Skip to content

chore: sync with upstream pingdotgg/t3code main - #229

Merged
yordis merged 154 commits into
mainfrom
yordis/chore-sync-upstream-20261112-1
Nov 13, 2026
Merged

chore: sync with upstream pingdotgg/t3code main#229
yordis merged 154 commits into
mainfrom
yordis/chore-sync-upstream-20261112-1

Conversation

@yordis

@yordis yordis commented Nov 13, 2026

Copy link
Copy Markdown
Member
  • Pull request watch: adopted upstream's extracted PullRequestWatchService and re-threaded the fork's watch instructions through the service, MCP handler, orchestrator, reactor equality and next-state. The fork's handler tests that upstream moved into the service tests were dropped, and a service test for instructions was added.
  • GitHub watch fingerprint: kept the fork's batched query and added upstream's merge-queue variable. The generated GraphQL file was regenerated, and the fingerprint test now expects the trailing merge-queue removal count.
  • ChatView converged on upstream's resumable-run derivation, replacing the fork's manual resume helper.
  • Sidebar keeps the fork's folder-drop handling alongside upstream's route resolution.
  • AGENTS.md keeps the fork PR-target line next to upstream's new forge mirror guidance. The fork's GitCafe-specific doc text yielded to upstream's rewrite.
  • ClaudeAdapterV2 condition now honors both the fork's settings env check and upstream's auto-compact window.
  • Lockfile taken from upstream and re-resolved so the fork-only secret provider packages stay.
  • Agent context budget bumped for the extra instructions tool parameter.
  • Added ledger entry 0034 for the watch instructions feature, which was kept but had no entry. Other fork-only code (batched watch fingerprints, reactor always invalidating) remains unledgered.
  • Test failures seen locally are git-process failures from the local git version and match failures on origin/main; no failure was found that only the merge causes.

