Skip to content

chore: merge upstream/main into fork - #460

Merged
adampeterhiggins merged 154 commits into
mainfrom
t3code/sync-upstream-2026-10-22-0930-r2
Oct 22, 2026
Merged

adampeterhiggins merged 154 commits into
mainfrom
t3code/sync-upstream-2026-10-22-0930-r2

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

New features

Fixes users will notice

  • Mobile unifies draft/thread navigation and composer behavior, preserves drafts and long-draft scroll positions, fixes iPad headers/composer alignment, and improves iPhone Duo folding, safe areas, search, sheets, and scroll retention. It also fixes pull-request opening crashes (pingdotgg/t3code#23467, pingdotgg/t3code#23366, pingdotgg/t3code#23096, pingdotgg/t3code#23149, pingdotgg/t3code#22600).
  • Web avoids broad rerenders while streaming or typing, bounds list layout passes, supports right-to-left Arabic/Hebrew text, and fixes paused video reloads. Composer prices no longer open the skill menu, special-character filenames remain chips, and panel/Usage/undo-settle shortcuts behave correctly (pingdotgg/t3code#23117, pingdotgg/t3code#23124, pingdotgg/t3code#22730, pingdotgg/t3code#23315, pingdotgg/t3code#22777, pingdotgg/t3code#21519, pingdotgg/t3code#22922).
  • Git operations retry refused SSH clones over HTTPS, refresh refs after reconnects, report refused pushes, retain PR diff files on unchanged refreshes, sync draft status, and fix Forgejo/GitCafe linking, GitLab pagination, Azure DevOps names with spaces, and copy-to-machine fork selection.
  • Servers stop abandoned runs before continuing, stop Claude children when their owning server dies, prune obsolete SSH runtimes, and safely remove Windows worktree junctions. Network file paths outside a thread's project are blocked across markdown assets, file reads, metadata, and cleanup (upstream commit a12d6ed942). Older clients connect again after idle-compaction setting changes (pingdotgg/t3code#23454).

Provider and internal changes

  • Agents get a compact current model catalog; Claude delegated children follow cache TTL settings, Codex retains all paths in multi-file patches, Antigravity retains question options, Pi can fork completed turns during a running turn, OpenCode distinguishes out-of-funds errors and cancelled todos, and Cursor closed-stream writes no longer crash the server.
  • ChatView, composer, and settings logic moves into focused hooks/components. Development and standalone builds pin Node 26.12.1, and TypeScript uses the tsc-rs drop-in without the Effect patch.

Remaining commits cover file links and theme fixes, update/sign-in diagnostics, queue handling, scheduled-task ordering, telemetry/test fixtures, development performance and changed-file check tooling, release deployment fixes, and corrected user/contributor guidance. The full commit list below records every included change.

Discord announcements were not used: the channel returned only five non-crosspost messages, all before the oldest included commit (2026-10-21); no matching announcement content or embeds were available.

Merge scope

Base: main at a566bcc117e4741b9463e23497c98588522eb360. No open upstream-sync PRs existed at selection or refresh. Main advanced during preparation; the merge was redone from that exact new head.
Pinned upstream: 8d3b061121fe65669d5d43d011b48cd3027a4108.
Range: a566bcc117e4741b9463e23497c98588522eb360..8d3b061121fe65669d5d43d011b48cd3027a4108 (153 upstream commits; 503 fork-only commits before merging).

Conflict resolutions

  • Web: adopted upstream's extracted ChatView/composer/settings hooks while keeping fork chat tabs and split panes, context integrations, account/model switches, citations, server drafts, empty-thread creation, usage recovery, agent controls, scheduled-task shortcuts, and terminal settings. Kept both sides' tests and combined terminal ANSI imports with theme readability changes.
  • Mobile: retained chat tabs, grouped/hidden selection and filter facets, usage notices, Conductor controls, integration pickers, send menus, and queue labels within upstream's shared draft/thread navigation and toolbar structure. Review caught and repaired synthetic-draft subscriptions and premature server-draft actions; repository context still preserves new-worktree creation.
  • Server/contracts/providers: retained fork delegation/workspace guidance and options, usage-limit recovery/guards, rollback contracts, Claude cwd behavior, settings migration, Cursor Max Mode tests, and composer helpers. Codex keeps fork unified multi-file diffs/model attribution alongside upstream per-file metadata. Kept both sides of add/add tests and fixed MCP middleware typing.
  • Shared fork-point helpers now accept upstream's quiet structural turn items without discarding native fork points. Updated fork-differences source pointers and reconciled the usage guide's enabled environments with fork service-status guidance.
  • On the refreshed base, the verified resolved tree is byte-for-byte unchanged except for main's newly merged database-seeding fix. The upstream commit list is identical. No existing sync branch was modified.

Verification

Used repository-local Vite+ 1.3.0 after vp i; global Vite+ 0.3.1 cannot load this checkout's task configuration.

  • Web: typecheck passed; 819 unit tests across 18 files passed; focused lint/format passed with existing warnings.
  • Mobile: typecheck passed; 243 focused tests across 19 files passed; after review repairs another 101 focused tests passed; lint/format passed with warnings. The broader mobile unit run had 2,260 passes and 14 baseline failures: 13 compiler-coverage failures reproduced against original fork HEAD, plus an unchanged provider-badge fixture missing settings.threadGroups.
  • Server/shared/contracts/Cursor: typechecks passed; 757 focused tests across 13 files passed, with strengthened Codex and agent-access checks rerun successfully; focused lint passed with warnings. Independent server review found no actionable merge regressions.
  • Client-runtime: typecheck passed; 56 tests across five files passed. Structural fork-point change: 11 tests and contracts/client-runtime typechecks/lint passed.
  • Refreshed-base database seeding: 7 tests passed; targeted lint passed. Independent web review found no actionable merge regressions and confirmed identical web source after the redo.
  • Scoped knip was run. It reports existing unused sidebar files and unused exports; the three sidebar files were confirmed disconnected in the original fork source. This is not a clean knip result.
  • git diff --check passes excluding the unchanged upstream Reanimated patch, whose blank patch-context line triggers trailing-whitespace detection. The upstream patch is preserved.
  • check:changed was inspected but not run: it unconditionally selects browser tests and repository-wide knip, conflicting with this run's explicit restrictions. Focused checks above cover the resolved areas. No browser/computer automation or dev server was launched.
Included upstream commits

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

Model: GPT-6.1-Sol (medium reasoning). Harness: Codex in T3 Code, including delegated conflict-resolution and review agents.

juliusmarminge and others added 30 commits October 21, 2026 01:36
…wn component (pingdotgg#22680)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…banners are built in ThreadActivityBanners (pingdotgg#22725)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… their own file (pingdotgg#22669)

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

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

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

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

Co-authored-by: ishaanko <ishaanko.mail@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22767)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
maria-rcks and others added 27 commits October 22, 2026 01:20
…3226)

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

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

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

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uests (pingdotgg#23034)

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

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

Co-authored-by: Vishal <vishalprashantdoshi@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Vishal Doshi <vdoshi96@users.noreply.github.com>
…ingdotgg#23106)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Nikita Maximilian Grimm <github@nikitagrimm.de>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tch (pingdotgg#23023)

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

Fixes pingdotgg#15682. Takes over pingdotgg#23035.

Co-authored-by: Taylor Dolezal <onlydole@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23117)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@adampeterhiggins
adampeterhiggins merged commit d190a6c into main Oct 22, 2026
@adampeterhiggins
adampeterhiggins deleted the t3code/sync-upstream-2026-10-22-0930-r2 branch October 22, 2026 12:11
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.