Skip to content

chore(fork): sync with upstream (2026-11-16) - #40

Merged
syz51 merged 1385 commits into
forkfrom
fork-sync-20261116
Nov 16, 2026
Merged

syz51 merged 1385 commits into
forkfrom
fork-sync-20261116

Conversation

@syz51

@syz51 syz51 commented Nov 16, 2026

Copy link
Copy Markdown
Owner

Weekly sync: merges upstream/main (6b7027b, 1,377 commits since the last sync) into fork.

Conflict resolutions

The rule was: keep upstream's behavior and redo the fork's patch on top. No conflict needed a product decision.

  • Package files and workflows: regenerated with bun scripts/fork-convert-to-bun.ts and bun scripts/fork-ci-runners.ts. pnpm and corepack appear only in comments.
  • PR watch (PullRequestWatchReactor.ts, orchestrationV2.ts): rebased the fork's end reasons and skip records onto upstream's batched wakes (fix(server): a pass that changes several watched pull requests wakes their thread once pingdotgg/t3code#35109). Held wakes carry endReason and skip. Each others item in the sync command carries them too. Merged and closed watches both go through held wakes.
  • Subagent effort (ClaudeAdapterV2.ts and test): kept upstream's explicit-effort recording and the fork's transcript-effort read. Model-only selections keep no effortLevel.
  • Restart continuation (Orchestrator.ts, RestartContinuation.ts): took upstream's processLossCount. Kept the fork's rate-limit retry, which reads settings only for runs that are not rate-limited.
  • Thread launch and management: kept the fork's isNonGitProject and upstream's defaultWorkspaceStrategy and worktree fallback base.
  • Settlement test: kept the fork's deploy and activityRunStatus expectations and upstream's monitor watch expectation.
  • Git (GitVcsDriverCore.ts, GitManager.ts): kept the fork's parallel remote status read on upstream's prefix-stripped upstream ref. Kept the fork's first-URL remote parse.
  • MCP (orchestratorMcp.ts, tools.ts, OrchestratorMcpService.ts, project handlers, CLI thread): kept the fork's compact results and link thread ids on upstream's thread_read result schema. Added earlierPosition to it. Took upstream's thread_read description, with only the fork's "or link".
  • ACP adapter: took upstream's cached runtime instructions and passed the fork's delegatedChild flag into them.
  • Chat markdown rows: kept the fork's workingDirectory and upstream's agentDirectories.
  • Tests: dropped Effect.scoped wrappers to match upstream's de-scoped tests, and kept the fork's ShellThreadReads layers.
  • Docs and evals: development setup keeps the Bun line on upstream's Vite+ install. MCP server doc keeps the fork's result-field rules but drops the type block for upstream's contract import. Sidebar doc keeps the delegated-task rate-limit retry. Eval cases take upstream's next text and keep the fork's delegate worktree cases.
  • Agent context budget: remeasured. Growth over fork equals upstream's growth over the last sync base (+333 / -3 / +1605 bytes), so this PR carries agent-context-increase.

fix(fork) commits

  • Upstream MCP integration and shell tests use the fork's thread_read result and shell reads.
  • Upstream's subagent effort test reads each child thread's final effort, since the fork updates a child once its transcript reports one.
  • The fork's PR watch head-change tests start from upstream's silent first read.
  • Upstream's remote task test expects the fork's agent results to omit a null model.
  • A project's default worktree for t3_thread_launch now follows the new-worktree origin setting. It always started from origin, and upstream's handler now fills startFromOrigin only when it is unset (found in review).
  • The subagent effort test checks each child's effort events in order, so a child with no effort must start as unknown.

Checks

vp run check:changed upstream/main: format, lint, knip, typecheck and graphql pass. Two local test failures remain that are macOS-only: GitVcsDriverCore worktree paths (/private/var) and the web Shift+F10 context-menu test. CI on Linux decides those.

Model and harness: Claude Opus 5.5 in Claude Code, run from T3 Code.

amr807 and others added 30 commits November 15, 2026 04:40
…dotgg#29498)

Co-authored-by: amr sarhan <amr@amrs-MacBook-Air.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…startup (pingdotgg#32053)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nnects (pingdotgg#31543)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…the caller's project (pingdotgg#35913)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…Mode (pingdotgg#30019)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t the web host (pingdotgg#29784)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uth and CORS (pingdotgg#35810)

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>
…de (pingdotgg#32157)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ror body (pingdotgg#35809)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…config (pingdotgg#28557)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#30299)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erited (pingdotgg#29764)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…3759)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… on its host (pingdotgg#35209)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#34065)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#23354)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… matches (pingdotgg#35916)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
cmcgrabby-hue and others added 22 commits November 15, 2026 13:56
…iew (pingdotgg#37340)

Co-authored-by: cmcgrabby-hue <267390149+cmcgrabby-hue@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ds (pingdotgg#37364)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ode's hand-back frame (pingdotgg#37355)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#37395)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37083)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@syz51 syz51 added the agent-context-increase Accept agent context growth in the budget check label Nov 16, 2026
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 16, 2026
@github-actions

Copy link
Copy Markdown

This PR changes the test suite by +1641 test cases (browser +177, unit +800, server +664).

New browser test files: apps/web/src/components/AppSidebarLayout.browser.test.tsx, apps/web/src/components/GitActionsControl.composition.browser.test.tsx, apps/web/src/components/RightPanelSheet.browser.test.tsx, apps/web/src/components/Sidebar.shiftGuard.browser.test.ts, apps/web/src/components/chat/ComposerPendingUserInputPanel.browser.test.tsx, apps/web/src/components/chat/DraftHeroHeadline.browser.test.tsx, apps/web/src/components/chat/MarkdownCodeBlock.browser.test.tsx, apps/web/src/components/chat/McpAppFrame.browser.test.tsx, apps/web/src/components/chat/ThreadDetailsPanel.browser.test.tsx, apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx, apps/web/src/components/chat/useComposerAttachmentIntake.browser.test.tsx, apps/web/src/components/chat/useComposerSelection.browser.test.tsx, apps/web/src/components/chat/useComposerStash.browser.test.tsx, apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx, apps/web/src/components/cloud/CloudEnvironmentConnectList.browser.test.tsx, apps/web/src/components/diffs/DiffFileTree.browser.test.tsx, apps/web/src/components/diffs/StyledDiffCodeView.browser.test.tsx, apps/web/src/components/files/ReadOnlySourcePreview.browser.test.tsx, apps/web/src/components/files/office/sheet-resize.browser.test.ts, apps/web/src/components/preview/ThreadPreviewMiniPlayer.browser.test.tsx, apps/web/src/components/settings/AddUsageLimitSourceDialog.browser.test.tsx, apps/web/src/components/settings/IntegrationsSettings.browser.test.tsx, apps/web/src/components/settings/LinkedEnvironmentsSettings.browser.test.tsx, apps/web/src/components/usage/UsageModelDialog.browser.test.tsx, apps/web/src/hooks/useShownThreadRouteTarget.browser.test.tsx, apps/web/src/themeCss.browser.test.ts.
Each browser test file costs CI seconds of module loading before its first test runs; a unit test costs milliseconds.

Keep tests that would fail for a real reason, and test logic below the UI where it can be. See Testing.

@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Nov 16, 2026
@github-actions

github-actions Bot commented Nov 16, 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: d20e779 · 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.

@syz51
syz51 merged commit f5cfafb into fork Nov 16, 2026
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accept agent context growth in the budget check 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL 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.