Skip to content

chore: sync with upstream pingdotgg/t3code main - #234

Merged
yordis merged 694 commits into
mainfrom
yordis/chore-sync-upstream-20261116-1
Nov 16, 2026
Merged

yordis merged 694 commits into
mainfrom
yordis/chore-sync-upstream-20261116-1

Conversation

@yordis

@yordis yordis commented Nov 16, 2026

Copy link
Copy Markdown
Member
  • Kept the fork's RPC tracing (ledger 0035, newly recorded): server spans stay children of the client span. Upstream's new root-span test contradicts this, so the fork's test replaces it; upstream's other instrumentation edits are kept.
  • Kept the fork's failed-commit output (ledger 0036, newly recorded) and layered upstream's selected-file index sync after it, so partial commits with conflicts and hook failures both behave.
  • Kept generated files starting folded (ledger 0037, newly recorded) on top of upstream's new Viewed folding; the fork's override check is dropped because upstream's collapse logic now handles overrides.
  • Watch fingerprint now merges both sides: the fork's includesCheckState and upstream's coversDetail both let a watch skip re-reading checks while in flight.
  • Orchestrator: took upstream's deletion lock around dispatch and kept the fork's dispatchStartedAtMs argument, which the fork's orchestrator metrics fix depends on.
  • Model picker: took upstream's coarse-pointer early return and kept the fork's instance selection (ledger 0032).
  • Pull request contracts and diff service carry both upstream's withheld-file fields and the fork's generated-path resolution.
  • Dev runner keeps the fork's state-dir owner guard test alongside upstream's resource monitor test.
  • Agent context budget re-recorded because the merged MCP tool list grew past it.
  • Watch fingerprint merge, orchestrator metrics, and the dev-runner guard are kept without ledger entries. Do these need entries, or should they go upstream?

juliusmarminge and others added 30 commits November 15, 2026 04:52
…d bound (pingdotgg#35937)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ice hub is off (pingdotgg#32542)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#36199)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…not the parent mode (pingdotgg#27334)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ning (pingdotgg#31548)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ir install folder (pingdotgg#35840)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…es at that model's rate (pingdotgg#32219)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36616)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ugh MCP (pingdotgg#33773)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…2363)

Co-authored-by: azhar <azhar.amir@amartha.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…2370)

Co-authored-by: azhar <azhar.amir@amartha.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…raw links (pingdotgg#32224)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… picker (pingdotgg#24082)

Co-authored-by: maria-rcks <maria@kuuro.net>
StiensWout and others added 22 commits November 15, 2026 23:25
…#37537)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…reported" (pingdotgg#36897)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…gg#37562)

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

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ema is current (pingdotgg#37564)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… for minutes (pingdotgg#37538)

Co-authored-by: Tobias <tobias@MacStudonTobias.localdomain>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tle limits (pingdotgg#37565)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#37605)

Co-authored-by: Orin <orin@orin.ws>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pstream-20261116-1

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

# Conflicts:
#	apps/server/src/observability/RpcInstrumentation.test.ts
#	apps/server/src/observability/RpcInstrumentation.ts
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/pullRequest/PullRequestService.ts
#	apps/server/src/vcs/GitVcsDriverCore.test.ts
#	apps/server/src/vcs/GitVcsDriverCore.ts
#	apps/web/src/components/chat/ModelPickerContent.tsx
#	apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
#	packages/contracts/src/pullRequest.ts
#	packages/source-control-core/src/server/PullRequestProvider.ts
#	scripts/dev-runner.test.ts
The merged MCP tool list grew past the recorded budget, so the budget test failed.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@cursor

cursor Bot commented Nov 16, 2026

Copy link
Copy Markdown

This PR is too large for Bugbot to review. It changes 35,028 lines and 3,833,090 characters. Split the change into smaller pull requests to get a review.

@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL labels Nov 16, 2026
@github-actions

Copy link
Copy Markdown

This PR changes the test suite by +662 test cases (browser +68, unit +334, server +260).

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/chat/ComposerPendingUserInputPanel.browser.test.tsx, apps/web/src/components/chat/DraftHeroHeadline.browser.test.tsx, apps/web/src/components/chat/McpAppFrame.browser.test.tsx, apps/web/src/components/chat/useComposerStash.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/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.
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

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

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

Other scenarios

All 64 scenario measurements match main.

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

Baseline: 495bb00 · PR result: da397b2 · 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.

@yordis
yordis merged commit 380af22 into main Nov 16, 2026
32 of 33 checks passed
@yordis
yordis deleted the yordis/chore-sync-upstream-20261116-1 branch November 16, 2026 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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