Skip to content

fix(fork): resolve upstream merge e8b28328da (2026-11-20) - #237

Merged
orbitingflea merged 1 commit into
catch-up/20261121-basefrom
catch-up/20261121
Nov 21, 2026
Merged

orbitingflea merged 1 commit into
catch-up/20261121-basefrom
catch-up/20261121

Conversation

@orbitingflea

@orbitingflea orbitingflea commented Nov 21, 2026 •

Copy link
Copy Markdown
Owner

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

  • Fork features work as before the merge, and upstream's new features arrive as upstream ships them.
  • One fork fix gives way to upstream's own version: an attachment preview builds its resource only from the attachment's fields, now through upstream's code.
  • The merge brings no SQLite migration.

Undo

Revert this commit and commit A together.

Files
  • Most conflicts keep both sides: upstream's code, with the fork's change on top.
  • Right panel: upstream renamed side chat tabs from side-chat to thread and 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's STATUS (code NNN): message errors, 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 as OFAILED_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.
  • Antigravity, the user's own CLI: upstream now marks a Google sign-in as an SSH session and skips the system keyring, to keep T3's managed profiles apart. The fork's own-CLI runtime uses the CLI's own login, so it keeps the server's own environment and its limits read the keyring again, as before the merge. Tests cover both.
  • Preview: upstream moved the preview browser to Chrome 158. The fork's full Chrome for the virtual-display mode moves to the same version, so its user agent and browser hints agree again.
  • A linked thread in the unfocused pane of a split right panel keeps updating, because a split shows that pane too.
  • Fork tests follow upstream's changes: the new Claude MCP sign-in session methods, the asset route's preview revisions service, the right panel's storage version 16, and the hub's per-account model list.
  • 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.json holds the measured sizes. Upstream's tool list grew, so this pull request carries the agent-context-increase label.
  • This pull request did not run the model evals, which need a key, or the native mobile app.

@orbitingflea orbitingflea added the agent-context-increase Accepts growth of the text agents receive label Nov 21, 2026
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:L labels Nov 21, 2026
@github-actions

github-actions Bot commented Nov 21, 2026 •

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire — 5.0 KiB — 6.8 KiB ✅
Codex Thread snapshot wire — 3.8 KiB — 4.9 KiB ✅
Codex Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Codex Live turn WebSocket decoded — 21.5 KiB — 24.4 KiB ✅
Codex Live turn messages — 1 — 8 ✅
Claude Total thread wire — 5.0 KiB — 6.8 KiB ✅
Claude Thread snapshot wire — 3.8 KiB — 4.9 KiB ✅
Claude Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Claude Live turn WebSocket decoded — 21.9 KiB — 24.4 KiB ✅
Claude Live turn messages — 1 — 8 ✅

Other scenarios

No main baseline exists yet for these 64 scenario measurements.

