Repository navigation
merge upstream/main into fork - #590
Merged
Merged
Conversation
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>
…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>
…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>
…ingdotgg#29196) 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>
…background wait between turns (pingdotgg#38638) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39192) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#39340) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39306) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pload fails (pingdotgg#38395) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… whole turn history (pingdotgg#39325)
…rs (pingdotgg#33568) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39393) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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
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.
What's in this sync
97 upstream commits (
3aa007b0e8..38bac7091a), all from Nov 19–20, 2026.New features
Fixes
t3_background_waitworks for its own commands, limits read the 1.5.x CLI's stored sign-in, sign-in names a runtime crash, the thread's cwd stays in the workspace, temporary sessions clean up, and compaction is allowed when the runtime advertises it (fix(server): accept Antigravity model IDs with thinking levels when delegating pingdotgg/t3code#39413, fix(server): worktree handoff no longer leaves Antigravity threads Waiting pingdotgg/t3code#39422, fix(server): Antigravity Google sign-in shows its link with the native CLI pingdotgg/t3code#38953, fix(server): host sleep no longer times out an Antigravity turn pingdotgg/t3code#39395, fix(server): Antigravity accepts t3_background_wait for its own background commands pingdotgg/t3code#39421, fix(server): Antigravity limits read the 1.5.x CLI's stored sign-in pingdotgg/t3code#38957, fix(server): Antigravity sign-in names a runtime crash instead of blaming Google pingdotgg/t3code#28355, fix(server): keep Antigravity thread cwd in workspace by omitting attachmentsDir from additionalDirectories pingdotgg/t3code#37997, fix(server): Antigravity 1.5 temporary setup and text-helper sessions clean up their files pingdotgg/t3code#39275, fix(antigravity): allow compaction when the runtime advertises it pingdotgg/t3code#37020).T3CODE_THREAD_ID, the thread name follows T3 renames, apps and plugins stay off during text generation, MCP apps resume an idle thread in its own workspace, and goal turns after a restart are paused (fix(server): Codex stdio MCP servers receive T3CODE_THREAD_ID pingdotgg/t3code#39414, fix(server): Codex thread name follows T3 thread renames pingdotgg/t3code#37442, fix(server): keep Codex apps and plugins off during text generation pingdotgg/t3code#39086, fix(server): MCP apps resume an idle Codex thread in its own workspace pingdotgg/t3code#38468, fix(server): Codex goal turns after a server restart are paused instead of running unseen pingdotgg/t3code#25935).--plugin-dirlaunch argument loads its plugin, and Full access rejects Claude Code's reworded dangerous-removal check (fix(claude): every repeated --plugin-dir launch argument loads its plugin pingdotgg/t3code#38634, fix(server): Full access rejects Claude Code's reworded dangerous-removal check pingdotgg/t3code#38581)./compactkeep their order, agent activity publishing retries after a network drop, threads stay Working when Claude or OpenCode marks a background wait between turns, agents on hosts without swap are OOM-killed instead of throttled for hours, and a delivered handoff of a failed run is not re-sent (fix(client-runtime): an unexpected failure no longer stops the reconnect loop for good pingdotgg/t3code#39420, fix(server): agent messages queued behind /compact keep send order pingdotgg/t3code#39417, fix(server): agent activity publish keeps retrying after a network drop pingdotgg/t3code#39402, fix(server): threads stay in Working when Claude or OpenCode marks a background wait between turns pingdotgg/t3code#38638, fix(server): agents on hosts without swap are OOM-killed instead of throttled for hours pingdotgg/t3code#39287, fix(server): a delivered handoff of a failed run is not re-sent to later fresh sessions pingdotgg/t3code#39281).:emoji:shortcodes, Git controls are scoped to the active checkout, Ctrl+B reaches a focused terminal, an off-track desktop build no longer says "Up to date", and the update capsule's restart countdown is localized and stays readable when narrow (fix(web): Cmd+W closes the browser tab when the page has focus pingdotgg/t3code#39340, fix(web): PR viewer renders GitHub :emoji: shortcodes pingdotgg/t3code#39315, fix(web): scope Git controls to the active checkout pingdotgg/t3code#39305, fix(web): Ctrl+B reaches a focused terminal again pingdotgg/t3code#34588, fix(web): an off-track desktop build no longer says "Up to date" pingdotgg/t3code#39302).ghcredential lookups no longer leak D-Bus daemons, and/logoutin chat needsproviders:manage(fix(shared): T3 Connect no longer runs cloudflared releases that trust the compromised eMudhra intermediates pingdotgg/t3code#26040, fix(server): gh credential lookups no longer leak D-Bus daemons pingdotgg/t3code#23824, fix(server): /logout in chat needs providers:manage pingdotgg/t3code#39027).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
origin/mainat3aa007b0e8(no open sync PR, so this targetsmain).pingdotgg/t3codemainpinned at38bac7091a.2ab3b7f59c).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 rerangt generatefor web and mobile, andi18n:checkpasses.Server
ProviderTurnStartService.ts,ProviderTurnControlService.ts: upstream wraps the provider prompt inwithMessageSenderNote(fix(server): agents can tell another agent's message from the user's pingdotgg/t3code#39306). The fork projects messages withprojectUserMessageForProvider(citations) and appends a linked-checkout prompt. The merge does both: the sender note wraps the fork's projected text, and the linked-checkout prompt is appended after it.Orchestrator.ts(merged cleanly but broke the fork): upstream perf(server): finalizing a delegated task no longer reads the child's whole turn history pingdotgg/t3code#39325 droppedproviderTurnsfrom delegated child controls. The fork's app-owned subagent usage total (fix(cursor): report token usage while agents are working #251/fix(grok): record native provider token usage #252) sums all of a child's provider turns, so finalization now reads the child'sproviderTurnsexplicitly.ClaudeAdapterV2.test.tskeeps the fork's Bash-cwd test and upstream's--plugin-dirtest.project/handlers.test.tskeeps upstream's new HEAD test and the fork's renamed branch-collision test. Upstream tests that merged cleanly now get the fork's extra services: aConductorWorkspacenoop inGitWorkflowService.test.ts,McpContextLinksincore.test.ts,ThreadLaunchServiceinOrchestratorMcpService.activity.test.ts, anddispatchIntakeCommandinThreadLaunchService.test.ts.packages/contracts/src/orchestrationV2.test.ts: union of imports.Web
Sidebar.tsx,SidebarThreadRow.tsx,threadActionMenu.logic.ts,Sidebar.drag.browser.test.tsx: search-result context menu, as described above. The fork'sreadThreadShelllookup stays, and it already covers collapsed shelves. Upstream'scanRename: !fromSearchandhandleSearchResultContextMenuare 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 ofrehypeResolvePictureSources(fork) andchatMarkdownImageSource(upstream), with a duplicate import removed.ThreadDetailsPrRows.tsxandcitationProcedure.tsuse upstream's imports where the fork had already moved the rest.packages/client-runtime/package.json: union of the fork's./theme-syncand upstream's./diff-file-orderexports.Mobile. Upstream pingdotgg#38911 replaced
updateMobilePreferencesAtomwith thesaveMobilePreferencescommand.SettingsFollowUpRouteScreen.tsx, which keeps the fork's steer-while-awaiting-subagents switch;AppearancePreferencesProvider.tsx, which keeps the fork's environment theme copies; anduse-thread-list-v2-shelf-preferences.ts, which keeps the fork's removal of the snoozed/settled shelf toggles.themeSync.ts, the Legacy (Plan Mode) section inThreadSettingsSections.tsx, and the notification event preference inSettingsNotificationsRouteScreen.tsx.use-thread-composer-state.ts: upstream's newonSendCommandsits next to the fork'sonUpdateInteractionMode. 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@t3tools/contracts,@t3tools/client-runtime,t3,@t3tools/web,@t3tools/mobile: passDelegatedCompletionDelivery,SubagentProjection,Orchestrator.control-reads,ThreadLaunchService,ClaudeAdapterV2,project/handlers,toolkits/core,OrchestratorMcpService.activity,GitWorkflowService,ProviderTurnStartService,ProviderTurnControlService,ProjectionStore: passcontracts/orchestrationV2.test, mobilescheduledTaskDraftandpreferences, webthreadActionMenu.logic: passSidebar.dragandSidebarThreadRow: passvp check --fixon the resolved files and the pre-commit hook (fmt, lint, knip): passvp run check:changedafter 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.tsxfailed to load its module during the full run and passes on its own (7/7). This is a load flake.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"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)ChatMarkdownimage handling).ProviderTurnStartServicepath (sender note around the fork's projected text). The worktree stayed clean.Desktop (
vp run dev:desktop, test-t3-desktop hook)ERR_INSUFFICIENT_RESOURCEScold-start failure. Threads open and render, and the pin set from the web client shows here too.client-settings.json. Its Alt+/ global shortcut opens the panel (project, model, checkout and access chips render), and a second press hides it.Menu.popup, so no modal menu appeared on screen.Not covered at runtime
Notes
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