Repository navigation
fix(fork): merge upstream 8760d06 into patch/draft-404-reload - #161
Merged
fireboltdude1357 merged 15 commits intoNov 1, 2026
Merged
fireboltdude1357 merged 15 commits into
fireboltdude1357 merged 15 commits into
Conversation
pingdotgg#28104) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ledgement (pingdotgg#16419) Co-authored-by: Codex (gpt-6.1-sol) <noreply@openai.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…#28027) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gdotgg#28474) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…8593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28605) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/mobile/src/state/threads.ts # apps/web/src/state/threads.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/draft-404-reloadconflicts with upstream 8760d06 inapps/web/src/state/threads.tsandapps/mobile/src/state/threads.ts.Upstream pingdotgg#28516 added
childThreadApprovalsAtomright after the thread shell atoms, and it readsenvironmentThreadDetails. The patch movedenvironmentThreadsandenvironmentThreadDetailsbelow the shell atoms so they can takethreadShellAtom. In both files I kept the patch's definitions and put upstream's atom after them.On a scratch stack of upstream 8760d06 with all 18 patches and the fix branches for full-access-never-asks and draft-404-reload,
pnpm install --no-frozen-lockfile,vp run typecheck(39 of 39) andvp test runon the 31 test files the patches touch (942 tests, including all 285 inClaudeAdapterV2.test.ts) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code