Skip to content

merge upstream/main into fork (through 25da86c29b) - #587

Merged
adampeterhiggins merged 176 commits into
mainfrom
t3code/sync-upstream-2026-11-17-0930
Nov 19, 2026
Merged

adampeterhiggins merged 176 commits into
mainfrom
t3code/sync-upstream-2026-11-17-0930

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

172 upstream commits (398c933e1c..25da86c29b, Nov 16–17).

New features: Issues on web and mobile with GitHub, GitLab, Azure DevOps, Forgejo and Linear, issue links for threads and agent tools, label/assignee filters, sorting, and saved views for issues and pull requests. New terminal shell configuration and optional close confirmation; unassignable default shortcuts; configurable usage retention; sparse worktree patterns; CLI model options; snapshot copying, macOS file-pill dragging, larger theme backgrounds, and a native streaming transcription toggle.

Fixes: More reliable mobile attachment uploads, queued messages, thread scrolling, pairing and iPad navigation. Web fixes preserve theme imports, review drafts, citations and text selection, improve keyboard/focus behavior and accessibility, and correct PR diff loading and viewed-file folding. Remote/auth fixes cover signed assets, MCP retries, pairing links, SSH runtime updates and stalled MCP cancellation.

Provider and internal changes: Claude recovery handles missing sessions, startup timeouts and native forks of running threads; OpenCode stop/goal/background-report handling improves; Pi, Grok, Antigravity and ACP fixes preserve sessions and installation settings. Server reads, git checkpoint scans, PR watches and scheduled-task cleanup improve efficiency and reliability. Includes upstream v0.1.10 release preparation.

Discord announcements were not used: the channel returned only October 20 messages with no crossposts matching this November 16–17 commit range.

Complete upstream commit list (including remaining fixes, refactors and maintenance)

About this PR

This run finished an interrupted run: the Nov 17 daily sync (thread) ran out of usage mid-merge with 18 server files left unstaged. This run checked those resolutions, committed the upstream merge, and then merged current main (664192772d, 4 newer fork commits, no conflicts) into the branch with a catch-up merge.

  • Base: main @ 664192772d. Upstream range: 398c933e1c..25da86c29b (pinned 25da86c29b).
  • Commits: 7d58f3bd71 (upstream merge), b1c144af19 (catch-up merge of main), 490c25b0b8 and 730eda04ce (test, compiler and skill-popover fixes found by check:changed after the merge).
  • A stacked PR adds the newer upstream commits on top of this one; merge this one first.

Conflict resolution

There were no upstream file splits in this range.

  • Desktop: tests use upstream's helper plus fork quick-message/appearance mocks.
  • Contracts: keep fork settings plus upstream retention and sparse-worktree settings.
  • client-runtime: exports and imports unioned.
  • Docs: keep fork guidance plus upstream Issues, shell and sparse-worktree behaviour.
  • Web and mobile: keep fork providers, composer integrations, checkout references, thread tabs, send controls, PR watches and settings, alongside upstream Issues, saved views, the new attachment API and shell settings.
  • Server (18 files): union of both sides. One real clash: upstream added its own "explicit branch already exists" check (fix(server): t3_thread_launch refuses an explicit branch that already exists pingdotgg/t3code#31279) beside the fork's version. They are now one check, with:
    • upstream's exact local-branch match, so a tag named refs/heads/x no longer counts as a branch;
    • upstream's error order;
    • the fork's worktreePath on the error.
  • Tests fixed after the merge:
    • Fork setup-script tests now expect upstream's T3CODE_TERMINAL_SHELL: "".
    • Upstream's rollback and one-time scheduled-task tests now mock fork-only ThreadManagementService methods (getRunCount, dispatch).
    • The fork's PullRequestFiltersMenu default props move into the body so the React Compiler no longer bails out.

Verification

  • Package typechecks pass: contracts, client-runtime, desktop, web, mobile, t3 (server).
  • Focused tests pass:
    • server conflicted files: 341 tests;
    • desktop, contracts and shared composer tests;
    • mobile: 106 tests;
    • web: 190 tests;
    • catch-up files: AgentContextBudget, agentFleet, ChatWidthResizeHandles.
  • vp run check:changed: format, lint, knip, graphql and typecheck (42 packages) pass. The test step failed and was fixed in 490c25b0b8 (server tests, React Compiler, tunnel.test.ts format). The rerun results:
    • PullRequestDetailPanel.browser: 41/41 pass on rerun. Its earlier failures were timeouts while other work loaded the machine.
    • ChatMarkdown.browser's skill-details test was a real regression: upstream's fix for fix(web): View instructions closes the skill details popover pingdotgg/t3code#37900 landed in a component the fork replaces. It is ported to the fork's SkillPreview in 730eda04ce.
    • Final check:changed: everything passes except 4 browser tests, which also fail on main (664192772d) and are not from this merge:
      • ChatMarkdown.browser, the two inline-code selection tests;
      • ChatView.browser, the rightPanelOpen shortcut test;
      • ComposerPromptEditorTiptap.input.browser, the bold-markers test.
  • Discord announcements were not used: the channel returned only October 20 messages, with no crossposts matching this Nov 16–17 range.

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

Model: gpt-6.1-sol (Codex in T3 Code) for the original run; finished by Claude Opus 5.5 (Claude Code in T3 Code).

🤖 Generated with Claude Code

RadekManak and others added 30 commits November 16, 2026 02:43
…tle limits (pingdotgg#37565)

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

Co-authored-by: Orin <orin@orin.ws>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…oaded" (pingdotgg#37651)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he id (pingdotgg#37493)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… keep uploading (pingdotgg#37681)

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>
Co-authored-by: Marker-bit <Marker-bit@users.noreply.github.com>
…gdotgg#37703)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: screen <screen@users.noreply.git.cafe>
Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ead (pingdotgg#37735)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 27 commits November 16, 2026 22:43
… remove each project (pingdotgg#35986)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
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>
…with an opaque border (pingdotgg#35577)

Co-authored-by: Claude Mythos 5.2 <noreply@anthropic.com>
…gg#36624)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…has no matches (pingdotgg#37971)

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#38021)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dy (pingdotgg#38025)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts:
#	.gitattributes
#	apps/desktop/src/app/DesktopApp.test.ts
#	apps/desktop/src/ipc/methods/window.test.ts
#	apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
#	apps/mobile/src/features/threads/ThreadComposer.tsx
#	apps/mobile/src/features/threads/ThreadDetailScreen.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/ThreadQueueControl.tsx
#	apps/mobile/src/features/threads/ThreadRouteScreen.tsx
#	apps/mobile/src/features/usage/usageProviders.ts
#	apps/mobile/src/lib/markdownDocument.ts
#	apps/mobile/src/lib/threadActivity.ts
#	apps/mobile/src/persistence/mobile-preferences.ts
#	apps/server/src/auth/RpcAuthorization.test.ts
#	apps/server/src/cli/thread.ts
#	apps/server/src/mcp/McpHttpServer.ts
#	apps/server/src/mcp/toolkits/project/handlers.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	apps/server/src/orchestration-v2/ProjectionStore.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/orchestration-v2/SubagentProjection.test.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/server.ts
#	apps/server/src/terminal/Manager.ts
#	apps/server/src/usage/UsageService.test.ts
#	apps/server/src/ws.ts
#	apps/web/src/appInit.tsx
#	apps/web/src/components/BranchToolbarBranchSelector.tsx
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/ComposerPromptEditorTiptap.tsx
#	apps/web/src/components/ContextChip.tsx
#	apps/web/src/components/GitActionsControl.tsx
#	apps/web/src/components/RightPanelTabs.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/DraftHeroHeadline.tsx
#	apps/web/src/components/chat/MarkdownFileLink.tsx
#	apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
#	apps/web/src/components/chat/SkillInlineText.tsx
#	apps/web/src/components/chat/SubagentTooltipContent.tsx
#	apps/web/src/components/chat/TimelineUserMessageRow.tsx
#	apps/web/src/components/chat/UserMessageContextChips.tsx
#	apps/web/src/components/pullRequest/PullRequestListFilters.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/ThreadPullRequestsPanel.tsx
#	apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
#	apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
#	apps/web/src/components/settings/settingsSearch.ts
#	apps/web/src/components/sidebar/SidebarChrome.tsx
#	apps/web/src/components/sidebar/SidebarDraftBlock.tsx
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/composer-logic.ts
#	apps/web/src/reviewCommentContext.test.ts
#	apps/web/src/rightPanelStore.ts
#	docs/user/project-settings.md
#	docs/user/source-control.md
#	docs/user/terminal.md
#	package.json
#	packages/client-runtime/package.json
#	packages/client-runtime/src/state/threadCommands.ts
#	packages/contracts/src/settings.ts
#	packages/contracts/src/t3ProjectFile.ts
#	packages/provider-acp/src/server/adapter.ts
#	packages/ssh/src/tunnel.test.ts
…our after the upstream merge

Upstream's setup-script env now carries T3CODE_TERMINAL_SHELL, upstream tests miss
fork-only ThreadManagementService methods, and the fork's filter defaults bailed out
of the React Compiler.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's fix (pingdotgg#37900) landed in SkillChipPopover, which the fork
replaces with its context preview registry; port it to SkillPreview.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@adampeterhiggins
adampeterhiggins merged commit 482b590 into main Nov 19, 2026
@adampeterhiggins
adampeterhiggins deleted the t3code/sync-upstream-2026-11-17-0930 branch November 19, 2026 22:33
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.