Skip to content

chore(sync): merge 194 upstream commits through v0.1.11 (2026-11-19) - #474

Merged
shuv1337 merged 198 commits into
mainfrom
t3/upstream-sync-de0466fd
Nov 21, 2026
Merged

shuv1337 merged 198 commits into
mainfrom
t3/upstream-sync-de0466fd

Conversation

@shuv1337

@shuv1337 shuv1337 commented Nov 21, 2026 •

Copy link
Copy Markdown
Owner

Problem

Catch S2Code up to pinned upstream pingdotgg/t3code v0.1.11 without changing fork install identity, runtime defaults, or release workflows. This imports 194 commits since 470ca63499; it includes no later 0.1.12-nightly commits.

  • Fork base (after fix(client): Background work shows one row per subagent, with its follow-ups counted #473): 9f0b154ddfbc66de7f65911f484d84d1f090f5e5
  • Upstream pin (2026-11-19 23:38 PST, v0.1.11): de0466fd80541b71a8b8d9b42ffe38e455f33640
  • Merge commit: 354a11d5c13242f05e01f3071b22486f315d0bc4. Its exact parents are 9f0b154ddfbc66de7f65911f484d84d1f090f5e5 and de0466fd80541b71a8b8d9b42ffe38e455f33640, in that order.
  • PR head: 348486461ac49aa135f7579d7c023b65c96cb413
  • Diffstat: 710 files changed, 33,390 insertions(+), 7,317 deletions(-)

Integration

Retains fork version "0.1.7" in all 4 workspace manifests and "private": true in apps/server/package.json (while taking upstream's "dev": "node scripts/dev.ts" script), fork #473 (#468) per-child background work grouping in derivePendingBackgroundWork, fork SSH ownership/symlink refusal guards (no $HOME/.t3 mutation and no host-t3 shortcut), fork @cursor/sdk@1.3.1 retry guard alongside upstream 106a1e03b7 model-cache invalidation, fork shared MCP servers across Codex/Pi/OpenCode, fork ModelManifest compatibility baseline (>=0.1.11 in providerCompatibility.ts so Antigravity 1.5+ rules evaluate accurately while manifests stay on 0.1.7), and fork S2Code branding in conflicted docs and triage playbook. No .github/workflows/*.yml files changed (git diff origin/main HEAD -- .github/workflows is empty).

Mobile native fingerprint note: upstream changes touch Android Kotlin sources in apps/mobile/modules/t3-review-diff (ReviewDiffCanvasDrawing.kt, T3ReviewDiffView.kt, ReviewDiffGeometryTest.kt) and patches/react-native-svg@15.16.1.patch. No EAS or release workflow was dispatched.

Web, mobile, and desktop translation catalogs were 3-way merged (preserving upstream additions and Simplified Chinese fixes alongside fork-only keys) and regenerated via i18n:generate; 0 new untranslated keys were introduced.

Conflicted files (45)

File Resolution
apps/marketing/src/i18n/{de,es,fr,ja,ko,pt-BR,ru,zh}.ts (8 files) Keep fork deletions (git rm).
apps/desktop/package.json, apps/web/package.json, packages/contracts/package.json (3 files) Keep "version": "0.1.7".
apps/server/package.json Keep "version": "0.1.7" and "private": true; adopt upstream "dev": "node scripts/dev.ts".
patches/@cursor__sdk@1.3.1.patch Start from fork patch (keeping 305.js, s2code-retry.cjs, agent.d.ts, s2codeRetryGuard) and apply upstream 106a1e03b7 listModelsForLocalValidation updates in dist/{bundled,cjs,esm}/index.js.
pnpm-lock.yaml Keep react-native-webrtc: 155.0.1 and @napi-rs/keyring: ^1.3.0; take upstream react-native-svg patch hash; recompute combined @cursor/sdk@1.3.1 patch hash via vp i and verify with vp i --frozen-lockfile.
apps/server/src/mcp/OrchestratorMcpService.ts Keep fork's earlier inheritedSelection/requestedModel with upstream antigravityTarget; preserve fork pool placement inside upstream's Effect.uninterruptibleMask and withResolvedInstance; pass cwd: project.workspaceRoot to cross-project resolveTargetRechecking; match aliased/suffixed models in requestedDriver pre-filter.
apps/server/src/mcp/OrchestratorMcpService.test.ts Keep fork ProjectService mock (workspaceRoot: "/other"), add resolveThreadStartInstance / workspaceScanDirectory / refreshWorkspaceSnapshot to affected test mocks, and test Antigravity thinking-suffixed resolution by driverKind.
apps/server/src/mcp/toolkits/project/handlers.ts Keep both ProviderDriverKind and ServerProvider imports; apply withWorkspaceModels and on-demand refreshWorkspaceSnapshot on model_unavailable in poolLaunchSelection.
apps/server/src/orchestration-v2/ProviderTurnStartService.ts Keep upstream carried side-chat handoff retirement block followed by fork's quota failover comment and manualResume.
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts Keep upstream sessionScope runtime opening, then assert runtime.backgroundTasksEndWithProcess.
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts Combine fork's sharedMcpServers matrix with upstream 06eda8e36e config/read transcript and stdio T3CODE_THREAD_ID assertion.
apps/server/src/peer/RemoteDelegation.test.ts Keep fork's finishLocalChild and cross-project tests, followed by upstream's captureThreadReads helper.
apps/server/src/auth/RpcAuthorization.test.ts Keep both clientRpcRequiredScopes and upstream's CommandId/MessageId/ORCHESTRATION_V2_WS_METHODS/RunId imports.
apps/server/src/cloud/relayResponse.ts Keep fork RelayAuthInvalidError copy with forkCliCommand; drop duplicate RelayEnvironmentLinkProofExpiredError fallthrough now handled below.
apps/server/src/process/agentScope.ts Combine fork per-product cap note and upstream MemoryHigh=infinity no-swap note in 4 lines.
.github/triage/PLAYBOOK.md, apps/server/src/triage/triagePrompt.ts Adopt upstream Step 8 GraphQL createIssue + prefilled URL instructions branded for shuv1337/s2code, keeping both files byte-identical after unescaping.
apps/web/src/components/desktopUpdate.logic.ts Keep PRODUCT_RELEASE_REPOSITORY and desktopUpdateChannelOf; drop deleted channelSwitchLabel import and inline channelTrackLabel using existing "Nightly"/"Stable" (release track) keys.
packages/provider-pi/src/server/mcpExtensionSource.ts Keep makeBridge(server, trusted) and bridges; use model-only + prepareLoadout + followsPublicTool for trusted t3-code alias and keep hidden for shared MCP servers; reconcile ALIAS_PREFIX against t3CodeBridge.
packages/shared/src/atomicWrite.ts Keep optional mode parameter while adopting upstream's single write-only handle, chmod, and file/dir sync.
packages/ssh/src/tunnel.ts Keep fork archive names, $T3_PRODUCT_HOME staging, and cleanup traps with upstream pre-download tar check; adopt upstream ControlMaster fallback preserving runner; remove auto-merged REMOTE_ENSURE_T3_HOME_SCRIPT.
scripts/dev-runner.ts Extend upstream isLiveHome guard to .t3 plus fork stable/nightly/preview and legacy homes; propagate or clear all three *_HOME variables together.
docs/operations/release.md Keep fork version (--ours).
docs/user/providers-antigravity.md, docs/user/remote-access.md Adopt upstream updates branded for S2Code / s2code (plus docs/user/providers-codex.md).
apps/mobile/src/i18n/translations/zh.json, apps/web/src/i18n/translations/{de,en,es,fr,ja,ko,pt-BR,ru,sv,zh}.json (11 files) Clean 3-way merge (0 conflicting values), regenerated via i18n:generate and formatted cleanly.

Critical auto-merged seams & follow-ups

  • packages/shared/src/orchestrationV2PendingBackgroundWork.ts & .test.ts: Dropped upstream's 7-line childThreadIds filter while keeping hasPendingBackgroundSubagent, so #473's groupPendingBackgroundTasks retains per-child grouping, +N follow-ups counts, and complete taskId stop tracking.
  • packages/ssh/src/tunnel.test.ts: Added ls, ln, grep to the missing-tar test PATH and adapted the symlink test to verify fork's intentional refusal on ~/.s2code-v2 without touching ~/.t3.
  • apps/server/src/cli/environment.test.ts: Wrote PRODUCT_HOME_MARKER ("s2code\n") for the pre-seeded temp home so fork ensureProductHome accepts it.
  • apps/server/src/orchestration-v2/UsageLimitFailover.integration.test.ts (dbd31f5724): Provided ModelManifest.layerTest for upstream's ModelManifest dependency.
  • apps/server/src/provider/providerCompatibility.ts, packages/provider-opencode/src/server/adapter.test.ts, apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts (f281424277): Set default provider-compatibility baseline to >=0.1.11 when package.json stays on fork "0.1.7", and added compatibility / getById / workspaceScanDirectory / refreshWorkspaceSnapshot to OpenCode test mocks.
  • Round 1 review follow-up (348486461a):
    • apps/server/src/mcp/OrchestratorMcpService.ts & .test.ts: Updated the requestedDriver candidate pre-filter to accept models matched by advertisedModel(provider, requestedModel) or antigravitySuffixedModel(provider, requestedModel), with test coverage for { driverKind: "antigravity", model: "gemini-4-neon-high" }.
    • apps/server/src/mcp/toolkits/project/handlers.ts & .test.ts: Hoisted cwd in t3_thread_launch, passed cwd and replaying into poolLaunchSelection, applied withWorkspaceModels(providers, cwd), and refreshed enabled pool instances' workspace snapshots on model_unavailable before retrying poolStartSelection, with cached and refresh-on-miss tests.

Agent context (UTF-8 bytes)

Surface Fork main Merged Change
Claude system append 6,245 6,245 0
Codex additional context 7,639 7,639 0
MCP tool list JSON 59,143 59,143 0

Verified with apps/server/src/provider/AgentContextBudget.test.ts (2/2 passed; 0-byte delta across all surfaces).

MCP authorization

  • t3_background_wait (apps/server/src/mcp/toolkits/orchestrator/handlers.ts): remains behind McpToolAccess.readsAsCaller and McpInvocationContext.requireThreadScope(scope, "t3_background_wait"), operating only on caller.thread.threadId.
  • /logout (apps/server/src/auth/RpcAuthorization.ts & RpcAuthorization.test.ts): requiredScopesForRpcCall appends AuthProvidersManageScope whenever sendsProviderSignOutPrompt matches; agent/scheduled-task sign-outs remain refused.
  • Peer-link session renewal (apps/server/src/auth/SessionStore.ts): requires signed plk: 1 claim, verifies the DB session row is active and unrevoked, preserves DB-backed scopes (row.value.scopes), proof key thumbprint (claims.jkt), and runtimeModeCeiling (claims.rtc), and extends expiry atomically only for live sessions; renew similarly enforces signed rnw: 1, proof key binding, and active DB row expiry.

Verification

All local checks ran under nice -n 19 with capped concurrency:

  • nice -n 19 vp i && nice -n 19 vp i --frozen-lockfile: passed.
  • i18n:generate (web, mobile, desktop), vp run i18n:check, node scripts/i18n-untranslated.ts: passed (0 untranslated keys, 0 brand-new keys).
  • vp fmt --check, vp lint --report-unused-disable-directives, vp run knip:check: passed (0 errors).
  • Focused high-risk Vitest suite (--maxWorkers=4, 16 files / 775 tests including AgentContextBudget.test.ts) + BackgroundWorkDetails.browser.test.tsx (--maxWorkers=2, 2/2): passed.
  • node scripts/check-changed.ts 9f0b154ddfbc66de7f65911f484d84d1f090f5e5 --concurrency 2: passed unused patches, format, lint, knip 1/2 & 2/2, GraphQL (3 packages), 43/43 package typecheck, node --test (29/29), React Compiler (154 files / 159 passed), and 324/328 Vitest files; the 4 remaining files were fixed in f281424277 and re-verified green (332/332 tests).
  • Round 1 review fixes (348486461a): focused Vitest suite (OrchestratorMcpService.test.ts, apps/server/src/mcp/toolkits/project/handlers.test.ts, AgentContextBudget.test.ts — 129/129 passed) and node scripts/check-changed.ts f281424277 --concurrency 2 (format, lint, knip 1/2 & 2/2, GraphQL, 3-package typecheck, 5 test files / 142 tests — all passed).
  • git diff origin/main HEAD -- .github/workflows: empty.
  • Full validation is CI Full (ci-full.yml), dispatched on the exact PR head 348486461ac49aa135f7579d7c023b65c96cb413.

Limits and follow-ups

  • SSH installer intentionally omits upstream's host-t3 shortcut and $HOME/.t3 symlink creation, keeping fork ownership/symlink guards and archive validation.
  • AUR packaging stays x86_64.
  • No EAS dispatch, no manual release / release.yml, no live/paid provider turns, and no #426 or #460 work.

Rat-stack pages followed: repo/AGENTS.md, skills/ship, lore/testing-ladder, and lore/scopes-own-resources.

Implementation and validation: Gemini 4 Neon via Cursor harness.

Anton-M-R and others added 30 commits November 19, 2026 05:21
…ingdotgg#39105)

Co-authored-by: Anton M. <347046595+Anton-M-R@users.noreply.github.com>
…right to left (pingdotgg#39109)

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

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…in thread's digest (pingdotgg#39132)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rojects both list (pingdotgg#39142)

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

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ssages, tasks and transfers (pingdotgg#39103)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ent cleared (pingdotgg#39151)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…te names (pingdotgg#39147)

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

Co-authored-by: Tibor Casteleijn <tibbor.casteleijn@easytrip.eu>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… saves (pingdotgg#39154)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ion model (pingdotgg#39157)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…the same PR (pingdotgg#39171)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 28 commits November 19, 2026 19:40
…g#39493)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…erseded ones (pingdotgg#39502)

Co-authored-by: Cursor <cursoragent@cursor.com>
…6499)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ents that failed (pingdotgg#39536)

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

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

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…Code test mocks

Co-authored-by: Cursor <cursoragent@cursor.com>
…models for pooled launches

Co-authored-by: Cursor <cursoragent@cursor.com>
@shuv1337
shuv1337 merged commit 3984177 into main Nov 21, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.