Repository navigation
chore: sync fork with upstream 3b3f8808f4 - #30
Merged
Merged
Conversation
…board guide (pingdotgg#37758) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40567) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…thread's PR branch (pingdotgg#40564)
…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>
…pingdotgg#40604) Co-authored-by: Julius Marminge <julius0216@outlook.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>
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.
|
This PR changes the test suite by +41 test cases (browser +5, unit +23, server +13). New browser test files: Keep tests that would fail for a real reason, and test logic below the UI where it can be. See Testing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fork main was 32 commits behind
pingdotgg/t3codemain again: upstream moved on while #29 was being checked.Merged upstream main
3b3f8808f4into 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 themOrchestrator.tsandProviderTurnStartService.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/mainpasses every step except one test case. The first case ofChatView.browser.test.tsxtimed 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/mainpasses 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'sFilePreviewPanel.browser.test.tsxmissed its wait under load; that file passes 15/15 alone, and the other 3253 tests pass.vp run i18n:checkpasses. A scratch data dir, seeded withmigrate-dev-dbfrom 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/wordsand drops remark from the web app), so switching a hub to this build needsvp i. Upstream moved 6 more commits during the sync (4ac5e6e791); they merge without conflicts and go in the next sync.