Skip to content

chore: sync upstream through da57ea2bf9 - #312

Merged
andrewcai8 merged 235 commits into
mainfrom
sync/upstream-da57ea2bf9
Nov 22, 2026
Merged

andrewcai8 merged 235 commits into
mainfrom
sync/upstream-da57ea2bf9

Conversation

@andrewcai8

Copy link
Copy Markdown
Owner

Why

The mini PC host is slow, and upstream has a run of server changes that start fewer git processes. This merges 234 upstream commits (0702c6f..da57ea2, upstream CI green). Merge with a merge commit, not a squash.

Notable upstream changes

Conflict resolutions (49 files)

  • Turn start: the fork still joins queued messages into one turn; upstream's output-schema instructions apply to the joined text. Kept the fork's injectHistory guard on uncertain delivery and added upstream's rejected-history check.
  • MCP: t3_thread_launch keeps fleet routing and gains upstream's generateTitle/outputSchema checks; Home and cross-environment launches refuse outputSchema rather than drop it. readThreadPage takes upstream's linked-client paging and first-page rule.
  • Server misc: RuntimePolicy keeps auto-approve and adds tracked folders; restart continuation keeps the fork's prompt-first text with upstream's cause-specific note; server.ts drops the fork's route-pipe split, since fix(server): signed URLs are logged and traced with the token redacted pingdotgg/t3code#40133 removed layerUnloggedSignedRequests. ws, storage cleanup, contracts, harness and test layers take both sides.
  • Web/mobile: limit banner and card keep Switch account and add upstream's "Resume now"; sidebar drafts move to upstream's useSidebarDrafts while keeping the fork's invested-work and cloud first-send rules; new-thread default keeps the Home skip and adds project grouping; branch toolbar keeps the cloud base selector before upstream's repository control. EnvironmentsMap handles the fork's waking phase.
  • Claude 429 reset (no textual conflict): upstream fix: proxied usage limits follow the hub's model routing and show on the thread card pingdotgg/t3code#30778 fills a proxied limit's reset from the hub's accounts, but the fork's adapter already assumed 30 minutes, so the hub path never ran. The assumption moved to the ingestor after the hub lookup; the no-hub replay fixture now expects the 30-minute reset.
  • Lockfile and catalogs: upstream's, plus the fork's e2b and connectrpc deps, then vp i and i18n:generate.

Verification

  • Typecheck clean in server, web, mobile, desktop, client-runtime, contracts, shared, provider-core, provider-cursor, source-control-github, scripts and evals.
  • agentContextBudget.json is the measured 65663 bytes (upstream 59052 plus fork tools), so this PR carries agent-context-increase. ForkMigrations.test.ts lists 103-105.
  • vp fmt --check and vp lint on all files that differ from upstream (warnings only), knip:check, i18n-check, vp i --frozen-lockfile pass.
  • Tests: server orchestration-v2, persistence, mcp, home and the conflicted files (4,470 pass), mobile 3,806, client-runtime 2,599, contracts 212, web logic 267, web browser 13 (draft block, sidebar drafts, route commands, scheduled tasks, pooled usage).

Not verified

  • Fork-only UsageService.boxUsage.test.ts "includes stored cloud box usage" fails 2 of 3 local runs on temp-dir cleanup (ENOTEMPTY). Upstream did not touch usage storage, so this looks like an existing flake; CI is the check.
  • Full web and desktop suites are left to CI. No live cloud box or hub run of the moved 30-minute reset.

Follow-ups

  • Home and cross-environment t3_thread_launch refuse outputSchema and ignore generateTitle; forwarding them through threads.launch would need a HomeService contract change.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 20, 2026 12:06
