Skip to content

chore: sync fork with upstream c198f73b37 - #33

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

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

Conversation

@radys-s

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

Copy link
Copy Markdown
Owner

Fork main was 17 commits behind pingdotgg/t3code main, and upstream changed 27 files the fork also changes: Orchestrator.ts, ProviderTurnStartService.ts and its test, runtimeLayer.test.ts, ChatView.tsx, threadWorkflows.ts and its test, and the 10 web and 10 mobile catalogs.

Merged upstream main c198f73b37 into 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's carriesPendingContext (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.ts passes 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/main passes every step (43 packages, 1616 tests in 58 files).
  • vp run check:changed origin/main passes every step (1677 tests in 54 files).
  • fix(web): a click outside the project action editor no longer discards the draft pingdotgg/t3code#40776 landed during those runs, so I checked its 2 files separately (browser test 2/2).
  • 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.
  • One independent read-only review found no bugs.

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-increase label. These 17 commits change no migrations, lockfile or package manifests.

charlesbine and others added 18 commits November 21, 2026 23:17
…its (pingdotgg#39822)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: charlesbine <charlesbine@users.noreply.github.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>
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.
@radys-s radys-s added the agent-context-increase Accepts a larger agent context budget than main label Nov 22, 2026
@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 +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.

@radys-s
radys-s merged commit 0830f64 into main Nov 22, 2026
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accepts a larger agent context budget than main 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.

9 participants