Skip to content

chore: merge upstream main into fork - #124

Merged
ScriptedAlchemy merged 1358 commits into
mainfrom
t3/merge-upstream-main-20261115
Nov 15, 2026
Merged

ScriptedAlchemy merged 1358 commits into
mainfrom
t3/merge-upstream-main-20261115

Conversation

@ScriptedAlchemy

@ScriptedAlchemy ScriptedAlchemy commented Nov 15, 2026 •

Copy link
Copy Markdown
Owner

Why

The fork was 1,350 commits behind pingdotgg/t3code main. This merges upstream through 21fe33c8d7 and resolves all 202 conflicted files. Each conflict keeps the fork feature and takes the upstream fix; where both sides solved the same problem, upstream's version wins.

What changed

  • Upstream's 13 new migrations are renumbered from 083–095 to 100–112, because the fork already uses 68–99.
  • Managed Codex update discovery follows upstream: the pinned release plus the npm lookup. The fork's GitHub-release polling is removed.
  • Four behavior bugs that the merge introduced are fixed: clients skipped a silent connection route, Claude text generation dropped launch-argument environment variables, a replayed remote delegation was refused while its provider cooled down, and storage cleanup trusted a stale symlink path.
  • CI: macOS jobs run on macos-latest, the mobile native job calls its lint script directly, and the changed-file check passes the new --skip-tests flag because the shard jobs run the suites.

Scope

  • Covers the merge, the conflict resolutions, and the source and test fixes the merge needed.
  • Leaves out the release workflows and the iOS store build, which only run on release.
  • Leaves out an Android device run; this machine has no Android SDK.

Tradeoffs

  • Agent context grows: Claude system text 8,646 → 8,979 bytes and the MCP tool list 67,387 → 68,955 bytes. The growth is upstream's send_to_user and theme tools, so this PR carries the agent-context-increase label.
  • Upstream's live WorktreeBranchSync and the fork's WorktreeBranches both run. They converge on the same thread branch, but no test exercises them together.
  • --skip-tests applies to every fork pull request, not only large ones.

Blast Radius

Every surface changes, because upstream touched about 2,400 files. The risk sits in the hand-merged server files: orchestration, provider adapters, storage cleanup and peer links. Existing installs run migrations 100–112 on their next start.

Verification

  • CI: 19 checks pass on the head commit, including all server, web, client and Rust test jobs and the desktop build.
  • Migrations 100–112 applied cleanly to a read-only snapshot of a real 3.9 GiB database at migration 99.
  • Web client on that data: a full Replay turn with an approval completes, a migrated thread renders, and every settings page loads with no page or server errors.

Merged with Claude Opus 5.5 and Claude Fable 5.2 in Claude Code; four test fixes delegated to Claude Opus 5.5 and GPT-6.1 Sol.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 14, 2026 19:43
pingdotgg#31816)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#37032)

Co-authored-by: Taylor Dolezal <117500+onlydole@users.noreply.github.com>
…d snoozed threads (pingdotgg#31894)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e sequences (pingdotgg#31882)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ntry" and "1 cell" (pingdotgg#31886)

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32089)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: marcel <marcel@marcels-MacBook-Air.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…32177)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ssions (pingdotgg#31870)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…loss (pingdotgg#32169)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dvertised as LAN routes (pingdotgg#32140)

Co-authored-by: repparw <repparw@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#32183)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32188)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…res (pingdotgg#32122)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…URL (pingdotgg#29625)

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>
…ards (pingdotgg#30695)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Jerry Wu <haoyuwu@andrew.cmu.edu>
Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t declined (pingdotgg#33575)

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

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

Co-authored-by: CommandCodeBot <noreply@commandcode.ai>
…dotgg#29498)

Co-authored-by: amr sarhan <amr@amrs-MacBook-Air.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…startup (pingdotgg#32053)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 17 commits November 15, 2026 06:57
…nes (pingdotgg#37243)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merge pingdotgg/t3code main through 21fe33c and resolve 202 conflicted files.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@changeset-bot

changeset-bot Bot commented Nov 15, 2026 •

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 58f954e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

ScriptedAlchemy and others added 7 commits November 15, 2026 11:20
The jobs were pinned to macos-26. The iOS store build needs Xcode 27.1, which
that image may not carry, so the jobs follow the newest hosted image.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…avior

connectOverRoutes compared the fork's map of transient errors against
undefined, so a route that stayed silent was never tried. Claude text
generation now keeps launch-arg environment variables when an account
directory also sets some.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…provider cools down

Upstream sends a new thread's first message inside thread.create, so the
receipt the delegation guard looked for is never written. The guard now runs
where new delegated work starts. Thread launch and group conversation tests
wait on the events the merged code emits.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… undid

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
A large merge puts over a thousand test files beside its changes, which one
step cannot finish inside its 900 s limit. check:changed gains --skip-tests,
and the fork job passes it because the shard jobs already run the suites.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@ScriptedAlchemy
ScriptedAlchemy merged commit 50eade0 into main Nov 15, 2026
22 checks passed
@ScriptedAlchemy
ScriptedAlchemy deleted the t3/merge-upstream-main-20261115 branch November 16, 2026 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.