Skip to content

chore: sync upstream through fecd7138e9 - #294

Merged
andrewcai8 merged 1861 commits into
mainfrom
sync/upstream-fecd7138e9
Nov 16, 2026
Merged

andrewcai8 merged 1861 commits into
mainfrom
sync/upstream-fecd7138e9

Conversation

@andrewcai8

Copy link
Copy Markdown
Owner

Syncs 1856 upstream commits (896e64f82d..fecd7138e9, upstream's newest green CI run on 2026-11-16). 102 conflicts.

Notable upstream changes

Conflict resolutions

  • Packages: kept the fork's dependencies (connectrpc, bufbuild, e2b, modal, namespacelabs) and took upstream's @cursor/sdk 1.3.1 and its lockfile.
  • CI: Test Web takes upstream's two shards but stays on ubuntu-latest; AttachmentFilePreview still runs alone, on shard 1. Native Static Analysis stays on macos-latest. The release resolve_commit gate combines the fork's ENABLE_RELEASE_WORKFLOW with upstream's PAUSE_NIGHTLY.
  • SQLite (nodeSqliteClient.ts, Sqlite.ts):
    • Took upstream's writer worker and dropped the fork's writer worker, checkpoint admission and back-pressure.
    • Kept the fork's onWriterLost, which exits so the server restarts.
    • A worker reply that can't be read now stops that worker; with batched replies it would otherwise hang every caller.
    • ForkMigrations checks with reads first and writes only when a fork migration is pending, because upstream perf(server): CLI startup no longer takes the write lock when the schema is current pingdotgg/t3code#37564 needs the CLI to skip the write lock.
    • No fork migration duplicates an upstream index.
  • Process spawning: removed the fork's SpawnHost in favor of upstream's NonBlockingSpawner and SpawnWorker. This also deletes the spawn host process, its benchmark, and its process-telemetry grouping.
  • Orchestration:
    • Kept the fork's FIFO queue (QueuedRunOrder) over upstream's interleaving by request time (fix(server): queued messages no longer wait behind every later delegate completion pingdotgg/t3code#34620). Waiting automated messages already join the next turn.
    • Restart recovery merges upstream's resend of interrupted turns with the fork's joined messages.
    • Joined prompts are built on upstream's resume source message.
    • The fork's index hints are re-applied in upstream's new ProjectionStore queries.
    • holdsOpenLock stays on every releaseEntry inside open.
  • Account switch: upstream now blanks the text of a manual continuation, so ProviderAccountSwitch sends its continuation as a plain message. It continues only while the limited run is still the chat's latest and stopped.
  • MCP:
    • McpToolAccess keeps both upstream's forwarded and the fork's ownRouting.
    • All 11 viaFleet tools are still wrapped.
    • t3_fork_* are now hiddenFromOutsideClients, as upstream's new startup check requires.
    • Home's fleet thread reads page newest first.
    • FleetQuestion options carry preview.
  • Web:
    • Sidebar rows use upstream's resolveSidebarRowStatus, with the fork's expired status passed through.
    • Settings navigation takes upstream's i18n layout and keeps the fork's Home filtering.
    • Draft environment routing never retargets a draft that starts a cloud environment.
  • Mobile and desktop: both sides kept: the scheduled-task target alongside upstream's updater-style drafts, cloud wake states, useNewThreadNavigation, and the desktop keepAliveOnClose.

Verification

  • Typecheck: passes in every touched package (server, web, mobile, desktop, contracts, shared, client-runtime, provider-core, provider-cursor, provider-acp, provider-opencode, source-control-github, scripts).
  • Lint, format, knip: vp lint and vp fmt --check are clean on all 702 files that differ from upstream (two warnings), and knip:check passes.
  • Server tests:
    • orchestration-v2, persistence, home, usage and AgentContextBudget: 3,569 passed.
    • mcp: 443 passed.
    • provider and usage: 1,280 passed.
    • scheduledTasks and the remaining lane files: passed.
  • Package tests: contracts, provider-core and provider-cursor pass in full. shared and client-runtime pass apart from one Mac-only bash 3.2 case in shell.test.ts.
  • Web, mobile and desktop tests: targeted tests for every conflicted file pass. Full suites are left to CI.
  • Review: an independent review of git show --remerge-diff found two defects, the account-switch guard and the newest-first fleet read. Both are fixed in 0b48837737c, with tests that fail without the fix.

Not verified

  • No real-client pass and no paid evals. Upstream's rewritten schedule_task and t3_thread_read descriptions now include the fork's cloud and Home sentences.

Follow-ups

  • The agent context budget grew: MCP tool list 54,742 → 56,347 bytes, Claude append 5,597 → 5,930 bytes. Hence the agent-context-increase label.
  • Warn before restarting the PC: migrations 082–096 build indexes.

Opus 5.5, Claude Code.

🤖 Generated with Claude Code

StiensWout and others added 30 commits November 15, 2026 04:56
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>
… narrow screens (pingdotgg#29503)

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>
… KB" (pingdotgg#30330)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: bentbrain <28818884+bentbrain@users.noreply.github.com>
…tgg#30753)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#29749)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… reply (pingdotgg#30084)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…failed when one did (pingdotgg#32407)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s cancelled (pingdotgg#32414)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ing node_modules (2,500 s → 5.0 s) (pingdotgg#32023)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
01-1 and others added 19 commits November 16, 2026 02:44
…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>
…oaded" (pingdotgg#37651)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he id (pingdotgg#37493)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merges 1856 upstream commits (896e64f..fecd713), including migrations 082-096.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- An account switch continues its run only while that run is still the chat's latest and
  stopped. Upstream now blanks the text of manual continuations, so the switch sends a plain
  message and checks this itself.
- Home's fleet thread reads page newest first like agent callers, not forward from the start.
- A new upstream server.test registry mock needs the fork's `entries`.

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 16, 2026
@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 added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 16, 2026
andrewcai8 and others added 2 commits November 16, 2026 13:48
Worker threads inherit the flag, and upstream's SQLite writer worker runs CommonJS, so every
contender exited before loading.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Fork orchestrator tools route through Home, so the in-process MCP server needs them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@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 +1 B (+0.0%) 24.4 KiB ✅
Claude Live turn messages 1 1 0 (0.0%) 8 ✅

Baseline: 33cfae0 · PR result: 205f903 · Source CI: failure

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
andrewcai8 merged commit f304be6 into main Nov 16, 2026
80 of 88 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.