Skip to content

chore(sync): merge upstream/main into fork - #296

Merged
adampeterhiggins merged 30 commits into
mainfrom
t3code/sync-upstream-2026-10-13
Oct 13, 2026
Merged

adampeterhiggins merged 30 commits into
mainfrom
t3code/sync-upstream-2026-10-13

Conversation

@adampeterhiggins

@adampeterhiggins adampeterhiggins commented Oct 13, 2026 •

Copy link
Copy Markdown
Owner

Sync the fork with all 28 upstream commits through 6524a8d437. At the start of the sync, the fork was 330 commits ahead and 28 behind upstream. This branch is based on fork main through 532533043e, retaining its filter menus, linked-repository PR references, model-parameter change markers, persistent sidebar searches, and lockfile-aware update builds.

Resolved the overlapping changes while keeping fork behavior:

  • Claude subagents retain final usage and output-file links, including upstream's new idle completion path. Added coverage for completed, failed, and stopped idle agents, alongside upstream's native-outcome and resume tests.
  • Stop still supports keeping delegated tasks running, while targeted native-agent stops use upstream's confirmed outcomes.
  • Database startup repairs the fork's legacy migration 55 before upstream's new migration-history guard. Both migration suites pass.
  • Git actions use upstream's callbacks bound to the selected thread, retaining the fork's browser-opening action and preferred PR-link behavior.
  • Composer context retains fork tab capture and reference attachments alongside upstream's pending-answer attachment targets.
  • Web/mobile tool presentation keeps fork integration marks, rich previews, file reads, and syntax highlighting alongside upstream's REPL titles, highlighting, and computer-use fixes.
  • Mobile PR lists keep the fork's filter facets and upstream's connected-environment preference.

Audited the automatically merged intersections and docs/fork-differences.md; none of the documented differences was adopted or removed by these upstream commits. Devin, Custom ACP, Cursor defaults/steering, integration context, chat tabs, agent panels, update pausing, and other fork additions remain in the merged tree.

Validation:

  • Focused regression runs covering more than 1,800 test executions: Claude/Codex adapters, Stop/effect worker, database migrations/event replay, Git actions/PR review guides, MCP access/delegation, Devin/Custom ACP, tabs, usage, agent fleets, filter facets, composer PR lookup, remote fallback/reconnect, attachments, and desktop updates. All selected suites pass; the route-search test was run with the web package's Vite config.
  • Contracts, client-runtime, provider-core, mobile, and desktop package typechecks pass. After updating the base, another 428 focused tests pass for model-change markers and traits, sidebar behavior, mobile activity, PR filtering, and delegated-task launch; client-runtime/mobile typechecks and the web check with the ES2024 library also pass.
  • Web typecheck passes with --lib ES2024,DOM,DOM.Iterable. Its standard check has a pre-existing ES2023-library error on Promise.withResolvers in terminal/ghostty/surface.test.ts.
  • Server typecheck has pre-existing middleware inference errors in unchanged mcp/AgentAccessMcpServer.ts; these are disclosed rather than counted as a clean check.
  • Server production bundle and final web production build pass.
  • Targeted lint/format checks have no errors; git diff --check passes. No browser or native-device verification was performed.

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

Model: GPT-6.1-sol. Harness: Codex in T3 Code.

ScottN-PV and others added 30 commits October 12, 2026 18:20
…g#18608)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… you to a new draft (pingdotgg#18672)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ct (pingdotgg#18824)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…stead of crash-looping (pingdotgg#15925)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
… resync after a downgrade (pingdotgg#15937)

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
… MCP servers (pingdotgg#17058)

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…is offline (pingdotgg#18698)

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

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
pingdotgg#18900)

Co-authored-by: Pawel Mikolajczuk <pmikolajczuk@atlassian.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@adampeterhiggins
adampeterhiggins force-pushed the t3code/sync-upstream-2026-10-13 branch from d1e683a to 07175cb Compare October 13, 2026 14:17
@adampeterhiggins
adampeterhiggins merged commit 4e746e2 into main Oct 13, 2026
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.