Repository navigation
fix(fork): merge upstream 4fd40e1 into patch/shell-subagent-trim - #254
Merged
fireboltdude1357 merged 6 commits intoNov 12, 2026
Merged
fireboltdude1357 merged 6 commits into
fireboltdude1357 merged 6 commits into
Conversation
…gdotgg#35286) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…otgg#35287) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dit from here keeps your files (pingdotgg#35291) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…d trips (pingdotgg#35071) The prepare-time shell load follows the idea and structure of pingdotgg#27413. Co-authored-by: ahalekelly <7078138+ahalekelly@users.noreply.github.com> Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…ng long thread (pingdotgg#35224) Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…l-subagent-trim-upstream-4fd40e1 # Conflicts: # apps/server/src/orchestration-v2/http.ts
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
patch/shell-subagent-trimconflicts with upstream 4fd40e1 inapps/server/src/orchestration-v2/http.ts.Upstream pingdotgg#35071 moves the shell snapshot route into
answerShellSnapshot, which also handlesresumeFrom. I took upstream's route and passed the patch'somitIdleSubagentParentsquery flag throughanswerShellSnapshottoloadShellSnapshot.On a scratch stack of upstream 4fd40e1 with all 26 patches and the four fix branches for this upstream,
pnpm install --no-frozen-lockfile,vp run typecheck, andvp test runon the test files the patches touch plusorchestration-v2/http.test.tsall pass (49 files, 1357 tests).integration/transferBudgetV2.integration.test.tspasses too.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code