Skip to content

chore: sync with upstream (2026-11-15) - #98

Merged
riccardovandra merged 1904 commits into
mainfrom
sync/upstream-2026-11-15
Nov 15, 2026
Merged

riccardovandra merged 1904 commits into
mainfrom
sync/upstream-2026-11-15

Conversation

@riccardovandra

@riccardovandra riccardovandra commented Nov 15, 2026 •

Copy link
Copy Markdown
Owner

What's new from upstream

1,902 upstream commits since the last sync (merge base pingdotgg#33113, 2026-11-09): 50 features, about 1,690 fixes, 83 performance changes. Below are the features in full and the fixes and other changes that matter most when using the app. The full list is git log origin/main..upstream/main.

New features

Bug fixes

Server and orchestration

Providers

Web and desktop

Mobile

SSH, CLI, source control, usage

Other notable changes

Merge details

Branch: sync/upstream-2026-11-15 from origin/main (no open sync PR existed). One merge commit of upstream/main at 2d80ca0852.

Conflicts and resolutions (46 files)

Kept both sides everywhere unless noted.

  • Fork features alongside new upstream entries (union of both): ClaudeAdapterV2.ts allowed-tools list (fork docs tools + send_to_user), t3McpToolPresentation.ts and t3ToolSummary.ts (fork skills/docs/AI PM/MCP-server tools + upstream theme and send_to_user), McpHttpServer.ts imports and toolkit list (fork toolkits + theme/message), settingsSearch.ts (fork Skills entry + upstream Scheduled tasks entry), DesktopUpdates.ts imports, contracts/environment.ts (serverReleaseMirror + serverUpdateStaging), contracts/settings.ts, ProviderSessionManager.ts (fork tools + upstream enableDeviceSupport gating and hasPendingWake), mcpSession.ts (fork tools/upstream-server types + MCP_TOOL_EXPOSURE_HEADER and hasPendingWake).
  • Upstream i18n (gt-react) around fork settings pages: settingsSearch.ts labels, SettingsBreadcrumb.tsx and mobile SettingsRouteScreen.tsx take upstream's msg()/gt() and add the fork's Tools / MCP servers entries in the same form. The fork's skill/server breadcrumb link now renders m(sectionLabel).
  • McpHttpServer.ts final layer: upstream's layerMcpTransport(Layer.mergeAll(layerTools, layerToolSearch)) plus the fork's Docs, AI PM, MCP servers, skill trash and skill library toolkits and layerUpstreamRoute.
  • CodexAdapterV2.ts: kept the fork's user MCP server entries and upstream's CODEX_DIRECT_ONLY_T3_TOOLS; moved upstream's threadSource: "subagent" for delegated children into the fork's threadRuntimeParams → thread/start flow.
  • provider-acp adapter: acpMcpContext now takes runtimePolicy (fork), deferMcpTools (upstream) and resolveCommand (fork).
  • OpenCode v1 and v2 adapters: kept fork disabledSkills, upstreamMcp/userMcp state and Docs Cloud prompt flag; adopted upstream's reconnect recovery (goal refresh, shell recovery, owned-process retry) with the fork's MCP state resets.
  • Pi adapter: took upstream's session-header cwd check and re-added the fork's sandboxPolicy to the new launch call.
  • Migrations.ts: releaseForkMigrationIds() runs before upstream's pending-migration log; upstream's per-migration transaction loop, then ensureForkSchema() as before.
  • ws.ts: dropped the fork's copy of shell-resume constants (upstream moved them to ShellStream.ts); kept the fork RPC layer chain and added upstream's AcpRegistrySessions.layer.
  • orchestrationInstructions.ts: took upstream's rewording and kept the fork's thread-link fallback, secretRef / .env /secret guidance, and the Docs and AI PM sections at the end.
  • Web timeline and session logic (session-logic.ts, MessagesTimeline.logic.ts, MessagesTimeline.tsx, mobile threadActivity.ts): fork doc / docs-cloud entries alongside upstream sent-message and viewed-images. Mobile now uses upstream's feedEntryFoldRunId, extended for docs-cloud.
  • useScopedSettings.ts: upstream's new writer signature and pending-write settling, with the fork's current-settings argument to requiredScopesForServerSettingsPatch.
  • Taken as upstream: vite.config.ts (upstream ships the real @betteroffice/fonts-cjk and deleted the fork's alias target), ChatComposer.tsx imports, docs/user/voice-input.md (plus the fork's Read aloud section).
  • Tests: fork and upstream tests kept side by side in CodexAdapterV2.test.ts, ClaudeAdapterV2.test.ts (the fork's artifact-watch test re-inserted where the two-way diff had misaligned it), ProviderSessionManager.test.ts, Orchestrator.control-reads.test.ts, RpcAuthorization.test.ts, project/handlers.test.ts, ChatMarkdown.browser.test.tsx, commandPermissions.test.ts, cursor/adapter.test.ts.
  • pnpm-lock.yaml: took upstream's, then vp i re-added the fork's dependencies (@modelcontextprotocol/sdk 1.29.0, skills 1.7.1, zod pinned 4.6.5).

Follow-up fixes after the merge (no conflict markers, needed to build)

  • ws.ts: removed the fork's own Layer.provide(AgentSessionScanner.layer). Upstream (fix(server): repeated session imports reach transcripts behind the scan budget pingdotgg/t3code#27215) now builds the scanner in runtimeLayer.ts with ProviderSessionRuntime, and the fork's copy leaked that requirement into every CLI entry point.

  • Web: MessageReadAloudButton.tsx and SkillDetail.tsx moved off the removed MorphIcon / vanilla lucide to lucide-react icons, matching refactor(web): remove icon morphing pingdotgg/t3code#33985.

  • MacSelfInstall.ts (fork): Effect.tryPromise calls use the { try, catch } form required by a new Effect diagnostic.

  • scripts/fork-brand.ts: the web stage label moved from branding.ts to branding.logic.ts, and vite.config.ts now stamps the <title> at build time. The Latest-stage edit now targets branding.logic.ts, apps/web/vite.config.ts joined the branded files, and the old index.html title edit is gone. fork-brand.test.ts follows.

  • Tests updated for new upstream contracts: renameSession / subagentModel on a fork Claude fake session, fork RPCs omitted from two new ws.test.ts servers, the Cursor cursorMcpServers and ACP acpMcpContext call sites, the fork OpenCode 2 MCP test advancing the clock past upstream's new 250 ms MCP tool settle, and two desktop self-install tests now expecting upstream's closeSshTunnels step before install.

  • agentContextBudget.json set to the measured values (Claude append 7,644 B, Codex context 9,034 B, MCP tool list 52,785 B); the fork's instructions and tools keep it above upstream's.

  • Fork lint fixes that the pre-commit hook required: an issue number dropped from a SkillDetail comment, ring-inset on the breadcrumb link's focus ring, two unused imports.

  • settingsSearch.ts: Settings → Tools and MCP servers added back to the sidebar's Agents group. They had been missing since the 2026-10-27 sync, when upstream's grouped settings nav (refactor(web): settings group by concern, with General split into focused pages pingdotgg/t3code#25651) started listing pages explicitly.

Needs a decision

None blocking. One judgment call to flag: upstream now closes SSH tunnels before every install, and the fork's unsigned macOS self-install path picks that up too, including when a self-install is refused. That looks right, but say if self-install should skip it.

Verification

  • node scripts/fork-brand.ts --check: passes (216 files).
  • vp run typecheck: passes in apps/server, apps/web, apps/mobile, apps/desktop, packages/contracts, packages/shared, packages/client-runtime, packages/provider-core, provider-acp, provider-cursor, provider-opencode, provider-pi.
  • vp test run on fork test files and tests beside conflicted files: client-runtime 149, contracts 60, provider-acp 3, provider-core 9, provider-cursor 30, provider-muse 50, provider-opencode 114, provider-pi 191, shared 183, desktop 57, mobile 69, scripts 80, web (non-browser) 542 — all pass. Server: 1,922 of 1,931 pass. The remaining failures were compared against clean checkouts:
    • Fail on pristine upstream/main too: ServerEnvironment.test.ts "publishes proven install ownership" (known macOS failure), ProjectionStore.test.ts "reads a fixed SQL turn-item window", and Orchestrator.control-reads.test.ts "starts and finishes a delegated task without reading the parent's history" (statement.stat is missing from this machine's Node node:sqlite).
    • Fail on fork origin/main before this merge: 6 tests in OpenCode2OrchestratorV2.integration.test.ts (replay frame mismatch). Not caused by this sync, but worth a separate look.
  • Not run: the 10 web browser test files in scope (ChatMarkdown, ChatView, CommandPalette, RightPanelTabs, Sidebar, MarkdownCodeBlock, MarkdownExternalLink, MessagesTimeline, ProjectSettingsPanel, mainAppLocation). Upstream bumped Playwright and the matching Chromium build isn't installed on this machine; they typecheck. No dev-server smoke test was run.
  • Lint: no new errors in touched files beyond what the fork's main already has (fork code still has about 60 errors under newer upstream rules such as no-unreasoned-state-sync and no-manual-memo, plus one new no-sparkles-icon hit in SkillAgents.tsx). Left for a separate cleanup.

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

🤖 Generated with Claude Code

only21mil and others added 30 commits November 14, 2026 14:42
…dotgg#23134)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t switches back (pingdotgg#30107)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#24140)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (6.3 s → 0.21 s median) (pingdotgg#30059)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…21838)

Co-authored-by: Ved Pandey <vedprakash2302@gmail.com>
…parent was delegated from (pingdotgg#30334)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…→ 20 ms median) (pingdotgg#30305)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ce (pingdotgg#30394)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ion (pingdotgg#30565)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ed tasks (pingdotgg#30428)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…breaks media in PR descriptions (pingdotgg#30571)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#30631)

Co-authored-by: Trevor Edwards <9443483+trevoedwards@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…r lists as a second "No project" (pingdotgg#30597)

Co-authored-by: DanielJBurbridge <36094258+DanielJBurbridge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#30539)

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

Co-authored-by: Tin Zeljar <35663757+Zheruel@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…will wake the thread (pingdotgg#30646)

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

Co-authored-by: Trevor Edwards <9443483+trevoedwards@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…relaunching (pingdotgg#30667)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
bentbrain and others added 29 commits November 15, 2026 05:17
Co-authored-by: bentbrain <28818884+bentbrain@users.noreply.github.com>
…tgg#30753)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#29749)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… reply (pingdotgg#30084)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32376)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…on every host (pingdotgg#32774)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…failed when one did (pingdotgg#32407)

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s cancelled (pingdotgg#32414)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ing node_modules (2,500 s → 5.0 s) (pingdotgg#32023)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…y never show (pingdotgg#32351)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#32364)

Co-authored-by: azhar <azhar.amir@amartha.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…33069)

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

Co-authored-by: Zuri <zurih@rtx.internal>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d player item (pingdotgg#32196)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#32619)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad read instead of hiding its threads (pingdotgg#32620)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's grouped settings nav (pingdotgg#25651) only shows pages listed in
SETTINGS_NAV_GROUPS, so both fork pages had dropped out of the sidebar.

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