Repository navigation
chore: sync fork with upstream c198f73b37 - #33
Merged
Merged
Conversation
…its (pingdotgg#39822) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: charlesbine <charlesbine@users.noreply.github.com>
pingdotgg#40154) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ow or steer survive a dropped socket (pingdotgg#40703) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n a broken character (pingdotgg#40726) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…anch (pingdotgg#40736) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d private ones work end to end (pingdotgg#40741)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its destination (pingdotgg#40739) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#40767) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Fork main (2479ed9, after #32) was 17 upstream commits behind, and upstream changed files the fork also changes. One conflict, in ProviderTurnStartService.ts: upstream pingdotgg#40764 keeps the "Native resume is unavailable" refusal for a resume on a provider without native resume and skips it only when pending context goes with the resume. The fork never refuses there: it continues with "Continue where you left off." (2026-11-15), and that start already carries pending context. Kept upstream's carriesPendingContext, which now picks the delivery session, and dropped the refusal. The fork's "asks to continue when the provider cannot resume natively" test fails with the refusal kept and passes without it, as do upstream's two new pending-context cases. The 10 web and 10 mobile catalogs merged without conflicts; each parses to base plus both sides' key changes, with no key changed by both sides and no duplicate keys.
|
This PR changes the test suite by +20 test cases (browser +1, unit +10, server +9). 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 17 commits behind
pingdotgg/t3codemain, and upstream changed 27 files the fork also changes:Orchestrator.ts,ProviderTurnStartService.tsand its test,runtimeLayer.test.ts,ChatView.tsx,threadWorkflows.tsand its test, and the 10 web and 10 mobile catalogs.Merged upstream main
c198f73b37into this branch with a real merge. Fork main (2479ed911e, after #32) is the first parent and was the branch head, so the PR needs no force-push.One conflict, in
ProviderTurnStartService.ts. Upstream pingdotgg#40764 keeps the "Native resume is unavailable" refusal for a Resume on a provider without native resume, and skips it only when pending context goes with the resume. The fork never refuses there: it continues with "Continue where you left off.", and that start already carries pending context. I kept upstream'scarriesPendingContext(it now picks the delivery session) and dropped the refusal. With the refusal kept, the fork's "asks to continue when the provider cannot resume natively" test fails. With the resolution,ProviderTurnStartService.test.tspasses 94/94, including upstream's two new pending-context cases.The other 26 shared files merged cleanly. Each catalog parses to base plus both sides' key changes, with no key changed by both sides and no duplicate keys. The fork's diff against upstream is 121 files before and after the merge. Its added and removed lines are identical in every file except the dropped refusal.
Checks:
vp run check:changed upstream/mainpasses every step (43 packages, 1616 tests in 58 files).vp run check:changed origin/mainpasses every step (1677 tests in 54 files).vp run i18n:checkpasses.migrate-dev-dbfrom a read-only copy of the live database, booted the server, completed V2 orchestration recovery and answered HTTP 302.No deploy or service restart was done.
Upstream pingdotgg#40741 grows the MCP tool list by 140 bytes (59052 -> 59192), so the Agent context budget check needs the
agent-context-increaselabel. These 17 commits change no migrations, lockfile or package manifests.