Repository navigation
fix(fork): resolve upstream merge e8b28328da (2026-11-20) - #237
Merged
Merged
Conversation
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Other scenariosNo All 64 scenario measurements
Baseline: unavailable · PR result: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
Resolve the 16 conflicted files of the merge commit and fix the breaks the merge brought. - Keep both sides where the fork and upstream added beside each other. - Take upstream's attachment resource fix, which matches the fork's. - Right panel: upstream renamed side chat tabs to thread tabs; the fork's Dashboard, Replies and Whiteboard tabs sit beside them, a saved split keeps a side chat tab across the rename, and a linked thread in the unfocused pane of a split keeps updating. - Antigravity status errors: upstream's reader takes only known status names, so a protobuf length byte is no longer read into the status. - The user's own Antigravity CLI keeps its own login: no SSH marker in its launch environment, and its limits read the system keyring again. - Full Chrome for the preview's virtual-display mode moves to 158 with upstream's preview browser. - The display-mode wrap takes upstream's run output instructions with the message text. - Fork tests follow upstream's new Claude session methods, asset route and hub model list; upstream's file preview drag cases each open their own file, as the fork reopens a file where the reader stopped. - Upstream's Sidebar browser tests start from an empty draft store, so drafts another browser test file left in localStorage do not take the jump numbers that upstream now gives unsent drafts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
orbitingflea
force-pushed
the
catch-up/20261121
branch
from
November 21, 2026 14:54
2d5dde4 to
427e7f2
Compare
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.
This pull request resolves the merge of upstream e8b2832 (commit A ad07aa8 left conflict markers in 16 files) and fixes the type and test breaks the merge brought.
改了什么行为
Behaviour change: no
Undo
Revert this commit and commit A together.
Files
side-chattothreadand added linked-thread tabs. The fork's Dashboard, Replies and Whiteboard tabs sit beside them. Upstream's migration renames saved side chat tabs, but not the fork's split view, so a saved split with a side chat in a pane was dropped. The fork's split restore now renames those ids too. A test covers it.AntigravityTurnOutcome.ts: upstream added a reader for Antigravity'sSTATUS (code NNN): messageerrors, which the fork already read in its own module. The error text follows a protobuf length byte, and when that byte is a capital letter upstream's reader puts it into the status, such asOFAILED_PRECONDITION. The reader now starts only at a known google.rpc status name, and the fork's own copy is removed. The fork's test from a real CLI error covers it.ProviderTurnStartService.ts: upstream's run output instructions are part of the text the fork's display mode wraps, so a re-wrapped prompt carries them once, after the user's words. A test covers it.FilePreviewPanel.browser.test.tsx: upstream's new drag cases opened the same file one after another. The fork reopens a file where the reader stopped, so each case now opens its own file. This adds one upstream test file to the files the fork changes.Sidebar.browser.test.tsx: every browser test file shares one localStorage. Drafts that the chat view's tests leave there reached two Sidebar tests, which fail since upstream gave unsent drafts jump numbers. Pure upstream fails the same way when the chat view tests run first. Both tests now start from an empty draft store. This adds a second upstream test file to the files the fork changes.agentContextBudget.jsonholds the measured sizes. Upstream's tool list grew, so this pull request carries theagent-context-increaselabel.