Skip to content

chore: sync fork with upstream 3b3f8808f4 - #30

Merged
radys-s merged 33 commits into
mainfrom
tomas/sync-upstream-2026-11-22
Nov 22, 2026
Merged

radys-s merged 33 commits into
mainfrom
tomas/sync-upstream-2026-11-22

Conversation

@radys-s

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

Copy link
Copy Markdown
Owner

Fork main was 32 commits behind pingdotgg/t3code main again: upstream moved on while #29 was being checked.

Merged upstream main 3b3f8808f4 into this branch with a real merge. Fork main (cfbcb25a04) is the first parent and was the branch head, so the PR needs no force-push. The only conflicts were at the tails of the 10 web catalogs: upstream moved two queue keys into source order, and the fork had appended its keys after them. They were resolved per JSON key (base, plus the fork's key changes, plus upstream's); no key was changed by both sides. The other 14 files changed on both sides merged cleanly, among them Orchestrator.ts and ProviderTurnStartService.ts. The fork's diff against upstream is 119 files before and after the merge, with identical per-file added and removed line counts. Upstream's steer re-queue (pingdotgg#40622), dropped-prompt handoffs (pingdotgg#40670), launch titles (pingdotgg#40567) and feature-flag and settings changes (pingdotgg#40594) were checked against the fork's Auto routing, queued-message failover, Resume fallback, launched-thread lineage and machine bar; none needed a change.

Checks: vp run check:changed upstream/main passes every step except one test case. The first case of ChatView.browser.test.tsx timed out (15 s) under the 57-file parallel run; that file passes 18/18 alone, and the other 1603 tests pass. vp run check:changed origin/main passes every step except one test case. Its 114-file test step first ran past the 900 s step timeout, so it was rerun with --timeout 2700. In that rerun, a drag-scroll case in upstream's FilePreviewPanel.browser.test.tsx missed its wait under load; that file passes 15/15 alone, and the other 3253 tests pass. vp run i18n:check passes. A scratch data dir, seeded with migrate-dev-db from a read-only copy of the live database, booted the server, completed V2 orchestration recovery and answered HTTP 302. A read-only review found no bugs. No deploy or service restart was done.

No new migrations. The lockfile changed (pingdotgg#27866 vendors @pierre/words and drops remark from the web app), so switching a hub to this build needs vp i. Upstream moved 6 more commits during the sync (4ac5e6e791); they merge without conflicts and go in the next sync.

flamboh and others added 30 commits November 21, 2026 14:15
…board guide (pingdotgg#37758)

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

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

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

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

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

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

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

Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634)

Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633)

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

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

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e per turn (pingdotgg#40671)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… drops its prompt (pingdotgg#40670)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared tooltip; remark leaves the web app (pingdotgg#27866)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Gemini 4 Neon <noreply@google.com>
Co-authored-by: Noah Sigel <noah.sigel@gmail.com>
juliusmarminge and others added 3 commits November 21, 2026 21:53
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Fork main (cfbcb25, after #29) was 32 upstream commits behind.
The ten web catalogs conflicted at their tails: upstream moved the two
queue-reorder keys into source order while the fork appended its keys
after them. Resolved per key: base plus the fork's key changes plus
upstream's; no key was changed by both sides.
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 22, 2026
@github-actions

Copy link
Copy Markdown

This PR changes the test suite by +41 test cases (browser +5, unit +23, server +13).

New browser test files: apps/web/src/lib/selectionActions.browser.test.ts.
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 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Nov 22, 2026
@radys-s
radys-s merged commit 5a349ab into main Nov 22, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.