chore: sync nightly v0.0.39-nightly.20260906.1292 into orchestration-v2 - #1
Open
charlieadair wants to merge 261 commits into
Open
chore: sync nightly v0.0.39-nightly.20260906.1292 into orchestration-v2#1charlieadair wants to merge 261 commits into
charlieadair wants to merge 261 commits into
Conversation
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…g#9564) Co-authored-by: Claude Code <noreply@anthropic.com>
…otgg#9565) Co-authored-by: Claude Code <noreply@anthropic.com>
…ngdotgg#9566) Co-authored-by: Claude Code <noreply@anthropic.com>
pingdotgg#9567) Co-authored-by: Claude Code <noreply@anthropic.com>
…gg#9568) Co-authored-by: Claude Code <noreply@anthropic.com>
…gg#9569) Co-authored-by: Claude Code <noreply@anthropic.com>
pingdotgg#9570) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
…tgg#9572) Co-authored-by: Claude Code <noreply@anthropic.com>
…9573) Co-authored-by: Claude Code <noreply@anthropic.com>
…rm (pingdotgg#9574) Co-authored-by: Claude Code <noreply@anthropic.com>
…ingdotgg#9575) Co-authored-by: Claude Code <noreply@anthropic.com>
…gdotgg#9576) Co-authored-by: Claude Code <noreply@anthropic.com>
…#9589) Co-authored-by: Claude Code <noreply@anthropic.com>
…#9770) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…tgg#9775) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otgg#10199) Co-authored-by: Claude Code <noreply@anthropic.com>
…ingdotgg#10200) Co-authored-by: Claude Code <noreply@anthropic.com>
…tgg#10173) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ing (pingdotgg#10210) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#10211) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…#9561) Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
…dotgg#10247) Co-authored-by: Claude Code <noreply@anthropic.com>
Merges 260 upstream commits (nightly .1279 -> .1292) into the v2 branch and reconciles them with the v2 orchestration stack. 108 files conflicted. Resolutions follow the branch's existing split: upstream owns provider/UI/docs behaviour, this branch owns orchestration. Notable calls: - Deleted v1 modules (adapters, reactors, ProviderService, ProviderSessionDirectory) stay deleted; upstream edits to them are dropped. - Upstream's provider-driver contract change (resolveMaintenance replacing maintenanceCapabilities) adopted across Cursor, Grok and AcpRegistry. - Upstream's persistent changed-files tree (pingdotgg#9821) adopted, replacing this branch's expand/compact-preview variant. - Upstream's warm thread resume (pingdotgg#9913) ported onto this branch's history-based snapshot model, and its retention change (pingdotgg#9740) adopted. - Upstream's agent-session import ported to v2: the thread is created through ThreadManagementService and the transcript is written as ordinary message/turn-item events, mirroring LegacyV1ThreadImporter so no new persisted event type is introduced. - Cursor stays on this branch's SDK path; main's ACP work is not carried in. Verified: vp run -r typecheck clean across all 15 projects; client-runtime (1306), web (3992) and the touched mobile suites pass. Model: Claude Opus 5. Harness: Claude Code.
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.
Brings 260 upstream commits (nightly
.1279→.1292) ontoorchestration-v2and reconciles them with the v2 orchestration stack. 108 files conflicted.How conflicts were resolved
The branch's existing split held: upstream owns provider, UI and docs behaviour; this branch owns orchestration. Where both sides changed the same thing, these were the judgement calls worth knowing about.
Kept this branch's side
ProviderService,ProviderSessionDirectory) stay deleted; upstream's edits to them are dropped.ws.ts,serverRuntimeStartup.ts,session-logic.ts,threads.tsand the mobile feed stay on their v2 shapes (runId/latestRun/runtimerather thanturnId/latestTurn/session).Adopted upstream's side
resolveMaintenancereplacesmaintenanceCapabilitiesacross Cursor, Grok and AcpRegistry.THREAD_SNAPSHOT_IDLE_TTL_MSmoves off the raw stream atom onto the derived detail atoms.thread-migrationnote and composer-context section carried across and four provider links repointed at the v2 modules.Ported rather than taken or dropped
matchesThreadSnapshotnow compareshistory.historyCursor/hasMoreHistoryinstead of the page cursor, andrememberruns on the applied-state path so the persist guard compares against live state rather than a stale commit.ThreadManagementServiceand the transcript is written as ordinarymessage.updated/turn-item.updatedevents, mirroringLegacyV1ThreadImporterso no new persisted event type is introduced.EventSinkV2andProviderSessionRuntimeRepositorymoved into the production layer so the requirement does not leak to every CLI caller.historyImportmetadata carried into this branch's consolidatedApplicationEventMetadata.Dropped
threads-atomssuite (restored to this branch's stub, updated for the new retention model),deriveTimelineEntriesWithState,deriveWorkLogEntries, upstream's older-page pagination tests, and one test driving anapplyLocksemaphore this branch does not have.buildRevertTurnCountByUserMessageIdandselectHandoffImageResources, which had no production consumer here after resolution.Verification
vp run -r typecheck— clean, all 15 projects.client-runtime— 1306/1306.web— 3992/3992.apps/server/src/project/AgentSessionImporter.test.ts— new focused v2 test, 2/2.Pre-existing and unrelated to this merge:
apps/web/src/terminal/ghostty/*files fail to load on.wasm?inline. Two are byte-identical to the merge base, and the failure reproduces with the pre-merge vite configs.pnpm installfails in this environment withCannot destructure property 'verified'. Root cause isWATCH_REPORT_DEPENDENCIES=1, inherited from the--watchdev-runner that hosts an agent session: every Node worker then posts awatch:requireframe first, and pnpm'sonce("message")consumes it instead of the real response. Unsetting that one variable fixes it. Worth knowing for anyone running installs from inside T3 Code.Follow-ups, not in this PR
8e2e8edd3, authored 2026-06-30) never landed onmain, and main has kept improving the ACP path since. Retiring the SDK path means ~3,200 lines and re-recording ~20 testkit fixtures against ACP.Model: Claude Opus 5. Harness: Claude Code.