Skip to content

chore(sync): merge 279 upstream commits through 2026-11-17 - #458

Merged
shuv1337 merged 283 commits into
mainfrom
t3/upstream-sync-3d7b74a7
Nov 17, 2026
Merged

shuv1337 merged 283 commits into
mainfrom
t3/upstream-sync-3d7b74a7

Conversation

@shuv1337

@shuv1337 shuv1337 commented Nov 17, 2026 •

Copy link
Copy Markdown
Owner

Problem

Catch S2Code up to the pinned upstream source without changing the fork's release identity or behavior. The pin includes 279 commits since the last shared point, ad1b1365999c92c3fc7a054e7f3af84623f74fee. No later upstream commits are included.

  • Fork base: 43be4365d0fd0c42d2e3042706dc5ab17797cc75
  • Upstream pin (2026-11-17 12:28 PST): 3d7b74a7ea3949185650eaf145852c2064c87a56
  • Merge commit: 273fc7674a737f0e3bf15b1c8e7c40f2eff5683b; its only parents, in order, are the base and the pin. No rebase, squash, or cherry-pick.
  • PR head: 4473ffd230de54ebec01d6737a0cedff0aa468df
  • 990 files changed, 114824 insertions(+), 8489 deletions(-).

Integration

Keep fork orchestration/delegation, named seats and pools, spent-instance continuation, shared MCP and parent-thread session scope, per-thread autoSettle, Cursor integration, Ocean-dark and no-star defaults, branding and channel homes, formatter hoisting, and recovery destinations. The Windows signing/release workflows and helpers from #447–#452 are unchanged. The fork migration ledger and its migrations 1–7 are unchanged; the migration entry point now avoids write locks when neither track needs an upgrade.

The follow-up adds missing fork settings translations to all web/mobile locale catalogs (sidebar density, voice calls, shared MCP), keeping upstream's new catalog check green.

The second follow-up isolates Git fixtures from the host URL rewrite and adapts the upstream VoiceProvider and SSH launcher fixtures. Fork main advanced to 83f315aece019ce8f49b32bcbe94f9f279bbb7f8 during validation; Git reports a clean merge with that tip. The pinned merge commit still has exactly the requested parents.

Conflicted files (46)

File Resolution
.github/workflows/ci.yml Keep the required lightweight GitHub-hosted fork check; CI Full remains separate.
.github/workflows/mobile-eas-preview-fork.yml Keep the fork deletion; no preview delivery workflow.
.github/workflows/mobile-eas-preview.yml Keep the fork deletion; no preview delivery workflow.
.github/workflows/mobile-eas-production.yml Keep dispatch-only fork EAS delivery, preflight and fork store identities; no automatic upstream publishing or Blacksmith runners.
.github/workflows/mobile-fingerprint-check.yml Keep the opt-in label and GitHub runner, and adopt upstream's handling of PR edits.
apps/desktop/package.json Keep the fork source version and package identity.
apps/desktop/src/app/DesktopStartupRecovery.test.ts Test both fork release/reinstall destinations and installation of the actually downloaded version.
apps/desktop/src/main.ts Use the relocated SSH runner resolver; keep fork environment setup.
apps/mobile/src/features/layout/workspace/ListSearchToolbar.android.tsx Use the shared PR/issues search toolbar with S2Code branding and the environment picker.
apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.tsx Adopt shared-slot titles; keep S2Code in the regular accessible title.
apps/mobile/src/features/settings/components/SourceControlSignInSection.tsx Export the row used by upstream's new details screens, preserving fork sign-in branding.
apps/mobile/src/features/settings/settings-search.test.ts Align settings search expectations with the new source-control and issues group.
apps/mobile/src/features/threads/ThreadComposer.tsx Retain the fork voice controls beside upstream composer changes.
apps/server/package.json Keep the fork version, private status and S2Code bin aliases; add upstream dependencies.
apps/server/src/auth/PairingGrantStore.ts Use the reserved subject to suppress MCP-approval grants from pairing links; retain Watch grant handling.
apps/server/src/cli/install.test.ts Keep the S2Code fixture name and make the PATH collision fixture executable.
apps/server/src/cli/install.ts Combine executable PATH lookup with fork command/channel identity.
apps/server/src/cli/thread.test.ts Exercise model-option parsing and pool failover, including the warning without a named model.
apps/server/src/cli/thread.ts Carry upstream --option parameters through the fork's --allow-pool-failover launch path.
apps/server/src/cli/uninstall.test.ts Keep fork uninstall coverage and upstream failed detached-spawn coverage.
apps/server/src/cli/uninstall.ts Wait for detached cleanup spawn; keep fork shim ownership, home safeguards and messages.
apps/server/src/cloud/selfUpdate.ts Keep the fork channel guard alongside upstream update checks.
apps/server/src/http.ts Keep both the fork signature dependency and upstream request context/observability.
apps/server/src/mcp/OrchestratorMcpService.ts Keep the public quota projection and expose the shared error mapper for upstream consumers.
apps/server/src/mcp/toolkits/project/handlers.ts Keep pool-backed launches and bring in upstream project-file handling.
apps/server/src/orchestration-v2/Orchestrator.ts Keep spent-instance queue restrictions and upstream buffered wake handling; adopt run counts.
apps/server/src/orchestration-v2/ProjectionStore.ts Use run counts for upstream queries and the fork's first-run decision.
apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts Update the mock to match the run-count API.
apps/server/src/persistence/Migrations.ts Append upstream 097–098 after 096; gate no-op V2 preview reconciliation, retaining fork and Watch reconciliation and the independent fork ledger 1–7.
apps/server/src/project/ProjectSetupScriptRunner.test.ts Keep the linked/unknown-origin guard and the upstream shell-preference test.
apps/server/src/provider/agentContextBudget.json Commit the measured values after trimming. See the remaining CI budget increase below.
apps/server/src/server.ts Compose upstream root request spans and the fork projection-store layer.
apps/server/src/serverSettings.ts Run upstream Simlock token cleanup through the fork's serialized settings writer without losing shared MCP token protections.
apps/server/src/usage/UsageService.test.ts Retain fork Cursor file/Keychain tests and upstream cache retention and shared-refresh coverage.
apps/web/package.json Keep the fork source version and merge upstream dependencies.
apps/web/src/components/chat/ChatComposer.tsx Keep fork voice controls and adopt upstream snapshot copying.
apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx Keep the spent-pool continuation case and the upstream deduplication/shortcut case.
docs/user/providers-antigravity.md Describe upstream fresh-session edits using S2Code branding.
docs/user/remote-access.md Document refused-route recovery using S2Code branding.
docs/user/source-control.md Update the settings path and retain S2Code branding.
packages/contracts/package.json Keep the fork source version.
packages/contracts/src/rpc.ts Register upstream issue RPCs alongside the fork Watch pairing RPC.
packages/provider-acp/src/server/adapter.ts Track upstream load-in-progress state but use fork session-scoped MCP/terminal context.
patches/expo-widgets@58.0.27.patch Keep upstream types/widget fixes and the fork's Xcode group Info.plist fix.
pnpm-lock.yaml Keep both dependency changes and the combined widget-patch digest.
scripts/install.sh Retain the fork-owned rollback/publication path and prevent a concurrent installer leaving a nested runtime.

