Repository navigation
fix(fork): merge upstream 5e9d564 into patch/bots - #126
Merged
Merged
Conversation
…ingdotgg#25816) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…h no list open (pingdotgg#25809) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…saves a draft twice (pingdotgg#25768) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ering (pingdotgg#25846) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rning (pingdotgg#25819) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…first commit (pingdotgg#25817) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rom screen effects (pingdotgg#25820) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25837) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25860) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25812) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#25882) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d one (pingdotgg#25839) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s it unavailable (pingdotgg#25632) Co-authored-by: Theo Browne <me@theo.li>
…otgg#25841) Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
…b checks agent-device 0.21.32 folds the iPhone Duo in Simlock's device set. The folded Duo keeps its side rail inside a thread, so the hide-on-push tab checks only apply to bottom tab bars. The Duo poses stay pending: alert accept cannot see the open-link prompt on the Duo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#25854) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…derive instead of syncing (pingdotgg#25813) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…effects (pingdotgg#25895) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25900) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Theo Browne <me@theo.li>
…ount connects (pingdotgg#25868) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…aint (pingdotgg#25909) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25915) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wn panel (pingdotgg#25908) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#25920) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dropped (pingdotgg#25916) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#25910) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ng (pingdotgg#25903) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…25929) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25928) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26058) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#26045) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26046) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26047) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…n drafts (pingdotgg#26050) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26061) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…an effect (pingdotgg#26049) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ad of stacking another (pingdotgg#26052) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#26042) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#25611) Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#25066) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ngdotgg#26064) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#19093) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#16653) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#16684) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16695) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Lenori <122464369+Lenoridev@users.noreply.github.com>
…nt (pingdotgg#17129) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… become a Labs beta (pingdotgg#17130) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…-upstream-5e9d564 # Conflicts: # apps/server/src/mcp/toolkits/project/handlers.ts # apps/server/src/mcp/toolkits/project/tools.ts
…mports Upstream added RemoteDelegation to OrchestratorMcpService and its own OrchestrationV2ThreadShell import to the project handlers test. Co-Authored-By: Claude Opus 5.5 <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.
The fork's nightly build fails because this patch conflicts with upstream. The 14:50 run failed on 07242ab. This branch merges upstream's current head, 5e9d564.
apps/server/src/mcp/toolkits/project/handlers.ts: upstream'st3_thread_launchnow derives its command id from an optionalclientRequestId, so a retry replays the first launch. I kept that and re-applied this patch's bot marker to the thread id. The id stays stable across retries because the marker wraps the same derived command id.apps/server/src/mcp/toolkits/project/tools.ts: kept upstream'sclientRequestIdanddelegatedFrominputs next to this patch'sbotinput.createThreadstest now provides upstream's newRemoteDelegationservice, and the project handlers test drops a duplicateOrchestrationV2ThreadShellimport that upstream also added.Verification:
vp run typecheck: 36 of 36 tasks pass.vp test runon the 13 test files this patch adds or changes: 338 passed..github/fork-patches.txtmerge with no conflicts, using the release, bots, cache-compaction and mobile-fork-identity fix branches. On the result, the build's repo-widevp run typecheckpasses all 36 tasks, and the 23 test files the patches add or change pass (668 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code