Skip to content

chore: sync with upstream (2026-11-22) - #102

Merged
riccardovandra merged 1203 commits into
mainfrom
sync/upstream-2026-11-22
Nov 22, 2026
Merged

riccardovandra merged 1203 commits into
mainfrom
sync/upstream-2026-11-22

Conversation

@riccardovandra

Copy link
Copy Markdown
Owner

What's new from upstream

New features

Issue tracking

Projects, git and PR tools for agents

Linked environments and remote previews

Providers

Chat, composer and web

Voice

Desktop

Mobile

CLI and administration

Bug fixes

Security and auth

Orchestration and threads

Claude

Codex

Cursor, OpenCode, Grok, Pi, ACP

Antigravity

Web

Mobile

Desktop, SSH and updates

Server and T3 Connect

Plus 866 smaller fixes not listed individually.

Other notable changes

Merge report

Commits merged

1,202 upstream commits (origin/main 9a7360c → upstream/main 4e28da0, 2026-11-15 to 2026-11-22), as one --no-ff merge commit. Land this PR as a merge commit, not a squash, so the next sync keeps upstream ancestry.

Conflicts and how each was resolved (42 files)

  • Both sides added imports or list entries (kept both): ProviderSessionManager.ts, RightPanelSurfaceContent.tsx, docs/README.md, mcp/toolkits/project/handlers.ts, binMain.ts (fork skills-cli plus upstream __cursor-sdk-worker), contracts/rpc.ts (fork Docs/Skills RPCs plus upstream Issues RPCs), contracts/settings.ts, runtimeLayer.test.ts, ChatMarkdown.browser.test.tsx, RpcAuthorization.test.ts, Orchestrator.control-reads.test.ts, provider-cursor and OpenCode2AdapterV2 tests.
  • Upstream i18n rewrite around fork copy: t3ToolSummary.ts took upstream's translated version, and the fork's 9 tool labels (skills, tools, docs, MCP servers) were rewritten in the new msg() plural style. RightPanelTabs.tsx, MarkdownCodeBlock.tsx (fork "Run and add result to chat" button moved to SharedTooltipTrigger and gt()), SettingsBreadcrumb.tsx, and composerContextRecords.ts (fork reviewCommentKindLabel for Doc/Diagram comments now takes the message resolver; UserMessageContextChips and upstream's new ReviewCommentContextChip use it).
  • Upstream restructures that kept fork behavior:
    • orchestrationInstructions.ts, provider-pi/mcpExtensionSource.ts, provider-opencode/v2/adapter.ts, ClaudeAdapterV2.ts, provider-acp/adapter.ts: took upstream's new provider instructions, runtime policy, PR-linking text and Windows MCP launcher, and kept the fork's Docs Cloud instruction variant and hub/user MCP servers.
    • CodexAdapterV2.ts: kept both config reads. Upstream's per-thread config/read covers stdio env; the fork's covers MCP name-collision.
    • ws.ts: fork RPC layers stay on ServerWsRpcGroupCore, and upstream's Issue, PeerThreadRelay and PeerClientPairing services were added to the fork layer chain.
    • RpcAuthorization.ts and serverSettings.ts: fork's settings-aware scopes are combined with upstream's secret-reference guard and simlock-token handling.
    • ScheduledTaskService.ts and its test: took upstream. It now contains the fork's one-time-task removal plus a runAt guard.
  • Same feature built twice: Sidebar.tsx. Upstream added its own resolveScopedNewThreadProjectRef (in Sidebar.logic.ts), which the sidebar button now uses. The fork's version in sidebarProjectGrouping.ts still serves the chat.new keybinding, which upstream does not scope.
  • Right panel: rightPanelStore.ts keeps selectDocsCloud and the Docs surface migration alongside upstream's openThread and linked-thread tabs. Storage version is bumped to 17 (fork was 15, upstream 16) so both migrations run.
  • Smaller ones: ChatMarkdown.tsx (math moved upstream, fork /secret chip kept), threadActivity.ts on mobile (docs-cloud moved into upstream's staysOutOfFold), index.css (fork doc-editor styles kept), useUpdateEverything.ts (fork release-mirror gating kept, with upstream's resolve argument), the user docs project-settings.md and thread-sidebar.md, and pnpm-lock.yaml (regenerated from upstream's lockfile with vp i; it follows the fork's exact pins, zod 4.6.5 and @modelcontextprotocol/sdk 1.29.0).

Clean merges that needed fixes

  • Upstream made searchableSetting private. Fork settings pages (Tools, Project folders, Usage-limit failover, Scheduled-task webhooks) now use useSearchableSetting(), and SettingResetButton takes ariaLabel.
  • Upstream removed react-markdown. The skill viewer (SkillFiles.tsx) now renders SKILL.md with upstream's own createMarkdownRenderer in inert mode (links, images and HTML stay text), so no dependency was added back.
  • Upstream's new Issues page passes the right-panel props, now including the fork's onAddDocs/docsAvailable. Mobile's MCP servers route title moved into upstream's ROUTE_TITLES. A mobile docs-cloud feed entry needs the new locale field. SkillDetail uses namedClipboardTarget. Upstream's new Claude, OpenCode and ws.test.ts tests got mocks for fork services.
  • Upstream now refuses MCP tools that act as the calling thread unless they are hidden from outside clients. The 9 Docs tools are annotated with hiddenFromOutsideClients.
  • scripts/fork-brand.ts: the sidebar and mobile wordmark edits now match upstream's {"Code"} and WORDMARK_SUFFIX markup.
  • agentContextBudget.json was re-measured. The fork's share is unchanged from last week (+1,374 B Claude, +1,372 B Codex, +3,047 B MCP tool list).
  • The settings sidebar still lists Tools and MCP servers. No new upstream workflow files arrived, so there is nothing to disable.

Needs your decision

  • Upstream's new i18n lint rule. t3code/no-untranslated-copy, together with tightened no-manual-memo, no-unreasoned-state-sync and no-low-value-comments rules, flags about 550 spots in pre-existing fork UI and server code (Docs Cloud, Tools/Skills settings, MCP servers, usage-limit failover). The commit hook lints every staged file, so I committed this merge with --no-verify. Fork files you edit later will hit these errors. Options: translate the fork copy (gt()/<T>) over time, or add the fork's directories to that rule's excludeFiles in vite.config.ts. I'd recommend the exclude for now, then translate fork pages as you touch them.

Verification

  • node scripts/fork-brand.ts --check: applies cleanly to 220 files.
  • vp run typecheck passes in apps/server, apps/web, apps/mobile, packages/contracts, provider-core, provider-acp, provider-opencode, provider-pi, provider-cursor and client-runtime.
  • vp test run covered 97 test files: every test file the fork adds or changes relative to upstream, plus tests beside conflicted files, across 13 packages and root scripts. Everything passes except the following, each compared against a pristine checkout:
    • Fail on pristine upstream/main too, so environmental: ServerEnvironment.test.ts "publishes proven install ownership" (known macOS failure), and three tests using node:sqlite statement.stat (missing on local Node 24.9.0): ProjectionStore.test.ts "fixed SQL turn-item window" and two in Orchestrator.control-reads.test.ts.
    • Fail on origin/main before this merge, so pre-existing fork failures: 6 tests in OpenCode2OrchestratorV2.integration.test.ts. Their replay fixtures don't include the fork's hub-server (t3-mcp-*) permission rules.
    • One timing flake: ChatView.browser.test.tsx "a shortcut conditioned on rightPanelOpen" timed out in the full run and passes alone.
  • vp run knip:check passes.

Model and harness: Claude Opus 5.5 (claude-opus-5-5) in Claude Code, run from T3 Code.

🤖 Generated with Claude Code

Yash-Singh1 and others added 30 commits November 20, 2026 17:13
pingdotgg#39526)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dotgg#37122)

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

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

Co-authored-by: angrojo <angel.rojo24@estudiantes.uva.es>
…otgg#30407)

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

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

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

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>
…39922)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#39653)

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

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>
…lpers (pingdotgg#39668)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Adamulek123 and others added 29 commits November 21, 2026 14:56
…ks (pingdotgg#40592)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… is gone (pingdotgg#40627)

Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634)

Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633)

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

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

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e per turn (pingdotgg#40671)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… drops its prompt (pingdotgg#40670)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared tooltip; remark leaves the web app (pingdotgg#27866)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Gemini 4 Neon <noreply@google.com>
Co-authored-by: Noah Sigel <noah.sigel@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-foreground-muted (pingdotgg#40676)

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

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Brings in 1,202 upstream commits from 2026-11-15 to 2026-11-22. Resolves
42 conflicting files, keeps fork features working with upstream's i18n,
issue-tracker, thread-tab and per-thread MCP changes, updates the fork
brand edits for the new wordmark markup, and re-measures the agent
context budget.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@riccardovandra
riccardovandra merged commit fa0b870 into main Nov 22, 2026
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.