Skip to content

chore: sync the fork with upstream 66b8a94f8d - #22

Merged
radys-s merged 95 commits into
mainfrom
tomas/sync-upstream-2026-11-19c
Nov 20, 2026
Merged

radys-s merged 95 commits into
mainfrom
tomas/sync-upstream-2026-11-19c

Conversation

@radys-s

@radys-s radys-s commented Nov 20, 2026

Copy link
Copy Markdown
Owner

Problem

After #19, fork main was 93 upstream commits behind, so it was missing upstream's newer server, client and provider fixes. This brings in upstream main 66b8a94f8d and keeps every fork feature.

Change

Fork features kept: Auto Low/Medium/High routed by live limits and weekly pace, failover to the next subscription on a usage limit, the Auto level: line in Auto-routed Claude prompts, Auto in the model picker, Resume on every provider, the pooled usage view and reset advice, unknown (not 0%) usage for Grok unified-billing accounts, and the fork's Resume-after-limits and Usage copy in every language.

Verification (hub2)

  • Fork diff before and after. git diff upstream/main...origin/main (old base 8edefc8818) and git diff upstream/main...HEAD are both 75 files, +3637/−242. Per file, the lines the fork adds and removes are identical in 74. The 75th is the conflict above.
  • vp run check:changed upstream/main (the fork's 75 files): unused patches, format, lint, knip, graphql, typecheck of 42 packages, 1105 tests in 31 files (the fork's 15 test files among them) and react compiler all pass.
  • vp run i18n:check: catalogs match the source in web, mobile and desktop.
  • Real boot on the worktree's own .t3, seeded from a read-only snapshot of the live database (never ~/.t3/userdata), with settings holding only the two Auto instances and auto-resume off. Migration 101_DelegatedTaskReadIndexes applied to the snapshot, and the server ran 15 minutes with its Claude drivers, provider probes and usage sweeps. Of 4147 trace spans, the only failures were two lookups for managed Codex and Antigravity installs this fresh data dir lacks, and two spans interrupted at shutdown. No agent turn was sent.
  • Review: one read-only review of the merge found no bugs. It noted one low risk, not acted on. With fix(server): a delivered handoff of a failed run is not re-sent to later fresh sessions pingdotgg/t3code#39281, a run on a provider without native resume that failed after an injected handoff now resumes with only "Continue where you left off.", so if that session never kept the failed prompt, the handoff's context is missing. Upstream accepts the same trade-off for native resume.

Notes

  • The CI workflow is disabled on the fork, so the local checks above stand in for it. The agent context budget file is unchanged, so no agent-context-increase label is needed.
  • Switching the hubs: migration 101_DelegatedTaskReadIndexes adds two partial indexes. The Node pins did not change.
  • Upstream main moved 61 commits overnight (da54e47f26). They merge without textual conflicts but touch 29 fork files, among them threadExecution.ts (the Resume gate), server.ts, Orchestrator.ts and ClaudeAdapterV2.ts, so they are left for the next sync.
  • The branch descends from fork main, so a merge commit (gh pr merge --merge) works without a force-push.

SoroushRF and others added 30 commits November 19, 2026 09:56
…arkers (pingdotgg#39217)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lapse all (pingdotgg#39213)

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

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

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ActivePort write (pingdotgg#38727)

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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… actions (pingdotgg#31545)

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

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

Co-authored-by: T3 Code <t3code@outpost.asia-east1-c.c.lucid-meridian-447091-ea9.internal>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

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

Co-authored-by: 尤嘉兴 <youjiaxing@dianchu.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#35307)

Signed-off-by: bettercallcaleb <121191527+bettercallcaleb@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ojection read span (pingdotgg#39284)

Co-authored-by: mInrOz <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39294)

Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
StiensWout and others added 28 commits November 19, 2026 12:29
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#39283)

Co-authored-by: ravdeep kainth <kainth.ravdeep@gmail.com>
Co-authored-by: voida6 <voida6@users.noreply.github.com>
…'s default branch (pingdotgg#32841)

Co-authored-by: Ajraba04 <143622128+Ajraba04@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#39331)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…achmentsDir from additionalDirectories (pingdotgg#37997)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ersedes it (pingdotgg#34634)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#39328)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…background wait between turns (pingdotgg#38638)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39340)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pload fails (pingdotgg#38395)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Syncs the fork with pingdotgg/t3code main, 93 commits newer than the
last sync base 8edefc8. A real merge keeps fork main an ancestor, so
the PR merges without a force-push.

One conflict, in ProviderTurnStartService.ts: upstream pingdotgg#39306 wraps the
text sent to the provider in withMessageSenderNote, and the fork sends
RESUME_PROMPT when Resume is pressed on a session without native resume.
The sender note now wraps whichever text the fork picks, so a Resume a
person pressed still sends "Continue where you left off." unchanged.

The other 30 files changed on both sides merged without conflicts,
among them AGENTS.md, the web and mobile i18n catalogs,
ClaudeAdapterV2.ts and its test, Orchestrator.ts,
ProviderTurnStartService.test.ts, ChatView.tsx, threadWorkflows.ts and
its test, use-thread-composer-state.ts and ThreadSettingsSections.tsx.

Origin: Tomáš asked to sync the fork with upstream.
Appends the progress entry for the merge of upstream main 66b8a94
(93 commits) into fork main: the one conflict and how it was resolved,
the upstream changes checked against fork features, the check, boot and
review results, the new migration for the hub switch, and the 61
upstream commits that landed overnight and are left for the next sync.

Origin: Tomáš asked to sync the fork with upstream and to add a
progress entry in the same PR.
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.