Repository navigation
merge upstream/main into fork (through 2ab3b7f59c), translate fork UI - #588
Merged
adampeterhiggins merged 370 commits intoNov 19, 2026
Merged
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#38517) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e a refresh while loading (pingdotgg#38508)
… MCP credentials (pingdotgg#26652) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ject file (pingdotgg#38510) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e hold is already met (pingdotgg#38545)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s in generated folder and branch names (pingdotgg#38540) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h screens (pingdotgg#38546) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ess (pingdotgg#38553) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry (pingdotgg#38493) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…els (pingdotgg#38556) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#38565) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#38491) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ist (pingdotgg#36035) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… of resolving every package fresh (pingdotgg#38592)
… to the T3 MCP server (pingdotgg#36439)
…rowser (pingdotgg#36037) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ding (pingdotgg#37406) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nd in Background work (pingdotgg#37787)
…pingdotgg#38598) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…es (pingdotgg#39207) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…login command printed (pingdotgg#39238)
…uage (pingdotgg#39224) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…arkers (pingdotgg#39217) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lapse all (pingdotgg#39213) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39235) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…uage (pingdotgg#39225) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#39253) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nal closed (pingdotgg#39260) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ithout model controls (pingdotgg#23586)
… wording fixes in six more locales (pingdotgg#38947)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ActivePort write (pingdotgg#38727) Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts: # apps/desktop/src/app/DesktopApp.test.ts # apps/desktop/src/ipc/methods/clientSettings.ts # apps/mobile/src/components/ComposerContextSheet.tsx # apps/mobile/src/features/home/HomeRouteScreen.tsx # apps/mobile/src/features/home/HomeScreen.tsx # apps/mobile/src/features/home/ThreadListFilters.tsx # apps/mobile/src/features/home/home-list-filter-menu.ts # apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx # apps/mobile/src/features/pull-requests/pullRequestList.ts # apps/mobile/src/features/pull-requests/usePullRequestList.ts # apps/mobile/src/features/settings/SettingsEnvironmentDetailRouteScreen.tsx # apps/mobile/src/features/settings/SettingsNotificationsRouteScreen.tsx # apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx # apps/mobile/src/features/settings/ThreadSettingsSections.tsx # apps/mobile/src/features/settings/appearance/sections/TextAppearanceSection.tsx # apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx # apps/mobile/src/features/settings/scheduledTaskPresentation.ts # apps/mobile/src/features/settings/settings-search.ts # apps/mobile/src/features/threads/ComposerAttachmentButton.tsx # apps/mobile/src/features/threads/ComposerCommandPopover.tsx # apps/mobile/src/features/threads/LinkedPullRequestList.tsx # apps/mobile/src/features/threads/NewTaskDraftScreen.tsx # apps/mobile/src/features/threads/ProviderSubagentBar.tsx # apps/mobile/src/features/threads/ThreadAgentsSheet.tsx # apps/mobile/src/features/threads/ThreadComposer.tsx # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx # apps/mobile/src/features/threads/thread-handoff-row.tsx # apps/mobile/src/features/threads/thread-list-v2-items.tsx # apps/mobile/src/features/threads/thread-search-match.tsx # apps/mobile/src/features/threads/thread-work-log.tsx # apps/mobile/src/features/threads/threadAgentsPresentation.ts # apps/mobile/src/features/threads/threadListV2.ts # apps/mobile/src/features/threads/use-composer-command-menu.ts # apps/mobile/src/features/usage/UsageLimitsPooled.tsx # apps/mobile/src/features/usage/UsageRouteScreen.tsx # apps/mobile/src/lib/composerContext.test.ts # apps/mobile/src/lib/threadActivity.ts # apps/mobile/src/native/EnrichedMarkdownText.tsx # apps/server/src/auth/RpcAuthorization.test.ts # apps/server/src/cli/auth.ts # apps/server/src/mcp/McpHttpServer.test.ts # apps/server/src/mcp/McpHttpServer.ts # apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts # apps/server/src/mcp/toolkits/core.test.ts # apps/server/src/mcp/toolkits/project/handlers.test.ts # apps/server/src/mcp/toolkits/project/handlers.ts # apps/server/src/mcp/toolkits/pullRequests/tools.ts # apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/Orchestrator.ts # apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.ts # apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.ts # apps/server/src/orchestration-v2/PullRequestWatchReactor.ts # apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts # apps/server/src/orchestration-v2/pullRequestWatch.test.ts # apps/server/src/provider/agentContextBudget.json # apps/server/src/scheduledTasks/ScheduledTaskService.test.ts # apps/web/src/components/ChatMarkdown.browser.test.tsx # apps/web/src/components/ChatMarkdown.tsx # apps/web/src/components/ChatView.logic.ts # apps/web/src/components/ChatView.tsx # apps/web/src/components/CommandPalette.tsx # apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx # apps/web/src/components/ComposerPromptEditorTiptap.tsx # apps/web/src/components/ProjectScriptsControl.tsx # apps/web/src/components/RightPanelTabs.tsx # apps/web/src/components/ServerUpdateAction.tsx # apps/web/src/components/Sidebar.tsx # apps/web/src/components/ThreadContextChip.tsx # apps/web/src/components/ThreadNotificationCoordinator.tsx # apps/web/src/components/ThreadStatusIndicators.tsx # apps/web/src/components/ThreadTerminalDrawer.tsx # apps/web/src/components/chat/AssistantCitationChip.tsx # apps/web/src/components/chat/AssistantCitationCommentEditor.tsx # apps/web/src/components/chat/AssistantSelectionToolbar.tsx # apps/web/src/components/chat/ChatComposer.tsx # apps/web/src/components/chat/ChatHeader.tsx # apps/web/src/components/chat/CompactComposerControlsMenu.tsx # apps/web/src/components/chat/ComposerAttachmentStrip.tsx # apps/web/src/components/chat/ComposerBannerStack.tsx # apps/web/src/components/chat/ComposerCommandMenu.tsx # apps/web/src/components/chat/ComposerStashMenu.tsx # apps/web/src/components/chat/DraftHeroHeadline.tsx # apps/web/src/components/chat/MarkdownFileLink.tsx # apps/web/src/components/chat/MarkdownThreadLink.tsx # apps/web/src/components/chat/MessagesTimeline.browser.test.tsx # apps/web/src/components/chat/MessagesTimeline.logic.ts # apps/web/src/components/chat/MessagesTimeline.tsx # apps/web/src/components/chat/ModelPickerContent.tsx # apps/web/src/components/chat/ModelPickerSidebar.tsx # apps/web/src/components/chat/OpenInPicker.tsx # apps/web/src/components/chat/ProposedPlanCard.tsx # apps/web/src/components/chat/ProviderSubagentBar.tsx # apps/web/src/components/chat/QueuedRunsControl.tsx # apps/web/src/components/chat/RightPanelSurfaceContent.tsx # apps/web/src/components/chat/SkillInlineText.tsx # apps/web/src/components/chat/SubagentTooltipContent.tsx # apps/web/src/components/chat/TerminalContextInlineChip.tsx # apps/web/src/components/chat/ThreadActivityBanners.tsx # apps/web/src/components/chat/ThreadDetailsPrRow.tsx # apps/web/src/components/chat/ThreadDetailsUsage.tsx # apps/web/src/components/chat/ThreadLineageWorkflowRow.tsx # apps/web/src/components/chat/ThreadRelationshipsControl.tsx # apps/web/src/components/chat/TimelineRowParts.tsx # apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts # apps/web/src/components/chat/TimelineWorkEntryRow.tsx # apps/web/src/components/chat/TimelineWorkGroupRows.logic.ts # apps/web/src/components/chat/TimelineWorkGroupRows.tsx # apps/web/src/components/chat/TraitsPicker.tsx # apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx # apps/web/src/components/chat/UserMessageContextChips.tsx # apps/web/src/components/chat/V2ItemInspector.tsx # apps/web/src/components/chat/V2LifecycleRow.tsx # apps/web/src/components/chat/WorkflowOpeningBlock.tsx # apps/web/src/components/chat/citationProcedure.ts # apps/web/src/components/chat/compaction.logic.ts # apps/web/src/components/chat/timelineMinimapItems.ts # apps/web/src/components/chat/turnDetailAnnouncement.ts # apps/web/src/components/chat/useChatTerminalActions.ts # apps/web/src/components/chat/useComposerContextImport.ts # apps/web/src/components/chat/useComposerMenuItems.ts # apps/web/src/components/chat/useComposerSelection.ts # apps/web/src/components/chat/useComposerSend.ts # apps/web/src/components/chat/useComposerStash.ts # apps/web/src/components/chat/useQueuedRunEdit.ts # apps/web/src/components/chat/useRightPanelActions.ts # apps/web/src/components/chat/useThreadLifecycle.tsx # apps/web/src/components/chat/useTimelineRewind.ts # apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx # apps/web/src/components/composerContextPresentation.tsx # apps/web/src/components/contextChipParts.tsx # apps/web/src/components/desktopUpdate.logic.ts # apps/web/src/components/diffs/DiffCommentAnnotation.tsx # apps/web/src/components/files/FilePreviewPanel.tsx # apps/web/src/components/files/ProjectFilePicker.tsx # apps/web/src/components/projectScriptEditor.tsx # apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx # apps/web/src/components/pullRequest/PullRequestCodeTab.tsx # apps/web/src/components/pullRequest/PullRequestDetailCrumbs.tsx # apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx # apps/web/src/components/pullRequest/PullRequestGhosts.tsx # apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx # apps/web/src/components/pullRequest/PullRequestListFilters.tsx # apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx # apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx # apps/web/src/components/pullRequest/PullRequestsColumn.tsx # apps/web/src/components/pullRequest/PullRequestsPage.tsx # apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx # apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx # apps/web/src/components/pullRequest/guide/GuideExcerpt.tsx # apps/web/src/components/pullRequest/pullRequestDetail.logic.ts # apps/web/src/components/pullRequest/pullRequestLinkContextMenu.ts # apps/web/src/components/pullRequest/pullRequestPresentation.tsx # apps/web/src/components/settings/AddEnvironmentDialog.tsx # apps/web/src/components/settings/AddProviderInstanceDialog.logic.ts # apps/web/src/components/settings/AppearanceSettingsPanel.tsx # apps/web/src/components/settings/AuthorizedClientsSettings.tsx # apps/web/src/components/settings/ConnectionsSettings.tsx # apps/web/src/components/settings/IntegrationsSettings.tsx # apps/web/src/components/settings/KeybindingsSettings.logic.ts # apps/web/src/components/settings/LabsSettingsPanel.tsx # apps/web/src/components/settings/NotificationSettings.tsx # apps/web/src/components/settings/ProjectIconPickerDialog.tsx # apps/web/src/components/settings/ProviderSettingsPanel.tsx # apps/web/src/components/settings/ScheduledTasksSettings.tsx # apps/web/src/components/settings/SettingInheritance.tsx # apps/web/src/components/settings/SettingsPanels.tsx # apps/web/src/components/settings/SnapShotSetupDialog.tsx # apps/web/src/components/settings/StorageSettings.tsx # apps/web/src/components/settings/UsageProviderSettings.tsx # apps/web/src/components/settings/settingsSearch.ts # apps/web/src/components/settings/useSnapShotShortcutRecorder.tsx # apps/web/src/components/sidebar/SidebarChrome.tsx # apps/web/src/components/sidebar/SidebarThreadHeader.tsx # apps/web/src/components/sidebar/SidebarThreadRow.tsx # apps/web/src/components/threadActionMenu.logic.ts # apps/web/src/components/usage/UsageLimits.tsx # apps/web/src/components/usage/UsageLimitsPooled.tsx # apps/web/src/components/usage/UsagePage.tsx # apps/web/src/editorPreferences.ts # apps/web/src/fileContextMenu.ts # apps/web/src/lib/composerContextRecords.ts # apps/web/src/lib/openPullRequestLink.ts # apps/web/src/session-logic.ts # apps/web/src/terminal/ghostty/surface.ts # apps/web/src/themePalette.ts # docs/user/providers-claude.md # docs/user/source-control.md # packages/client-runtime/src/composerThreadItems.ts # packages/client-runtime/src/state/contextWindow.ts # packages/client-runtime/src/t3ToolSummary.ts # packages/contracts/src/orchestrationV2.ts # packages/provider-acp/src/server/adapter.ts # packages/shared/src/paletteSearch.ts # pnpm-lock.yaml
# Conflicts: # apps/web/src/components/pullRequest/PullRequestListFilters.tsx
Wraps the remaining fork copy that check:changed lints, wires upstream's review-comment and preview-annotation label helpers into the fork's chips, moves an upstream ACP registry test to the fork's start() options, and regenerates and formats the web and mobile catalogs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Fork tests stub upstream's new ProjectService.getById and Cursor token exchange, the triage fixture resolves macOS's symlinked tmpdir, the PR filter loading test moves to the browser project with GT, and fork card rows show upstream's issue badge. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/web/src/components/contextPreviews.tsx
Every fork-only string in web, mobile and client-runtime now goes through gt-react (<T>, gt(), msg()), so t3code/no-untranslated-copy is clean across the tree; callers pass resolvers to the client-runtime and table helpers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Fills the de, es, fr, ja, ko, pt-BR, ru, sv and zh catalogs for the fork's strings, which carried English placeholders. Brand and product names, units and language-neutral strings stay English. Every message parses as ICU. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…work touched Gives fork effects their sync reasons, moves mobile picker sheets to LegendList, converts two jsdom tests to browser tests, fixes a React Compiler crash in WorktreeInventory, restores the card row's sidebar keyboard data attributes, and updates fork tests for upstream's menu source argument and Linked items label. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Base automatically changed from
t3code/sync-upstream-2026-11-17-0930
to
main
November 19, 2026 22:33
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
361 upstream commits (
25da86c29b..2ab3b7f59c, Nov 17–20), on top of the parent sync PR.New features
Fixes (about 300)
/clear;Performance and internal
refactor(cli): state-changing CLI commands go through a running server (refactor(cli): commands that change state go through a running server pingdotgg/t3code#38991).Discord announcements were not used: the announcements channel (#general in Adam Higgins's server) has no crossposts since Oct 20, so none match this Nov 17–20 range.
All 361 upstream commits
t3 auth session revokecloses the revoked client's open connections (fix(cli):t3 auth session revokecloses the revoked client's open connections pingdotgg/t3code#38974)Stacking
t3code/sync-upstream-2026-11-17-0930, upstream through25da86c29b). This PR only adds the newer upstream commits25da86c29b..2ab3b7f59c, so its diff against the parent branch is just this sync.main.490c25b0b8(parent head). This PR's commits:da2f84204d: upstream merge, pinned2ab3b7f59c, branched from the parent'sb1c144af19.a2c98c3cb1and1426397763: merge the parent's later fix commits.d4a77bcd47and0f8e8ef041: post-merge fixes.7ed0194ab9,39feb3ed96and the docs commit: fork translations.Conflict resolution
There were 198 conflicted files and no upstream file splits. Nearly all of them came from upstream's i18n change (pingdotgg#37893), which wrapped every UI string in
gt-react. Rule throughout: take upstream's structure and i18n wrapping, re-apply the fork's behaviour, and wrap the fork's copy the same way.pausedPullRequestWatchwraps upstream's newuntil,pausedandchecksPendingwatch fields.commitOfferis used in the fork's Claude offer flow.followPromptkeeps the fork'spromptResponse.list_issues/read_issuetool presentations took action names the fork used. The fork'slist_thread_links/read_linear_issueare renamed tolist-links/read-linear-issueso they don't show as upstream's tools.watch_pull_request's description was reworded: upstream now releases the thread when checks finish unlessuntil: "merged". The evals were not run.(props, resolve)signatures plus the fork's pages, groups, organisations, PR facets, scheduled-task catch-up, send menu, reference links and degraded-services rows.scheduledTaskPresentation.tsholds upstream's localised schedule helpers.SubagentTooltipContentandTerminalContextInlineChip, which the fork replaced with the context preview registry;compaction.logic.ts, which moved intoContextWindowMeter.logic.ts, with upstream's i18n ported.ModelPickerContentnow takes the sub-provider instance from the fork's driver rail.ThreadRelationshipsControl'srelationshipLabelis restored.SettingResetButtontakesariaLabel;searchableSettingbecomesuseSearchableSettingwhere touched;ClipboardTargetfor copy,ariaLabelreset buttons, the*Copyhelper modules, mobileROUTE_TITLES, and the desktopapplyLanguagetest layer. The server CLI keeps English helpers locally, because the server never imports the*Copymodules.agentContextBudget.jsonwas re-measured.Translations
This PR also translates the fork's own UI, which upstream's i18n change left in English.
7ed0194ab9): all 1,738 fork strings in web, mobile and client-runtime go through<T>,gt()andmsg()perdocs/internals/i18n.md. Label helpers gained optional resolver parameters, and callers passuseMessages().vp run i18n:untranslatednow reports 0.39feb3ed96): the de, es, fr, ja, ko, pt-BR, ru, sv and zh catalogs now have real translations for about 2,500 fork strings each. Terms follow each catalog's existing ones. Brand and product names, units and language-neutral strings stay English.vp run i18n:checkpasses, and every string in all 30 catalogs parses with GT's ICU parser (172,530 strings, 0 errors).Verification
t3(server).vp run i18n:checkpasses.vp run check:changed, before the translation commits: format, lint, knip, graphql, typecheck (42 packages) and the React Compiler check pass.0f8e8ef041and the parent's730eda04ce:ProjectService.getByIdand the Cursor token exchange;main(664192772d) are not from this merge:ChatMarkdown.browser, the inline-code selection tests (2);ChatView.browser, therightPanelOpenshortcut test (1);ComposerPromptEditorTiptap.input.browser, the bold-markers test (1);ThreadRelationshipsControl.agents.browser(18).check:changedon the translated tree was still running when this PR was opened. Its result will be added as a comment.require-disposable-render,no-unreasoned-state-sync,no-restricted-importsand so on) are in fork files onmaintoday. They are not from this merge, andcheck:changeddoesn't lint those untouched files. Touched files are clean.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). Harness: Claude Code in T3 Code, with parallel subagents for conflict resolution.🤖 Generated with Claude Code