Yuruzuu and others added 30 commits November 12, 2026 13:50
@Yuruzuu @juliusmarminge
perf(web): PDF Find jumps to the first match in long PDFs 3.1x faster…
a03f718 
… (median) (pingdotgg#33956)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@mwolson @juliusmarminge
fix(mobile): Keep a tall question's Submit button above Android's nav…
96aa40e 
…igation bar (pingdotgg#33929)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@AlexSandilands @maria-rcks @juliusmarminge
fix(web): choosing a project icon again re-reads it from disk (pingdo…
4f555c7 
…tgg#28584)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Mnigos @maria-rcks @juliusmarminge
fix(web): sidebar keeps the open thread active while Settings or Usag…
d9a97e7 
…e is open (pingdotgg#28703)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(web): gitignore fences in the rich-text composer highlight as ini…
9c7618b 
…, as chat does (pingdotgg#35603)
@Edge358 @juliusmarminge
fix(web): keep later navigation when thread deletion completes (pingd…
451e375 
…otgg#33953)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(server): Git status finds the default branch when the only remote…
0bc993a 
… isn't origin (pingdotgg#28815)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Chinoman10 @maria-rcks @juliusmarminge
fix(pi): settle prompts consumed by input handlers (pingdotgg#28798)
f255158 
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @juliusmarminge
fix(cursor): honor HTTP/1.1 transport for proxy networks (pingdotgg#2…
39ab6a2 
…5338)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(client): hide Resume while a pending request blocks continuing th…
5f43681 
…e run (pingdotgg#28810)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @juliusmarminge
fix(server): t3 doctor holds off server launches and names the holder (…
2adda57 
…pingdotgg#24963)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@voltcrash @juliusmarminge
fix(server): preserve filename whitespace when reading and saving fil…
cbf9e26 
…es (pingdotgg#29314)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@NotReliable Spike
@maria-rcks @juliusmarminge
fix(server): tool calls a released session cuts off no longer keep th…
70833b2 
…e thread Waiting (pingdotgg#29036)

Co-authored-by: Spike <spike@example.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@voltcrash @maria-rcks @juliusmarminge
fix(server): keep thread tool responses small by default (pingdotgg#2…
85b1606 
…9268)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@grodriguez-fr @juliusmarminge
fix(web): a chunk that fails after boot no longer reloads the page in…
6d53584 
… a loop (pingdotgg#29306)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@QRpeachKZ @maria-rcks
Увалиев Султан Ермекович @factory-droid @juliusmarminge
fix(opencode): keep ACP question choices and fold the custom answer (p…
fd5cb99 
…ingdotgg#25879)

Co-authored-by: Sultan U <192680428+QRpeachKZ@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Увалиев Султан Ермекович <alfa@HNBA.local>
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fancyboi999 @maria-rcks
Xinmin Zeng @juliusmarminge
fix(web): sent messages honor their theme foreground (pingdotgg#26888)
b63d3c5 
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Xinmin Zeng <fancyzeng999@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge @claude
perf(ci): run server test files in parallel on each shard (pingdotgg#…
a3cde98 
…35618)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@dependabot @maria-rcks @juliusmarminge
chore(deps): bump the npm_and_yarn group across 2 directories with 1 …
aa58dc6 
…update (pingdotgg#33945)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@maria-rcks @nateEc @juliusmarminge
fix(server): keep worktrees containing nested repositories (pingdotgg…
8753c74 
…#25241)

Co-authored-by: Yukun Shan <92423096+nateEc@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@samkelly880 @juliusmarminge
fix(shared): Windows-style paths stay out of the slash menu (pingdotg…
f41e8b3 
…g#27851)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@ParasN @YMiyya
@maria-rcks @juliusmarminge
fix(acp): let agents that advertise /compact compact their own context (
ac7c7f6 
pingdotgg#28822)

Co-authored-by: ParasN <25337333+ParasN@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(acp-registry): subscribe to snapshot changes before triggering t…
2f9d930 
…hem (pingdotgg#35627)
@voltcrash @maria-rcks @juliusmarminge
fix(web): diff colors follow appearance contrast (pingdotgg#28947)
fbd77b9 
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@ScottN-PV @maria-rcks @juliusmarminge
fix(web): keep the child thread open when its remote parent was delet…
dfded9d 
…ed (pingdotgg#27436)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@tao12345666333 @juliusmarminge
fix(desktop): poll for updates every 4 hours, not 4 minutes (pingdotg…
731291e 
…g#28481)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@jokaperes @maria-rcks @juliusmarminge
fix(usage): bill Codex requests whose cumulative counters rewind to a…
9a614e3 
…n earlier snapshot (pingdotgg#29366)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@nateEc @maria-rcks @juliusmarminge
fix(server): persist terminal output without rewriting all history (p…
65716ba 
…ingdotgg#24019)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@bompus @juliusmarminge
perf(server): stop serializing terminal chunks just to measure them (p…
8bfb723 
…ingdotgg#24179)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fixfon @maria-rcks @juliusmarminge
fix(web): stop opening a menu when a terminal selection ends (pingdot…
4cd7a3e 
…gg#24112)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 24 commits November 12, 2026 17:50
@juliusmarminge
fix(ssh): an alias no longer hides known_hosts entries on other ports (…
25feac2 
…pingdotgg#35779)
@juliusmarminge
fix(server): IPv4-mapped loopback SSH device targets count as this ma…
368b4fe 
…chine (pingdotgg#35774)
@juliusmarminge
fix(ssh): host discovery follows Include globs in directory components (
c0b08fa 
pingdotgg#35771)
@juliusmarminge
fix(server): Commit finishes a merge resolved to the current branch's…
8b9f8ca 
… tree (pingdotgg#35778)
@juliusmarminge
fix(server): gh default remote lookup ignores an inherited GIT_DIR (p…
b8c74f5 
…ingdotgg#35764)
@linushohne @claude
docs: FAQ says the Claude 5-hour limit drain is fixed (pingdotgg#31473)
7bc3684 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge
fix(server): fork PR worktrees no longer fail when a local branch own…
336a8c1 
…s the t3code/pr-<n> prefix (pingdotgg#35768)
@juliusmarminge
fix(web): a failed commit keeps the commit message you typed (pingdot…
05cc444 
…gg#35781)
@juliusmarminge
fix(server): branches whose names start with a parenthesis are no lon…
8a1811e 
…ger reported as detached (pingdotgg#35780)
@juliusmarminge
test(ssh): launcher harness no longer races its background nohup (pin…
49440b2 
…gdotgg#35788)
@juliusmarminge @claude
fix(web): Resume replaces Stop without a lingering Stopped button (pi…
442b1db 
…ngdotgg#35755)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maschwenk @juliusmarminge
test(web): typecheck the project file refresh test (pingdotgg#34061)
d86ee1e 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@dpreil-ydlp @dpreil
@maria-rcks @juliusmarminge @claude
docs(codex): explain native image generation setup (pingdotgg#31426)
6f21b0f 
Co-authored-by: David Preil <dzpreil@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@hieu-lee @juliusmarminge
perf(shared): command output failure scan rejects clean output in one…
bb9658d 
… pass (pingdotgg#26935)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(web): sidebar drag test opens its folder past the shift guard (p…
5ccc65b 
…ingdotgg#35803)
@t3dotgg
feat(mobile): secret field gets an eye toggle to show what you typed (p…
7fb54eb 
…ingdotgg#35783)

* feat(mobile): secret field gets an eye toggle to show what you typed
@t3dotgg @claude
fix(mobile): a cold launch shows the cached thread rows with the firs…
5ceabb3 
…t frame (pingdotgg#35683)

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@juliusmarminge
fix(server): ACP terminal MCP calls answer interleaved server requests (
45b0fe4 
pingdotgg#35805)
@juliusmarminge
fix(web): "Try again" recovers from a failed page chunk load (pingdot…
2755a95 
…gg#35806)
@juliusmarminge
fix(shared): read MCP event streams whatever the case of the content …
36371de 
…type (pingdotgg#35815)
@yordis
Merge remote-tracking branch 'upstream/main' into yordis/chore-sync-u…
9318eb2 
…pstream-20261112-1

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@yordis
docs(fork): record the pull request watch instructions in the ledger
8b4db39 
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@yordis
fix(server): record the merged agent context budget
97190ef 
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@yordis
test: align watch tests with the merged upstream behavior
1741e4c 
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@cursor

cursor Bot commented Nov 13, 2026

Copy link
Copy Markdown

This PR is too large for Bugbot to review. It changes 29,191 lines and 3,806,546 characters. Split the change into smaller pull requests to get a review.

@yordis
yordis merged commit c8a04dc into main Nov 13, 2026
19 of 20 checks passed
@yordis
yordis deleted the yordis/chore-sync-upstream-20261112-1 branch November 13, 2026 03:33
@github-actions

github-actions Bot commented Nov 13, 2026

Copy link
Copy Markdown

This PR changes the test suite by +220 test cases (browser +35, unit +90, server +95).

New browser test files: apps/web/src/components/Sidebar.shiftGuard.browser.test.ts, apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx, apps/web/src/components/chat/useComposerSelection.browser.test.tsx, apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx, apps/web/src/hooks/useShownThreadRouteTarget.browser.test.tsx.
Each browser test file costs CI seconds of module loading before its first test runs; a unit test costs milliseconds.

Keep tests that would fail for a real reason, and test logic below the UI where it can be. See Testing.

@github-actions github-actions Bot added the vouch:trusted Author is trusted by repo permissions or the VOUCHED list. label Nov 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.