Repository navigation
chore(sync): merge 279 upstream commits through 2026-11-17 - #458
Merged
Merged
Conversation
…tle limits (pingdotgg#37565) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…failing every send (pingdotgg#37610)
pingdotgg#37605) Co-authored-by: Orin <orin@orin.ws> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not the repository (pingdotgg#37638)
…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>
…otgg#37661) Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… keep uploading (pingdotgg#37681) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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>
…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>
…ngdotgg#38262) Co-authored-by: Cursor <cursoragent@cursor.com>
…g#38313) Co-authored-by: Julius Marminge <julius0216@outlook.com>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
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 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.43be4365d0fd0c42d2e3042706dc5ab17797cc753d7b74a7ea3949185650eaf145852c2064c87a56273fc7674a737f0e3bf15b1c8e7c40f2eff5683b; its only parents, in order, are the base and the pin. No rebase, squash, or cherry-pick.4473ffd230de54ebec01d6737a0cedff0aa468dfIntegration
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
83f315aece019ce8f49b32bcbe94f9f279bbb7f8during validation; Git reports a clean merge with that tip. The pinned merge commit still has exactly the requested parents.Conflicted files (46)
.github/workflows/ci.yml.github/workflows/mobile-eas-preview-fork.yml.github/workflows/mobile-eas-preview.yml.github/workflows/mobile-eas-production.yml.github/workflows/mobile-fingerprint-check.ymlapps/desktop/package.jsonapps/desktop/src/app/DesktopStartupRecovery.test.tsapps/desktop/src/main.tsapps/mobile/src/features/layout/workspace/ListSearchToolbar.android.tsxapps/mobile/src/features/layout/workspace/WorkspaceRootScreen.tsxapps/mobile/src/features/settings/components/SourceControlSignInSection.tsxapps/mobile/src/features/settings/settings-search.test.tsapps/mobile/src/features/threads/ThreadComposer.tsxapps/server/package.jsonapps/server/src/auth/PairingGrantStore.tsapps/server/src/cli/install.test.tsapps/server/src/cli/install.tsapps/server/src/cli/thread.test.tsapps/server/src/cli/thread.ts--optionparameters through the fork's--allow-pool-failoverlaunch path.apps/server/src/cli/uninstall.test.tsapps/server/src/cli/uninstall.tsapps/server/src/cloud/selfUpdate.tsapps/server/src/http.tsapps/server/src/mcp/OrchestratorMcpService.tsapps/server/src/mcp/toolkits/project/handlers.tsapps/server/src/orchestration-v2/Orchestrator.tsapps/server/src/orchestration-v2/ProjectionStore.tsapps/server/src/orchestration-v2/ProviderTurnControlService.test.tsapps/server/src/persistence/Migrations.tsapps/server/src/project/ProjectSetupScriptRunner.test.tsapps/server/src/provider/agentContextBudget.jsonapps/server/src/server.tsapps/server/src/serverSettings.tsapps/server/src/usage/UsageService.test.tsapps/web/package.jsonapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/chat/ProviderModelPicker.browser.test.tsxdocs/user/providers-antigravity.mddocs/user/remote-access.mddocs/user/source-control.mdpackages/contracts/package.jsonpackages/contracts/src/rpc.tspackages/provider-acp/src/server/adapter.tspatches/expo-widgets@58.0.27.patchInfo.plistfix.pnpm-lock.yamlscripts/install.shVerification
vp ipassed;vp run i18n:checkpassed for web and mobile.check:changedagainst43be4365d0passed 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.bash -n scripts/install.shpassed.actionlintfound 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-increaselabel 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, andlore/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
S2CODE_RELEASE_BASE_URLand itsSHUV2CODE_alias, with the canonical key taking precedence.check:changedpassed every gate (43 packages typechecked; 10,244 tests passed, six skipped; 298 React Compiler checks passed).