Skip to content

merge upstream/main into fork - #590

Merged
adampeterhiggins merged 98 commits into
mainfrom
t3code/sync-upstream-2026-11-19-2355
Nov 20, 2026
Merged

adampeterhiggins merged 98 commits into
mainfrom
t3code/sync-upstream-2026-11-19-2355

Conversation

@adampeterhiggins

@adampeterhiggins adampeterhiggins commented Nov 20, 2026 •

Copy link
Copy Markdown
Owner

What's in this sync

97 upstream commits (3aa007b0e8..38bac7091a), all from Nov 19–20, 2026.

New features

Fixes

Performance

Discord announcements were not used: #general in "Adam Higgins's server" has no #t3-code-announcements crossposts since Oct 20, so nothing covers this range.

All 97 upstream commits

Sync details

  • Base: origin/main at 3aa007b0e8 (no open sync PR, so this targets main).
  • Upstream: pingdotgg/t3code main pinned at 38bac7091a.
  • Before this sync the fork was 97 commits behind and 690 ahead of upstream (merge base 2ab3b7f59c).
  • Upstream split no files in this range. No conflicted file lost a large block to an upstream refactor.

Conflict resolutions (30 files)

Locales (apps/web/src/i18n/translations/*.json, 10 files): upstream and the fork both dropped the "Show {n} more" key. Kept the fork's "Show less" and added upstream's new zh "Could not import {name}" string. Then reran gt generate for web and mobile, and i18n:check passes.

Server

Web

  • Sidebar.tsx, SidebarThreadRow.tsx, threadActionMenu.logic.ts, Sidebar.drag.browser.test.tsx: search-result context menu, as described above. The fork's readThreadShell lookup stays, and it already covers collapsed shelves. Upstream's canRename: !fromSearch and handleSearchResultContextMenu are added to the fork's richer menu state. The fork's preview hover and keyboard menu on search rows stay.
  • CommandPalette.tsx: upstream's port-forward submenu is chained ahead of the fork's attention-inbox and run-scheduled-task submenus.
  • ChatMarkdown.tsx: union of rehypeResolvePictureSources (fork) and chatMarkdownImageSource (upstream), with a duplicate import removed. ThreadDetailsPrRows.tsx and citationProcedure.ts use upstream's imports where the fork had already moved the rest.
  • packages/client-runtime/package.json: union of the fork's ./theme-sync and upstream's ./diff-file-order exports.

Mobile. Upstream pingdotgg#38911 replaced updateMobilePreferencesAtom with the saveMobilePreferences command.

  • Conflicted: SettingsFollowUpRouteScreen.tsx, which keeps the fork's steer-while-awaiting-subagents switch; AppearancePreferencesProvider.tsx, which keeps the fork's environment theme copies; and use-thread-list-v2-shelf-preferences.ts, which keeps the fork's removal of the snoozed/settled shelf toggles.
  • Merged cleanly but still called the removed API, now ported: themeSync.ts, the Legacy (Plan Mode) section in ThreadSettingsSections.tsx, and the notification event preference in SettingsNotificationsRouteScreen.tsx.
  • use-thread-composer-state.ts: upstream's new onSendCommand sits next to the fork's onUpdateInteractionMode. Goal commands send the thread's own interaction mode, because the fork keeps per-thread modes on mobile.
  • ThreadFeed.tsx, scheduledTaskDraft.test.ts: union of imports.

Verification

  • vp i; gt generate (web, mobile); i18n:check: pass
  • Typecheck of @t3tools/contracts, @t3tools/client-runtime, t3, @t3tools/web, @t3tools/mobile: pass
  • Server tests (12 files, 968 tests): DelegatedCompletionDelivery, SubagentProjection, Orchestrator.control-reads, ThreadLaunchService, ClaudeAdapterV2, project/handlers, toolkits/core, OrchestratorMcpService.activity, GitWorkflowService, ProviderTurnStartService, ProviderTurnControlService, ProjectionStore: pass
  • contracts/orchestrationV2.test, mobile scheduledTaskDraft and preferences, web threadActionMenu.logic: pass
  • Browser tests Sidebar.drag and SidebarThreadRow: pass
  • vp check --fix on the resolved files and the pre-commit hook (fmt, lint, knip): pass
  • vp run check:changed after the merge commit: format, graphql, unused patches, lint, knip, typecheck (42 packages), node tests and the React compiler check all pass. vp test (208 files): 6012 tests pass and 4 files fail:
    • CommandPalette.browser.test.tsx failed to load its module during the full run and passes on its own (7/7). This is a load flake.
    • Already failing on origin/main (3aa007b0e8), in a clean checkout, with identical failures. The merge did not cause them, and a stacked follow-up should fix them:
      • ChatMarkdown.browser.test.tsx: double-click word and triple-click line selection in inline code (2 tests)
      • ChatView.browser.test.tsx: "a shortcut conditioned on rightPanelOpen sees the thread's open right panel"
      • Sidebar.browser.test.tsx: "keeps the viewport in place when showing more settled threads"
  • Fork CI runs on Blacksmith runners the fork does not have, so its checks stay queued. Local verification is the gate.

Runtime verification (web and desktop)

Run against this worktree's isolated .t3, never the live install. The live DB is over 500 MiB, so dev seeding skipped it; I added a project and four threads with the free Replay (dev) provider.

Web (vp run dev, T3 Browser panel)

  • The app pairs and loads. The sidebar shows the seeded threads with the PR merge upstream/main into fork #590 badge, and the usage footer renders.
  • Replay threads render: headings, lists, a code block with its toolbar, a table, and images (the merged ChatMarkdown image handling).
  • A new turn sent from the composer streams end to end: thinking, a task list, tool calls and the final markdown. This exercises the merged ProviderTurnStartService path (sender note around the fork's projected text). The worktree stayed clean.
  • The sidebar search-result right-click opens the merged menu. The fork's items are all there (Hide, Move to group/project, Link, Auto-settle, Copy/Export), Rename is disabled per upstream fix(web): right-clicking a sidebar search result now opens its thread actions pingdotgg/t3code#31545, and Pin from the menu applies.
  • Command palette: Change theme, Needs attention (fork), and Settings → Scheduled tasks all open.
  • Upstream's new Preview tunnel setting renders under Settings → Sharing & access.
  • Thread details show the PR merge upstream/main into fork #590 row and the change counts.
  • Every Settings page renders without an error state, and the dev server log shows no errors.

Desktop (vp run dev:desktop, test-t3-desktop hook)

  • The main window loads cleanly, with no ERR_INSUFFICIENT_RESOURCES cold-start failure. Threads open and render, and the pin set from the web client shows here too.
  • The quick-message setting saves to client-settings.json. Its Alt+/ global shortcut opens the panel (project, model, checkout and access chips render), and a second press hides it.
  • The sidebar search-result right-click builds the native Electron menu with the same items as web, with Rename disabled and Unpin reflecting state. I read the menu by intercepting Menu.popup, so no modal menu appeared on screen.
  • The desktop log shows no renderer crashes or uncaught errors. Test settings were restored, and every process and port was stopped and checked.

Not covered at runtime

  • Upstream's desktop port forwarding: the palette entry only appears with another linked environment, and this isolated state has none.
  • Sending from the quick-message panel: the default is a paid model, and Replay isn't available in desktop dev.
  • Mobile: no simulator round in this pass. The mobile preference ports are covered by typecheck and the mobile unit tests only.

Notes

  • An earlier "Daily upstream sync PR" thread (Daily upstream sync PR) had been queued since 19:15 without starting, and it has no worktree or branch. There was nothing to finish, and this sync covers its upstream range. It could not be settled while it has queued messages.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.


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

🤖 Generated with Claude Code

sti0 and others added 30 commits November 19, 2026 11:24
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#25519)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… actions (pingdotgg#31545)

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

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

Co-authored-by: T3 Code <t3code@outpost.asia-east1-c.c.lucid-meridian-447091-ea9.internal>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

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

Co-authored-by: 尤嘉兴 <youjiaxing@dianchu.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#35307)

Signed-off-by: bettercallcaleb <121191527+bettercallcaleb@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ojection read span (pingdotgg#39284)

Co-authored-by: mInrOz <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39294)

Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…der reuses its session (pingdotgg#27517)

Co-authored-by: TinBane <363069+TinBane@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…shared session (pingdotgg#32396)

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

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ot Found (pingdotgg#38210)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…dotgg#38870)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ir own outcome (pingdotgg#38911)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…upting a caller stops them (pingdotgg#38912)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…fect (pingdotgg#38913)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
pingdotgg#39214)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Bil0000 and others added 28 commits November 19, 2026 14:47
…background wait between turns (pingdotgg#38638)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pload fails (pingdotgg#38395)

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

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

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

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ect loop for good (pingdotgg#39420)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts:
#	apps/mobile/src/features/settings/SettingsFollowUpRouteScreen.tsx
#	apps/mobile/src/features/settings/appearance/AppearancePreferencesProvider.tsx
#	apps/mobile/src/features/settings/scheduledTaskDraft.test.ts
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/server/src/mcp/toolkits/project/handlers.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnControlService.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.ts
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/Sidebar.drag.browser.test.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/chat/ThreadDetailsPrRows.tsx
#	apps/web/src/components/chat/citationProcedure.ts
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/components/threadActionMenu.logic.ts
#	apps/web/src/i18n/translations/de.json
#	apps/web/src/i18n/translations/en.json
#	apps/web/src/i18n/translations/es.json
#	apps/web/src/i18n/translations/fr.json
#	apps/web/src/i18n/translations/ja.json
#	apps/web/src/i18n/translations/ko.json
#	apps/web/src/i18n/translations/pt-BR.json
#	apps/web/src/i18n/translations/ru.json
#	apps/web/src/i18n/translations/sv.json
#	apps/web/src/i18n/translations/zh.json
#	packages/client-runtime/package.json
#	packages/contracts/src/orchestrationV2.test.ts
@adampeterhiggins
adampeterhiggins merged commit 82525e0 into main Nov 20, 2026
@adampeterhiggins
adampeterhiggins deleted the t3code/sync-upstream-2026-11-19-2355 branch November 20, 2026 01:13
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.