[onmax]

Summary

The daily upstream sync has failed since 2026-09-25 because upstream merged orchestration V2 (pingdotgg#2829), which deleted the V1 ClaudeAdapter, CodexAdapter, and ProviderAdapter modules the embedded @t3tools/provider-runtime wrapped. This PR merges upstream/main (1238 commits) and rebuilds the runtime on the V2 adapters while keeping the host contract stable.

• Merge: upstream main through fix(server): runs no longer get stuck (#15048). Fork-owned workflows, the publishable @t3tools/contracts manifest, and the Claude SDK staging rules are preserved; the fork's edits to the deleted V1 adapters are dropped.
• Runtime: createProviderRuntime creates ClaudeAdapterV2 / CodexAdapterV2 instances. startSession opens a V2 session and thread, sendTurn starts a run or steers the active one, interruptTurn waits for the provider turn id. The new legacy-events.ts translates ProviderAdapterV2Event into the flat ProviderRuntimeEvent stream hosts consume (item.*, content.delta, request.*, user-input.*, turn.completed, turn.aborted, thread.token-usage.updated, task.*). The resume cursor is now the encoded OrchestrationV2ProviderThread; older cursors start a fresh thread.
• Fork adaptations moved to V2: ClaudeAdapterV2 loads the Claude SDK on first use (Codex-only hosts do not install it), guarded by ClaudeAdapterV2.lazy.test.ts. OrchestrationV2RpcSchemas and WsRpcGroup get explicit type annotations because their inferred types exceed the declaration serialization limit (TS7056); two Codex interfaces are exported so the bundle's declarations can name them.
• Includes fix(provider-runtime): import bundled Node builtins through ESM #5 (ESM Node builtins) as a cherry-pick so the published artifact works in Workers.
• The pack hooks remove the .d.ts files the TypeScript 7 generator writes beside server sources.
• sync-upstream.yml verifies the V2 lazy test instead of the deleted adapter tests; docs/internals/embedded-provider-runtime.md describes the V2 mapping.

Validation

• vp run --filter @t3tools/contracts build and typecheck
• vp run --filter @t3tools/provider-runtime build (bundle externals: effect/*, node:*, @t3tools/contracts; no __require("process"|"buffer"); no stray declarations)
• tsc --noEmit in packages/provider-runtime
• vp test run packages/provider-runtime/src apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.lazy.test.ts (21 tests, including the packed-artifact consumer test)
• vp test run apps/server/src/provider/Layers/ProviderRegistry.test.ts apps/server/src/provider/Layers/codexUsageLimits.test.ts apps/server/src/provider/Layers/claudeUsageLimits.test.ts scripts/lib/cli-external-packages.test.ts (103 tests)
• vp lint and vp fmt --check on the changed files

Not verified: a live Claude or Codex turn through the new runtime. The vitehub consumer bump will exercise it.

[vite-hub]

Waiting to start.

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-03T10:30:46.247718Z	cb8ae81	New commits

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

[chatgpt-codex-connector]

💡 Codex Review

t3code/packages/provider-runtime/src/index.ts

Lines 513 to 519 in cd2aa67

	const runtimePolicy: ProviderAdapterV2RuntimePolicy = {
	runtimeMode: runtimeMode ?? "full-access",
	interactionMode: "default",
	cwd: sessionInput.cwd ?? cwd,
	...(sessionInput.approvalPolicy === undefined
	? {}
	: { approvalPolicy: sessionInput.approvalPolicy }),

Preserve explicit sandbox restrictions

When an existing host passes sandboxMode: "read-only" or "workspace-write", the value remains in sessionInput but is never translated into runtimePolicy.sandboxPolicy; the replacement API also removes it from ProviderRuntimeStartInput. Consequently the default runtimeMode selects full access, so previously sandboxed embedded sessions can now write files and execute unrestricted commands. Map the legacy sandbox mode into the V2 policy rather than silently discarding it.

---

t3code/packages/provider-runtime/src/index.ts

Lines 609 to 611 in cd2aa67

	if (resumeThread === undefined || resumeThread.id !== providerThread.id) {
	try {
	await options.sessionStore?.set(threadId, resumeCursorFor(session));

Persist explicitly supplied resume cursors

When a host seeds a configured sessionStore with an explicit valid resumeCursor, a successful resume normally returns the same provider-thread ID, making this condition false and leaving the store empty. After the runtime is restarted without passing the cursor again, startSession cannot recover it and creates a fresh provider thread, losing the conversation that the store was intended to preserve. The current cursor should still be written when it originated from the call rather than the store.

---

t3code/packages/provider-runtime/src/legacy-events.ts

Lines 375 to 378 in cd2aa67

	const run = this.#runsByProviderTurnId.get(event.providerTurnId) ?? this.activeRun;
	if (run === undefined || run.terminal) return [];
	run.terminal = true;
	if (this.#activeRun === run) this.#activeRun = undefined;

Release completed-turn translation state

For a long-lived embedded session, every completed turn remains in all three run maps, while its nodes, items, requests, and completed subagents likewise remain in their registries; terminalization only flips a flag and clears #activeRun. Repeated turns and tool calls therefore make memory usage grow for the lifetime of the session. Remove state that can no longer receive updates, while retaining only genuinely active background-task state.

AGENTS.md reference: AGENTS.md:L15-L17

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

💡 Codex Review

t3code/packages/provider-runtime/src/index.ts

Line 594 in cb8ae81

turnOrdinal: 0,

Preserve turn ordinals when resuming a session

When a host recreates the runtime from a resumeCursor or sessionStore, this resets the ordinal to zero, so the next sendTurn derives the same runId/turnId as the thread's original first turn. Besides colliding with IDs already persisted by the host, Claude receives providerTurnOrdinal: 1; ClaudeAdapterV2 uses an ordinal greater than one to recognize a persisted session, so a normal restart can try to create the existing fixed session ID instead of resuming it and fail with a session-already-in-use error. The resume cursor needs to preserve the next ordinal or the runtime must otherwise initialize resumed sessions past their prior turns.

---

t3code/packages/provider-runtime/src/index.ts

Line 626 in cb8ae81

return legacySession(session);

Emit lifecycle events when starting embedded sessions

For both providers, a successful startSession now returns without enqueueing the session.started and thread.started events that the removed V1 adapters emitted as part of the published ProviderRuntimeEvent contract. LegacyEventTranslator cannot synthesize either event from the initial session/thread rows, so external hosts that wait for these lifecycle events to mark the session ready or record the provider thread ID will wait indefinitely even though startSession succeeded.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[pkg-pr-new]

Open in StackBlitz

pnpm add https://pkg.pr.new/vite-hub/t3code/@t3tools/contracts@6

pnpm add https://pkg.pr.new/vite-hub/t3code/@t3tools/provider-runtime@6

commit: cb8ae81

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.