Repository navigation
chore(fork): merge upstream v0.1.10-nightly.20261114.4682 - #49
Merged
Merged
Conversation
…ged revalidation (pingdotgg#23775) Signed-off-by: Shaswat Raj <shaswat340@gmail.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ell (pingdotgg#33064) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: lyn1dev <lyn1dev@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… local port (pingdotgg#24247) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#23743) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: only21mil <only21mil@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…omposer (pingdotgg#26692) Co-authored-by: nibarAhmed <nibarahmed0@gmail.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hite (pingdotgg#34569) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36290) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hes (pingdotgg#36477) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#33244) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36504) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n launch (pingdotgg#36042) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#36250) Co-authored-by: Roger <roger@Rogerflix.local> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#35907) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#35617) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#35612) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#24007) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36588) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…6590) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#25445) Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#24045) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#25472) Co-authored-by: Abid A Gafoor <40262245+sgaabdu4@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows (pingdotgg#24006) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36561) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25874) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36602) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nel (pingdotgg#36606) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36610) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36604) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36613) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25858) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#26069) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36584) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36608) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36626) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#36621) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge this with Create a merge commit, not squash, so upstream history stays intact.
Conflicted file:
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts: kept the fork's background-wait reminder hook (backgroundWaitReminder, part of the background-work feature) and droppedCLAUDE_CODE_MODEL_ALIASES, which upstream removed along with its last use (fix(server): Claude on Bedrock runs the model picked in the composer pingdotgg/t3code#24695). The neighbouring turn-start code, where upstream's native resume (feat(server): resume stopped provider threads natively pingdotgg/t3code#36526) meets the fork's wake delivery, merged on its own and keeps both.AgentContextBudgetandClaudeAdapterV2tests pass locally.🤖 Generated with Claude Code