…ls (pingdotgg#39837)

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

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dotgg#39439)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…gdotgg#39515)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ack offers nothing (pingdotgg#38506)

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows is locked (pingdotgg#39198)

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

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…#39897)

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

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

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

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

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

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

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

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 22 commits November 21, 2026 10:31
…folder labels (pingdotgg#40464)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n character set (pingdotgg#40476)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40490)

Co-authored-by: x0r <x0r@noreply.x0r.li>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…agent (pingdotgg#40496)

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

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

Co-authored-by: Sean Kenneth Doherty <328402569+seankd3@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…entry separators (pingdotgg#40509)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e separators (pingdotgg#40523)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d rule (pingdotgg#40525)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merge 234 upstream commits (0702c6f..da57ea2), including the run of
server changes that start fewer git processes (pingdotgg#40153, pingdotgg#40376, pingdotgg#40305,
pingdotgg#40162, pingdotgg#40338, pingdotgg#40337, pingdotgg#40450) and the queue/checkpoint fixes (pingdotgg#40411,
pingdotgg#40489).

Fork adaptations beyond the conflicts:
- The assumed 30-minute reset for a Claude 429 moved from ClaudeAdapterV2
  to ProviderEventIngestor, after upstream's hub-pool reset (pingdotgg#30778), so a
  known hub's refill time wins over the guess.
- server.ts drops the route-pipe split; pingdotgg#40133 removed
  layerUnloggedSignedRequests.
- EnvironmentsMap handles the fork's `waking` phase.
- Fake Claude sessions gain the MCP sign-in methods; ForkMigrations lists
  103-105; agentContextBudget.json is the measured 65663 bytes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@andrewcai8 andrewcai8 added the agent-context-increase Accept agent context growth in agentContextBudget.json label Nov 21, 2026
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 21, 2026
@github-actions

Copy link
Copy Markdown

This PR changes the test suite by +1415 test cases (browser +37, unit +1201, server +177).

New browser test files: apps/web/src/components/settings/SnoozePresetsSettings.browser.test.tsx, apps/web/src/components/ui/search-input.browser.test.tsx, apps/web/src/lib/imageCompression.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 21, 2026
@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

4 of 64 scenario measurements changed or failed.

Provider Scenario Metric Main baseline This PR Impact PR ceiling
Codex fleet shell snapshot HTTP decoded 42.4 KiB 42.4 KiB +20 B (+0.0%) 53.7 KiB ✅
Codex stale shell reload HTTP decoded 42.4 KiB 42.4 KiB +20 B (+0.0%) 53.7 KiB ✅
Claude fleet shell snapshot HTTP decoded 43.0 KiB 43.0 KiB +20 B (+0.0%) 53.7 KiB ✅
Claude stale shell reload HTTP decoded 43.0 KiB 43.0 KiB +20 B (+0.0%) 53.7 KiB ✅
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 +20 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 +20 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 +20 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 +20 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: 9e65e61 · PR result: 3fe8da9 · 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.

@andrewcai8

Copy link
Copy Markdown
Owner Author

PASS+NOTES

Independent verification of 3fe8da9 (merge of fork main 9e65e61 + upstream da57ea2, no commits after the merge).

What I checked

  • git show --remerge-diff 3fe8da90f9: every resolution in server, web, mobile, client-runtime, contracts.
  • Dropped lines: for each of the 49 files, I took the lines fork and upstream each added since 0702c6f and looked for them in the result. Each line not found was a deliberate rewrite: the fork's readThreadPage extraction now carries upstream's linked-client and first-page rules (OrchestratorMcpService.ts:1391); joined prompts now feed upstream's outputInstructions (ProviderTurnStartService.ts:999); sidebar drafts moved into useSidebarDrafts with the fork's invested-work and cloud-send rules; resolveDefaultProjectRef keeps the Home skip and adds grouping; the stripe change took upstream's tile while keeping the fork's removal of the pace mark.
  • Fork behaviours: SpawnHost.ts present and returned by SpawnWorker.layerServer on Linux (SpawnWorker.ts:572). ForkMigrations.test.ts lists 103-105. Joined queued messages kept (ProviderTurnStartService.ts:999). accountPinned kept beside upstream's ...output (Orchestrator.ts:8300). Cloud-box bearer onboarding unchanged (client-runtime onboarding.ts:133). t3_thread_launch keeps viaFleet. Scheduled-task target kept in the editor and row. The injectHistory guard on uncertainDelivery kept, with upstream's rejectedHistory added (ProviderTurnStartService.ts:1560). ci.yml Test job is still timeout-minutes: 20.
  • Claude 429 move: upstream fix: proxied usage limits follow the hub's model routing and show on the thread card pingdotgg/t3code#30778 (new in this range) only fills a hub reset when resetAt == null, and the fork's adapter constant would have blocked it. The 30-minute assumption now runs in the ingestor after the hub lookup (ProviderEventIngestor.ts:704). Resolved this way, the hub value wins and the fork's fallback still applies.

Commands

  • vp i --frozen-lockfile: ok.
  • vp test run on 22 server files (conflicted tests, ClaudeAdapterV2, ProviderEventIngestor, ProviderTurnStartService, OrchestratorMcpService, project handlers and hostLaunchThread, RuntimePolicy, RestartContinuation, storageCleanup, ws, SpawnHost, ForkMigrations, 103 migration, UsageLimitRecoveryWorker, ThreadLaunchService, ClaudeReplayFixtures integration): 1482 passed, 1 skipped; replay fixtures 40/40.
  • Web, --maxWorkers=2: scheduledTasksSettings.logic, UsageLimitRecoveryBanner, environmentsMap.logic, useHandleNewThread (and .cloud), SidebarDraftBlock.browser: 98 passed.
  • vp run typecheck in apps/server, apps/web, apps/mobile, packages/contracts, packages/client-runtime, scripts: all exit 0.
  • CI at the head: every check is success or skipped.

Migrations (all cheap on the 109 GB PC DB)

  • 103: ALTER TABLE issue_tracker_bindings ADD COLUMN ... DEFAULT '[]'. Metadata only, no scan.
  • 104: PRAGMA table_info, then the same kind of ADD COLUMN on projection_projects. Metadata only.
  • 105: CREATE TABLE task_folders plus an index on the new, empty table. Instant.

Notes (not blocking)

  • The ingestor fallback now needs class === "usage_limit", where the old adapter path covered any 429. A non-usage-limit 429 (an error-subtype result without the usage flag) no longer gets a reset, and limit recovery ignores that class anyway. No live hub or cloud-box run was done.
  • Home and cross-environment t3_thread_launch refuse outputSchema (handlers.ts:334) and silently drop generateTitle. This is already listed as a follow-up.

🤖 Generated with Claude Code

@andrewcai8
andrewcai8 merged commit 521daeb into main Nov 22, 2026
44 of 45 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 agentContextBudget.json 📱 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.