Repository navigation
chore(sync): merge 194 upstream commits through v0.1.11 (2026-11-19) - #474
Merged
Merged
Conversation
…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>
…event subscriptions (pingdotgg#39134)
… 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>
…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>
…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>
… and recover on reinstall (pingdotgg#39363)
…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>
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Catch S2Code up to pinned upstream
pingdotgg/t3codev0.1.11 without changing fork install identity, runtime defaults, or release workflows. This imports 194 commits since470ca63499; it includes no later0.1.12-nightlycommits.9f0b154ddfbc66de7f65911f484d84d1f090f5e5v0.1.11):de0466fd80541b71a8b8d9b42ffe38e455f33640354a11d5c13242f05e01f3071b22486f315d0bc4. Its exact parents are9f0b154ddfbc66de7f65911f484d84d1f090f5e5andde0466fd80541b71a8b8d9b42ffe38e455f33640, in that order.348486461ac49aa135f7579d7c023b65c96cb413Integration
Retains fork version
"0.1.7"in all 4 workspace manifests and"private": trueinapps/server/package.json(while taking upstream's"dev": "node scripts/dev.ts"script), fork#473(#468) per-child background work grouping inderivePendingBackgroundWork, fork SSH ownership/symlink refusal guards (no$HOME/.t3mutation and no host-t3shortcut), fork@cursor/sdk@1.3.1retry guard alongside upstream106a1e03b7model-cache invalidation, fork shared MCP servers across Codex/Pi/OpenCode, forkModelManifestcompatibility baseline (>=0.1.11inproviderCompatibility.tsso Antigravity 1.5+ rules evaluate accurately while manifests stay on0.1.7), and fork S2Code branding in conflicted docs and triage playbook. No.github/workflows/*.ymlfiles changed (git diff origin/main HEAD -- .github/workflowsis empty).Mobile native fingerprint note: upstream changes touch Android Kotlin sources in
apps/mobile/modules/t3-review-diff(ReviewDiffCanvasDrawing.kt,T3ReviewDiffView.kt,ReviewDiffGeometryTest.kt) andpatches/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)
apps/marketing/src/i18n/{de,es,fr,ja,ko,pt-BR,ru,zh}.ts(8 files)git rm).apps/desktop/package.json,apps/web/package.json,packages/contracts/package.json(3 files)"version": "0.1.7".apps/server/package.json"version": "0.1.7"and"private": true; adopt upstream"dev": "node scripts/dev.ts".patches/@cursor__sdk@1.3.1.patch305.js,s2code-retry.cjs,agent.d.ts,s2codeRetryGuard) and apply upstream106a1e03b7listModelsForLocalValidationupdates indist/{bundled,cjs,esm}/index.js.pnpm-lock.yamlreact-native-webrtc: 155.0.1and@napi-rs/keyring: ^1.3.0; take upstreamreact-native-svgpatch hash; recompute combined@cursor/sdk@1.3.1patch hash viavp iand verify withvp i --frozen-lockfile.apps/server/src/mcp/OrchestratorMcpService.tsinheritedSelection/requestedModelwith upstreamantigravityTarget; preserve fork pool placement inside upstream'sEffect.uninterruptibleMaskandwithResolvedInstance; passcwd: project.workspaceRootto cross-projectresolveTargetRechecking; match aliased/suffixed models inrequestedDriverpre-filter.apps/server/src/mcp/OrchestratorMcpService.test.tsProjectServicemock (workspaceRoot: "/other"), addresolveThreadStartInstance/workspaceScanDirectory/refreshWorkspaceSnapshotto affected test mocks, and test Antigravity thinking-suffixed resolution bydriverKind.apps/server/src/mcp/toolkits/project/handlers.tsProviderDriverKindandServerProviderimports; applywithWorkspaceModelsand on-demandrefreshWorkspaceSnapshotonmodel_unavailableinpoolLaunchSelection.apps/server/src/orchestration-v2/ProviderTurnStartService.tsmanualResume.apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.tssessionScoperuntime opening, then assertruntime.backgroundTasksEndWithProcess.apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.tssharedMcpServersmatrix with upstream06eda8e36econfig/readtranscript and stdioT3CODE_THREAD_IDassertion.apps/server/src/peer/RemoteDelegation.test.tsfinishLocalChildand cross-project tests, followed by upstream'scaptureThreadReadshelper.apps/server/src/auth/RpcAuthorization.test.tsclientRpcRequiredScopesand upstream'sCommandId/MessageId/ORCHESTRATION_V2_WS_METHODS/RunIdimports.apps/server/src/cloud/relayResponse.tsRelayAuthInvalidErrorcopy withforkCliCommand; drop duplicateRelayEnvironmentLinkProofExpiredErrorfallthrough now handled below.apps/server/src/process/agentScope.tsMemoryHigh=infinityno-swap note in 4 lines..github/triage/PLAYBOOK.md,apps/server/src/triage/triagePrompt.tscreateIssue+ prefilled URL instructions branded forshuv1337/s2code, keeping both files byte-identical after unescaping.apps/web/src/components/desktopUpdate.logic.tsPRODUCT_RELEASE_REPOSITORYanddesktopUpdateChannelOf; drop deletedchannelSwitchLabelimport and inlinechannelTrackLabelusing existing"Nightly"/"Stable"(release track) keys.packages/provider-pi/src/server/mcpExtensionSource.tsmakeBridge(server, trusted)andbridges; usemodel-only+prepareLoadout+followsPublicToolfor trustedt3-codealias and keephiddenfor shared MCP servers; reconcileALIAS_PREFIXagainstt3CodeBridge.packages/shared/src/atomicWrite.tsmodeparameter while adopting upstream's single write-only handle,chmod, and file/dirsync.packages/ssh/src/tunnel.ts$T3_PRODUCT_HOMEstaging, and cleanup traps with upstream pre-downloadtarcheck; adopt upstreamControlMasterfallback preservingrunner; remove auto-mergedREMOTE_ENSURE_T3_HOME_SCRIPT.scripts/dev-runner.tsisLiveHomeguard to.t3plus fork stable/nightly/preview and legacy homes; propagate or clear all three*_HOMEvariables together.docs/operations/release.md--ours).docs/user/providers-antigravity.md,docs/user/remote-access.mdS2Code/s2code(plusdocs/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)i18n:generateand formatted cleanly.Critical auto-merged seams & follow-ups
packages/shared/src/orchestrationV2PendingBackgroundWork.ts&.test.ts: Dropped upstream's 7-linechildThreadIdsfilter while keepinghasPendingBackgroundSubagent, so#473'sgroupPendingBackgroundTasksretains per-child grouping,+N follow-upscounts, and completetaskIdstop tracking.packages/ssh/src/tunnel.test.ts: Addedls,ln,grepto the missing-tartest PATH and adapted the symlink test to verify fork's intentional refusal on~/.s2code-v2without touching~/.t3.apps/server/src/cli/environment.test.ts: WrotePRODUCT_HOME_MARKER("s2code\n") for the pre-seeded temp home so forkensureProductHomeaccepts it.apps/server/src/orchestration-v2/UsageLimitFailover.integration.test.ts(dbd31f5724): ProvidedModelManifest.layerTestfor upstream'sModelManifestdependency.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.11whenpackage.jsonstays on fork"0.1.7", and addedcompatibility/getById/workspaceScanDirectory/refreshWorkspaceSnapshotto OpenCode test mocks.348486461a):apps/server/src/mcp/OrchestratorMcpService.ts&.test.ts: Updated therequestedDrivercandidate pre-filter to accept models matched byadvertisedModel(provider, requestedModel)orantigravitySuffixedModel(provider, requestedModel), with test coverage for{ driverKind: "antigravity", model: "gemini-4-neon-high" }.apps/server/src/mcp/toolkits/project/handlers.ts&.test.ts: Hoistedcwdint3_thread_launch, passedcwdandreplayingintopoolLaunchSelection, appliedwithWorkspaceModels(providers, cwd), and refreshed enabled pool instances' workspace snapshots onmodel_unavailablebefore retryingpoolStartSelection, with cached and refresh-on-miss tests.Agent context (UTF-8 bytes)
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 behindMcpToolAccess.readsAsCallerandMcpInvocationContext.requireThreadScope(scope, "t3_background_wait"), operating only oncaller.thread.threadId./logout(apps/server/src/auth/RpcAuthorization.ts&RpcAuthorization.test.ts):requiredScopesForRpcCallappendsAuthProvidersManageScopewheneversendsProviderSignOutPromptmatches; agent/scheduled-task sign-outs remain refused.apps/server/src/auth/SessionStore.ts): requires signedplk: 1claim, verifies the DB session row is active and unrevoked, preserves DB-backed scopes (row.value.scopes), proof key thumbprint (claims.jkt), andruntimeModeCeiling(claims.rtc), and extends expiry atomically only for live sessions;renewsimilarly enforces signedrnw: 1, proof key binding, and active DB row expiry.Verification
All local checks ran under
nice -n 19with 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).--maxWorkers=4, 16 files / 775 tests includingAgentContextBudget.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 inf281424277and re-verified green (332/332 tests).348486461a): focused Vitest suite (OrchestratorMcpService.test.ts,apps/server/src/mcp/toolkits/project/handlers.test.ts,AgentContextBudget.test.ts— 129/129 passed) andnode 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.CI Full(ci-full.yml), dispatched on the exact PR head348486461ac49aa135f7579d7c023b65c96cb413.Limits and follow-ups
t3shortcut and$HOME/.t3symlink creation, keeping fork ownership/symlink guards and archive validation.release.yml, no live/paid provider turns, and no#426or#460work.Rat-stack pages followed:
repo/AGENTS.md,skills/ship,lore/testing-ladder, andlore/scopes-own-resources.Implementation and validation: Gemini 4 Neon via Cursor harness.