Verification

  • vp i passed; vp run i18n:check passed for web and mobile.
  • Final check:changed against 43be4365d0 passed every gate with the machine cap (nice 19, concurrency 2, up to four Vitest workers): 43-package typecheck, 415 test files / 10,239 passed / six existing skips, seven Node tests, and 298 React Compiler checks across 293 changed source files.
  • Focused CLI and installer tests (including concurrent publication), migration/Watch and receipt tests, startup recovery, ACP, projection/orchestrator, mobile workspace and settings, and Chromium palette/model-picker tests passed. The first capped run exposed five fixture failures; all 197 tests across the four affected files passed after the fixes, then the complete changed-file gate passed on this exact head.
  • bash -n scripts/install.sh passed. actionlint found only the pre-existing SC2016 report for the JavaScript inside the fork's mobile release workflow; the workflows passed with that report filtered. CI Full will be dispatched on this head; no release workflow was dispatched.

Limits

The measured MCP tool list grew from 51,812 to 54,221 bytes before trimming. After the initial trim and round-one restoration of shared tool guidance, it is 53,967 bytes (+2,155 against fork main; +203 against the previous PR head). Claude and Codex stayed at 5,930 and 7,324 bytes. The equality test passes. The maintainer-approved agent-context-increase label remains in place. Paid prompt evals were not run.

No live-provider turns, native mobile device or installed-app verification, signed Windows packaging, local release, service restart, or tests against live user state. Full builds and repo-wide suites were left to CI. No screenshots were taken; the client evidence is focused Vitest (including Chromium), not a full desktop/mobile walkthrough.

Rat-stack pages applied: repo/AGENTS.md, skills/rat-stack-mode, skills/ship, skills/investigate-a-failure, skills/add-a-store, and lore/testing-ladder (preserve source-of-truth ledgers, verify the exact head, fix fixture failures at their source, use the narrowest test first).

Implementation and validation: GPT-6.2 Sol via OpenCode (S2Code/T3 Code).

Review fixes

  • Restored the dev SSH runner version used to select the channel home. The mirror mismatch was introduced by the sync; Desktop now discovers and uses S2CODE_RELEASE_BASE_URL and its SHUV2CODE_ alias, with the canonical key taking precedence.
  • Added the Linear GraphQL generation and i18n catalog checks to CI Full. Restored the model-facing delegation and launch guidance and the mobile MCP settings-search case. McpOAuth was left unchanged.
  • 69 focused tests passed. The Linear, i18n, and workflow syntax checks passed. Capped check:changed passed every gate (43 packages typechecked; 10,244 tests passed, six skipped; 298 React Compiler checks passed).

juliusmarminge and others added 30 commits November 16, 2026 01:08
…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>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… keep uploading (pingdotgg#37681)

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>
Co-authored-by: Marker-bit <Marker-bit@users.noreply.github.com>
…gdotgg#37703)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: screen <screen@users.noreply.git.cafe>
Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ead (pingdotgg#37735)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
StiensWout and others added 24 commits November 17, 2026 09:26
…gdotgg#38235)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…swers (pingdotgg#38237)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#38238)

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38250)

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n recovery (pingdotgg#38241)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#38313)

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

socket-security Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatednpm/​@​legendapp/​list@​3.7.2 ⏵ 3.7.3100 +1100100 +195 -1100

View full report

@shuv1337 shuv1337 added the agent-context-increase Approves growth in agent context budget label Nov 17, 2026
@shuv1337
shuv1337 merged commit 6f7cfd5 into main Nov 17, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Approves growth in agent context budget

Projects

None yet

Development

Successfully merging this pull request may close these issues.