All 64 scenario measurements
Provider Scenario Metric Main baseline This PR Impact PR ceiling
Codex short turn resume WebSocket decoded — 10.5 KiB — 12.7 KiB ✅
Codex short turn resume WebSocket messages — 2 — 2 ✅
Codex long turn running, cold open HTTP decoded — 281.7 KiB — 302.7 KiB ✅
Codex long turn running, cold open rows — 75 — 75 ✅
Codex long turn running, history page HTTP decoded — 92.4 KiB — 107.4 KiB ✅
Codex long turn running, history page rows — 75 — 75 ✅
Codex long turn finished, cold open HTTP decoded — 381.5 KiB — 410.2 KiB ✅
Codex long turn finished, cold open rows — 151 — 151 ✅
Codex long turn finished, socket cold open WebSocket decoded — 381.6 KiB — 410.2 KiB ✅
Codex long turn finished, socket cold open WebSocket messages — 2 — 2 ✅
Codex long turn finished, socket cold open rows — 151 — 151 ✅
Codex long turn finished, work page HTTP decoded — 186.2 KiB — 200.2 KiB ✅
Codex long turn finished, work page rows — 150 — 150 ✅
Codex idle thread resume WebSocket decoded — 65 B — 200 B ✅
Codex idle thread resume WebSocket messages — 1 — 1 ✅
Codex fleet shell snapshot HTTP decoded — 42.4 KiB — 53.7 KiB ✅
Codex fleet shell snapshot rows — 27 — 27 ✅
Codex fleet shell subscribe WebSocket decoded — 65 B — 200 B ✅
Codex fleet shell subscribe WebSocket messages — 1 — 1 ✅
Codex fleet shell resume check HTTP decoded — 18 B — 100 B ✅
Codex fleet shell resume check rows — 0 — 0 ✅
Codex stale shell reload HTTP decoded — 42.4 KiB — 53.7 KiB ✅
Codex stale shell reload rows — 27 — 27 ✅
Codex stale shell resume WebSocket decoded — 140 B — 400 B ✅
Codex stale shell resume WebSocket messages — 2 — 2 ✅
Codex stale todo list cold open HTTP decoded — 72.4 KiB — 83.0 KiB ✅
Codex stale todo list cold open rows — 75 — 75 ✅
Codex stale todo list cold open nodes — 2 — 4 ✅
Codex stale todo list cold open subagents — 2 — 4 ✅
Codex stale todo list cold open plans — 1 — 2 ✅
Codex stale todo list cold open providerTurns — 1 — 2 ✅
Codex stale todo list cold open checkpoints — 1 — 2 ✅
Claude short turn resume WebSocket decoded — 10.6 KiB — 12.7 KiB ✅
Claude short turn resume WebSocket messages — 2 — 2 ✅
Claude long turn running, cold open HTTP decoded — 283.3 KiB — 302.7 KiB ✅
Claude long turn running, cold open rows — 75 — 75 ✅
Claude long turn running, history page HTTP decoded — 93.4 KiB — 107.4 KiB ✅
Claude long turn running, history page rows — 75 — 75 ✅
Claude long turn finished, cold open HTTP decoded — 384.2 KiB — 410.2 KiB ✅
Claude long turn finished, cold open rows — 151 — 151 ✅
Claude long turn finished, socket cold open WebSocket decoded — 384.3 KiB — 410.2 KiB ✅
Claude long turn finished, socket cold open WebSocket messages — 2 — 2 ✅
Claude long turn finished, socket cold open rows — 151 — 151 ✅
Claude long turn finished, work page HTTP decoded — 188.1 KiB — 200.2 KiB ✅
Claude long turn finished, work page rows — 150 — 150 ✅
Claude idle thread resume WebSocket decoded — 66 B — 200 B ✅
Claude idle thread resume WebSocket messages — 1 — 1 ✅
Claude fleet shell snapshot HTTP decoded — 43.0 KiB — 53.7 KiB ✅
Claude fleet shell snapshot rows — 27 — 27 ✅
Claude fleet shell subscribe WebSocket decoded — 66 B — 200 B ✅
Claude fleet shell subscribe WebSocket messages — 1 — 1 ✅
Claude fleet shell resume check HTTP decoded — 18 B — 100 B ✅
Claude fleet shell resume check rows — 0 — 0 ✅
Claude stale shell reload HTTP decoded — 43.0 KiB — 53.7 KiB ✅
Claude stale shell reload rows — 27 — 27 ✅
Claude stale shell resume WebSocket decoded — 140 B — 400 B ✅
Claude stale shell resume WebSocket messages — 2 — 2 ✅
Claude stale todo list cold open HTTP decoded — 73.4 KiB — 83.0 KiB ✅
Claude stale todo list cold open rows — 75 — 75 ✅
Claude stale todo list cold open nodes — 2 — 4 ✅
Claude stale todo list cold open subagents — 2 — 4 ✅
Claude stale todo list cold open plans — 1 — 2 ✅
Claude stale todo list cold open providerTurns — 1 — 2 ✅
Claude stale todo list cold open checkpoints — 1 — 2 ✅

Baseline: unavailable · PR result: 427e7f2 · Source CI: success

Scenario and decoded snapshot size

10 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.

  • Codex decoded thread snapshot: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

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
orbitingflea merged commit 427e7f2 into catch-up/20261121-base Nov 21, 2026
25 of 26 checks passed
@orbitingflea
orbitingflea deleted the catch-up/20261121 branch November 21, 2026 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accepts growth of the text agents receive size:L vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant