Skip to content

merge upstream/main into fork - #592

Merged
adampeterhiggins merged 59 commits into
mainfrom
t3code/sync-upstream-2026-11-20-aa725f4bd4-093546
Nov 20, 2026
Merged

adampeterhiggins merged 59 commits into
mainfrom
t3code/sync-upstream-2026-11-20-aa725f4bd4-093546

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

New features

Fixes

Provider and server changes

Remaining upstream commits

Discord announcements were not used because the channel returned no matching crossposts for this range.

Merge range

  • Base: origin/main at 3ffbb2f34b51e74fb1f590768ee86d4788ad5759.
  • Upstream: aa725f4bd422c8649a6160ed97bad05ffeaf3ed2.
  • The base had 694 fork-only commits and lacked 58 upstream commits. This PR targets main.

Conflict resolutions

  • Server and MCP: Preserve fork OAuth log exclusions, cross-project delegation, managed worktree launch behavior, peer refusal cases, Muse compatibility, and Codex result previews alongside upstream log filtering, background delegation, cancellation-safe launches, link renewal, manifest compatibility, and search query deduplication. Remove a duplicate import from the clean merge of launch tests.
  • Cursor: Preserve per-account credentials, picker defaults, and subscription limits alongside upstream catalog refresh and Max Mode handling.
  • Composer, sidebar, and localization: Keep recent thread suggestions and fork preview chips while adding used side chats and opening them in their parent chat. Keep upstream repeat-error banners, grouped issue badges, and batch linking alongside fork locale keys and package exports. Update the composer behavior in the fork notes. No conflicted files were split upstream.
  • ACP startup diagnostics: Preserve the subprocess exit diagnostic if a pipe write fails first. This keeps Antigravity’s page size error from being reported as cancellation.

Verification

  • Frozen dependency install, formatting and lint of conflict resolutions, and translation catalog checks for web, mobile, and desktop passed.
  • Eight focused test files passed with 328 tests.
  • The changed-file gate against origin/main passed formatting, lint, Knip, patch validation, GraphQL generation, typechecking across 42 packages, and React Compiler checks. Its test phase passed 4,571 tests across 112 files and identified four files that needed follow-up. Browser projects were excluded.
  • Reran those four files with test fixtures outside the Git worktree. Git, scanner (including the FIFO cases), and peer tests passed. The remaining Antigravity abort test exposed the ACP startup race above. After the fix, all 110 tests across the installer and ACP client and protocol passed. Server and ACP typechecks passed again.
  • Whitespace check passed with tab indentation allowed for the upstream dependency patch. The patch matches upstream exactly.

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

GPT-6.2 Sol via the Codex harness in T3 Code.

juliusmarminge and others added 30 commits November 19, 2026 16:07
…ain (pingdotgg#37419)

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

Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ider versions (pingdotgg#39427)

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

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

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>
…s parent (pingdotgg#39455)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#39458)

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>
…#39380)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#39493)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…"Ran command" (pingdotgg#39474)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 28 commits November 19, 2026 19:46
…erseded ones (pingdotgg#39502)

Co-authored-by: Cursor <cursoragent@cursor.com>
…6499)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ents that failed (pingdotgg#39536)

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

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

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
pingdotgg#39562)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n closes (pingdotgg#39569)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39598)

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

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@adampeterhiggins
adampeterhiggins merged commit 40d2f85 into main Nov 20, 2026
@adampeterhiggins
adampeterhiggins deleted the t3code/sync-upstream-2026-11-20-aa725f4bd4-093546 branch November 20, 2026 13:01
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.