diff --git a/.docs/provider-architecture.md b/.docs/provider-architecture.md
index 794b6aa5d5..9c140b2f4d 100644
--- a/.docs/provider-architecture.md
+++ b/.docs/provider-architecture.md
@@ -13,7 +13,7 @@ Methods mirror the `NativeApi` interface defined in `@t3tools/contracts`:
 - `providers.respondToRequest`, `providers.stopSession`
 - `shell.openInEditor`, `server.getConfig`
 
-Codex is the only implemented provider. `claudeCode` is reserved in contracts/UI.
+Codex is the only implemented provider. `claudeAgent` is reserved in contracts/UI.
 
 ## Client transport
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f3ead16e1..0db4aa5658 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -283,7 +283,7 @@ jobs:
         name: Mint release app token
         uses: actions/create-github-app-token@v2
         with:
-          app-id: ${{ vars.RELEASE_APP_ID }}
+          app-id: ${{ secrets.RELEASE_APP_ID }}
           private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
 
diff --git a/.plans/17-claude-agent.md b/.plans/17-claude-agent.md
new file mode 100644
index 0000000000..a2d906e0e0
--- /dev/null
+++ b/.plans/17-claude-agent.md
@@ -0,0 +1,441 @@
+# Plan: Claude Code Integration (Orchestration Architecture)
+
+## Why this plan was rewritten
+
+The previous plan targeted a pre-orchestration architecture (`ProviderManager`, provider-native WS event methods, and direct provider UI wiring). The current app now routes everything through:
+
+1. `orchestration.dispatchCommand` (client intent)
+2. `OrchestrationEngine` (decide + persist + publish domain events)
+3. `ProviderCommandReactor` (domain intent -> `ProviderService`)
+4. `ProviderService` (adapter routing + canonical runtime stream)
+5. `ProviderRuntimeIngestion` (provider runtime -> internal orchestration commands)
+6. `orchestration.domainEvent` (single push channel consumed by web)
+
+Claude integration must plug into this path instead of reintroducing legacy provider-specific flows.
+
+---
+
+## Current constraints to design around (post-Stage 1)
+
+1. Provider runtime ingestion expects canonical `ProviderRuntimeEvent` shapes, not provider-native payloads.
+2. Start input now uses typed `providerOptions` and generic `resumeCursor`; top-level provider-specific fields were removed.
+3. `resumeCursor` is intentionally opaque outside adapters and must never be synthesized from `providerThreadId`.
+4. `ProviderService` still requires adapter `startSession()` to return a `ProviderSession` with `threadId`.
+5. Checkpoint revert currently calls `providerService.rollbackConversation()`, so Claude adapter needs a rollback strategy compatible with current reactor behavior.
+6. Web currently marks Claude as unavailable (`"Claude Code (soon)"`) and model picker is Codex-only.
+
+---
+
+## Architecture target
+
+Add Claude as a first-class provider adapter that emits canonical runtime events and works with existing orchestration reactors without adding new WS channels or bypass paths.
+
+Key decisions:
+
+1. Keep orchestration provider-agnostic; adapt Claude inside adapter/layer boundaries.
+2. Use the existing canonical runtime stream (`ProviderRuntimeEvent`) as the only ingestion contract.
+3. Keep provider session routing in `ProviderService` and `ProviderSessionDirectory`.
+4. Add explicit provider selection to turn-start intent so first turn can start Claude session intentionally.
+
+---
+
+## Phase 1: Contracts and command shape updates
+
+### 1.1 Provider-aware model contract
+
+Update `packages/contracts/src/model.ts` so model resolution can be provider-aware instead of Codex-only.
+
+Expected outcomes:
+
+1. Introduce provider-scoped model lists (Codex + Claude).
+2. Add helpers that resolve model by provider.
+3. Preserve backwards compatibility for existing Codex defaults.
+
+### 1.2 Turn-start provider intent
+
+Update `packages/contracts/src/orchestration.ts`:
+
+1. Add optional `provider: ProviderKind` to `ThreadTurnStartCommand`.
+2. Carry provider through `ThreadTurnStartRequestedPayload`.
+3. Keep existing command valid when provider is omitted.
+
+This removes the implicit “Codex unless session already exists” behavior as the only path.
+
+### 1.3 Provider session start input for Claude runtime knobs (completed)
+
+Update `packages/contracts/src/provider.ts`:
+
+1. Move provider-specific start fields into typed `providerOptions`:
+   - `providerOptions.codex`
+   - `providerOptions.claudeCode`
+2. Keep `resumeCursor` as the single cross-provider resume input in `ProviderSessionStartInput`.
+3. Deprecate/remove `resumeThreadId` from the generic start contract.
+4. Treat `resumeCursor` as adapter-owned opaque state.
+
+### 1.4 Contract tests (completed)
+
+Update/add tests in `packages/contracts/src/*.test.ts` for:
+
+1. New command payload shape.
+2. Provider-aware model resolution behavior.
+3. Breaking-change expectations for removed top-level provider fields.
+
+---
+
+## Phase 2: Claude adapter implementation
+
+### 2.1 Add adapter service + layer
+
+Create:
+
+1. `apps/server/src/provider/Services/ClaudeAdapter.ts`
+2. `apps/server/src/provider/Layers/ClaudeAdapter.ts`
+
+Adapter must implement `ProviderAdapterShape<ProviderAdapterError>`.
+
+### 2.1.a SDK dependency and baseline config
+
+Add server dependency:
+
+1. `@anthropic-ai/claude-agent-sdk`
+
+Baseline adapter options to support from day one:
+
+1. `cwd`
+2. `model`
+3. `pathToClaudeCodeExecutable` (from `providerOptions.claudeCode.binaryPath`)
+4. `permissionMode` (from `providerOptions.claudeCode.permissionMode`)
+5. `maxThinkingTokens` (from `providerOptions.claudeCode.maxThinkingTokens`)
+6. `resume`
+7. `resumeSessionAt`
+8. `includePartialMessages`
+9. `canUseTool`
+10. `hooks`
+11. `env` and `additionalDirectories` (if needed for sandbox/workspace parity)
+
+### 2.2 Claude runtime bridge
+
+Implement a Claude runtime bridge (either directly in adapter layer or via dedicated manager file) that wraps Agent SDK query lifecycle.
+
+Required capabilities:
+
+1. Long-lived session context per adapter session.
+2. Multi-turn input queue.
+3. Interrupt support.
+4. Approval request/response bridge.
+5. Resume support via opaque `resumeCursor` (parsed inside Claude adapter only).
+
+#### 2.2.a Agent SDK details to preserve
+
+The adapter should explicitly rely on these SDK capabilities:
+
+1. `query()` returns an async iterable message stream and control methods (`interrupt`, `setModel`, `setPermissionMode`, `setMaxThinkingTokens`, account/status helpers).
+2. Multi-turn input is supported via async-iterable prompt input.
+3. Tool approval decisions are provided via `canUseTool`.
+4. Resume support uses `resume` and optional `resumeSessionAt`, both derived by parsing adapter-owned `resumeCursor`.
+5. Hooks can be used for lifecycle signals (`Stop`, `PostToolUse`, etc.) when we need adapter-originated checkpoint/runtime events.
+
+#### 2.2.b Effect-native session lifecycle skeleton
+
+```ts
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import { Effect } from "effect";
+
+const acquireSession = (input: ProviderSessionStartInput) =>
+  Effect.acquireRelease(
+    Effect.tryPromise({
+      try: async () => {
+        const claudeOptions = input.providerOptions?.claudeCode;
+        const resumeState = readClaudeResumeState(input.resumeCursor);
+        const abortController = new AbortController();
+        const result = query({
+          prompt: makePromptAsyncIterable(),
+          options: {
+            cwd: input.cwd,
+            model: input.model,
+            permissionMode: claudeOptions?.permissionMode,
+            maxThinkingTokens: claudeOptions?.maxThinkingTokens,
+            pathToClaudeCodeExecutable: claudeOptions?.binaryPath,
+            resume: resumeState?.threadId,
+            resumeSessionAt: resumeState?.sessionAt,
+            signal: abortController.signal,
+            includePartialMessages: true,
+            canUseTool: makeCanUseTool(),
+            hooks: makeClaudeHooks(),
+          },
+        });
+        return { abortController, result };
+      },
+      catch: (cause) =>
+        new ProviderAdapterProcessError({
+          provider: "claudeCode",
+          sessionId: "pending",
+          detail: "Failed to start Claude runtime session.",
+          cause,
+        }),
+    }),
+    ({ abortController }) => Effect.sync(() => abortController.abort()),
+  );
+```
+
+#### 2.2.c AsyncIterable -> Effect Stream integration
+
+Preferred when available in the pinned Effect version:
+
+```ts
+const sdkMessageStream = Stream.fromAsyncIterable(
+  session.result,
+  (cause) =>
+    new ProviderAdapterProcessError({
+      provider: "claudeCode",
+      sessionId,
+      detail: "Claude runtime stream failed.",
+      cause,
+    }),
+);
+```
+
+Portable fallback (already aligned with current server patterns):
+
+```ts
+const sdkMessageStream = Stream.async<ClaudeSdkMessage, ProviderAdapterProcessError>((emit) => {
+  let cancelled = false;
+  void (async () => {
+    try {
+      for await (const message of session.result) {
+        if (cancelled) break;
+        emit.single(message);
+      }
+      emit.end();
+    } catch (cause) {
+      emit.fail(
+        new ProviderAdapterProcessError({
+          provider: "claudeCode",
+          sessionId,
+          detail: "Claude runtime stream failed.",
+          cause,
+        }),
+      );
+    }
+  })();
+  return Effect.sync(() => {
+    cancelled = true;
+  });
+});
+```
+
+### 2.3 Canonical event mapping
+
+Claude adapter must translate Agent SDK output into canonical `ProviderRuntimeEvent`.
+
+Initial mapping target:
+
+1. assistant text deltas -> `content.delta`
+2. final assistant text -> `item.completed` and/or `turn.completed`
+3. approval requests -> `request.opened`
+4. approval results -> `request.resolved`
+5. system lifecycle -> `session.*`, `thread.*`, `turn.*`
+6. errors -> `runtime.error`
+7. plan/proposed-plan content when derivable
+
+Implementation note:
+
+1. Keep raw Claude message on `raw` for debugging.
+2. Prefer canonical item/request kinds over provider-native enums.
+3. If Claude emits extra event kinds we do not model yet, map them to `tool.summary`, `runtime.warning`, or `unknown`-compatible payloads instead of dropping silently.
+
+### 2.4 Resume cursor strategy
+
+Define Claude-owned opaque resume state, e.g.:
+
+```ts
+interface ClaudeResumeCursor {
+  readonly version: 1;
+  readonly threadId?: string;
+  readonly sessionAt?: string;
+}
+```
+
+Rules:
+
+1. Serialize only adapter-owned state into `resumeCursor`.
+2. Parse/validate only inside Claude adapter.
+3. Store updated cursor when Claude runtime yields enough data to resume safely.
+4. Never overload orchestration thread id as Claude thread id.
+
+### 2.5 Interrupt and stop semantics
+
+Map orchestration stop/interrupt expectations onto SDK controls:
+
+1. `interruptTurn()` -> active query interrupt.
+2. `stopSession()` -> close session resources and prevent future sends.
+3. `rollbackThread()` -> see Phase 4.
+
+---
+
+## Phase 3: Provider service and composition
+
+### 3.1 Register Claude adapter
+
+Update provider registry layer to include Claude:
+
+1. add `claudeCode` -> `ClaudeAdapter`
+2. ensure `ProviderService.listProviderStatuses()` reports Claude availability
+
+### 3.2 Persist provider binding
+
+Current `ProviderSessionDirectory` already stores provider/thread binding and opaque `resumeCursor`.
+
+Required validation:
+
+1. Claude bindings survive restart.
+2. resume cursor remains opaque and round-trips untouched.
+3. stopAll + restart can recover Claude sessions when possible.
+
+### 3.3 Provider start routing
+
+Update `ProviderCommandReactor` / orchestration flow:
+
+1. If a thread turn start requests `provider: "claudeCode"`, start Claude if no active session exists.
+2. If a thread already has Claude session binding, reuse it.
+3. If provider switches between Codex and Claude, explicitly stop/rebind before next send.
+
+---
+
+## Phase 4: Checkpoint and revert strategy
+
+Claude does not necessarily expose the same conversation rewind primitive as Codex app-server. Current architecture expects `providerService.rollbackConversation()`.
+
+Pick one explicit strategy:
+
+### Option A: provider-native rewind
+
+If SDK/runtime supports safe rewind:
+
+1. implement in Claude adapter
+2. keep `CheckpointReactor` unchanged
+
+### Option B: session restart + state truncation shim
+
+If no native rewind exists:
+
+1. Claude adapter returns successful rollback by:
+   - stopping current Claude session
+   - clearing/rewriting stored Claude resume cursor to last safe resumable point
+   - forcing next turn to recreate session from persisted orchestration state
+2. Document that rollback is “conversation reset to checkpoint boundary”, not provider-native turn deletion.
+
+Whichever option is chosen:
+
+1. behavior must be deterministic
+2. checkpoint revert tests must pass under orchestration expectations
+3. user-visible activity log should explain failures clearly when provider rollback is impossible
+
+---
+
+## Phase 5: Web integration
+
+### 5.1 Provider picker and model picker
+
+Update web state/UI:
+
+1. allow choosing Claude as thread provider before first turn
+2. show Claude model list from provider-aware model helpers
+3. preserve existing Codex default behavior when provider omitted
+
+Likely touch points:
+
+1. `apps/web/src/store.ts`
+2. `apps/web/src/components/ChatView.tsx`
+3. `apps/web/src/types.ts`
+4. `packages/shared/src/model.ts`
+
+### 5.2 Settings for Claude executable/options
+
+Add app settings if needed for:
+
+1. Claude binary path
+2. default permission mode
+3. default max thinking tokens
+
+Do not hardcode provider-specific config into generic session state if it belongs in app settings or typed `providerOptions`.
+
+### 5.3 Session rendering
+
+No new WS channel should be needed. Claude should appear through existing:
+
+1. thread messages
+2. activities/worklog
+3. approvals
+4. session state
+5. checkpoints/diffs
+
+---
+
+## Phase 6: Testing strategy
+
+### 6.1 Contract tests
+
+Cover:
+
+1. provider-aware model schemas
+2. provider field on turn-start command
+3. provider-specific start options schema
+
+### 6.2 Adapter layer tests
+
+Add `ClaudeAdapter.test.ts` covering:
+
+1. session start
+2. event mapping
+3. approval bridge
+4. resume cursor parse/serialize
+5. interrupt behavior
+6. rollback behavior or explicit unsupported error path
+
+Use SDK-facing layer tests/mocks only at the boundary. Do not mock orchestration business logic in higher-level tests.
+
+### 6.3 Provider service integration tests
+
+Extend provider integration coverage so Claude is exercised through `ProviderService`:
+
+1. start Claude session
+2. send turn
+3. receive canonical runtime events
+4. restart/recover using persisted binding
+
+### 6.4 Orchestration integration tests
+
+Add/extend integration tests around:
+
+1. first-turn provider selection
+2. Claude approval requests routed through orchestration
+3. Claude runtime ingestion -> messages/activities/session updates
+4. checkpoint revert behavior under Claude
+5. stopAll/restart recovery
+
+These should validate real orchestration flows, not just adapter behavior.
+
+---
+
+## Phase 7: Rollout order
+
+Recommended implementation order:
+
+1. contracts/provider-aware models
+2. provider field on turn-start
+3. Claude adapter skeleton + start/send/stream
+4. canonical event mapping
+5. provider registry/service wiring
+6. orchestration recovery + checkpoint strategy
+7. web provider/model picker
+8. full integration tests
+
+---
+
+## Non-goals
+
+1. Reintroducing provider-specific WS methods/channels.
+2. Storing provider-native thread ids as orchestration ids.
+3. Bypassing orchestration engine for Claude-specific UI flows.
+4. Encoding Claude resume semantics outside adapter-owned `resumeCursor`.
diff --git a/.plans/17-claude-code.md b/.plans/17-claude-code.md
index 822dbd806b..c697011d3c 100644
--- a/.plans/17-claude-code.md
+++ b/.plans/17-claude-code.md
@@ -1,6 +1,6 @@
 # Plan: Claude Code Integration (Orchestration Architecture)
 
-> **Note -- Multi-provider scope:** This plan was originally written for the Claude Code adapter, but the patterns described here (adapter shape, canonical runtime mapping, resume cursor ownership, provider registry wiring, and orchestration integration) apply equally to the full multi-provider adapter infrastructure now implemented in this PR: **ClaudeCodeAdapter**, **CopilotAdapter**, **OpenCodeAdapter**, **GeminiCliAdapter**, **KiloAdapter**, and **AmpAdapter**. Where the text says "Claude adapter", read it as the reference implementation; every other adapter follows the same contract surface.
+> **Note -- Multi-provider scope:** This plan was originally written for the Claude Code adapter, but the patterns described here (adapter shape, canonical runtime mapping, resume cursor ownership, provider registry wiring, and orchestration integration) apply equally to the full multi-provider adapter infrastructure now implemented in this PR: **ClaudeAdapter**, **CopilotAdapter**, **OpenCodeAdapter**, **GeminiCliAdapter**, **KiloAdapter**, and **AmpAdapter**. Where the text says "Claude adapter", read it as the reference implementation; every other adapter follows the same contract surface.
 
 ## Why this plan was rewritten
 
@@ -90,8 +90,8 @@ Update/add tests in `packages/contracts/src/*.test.ts` for:
 
 Create:
 
-1. `apps/server/src/provider/Services/ClaudeCodeAdapter.ts`
-2. `apps/server/src/provider/Layers/ClaudeCodeAdapter.ts`
+1. `apps/server/src/provider/Services/ClaudeAdapter.ts`
+2. `apps/server/src/provider/Layers/ClaudeAdapter.ts`
 
 Adapter must implement `ProviderAdapterShape<ProviderAdapterError>`.
 
@@ -181,7 +181,7 @@ const acquireSession = (input: ProviderSessionStartInput) =>
       },
       catch: (cause) =>
         new ProviderAdapterProcessError({
-          provider: "claudeCode",
+          provider: "claudeAgent",
           sessionId: "pending",
           detail: "Failed to start Claude runtime session.",
           cause,
@@ -200,7 +200,7 @@ const sdkMessageStream = Stream.fromAsyncIterable(
   session.result,
   (cause) =>
     new ProviderAdapterProcessError({
-      provider: "claudeCode",
+      provider: "claudeAgent",
       sessionId,
       detail: "Claude runtime stream failed.",
       cause,
@@ -223,7 +223,7 @@ const sdkMessageStream = Stream.async<ClaudeSdkMessage, ProviderAdapterProcessEr
     } catch (cause) {
       emit.fail(
         new ProviderAdapterProcessError({
-          provider: "claudeCode",
+          provider: "claudeAgent",
           sessionId,
           detail: "Claude runtime stream failed.",
           cause,
@@ -292,7 +292,7 @@ Map orchestration stop/interrupt expectations onto SDK controls:
 
 Update provider registry layer to include Claude:
 
-1. add `claudeCode` -> `ClaudeCodeAdapter`
+1. add `claudeAgent` -> `ClaudeAdapter`
 2. ensure `ProviderService.listProviderStatuses()` reports Claude availability
 
 ### 3.2 Persist provider binding
@@ -309,7 +309,7 @@ Required validation:
 
 Update `ProviderCommandReactor` / orchestration flow:
 
-1. If a thread turn start requests `provider: "claudeCode"`, start Claude if no active session exists.
+1. If a thread turn start requests `provider: "claudeAgent"`, start Claude if no active session exists.
 2. If a thread already has Claude session binding, reuse it.
 3. If provider switches between Codex and Claude, explicitly stop/rebind before next send.
 
@@ -405,7 +405,7 @@ Cover:
 
 ### 6.2 Adapter layer tests
 
-Add `ClaudeCodeAdapter.test.ts` covering:
+Add `ClaudeAdapter.test.ts` covering:
 
 1. session start
 2. event mapping
diff --git a/AGENTS.md b/AGENTS.md
index deb69993c5..59dc4f8cd6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,7 +16,7 @@
 
 ## Project Snapshot
 
-T3 Code is a minimal web GUI for using code agents like Codex and Claude Code (coming soon).
+T3 Code is a minimal web GUI for using coding agents like Codex and Claude.
 
 This repository is a VERY EARLY WIP. Proposing sweeping changes that improve long-term maintainability is encouraged.
 
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index a955b4297b..06ce46c94c 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.0.5",
+  "version": "0.0.13",
   "private": true,
   "main": "dist-electron/main.js",
   "scripts": {
diff --git a/apps/server/integration/OrchestrationEngineHarness.integration.ts b/apps/server/integration/OrchestrationEngineHarness.integration.ts
index 642f9b3dec..c237246ab2 100644
--- a/apps/server/integration/OrchestrationEngineHarness.integration.ts
+++ b/apps/server/integration/OrchestrationEngineHarness.integration.ts
@@ -6,6 +6,7 @@ import { execFileSync } from "node:child_process";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import {
   ApprovalRequestId,
+  ProviderKind,
   type OrchestrationEvent,
   type OrchestrationThread,
 } from "@t3tools/contracts";
@@ -205,7 +206,7 @@ export interface OrchestrationIntegrationHarness {
 }
 
 interface MakeOrchestrationIntegrationHarnessOptions {
-  readonly provider?: "codex" | "claudeCode";
+  readonly provider?: ProviderKind;
   readonly realCodex?: boolean;
 }
 
diff --git a/apps/server/integration/TestProviderAdapter.integration.ts b/apps/server/integration/TestProviderAdapter.integration.ts
index 76a9cb8973..187f471866 100644
--- a/apps/server/integration/TestProviderAdapter.integration.ts
+++ b/apps/server/integration/TestProviderAdapter.integration.ts
@@ -10,6 +10,7 @@ import {
   ProviderTurnStartResult,
   ThreadId,
   TurnId,
+  ProviderKind,
 } from "@t3tools/contracts";
 import { Effect, Queue, Stream } from "effect";
 
@@ -36,7 +37,7 @@ export interface TestTurnResponse {
 export type FixtureProviderRuntimeEvent = {
   readonly type: string;
   readonly eventId: EventId;
-  readonly provider: "codex" | "claudeCode" | "cursor";
+  readonly provider: ProviderKind;
   readonly createdAt: string;
   readonly threadId: string;
   readonly turnId?: string | undefined;
@@ -178,7 +179,7 @@ function normalizeFixtureEvent(rawEvent: Record<string, unknown>): ProviderRunti
 
 export interface TestProviderAdapterHarness {
   readonly adapter: ProviderAdapterShape<ProviderAdapterError>;
-  readonly provider: "codex" | "claudeCode";
+  readonly provider: ProviderKind;
   readonly queueTurnResponse: (
     threadId: ThreadId,
     response: TestTurnResponse,
@@ -198,7 +199,7 @@ export interface TestProviderAdapterHarness {
 }
 
 interface MakeTestProviderAdapterHarnessOptions {
-  readonly provider?: "codex" | "claudeCode";
+  readonly provider?: ProviderKind;
 }
 
 function nowIso(): string {
@@ -206,7 +207,7 @@ function nowIso(): string {
 }
 
 function sessionNotFound(
-  provider: "codex" | "claudeCode",
+  provider: ProviderKind,
   threadId: ThreadId,
 ): ProviderAdapterSessionNotFoundError {
   return new ProviderAdapterSessionNotFoundError({
@@ -216,7 +217,7 @@ function sessionNotFound(
 }
 
 function missingSessionEffect(
-  provider: "codex" | "claudeCode",
+  provider: ProviderKind,
   threadId: ThreadId,
 ): Effect.Effect<never, ProviderAdapterError> {
   return Effect.fail(sessionNotFound(provider, threadId));
diff --git a/apps/server/integration/orchestrationEngine.integration.test.ts b/apps/server/integration/orchestrationEngine.integration.test.ts
index 5223ead40b..2c116751e6 100644
--- a/apps/server/integration/orchestrationEngine.integration.test.ts
+++ b/apps/server/integration/orchestrationEngine.integration.test.ts
@@ -5,9 +5,11 @@ import {
   ApprovalRequestId,
   CommandId,
   DEFAULT_PROVIDER_INTERACTION_MODE,
+  DEFAULT_MODEL_BY_PROVIDER,
   EventId,
   MessageId,
   ProjectId,
+  ProviderKind,
   ThreadId,
 } from "@t3tools/contracts";
 import { assert, it } from "@effect/vitest";
@@ -36,7 +38,7 @@ const PROJECT_ID = asProjectId("project-1");
 const THREAD_ID = ThreadId.makeUnsafe("thread-1");
 const FIXTURE_TURN_ID = "fixture-turn";
 const APPROVAL_REQUEST_ID = asApprovalRequestId("req-approval-1");
-type IntegrationProvider = "codex" | "claudeCode";
+type IntegrationProvider = ProviderKind;
 
 function nowIso() {
   return new Date().toISOString();
@@ -105,6 +107,8 @@ function withRealCodexHarness<A, E>(
 const seedProjectAndThread = (harness: OrchestrationIntegrationHarness) =>
   Effect.gen(function* () {
     const createdAt = nowIso();
+    const provider = harness.adapterHarness?.provider ?? "codex";
+    const defaultModel = DEFAULT_MODEL_BY_PROVIDER[provider];
 
     yield* harness.engine.dispatch({
       type: "project.create",
@@ -112,7 +116,7 @@ const seedProjectAndThread = (harness: OrchestrationIntegrationHarness) =>
       projectId: PROJECT_ID,
       title: "Integration Project",
       workspaceRoot: harness.workspaceDir,
-      defaultModel: "gpt-5-codex",
+      defaultModel,
       createdAt,
     });
 
@@ -122,7 +126,7 @@ const seedProjectAndThread = (harness: OrchestrationIntegrationHarness) =>
       threadId: THREAD_ID,
       projectId: PROJECT_ID,
       title: "Integration Thread",
-      model: "gpt-5-codex",
+      model: defaultModel,
       interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
       runtimeMode: "approval-required",
       branch: null,
@@ -883,7 +887,7 @@ it.live(
     ),
 );
 
-it.live("starts a claudeCode session on first turn when provider is requested", () =>
+it.live("starts a claudeAgent session on first turn when provider is requested", () =>
   withHarness(
     (harness) =>
       Effect.gen(function* () {
@@ -893,20 +897,20 @@ it.live("starts a claudeCode session on first turn when provider is requested",
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-start-1", "2026-02-24T10:10:00.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-start-1", "2026-02-24T10:10:00.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-start-2", "2026-02-24T10:10:00.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-start-2", "2026-02-24T10:10:00.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "Claude first turn.\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-start-3", "2026-02-24T10:10:00.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-start-3", "2026-02-24T10:10:00.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -919,25 +923,25 @@ it.live("starts a claudeCode session on first turn when provider is requested",
           commandId: "cmd-turn-start-claude-initial",
           messageId: "msg-user-claude-initial",
           text: "Use Claude",
-          provider: "claudeCode",
+          provider: "claudeAgent",
         });
 
         const thread = yield* harness.waitForThread(
           THREAD_ID,
           (entry) =>
-            entry.session?.providerName === "claudeCode" &&
+            entry.session?.providerName === "claudeAgent" &&
             entry.session.status === "ready" &&
             entry.messages.some(
               (message) => message.role === "assistant" && message.text === "Claude first turn.\n",
             ),
         );
-        assert.equal(thread.session?.providerName, "claudeCode");
+        assert.equal(thread.session?.providerName, "claudeAgent");
       }),
-    "claudeCode",
+    "claudeAgent",
   ),
 );
 
-it.live("recovers claudeCode sessions after provider stopAll using persisted resume state", () =>
+it.live("recovers claudeAgent sessions after provider stopAll using persisted resume state", () =>
   withHarness(
     (harness) =>
       Effect.gen(function* () {
@@ -947,20 +951,20 @@ it.live("recovers claudeCode sessions after provider stopAll using persisted res
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-recover-1", "2026-02-24T10:11:00.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-1", "2026-02-24T10:11:00.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-recover-2", "2026-02-24T10:11:00.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-2", "2026-02-24T10:11:00.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "Turn before restart.\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-recover-3", "2026-02-24T10:11:00.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-3", "2026-02-24T10:11:00.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -973,7 +977,7 @@ it.live("recovers claudeCode sessions after provider stopAll using persisted res
           commandId: "cmd-turn-start-claude-recover-1",
           messageId: "msg-user-claude-recover-1",
           text: "Before restart",
-          provider: "claudeCode",
+          provider: "claudeAgent",
         });
 
         yield* harness.waitForThread(
@@ -993,20 +997,20 @@ it.live("recovers claudeCode sessions after provider stopAll using persisted res
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-recover-4", "2026-02-24T10:11:01.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-4", "2026-02-24T10:11:01.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-recover-5", "2026-02-24T10:11:01.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-5", "2026-02-24T10:11:01.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "Turn after restart.\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-recover-6", "2026-02-24T10:11:01.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-recover-6", "2026-02-24T10:11:01.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -1029,20 +1033,20 @@ it.live("recovers claudeCode sessions after provider stopAll using persisted res
         const recoveredThread = yield* harness.waitForThread(
           THREAD_ID,
           (entry) =>
-            entry.session?.providerName === "claudeCode" &&
+            entry.session?.providerName === "claudeAgent" &&
             entry.messages.some(
               (message) => message.role === "user" && message.text === "After restart",
             ) &&
             !entry.activities.some((activity) => activity.kind === "provider.turn.start.failed"),
         );
-        assert.equal(recoveredThread.session?.providerName, "claudeCode");
+        assert.equal(recoveredThread.session?.providerName, "claudeAgent");
         assert.equal(recoveredThread.session?.threadId, "thread-1");
       }),
-    "claudeCode",
+    "claudeAgent",
   ),
 );
 
-it.live("forwards claudeCode approval responses to the provider session", () =>
+it.live("forwards claudeAgent approval responses to the provider session", () =>
   withHarness(
     (harness) =>
       Effect.gen(function* () {
@@ -1052,13 +1056,13 @@ it.live("forwards claudeCode approval responses to the provider session", () =>
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-approval-1", "2026-02-24T10:12:00.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-approval-1", "2026-02-24T10:12:00.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "approval.requested",
-              ...runtimeBase("evt-claude-approval-2", "2026-02-24T10:12:00.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-approval-2", "2026-02-24T10:12:00.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               requestId: APPROVAL_REQUEST_ID,
@@ -1067,7 +1071,7 @@ it.live("forwards claudeCode approval responses to the provider session", () =>
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-approval-3", "2026-02-24T10:12:00.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-approval-3", "2026-02-24T10:12:00.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -1080,7 +1084,7 @@ it.live("forwards claudeCode approval responses to the provider session", () =>
           commandId: "cmd-turn-start-claude-approval",
           messageId: "msg-user-claude-approval",
           text: "Need approval",
-          provider: "claudeCode",
+          provider: "claudeAgent",
         });
 
         const thread = yield* harness.waitForThread(THREAD_ID, (entry) =>
@@ -1109,11 +1113,11 @@ it.live("forwards claudeCode approval responses to the provider session", () =>
         );
         assert.equal(approvalResponses[0]?.decision, "accept");
       }),
-    "claudeCode",
+    "claudeAgent",
   ),
 );
 
-it.live("forwards thread.turn.interrupt to claudeCode provider sessions", () =>
+it.live("forwards thread.turn.interrupt to claudeAgent provider sessions", () =>
   withHarness(
     (harness) =>
       Effect.gen(function* () {
@@ -1123,20 +1127,20 @@ it.live("forwards thread.turn.interrupt to claudeCode provider sessions", () =>
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-interrupt-1", "2026-02-24T10:13:00.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-interrupt-1", "2026-02-24T10:13:00.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-interrupt-2", "2026-02-24T10:13:00.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-interrupt-2", "2026-02-24T10:13:00.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "Long running output.\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-interrupt-3", "2026-02-24T10:13:00.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-interrupt-3", "2026-02-24T10:13:00.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -1149,7 +1153,7 @@ it.live("forwards thread.turn.interrupt to claudeCode provider sessions", () =>
           commandId: "cmd-turn-start-claude-interrupt",
           messageId: "msg-user-claude-interrupt",
           text: "Start long turn",
-          provider: "claudeCode",
+          provider: "claudeAgent",
         });
 
         const thread = yield* harness.waitForThread(
@@ -1175,11 +1179,11 @@ it.live("forwards thread.turn.interrupt to claudeCode provider sessions", () =>
         );
         assert.equal(interruptCalls.length, 1);
       }),
-    "claudeCode",
+    "claudeAgent",
   ),
 );
 
-it.live("reverts claudeCode turns and rolls back provider conversation state", () =>
+it.live("reverts claudeAgent turns and rolls back provider conversation state", () =>
   withHarness(
     (harness) =>
       Effect.gen(function* () {
@@ -1189,20 +1193,20 @@ it.live("reverts claudeCode turns and rolls back provider conversation state", (
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-revert-1", "2026-02-24T10:14:00.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-1", "2026-02-24T10:14:00.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-revert-2", "2026-02-24T10:14:00.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-2", "2026-02-24T10:14:00.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "README -> v2\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-revert-3", "2026-02-24T10:14:00.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-3", "2026-02-24T10:14:00.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -1219,7 +1223,7 @@ it.live("reverts claudeCode turns and rolls back provider conversation state", (
           commandId: "cmd-turn-start-claude-revert-1",
           messageId: "msg-user-claude-revert-1",
           text: "First Claude edit",
-          provider: "claudeCode",
+          provider: "claudeAgent",
         });
 
         yield* harness.waitForThread(
@@ -1232,20 +1236,20 @@ it.live("reverts claudeCode turns and rolls back provider conversation state", (
           events: [
             {
               type: "turn.started",
-              ...runtimeBase("evt-claude-revert-4", "2026-02-24T10:14:01.000Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-4", "2026-02-24T10:14:01.000Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
             },
             {
               type: "message.delta",
-              ...runtimeBase("evt-claude-revert-5", "2026-02-24T10:14:01.050Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-5", "2026-02-24T10:14:01.050Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               delta: "README -> v3\n",
             },
             {
               type: "turn.completed",
-              ...runtimeBase("evt-claude-revert-6", "2026-02-24T10:14:01.100Z", "claudeCode"),
+              ...runtimeBase("evt-claude-revert-6", "2026-02-24T10:14:01.100Z", "claudeAgent"),
               threadId: THREAD_ID,
               turnId: FIXTURE_TURN_ID,
               status: "completed",
@@ -1269,7 +1273,7 @@ it.live("reverts claudeCode turns and rolls back provider conversation state", (
           (entry) =>
             entry.latestTurn?.turnId === "turn-2" &&
             entry.checkpoints.length === 2 &&
-            entry.session?.providerName === "claudeCode",
+            entry.session?.providerName === "claudeAgent",
         );
 
         yield* harness.engine.dispatch({
@@ -1296,6 +1300,6 @@ it.live("reverts claudeCode turns and rolls back provider conversation state", (
         );
         assert.deepEqual(harness.adapterHarness!.getRollbackCalls(THREAD_ID), [1]);
       }),
-    "claudeCode",
+    "claudeAgent",
   ),
 );
diff --git a/apps/server/package.json b/apps/server/package.json
index 093e4b69a2..bf2011b4ce 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "t3",
-  "version": "0.0.5",
+  "version": "0.0.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/pingdotgg/t3code",
@@ -22,7 +22,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.71",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.77",
     "@effect/platform-node": "catalog:",
     "@effect/sql-sqlite-bun": "catalog:",
     "@github/copilot": "1.0.2",
diff --git a/apps/server/src/codexAppServerManager.test.ts b/apps/server/src/codexAppServerManager.test.ts
index 2dfe4689d7..ad33503e4d 100644
--- a/apps/server/src/codexAppServerManager.test.ts
+++ b/apps/server/src/codexAppServerManager.test.ts
@@ -37,6 +37,7 @@ function createSendTurnHarness() {
       planType: null,
       sparkEnabled: true,
     },
+    collabReceiverTurns: new Map(),
   };
 
   const requireSession = vi
@@ -75,6 +76,7 @@ function createThreadControlHarness() {
       createdAt: "2026-02-10T00:00:00.000Z",
       updatedAt: "2026-02-10T00:00:00.000Z",
     },
+    collabReceiverTurns: new Map(),
   };
 
   const requireSession = vi
@@ -146,6 +148,7 @@ function createPendingUserInputHarness() {
         },
       ],
     ]),
+    collabReceiverTurns: new Map(),
   };
 
   const requireSession = vi
@@ -164,6 +167,43 @@ function createPendingUserInputHarness() {
   return { manager, context, requireSession, writeMessage, emitEvent };
 }
 
+function createCollabNotificationHarness() {
+  const manager = new CodexAppServerManager();
+  const context = {
+    session: {
+      provider: "codex",
+      status: "running",
+      threadId: asThreadId("thread_1"),
+      runtimeMode: "full-access",
+      model: "gpt-5.3-codex",
+      activeTurnId: "turn_parent",
+      resumeCursor: { threadId: "provider_parent" },
+      createdAt: "2026-02-10T00:00:00.000Z",
+      updatedAt: "2026-02-10T00:00:00.000Z",
+    },
+    account: {
+      type: "unknown",
+      planType: null,
+      sparkEnabled: true,
+    },
+    pending: new Map(),
+    pendingApprovals: new Map(),
+    pendingUserInputs: new Map(),
+    collabReceiverTurns: new Map<string, string>(),
+    nextRequestId: 1,
+    stopping: false,
+  };
+
+  const emitEvent = vi
+    .spyOn(manager as unknown as { emitEvent: (...args: unknown[]) => void }, "emitEvent")
+    .mockImplementation(() => {});
+  const updateSession = vi
+    .spyOn(manager as unknown as { updateSession: (...args: unknown[]) => void }, "updateSession")
+    .mockImplementation(() => {});
+
+  return { manager, context, emitEvent, updateSession };
+}
+
 describe("classifyCodexStderrLine", () => {
   it("ignores empty lines", () => {
     expect(classifyCodexStderrLine("   ")).toBeNull();
@@ -784,6 +824,7 @@ describe("respondToUserInput", () => {
       },
       pendingApprovals: new Map(),
       pendingUserInputs: new Map(),
+      collabReceiverTurns: new Map(),
     };
     type ApprovalRequestContext = {
       session: typeof context.session;
@@ -811,6 +852,152 @@ describe("respondToUserInput", () => {
   });
 });
 
+describe("collab child conversation routing", () => {
+  it("rewrites child notification turn ids onto the parent turn", () => {
+    const { manager, context, emitEvent } = createCollabNotificationHarness();
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "item/completed",
+      params: {
+        item: {
+          type: "collabAgentToolCall",
+          id: "call_collab_1",
+          receiverThreadIds: ["child_provider_1"],
+        },
+        threadId: "provider_parent",
+        turnId: "turn_parent",
+      },
+    });
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "item/agentMessage/delta",
+      params: {
+        threadId: "child_provider_1",
+        turnId: "turn_child_1",
+        itemId: "msg_child_1",
+        delta: "working",
+      },
+    });
+
+    expect(emitEvent).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        method: "item/agentMessage/delta",
+        turnId: "turn_parent",
+        itemId: "msg_child_1",
+      }),
+    );
+  });
+
+  it("suppresses child lifecycle notifications so they cannot replace the parent turn", () => {
+    const { manager, context, emitEvent, updateSession } = createCollabNotificationHarness();
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "item/completed",
+      params: {
+        item: {
+          type: "collabAgentToolCall",
+          id: "call_collab_1",
+          receiverThreadIds: ["child_provider_1"],
+        },
+        threadId: "provider_parent",
+        turnId: "turn_parent",
+      },
+    });
+    emitEvent.mockClear();
+    updateSession.mockClear();
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "turn/started",
+      params: {
+        threadId: "child_provider_1",
+        turn: { id: "turn_child_1" },
+      },
+    });
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "turn/completed",
+      params: {
+        threadId: "child_provider_1",
+        turn: { id: "turn_child_1", status: "completed" },
+      },
+    });
+
+    expect(emitEvent).not.toHaveBeenCalled();
+    expect(updateSession).not.toHaveBeenCalled();
+  });
+
+  it("rewrites child approval requests onto the parent turn", () => {
+    const { manager, context, emitEvent } = createCollabNotificationHarness();
+
+    (
+      manager as unknown as {
+        handleServerNotification: (context: unknown, notification: Record<string, unknown>) => void;
+      }
+    ).handleServerNotification(context, {
+      method: "item/completed",
+      params: {
+        item: {
+          type: "collabAgentToolCall",
+          id: "call_collab_1",
+          receiverThreadIds: ["child_provider_1"],
+        },
+        threadId: "provider_parent",
+        turnId: "turn_parent",
+      },
+    });
+    emitEvent.mockClear();
+
+    (
+      manager as unknown as {
+        handleServerRequest: (context: unknown, request: Record<string, unknown>) => void;
+      }
+    ).handleServerRequest(context, {
+      id: 42,
+      method: "item/commandExecution/requestApproval",
+      params: {
+        threadId: "child_provider_1",
+        turnId: "turn_child_1",
+        itemId: "call_child_1",
+        command: "bun install",
+      },
+    });
+
+    expect(Array.from(context.pendingApprovals.values())[0]).toEqual(
+      expect.objectContaining({
+        turnId: "turn_parent",
+        itemId: "call_child_1",
+      }),
+    );
+    expect(emitEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        method: "item/commandExecution/requestApproval",
+        turnId: "turn_parent",
+        itemId: "call_child_1",
+      }),
+    );
+  });
+});
+
 describe.skipIf(!process.env.CODEX_BINARY_PATH)("startSession live Codex resume", () => {
   it("keeps prior thread history when resuming with a changed runtime mode", async () => {
     const workspaceDir = mkdtempSync(path.join(os.tmpdir(), "codex-live-resume-"));
diff --git a/apps/server/src/codexAppServerManager.ts b/apps/server/src/codexAppServerManager.ts
index e9a99f720d..2adec89eb4 100644
--- a/apps/server/src/codexAppServerManager.ts
+++ b/apps/server/src/codexAppServerManager.ts
@@ -71,6 +71,7 @@ interface CodexSessionContext {
   pending: Map<PendingRequestKey, PendingRequest>;
   pendingApprovals: Map<ApprovalRequestId, PendingApprovalRequest>;
   pendingUserInputs: Map<ApprovalRequestId, PendingUserInputRequest>;
+  collabReceiverTurns: Map<string, TurnId>;
   nextRequestId: number;
   stopping: boolean;
 }
@@ -573,6 +574,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
         pending: new Map(),
         pendingApprovals: new Map(),
         pendingUserInputs: new Map(),
+        collabReceiverTurns: new Map(),
         nextRequestId: 1,
         stopping: false,
       };
@@ -734,6 +736,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
 
   async sendTurn(input: CodexAppServerSendTurnInput): Promise<ProviderTurnStartResult> {
     const context = this.requireSession(input.threadId);
+    context.collabReceiverTurns.clear();
 
     const turnInput: Array<
       { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
@@ -1172,7 +1175,16 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     context: CodexSessionContext,
     notification: JsonRpcNotification,
   ): void {
-    const route = this.readRouteFields(notification.params);
+    const rawRoute = this.readRouteFields(notification.params);
+    this.rememberCollabReceiverTurns(context, notification.params, rawRoute.turnId);
+    const childParentTurnId = this.readChildParentTurnId(context, notification.params);
+    const isChildConversation = childParentTurnId !== undefined;
+    if (
+      isChildConversation &&
+      this.shouldSuppressChildConversationNotification(notification.method)
+    ) {
+      return;
+    }
     const textDelta =
       notification.method === "item/agentMessage/delta"
         ? this.readString(notification.params, "delta")
@@ -1185,8 +1197,10 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
       threadId: context.session.threadId,
       createdAt: new Date().toISOString(),
       method: notification.method,
-      turnId: route.turnId,
-      itemId: route.itemId,
+      ...((childParentTurnId ?? rawRoute.turnId)
+        ? { turnId: childParentTurnId ?? rawRoute.turnId }
+        : {}),
+      ...(rawRoute.itemId ? { itemId: rawRoute.itemId } : {}),
       textDelta,
       payload: notification.params,
     });
@@ -1202,6 +1216,9 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     }
 
     if (notification.method === "turn/started") {
+      if (isChildConversation) {
+        return;
+      }
       const turnId = toTurnId(this.readString(this.readObject(notification.params)?.turn, "id"));
       this.updateSession(context, {
         status: "running",
@@ -1211,6 +1228,10 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     }
 
     if (notification.method === "turn/completed") {
+      if (isChildConversation) {
+        return;
+      }
+      context.collabReceiverTurns.clear();
       const turn = this.readObject(notification.params, "turn");
       const status = this.readString(turn, "status");
       const errorMessage = this.readString(this.readObject(turn, "error"), "message");
@@ -1223,6 +1244,9 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     }
 
     if (notification.method === "error") {
+      if (isChildConversation) {
+        return;
+      }
       const message = this.readString(this.readObject(notification.params)?.error, "message");
       const willRetry = this.readBoolean(notification.params, "willRetry");
 
@@ -1234,7 +1258,9 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
   }
 
   private handleServerRequest(context: CodexSessionContext, request: JsonRpcRequest): void {
-    const route = this.readRouteFields(request.params);
+    const rawRoute = this.readRouteFields(request.params);
+    const childParentTurnId = this.readChildParentTurnId(context, request.params);
+    const effectiveTurnId = childParentTurnId ?? rawRoute.turnId;
     const requestKind = this.requestKindForMethod(request.method);
     let requestId: ApprovalRequestId | undefined;
     if (requestKind) {
@@ -1250,8 +1276,8 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
               : "item/fileChange/requestApproval",
         requestKind,
         threadId: context.session.threadId,
-        ...(route.turnId ? { turnId: route.turnId } : {}),
-        ...(route.itemId ? { itemId: route.itemId } : {}),
+        ...(effectiveTurnId ? { turnId: effectiveTurnId } : {}),
+        ...(rawRoute.itemId ? { itemId: rawRoute.itemId } : {}),
       };
       context.pendingApprovals.set(requestId, pendingRequest);
     }
@@ -1262,8 +1288,8 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
         requestId,
         jsonRpcId: request.id,
         threadId: context.session.threadId,
-        ...(route.turnId ? { turnId: route.turnId } : {}),
-        ...(route.itemId ? { itemId: route.itemId } : {}),
+        ...(effectiveTurnId ? { turnId: effectiveTurnId } : {}),
+        ...(rawRoute.itemId ? { itemId: rawRoute.itemId } : {}),
       });
     }
 
@@ -1274,8 +1300,8 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
       threadId: context.session.threadId,
       createdAt: new Date().toISOString(),
       method: request.method,
-      turnId: route.turnId,
-      itemId: route.itemId,
+      ...(effectiveTurnId ? { turnId: effectiveTurnId } : {}),
+      ...(rawRoute.itemId ? { itemId: rawRoute.itemId } : {}),
       requestId,
       requestKind,
       payload: request.params,
@@ -1502,6 +1528,64 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     return route;
   }
 
+  private readProviderConversationId(params: unknown): string | undefined {
+    return (
+      this.readString(params, "threadId") ??
+      this.readString(this.readObject(params, "thread"), "id") ??
+      this.readString(params, "conversationId")
+    );
+  }
+
+  private readChildParentTurnId(context: CodexSessionContext, params: unknown): TurnId | undefined {
+    const providerConversationId = this.readProviderConversationId(params);
+    if (!providerConversationId) {
+      return undefined;
+    }
+    return context.collabReceiverTurns.get(providerConversationId);
+  }
+
+  private rememberCollabReceiverTurns(
+    context: CodexSessionContext,
+    params: unknown,
+    parentTurnId: TurnId | undefined,
+  ): void {
+    if (!parentTurnId) {
+      return;
+    }
+    const payload = this.readObject(params);
+    const item = this.readObject(payload, "item") ?? payload;
+    const itemType = this.readString(item, "type") ?? this.readString(item, "kind");
+    if (itemType !== "collabAgentToolCall") {
+      return;
+    }
+
+    const receiverThreadIds =
+      this.readArray(item, "receiverThreadIds")
+        ?.map((value) => (typeof value === "string" ? value : null))
+        .filter((value): value is string => value !== null) ?? [];
+    for (const receiverThreadId of receiverThreadIds) {
+      context.collabReceiverTurns.set(receiverThreadId, parentTurnId);
+    }
+  }
+
+  private shouldSuppressChildConversationNotification(method: string): boolean {
+    return (
+      method === "thread/started" ||
+      method === "thread/status/changed" ||
+      method === "thread/archived" ||
+      method === "thread/unarchived" ||
+      method === "thread/closed" ||
+      method === "thread/compacted" ||
+      method === "thread/name/updated" ||
+      method === "thread/tokenUsage/updated" ||
+      method === "turn/started" ||
+      method === "turn/completed" ||
+      method === "turn/aborted" ||
+      method === "turn/plan/updated" ||
+      method === "item/plan/delta"
+    );
+  }
+
   private readObject(value: unknown, key?: string): Record<string, unknown> | undefined {
     const target =
       key === undefined
diff --git a/apps/server/src/git/Layers/GitManager.test.ts b/apps/server/src/git/Layers/GitManager.test.ts
index f60dc7c100..78f8c3cac0 100644
--- a/apps/server/src/git/Layers/GitManager.test.ts
+++ b/apps/server/src/git/Layers/GitManager.test.ts
@@ -454,7 +454,7 @@ function runStackedAction(
     provider?:
       | "codex"
       | "copilot"
-      | "claudeCode"
+      | "claudeAgent"
       | "cursor"
       | "opencode"
       | "geminiCli"
diff --git a/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts b/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
index 64547bd0ef..1f366eacbe 100644
--- a/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { execFileSync } from "node:child_process";
 
-import type { ProviderRuntimeEvent, ProviderSession } from "@t3tools/contracts";
+import type { ProviderKind, ProviderRuntimeEvent, ProviderSession } from "@t3tools/contracts";
 import {
   CommandId,
   DEFAULT_PROVIDER_INTERACTION_MODE,
@@ -45,15 +45,7 @@ const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
 type LegacyProviderRuntimeEvent = {
   readonly type: string;
   readonly eventId: EventId;
-  readonly provider:
-    | "codex"
-    | "copilot"
-    | "claudeCode"
-    | "cursor"
-    | "opencode"
-    | "geminiCli"
-    | "amp"
-    | "kilo";
+  readonly provider: ProviderKind;
   readonly createdAt: string;
   readonly threadId: ThreadId;
   readonly turnId?: string | undefined;
@@ -67,7 +59,7 @@ function createProviderServiceHarness(
   cwd: string,
   hasSession = true,
   sessionCwd = cwd,
-  providerName: "codex" | "claudeCode" = "codex",
+  providerName: "codex" | "claudeAgent" = "codex",
 ) {
   const now = new Date().toISOString();
   const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
@@ -244,7 +236,7 @@ describe("CheckpointReactor", () => {
     readonly projectWorkspaceRoot?: string;
     readonly threadWorktreePath?: string | null;
     readonly providerSessionCwd?: string;
-    readonly providerName?: "codex" | "claudeCode";
+    readonly providerName?: "codex" | "claudeAgent";
   }) {
     const cwd = createGitRepository();
     tempDirs.push(cwd);
@@ -487,10 +479,10 @@ describe("CheckpointReactor", () => {
     expect(thread.checkpoints[0]?.checkpointTurnCount).toBe(1);
   });
 
-  it("captures pre-turn and completion checkpoints for claudeCode runtime events", async () => {
+  it("captures pre-turn and completion checkpoints for claudeAgent runtime events", async () => {
     const harness = await createHarness({
       seedFilesystemCheckpoints: false,
-      providerName: "claudeCode",
+      providerName: "claudeAgent",
     });
     const createdAt = new Date().toISOString();
 
@@ -502,7 +494,7 @@ describe("CheckpointReactor", () => {
         session: {
           threadId: ThreadId.makeUnsafe("thread-1"),
           status: "ready",
-          providerName: "claudeCode",
+          providerName: "claudeAgent",
           runtimeMode: "approval-required",
           activeTurnId: null,
           lastError: null,
@@ -515,7 +507,7 @@ describe("CheckpointReactor", () => {
     harness.provider.emit({
       type: "turn.started",
       eventId: EventId.makeUnsafe("evt-turn-started-claude-1"),
-      provider: "claudeCode",
+      provider: "claudeAgent",
       createdAt: new Date().toISOString(),
       threadId: ThreadId.makeUnsafe("thread-1"),
       turnId: asTurnId("turn-claude-1"),
@@ -529,7 +521,7 @@ describe("CheckpointReactor", () => {
     harness.provider.emit({
       type: "turn.completed",
       eventId: EventId.makeUnsafe("evt-turn-completed-claude-1"),
-      provider: "claudeCode",
+      provider: "claudeAgent",
       createdAt: new Date().toISOString(),
       threadId: ThreadId.makeUnsafe("thread-1"),
       turnId: asTurnId("turn-claude-1"),
@@ -863,8 +855,8 @@ describe("CheckpointReactor", () => {
     ).toBe(false);
   });
 
-  it("executes provider revert and emits thread.reverted for claudeCode sessions", async () => {
-    const harness = await createHarness({ providerName: "claudeCode" });
+  it("executes provider revert and emits thread.reverted for claudeAgent sessions", async () => {
+    const harness = await createHarness({ providerName: "claudeAgent" });
     const createdAt = new Date().toISOString();
 
     await Effect.runPromise(
@@ -875,7 +867,7 @@ describe("CheckpointReactor", () => {
         session: {
           threadId: ThreadId.makeUnsafe("thread-1"),
           status: "ready",
-          providerName: "claudeCode",
+          providerName: "claudeAgent",
           runtimeMode: "approval-required",
           activeTurnId: null,
           lastError: null,
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
index d15b2efa2e..5fbe3016fd 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
@@ -1729,6 +1729,8 @@ it.effect("restores pending turn-start metadata across projection pipeline resta
     const threadId = ThreadId.makeUnsafe("thread-restart");
     const turnId = TurnId.makeUnsafe("turn-restart");
     const messageId = MessageId.makeUnsafe("message-restart");
+    const sourcePlanThreadId = ThreadId.makeUnsafe("thread-plan-source");
+    const sourcePlanId = "plan-source";
     const turnStartedAt = "2026-02-26T14:00:00.000Z";
     const sessionSetAt = "2026-02-26T14:00:05.000Z";
 
@@ -1749,6 +1751,10 @@ it.effect("restores pending turn-start metadata across projection pipeline resta
         payload: {
           threadId,
           messageId,
+          sourceProposedPlan: {
+            threadId: sourcePlanThreadId,
+            planId: sourcePlanId,
+          },
           runtimeMode: "approval-required",
           createdAt: turnStartedAt,
         },
@@ -1800,11 +1806,15 @@ it.effect("restores pending turn-start metadata across projection pipeline resta
       return yield* sql<{
         readonly turnId: string;
         readonly userMessageId: string | null;
+        readonly sourceProposedPlanThreadId: string | null;
+        readonly sourceProposedPlanId: string | null;
         readonly startedAt: string;
       }>`
         SELECT
           turn_id AS "turnId",
           pending_message_id AS "userMessageId",
+          source_proposed_plan_thread_id AS "sourceProposedPlanThreadId",
+          source_proposed_plan_id AS "sourceProposedPlanId",
           started_at AS "startedAt"
         FROM projection_turns
         WHERE turn_id = ${turnId}
@@ -1815,6 +1825,8 @@ it.effect("restores pending turn-start metadata across projection pipeline resta
       {
         turnId: "turn-restart",
         userMessageId: "message-restart",
+        sourceProposedPlanThreadId: "thread-plan-source",
+        sourceProposedPlanId: "plan-source",
         startedAt: turnStartedAt,
       },
     ]);
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
index 6ae94105a6..d46764cc8c 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
@@ -653,6 +653,8 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
             threadId: event.payload.threadId,
             turnId: event.payload.proposedPlan.turnId,
             planMarkdown: event.payload.proposedPlan.planMarkdown,
+            implementedAt: event.payload.proposedPlan.implementedAt,
+            implementationThreadId: event.payload.proposedPlan.implementationThreadId,
             createdAt: event.payload.proposedPlan.createdAt,
             updatedAt: event.payload.proposedPlan.updatedAt,
           });
@@ -775,6 +777,8 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
           yield* projectionTurnRepository.replacePendingTurnStart({
             threadId: event.payload.threadId,
             messageId: event.payload.messageId,
+            sourceProposedPlanThreadId: event.payload.sourceProposedPlan?.threadId ?? null,
+            sourceProposedPlanId: event.payload.sourceProposedPlan?.planId ?? null,
             requestedAt: event.payload.createdAt,
           });
           return;
@@ -804,6 +808,16 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
               pendingMessageId:
                 existingTurn.value.pendingMessageId ??
                 (Option.isSome(pendingTurnStart) ? pendingTurnStart.value.messageId : null),
+              sourceProposedPlanThreadId:
+                existingTurn.value.sourceProposedPlanThreadId ??
+                (Option.isSome(pendingTurnStart)
+                  ? pendingTurnStart.value.sourceProposedPlanThreadId
+                  : null),
+              sourceProposedPlanId:
+                existingTurn.value.sourceProposedPlanId ??
+                (Option.isSome(pendingTurnStart)
+                  ? pendingTurnStart.value.sourceProposedPlanId
+                  : null),
               startedAt:
                 existingTurn.value.startedAt ??
                 (Option.isSome(pendingTurnStart)
@@ -822,6 +836,12 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
               pendingMessageId: Option.isSome(pendingTurnStart)
                 ? pendingTurnStart.value.messageId
                 : null,
+              sourceProposedPlanThreadId: Option.isSome(pendingTurnStart)
+                ? pendingTurnStart.value.sourceProposedPlanThreadId
+                : null,
+              sourceProposedPlanId: Option.isSome(pendingTurnStart)
+                ? pendingTurnStart.value.sourceProposedPlanId
+                : null,
               assistantMessageId: null,
               state: "running",
               requestedAt: Option.isSome(pendingTurnStart)
@@ -875,6 +895,8 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
             turnId: event.payload.turnId,
             threadId: event.payload.threadId,
             pendingMessageId: null,
+            sourceProposedPlanThreadId: null,
+            sourceProposedPlanId: null,
             assistantMessageId: event.payload.messageId,
             state: event.payload.streaming ? "running" : "completed",
             requestedAt: event.payload.createdAt,
@@ -910,6 +932,8 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
             turnId: event.payload.turnId,
             threadId: event.payload.threadId,
             pendingMessageId: null,
+            sourceProposedPlanThreadId: null,
+            sourceProposedPlanId: null,
             assistantMessageId: null,
             state: "interrupted",
             requestedAt: event.payload.createdAt,
@@ -954,6 +978,8 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {
             turnId: event.payload.turnId,
             threadId: event.payload.threadId,
             pendingMessageId: null,
+            sourceProposedPlanThreadId: null,
+            sourceProposedPlanId: null,
             assistantMessageId: event.payload.assistantMessageId,
             state: nextState,
             requestedAt: event.payload.completedAt,
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
index fc7db54802..b5b73fd6e0 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
@@ -26,6 +26,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
 
       yield* sql`DELETE FROM projection_projects`;
       yield* sql`DELETE FROM projection_state`;
+      yield* sql`DELETE FROM projection_thread_proposed_plans`;
       yield* sql`DELETE FROM projection_turns`;
 
       yield* sql`
@@ -101,6 +102,29 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
         )
       `;
 
+      yield* sql`
+        INSERT INTO projection_thread_proposed_plans (
+          plan_id,
+          thread_id,
+          turn_id,
+          plan_markdown,
+          implemented_at,
+          implementation_thread_id,
+          created_at,
+          updated_at
+        )
+        VALUES (
+          'plan-1',
+          'thread-1',
+          'turn-1',
+          '# Ship it',
+          '2026-02-24T00:00:05.500Z',
+          'thread-2',
+          '2026-02-24T00:00:05.000Z',
+          '2026-02-24T00:00:05.500Z'
+        )
+      `;
+
       yield* sql`
         INSERT INTO projection_thread_activities (
           activity_id,
@@ -154,6 +178,8 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           thread_id,
           turn_id,
           pending_message_id,
+          source_proposed_plan_thread_id,
+          source_proposed_plan_id,
           assistant_message_id,
           state,
           requested_at,
@@ -168,6 +194,8 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           'thread-1',
           'turn-1',
           NULL,
+          'thread-1',
+          'plan-1',
           'message-1',
           'completed',
           '2026-02-24T00:00:08.000Z',
@@ -238,6 +266,10 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
             startedAt: "2026-02-24T00:00:08.000Z",
             completedAt: "2026-02-24T00:00:08.000Z",
             assistantMessageId: asMessageId("message-1"),
+            sourceProposedPlan: {
+              threadId: ThreadId.makeUnsafe("thread-1"),
+              planId: "plan-1",
+            },
           },
           createdAt: "2026-02-24T00:00:02.000Z",
           updatedAt: "2026-02-24T00:00:03.000Z",
@@ -253,7 +285,17 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
               updatedAt: "2026-02-24T00:00:05.000Z",
             },
           ],
-          proposedPlans: [],
+          proposedPlans: [
+            {
+              id: "plan-1",
+              turnId: asTurnId("turn-1"),
+              planMarkdown: "# Ship it",
+              implementedAt: "2026-02-24T00:00:05.500Z",
+              implementationThreadId: ThreadId.makeUnsafe("thread-2"),
+              createdAt: "2026-02-24T00:00:05.000Z",
+              updatedAt: "2026-02-24T00:00:05.500Z",
+            },
+          ],
           activities: [
             {
               id: asEventId("activity-1"),
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
index 5fd38a5401..849d2fa3b6 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
@@ -4,8 +4,10 @@ import {
   MessageId,
   NonNegativeInt,
   OrchestrationCheckpointFile,
+  OrchestrationProposedPlanId,
   OrchestrationReadModel,
   ProjectScript,
+  ThreadId,
   TurnId,
   type OrchestrationCheckpointSummary,
   type OrchestrationLatestTurn,
@@ -74,6 +76,8 @@ const ProjectionLatestTurnDbRowSchema = Schema.Struct({
   startedAt: Schema.NullOr(IsoDateTime),
   completedAt: Schema.NullOr(IsoDateTime),
   assistantMessageId: Schema.NullOr(MessageId),
+  sourceProposedPlanThreadId: Schema.NullOr(ThreadId),
+  sourceProposedPlanId: Schema.NullOr(OrchestrationProposedPlanId),
 });
 const ProjectionStateDbRowSchema = ProjectionState;
 
@@ -200,6 +204,8 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           thread_id AS "threadId",
           turn_id AS "turnId",
           plan_markdown AS "planMarkdown",
+          implemented_at AS "implementedAt",
+          implementation_thread_id AS "implementationThreadId",
           created_at AS "createdAt",
           updated_at AS "updatedAt"
         FROM projection_thread_proposed_plans
@@ -284,7 +290,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           requested_at AS "requestedAt",
           started_at AS "startedAt",
           completed_at AS "completedAt",
-          assistant_message_id AS "assistantMessageId"
+          assistant_message_id AS "assistantMessageId",
+          source_proposed_plan_thread_id AS "sourceProposedPlanThreadId",
+          source_proposed_plan_id AS "sourceProposedPlanId"
         FROM projection_turns
         WHERE turn_id IS NOT NULL
         ORDER BY thread_id ASC, requested_at DESC, turn_id DESC
@@ -435,6 +443,8 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
               id: row.planId,
               turnId: row.turnId,
               planMarkdown: row.planMarkdown,
+              implementedAt: row.implementedAt,
+              implementationThreadId: row.implementationThreadId,
               createdAt: row.createdAt,
               updatedAt: row.updatedAt,
             });
@@ -497,6 +507,14 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
               startedAt: row.startedAt,
               completedAt: row.completedAt,
               assistantMessageId: row.assistantMessageId,
+              ...(row.sourceProposedPlanThreadId !== null && row.sourceProposedPlanId !== null
+                ? {
+                    sourceProposedPlan: {
+                      threadId: row.sourceProposedPlanThreadId,
+                      planId: row.sourceProposedPlanId,
+                    },
+                  }
+                : {}),
             });
           }
 
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
index 4c530ecec9..ef4ef4ba69 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
@@ -84,9 +84,13 @@ describe("ProviderCommandReactor", () => {
     createdStateDirs.clear();
   });
 
-  async function createHarness(input?: { readonly stateDir?: string }) {
+  async function createHarness(input?: {
+    readonly stateDir?: string;
+    readonly threadModel?: string;
+  }) {
     const now = new Date().toISOString();
     const stateDir = input?.stateDir ?? fs.mkdtempSync(path.join(os.tmpdir(), "t3code-reactor-"));
+    const threadModel = input?.threadModel ?? "gpt-5-codex";
     createdStateDirs.add(stateDir);
     const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
     let nextSessionIndex = 1;
@@ -98,7 +102,7 @@ describe("ProviderCommandReactor", () => {
         input !== null &&
         "provider" in input &&
         (input.provider === "codex" ||
-          input.provider === "claudeCode" ||
+          input.provider === "claudeAgent" ||
           input.provider === "cursor")
           ? input.provider
           : "codex";
@@ -132,7 +136,7 @@ describe("ProviderCommandReactor", () => {
             : "full-access",
         ...(model !== undefined ? { model } : {}),
         threadId,
-        resumeCursor: resumeCursor ?? { opaque: `cursor-${sessionIndex}` },
+        resumeCursor: resumeCursor ?? { opaque: `resume-${sessionIndex}` },
         createdAt: now,
         updatedAt: now,
       };
@@ -228,7 +232,7 @@ describe("ProviderCommandReactor", () => {
         projectId: asProjectId("project-1"),
         title: "Provider Project",
         workspaceRoot: "/tmp/provider-project",
-        defaultModel: "gpt-5-codex",
+        defaultModel: threadModel,
         createdAt: now,
       }),
     );
@@ -239,7 +243,7 @@ describe("ProviderCommandReactor", () => {
         threadId: ThreadId.makeUnsafe("thread-1"),
         projectId: asProjectId("project-1"),
         title: "Thread",
-        model: "gpt-5-codex",
+        model: threadModel,
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "approval-required",
         branch: null,
@@ -351,6 +355,106 @@ describe("ProviderCommandReactor", () => {
     });
   });
 
+  it("forwards claude effort options through session start and turn send", async () => {
+    const harness = await createHarness({ threadModel: "claude-sonnet-4-6" });
+    const now = new Date().toISOString();
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-claude-effort"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        message: {
+          messageId: asMessageId("user-message-claude-effort"),
+          role: "user",
+          text: "hello with effort",
+          attachments: [],
+        },
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        modelOptions: {
+          claudeAgent: {
+            effort: "max",
+          },
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: now,
+      }),
+    );
+
+    await waitFor(() => harness.startSession.mock.calls.length === 1);
+    await waitFor(() => harness.sendTurn.mock.calls.length === 1);
+    expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
+      provider: "claudeAgent",
+      model: "claude-sonnet-4-6",
+      modelOptions: {
+        claudeAgent: {
+          effort: "max",
+        },
+      },
+    });
+    expect(harness.sendTurn.mock.calls[0]?.[0]).toMatchObject({
+      threadId: ThreadId.makeUnsafe("thread-1"),
+      model: "claude-sonnet-4-6",
+      modelOptions: {
+        claudeAgent: {
+          effort: "max",
+        },
+      },
+    });
+  });
+
+  it("forwards claude fast mode options through session start and turn send", async () => {
+    const harness = await createHarness({ threadModel: "claude-opus-4-6" });
+    const now = new Date().toISOString();
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-claude-fast-mode"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        message: {
+          messageId: asMessageId("user-message-claude-fast-mode"),
+          role: "user",
+          text: "hello with fast mode",
+          attachments: [],
+        },
+        provider: "claudeAgent",
+        model: "claude-opus-4-6",
+        modelOptions: {
+          claudeAgent: {
+            fastMode: true,
+          },
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: now,
+      }),
+    );
+
+    await waitFor(() => harness.startSession.mock.calls.length === 1);
+    await waitFor(() => harness.sendTurn.mock.calls.length === 1);
+    expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
+      provider: "claudeAgent",
+      model: "claude-opus-4-6",
+      modelOptions: {
+        claudeAgent: {
+          fastMode: true,
+        },
+      },
+    });
+    expect(harness.sendTurn.mock.calls[0]?.[0]).toMatchObject({
+      threadId: ThreadId.makeUnsafe("thread-1"),
+      model: "claude-opus-4-6",
+      modelOptions: {
+        claudeAgent: {
+          fastMode: true,
+        },
+      },
+    });
+  });
+
   it("forwards plan interaction mode to the provider turn request", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();
@@ -404,7 +508,7 @@ describe("ProviderCommandReactor", () => {
           text: "hello claude",
           attachments: [],
         },
-        provider: "claudeCode",
+        provider: "claudeAgent",
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "approval-required",
         createdAt: now,
@@ -414,7 +518,7 @@ describe("ProviderCommandReactor", () => {
     await waitFor(() => harness.startSession.mock.calls.length === 1);
     await waitFor(() => harness.sendTurn.mock.calls.length === 1);
     expect(harness.startSession.mock.calls[0]?.[1]).toMatchObject({
-      provider: "claudeCode",
+      provider: "claudeAgent",
       cwd: "/tmp/provider-project",
       model: "gpt-5-codex",
       runtimeMode: "approval-required",
@@ -422,7 +526,7 @@ describe("ProviderCommandReactor", () => {
 
     const readModel = await Effect.runPromise(harness.engine.getReadModel());
     const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
-    expect(thread?.session?.providerName).toBe("claudeCode");
+    expect(thread?.session?.providerName).toBe("claudeAgent");
     expect(thread?.session?.threadId).toBe("thread-1");
   });
 
@@ -509,73 +613,28 @@ describe("ProviderCommandReactor", () => {
     expect(harness.stopSession.mock.calls.length).toBe(0);
   });
 
-  it("reuses the same cursor session when requested model is unchanged", async () => {
-    const harness = await createHarness();
+  it("restarts claude sessions when claude effort changes", async () => {
+    const harness = await createHarness({ threadModel: "claude-sonnet-4-6" });
     const now = new Date().toISOString();
 
     await Effect.runPromise(
       harness.engine.dispatch({
         type: "thread.turn.start",
-        commandId: CommandId.makeUnsafe("cmd-turn-start-cursor-model-same-1"),
+        commandId: CommandId.makeUnsafe("cmd-turn-start-claude-effort-1"),
         threadId: ThreadId.makeUnsafe("thread-1"),
         message: {
-          messageId: asMessageId("user-message-cursor-model-same-1"),
+          messageId: asMessageId("user-message-claude-effort-1"),
           role: "user",
-          text: "first",
+          text: "first claude turn",
           attachments: [],
         },
-        provider: "cursor",
-        model: "composer-1.5",
-        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
-        runtimeMode: "approval-required",
-        createdAt: now,
-      }),
-    );
-
-    await waitFor(() => harness.startSession.mock.calls.length === 1);
-    await waitFor(() => harness.sendTurn.mock.calls.length === 1);
-
-    await Effect.runPromise(
-      harness.engine.dispatch({
-        type: "thread.turn.start",
-        commandId: CommandId.makeUnsafe("cmd-turn-start-cursor-model-same-2"),
-        threadId: ThreadId.makeUnsafe("thread-1"),
-        message: {
-          messageId: asMessageId("user-message-cursor-model-same-2"),
-          role: "user",
-          text: "second",
-          attachments: [],
-        },
-        provider: "cursor",
-        model: "composer-1.5",
-        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
-        runtimeMode: "approval-required",
-        createdAt: now,
-      }),
-    );
-
-    await waitFor(() => harness.sendTurn.mock.calls.length === 2);
-    expect(harness.startSession.mock.calls.length).toBe(1);
-    expect(harness.stopSession.mock.calls.length).toBe(0);
-  });
-
-  it("keeps cursor session/model when model change is unsupported", async () => {
-    const harness = await createHarness();
-    const now = new Date().toISOString();
-
-    await Effect.runPromise(
-      harness.engine.dispatch({
-        type: "thread.turn.start",
-        commandId: CommandId.makeUnsafe("cmd-turn-start-cursor-model-change-1"),
-        threadId: ThreadId.makeUnsafe("thread-1"),
-        message: {
-          messageId: asMessageId("user-message-cursor-model-change-1"),
-          role: "user",
-          text: "first",
-          attachments: [],
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        modelOptions: {
+          claudeAgent: {
+            effort: "medium",
+          },
         },
-        provider: "cursor",
-        model: "gpt-5.3-codex",
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "approval-required",
         createdAt: now,
@@ -588,29 +647,37 @@ describe("ProviderCommandReactor", () => {
     await Effect.runPromise(
       harness.engine.dispatch({
         type: "thread.turn.start",
-        commandId: CommandId.makeUnsafe("cmd-turn-start-cursor-model-change-2"),
+        commandId: CommandId.makeUnsafe("cmd-turn-start-claude-effort-2"),
         threadId: ThreadId.makeUnsafe("thread-1"),
         message: {
-          messageId: asMessageId("user-message-cursor-model-change-2"),
+          messageId: asMessageId("user-message-claude-effort-2"),
           role: "user",
-          text: "second",
+          text: "second claude turn",
           attachments: [],
         },
-        provider: "cursor",
-        model: "composer-1.5",
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        modelOptions: {
+          claudeAgent: {
+            effort: "max",
+          },
+        },
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "approval-required",
         createdAt: now,
       }),
     );
 
+    await waitFor(() => harness.startSession.mock.calls.length === 2);
     await waitFor(() => harness.sendTurn.mock.calls.length === 2);
-
-    expect(harness.stopSession.mock.calls.length).toBe(0);
-    expect(harness.startSession.mock.calls.length).toBe(1);
-    expect(harness.sendTurn.mock.calls[1]?.[0]).toMatchObject({
-      threadId: ThreadId.makeUnsafe("thread-1"),
-      model: "gpt-5.3-codex",
+    expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({
+      provider: "claudeAgent",
+      resumeCursor: { opaque: "resume-1" },
+      modelOptions: {
+        claudeAgent: {
+          effort: "max",
+        },
+      },
     });
   });
 
@@ -688,7 +755,7 @@ describe("ProviderCommandReactor", () => {
     expect(harness.stopSession.mock.calls.length).toBe(0);
     expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({
       threadId: ThreadId.makeUnsafe("thread-1"),
-      resumeCursor: { opaque: "cursor-1" },
+      resumeCursor: { opaque: "resume-1" },
       runtimeMode: "approval-required",
     });
     expect(harness.sendTurn.mock.calls[1]?.[0]).toMatchObject({
@@ -736,7 +803,7 @@ describe("ProviderCommandReactor", () => {
           text: "second",
           attachments: [],
         },
-        provider: "claudeCode",
+        provider: "claudeAgent",
         interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
         runtimeMode: "approval-required",
         createdAt: now,
@@ -749,7 +816,7 @@ describe("ProviderCommandReactor", () => {
     expect(harness.stopSession.mock.calls.length).toBe(0);
     expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({
       threadId: ThreadId.makeUnsafe("thread-1"),
-      provider: "claudeCode",
+      provider: "claudeAgent",
       runtimeMode: "approval-required",
     });
     expect(harness.startSession.mock.calls[1]?.[1]).not.toHaveProperty("resumeCursor");
@@ -757,7 +824,7 @@ describe("ProviderCommandReactor", () => {
     const readModel = await Effect.runPromise(harness.engine.getReadModel());
     const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
     expect(thread?.session?.threadId).toBe("thread-1");
-    expect(thread?.session?.providerName).toBe("claudeCode");
+    expect(thread?.session?.providerName).toBe("claudeAgent");
     expect(thread?.session?.runtimeMode).toBe("approval-required");
   });
 
@@ -1036,6 +1103,7 @@ describe("ProviderCommandReactor", () => {
     expect(failureActivity).toBeDefined();
     expect(failureActivity?.payload).toMatchObject({
       requestId: "approval-request-1",
+      detail: expect.stringContaining("Stale pending approval request: approval-request-1"),
     });
 
     const resolvedActivity = thread?.activities.find(
@@ -1048,6 +1116,117 @@ describe("ProviderCommandReactor", () => {
     expect(resolvedActivity).toBeUndefined();
   });
 
+  it("surfaces stale provider user-input failures without faking user-input resolution", async () => {
+    const harness = await createHarness();
+    const now = new Date().toISOString();
+    harness.respondToUserInput.mockImplementation(() =>
+      Effect.fail(
+        new ProviderAdapterRequestError({
+          provider: "claudeAgent",
+          method: "item/tool/respondToUserInput",
+          detail: "Unknown pending user-input request: user-input-request-1",
+        }),
+      ),
+    );
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-for-user-input-error"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        session: {
+          threadId: ThreadId.makeUnsafe("thread-1"),
+          status: "running",
+          providerName: "claudeAgent",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          lastError: null,
+          updatedAt: now,
+        },
+        createdAt: now,
+      }),
+    );
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.activity.append",
+        commandId: CommandId.makeUnsafe("cmd-user-input-requested"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        activity: {
+          id: EventId.makeUnsafe("activity-user-input-requested"),
+          tone: "info",
+          kind: "user-input.requested",
+          summary: "User input requested",
+          payload: {
+            requestId: "user-input-request-1",
+            questions: [
+              {
+                id: "sandbox_mode",
+                header: "Sandbox",
+                question: "Which mode should be used?",
+                options: [
+                  {
+                    label: "workspace-write",
+                    description: "Allow workspace writes only",
+                  },
+                ],
+              },
+            ],
+          },
+          turnId: null,
+          createdAt: now,
+        },
+        createdAt: now,
+      }),
+    );
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.user-input.respond",
+        commandId: CommandId.makeUnsafe("cmd-user-input-respond-stale"),
+        threadId: ThreadId.makeUnsafe("thread-1"),
+        requestId: asApprovalRequestId("user-input-request-1"),
+        answers: {
+          sandbox_mode: "workspace-write",
+        },
+        createdAt: now,
+      }),
+    );
+
+    await waitFor(async () => {
+      const readModel = await Effect.runPromise(harness.engine.getReadModel());
+      const thread = readModel.threads.find(
+        (entry) => entry.id === ThreadId.makeUnsafe("thread-1"),
+      );
+      if (!thread) return false;
+      return thread.activities.some(
+        (activity) => activity.kind === "provider.user-input.respond.failed",
+      );
+    });
+
+    const readModel = await Effect.runPromise(harness.engine.getReadModel());
+    const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+    expect(thread).toBeDefined();
+
+    const failureActivity = thread?.activities.find(
+      (activity) => activity.kind === "provider.user-input.respond.failed",
+    );
+    expect(failureActivity).toBeDefined();
+    expect(failureActivity?.payload).toMatchObject({
+      requestId: "user-input-request-1",
+      detail: expect.stringContaining("Stale pending user-input request: user-input-request-1"),
+    });
+
+    const resolvedActivity = thread?.activities.find(
+      (activity) =>
+        activity.kind === "user-input.resolved" &&
+        typeof activity.payload === "object" &&
+        activity.payload !== null &&
+        (activity.payload as Record<string, unknown>).requestId === "user-input-request-1",
+    );
+    expect(resolvedActivity).toBeUndefined();
+  });
+
   it("reacts to thread.session.stop by stopping provider session and clearing thread session state", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
index 6e747b8e45..8543601e6c 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
@@ -18,12 +18,15 @@ import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
 import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
 import { GitCore } from "../../git/Services/GitCore.ts";
 import { TextGeneration } from "../../git/Services/TextGeneration.ts";
+import { ProviderAdapterRequestError } from "../../provider/Errors.ts";
+import type { ProviderServiceError } from "../../provider/Errors.ts";
 import { ProviderService } from "../../provider/Services/ProviderService.ts";
 import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
 import {
   ProviderCommandReactor,
   type ProviderCommandReactorShape,
 } from "../Services/ProviderCommandReactor.ts";
+import { inferProviderForModel } from "@t3tools/shared/model";
 
 type ProviderIntentEvent = Extract<
   OrchestrationEvent,
@@ -74,6 +77,42 @@ const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
 const WORKTREE_BRANCH_PREFIX = "t3code";
 const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
 
+const sameClaudeModelOptions = (
+  left: ProviderModelOptions | undefined,
+  right: ProviderModelOptions | undefined,
+): boolean =>
+  JSON.stringify(left?.claudeAgent ?? null) === JSON.stringify(right?.claudeAgent ?? null);
+
+function isUnknownPendingApprovalRequestError(cause: Cause.Cause<ProviderServiceError>): boolean {
+  const error = Cause.squash(cause);
+  if (Schema.is(ProviderAdapterRequestError)(error)) {
+    const detail = error.detail.toLowerCase();
+    return (
+      detail.includes("unknown pending approval request") ||
+      detail.includes("unknown pending permission request")
+    );
+  }
+  const message = Cause.pretty(cause);
+  return (
+    message.includes("unknown pending approval request") ||
+    message.includes("unknown pending permission request")
+  );
+}
+
+function isUnknownPendingUserInputRequestError(cause: Cause.Cause<ProviderServiceError>): boolean {
+  const error = Cause.squash(cause);
+  if (Schema.is(ProviderAdapterRequestError)(error)) {
+    return error.detail.toLowerCase().includes("unknown pending user-input request");
+  }
+  return Cause.pretty(cause).toLowerCase().includes("unknown pending user-input request");
+}
+
+function stalePendingRequestDetail(
+  requestKind: "approval" | "user-input",
+  requestId: string,
+): string {
+  return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
+}
 function isTemporaryWorktreeBranch(branch: string): boolean {
   return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());
 }
@@ -125,6 +164,8 @@ const make = Effect.gen(function* () {
       ),
     );
 
+  const threadModelOptions = new Map<ThreadId, ProviderModelOptions>();
+
   const appendProviderFailureActivity = (input: {
     readonly threadId: ThreadId;
     readonly kind:
@@ -275,8 +316,18 @@ const make = Effect.gen(function* () {
           : (yield* providerService.getCapabilities(currentProvider)).sessionModelSwitch;
       const modelChanged = options?.model !== undefined && options.model !== activeSession?.model;
       const shouldRestartForModelChange = modelChanged && sessionModelSwitch === "restart-session";
+      const previousModelOptions = threadModelOptions.get(threadId);
+      const shouldRestartForModelOptionsChange =
+        currentProvider === "claudeAgent" &&
+        options?.modelOptions !== undefined &&
+        !sameClaudeModelOptions(previousModelOptions, options.modelOptions);
 
-      if (!runtimeModeChanged && !providerChanged && !shouldRestartForModelChange) {
+      if (
+        !runtimeModeChanged &&
+        !providerChanged &&
+        !shouldRestartForModelChange &&
+        !shouldRestartForModelOptionsChange
+      ) {
         return existingSessionThreadId;
       }
 
@@ -295,6 +346,7 @@ const make = Effect.gen(function* () {
         providerChanged,
         modelChanged,
         shouldRestartForModelChange,
+        shouldRestartForModelOptionsChange,
         hasResumeCursor: resumeCursor !== undefined,
       });
       const restartedSession = yield* startProviderSession({
@@ -334,15 +386,18 @@ const make = Effect.gen(function* () {
     if (!thread) {
       return;
     }
-    if (input.providerOptions !== undefined) {
-      threadProviderOptions.set(input.threadId, input.providerOptions);
-    }
     yield* ensureSessionForThread(input.threadId, input.createdAt, {
       ...(input.provider !== undefined ? { provider: input.provider } : {}),
       ...(input.model !== undefined ? { model: input.model } : {}),
       ...(input.modelOptions !== undefined ? { modelOptions: input.modelOptions } : {}),
       ...(input.providerOptions !== undefined ? { providerOptions: input.providerOptions } : {}),
     });
+    if (input.providerOptions !== undefined) {
+      threadProviderOptions.set(input.threadId, input.providerOptions);
+    }
+    if (input.modelOptions !== undefined) {
+      threadModelOptions.set(input.threadId, input.modelOptions);
+    }
     const normalizedInput = toNonEmptyProviderInput(input.messageText);
     const normalizedAttachments = input.attachments ?? [];
     const activeSession = yield* providerService
@@ -483,7 +538,21 @@ const make = Effect.gen(function* () {
         : {}),
       interactionMode: event.payload.interactionMode,
       createdAt: event.payload.createdAt,
-    });
+    }).pipe(
+      Effect.catchCause((cause) => {
+        if (Cause.hasInterruptsOnly(cause)) {
+          return Effect.failCause(cause);
+        }
+        return appendProviderFailureActivity({
+          threadId: event.payload.threadId,
+          kind: "provider.turn.start.failed",
+          summary: "Provider turn start failed",
+          detail: Cause.pretty(cause),
+          turnId: null,
+          createdAt: event.payload.createdAt,
+        });
+      }),
+    );
   });
 
   const processTurnInterruptRequested = Effect.fnUntraced(function* (
@@ -561,7 +630,9 @@ const make = Effect.gen(function* () {
               threadId: event.payload.threadId,
               kind: "provider.approval.respond.failed",
               summary: "Provider approval response failed",
-              detail: Cause.pretty(cause),
+              detail: isUnknownPendingApprovalRequestError(cause)
+                ? stalePendingRequestDetail("approval", event.payload.requestId)
+                : Cause.pretty(cause),
               turnId: null,
               createdAt: event.payload.createdAt,
               requestId: event.payload.requestId,
@@ -607,7 +678,9 @@ const make = Effect.gen(function* () {
               threadId: event.payload.threadId,
               kind: "provider.user-input.respond.failed",
               summary: "Provider user input response failed",
-              detail: Cause.pretty(cause),
+              detail: isUnknownPendingUserInputRequestError(cause)
+                ? stalePendingRequestDetail("user-input", event.payload.requestId)
+                : Cause.pretty(cause),
               turnId: null,
               createdAt: event.payload.createdAt,
               requestId: event.payload.requestId,
@@ -688,13 +761,13 @@ const make = Effect.gen(function* () {
             return;
           }
           const cachedProviderOptions = threadProviderOptions.get(event.payload.threadId);
-          yield* ensureSessionForThread(
-            event.payload.threadId,
-            event.occurredAt,
-            cachedProviderOptions !== undefined
+          const cachedModelOptions = threadModelOptions.get(event.payload.threadId);
+          yield* ensureSessionForThread(event.payload.threadId, event.occurredAt, {
+            ...(cachedProviderOptions !== undefined
               ? { providerOptions: cachedProviderOptions }
-              : undefined,
-          );
+              : {}),
+            ...(cachedModelOptions !== undefined ? { modelOptions: cachedModelOptions } : {}),
+          });
           return;
         }
         case "thread.turn-start-requested":
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
index e4c0c67276..301e046a85 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
@@ -2,7 +2,12 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
-import type { OrchestrationReadModel, ProviderRuntimeEvent } from "@t3tools/contracts";
+import type {
+  OrchestrationReadModel,
+  ProviderKind,
+  ProviderRuntimeEvent,
+  ProviderSession,
+} from "@t3tools/contracts";
 import {
   ApprovalRequestId,
   CommandId,
@@ -46,15 +51,7 @@ const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
 type LegacyProviderRuntimeEvent = {
   readonly type: string;
   readonly eventId: EventId;
-  readonly provider:
-    | "codex"
-    | "copilot"
-    | "claudeCode"
-    | "cursor"
-    | "opencode"
-    | "geminiCli"
-    | "amp"
-    | "kilo";
+  readonly provider: ProviderKind;
   readonly createdAt: string;
   readonly threadId: ThreadId;
   readonly turnId?: string | undefined;
@@ -66,6 +63,7 @@ type LegacyProviderRuntimeEvent = {
 
 function createProviderServiceHarness() {
   const runtimeEventPubSub = Effect.runSync(PubSub.unbounded<ProviderRuntimeEvent>());
+  const runtimeSessions: ProviderSession[] = [];
 
   const unsupported = () => Effect.die(new Error("Unsupported provider call in test")) as never;
   const service: ProviderServiceShape = {
@@ -75,12 +73,21 @@ function createProviderServiceHarness() {
     respondToRequest: () => unsupported(),
     respondToUserInput: () => unsupported(),
     stopSession: () => unsupported(),
-    listSessions: () => Effect.succeed([]),
+    listSessions: () => Effect.succeed([...runtimeSessions]),
     getCapabilities: () => Effect.succeed(getProviderCapabilities("codex")),
     rollbackConversation: () => unsupported(),
     streamEvents: Stream.fromPubSub(runtimeEventPubSub),
   };
 
+  const setSession = (session: ProviderSession): void => {
+    const existingIndex = runtimeSessions.findIndex((entry) => entry.threadId === session.threadId);
+    if (existingIndex >= 0) {
+      runtimeSessions[existingIndex] = session;
+      return;
+    }
+    runtimeSessions.push(session);
+  };
+
   const emit = (event: LegacyProviderRuntimeEvent): void => {
     Effect.runSync(PubSub.publish(runtimeEventPubSub, event as unknown as ProviderRuntimeEvent));
   };
@@ -88,6 +95,7 @@ function createProviderServiceHarness() {
   return {
     service,
     emit,
+    setSession,
   };
 }
 
@@ -95,11 +103,12 @@ async function waitForThread(
   engine: OrchestrationEngineShape,
   predicate: (thread: ProviderRuntimeTestThread) => boolean,
   timeoutMs = 2000,
+  threadId: ThreadId = asThreadId("thread-1"),
 ) {
   const deadline = Date.now() + timeoutMs;
   const poll = async (): Promise<ProviderRuntimeTestThread> => {
     const readModel = await Effect.runPromise(engine.getReadModel());
-    const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+    const thread = readModel.threads.find((entry) => entry.id === threadId);
     if (thread && predicate(thread)) {
       return thread;
     }
@@ -159,6 +168,7 @@ describe("ProviderRuntimeIngestion", () => {
     );
     const layer = ProviderRuntimeIngestionLive.pipe(
       Layer.provideMerge(orchestrationLayer),
+      Layer.provideMerge(SqlitePersistenceMemory),
       Layer.provideMerge(Layer.succeed(ProviderService, provider.service)),
       Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),
       Layer.provideMerge(NodeServices.layer),
@@ -214,10 +224,19 @@ describe("ProviderRuntimeIngestion", () => {
         createdAt,
       }),
     );
+    provider.setSession({
+      provider: "codex",
+      status: "ready",
+      runtimeMode: "approval-required",
+      threadId: ThreadId.makeUnsafe("thread-1"),
+      createdAt,
+      updatedAt: createdAt,
+    });
 
     return {
       engine,
       emit: provider.emit,
+      setProviderSession: provider.setSession,
       drain,
     };
   }
@@ -423,7 +442,7 @@ describe("ProviderRuntimeIngestion", () => {
         session: {
           threadId: ThreadId.makeUnsafe("thread-1"),
           status: "ready",
-          providerName: "claudeCode",
+          providerName: "claudeAgent",
           runtimeMode: "approval-required",
           activeTurnId: null,
           updatedAt: seededAt,
@@ -436,7 +455,7 @@ describe("ProviderRuntimeIngestion", () => {
     harness.emit({
       type: "turn.started",
       eventId: asEventId("evt-turn-started-claude-placeholder"),
-      provider: "claudeCode",
+      provider: "claudeAgent",
       createdAt: new Date().toISOString(),
       threadId: asThreadId("thread-1"),
       turnId: asTurnId("turn-claude-placeholder"),
@@ -452,7 +471,7 @@ describe("ProviderRuntimeIngestion", () => {
     harness.emit({
       type: "turn.completed",
       eventId: asEventId("evt-turn-completed-claude-placeholder"),
-      provider: "claudeCode",
+      provider: "claudeAgent",
       createdAt: new Date().toISOString(),
       threadId: asThreadId("thread-1"),
       turnId: asTurnId("turn-claude-placeholder"),
@@ -713,6 +732,496 @@ describe("ProviderRuntimeIngestion", () => {
     );
   });
 
+  it("marks the source proposed plan implemented only after the target turn starts", async () => {
+    const harness = await createHarness();
+    const sourceThreadId = asThreadId("thread-plan");
+    const targetThreadId = asThreadId("thread-implement");
+    const sourceTurnId = asTurnId("turn-plan-source");
+    const targetTurnId = asTurnId("turn-plan-implement");
+    const createdAt = new Date().toISOString();
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.makeUnsafe("cmd-thread-create-plan-source"),
+        threadId: sourceThreadId,
+        projectId: asProjectId("project-1"),
+        title: "Plan Source",
+        model: "gpt-5-codex",
+        interactionMode: "plan",
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-plan-source"),
+        threadId: sourceThreadId,
+        session: {
+          threadId: sourceThreadId,
+          status: "ready",
+          providerName: "codex",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          updatedAt: createdAt,
+          lastError: null,
+        },
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.makeUnsafe("cmd-thread-create-plan-target"),
+        threadId: targetThreadId,
+        projectId: asProjectId("project-1"),
+        title: "Plan Target",
+        model: "gpt-5-codex",
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-plan-target"),
+        threadId: targetThreadId,
+        session: {
+          threadId: targetThreadId,
+          status: "ready",
+          providerName: "codex",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          updatedAt: createdAt,
+          lastError: null,
+        },
+        createdAt,
+      }),
+    );
+    harness.setProviderSession({
+      provider: "codex",
+      status: "ready",
+      runtimeMode: "approval-required",
+      threadId: targetThreadId,
+      createdAt,
+      updatedAt: createdAt,
+      activeTurnId: targetTurnId,
+    });
+
+    harness.emit({
+      type: "turn.proposed.completed",
+      eventId: asEventId("evt-plan-source-completed"),
+      provider: "codex",
+      createdAt,
+      threadId: sourceThreadId,
+      turnId: sourceTurnId,
+      payload: {
+        planMarkdown: "# Source plan",
+      },
+    });
+
+    const sourceThreadWithPlan = await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.proposedPlans.some(
+          (proposedPlan: ProviderRuntimeTestProposedPlan) =>
+            proposedPlan.id === "plan:thread-plan:turn:turn-plan-source" &&
+            proposedPlan.implementedAt === null,
+        ),
+      2_000,
+      sourceThreadId,
+    );
+    const sourcePlan = sourceThreadWithPlan.proposedPlans.find(
+      (entry: ProviderRuntimeTestProposedPlan) =>
+        entry.id === "plan:thread-plan:turn:turn-plan-source",
+    );
+    expect(sourcePlan).toBeDefined();
+    if (!sourcePlan) {
+      throw new Error("Expected source plan to exist.");
+    }
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-plan-target"),
+        threadId: targetThreadId,
+        message: {
+          messageId: asMessageId("msg-plan-target"),
+          role: "user",
+          text: "PLEASE IMPLEMENT THIS PLAN:\n# Source plan",
+          attachments: [],
+        },
+        sourceProposedPlan: {
+          threadId: sourceThreadId,
+          planId: sourcePlan.id,
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: new Date().toISOString(),
+      }),
+    );
+
+    const sourceThreadBeforeStart = await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.proposedPlans.some(
+          (proposedPlan: ProviderRuntimeTestProposedPlan) =>
+            proposedPlan.id === sourcePlan.id && proposedPlan.implementedAt === null,
+        ),
+      2_000,
+      sourceThreadId,
+    );
+    expect(
+      sourceThreadBeforeStart.proposedPlans.find((entry) => entry.id === sourcePlan.id),
+    ).toMatchObject({
+      implementedAt: null,
+      implementationThreadId: null,
+    });
+
+    harness.emit({
+      type: "turn.started",
+      eventId: asEventId("evt-plan-target-started"),
+      provider: "codex",
+      createdAt: new Date().toISOString(),
+      threadId: targetThreadId,
+      turnId: targetTurnId,
+    });
+
+    const sourceThreadAfterStart = await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.proposedPlans.some(
+          (proposedPlan: ProviderRuntimeTestProposedPlan) =>
+            proposedPlan.id === sourcePlan.id &&
+            proposedPlan.implementedAt !== null &&
+            proposedPlan.implementationThreadId === targetThreadId,
+        ),
+      2_000,
+      sourceThreadId,
+    );
+    expect(
+      sourceThreadAfterStart.proposedPlans.find((entry) => entry.id === sourcePlan.id),
+    ).toMatchObject({
+      implementationThreadId: "thread-implement",
+    });
+  });
+
+  it("does not mark the source proposed plan implemented for a rejected turn.started event", async () => {
+    const harness = await createHarness();
+    const sourceThreadId = asThreadId("thread-plan");
+    const targetThreadId = asThreadId("thread-1");
+    const sourceTurnId = asTurnId("turn-plan-source");
+    const activeTurnId = asTurnId("turn-already-running");
+    const staleTurnId = asTurnId("turn-stale-start");
+    const createdAt = new Date().toISOString();
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.makeUnsafe("cmd-thread-create-plan-source-guarded"),
+        threadId: sourceThreadId,
+        projectId: asProjectId("project-1"),
+        title: "Plan Source",
+        model: "gpt-5-codex",
+        interactionMode: "plan",
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-plan-source-guarded"),
+        threadId: sourceThreadId,
+        session: {
+          threadId: sourceThreadId,
+          status: "ready",
+          providerName: "codex",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          updatedAt: createdAt,
+          lastError: null,
+        },
+        createdAt,
+      }),
+    );
+    harness.setProviderSession({
+      provider: "codex",
+      status: "running",
+      runtimeMode: "approval-required",
+      threadId: targetThreadId,
+      createdAt,
+      updatedAt: createdAt,
+      activeTurnId,
+    });
+
+    harness.emit({
+      type: "turn.started",
+      eventId: asEventId("evt-turn-started-already-running"),
+      provider: "codex",
+      createdAt,
+      threadId: targetThreadId,
+      turnId: activeTurnId,
+    });
+
+    await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.session?.status === "running" && thread.session?.activeTurnId === activeTurnId,
+      2_000,
+      targetThreadId,
+    );
+
+    harness.emit({
+      type: "turn.proposed.completed",
+      eventId: asEventId("evt-plan-source-completed-guarded"),
+      provider: "codex",
+      createdAt,
+      threadId: sourceThreadId,
+      turnId: sourceTurnId,
+      payload: {
+        planMarkdown: "# Source plan",
+      },
+    });
+
+    const sourceThreadWithPlan = await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.proposedPlans.some(
+          (proposedPlan: ProviderRuntimeTestProposedPlan) =>
+            proposedPlan.id === "plan:thread-plan:turn:turn-plan-source" &&
+            proposedPlan.implementedAt === null,
+        ),
+      2_000,
+      sourceThreadId,
+    );
+    const sourcePlan = sourceThreadWithPlan.proposedPlans.find(
+      (entry: ProviderRuntimeTestProposedPlan) =>
+        entry.id === "plan:thread-plan:turn:turn-plan-source",
+    );
+    expect(sourcePlan).toBeDefined();
+    if (!sourcePlan) {
+      throw new Error("Expected source plan to exist.");
+    }
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-plan-target-guarded"),
+        threadId: targetThreadId,
+        message: {
+          messageId: asMessageId("msg-plan-target-guarded"),
+          role: "user",
+          text: "PLEASE IMPLEMENT THIS PLAN:\n# Source plan",
+          attachments: [],
+        },
+        sourceProposedPlan: {
+          threadId: sourceThreadId,
+          planId: sourcePlan.id,
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: new Date().toISOString(),
+      }),
+    );
+
+    harness.emit({
+      type: "turn.started",
+      eventId: asEventId("evt-turn-started-stale-plan-implementation"),
+      provider: "codex",
+      createdAt: new Date().toISOString(),
+      threadId: targetThreadId,
+      turnId: staleTurnId,
+    });
+
+    await harness.drain();
+
+    const readModel = await Effect.runPromise(harness.engine.getReadModel());
+    const sourceThreadAfterRejectedStart = readModel.threads.find(
+      (entry) => entry.id === sourceThreadId,
+    );
+    expect(
+      sourceThreadAfterRejectedStart?.proposedPlans.find((entry) => entry.id === sourcePlan.id),
+    ).toMatchObject({
+      implementedAt: null,
+      implementationThreadId: null,
+    });
+
+    const targetThreadAfterRejectedStart = readModel.threads.find(
+      (entry) => entry.id === targetThreadId,
+    );
+    expect(targetThreadAfterRejectedStart?.session?.status).toBe("running");
+    expect(targetThreadAfterRejectedStart?.session?.activeTurnId).toBe(activeTurnId);
+  });
+
+  it("does not mark the source proposed plan implemented for an unrelated turn.started when no thread active turn is tracked", async () => {
+    const harness = await createHarness();
+    const sourceThreadId = asThreadId("thread-plan");
+    const targetThreadId = asThreadId("thread-implement");
+    const sourceTurnId = asTurnId("turn-plan-source");
+    const expectedTurnId = asTurnId("turn-plan-implement");
+    const replayedTurnId = asTurnId("turn-replayed");
+    const createdAt = new Date().toISOString();
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.makeUnsafe("cmd-thread-create-plan-source-unrelated"),
+        threadId: sourceThreadId,
+        projectId: asProjectId("project-1"),
+        title: "Plan Source",
+        model: "gpt-5-codex",
+        interactionMode: "plan",
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-plan-source-unrelated"),
+        threadId: sourceThreadId,
+        session: {
+          threadId: sourceThreadId,
+          status: "ready",
+          providerName: "codex",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          updatedAt: createdAt,
+          lastError: null,
+        },
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.makeUnsafe("cmd-thread-create-plan-target-unrelated"),
+        threadId: targetThreadId,
+        projectId: asProjectId("project-1"),
+        title: "Plan Target",
+        model: "gpt-5-codex",
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt,
+      }),
+    );
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.session.set",
+        commandId: CommandId.makeUnsafe("cmd-session-set-plan-target-unrelated"),
+        threadId: targetThreadId,
+        session: {
+          threadId: targetThreadId,
+          status: "ready",
+          providerName: "codex",
+          runtimeMode: "approval-required",
+          activeTurnId: null,
+          updatedAt: createdAt,
+          lastError: null,
+        },
+        createdAt,
+      }),
+    );
+
+    harness.emit({
+      type: "turn.proposed.completed",
+      eventId: asEventId("evt-plan-source-completed-unrelated"),
+      provider: "codex",
+      createdAt,
+      threadId: sourceThreadId,
+      turnId: sourceTurnId,
+      payload: {
+        planMarkdown: "# Source plan",
+      },
+    });
+
+    const sourceThreadWithPlan = await waitForThread(
+      harness.engine,
+      (thread) =>
+        thread.proposedPlans.some(
+          (proposedPlan: ProviderRuntimeTestProposedPlan) =>
+            proposedPlan.id === "plan:thread-plan:turn:turn-plan-source" &&
+            proposedPlan.implementedAt === null,
+        ),
+      2_000,
+      sourceThreadId,
+    );
+    const sourcePlan = sourceThreadWithPlan.proposedPlans.find(
+      (entry: ProviderRuntimeTestProposedPlan) =>
+        entry.id === "plan:thread-plan:turn:turn-plan-source",
+    );
+    expect(sourcePlan).toBeDefined();
+    if (!sourcePlan) {
+      throw new Error("Expected source plan to exist.");
+    }
+
+    await Effect.runPromise(
+      harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.makeUnsafe("cmd-turn-start-plan-target-unrelated"),
+        threadId: targetThreadId,
+        message: {
+          messageId: asMessageId("msg-plan-target-unrelated"),
+          role: "user",
+          text: "PLEASE IMPLEMENT THIS PLAN:\n# Source plan",
+          attachments: [],
+        },
+        sourceProposedPlan: {
+          threadId: sourceThreadId,
+          planId: sourcePlan.id,
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: new Date().toISOString(),
+      }),
+    );
+
+    harness.setProviderSession({
+      provider: "codex",
+      status: "running",
+      runtimeMode: "approval-required",
+      threadId: targetThreadId,
+      createdAt,
+      updatedAt: createdAt,
+      activeTurnId: expectedTurnId,
+    });
+
+    harness.emit({
+      type: "turn.started",
+      eventId: asEventId("evt-turn-started-unrelated-plan-implementation"),
+      provider: "codex",
+      createdAt: new Date().toISOString(),
+      threadId: targetThreadId,
+      turnId: replayedTurnId,
+    });
+
+    await harness.drain();
+
+    const readModel = await Effect.runPromise(harness.engine.getReadModel());
+    const sourceThreadAfterUnrelatedStart = readModel.threads.find(
+      (entry) => entry.id === sourceThreadId,
+    );
+    expect(
+      sourceThreadAfterUnrelatedStart?.proposedPlans.find((entry) => entry.id === sourcePlan.id),
+    ).toMatchObject({
+      implementedAt: null,
+      implementationThreadId: null,
+    });
+  });
+
   it("finalizes buffered proposed-plan deltas into a first-class proposed plan on turn completion", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();
@@ -1690,6 +2199,7 @@ describe("ProviderRuntimeIngestion", () => {
       payload: {
         taskId: "turn-task-1",
         description: "Comparing the desktop rollout chunks to the app-server stream.",
+        summary: "Code reviewer is validating the desktop rollout chunks.",
       },
     });
 
@@ -1752,8 +2262,9 @@ describe("ProviderRuntimeIngestion", () => {
     expect(started?.kind).toBe("task.started");
     expect(started?.summary).toBe("Plan task started");
     expect(progress?.kind).toBe("task.progress");
-    expect(progressPayload?.detail).toBe(
-      "Comparing the desktop rollout chunks to the app-server stream.",
+    expect(progressPayload?.detail).toBe("Code reviewer is validating the desktop rollout chunks.");
+    expect(progressPayload?.summary).toBe(
+      "Code reviewer is validating the desktop rollout chunks.",
     );
     expect(completed?.kind).toBe("task.completed");
     expect(completedPayload?.detail).toBe("<proposed_plan>\n# Plan title\n</proposed_plan>");
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
index 8851cc3dfd..78570cef30 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
@@ -4,6 +4,7 @@ import {
   CommandId,
   MessageId,
   type OrchestrationEvent,
+  type OrchestrationProposedPlanId,
   CheckpointRef,
   isToolLifecycleItemType,
   ThreadId,
@@ -15,6 +16,8 @@ import { Cache, Cause, Duration, Effect, Layer, Option, Ref, Stream } from "effe
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
 
 import { ProviderService } from "../../provider/Services/ProviderService.ts";
+import { ProjectionTurnRepository } from "../../persistence/Services/ProjectionTurns.ts";
+import { ProjectionTurnRepositoryLive } from "../../persistence/Layers/ProjectionTurns.ts";
 import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
 import { isGitRepository } from "../../git/isRepo.ts";
 import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
@@ -403,7 +406,8 @@ function runtimeEventToActivities(
           summary: "Reasoning update",
           payload: {
             taskId: event.payload.taskId,
-            detail: truncateDetail(event.payload.description),
+            detail: truncateDetail(event.payload.summary ?? event.payload.description),
+            ...(event.payload.summary ? { summary: truncateDetail(event.payload.summary) } : {}),
             ...(event.payload.lastToolName ? { lastToolName: event.payload.lastToolName } : {}),
             ...(event.payload.usage !== undefined ? { usage: event.payload.usage } : {}),
           },
@@ -513,6 +517,7 @@ function runtimeEventToActivities(
 const make = Effect.gen(function* () {
   const orchestrationEngine = yield* OrchestrationEngineService;
   const providerService = yield* ProviderService;
+  const projectionTurnRepository = yield* ProjectionTurnRepository;
 
   const assistantDeliveryModeRef = yield* Ref.make<AssistantDeliveryMode>(
     DEFAULT_ASSISTANT_DELIVERY_MODE,
@@ -921,6 +926,8 @@ const make = Effect.gen(function* () {
     threadProposedPlans: ReadonlyArray<{
       id: string;
       createdAt: string;
+      implementedAt: string | null;
+      implementationThreadId: ThreadId | null;
     }>;
     planId: string;
     turnId?: TurnId;
@@ -943,6 +950,8 @@ const make = Effect.gen(function* () {
           id: input.planId,
           turnId: input.turnId ?? null,
           planMarkdown,
+          implementedAt: existingPlan?.implementedAt ?? null,
+          implementationThreadId: existingPlan?.implementationThreadId ?? null,
           createdAt: existingPlan?.createdAt ?? input.createdAt,
           updatedAt: input.updatedAt,
         },
@@ -956,6 +965,8 @@ const make = Effect.gen(function* () {
     threadProposedPlans: ReadonlyArray<{
       id: string;
       createdAt: string;
+      implementedAt: string | null;
+      implementationThreadId: ThreadId | null;
     }>;
     planId: string;
     turnId?: TurnId;
@@ -1028,6 +1039,79 @@ const make = Effect.gen(function* () {
   // turn.completed) still get turn-level usage in the completion summary.
   const pendingTokenUsageByThread = new Map<string, Record<string, unknown>>();
 
+  const getSourceProposedPlanReferenceForPendingTurnStart = Effect.fnUntraced(function* (
+    threadId: ThreadId,
+  ) {
+    const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId({
+      threadId,
+    });
+    if (Option.isNone(pendingTurnStart)) {
+      return null;
+    }
+
+    const sourceThreadId = pendingTurnStart.value.sourceProposedPlanThreadId;
+    const sourcePlanId = pendingTurnStart.value.sourceProposedPlanId;
+    if (sourceThreadId === null || sourcePlanId === null) {
+      return null;
+    }
+
+    return {
+      sourceThreadId,
+      sourcePlanId,
+    } as const;
+  });
+
+  const getExpectedProviderTurnIdForThread = Effect.fnUntraced(function* (threadId: ThreadId) {
+    const sessions = yield* providerService.listSessions();
+    const session = sessions.find((entry) => entry.threadId === threadId);
+    return session?.activeTurnId;
+  });
+
+  const getSourceProposedPlanReferenceForAcceptedTurnStart = Effect.fnUntraced(function* (
+    threadId: ThreadId,
+    eventTurnId: TurnId | undefined,
+  ) {
+    if (eventTurnId === undefined) {
+      return null;
+    }
+
+    const expectedTurnId = yield* getExpectedProviderTurnIdForThread(threadId);
+    if (!sameId(expectedTurnId, eventTurnId)) {
+      return null;
+    }
+
+    return yield* getSourceProposedPlanReferenceForPendingTurnStart(threadId);
+  });
+
+  const markSourceProposedPlanImplemented = Effect.fnUntraced(function* (
+    sourceThreadId: ThreadId,
+    sourcePlanId: OrchestrationProposedPlanId,
+    implementationThreadId: ThreadId,
+    implementedAt: string,
+  ) {
+    const readModel = yield* orchestrationEngine.getReadModel();
+    const sourceThread = readModel.threads.find((entry) => entry.id === sourceThreadId);
+    const sourcePlan = sourceThread?.proposedPlans.find((entry) => entry.id === sourcePlanId);
+    if (!sourceThread || !sourcePlan || sourcePlan.implementedAt !== null) {
+      return;
+    }
+
+    yield* orchestrationEngine.dispatch({
+      type: "thread.proposed-plan.upsert",
+      commandId: CommandId.makeUnsafe(
+        `provider:source-proposed-plan-implemented:${implementationThreadId}:${crypto.randomUUID()}`,
+      ),
+      threadId: sourceThread.id,
+      proposedPlan: {
+        ...sourcePlan,
+        implementedAt,
+        implementationThreadId,
+        updatedAt: implementedAt,
+      },
+      createdAt: implementedAt,
+    });
+  });
+
   const processRuntimeEvent = (event: ProviderRuntimeEvent) =>
     Effect.gen(function* () {
       // Accumulate token usage events per thread
@@ -1104,6 +1188,10 @@ const make = Effect.gen(function* () {
             return true;
         }
       })();
+      const acceptedTurnStartedSourcePlan =
+        event.type === "turn.started" && shouldApplyThreadLifecycle
+          ? yield* getSourceProposedPlanReferenceForAcceptedTurnStart(thread.id, eventTurnId)
+          : null;
 
       if (
         event.type === "session.started" ||
@@ -1172,6 +1260,26 @@ const make = Effect.gen(function* () {
             pendingTokenUsageByThread.delete(event.threadId);
           }
 
+          if (event.type === "turn.started" && acceptedTurnStartedSourcePlan !== null) {
+            yield* markSourceProposedPlanImplemented(
+              acceptedTurnStartedSourcePlan.sourceThreadId,
+              acceptedTurnStartedSourcePlan.sourcePlanId,
+              thread.id,
+              now,
+            ).pipe(
+              Effect.catchCause((cause) =>
+                Effect.logWarning(
+                  "provider runtime ingestion failed to mark source proposed plan",
+                  {
+                    eventId: event.eventId,
+                    eventType: event.type,
+                    cause: Cause.pretty(cause),
+                  },
+                ),
+              ),
+            );
+          }
+
           yield* orchestrationEngine.dispatch({
             type: "thread.session.set",
             commandId: providerCommandId(event, "thread-session-set"),
@@ -1520,4 +1628,7 @@ const make = Effect.gen(function* () {
   } satisfies ProviderRuntimeIngestionShape;
 });
 
-export const ProviderRuntimeIngestionLive = Layer.effect(ProviderRuntimeIngestionService, make);
+export const ProviderRuntimeIngestionLive = Layer.effect(
+  ProviderRuntimeIngestionService,
+  make,
+).pipe(Layer.provide(ProjectionTurnRepositoryLive));
diff --git a/apps/server/src/orchestration/decider.ts b/apps/server/src/orchestration/decider.ts
index 744ca9ef43..e68103ab6d 100644
--- a/apps/server/src/orchestration/decider.ts
+++ b/apps/server/src/orchestration/decider.ts
@@ -262,11 +262,35 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
     }
 
     case "thread.turn.start": {
-      yield* requireThread({
+      const targetThread = yield* requireThread({
         readModel,
         command,
         threadId: command.threadId,
       });
+      const sourceProposedPlan = command.sourceProposedPlan;
+      const sourceThread = sourceProposedPlan
+        ? yield* requireThread({
+            readModel,
+            command,
+            threadId: sourceProposedPlan.threadId,
+          })
+        : null;
+      const sourcePlan =
+        sourceProposedPlan && sourceThread
+          ? sourceThread.proposedPlans.find((entry) => entry.id === sourceProposedPlan.planId)
+          : null;
+      if (sourceProposedPlan && !sourcePlan) {
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `Proposed plan '${sourceProposedPlan.planId}' does not exist on thread '${sourceProposedPlan.threadId}'.`,
+        });
+      }
+      if (sourceThread && sourceThread.projectId !== targetThread.projectId) {
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `Proposed plan '${sourceProposedPlan?.planId}' belongs to thread '${sourceThread.id}' in a different project.`,
+        });
+      }
       const userMessageEvent: Omit<OrchestrationEvent, "sequence"> = {
         ...withEventBase({
           aggregateKind: "thread",
@@ -306,12 +330,9 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
             ? { providerOptions: command.providerOptions }
             : {}),
           assistantDeliveryMode: command.assistantDeliveryMode ?? DEFAULT_ASSISTANT_DELIVERY_MODE,
-          runtimeMode:
-            readModel.threads.find((entry) => entry.id === command.threadId)?.runtimeMode ??
-            command.runtimeMode,
-          interactionMode:
-            readModel.threads.find((entry) => entry.id === command.threadId)?.interactionMode ??
-            command.interactionMode,
+          runtimeMode: targetThread.runtimeMode,
+          interactionMode: targetThread.interactionMode,
+          ...(sourceProposedPlan !== undefined ? { sourceProposedPlan } : {}),
           createdAt: command.createdAt,
         },
       };
diff --git a/apps/server/src/persistence/Layers/ProjectionThreadProposedPlans.ts b/apps/server/src/persistence/Layers/ProjectionThreadProposedPlans.ts
index 3d103592f9..ccd322feb2 100644
--- a/apps/server/src/persistence/Layers/ProjectionThreadProposedPlans.ts
+++ b/apps/server/src/persistence/Layers/ProjectionThreadProposedPlans.ts
@@ -22,6 +22,8 @@ const makeProjectionThreadProposedPlanRepository = Effect.gen(function* () {
         thread_id,
         turn_id,
         plan_markdown,
+        implemented_at,
+        implementation_thread_id,
         created_at,
         updated_at
       )
@@ -30,6 +32,8 @@ const makeProjectionThreadProposedPlanRepository = Effect.gen(function* () {
         ${row.threadId},
         ${row.turnId},
         ${row.planMarkdown},
+        ${row.implementedAt},
+        ${row.implementationThreadId},
         ${row.createdAt},
         ${row.updatedAt}
       )
@@ -38,6 +42,8 @@ const makeProjectionThreadProposedPlanRepository = Effect.gen(function* () {
         thread_id = excluded.thread_id,
         turn_id = excluded.turn_id,
         plan_markdown = excluded.plan_markdown,
+        implemented_at = excluded.implemented_at,
+        implementation_thread_id = excluded.implementation_thread_id,
         created_at = excluded.created_at,
         updated_at = excluded.updated_at
     `,
@@ -52,6 +58,8 @@ const makeProjectionThreadProposedPlanRepository = Effect.gen(function* () {
         thread_id AS "threadId",
         turn_id AS "turnId",
         plan_markdown AS "planMarkdown",
+        implemented_at AS "implementedAt",
+        implementation_thread_id AS "implementationThreadId",
         created_at AS "createdAt",
         updated_at AS "updatedAt"
       FROM projection_thread_proposed_plans
diff --git a/apps/server/src/persistence/Layers/ProjectionTurns.ts b/apps/server/src/persistence/Layers/ProjectionTurns.ts
index 8330661e30..9b6c9c5771 100644
--- a/apps/server/src/persistence/Layers/ProjectionTurns.ts
+++ b/apps/server/src/persistence/Layers/ProjectionTurns.ts
@@ -47,6 +47,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           thread_id,
           turn_id,
           pending_message_id,
+          source_proposed_plan_thread_id,
+          source_proposed_plan_id,
           assistant_message_id,
           state,
           requested_at,
@@ -61,6 +63,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           ${row.threadId},
           ${row.turnId},
           ${row.pendingMessageId},
+          ${row.sourceProposedPlanThreadId},
+          ${row.sourceProposedPlanId},
           ${row.assistantMessageId},
           ${row.state},
           ${row.requestedAt},
@@ -74,6 +78,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
         ON CONFLICT (thread_id, turn_id)
         DO UPDATE SET
           pending_message_id = excluded.pending_message_id,
+          source_proposed_plan_thread_id = excluded.source_proposed_plan_thread_id,
+          source_proposed_plan_id = excluded.source_proposed_plan_id,
           assistant_message_id = excluded.assistant_message_id,
           state = excluded.state,
           requested_at = excluded.requested_at,
@@ -106,6 +112,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           thread_id,
           turn_id,
           pending_message_id,
+          source_proposed_plan_thread_id,
+          source_proposed_plan_id,
           assistant_message_id,
           state,
           requested_at,
@@ -120,6 +128,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           ${row.threadId},
           NULL,
           ${row.messageId},
+          ${row.sourceProposedPlanThreadId},
+          ${row.sourceProposedPlanId},
           NULL,
           'pending',
           ${row.requestedAt},
@@ -141,6 +151,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
         SELECT
           thread_id AS "threadId",
           pending_message_id AS "messageId",
+          source_proposed_plan_thread_id AS "sourceProposedPlanThreadId",
+          source_proposed_plan_id AS "sourceProposedPlanId",
           requested_at AS "requestedAt"
         FROM projection_turns
         WHERE thread_id = ${threadId}
@@ -162,6 +174,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           thread_id AS "threadId",
           turn_id AS "turnId",
           pending_message_id AS "pendingMessageId",
+          source_proposed_plan_thread_id AS "sourceProposedPlanThreadId",
+          source_proposed_plan_id AS "sourceProposedPlanId",
           assistant_message_id AS "assistantMessageId",
           state,
           requested_at AS "requestedAt",
@@ -193,6 +207,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
           thread_id AS "threadId",
           turn_id AS "turnId",
           pending_message_id AS "pendingMessageId",
+          source_proposed_plan_thread_id AS "sourceProposedPlanThreadId",
+          source_proposed_plan_id AS "sourceProposedPlanId",
           assistant_message_id AS "assistantMessageId",
           state,
           requested_at AS "requestedAt",
diff --git a/apps/server/src/persistence/Migrations.ts b/apps/server/src/persistence/Migrations.ts
index 7deb890dd8..ea1821014a 100644
--- a/apps/server/src/persistence/Migrations.ts
+++ b/apps/server/src/persistence/Migrations.ts
@@ -25,6 +25,8 @@ import Migration0010 from "./Migrations/010_ProjectionThreadsRuntimeMode.ts";
 import Migration0011 from "./Migrations/011_OrchestrationThreadCreatedRuntimeMode.ts";
 import Migration0012 from "./Migrations/012_ProjectionThreadsInteractionMode.ts";
 import Migration0013 from "./Migrations/013_ProjectionThreadProposedPlans.ts";
+import Migration0014 from "./Migrations/014_ProjectionThreadProposedPlanImplementation.ts";
+import Migration0015 from "./Migrations/015_ProjectionTurnsSourceProposedPlan.ts";
 import { Effect } from "effect";
 
 /**
@@ -51,6 +53,8 @@ const loader = Migrator.fromRecord({
   "11_OrchestrationThreadCreatedRuntimeMode": Migration0011,
   "12_ProjectionThreadsInteractionMode": Migration0012,
   "13_ProjectionThreadProposedPlans": Migration0013,
+  "14_ProjectionThreadProposedPlanImplementation": Migration0014,
+  "15_ProjectionTurnsSourceProposedPlan": Migration0015,
 });
 
 /**
diff --git a/apps/server/src/persistence/Migrations/014_ProjectionThreadProposedPlanImplementation.ts b/apps/server/src/persistence/Migrations/014_ProjectionThreadProposedPlanImplementation.ts
new file mode 100644
index 0000000000..c7a82bfb33
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/014_ProjectionThreadProposedPlanImplementation.ts
@@ -0,0 +1,16 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  yield* sql`
+    ALTER TABLE projection_thread_proposed_plans
+    ADD COLUMN implemented_at TEXT
+  `;
+
+  yield* sql`
+    ALTER TABLE projection_thread_proposed_plans
+    ADD COLUMN implementation_thread_id TEXT
+  `;
+});
diff --git a/apps/server/src/persistence/Migrations/015_ProjectionTurnsSourceProposedPlan.ts b/apps/server/src/persistence/Migrations/015_ProjectionTurnsSourceProposedPlan.ts
new file mode 100644
index 0000000000..57a2661879
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/015_ProjectionTurnsSourceProposedPlan.ts
@@ -0,0 +1,16 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  yield* sql`
+    ALTER TABLE projection_turns
+    ADD COLUMN source_proposed_plan_thread_id TEXT
+  `;
+
+  yield* sql`
+    ALTER TABLE projection_turns
+    ADD COLUMN source_proposed_plan_id TEXT
+  `;
+});
diff --git a/apps/server/src/persistence/Services/ProjectionThreadProposedPlans.ts b/apps/server/src/persistence/Services/ProjectionThreadProposedPlans.ts
index ee662d52be..d141a11bb9 100644
--- a/apps/server/src/persistence/Services/ProjectionThreadProposedPlans.ts
+++ b/apps/server/src/persistence/Services/ProjectionThreadProposedPlans.ts
@@ -15,6 +15,8 @@ export const ProjectionThreadProposedPlan = Schema.Struct({
   threadId: ThreadId,
   turnId: Schema.NullOr(TurnId),
   planMarkdown: TrimmedNonEmptyString,
+  implementedAt: Schema.NullOr(IsoDateTime),
+  implementationThreadId: Schema.NullOr(ThreadId),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
 });
diff --git a/apps/server/src/persistence/Services/ProjectionTurns.ts b/apps/server/src/persistence/Services/ProjectionTurns.ts
index 1c791342ff..95dab450bf 100644
--- a/apps/server/src/persistence/Services/ProjectionTurns.ts
+++ b/apps/server/src/persistence/Services/ProjectionTurns.ts
@@ -11,6 +11,7 @@ import {
   IsoDateTime,
   MessageId,
   NonNegativeInt,
+  OrchestrationProposedPlanId,
   OrchestrationCheckpointFile,
   OrchestrationCheckpointStatus,
   ThreadId,
@@ -34,6 +35,8 @@ export const ProjectionTurn = Schema.Struct({
   threadId: ThreadId,
   turnId: Schema.NullOr(TurnId),
   pendingMessageId: Schema.NullOr(MessageId),
+  sourceProposedPlanThreadId: Schema.NullOr(ThreadId),
+  sourceProposedPlanId: Schema.NullOr(OrchestrationProposedPlanId),
   assistantMessageId: Schema.NullOr(MessageId),
   state: ProjectionTurnState,
   requestedAt: IsoDateTime,
@@ -50,6 +53,8 @@ export const ProjectionTurnById = Schema.Struct({
   threadId: ThreadId,
   turnId: TurnId,
   pendingMessageId: Schema.NullOr(MessageId),
+  sourceProposedPlanThreadId: Schema.NullOr(ThreadId),
+  sourceProposedPlanId: Schema.NullOr(OrchestrationProposedPlanId),
   assistantMessageId: Schema.NullOr(MessageId),
   state: ProjectionTurnState,
   requestedAt: IsoDateTime,
@@ -65,6 +70,8 @@ export type ProjectionTurnById = typeof ProjectionTurnById.Type;
 export const ProjectionPendingTurnStart = Schema.Struct({
   threadId: ThreadId,
   messageId: MessageId,
+  sourceProposedPlanThreadId: Schema.NullOr(ThreadId),
+  sourceProposedPlanId: Schema.NullOr(OrchestrationProposedPlanId),
   requestedAt: IsoDateTime,
 });
 export type ProjectionPendingTurnStart = typeof ProjectionPendingTurnStart.Type;
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
new file mode 100644
index 0000000000..a3f67651d8
--- /dev/null
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
@@ -0,0 +1,2764 @@
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import type {
+  Options as ClaudeQueryOptions,
+  PermissionMode,
+  PermissionResult,
+  SDKMessage,
+  SDKUserMessage,
+} from "@anthropic-ai/claude-agent-sdk";
+import {
+  ApprovalRequestId,
+  ProviderItemId,
+  ProviderRuntimeEvent,
+  ThreadId,
+} from "@t3tools/contracts";
+import { assert, describe, it } from "@effect/vitest";
+import { Effect, Fiber, Layer, Random, Stream } from "effect";
+
+import { attachmentRelativePath } from "../../attachmentStore.ts";
+import { ServerConfig } from "../../config.ts";
+import { ProviderAdapterValidationError } from "../Errors.ts";
+import { ClaudeAdapter } from "../Services/ClaudeAdapter.ts";
+import { makeClaudeAdapterLive, type ClaudeAdapterLiveOptions } from "./ClaudeAdapter.ts";
+
+class FakeClaudeQuery implements AsyncIterable<SDKMessage> {
+  private readonly queue: Array<SDKMessage> = [];
+  private readonly waiters: Array<{
+    readonly resolve: (value: IteratorResult<SDKMessage>) => void;
+    readonly reject: (reason: unknown) => void;
+  }> = [];
+  private done = false;
+  private failure: unknown | undefined;
+
+  public readonly interruptCalls: Array<void> = [];
+  public readonly setModelCalls: Array<string | undefined> = [];
+  public readonly setPermissionModeCalls: Array<string> = [];
+  public readonly setMaxThinkingTokensCalls: Array<number | null> = [];
+  public closeCalls = 0;
+
+  emit(message: SDKMessage): void {
+    if (this.done) {
+      return;
+    }
+    const waiter = this.waiters.shift();
+    if (waiter) {
+      waiter.resolve({ done: false, value: message });
+      return;
+    }
+    this.queue.push(message);
+  }
+
+  fail(cause: unknown): void {
+    if (this.done) {
+      return;
+    }
+    this.done = true;
+    this.failure = cause;
+    for (const waiter of this.waiters.splice(0)) {
+      waiter.reject(cause);
+    }
+  }
+
+  finish(): void {
+    if (this.done) {
+      return;
+    }
+    this.done = true;
+    this.failure = undefined;
+    for (const waiter of this.waiters.splice(0)) {
+      waiter.resolve({ done: true, value: undefined });
+    }
+  }
+
+  readonly interrupt = async (): Promise<void> => {
+    this.interruptCalls.push(undefined);
+  };
+
+  readonly setModel = async (model?: string): Promise<void> => {
+    this.setModelCalls.push(model);
+  };
+
+  readonly setPermissionMode = async (mode: PermissionMode): Promise<void> => {
+    this.setPermissionModeCalls.push(mode);
+  };
+
+  readonly setMaxThinkingTokens = async (maxThinkingTokens: number | null): Promise<void> => {
+    this.setMaxThinkingTokensCalls.push(maxThinkingTokens);
+  };
+
+  readonly close = (): void => {
+    this.closeCalls += 1;
+    this.finish();
+  };
+
+  [Symbol.asyncIterator](): AsyncIterator<SDKMessage> {
+    return {
+      next: () => {
+        if (this.queue.length > 0) {
+          const value = this.queue.shift();
+          if (value) {
+            return Promise.resolve({
+              done: false,
+              value,
+            });
+          }
+        }
+        if (this.failure !== undefined) {
+          const failure = this.failure;
+          this.failure = undefined;
+          return Promise.reject(failure);
+        }
+        if (this.done) {
+          return Promise.resolve({
+            done: true,
+            value: undefined,
+          });
+        }
+        return new Promise((resolve, reject) => {
+          this.waiters.push({
+            resolve,
+            reject,
+          });
+        });
+      },
+    };
+  }
+}
+
+function makeHarness(config?: {
+  readonly nativeEventLogPath?: string;
+  readonly nativeEventLogger?: ClaudeAdapterLiveOptions["nativeEventLogger"];
+  readonly cwd?: string;
+  readonly stateDir?: string;
+}) {
+  const query = new FakeClaudeQuery();
+  let createInput:
+    | {
+        readonly prompt: AsyncIterable<SDKUserMessage>;
+        readonly options: ClaudeQueryOptions;
+      }
+    | undefined;
+
+  const adapterOptions: ClaudeAdapterLiveOptions = {
+    createQuery: (input) => {
+      createInput = input;
+      return query;
+    },
+    ...(config?.nativeEventLogger
+      ? {
+          nativeEventLogger: config.nativeEventLogger,
+        }
+      : {}),
+    ...(config?.nativeEventLogPath
+      ? {
+          nativeEventLogPath: config.nativeEventLogPath,
+        }
+      : {}),
+  };
+
+  return {
+    layer: makeClaudeAdapterLive(adapterOptions).pipe(
+      Layer.provideMerge(
+        ServerConfig.layerTest(
+          config?.cwd ?? "/tmp/claude-adapter-test",
+          config?.stateDir ?? "/tmp",
+        ),
+      ),
+      Layer.provideMerge(NodeServices.layer),
+    ),
+    query,
+    getLastCreateQueryInput: () => createInput,
+  };
+}
+
+function makeDeterministicRandomService(seed = 0x1234_5678): {
+  nextIntUnsafe: () => number;
+  nextDoubleUnsafe: () => number;
+} {
+  let state = seed >>> 0;
+  const nextIntUnsafe = (): number => {
+    state = (Math.imul(1_664_525, state) + 1_013_904_223) >>> 0;
+    return state;
+  };
+
+  return {
+    nextIntUnsafe,
+    nextDoubleUnsafe: () => nextIntUnsafe() / 0x1_0000_0000,
+  };
+}
+
+async function readFirstPromptText(
+  input:
+    | {
+        readonly prompt: AsyncIterable<SDKUserMessage>;
+      }
+    | undefined,
+): Promise<string | undefined> {
+  const iterator = input?.prompt[Symbol.asyncIterator]();
+  if (!iterator) {
+    return undefined;
+  }
+  const next = await iterator.next();
+  if (next.done) {
+    return undefined;
+  }
+  const content = (next.value.message as { content?: Array<{ type?: string; text?: string }> })
+    ?.content?.[0];
+  if (!content || content.type !== "text") {
+    return undefined;
+  }
+  return content.text;
+}
+
+async function readFirstPromptMessage(
+  input:
+    | {
+        readonly prompt: AsyncIterable<SDKUserMessage>;
+      }
+    | undefined,
+): Promise<SDKUserMessage | undefined> {
+  const iterator = input?.prompt[Symbol.asyncIterator]();
+  if (!iterator) {
+    return undefined;
+  }
+  const next = await iterator.next();
+  if (next.done) {
+    return undefined;
+  }
+  return next.value;
+}
+
+const THREAD_ID = ThreadId.makeUnsafe("thread-claude-1");
+const RESUME_THREAD_ID = ThreadId.makeUnsafe("thread-claude-resume");
+
+describe("ClaudeAdapterLive", () => {
+  it.effect("returns validation error for non-claude provider on startSession", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const result = yield* adapter
+        .startSession({ threadId: THREAD_ID, provider: "codex", runtimeMode: "full-access" })
+        .pipe(Effect.result);
+
+      assert.equal(result._tag, "Failure");
+      if (result._tag !== "Failure") {
+        return;
+      }
+      assert.deepEqual(
+        result.failure,
+        new ProviderAdapterValidationError({
+          provider: "claudeAgent",
+          operation: "startSession",
+          issue: "Expected provider 'claudeAgent' but received 'codex'.",
+        }),
+      );
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("derives bypass permission mode from full-access runtime policy", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.permissionMode, "bypassPermissions");
+      assert.equal(createInput?.options.allowDangerouslySkipPermissions, true);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("keeps explicit claude permission mode over runtime-derived defaults", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+        providerOptions: {
+          claudeAgent: {
+            permissionMode: "plan",
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.permissionMode, "plan");
+      assert.equal(createInput?.options.allowDangerouslySkipPermissions, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("forwards claude effort levels into query options", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-opus-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            effort: "max",
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.effort, "max");
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("ignores unsupported max effort for Sonnet 4.6", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            effort: "max",
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.effort, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("ignores adaptive effort for Haiku 4.5", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-haiku-4-5",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            effort: "high",
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.effort, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("forwards Claude thinking toggle into SDK settings for Haiku 4.5", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-haiku-4-5",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            thinking: false,
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.deepEqual(createInput?.options.settings, {
+        alwaysThinkingEnabled: false,
+      });
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("ignores Claude thinking toggle for non-Haiku models", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            thinking: false,
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.settings, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("forwards claude fast mode into SDK settings", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-opus-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            fastMode: true,
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.deepEqual(createInput?.options.settings, {
+        fastMode: true,
+      });
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("ignores claude fast mode for non-opus models", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            fastMode: true,
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.settings, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("treats ultrathink as a prompt keyword instead of a session effort", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-6",
+        runtimeMode: "full-access",
+        modelOptions: {
+          claudeAgent: {
+            effort: "ultrathink",
+          },
+        },
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "Investigate the edge cases",
+        attachments: [],
+        model: "claude-sonnet-4-6",
+        modelOptions: {
+          claudeAgent: {
+            effort: "ultrathink",
+          },
+        },
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.effort, undefined);
+      const promptText = yield* Effect.promise(() => readFirstPromptText(createInput));
+      assert.equal(promptText, "Ultrathink:\nInvestigate the edge cases");
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("embeds image attachments in Claude user messages", () => {
+    const stateDir = mkdtempSync(path.join(os.tmpdir(), "claude-attachments-"));
+    const harness = makeHarness({
+      cwd: "/tmp/project-claude-attachments",
+      stateDir,
+    });
+    return Effect.gen(function* () {
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() =>
+          rmSync(stateDir, {
+            recursive: true,
+            force: true,
+          }),
+        ),
+      );
+
+      const adapter = yield* ClaudeAdapter;
+
+      const attachment = {
+        type: "image" as const,
+        id: "thread-claude-attachment-12345678-1234-1234-1234-123456789abc",
+        name: "diagram.png",
+        mimeType: "image/png",
+        sizeBytes: 4,
+      };
+      const attachmentPath = path.join(stateDir, "attachments", attachmentRelativePath(attachment));
+      mkdirSync(path.dirname(attachmentPath), { recursive: true });
+      writeFileSync(attachmentPath, Uint8Array.from([1, 2, 3, 4]));
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "What's in this image?",
+        attachments: [attachment],
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      const promptMessage = yield* Effect.promise(() => readFirstPromptMessage(createInput));
+      assert.isDefined(promptMessage);
+      assert.deepEqual((promptMessage?.message as Record<string, unknown>)?.content, [
+        {
+          type: "text",
+          text: "What's in this image?",
+        },
+        {
+          type: "image",
+          source: {
+            type: "base64",
+            media_type: "image/png",
+            data: "AQIDBA==",
+          },
+        },
+      ]);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("maps Claude stream/runtime messages to canonical provider runtime events", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 10).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        model: "claude-sonnet-4-5",
+        runtimeMode: "full-access",
+      });
+
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-1",
+        uuid: "stream-0",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "text",
+            text: "",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-1",
+        uuid: "stream-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "text_delta",
+            text: "Hi",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-1",
+        uuid: "stream-2",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 0,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-1",
+        uuid: "stream-3",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 1,
+          content_block: {
+            type: "tool_use",
+            id: "tool-1",
+            name: "Bash",
+            input: {
+              command: "ls",
+            },
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-1",
+        uuid: "stream-4",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 1,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "assistant",
+        session_id: "sdk-session-1",
+        uuid: "assistant-1",
+        parent_tool_use_id: null,
+        message: {
+          id: "assistant-message-1",
+          content: [{ type: "text", text: "Hi" }],
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-1",
+        uuid: "result-1",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "content.delta",
+          "item.completed",
+          "item.started",
+          "item.completed",
+          "turn.completed",
+        ],
+      );
+
+      const turnStarted = runtimeEvents[3];
+      assert.equal(turnStarted?.type, "turn.started");
+      if (turnStarted?.type === "turn.started") {
+        assert.equal(String(turnStarted.turnId), String(turn.turnId));
+      }
+
+      const deltaEvent = runtimeEvents.find((event) => event.type === "content.delta");
+      assert.equal(deltaEvent?.type, "content.delta");
+      if (deltaEvent?.type === "content.delta") {
+        assert.equal(deltaEvent.payload.delta, "Hi");
+        assert.equal(String(deltaEvent.turnId), String(turn.turnId));
+      }
+
+      const toolStarted = runtimeEvents.find((event) => event.type === "item.started");
+      assert.equal(toolStarted?.type, "item.started");
+      if (toolStarted?.type === "item.started") {
+        assert.equal(toolStarted.payload.itemType, "command_execution");
+      }
+
+      const assistantCompletedIndex = runtimeEvents.findIndex(
+        (event) =>
+          event.type === "item.completed" && event.payload.itemType === "assistant_message",
+      );
+      const toolStartedIndex = runtimeEvents.findIndex((event) => event.type === "item.started");
+      assert.equal(
+        assistantCompletedIndex >= 0 &&
+          toolStartedIndex >= 0 &&
+          assistantCompletedIndex < toolStartedIndex,
+        true,
+      );
+
+      const turnCompleted = runtimeEvents[runtimeEvents.length - 1];
+      assert.equal(turnCompleted?.type, "turn.completed");
+      if (turnCompleted?.type === "turn.completed") {
+        assert.equal(String(turnCompleted.turnId), String(turn.turnId));
+        assert.equal(turnCompleted.payload.state, "completed");
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("maps Claude reasoning deltas, streamed tool inputs, and tool results", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 11).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-tool-streams",
+        uuid: "stream-thinking",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "thinking_delta",
+            thinking: "Let",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-tool-streams",
+        uuid: "stream-tool-start",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 1,
+          content_block: {
+            type: "tool_use",
+            id: "tool-grep-1",
+            name: "Grep",
+            input: {},
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-tool-streams",
+        uuid: "stream-tool-input-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 1,
+          delta: {
+            type: "input_json_delta",
+            partial_json: '{"pattern":"foo","path":"src"}',
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-tool-streams",
+        uuid: "stream-tool-stop",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 1,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "user",
+        session_id: "sdk-session-tool-streams",
+        uuid: "user-tool-result",
+        parent_tool_use_id: null,
+        message: {
+          role: "user",
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: "tool-grep-1",
+              content: "src/example.ts:1:foo",
+            },
+          ],
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-tool-streams",
+        uuid: "result-tool-streams",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "content.delta",
+          "item.started",
+          "item.updated",
+          "item.updated",
+          "item.completed",
+          "turn.completed",
+        ],
+      );
+
+      const reasoningDelta = runtimeEvents.find(
+        (event) => event.type === "content.delta" && event.payload.streamKind === "reasoning_text",
+      );
+      assert.equal(reasoningDelta?.type, "content.delta");
+      if (reasoningDelta?.type === "content.delta") {
+        assert.equal(reasoningDelta.payload.delta, "Let");
+        assert.equal(String(reasoningDelta.turnId), String(turn.turnId));
+      }
+
+      const toolStarted = runtimeEvents.find((event) => event.type === "item.started");
+      assert.equal(toolStarted?.type, "item.started");
+      if (toolStarted?.type === "item.started") {
+        assert.equal(toolStarted.payload.itemType, "dynamic_tool_call");
+      }
+
+      const toolInputUpdated = runtimeEvents.find(
+        (event) =>
+          event.type === "item.updated" &&
+          (event.payload.data as { input?: { pattern?: string; path?: string } } | undefined)?.input
+            ?.pattern === "foo",
+      );
+      assert.equal(toolInputUpdated?.type, "item.updated");
+      if (toolInputUpdated?.type === "item.updated") {
+        assert.deepEqual(toolInputUpdated.payload.data, {
+          toolName: "Grep",
+          input: {
+            pattern: "foo",
+            path: "src",
+          },
+        });
+      }
+
+      const toolResultUpdated = runtimeEvents.find(
+        (event) =>
+          event.type === "item.updated" &&
+          (event.payload.data as { result?: { tool_use_id?: string } } | undefined)?.result
+            ?.tool_use_id === "tool-grep-1",
+      );
+      assert.equal(toolResultUpdated?.type, "item.updated");
+      if (toolResultUpdated?.type === "item.updated") {
+        assert.equal(
+          (
+            toolResultUpdated.payload.data as {
+              result?: { content?: string };
+            }
+          ).result?.content,
+          "src/example.ts:1:foo",
+        );
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("classifies Claude Task tool invocations as collaboration agent work", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 8).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "delegate this",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-task",
+        uuid: "stream-task-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "tool_use",
+            id: "tool-task-1",
+            name: "Task",
+            input: {
+              description: "Review the database layer",
+              prompt: "Audit the SQL changes",
+              subagent_type: "code-reviewer",
+            },
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "assistant",
+        session_id: "sdk-session-task",
+        uuid: "assistant-task-1",
+        parent_tool_use_id: null,
+        message: {
+          id: "assistant-message-task-1",
+          content: [{ type: "text", text: "Delegated" }],
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-task",
+        uuid: "result-task-1",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      const toolStarted = runtimeEvents.find((event) => event.type === "item.started");
+      assert.equal(toolStarted?.type, "item.started");
+      if (toolStarted?.type === "item.started") {
+        assert.equal(toolStarted.payload.itemType, "collab_agent_tool_call");
+        assert.equal(toolStarted.payload.title, "Subagent task");
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("treats user-aborted Claude results as interrupted without a runtime error", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 6).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "result",
+        subtype: "error_during_execution",
+        is_error: false,
+        errors: ["Error: Request was aborted."],
+        stop_reason: "tool_use",
+        session_id: "sdk-session-abort",
+        uuid: "result-abort",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "turn.completed",
+        ],
+      );
+
+      const turnCompleted = runtimeEvents[runtimeEvents.length - 1];
+      assert.equal(turnCompleted?.type, "turn.completed");
+      if (turnCompleted?.type === "turn.completed") {
+        assert.equal(String(turnCompleted.turnId), String(turn.turnId));
+        assert.equal(turnCompleted.payload.state, "interrupted");
+        assert.equal(turnCompleted.payload.errorMessage, "Error: Request was aborted.");
+        assert.equal(turnCompleted.payload.stopReason, "tool_use");
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("closes the session when the Claude stream aborts after a turn starts", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const runtimeEvents: Array<ProviderRuntimeEvent> = [];
+
+      const runtimeEventsFiber = Effect.runFork(
+        Stream.runForEach(adapter.streamEvents, (event) =>
+          Effect.sync(() => {
+            runtimeEvents.push(event);
+          }),
+        ),
+      );
+
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const turn = yield* adapter.sendTurn({
+        threadId: THREAD_ID,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.fail(new Error("All fibers interrupted without error"));
+
+      yield* Effect.yieldNow;
+      yield* Effect.yieldNow;
+      yield* Effect.yieldNow;
+      runtimeEventsFiber.interruptUnsafe();
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "turn.completed",
+          "session.exited",
+        ],
+      );
+
+      const turnCompleted = runtimeEvents[4];
+      assert.equal(turnCompleted?.type, "turn.completed");
+      if (turnCompleted?.type === "turn.completed") {
+        assert.equal(String(turnCompleted.turnId), String(turn.turnId));
+        assert.equal(turnCompleted.payload.state, "interrupted");
+        assert.equal(turnCompleted.payload.errorMessage, "Claude runtime interrupted.");
+      }
+
+      const sessionExited = runtimeEvents[5];
+      assert.equal(sessionExited?.type, "session.exited");
+
+      assert.equal(yield* adapter.hasSession(THREAD_ID), false);
+      const sessions = yield* adapter.listSessions();
+      assert.equal(sessions.length, 0);
+      assert.equal(harness.query.closeCalls, 1);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("forwards Claude task progress summaries for subagent updates", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 5).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      harness.query.emit({
+        type: "system",
+        subtype: "task_progress",
+        task_id: "task-subagent-1",
+        description: "Running background teammate",
+        summary: "Code reviewer checked the migration edge cases.",
+        usage: {
+          total_tokens: 123,
+          tool_uses: 4,
+          duration_ms: 987,
+        },
+        session_id: "sdk-session-task-summary",
+        uuid: "task-progress-1",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      const progressEvent = runtimeEvents.find((event) => event.type === "task.progress");
+      assert.equal(progressEvent?.type, "task.progress");
+      if (progressEvent?.type === "task.progress") {
+        assert.equal(
+          progressEvent.payload.summary,
+          "Code reviewer checked the migration edge cases.",
+        );
+        assert.equal(progressEvent.payload.description, "Running background teammate");
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect(
+    "emits completion only after turn result when assistant frames arrive before deltas",
+    () => {
+      const harness = makeHarness();
+      return Effect.gen(function* () {
+        const adapter = yield* ClaudeAdapter;
+
+        const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 8).pipe(
+          Stream.runCollect,
+          Effect.forkChild,
+        );
+
+        const session = yield* adapter.startSession({
+          threadId: THREAD_ID,
+          provider: "claudeAgent",
+          runtimeMode: "full-access",
+        });
+
+        const turn = yield* adapter.sendTurn({
+          threadId: session.threadId,
+          input: "hello",
+          attachments: [],
+        });
+
+        harness.query.emit({
+          type: "assistant",
+          session_id: "sdk-session-early-assistant",
+          uuid: "assistant-early",
+          parent_tool_use_id: null,
+          message: {
+            id: "assistant-message-early",
+            content: [
+              { type: "tool_use", id: "tool-early", name: "Read", input: { path: "a.ts" } },
+            ],
+          },
+        } as unknown as SDKMessage);
+
+        harness.query.emit({
+          type: "stream_event",
+          session_id: "sdk-session-early-assistant",
+          uuid: "stream-early",
+          parent_tool_use_id: null,
+          event: {
+            type: "content_block_delta",
+            index: 0,
+            delta: {
+              type: "text_delta",
+              text: "Late text",
+            },
+          },
+        } as unknown as SDKMessage);
+
+        harness.query.emit({
+          type: "result",
+          subtype: "success",
+          is_error: false,
+          errors: [],
+          session_id: "sdk-session-early-assistant",
+          uuid: "result-early",
+        } as unknown as SDKMessage);
+
+        const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+        assert.deepEqual(
+          runtimeEvents.map((event) => event.type),
+          [
+            "session.started",
+            "session.configured",
+            "session.state.changed",
+            "turn.started",
+            "thread.started",
+            "content.delta",
+            "item.completed",
+            "turn.completed",
+          ],
+        );
+
+        const deltaIndex = runtimeEvents.findIndex((event) => event.type === "content.delta");
+        const completedIndex = runtimeEvents.findIndex((event) => event.type === "item.completed");
+        assert.equal(deltaIndex >= 0 && completedIndex >= 0 && deltaIndex < completedIndex, true);
+
+        const deltaEvent = runtimeEvents[deltaIndex];
+        assert.equal(deltaEvent?.type, "content.delta");
+        if (deltaEvent?.type === "content.delta") {
+          assert.equal(deltaEvent.payload.delta, "Late text");
+          assert.equal(String(deltaEvent.turnId), String(turn.turnId));
+        }
+      }).pipe(
+        Effect.provideService(Random.Random, makeDeterministicRandomService()),
+        Effect.provide(harness.layer),
+      );
+    },
+  );
+
+  it.effect("creates a fresh assistant message when Claude reuses a text block index", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 9).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-start-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "text",
+            text: "",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-delta-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "text_delta",
+            text: "First",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-stop-1",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 0,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-start-2",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "text",
+            text: "",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-delta-2",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "text_delta",
+            text: "Second",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-reused-text-index",
+        uuid: "stream-reused-stop-2",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 0,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-reused-text-index",
+        uuid: "result-reused-text-index",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "content.delta",
+          "item.completed",
+          "content.delta",
+          "item.completed",
+        ],
+      );
+
+      const assistantDeltas = runtimeEvents.filter(
+        (event) => event.type === "content.delta" && event.payload.streamKind === "assistant_text",
+      );
+      assert.equal(assistantDeltas.length, 2);
+      if (assistantDeltas.length !== 2) {
+        return;
+      }
+      const [firstAssistantDelta, secondAssistantDelta] = assistantDeltas;
+      assert.equal(firstAssistantDelta?.type, "content.delta");
+      assert.equal(secondAssistantDelta?.type, "content.delta");
+      if (
+        firstAssistantDelta?.type !== "content.delta" ||
+        secondAssistantDelta?.type !== "content.delta"
+      ) {
+        return;
+      }
+      assert.equal(firstAssistantDelta.payload.delta, "First");
+      assert.equal(secondAssistantDelta.payload.delta, "Second");
+      assert.notEqual(firstAssistantDelta.itemId, secondAssistantDelta.itemId);
+
+      const assistantCompletions = runtimeEvents.filter(
+        (event) =>
+          event.type === "item.completed" && event.payload.itemType === "assistant_message",
+      );
+      assert.equal(assistantCompletions.length, 2);
+      assert.equal(String(assistantCompletions[0]?.itemId), String(firstAssistantDelta.itemId));
+      assert.equal(String(assistantCompletions[1]?.itemId), String(secondAssistantDelta.itemId));
+      assert.notEqual(
+        String(assistantCompletions[0]?.itemId),
+        String(assistantCompletions[1]?.itemId),
+      );
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("falls back to assistant payload text when stream deltas are absent", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 8).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "assistant",
+        session_id: "sdk-session-fallback-text",
+        uuid: "assistant-fallback",
+        parent_tool_use_id: null,
+        message: {
+          id: "assistant-message-fallback",
+          content: [{ type: "text", text: "Fallback hello" }],
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-fallback-text",
+        uuid: "result-fallback",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "content.delta",
+          "item.completed",
+          "turn.completed",
+        ],
+      );
+
+      const deltaEvent = runtimeEvents.find((event) => event.type === "content.delta");
+      assert.equal(deltaEvent?.type, "content.delta");
+      if (deltaEvent?.type === "content.delta") {
+        assert.equal(deltaEvent.payload.delta, "Fallback hello");
+        assert.equal(String(deltaEvent.turnId), String(turn.turnId));
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("segments Claude assistant text blocks around tool calls", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 13).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-1-start",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 0,
+          content_block: {
+            type: "text",
+            text: "",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-1-delta",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "text_delta",
+            text: "First message.",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-1-stop",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 0,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-tool-start",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 1,
+          content_block: {
+            type: "tool_use",
+            id: "tool-interleaved-1",
+            name: "Grep",
+            input: {
+              pattern: "assistant",
+              path: "src",
+            },
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-tool-stop",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 1,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "user",
+        session_id: "sdk-session-interleaved",
+        uuid: "user-tool-result-interleaved",
+        parent_tool_use_id: null,
+        message: {
+          role: "user",
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: "tool-interleaved-1",
+              content: "src/example.ts:1:assistant",
+            },
+          ],
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-2-start",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_start",
+          index: 2,
+          content_block: {
+            type: "text",
+            text: "",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-2-delta",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 2,
+          delta: {
+            type: "text_delta",
+            text: "Second message.",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-interleaved",
+        uuid: "stream-text-2-stop",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_stop",
+          index: 2,
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-interleaved",
+        uuid: "result-interleaved",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+          "content.delta",
+          "item.completed",
+          "item.started",
+          "item.updated",
+          "item.completed",
+          "content.delta",
+          "item.completed",
+          "turn.completed",
+        ],
+      );
+
+      const assistantTextDeltas = runtimeEvents.filter(
+        (event) => event.type === "content.delta" && event.payload.streamKind === "assistant_text",
+      );
+      assert.equal(assistantTextDeltas.length, 2);
+      if (assistantTextDeltas.length !== 2) {
+        return;
+      }
+      const [firstAssistantDelta, secondAssistantDelta] = assistantTextDeltas;
+      if (!firstAssistantDelta || !secondAssistantDelta) {
+        return;
+      }
+      assert.notEqual(String(firstAssistantDelta.itemId), String(secondAssistantDelta.itemId));
+
+      const firstAssistantCompletedIndex = runtimeEvents.findIndex(
+        (event) =>
+          event.type === "item.completed" &&
+          event.payload.itemType === "assistant_message" &&
+          String(event.itemId) === String(firstAssistantDelta.itemId),
+      );
+      const toolStartedIndex = runtimeEvents.findIndex((event) => event.type === "item.started");
+      const secondAssistantDeltaIndex = runtimeEvents.findIndex(
+        (event) =>
+          event.type === "content.delta" &&
+          event.payload.streamKind === "assistant_text" &&
+          String(event.itemId) === String(secondAssistantDelta.itemId),
+      );
+
+      assert.equal(
+        firstAssistantCompletedIndex >= 0 &&
+          toolStartedIndex >= 0 &&
+          secondAssistantDeltaIndex >= 0 &&
+          firstAssistantCompletedIndex < toolStartedIndex &&
+          toolStartedIndex < secondAssistantDeltaIndex,
+        true,
+      );
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("does not fabricate provider thread ids before first SDK session_id", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 5).pipe(
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+      assert.equal(session.threadId, THREAD_ID);
+
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+      assert.equal(turn.threadId, THREAD_ID);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-thread-real",
+        uuid: "stream-thread-real",
+        parent_tool_use_id: null,
+        event: {
+          type: "message_start",
+          message: {
+            id: "msg-thread-real",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-thread-real",
+        uuid: "result-thread-real",
+      } as unknown as SDKMessage);
+
+      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
+      assert.deepEqual(
+        runtimeEvents.map((event) => event.type),
+        [
+          "session.started",
+          "session.configured",
+          "session.state.changed",
+          "turn.started",
+          "thread.started",
+        ],
+      );
+
+      const sessionStarted = runtimeEvents[0];
+      assert.equal(sessionStarted?.type, "session.started");
+      if (sessionStarted?.type === "session.started") {
+        assert.equal(sessionStarted.threadId, THREAD_ID);
+      }
+
+      const threadStarted = runtimeEvents[4];
+      assert.equal(threadStarted?.type, "thread.started");
+      if (threadStarted?.type === "thread.started") {
+        assert.equal(threadStarted.threadId, THREAD_ID);
+        assert.deepEqual(threadStarted.payload, {
+          providerThreadId: "sdk-thread-real",
+        });
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("bridges approval request/response lifecycle through canUseTool", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "approval-required",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "approve this",
+        attachments: [],
+      });
+      yield* Stream.take(adapter.streamEvents, 1).pipe(Stream.runDrain);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-approval-1",
+        uuid: "stream-approval-thread",
+        parent_tool_use_id: null,
+        event: {
+          type: "message_start",
+          message: {
+            id: "msg-approval-thread",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      const threadStarted = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(threadStarted._tag, "Some");
+      if (threadStarted._tag !== "Some" || threadStarted.value.type !== "thread.started") {
+        return;
+      }
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      const permissionPromise = canUseTool(
+        "Bash",
+        { command: "pwd" },
+        {
+          signal: new AbortController().signal,
+          suggestions: [
+            {
+              type: "setMode",
+              mode: "default",
+              destination: "session",
+            },
+          ],
+          toolUseID: "tool-use-1",
+        },
+      );
+
+      const requested = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(requested._tag, "Some");
+      if (requested._tag !== "Some") {
+        return;
+      }
+      assert.equal(requested.value.type, "request.opened");
+      if (requested.value.type !== "request.opened") {
+        return;
+      }
+      assert.deepEqual(requested.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-use-1"),
+      });
+      const runtimeRequestId = requested.value.requestId;
+      assert.equal(typeof runtimeRequestId, "string");
+      if (runtimeRequestId === undefined) {
+        return;
+      }
+
+      yield* adapter.respondToRequest(
+        session.threadId,
+        ApprovalRequestId.makeUnsafe(runtimeRequestId),
+        "accept",
+      );
+
+      const resolved = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(resolved._tag, "Some");
+      if (resolved._tag !== "Some") {
+        return;
+      }
+      assert.equal(resolved.value.type, "request.resolved");
+      if (resolved.value.type !== "request.resolved") {
+        return;
+      }
+      assert.equal(resolved.value.requestId, requested.value.requestId);
+      assert.equal(resolved.value.payload.decision, "accept");
+      assert.deepEqual(resolved.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-use-1"),
+      });
+
+      const permissionResult = yield* Effect.promise(() => permissionPromise);
+      assert.equal((permissionResult as PermissionResult).behavior, "allow");
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("classifies Agent tools and read-only Claude tools correctly for approvals", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "approval-required",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      const agentPermissionPromise = canUseTool(
+        "Agent",
+        {},
+        {
+          signal: new AbortController().signal,
+          toolUseID: "tool-agent-1",
+        },
+      );
+
+      const agentRequested = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(agentRequested._tag, "Some");
+      if (agentRequested._tag !== "Some" || agentRequested.value.type !== "request.opened") {
+        return;
+      }
+      assert.equal(agentRequested.value.payload.requestType, "dynamic_tool_call");
+
+      yield* adapter.respondToRequest(
+        session.threadId,
+        ApprovalRequestId.makeUnsafe(String(agentRequested.value.requestId)),
+        "accept",
+      );
+      yield* Stream.runHead(adapter.streamEvents);
+      yield* Effect.promise(() => agentPermissionPromise);
+
+      const grepPermissionPromise = canUseTool(
+        "Grep",
+        { pattern: "foo", path: "src" },
+        {
+          signal: new AbortController().signal,
+          toolUseID: "tool-grep-approval-1",
+        },
+      );
+
+      const grepRequested = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(grepRequested._tag, "Some");
+      if (grepRequested._tag !== "Some" || grepRequested.value.type !== "request.opened") {
+        return;
+      }
+      assert.equal(grepRequested.value.payload.requestType, "file_read_approval");
+
+      yield* adapter.respondToRequest(
+        session.threadId,
+        ApprovalRequestId.makeUnsafe(String(grepRequested.value.requestId)),
+        "accept",
+      );
+      yield* Stream.runHead(adapter.streamEvents);
+      yield* Effect.promise(() => grepPermissionPromise);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("passes Claude resume ids without pinning a stale assistant checkpoint", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: RESUME_THREAD_ID,
+        provider: "claudeAgent",
+        resumeCursor: {
+          threadId: "resume-thread-1",
+          resume: "550e8400-e29b-41d4-a716-446655440000",
+          resumeSessionAt: "assistant-99",
+          turnCount: 3,
+        },
+        runtimeMode: "full-access",
+      });
+
+      assert.equal(session.threadId, RESUME_THREAD_ID);
+      assert.deepEqual(session.resumeCursor, {
+        threadId: RESUME_THREAD_ID,
+        resume: "550e8400-e29b-41d4-a716-446655440000",
+        resumeSessionAt: "assistant-99",
+        turnCount: 3,
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      assert.equal(createInput?.options.resume, "550e8400-e29b-41d4-a716-446655440000");
+      assert.equal(createInput?.options.sessionId, undefined);
+      assert.equal(createInput?.options.resumeSessionAt, undefined);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("uses an app-generated Claude session id for fresh sessions", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      const createInput = harness.getLastCreateQueryInput();
+      const sessionResumeCursor = session.resumeCursor as {
+        threadId?: string;
+        resume?: string;
+        turnCount?: number;
+      };
+      assert.equal(sessionResumeCursor.threadId, THREAD_ID);
+      assert.equal(typeof sessionResumeCursor.resume, "string");
+      assert.equal(sessionResumeCursor.turnCount, 0);
+      assert.match(
+        sessionResumeCursor.resume ?? "",
+        /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
+      );
+      assert.equal(createInput?.options.resume, undefined);
+      assert.equal(createInput?.options.sessionId, sessionResumeCursor.resume);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect(
+    "supports rollbackThread by trimming in-memory turns and preserving earlier turns",
+    () => {
+      const harness = makeHarness();
+      return Effect.gen(function* () {
+        const adapter = yield* ClaudeAdapter;
+
+        const session = yield* adapter.startSession({
+          threadId: THREAD_ID,
+          provider: "claudeAgent",
+          runtimeMode: "full-access",
+        });
+
+        const firstTurn = yield* adapter.sendTurn({
+          threadId: session.threadId,
+          input: "first",
+          attachments: [],
+        });
+
+        const firstCompletedFiber = yield* Stream.filter(
+          adapter.streamEvents,
+          (event) => event.type === "turn.completed",
+        ).pipe(Stream.runHead, Effect.forkChild);
+
+        harness.query.emit({
+          type: "result",
+          subtype: "success",
+          is_error: false,
+          errors: [],
+          session_id: "sdk-session-rollback",
+          uuid: "result-first",
+        } as unknown as SDKMessage);
+
+        const firstCompleted = yield* Fiber.join(firstCompletedFiber);
+        assert.equal(firstCompleted._tag, "Some");
+        if (firstCompleted._tag === "Some" && firstCompleted.value.type === "turn.completed") {
+          assert.equal(String(firstCompleted.value.turnId), String(firstTurn.turnId));
+        }
+
+        const secondTurn = yield* adapter.sendTurn({
+          threadId: session.threadId,
+          input: "second",
+          attachments: [],
+        });
+
+        const secondCompletedFiber = yield* Stream.filter(
+          adapter.streamEvents,
+          (event) => event.type === "turn.completed",
+        ).pipe(Stream.runHead, Effect.forkChild);
+
+        harness.query.emit({
+          type: "result",
+          subtype: "success",
+          is_error: false,
+          errors: [],
+          session_id: "sdk-session-rollback",
+          uuid: "result-second",
+        } as unknown as SDKMessage);
+
+        const secondCompleted = yield* Fiber.join(secondCompletedFiber);
+        assert.equal(secondCompleted._tag, "Some");
+        if (secondCompleted._tag === "Some" && secondCompleted.value.type === "turn.completed") {
+          assert.equal(String(secondCompleted.value.turnId), String(secondTurn.turnId));
+        }
+
+        const threadBeforeRollback = yield* adapter.readThread(session.threadId);
+        assert.equal(threadBeforeRollback.turns.length, 2);
+
+        const rolledBack = yield* adapter.rollbackThread(session.threadId, 1);
+        assert.equal(rolledBack.turns.length, 1);
+        assert.equal(rolledBack.turns[0]?.id, firstTurn.turnId);
+
+        const threadAfterRollback = yield* adapter.readThread(session.threadId);
+        assert.equal(threadAfterRollback.turns.length, 1);
+        assert.equal(threadAfterRollback.turns[0]?.id, firstTurn.turnId);
+      }).pipe(
+        Effect.provideService(Random.Random, makeDeterministicRandomService()),
+        Effect.provide(harness.layer),
+      );
+    },
+  );
+
+  it.effect("updates model on sendTurn when model override is provided", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        model: "claude-opus-4-6",
+        attachments: [],
+      });
+
+      assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6"]);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("sets plan permission mode on sendTurn when interactionMode is plan", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "plan this for me",
+        interactionMode: "plan",
+        attachments: [],
+      });
+
+      assert.deepEqual(harness.query.setPermissionModeCalls, ["plan"]);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("restores base permission mode on sendTurn when interactionMode is default", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      // First turn in plan mode
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "plan this",
+        interactionMode: "plan",
+        attachments: [],
+      });
+
+      // Complete the turn so we can send another
+      const turnCompletedFiber = yield* Stream.filter(
+        adapter.streamEvents,
+        (event) => event.type === "turn.completed",
+      ).pipe(Stream.runHead, Effect.forkChild);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-plan-restore",
+        uuid: "result-plan",
+      } as unknown as SDKMessage);
+
+      yield* Fiber.join(turnCompletedFiber);
+
+      // Second turn back to default
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "now do it",
+        interactionMode: "default",
+        attachments: [],
+      });
+
+      // First call sets "plan", second call restores "bypassPermissions" (the base for full-access)
+      assert.deepEqual(harness.query.setPermissionModeCalls, ["plan", "bypassPermissions"]);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("does not call setPermissionMode when interactionMode is absent", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      assert.deepEqual(harness.query.setPermissionModeCalls, []);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("captures ExitPlanMode as a proposed plan and denies auto-exit", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "plan this",
+        interactionMode: "plan",
+        attachments: [],
+      });
+      yield* Stream.take(adapter.streamEvents, 1).pipe(Stream.runDrain);
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      const permissionPromise = canUseTool(
+        "ExitPlanMode",
+        {
+          plan: "# Ship it\n\n- one\n- two",
+          allowedPrompts: [{ tool: "Bash", prompt: "run tests" }],
+        },
+        {
+          signal: new AbortController().signal,
+          toolUseID: "tool-exit-1",
+        },
+      );
+
+      const proposedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(proposedEvent._tag, "Some");
+      if (proposedEvent._tag !== "Some") {
+        return;
+      }
+      assert.equal(proposedEvent.value.type, "turn.proposed.completed");
+      if (proposedEvent.value.type !== "turn.proposed.completed") {
+        return;
+      }
+      assert.equal(proposedEvent.value.payload.planMarkdown, "# Ship it\n\n- one\n- two");
+      assert.deepEqual(proposedEvent.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-exit-1"),
+      });
+
+      const permissionResult = yield* Effect.promise(() => permissionPromise);
+      assert.equal((permissionResult as PermissionResult).behavior, "deny");
+      const deniedResult = permissionResult as PermissionResult & {
+        message?: string;
+      };
+      assert.equal(deniedResult.message?.includes("captured your proposed plan"), true);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("extracts proposed plans from assistant ExitPlanMode snapshots", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "plan this",
+        interactionMode: "plan",
+        attachments: [],
+      });
+      yield* Stream.take(adapter.streamEvents, 1).pipe(Stream.runDrain);
+
+      const proposedEventFiber = yield* Stream.filter(
+        adapter.streamEvents,
+        (event) => event.type === "turn.proposed.completed",
+      ).pipe(Stream.runHead, Effect.forkChild);
+
+      harness.query.emit({
+        type: "assistant",
+        session_id: "sdk-session-exit-plan",
+        uuid: "assistant-exit-plan",
+        parent_tool_use_id: null,
+        message: {
+          model: "claude-opus-4-6",
+          id: "msg-exit-plan",
+          type: "message",
+          role: "assistant",
+          content: [
+            {
+              type: "tool_use",
+              id: "tool-exit-2",
+              name: "ExitPlanMode",
+              input: {
+                plan: "# Final plan\n\n- capture it",
+              },
+            },
+          ],
+          stop_reason: null,
+          stop_sequence: null,
+          usage: {},
+        },
+      } as unknown as SDKMessage);
+
+      const proposedEvent = yield* Fiber.join(proposedEventFiber);
+      assert.equal(proposedEvent._tag, "Some");
+      if (proposedEvent._tag !== "Some") {
+        return;
+      }
+      assert.equal(proposedEvent.value.type, "turn.proposed.completed");
+      if (proposedEvent.value.type !== "turn.proposed.completed") {
+        return;
+      }
+      assert.equal(proposedEvent.value.payload.planMarkdown, "# Final plan\n\n- capture it");
+      assert.deepEqual(proposedEvent.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-exit-2"),
+      });
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("handles AskUserQuestion via user-input.requested/resolved lifecycle", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      // Start session in approval-required mode so canUseTool fires.
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "approval-required",
+      });
+
+      // Drain the session startup events (started, configured, state.changed).
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "question turn",
+        attachments: [],
+      });
+      yield* Stream.take(adapter.streamEvents, 1).pipe(Stream.runDrain);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-user-input-1",
+        uuid: "stream-user-input-thread",
+        parent_tool_use_id: null,
+        event: {
+          type: "message_start",
+          message: {
+            id: "msg-user-input-thread",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      const threadStarted = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(threadStarted._tag, "Some");
+      if (threadStarted._tag !== "Some" || threadStarted.value.type !== "thread.started") {
+        return;
+      }
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      // Simulate Claude calling AskUserQuestion with structured questions.
+      const askInput = {
+        questions: [
+          {
+            question: "Which framework?",
+            header: "Framework",
+            options: [
+              { label: "React", description: "React.js" },
+              { label: "Vue", description: "Vue.js" },
+            ],
+            multiSelect: false,
+          },
+        ],
+      };
+
+      const permissionPromise = canUseTool("AskUserQuestion", askInput, {
+        signal: new AbortController().signal,
+        toolUseID: "tool-ask-1",
+      });
+
+      // The adapter should emit a user-input.requested event.
+      const requestedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(requestedEvent._tag, "Some");
+      if (requestedEvent._tag !== "Some") {
+        return;
+      }
+      assert.equal(requestedEvent.value.type, "user-input.requested");
+      if (requestedEvent.value.type !== "user-input.requested") {
+        return;
+      }
+      const requestId = requestedEvent.value.requestId;
+      assert.equal(typeof requestId, "string");
+      assert.equal(requestedEvent.value.payload.questions.length, 1);
+      assert.equal(requestedEvent.value.payload.questions[0]?.question, "Which framework?");
+      assert.deepEqual(requestedEvent.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-ask-1"),
+      });
+
+      // Respond with the user's answers.
+      yield* adapter.respondToUserInput(
+        session.threadId,
+        ApprovalRequestId.makeUnsafe(requestId!),
+        { "Which framework?": "React" },
+      );
+
+      // The adapter should emit a user-input.resolved event.
+      const resolvedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(resolvedEvent._tag, "Some");
+      if (resolvedEvent._tag !== "Some") {
+        return;
+      }
+      assert.equal(resolvedEvent.value.type, "user-input.resolved");
+      if (resolvedEvent.value.type !== "user-input.resolved") {
+        return;
+      }
+      assert.deepEqual(resolvedEvent.value.payload.answers, {
+        "Which framework?": "React",
+      });
+      assert.deepEqual(resolvedEvent.value.providerRefs, {
+        providerItemId: ProviderItemId.makeUnsafe("tool-ask-1"),
+      });
+
+      // The canUseTool promise should resolve with the answers in SDK format.
+      const permissionResult = yield* Effect.promise(() => permissionPromise);
+      assert.equal((permissionResult as PermissionResult).behavior, "allow");
+      const updatedInput = (permissionResult as { updatedInput: Record<string, unknown> })
+        .updatedInput;
+      assert.deepEqual(updatedInput.answers, { "Which framework?": "React" });
+      // Original questions should be passed through.
+      assert.deepEqual(updatedInput.questions, askInput.questions);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("routes AskUserQuestion through user-input flow even in full-access mode", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      // In full-access mode, regular tools are auto-approved.
+      // AskUserQuestion should still go through the user-input flow.
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      const askInput = {
+        questions: [
+          {
+            question: "Deploy to which env?",
+            header: "Env",
+            options: [
+              { label: "Staging", description: "Staging environment" },
+              { label: "Production", description: "Production environment" },
+            ],
+            multiSelect: false,
+          },
+        ],
+      };
+
+      const permissionPromise = canUseTool("AskUserQuestion", askInput, {
+        signal: new AbortController().signal,
+        toolUseID: "tool-ask-2",
+      });
+
+      // Should still get user-input.requested even in full-access mode.
+      const requestedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(requestedEvent._tag, "Some");
+      if (requestedEvent._tag !== "Some" || requestedEvent.value.type !== "user-input.requested") {
+        assert.fail("Expected user-input.requested event");
+        return;
+      }
+      const requestId = requestedEvent.value.requestId;
+
+      yield* adapter.respondToUserInput(
+        session.threadId,
+        ApprovalRequestId.makeUnsafe(requestId!),
+        { "Deploy to which env?": "Staging" },
+      );
+
+      // Drain the resolved event.
+      yield* Stream.runHead(adapter.streamEvents);
+
+      const permissionResult = yield* Effect.promise(() => permissionPromise);
+      assert.equal((permissionResult as PermissionResult).behavior, "allow");
+      const updatedInput = (permissionResult as { updatedInput: Record<string, unknown> })
+        .updatedInput;
+      assert.deepEqual(updatedInput.answers, { "Deploy to which env?": "Staging" });
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("denies AskUserQuestion when the waiting turn is aborted", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "approval-required",
+      });
+
+      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
+
+      const createInput = harness.getLastCreateQueryInput();
+      const canUseTool = createInput?.options.canUseTool;
+      assert.equal(typeof canUseTool, "function");
+      if (!canUseTool) {
+        return;
+      }
+
+      const controller = new AbortController();
+      const permissionPromise = canUseTool(
+        "AskUserQuestion",
+        {
+          questions: [
+            {
+              question: "Continue?",
+              header: "Continue",
+              options: [{ label: "Yes", description: "Proceed" }],
+              multiSelect: false,
+            },
+          ],
+        },
+        {
+          signal: controller.signal,
+          toolUseID: "tool-ask-abort",
+        },
+      );
+
+      const requestedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(requestedEvent._tag, "Some");
+      if (requestedEvent._tag !== "Some" || requestedEvent.value.type !== "user-input.requested") {
+        assert.fail("Expected user-input.requested event");
+        return;
+      }
+      assert.equal(requestedEvent.value.threadId, session.threadId);
+
+      controller.abort();
+
+      const resolvedEvent = yield* Stream.runHead(adapter.streamEvents);
+      assert.equal(resolvedEvent._tag, "Some");
+      if (resolvedEvent._tag !== "Some" || resolvedEvent.value.type !== "user-input.resolved") {
+        assert.fail("Expected user-input.resolved event");
+        return;
+      }
+      assert.deepEqual(resolvedEvent.value.payload.answers, {});
+
+      const permissionResult = yield* Effect.promise(() => permissionPromise);
+      assert.deepEqual(permissionResult, {
+        behavior: "deny",
+        message: "User cancelled tool execution.",
+      } satisfies PermissionResult);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("writes provider-native observability records when enabled", () => {
+    const nativeEvents: Array<{
+      event?: {
+        provider?: string;
+        method?: string;
+        threadId?: string;
+        turnId?: string;
+      };
+    }> = [];
+    const nativeThreadIds: Array<string | null> = [];
+    const harness = makeHarness({
+      nativeEventLogger: {
+        filePath: "memory://claude-native-events",
+        write: (event, threadId) => {
+          nativeEvents.push(event as (typeof nativeEvents)[number]);
+          nativeThreadIds.push(threadId ?? null);
+          return Effect.void;
+        },
+        close: () => Effect.void,
+      },
+    });
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: "claudeAgent",
+        runtimeMode: "full-access",
+      });
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      const turnCompletedFiber = yield* Stream.filter(
+        adapter.streamEvents,
+        (event) => event.type === "turn.completed",
+      ).pipe(Stream.runHead, Effect.forkChild);
+
+      harness.query.emit({
+        type: "stream_event",
+        session_id: "sdk-session-native-log",
+        uuid: "stream-native-log",
+        parent_tool_use_id: null,
+        event: {
+          type: "content_block_delta",
+          index: 0,
+          delta: {
+            type: "text_delta",
+            text: "hi",
+          },
+        },
+      } as unknown as SDKMessage);
+
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-native-log",
+        uuid: "result-native-log",
+      } as unknown as SDKMessage);
+
+      const turnCompleted = yield* Fiber.join(turnCompletedFiber);
+      assert.equal(turnCompleted._tag, "Some");
+
+      assert.equal(nativeEvents.length > 0, true);
+      assert.equal(
+        nativeEvents.some((record) => record.event?.provider === "claudeAgent"),
+        true,
+      );
+      assert.equal(
+        nativeEvents.some(
+          (record) =>
+            String(
+              (record.event as { readonly providerThreadId?: string } | undefined)
+                ?.providerThreadId,
+            ) === "sdk-session-native-log",
+        ),
+        true,
+      );
+      assert.equal(
+        nativeEvents.some((record) => String(record.event?.turnId) === String(turn.turnId)),
+        true,
+      );
+      assert.equal(
+        nativeEvents.some(
+          (record) => record.event?.method === "claude/stream_event/content_block_delta/text_delta",
+        ),
+        true,
+      );
+      assert.equal(
+        nativeThreadIds.every((threadId) => threadId === String(THREAD_ID)),
+        true,
+      );
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+});
diff --git a/apps/server/src/provider/Layers/ClaudeCodeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
similarity index 50%
rename from apps/server/src/provider/Layers/ClaudeCodeAdapter.ts
rename to apps/server/src/provider/Layers/ClaudeAdapter.ts
index 5f1a328b51..0b3a20aebe 100644
--- a/apps/server/src/provider/Layers/ClaudeCodeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -1,17 +1,13 @@
 /**
- * ClaudeCodeAdapterLive - Scoped live implementation for the Claude Code provider adapter.
+ * ClaudeAdapterLive - Scoped live implementation for the Claude Agent provider adapter.
  *
  * Wraps `@anthropic-ai/claude-agent-sdk` query sessions behind the generic
  * provider adapter contract and emits canonical runtime events.
  *
- * @module ClaudeCodeAdapterLive
+ * @module ClaudeAdapterLive
  */
-import { createRequire } from "node:module";
-import * as Path from "node:path";
-
 import {
   type CanUseTool,
-  type EffortLevel,
   query,
   type Options as ClaudeQueryOptions,
   type PermissionMode,
@@ -32,15 +28,41 @@ import {
   type ProviderRuntimeTurnStatus,
   type ProviderSendTurnInput,
   type ProviderSession,
+  type ProviderUserInputAnswers,
+  type RuntimeContentStreamKind,
   RuntimeItemId,
   RuntimeRequestId,
   RuntimeTaskId,
   ThreadId,
   TurnId,
+  type UserInputQuestion,
 } from "@t3tools/contracts";
-import { Cause, DateTime, Deferred, Effect, Layer, Queue, Random, Ref, Stream } from "effect";
-
-import type { ProviderUsageQuota, ProviderUsageResult } from "@t3tools/contracts";
+import {
+  applyClaudePromptEffortPrefix,
+  getEffectiveClaudeCodeEffort,
+  getReasoningEffortOptions,
+  resolveReasoningEffortForProvider,
+  supportsClaudeFastMode,
+  supportsClaudeThinkingToggle,
+  supportsClaudeUltrathinkKeyword,
+} from "@t3tools/shared/model";
+import {
+  Cause,
+  DateTime,
+  Deferred,
+  Effect,
+  Exit,
+  FileSystem,
+  Fiber,
+  Layer,
+  Queue,
+  Random,
+  Ref,
+  Stream,
+} from "effect";
+
+import { resolveAttachmentPath } from "../../attachmentStore.ts";
+import { ServerConfig } from "../../config.ts";
 import {
   ProviderAdapterProcessError,
   ProviderAdapterRequestError,
@@ -49,124 +71,30 @@ import {
   ProviderAdapterValidationError,
   type ProviderAdapterError,
 } from "../Errors.ts";
+import { ClaudeAdapter, type ClaudeAdapterShape } from "../Services/ClaudeAdapter.ts";
 import { getProviderCapabilities } from "../Services/ProviderAdapter.ts";
-import { ClaudeCodeAdapter, type ClaudeCodeAdapterShape } from "../Services/ClaudeCodeAdapter.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
-import { toMessage } from "../toMessage.ts";
-
-import { createLogger } from "../../logger";
-
-const PROVIDER = "claudeCode" as const;
-const logger = createLogger(PROVIDER);
-
-/**
- * Environment variables that must be stripped before spawning the Claude Code
- * subprocess.  These are set by the Electron desktop shell and leak into the
- * server's `process.env` when T3 Code runs in desktop mode.  Passing them
- * through to the Claude CLI can cause it to exit immediately with code 1.
- */
-const SPAWN_ENV_BLOCKLIST = new Set([
-  "ELECTRON_RUN_AS_NODE",
-  "ELECTRON_RENDERER_PORT",
-  "CLAUDECODE",
-]);
-
-const DESKTOP_DIAGNOSTIC_ENV_PREFIXES = ["CLAUDE", "ELECTRON", "CODEX", "T3CODE"] as const;
-
-function sanitizedEnv(): Record<string, string | undefined> {
-  const env = { ...process.env };
-  for (const key of SPAWN_ENV_BLOCKLIST) {
-    delete env[key];
-  }
-  return env;
-}
-
-const require = createRequire(import.meta.url);
-let resolvedClaudeSdkCliPath: string | undefined;
-
-function defaultClaudeSdkCliPath(): string {
-  if (resolvedClaudeSdkCliPath) {
-    return resolvedClaudeSdkCliPath;
-  }
-
-  const sdkEntry = require.resolve("@anthropic-ai/claude-agent-sdk");
-  resolvedClaudeSdkCliPath = Path.join(Path.dirname(sdkEntry), "cli.js");
-  return resolvedClaudeSdkCliPath;
-}
-
-/**
- * Loose accessor type for SDKMessage dynamic properties that arrive via
- * the SDK's index signature.  Using this instead of `any` keeps the
- * declaration file strict (`[key: string]: unknown`) while giving
- * adapter code ergonomic access to SDK-emitted fields.
- */
-type SDKMessageLoose = SDKMessage & Record<string, any>; // oxlint-ignore-next-line -- intentional `any` for SDK index access
-
-// ── Module-level usage tracking ──────────────────────────────────────
-
-interface ClaudeCodeUsageAccumulator {
-  lastRateLimits: Record<string, unknown> | null;
-}
 
-// Intentionally module-level: aggregates usage across all Claude Code sessions
-// for the global usage display shown in the UI sidebar.
-let _claudeUsageAccumulator: ClaudeCodeUsageAccumulator = {
-  lastRateLimits: null,
-};
-
-function storeClaudeRateLimits(message: Record<string, unknown>): void {
-  _claudeUsageAccumulator.lastRateLimits = message;
-}
-
-function rateLimitBucket(
-  rl: Record<string, unknown>,
-  prefix: string,
-  label: string,
-): ProviderUsageQuota | undefined {
-  const limit =
-    typeof rl[`${prefix}_limit`] === "number" ? (rl[`${prefix}_limit`] as number) : undefined;
-  const remaining =
-    typeof rl[`${prefix}_remaining`] === "number"
-      ? (rl[`${prefix}_remaining`] as number)
-      : undefined;
-  const reset =
-    typeof rl[`${prefix}_reset`] === "string" ? (rl[`${prefix}_reset`] as string) : undefined;
-  if (limit === undefined || remaining === undefined) return undefined;
-  const used = limit - remaining;
-  return {
-    plan: label,
-    used,
-    limit,
-    percentUsed: limit > 0 ? Math.round((used / limit) * 100) : 0,
-    ...(reset ? { resetDate: reset } : {}),
-  };
-}
-
-export function fetchClaudeCodeUsage(): ProviderUsageResult {
-  const acc = _claudeUsageAccumulator;
-  const rl = acc.lastRateLimits;
-
-  // Build quotas from rate limit event if available
-  const quotas: ProviderUsageQuota[] = [];
-  if (rl) {
-    // Request-based limits
-    const reqQuota = rateLimitBucket(rl, "requests", "Requests");
-    if (reqQuota) quotas.push(reqQuota);
-    // Input-token limits
-    const inputQuota = rateLimitBucket(rl, "input_tokens", "Input tokens");
-    if (inputQuota) quotas.push(inputQuota);
-    // Output-token limits
-    const outputQuota = rateLimitBucket(rl, "output_tokens", "Output tokens");
-    if (outputQuota) quotas.push(outputQuota);
-    // Generic token limits (some API tiers)
-    const tokensQuota = rateLimitBucket(rl, "tokens", "Tokens");
-    if (tokensQuota) quotas.push(tokensQuota);
-  }
-
-  return {
-    provider: PROVIDER,
-    ...(quotas.length > 0 ? { quota: quotas[0], quotas } : {}),
+const PROVIDER = "claudeAgent" as const;
+type ClaudeTextStreamKind = Extract<RuntimeContentStreamKind, "assistant_text" | "reasoning_text">;
+type ClaudeToolResultStreamKind = Extract<
+  RuntimeContentStreamKind,
+  "command_output" | "file_change_output"
+>;
+
+/** Loosely typed stream event from the Claude SDK. */
+interface ClaudeStreamEvent {
+  readonly type?: string;
+  readonly index?: number;
+  readonly content_block?: Record<string, unknown>;
+  readonly delta?: {
+    readonly type?: string;
+    readonly text?: string;
+    readonly thinking?: string;
+    readonly partial_json?: string;
+    readonly [key: string]: unknown;
   };
+  readonly [key: string]: unknown;
 }
 
 type PromptQueueItem =
@@ -187,12 +115,21 @@ interface ClaudeResumeState {
 
 interface ClaudeTurnState {
   readonly turnId: TurnId;
-  readonly assistantItemId: string;
   readonly startedAt: string;
   readonly items: Array<unknown>;
-  readonly messageCompleted: boolean;
-  readonly emittedTextDelta: boolean;
-  readonly fallbackAssistantText: string;
+  readonly assistantTextBlocks: Map<number, AssistantTextBlockState>;
+  readonly assistantTextBlockOrder: Array<AssistantTextBlockState>;
+  readonly capturedProposedPlanKeys: Set<string>;
+  nextSyntheticAssistantBlockIndex: number;
+}
+
+interface AssistantTextBlockState {
+  readonly itemId: string;
+  readonly blockIndex: number;
+  emittedTextDelta: boolean;
+  fallbackText: string;
+  streamClosed: boolean;
+  completionEmitted: boolean;
 }
 
 interface PendingApproval {
@@ -202,28 +139,38 @@ interface PendingApproval {
   readonly decision: Deferred.Deferred<ProviderApprovalDecision>;
 }
 
+interface PendingUserInput {
+  readonly questions: ReadonlyArray<UserInputQuestion>;
+  readonly answers: Deferred.Deferred<ProviderUserInputAnswers>;
+}
+
 interface ToolInFlight {
   readonly itemId: string;
   readonly itemType: CanonicalItemType;
   readonly toolName: string;
   readonly title: string;
   readonly detail?: string;
+  readonly input: Record<string, unknown>;
+  readonly partialInputJson: string;
+  readonly lastEmittedInputFingerprint?: string;
 }
 
 interface ClaudeSessionContext {
   session: ProviderSession;
   readonly promptQueue: Queue.Queue<PromptQueueItem>;
   readonly query: ClaudeQueryRuntime;
+  streamFiber: Fiber.Fiber<void, Error> | undefined;
   readonly startedAt: string;
+  readonly basePermissionMode: PermissionMode | undefined;
   resumeSessionId: string | undefined;
   readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;
+  readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;
   readonly turns: Array<{
     id: TurnId;
     items: Array<unknown>;
   }>;
   readonly inFlightTools: Map<number, ToolInFlight>;
   turnState: ClaudeTurnState | undefined;
-  lastTurnId: TurnId | undefined;
   lastAssistantUuid: string | undefined;
   lastThreadStartedId: string | undefined;
   stopped: boolean;
@@ -237,7 +184,7 @@ interface ClaudeQueryRuntime extends AsyncIterable<SDKMessage> {
   readonly close: () => void;
 }
 
-export interface ClaudeCodeAdapterLiveOptions {
+export interface ClaudeAdapterLiveOptions {
   readonly createQuery?: (input: {
     readonly prompt: AsyncIterable<SDKUserMessage>;
     readonly options: ClaudeQueryOptions;
@@ -254,41 +201,83 @@ function isSyntheticClaudeThreadId(value: string): boolean {
   return value.startsWith("claude-thread-");
 }
 
-function toStringOrUndefined(value: unknown): string | undefined {
-  return typeof value === "string" && value.length > 0 ? value : undefined;
+function toMessage(cause: unknown, fallback: string): string {
+  if (cause instanceof Error && cause.message.length > 0) {
+    return cause.message;
+  }
+  return fallback;
+}
+
+function toError(cause: unknown, fallback: string): Error {
+  return cause instanceof Error ? cause : new Error(toMessage(cause, fallback));
 }
 
-function toUnknownRecord(value: unknown): Record<string, unknown> | undefined {
-  return value !== null && typeof value === "object"
-    ? (value as Record<string, unknown>)
-    : undefined;
+function normalizeClaudeStreamMessages(cause: Cause.Cause<Error>): ReadonlyArray<string> {
+  const errors = Cause.prettyErrors(cause)
+    .map((error) => error.message.trim())
+    .filter((message) => message.length > 0);
+  if (errors.length > 0) {
+    return errors;
+  }
+
+  const squashed = toMessage(Cause.squash(cause), "").trim();
+  return squashed.length > 0 ? [squashed] : [];
+}
+
+function isClaudeInterruptedMessage(message: string): boolean {
+  const normalized = message.toLowerCase();
+  return (
+    normalized.includes("all fibers interrupted without error") ||
+    normalized.includes("request was aborted") ||
+    normalized.includes("interrupted by user")
+  );
+}
+
+function isClaudeInterruptedCause(cause: Cause.Cause<Error>): boolean {
+  return (
+    Cause.hasInterruptsOnly(cause) ||
+    normalizeClaudeStreamMessages(cause).some(isClaudeInterruptedMessage)
+  );
 }
 
-function isDesktopRuntime(): boolean {
-  return process.env.T3CODE_MODE === "desktop";
+function messageFromClaudeStreamCause(cause: Cause.Cause<Error>, fallback: string): string {
+  return normalizeClaudeStreamMessages(cause)[0] ?? fallback;
 }
 
-function diagnosticEnvKeys(
-  env: Readonly<Record<string, string | undefined>>,
-): ReadonlyArray<string> {
-  return Object.keys(env)
-    .filter((key) => DESKTOP_DIAGNOSTIC_ENV_PREFIXES.some((prefix) => key.startsWith(prefix)))
-    .toSorted();
+function interruptionMessageFromClaudeCause(cause: Cause.Cause<Error>): string {
+  const message = messageFromClaudeStreamCause(cause, "Claude runtime interrupted.");
+  return isClaudeInterruptedMessage(message) ? "Claude runtime interrupted." : message;
 }
 
-function logDesktopClaudeDiagnostic(message: string, data?: Record<string, unknown>): void {
-  if (!isDesktopRuntime()) return;
-  if (data) {
-    logger.warn(`[desktop] ${message}`, data);
-    return;
+function resultErrorsText(result: SDKResultMessage): string {
+  return "errors" in result && Array.isArray(result.errors)
+    ? result.errors.join(" ").toLowerCase()
+    : "";
+}
+
+function isInterruptedResult(result: SDKResultMessage): boolean {
+  const errors = resultErrorsText(result);
+  if (errors.includes("interrupt")) {
+    return true;
   }
-  logger.warn(`[desktop] ${message}`);
+
+  return (
+    result.subtype === "error_during_execution" &&
+    result.is_error === false &&
+    (errors.includes("request was aborted") ||
+      errors.includes("interrupted by user") ||
+      errors.includes("aborted"))
+  );
 }
 
 function asRuntimeItemId(value: string): RuntimeItemId {
   return RuntimeItemId.makeUnsafe(value);
 }
 
+function asCanonicalTurnId(value: TurnId): TurnId {
+  return value;
+}
+
 function asRuntimeRequestId(value: ApprovalRequestId): RuntimeRequestId {
   return RuntimeRequestId.makeUnsafe(value);
 }
@@ -346,6 +335,17 @@ function readClaudeResumeState(resumeCursor: unknown): ClaudeResumeState | undef
 
 function classifyToolItemType(toolName: string): CanonicalItemType {
   const normalized = toolName.toLowerCase();
+  if (normalized.includes("agent")) {
+    return "collab_agent_tool_call";
+  }
+  if (
+    normalized === "task" ||
+    normalized === "agent" ||
+    normalized.includes("subagent") ||
+    normalized.includes("sub-agent")
+  ) {
+    return "collab_agent_tool_call";
+  }
   if (
     normalized.includes("bash") ||
     normalized.includes("command") ||
@@ -368,22 +368,37 @@ function classifyToolItemType(toolName: string): CanonicalItemType {
   if (normalized.includes("mcp")) {
     return "mcp_tool_call";
   }
+  if (normalized.includes("websearch") || normalized.includes("web search")) {
+    return "web_search";
+  }
+  if (normalized.includes("image")) {
+    return "image_view";
+  }
   return "dynamic_tool_call";
 }
 
-function classifyRequestType(toolName: string): CanonicalRequestType {
+function isReadOnlyToolName(toolName: string): boolean {
   const normalized = toolName.toLowerCase();
-  if (normalized === "read" || normalized.includes("read file") || normalized.includes("view")) {
+  return (
+    normalized === "read" ||
+    normalized.includes("read file") ||
+    normalized.includes("view") ||
+    normalized.includes("grep") ||
+    normalized.includes("glob") ||
+    normalized.includes("search")
+  );
+}
+
+function classifyRequestType(toolName: string): CanonicalRequestType {
+  if (isReadOnlyToolName(toolName)) {
     return "file_read_approval";
   }
-  switch (classifyToolItemType(toolName)) {
-    case "command_execution":
-      return "command_execution_approval";
-    case "file_change":
-      return "file_change_approval";
-    default:
-      return "dynamic_tool_call";
-  }
+  const itemType = classifyToolItemType(toolName);
+  return itemType === "command_execution"
+    ? "command_execution_approval"
+    : itemType === "file_change"
+      ? "file_change_approval"
+      : "dynamic_tool_call";
 }
 
 function summarizeToolRequest(toolName: string, input: Record<string, unknown>): string {
@@ -408,6 +423,12 @@ function titleForTool(itemType: CanonicalItemType): string {
       return "File change";
     case "mcp_tool_call":
       return "MCP tool call";
+    case "collab_agent_tool_call":
+      return "Subagent task";
+    case "web_search":
+      return "Web search";
+    case "image_view":
+      return "Image view";
     case "dynamic_tool_call":
       return "Tool call";
     default:
@@ -415,59 +436,118 @@ function titleForTool(itemType: CanonicalItemType): string {
   }
 }
 
-function buildUserMessage(
-  input: ProviderSendTurnInput,
-): Effect.Effect<SDKUserMessage, ProviderAdapterRequestError> {
-  const fragments: string[] = [];
-
-  if (input.input && input.input.trim().length > 0) {
-    fragments.push(input.input.trim());
-  }
-
-  const attachments = input.attachments ?? [];
-  const unsupportedAttachments = attachments.filter((a) => a.type !== "image");
-
-  if (unsupportedAttachments.length > 0) {
-    const types = [...new Set(unsupportedAttachments.map((a) => a.type))].join(", ");
-    return Effect.fail(
-      new ProviderAdapterRequestError({
-        provider: PROVIDER,
-        method: "turn/start",
-        detail: `Unsupported attachment type(s): ${types}. Claude Code only supports image attachments as descriptive text.`,
-      }),
-    );
-  }
-
-  for (const attachment of attachments) {
-    if (attachment.type === "image") {
-      fragments.push(
-        `Attached image: ${attachment.name} (${attachment.mimeType}, ${attachment.sizeBytes} bytes).`,
-      );
-    }
-  }
-
-  const text = fragments.join("\n\n");
+const SUPPORTED_CLAUDE_IMAGE_MIME_TYPES = new Set([
+  "image/gif",
+  "image/jpeg",
+  "image/png",
+  "image/webp",
+]);
 
-  if (text.length === 0) {
-    return Effect.fail(
-      new ProviderAdapterRequestError({
-        provider: PROVIDER,
-        method: "turn/start",
-        detail:
-          "Cannot send an empty turn: no text input and all attachments were reduced to empty content.",
-      }),
-    );
-  }
+function buildPromptText(input: ProviderSendTurnInput): string {
+  const requestedEffort = resolveReasoningEffortForProvider(
+    "claudeAgent",
+    input.modelOptions?.claudeAgent?.effort ?? null,
+  );
+  const supportedEffortOptions = getReasoningEffortOptions("claudeAgent", input.model);
+  const promptEffort =
+    requestedEffort === "ultrathink" && supportsClaudeUltrathinkKeyword(input.model)
+      ? "ultrathink"
+      : requestedEffort && supportedEffortOptions.includes(requestedEffort)
+        ? requestedEffort
+        : null;
+  return applyClaudePromptEffortPrefix(input.input?.trim() ?? "", promptEffort);
+}
 
-  return Effect.succeed({
+function buildUserMessage(input: {
+  readonly sdkContent: Array<Record<string, unknown>>;
+}): SDKUserMessage {
+  return {
     type: "user",
     session_id: "",
     parent_tool_use_id: null,
     message: {
       role: "user",
-      content: [{ type: "text", text }],
+      content: input.sdkContent,
+    },
+  } as SDKUserMessage;
+}
+
+function buildClaudeImageContentBlock(input: {
+  readonly mimeType: string;
+  readonly bytes: Uint8Array;
+}): Record<string, unknown> {
+  return {
+    type: "image",
+    source: {
+      type: "base64",
+      media_type: input.mimeType,
+      data: Buffer.from(input.bytes).toString("base64"),
     },
-  } as SDKUserMessage);
+  };
+}
+
+function buildUserMessageEffect(
+  input: ProviderSendTurnInput,
+  dependencies: {
+    readonly fileSystem: FileSystem.FileSystem;
+    readonly stateDir: string;
+  },
+): Effect.Effect<SDKUserMessage, ProviderAdapterRequestError> {
+  return Effect.gen(function* () {
+    const text = buildPromptText(input);
+    const sdkContent: Array<Record<string, unknown>> = [];
+
+    if (text.length > 0) {
+      sdkContent.push({ type: "text", text });
+    }
+
+    for (const attachment of input.attachments ?? []) {
+      if (attachment.type !== "image") {
+        continue;
+      }
+
+      if (!SUPPORTED_CLAUDE_IMAGE_MIME_TYPES.has(attachment.mimeType)) {
+        return yield* new ProviderAdapterRequestError({
+          provider: PROVIDER,
+          method: "turn/start",
+          detail: `Unsupported Claude image attachment type '${attachment.mimeType}'.`,
+        });
+      }
+
+      const attachmentPath = resolveAttachmentPath({
+        stateDir: dependencies.stateDir,
+        attachment,
+      });
+      if (!attachmentPath) {
+        return yield* new ProviderAdapterRequestError({
+          provider: PROVIDER,
+          method: "turn/start",
+          detail: `Invalid attachment id '${attachment.id}'.`,
+        });
+      }
+
+      const bytes = yield* dependencies.fileSystem.readFile(attachmentPath).pipe(
+        Effect.mapError(
+          (cause) =>
+            new ProviderAdapterRequestError({
+              provider: PROVIDER,
+              method: "turn/start",
+              detail: toMessage(cause, "Failed to read attachment file."),
+              cause,
+            }),
+        ),
+      );
+
+      sdkContent.push(
+        buildClaudeImageContentBlock({
+          mimeType: attachment.mimeType,
+          bytes,
+        }),
+      );
+    }
+
+    return buildUserMessage({ sdkContent });
+  });
 }
 
 function turnStatusFromResult(result: SDKResultMessage): ProviderRuntimeTurnStatus {
@@ -475,11 +555,8 @@ function turnStatusFromResult(result: SDKResultMessage): ProviderRuntimeTurnStat
     return "completed";
   }
 
-  const errors = (result.errors ?? [])
-    .map((error) => String(error))
-    .join(" ")
-    .toLowerCase();
-  if (errors.includes("interrupt")) {
+  const errors = resultErrorsText(result);
+  if (isInterruptedResult(result)) {
     return "interrupted";
   }
   if (errors.includes("cancel")) {
@@ -488,24 +565,32 @@ function turnStatusFromResult(result: SDKResultMessage): ProviderRuntimeTurnStat
   return "failed";
 }
 
-function streamKindFromDeltaType(deltaType: string): "assistant_text" | "reasoning_text" {
+function streamKindFromDeltaType(deltaType: string): ClaudeTextStreamKind {
   return deltaType.includes("thinking") ? "reasoning_text" : "assistant_text";
 }
 
-function providerThreadRef(
-  context: ClaudeSessionContext,
-): { readonly providerThreadId: string } | {} {
-  return context.resumeSessionId ? { providerThreadId: context.resumeSessionId } : {};
+function nativeProviderRefs(
+  _context: ClaudeSessionContext,
+  options?: {
+    readonly providerItemId?: string | undefined;
+  },
+): NonNullable<ProviderRuntimeEvent["providerRefs"]> {
+  if (options?.providerItemId) {
+    return {
+      providerItemId: ProviderItemId.makeUnsafe(options.providerItemId),
+    };
+  }
+  return {};
 }
 
-function extractAssistantText(message: SDKMessage): string {
+function extractAssistantTextBlocks(message: SDKMessage): Array<string> {
   if (message.type !== "assistant") {
-    return "";
+    return [];
   }
 
   const content = (message.message as { content?: unknown } | undefined)?.content;
   if (!Array.isArray(content)) {
-    return "";
+    return [];
   }
 
   const fragments: string[] = [];
@@ -523,7 +608,141 @@ function extractAssistantText(message: SDKMessage): string {
     }
   }
 
-  return fragments.join("");
+  return fragments;
+}
+
+function extractContentBlockText(block: unknown): string {
+  if (!block || typeof block !== "object") {
+    return "";
+  }
+
+  const candidate = block as { type?: unknown; text?: unknown };
+  return candidate.type === "text" && typeof candidate.text === "string" ? candidate.text : "";
+}
+
+function extractTextContent(value: unknown): string {
+  if (typeof value === "string") {
+    return value;
+  }
+
+  if (Array.isArray(value)) {
+    return value.map((entry) => extractTextContent(entry)).join("");
+  }
+
+  if (!value || typeof value !== "object") {
+    return "";
+  }
+
+  const record = value as {
+    text?: unknown;
+    content?: unknown;
+  };
+
+  if (typeof record.text === "string") {
+    return record.text;
+  }
+
+  return extractTextContent(record.content);
+}
+
+function extractExitPlanModePlan(value: unknown): string | undefined {
+  if (!value || typeof value !== "object") {
+    return undefined;
+  }
+
+  const record = value as {
+    plan?: unknown;
+  };
+  return typeof record.plan === "string" && record.plan.trim().length > 0
+    ? record.plan.trim()
+    : undefined;
+}
+
+function exitPlanCaptureKey(input: {
+  readonly toolUseId?: string | undefined;
+  readonly planMarkdown: string;
+}): string {
+  return input.toolUseId && input.toolUseId.length > 0
+    ? `tool:${input.toolUseId}`
+    : `plan:${input.planMarkdown}`;
+}
+
+function tryParseJsonRecord(value: string): Record<string, unknown> | undefined {
+  try {
+    const parsed = JSON.parse(value);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+      ? (parsed as Record<string, unknown>)
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function toolInputFingerprint(input: Record<string, unknown>): string | undefined {
+  try {
+    return JSON.stringify(input);
+  } catch {
+    return undefined;
+  }
+}
+
+function toolResultStreamKind(itemType: CanonicalItemType): ClaudeToolResultStreamKind | undefined {
+  switch (itemType) {
+    case "command_execution":
+      return "command_output";
+    case "file_change":
+      return "file_change_output";
+    default:
+      return undefined;
+  }
+}
+
+function toolResultBlocksFromUserMessage(message: SDKMessage): Array<{
+  readonly toolUseId: string;
+  readonly block: Record<string, unknown>;
+  readonly text: string;
+  readonly isError: boolean;
+}> {
+  if (message.type !== "user") {
+    return [];
+  }
+
+  const content = (message.message as { content?: unknown } | undefined)?.content;
+  if (!Array.isArray(content)) {
+    return [];
+  }
+
+  const blocks: Array<{
+    readonly toolUseId: string;
+    readonly block: Record<string, unknown>;
+    readonly text: string;
+    readonly isError: boolean;
+  }> = [];
+
+  for (const entry of content) {
+    if (!entry || typeof entry !== "object") {
+      continue;
+    }
+
+    const block = entry as Record<string, unknown>;
+    if (block.type !== "tool_result") {
+      continue;
+    }
+
+    const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : undefined;
+    if (!toolUseId) {
+      continue;
+    }
+
+    blocks.push({
+      toolUseId,
+      block,
+      text: extractTextContent(block.content),
+      isError: block.is_error === true,
+    });
+  }
+
+  return blocks;
 }
 
 function toSessionError(
@@ -577,7 +796,7 @@ function sdkMessageSubtype(value: unknown): string | undefined {
   return typeof record.subtype === "string" ? record.subtype : undefined;
 }
 
-function sdkNativeMethod(message: SDKMessageLoose): string {
+function sdkNativeMethod(message: SDKMessage): string {
   const subtype = sdkMessageSubtype(message);
   if (subtype) {
     return `claude/${message.type}/${subtype}`;
@@ -600,7 +819,7 @@ function sdkNativeMethod(message: SDKMessageLoose): string {
   return `claude/${message.type}`;
 }
 
-function sdkNativeItemId(message: SDKMessageLoose): string | undefined {
+function sdkNativeItemId(message: SDKMessage): string | undefined {
   if (message.type === "assistant") {
     const maybeId = (message.message as { id?: unknown }).id;
     if (typeof maybeId === "string") {
@@ -609,6 +828,10 @@ function sdkNativeItemId(message: SDKMessageLoose): string | undefined {
     return undefined;
   }
 
+  if (message.type === "user") {
+    return toolResultBlocksFromUserMessage(message)[0]?.toolUseId;
+  }
+
   if (message.type === "stream_event") {
     const event = message.event as {
       type?: unknown;
@@ -622,8 +845,10 @@ function sdkNativeItemId(message: SDKMessageLoose): string | undefined {
   return undefined;
 }
 
-function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
+function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
   return Effect.gen(function* () {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const serverConfig = yield* ServerConfig;
     const nativeEventLogger =
       options?.nativeEventLogger ??
       (options?.nativeEventLogPath !== undefined
@@ -673,16 +898,15 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               provider: PROVIDER,
               createdAt: observedAt,
               method: sdkNativeMethod(message),
-              ...(context.session.threadId ? { threadId: context.session.threadId } : {}),
               ...(typeof message.session_id === "string"
                 ? { providerThreadId: message.session_id }
                 : {}),
-              ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+              ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
               ...(itemId ? { itemId: ProviderItemId.makeUnsafe(itemId) } : {}),
               payload: message,
             },
           },
-          null,
+          context.session.threadId,
         );
       });
 
@@ -735,6 +959,203 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         };
       });
 
+    const ensureAssistantTextBlock = (
+      context: ClaudeSessionContext,
+      blockIndex: number,
+      options?: {
+        readonly fallbackText?: string;
+        readonly streamClosed?: boolean;
+      },
+    ): Effect.Effect<
+      | {
+          readonly blockIndex: number;
+          readonly block: AssistantTextBlockState;
+        }
+      | undefined
+    > =>
+      Effect.gen(function* () {
+        const turnState = context.turnState;
+        if (!turnState) {
+          return undefined;
+        }
+
+        const existing = turnState.assistantTextBlocks.get(blockIndex);
+        if (existing && !existing.completionEmitted) {
+          if (existing.fallbackText.length === 0 && options?.fallbackText) {
+            existing.fallbackText = options.fallbackText;
+          }
+          if (options?.streamClosed) {
+            existing.streamClosed = true;
+          }
+          return { blockIndex, block: existing };
+        }
+
+        const block: AssistantTextBlockState = {
+          itemId: yield* Random.nextUUIDv4,
+          blockIndex,
+          emittedTextDelta: false,
+          fallbackText: options?.fallbackText ?? "",
+          streamClosed: options?.streamClosed ?? false,
+          completionEmitted: false,
+        };
+        turnState.assistantTextBlocks.set(blockIndex, block);
+        turnState.assistantTextBlockOrder.push(block);
+        return { blockIndex, block };
+      });
+
+    const createSyntheticAssistantTextBlock = (
+      context: ClaudeSessionContext,
+      fallbackText: string,
+    ): Effect.Effect<
+      | {
+          readonly blockIndex: number;
+          readonly block: AssistantTextBlockState;
+        }
+      | undefined
+    > =>
+      Effect.gen(function* () {
+        const turnState = context.turnState;
+        if (!turnState) {
+          return undefined;
+        }
+
+        const blockIndex = turnState.nextSyntheticAssistantBlockIndex;
+        turnState.nextSyntheticAssistantBlockIndex -= 1;
+        return yield* ensureAssistantTextBlock(context, blockIndex, {
+          fallbackText,
+          streamClosed: true,
+        });
+      });
+
+    const completeAssistantTextBlock = (
+      context: ClaudeSessionContext,
+      block: AssistantTextBlockState,
+      options?: {
+        readonly force?: boolean;
+        readonly rawMethod?: string;
+        readonly rawPayload?: unknown;
+      },
+    ): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        const turnState = context.turnState;
+        if (!turnState || block.completionEmitted) {
+          return;
+        }
+
+        if (!options?.force && !block.streamClosed) {
+          return;
+        }
+
+        if (!block.emittedTextDelta && block.fallbackText.length > 0) {
+          const deltaStamp = yield* makeEventStamp();
+          yield* offerRuntimeEvent({
+            type: "content.delta",
+            eventId: deltaStamp.eventId,
+            provider: PROVIDER,
+            createdAt: deltaStamp.createdAt,
+            threadId: context.session.threadId,
+            turnId: turnState.turnId,
+            itemId: asRuntimeItemId(block.itemId),
+            payload: {
+              streamKind: "assistant_text",
+              delta: block.fallbackText,
+            },
+            providerRefs: nativeProviderRefs(context),
+            ...(options?.rawMethod || options?.rawPayload
+              ? {
+                  raw: {
+                    source: "claude.sdk.message" as const,
+                    ...(options.rawMethod ? { method: options.rawMethod } : {}),
+                    payload: options?.rawPayload,
+                  },
+                }
+              : {}),
+          });
+        }
+
+        block.completionEmitted = true;
+        if (turnState.assistantTextBlocks.get(block.blockIndex) === block) {
+          turnState.assistantTextBlocks.delete(block.blockIndex);
+        }
+
+        const stamp = yield* makeEventStamp();
+        yield* offerRuntimeEvent({
+          type: "item.completed",
+          eventId: stamp.eventId,
+          provider: PROVIDER,
+          createdAt: stamp.createdAt,
+          itemId: asRuntimeItemId(block.itemId),
+          threadId: context.session.threadId,
+          turnId: turnState.turnId,
+          payload: {
+            itemType: "assistant_message",
+            status: "completed",
+            title: "Assistant message",
+            ...(block.fallbackText.length > 0 ? { detail: block.fallbackText } : {}),
+          },
+          providerRefs: nativeProviderRefs(context),
+          ...(options?.rawMethod || options?.rawPayload
+            ? {
+                raw: {
+                  source: "claude.sdk.message" as const,
+                  ...(options.rawMethod ? { method: options.rawMethod } : {}),
+                  payload: options?.rawPayload,
+                },
+              }
+            : {}),
+        });
+      });
+
+    const backfillAssistantTextBlocksFromSnapshot = (
+      context: ClaudeSessionContext,
+      message: SDKMessage,
+    ): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        const turnState = context.turnState;
+        if (!turnState) {
+          return;
+        }
+
+        const snapshotTextBlocks = extractAssistantTextBlocks(message);
+        if (snapshotTextBlocks.length === 0) {
+          return;
+        }
+
+        const orderedBlocks = turnState.assistantTextBlockOrder.map((block) => ({
+          blockIndex: block.blockIndex,
+          block,
+        }));
+
+        for (const [position, text] of snapshotTextBlocks.entries()) {
+          const existingEntry = orderedBlocks[position];
+          const entry =
+            existingEntry ??
+            (yield* createSyntheticAssistantTextBlock(context, text).pipe(
+              Effect.map((created) => {
+                if (!created) {
+                  return undefined;
+                }
+                orderedBlocks.push(created);
+                return created;
+              }),
+            ));
+          if (!entry) {
+            continue;
+          }
+
+          if (entry.block.fallbackText.length === 0) {
+            entry.block.fallbackText = text;
+          }
+
+          if (entry.block.streamClosed && !entry.block.completionEmitted) {
+            yield* completeAssistantTextBlock(context, entry.block, {
+              rawMethod: "claude/assistant",
+              rawPayload: message,
+            });
+          }
+        }
+      });
+
     const ensureThreadId = (
       context: ClaudeSessionContext,
       message: SDKMessage,
@@ -777,6 +1198,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
       cause?: unknown,
     ): Effect.Effect<void> =>
       Effect.gen(function* () {
+        if (cause !== undefined) {
+          void cause;
+        }
         const turnState = context.turnState;
         const stamp = yield* makeEventStamp();
         yield* offerRuntimeEvent({
@@ -785,16 +1209,13 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           provider: PROVIDER,
           createdAt: stamp.createdAt,
           threadId: context.session.threadId,
-          ...(turnState ? { turnId: turnState.turnId } : {}),
+          ...(turnState ? { turnId: asCanonicalTurnId(turnState.turnId) } : {}),
           payload: {
             message,
             class: "provider_error",
             ...(cause !== undefined ? { detail: cause } : {}),
           },
-          providerRefs: {
-            ...providerThreadRef(context),
-            ...(turnState ? { providerTurnId: String(turnState.turnId) } : {}),
-          },
+          providerRefs: nativeProviderRefs(context),
         });
       });
 
@@ -812,14 +1233,59 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           provider: PROVIDER,
           createdAt: stamp.createdAt,
           threadId: context.session.threadId,
-          ...(turnState ? { turnId: turnState.turnId } : {}),
+          ...(turnState ? { turnId: asCanonicalTurnId(turnState.turnId) } : {}),
           payload: {
             message,
             ...(detail !== undefined ? { detail } : {}),
           },
-          providerRefs: {
-            ...providerThreadRef(context),
-            ...(turnState ? { providerTurnId: String(turnState.turnId) } : {}),
+          providerRefs: nativeProviderRefs(context),
+        });
+      });
+
+    const emitProposedPlanCompleted = (
+      context: ClaudeSessionContext,
+      input: {
+        readonly planMarkdown: string;
+        readonly toolUseId?: string | undefined;
+        readonly rawSource: "claude.sdk.message" | "claude.sdk.permission";
+        readonly rawMethod: string;
+        readonly rawPayload: unknown;
+      },
+    ): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        const turnState = context.turnState;
+        const planMarkdown = input.planMarkdown.trim();
+        if (!turnState || planMarkdown.length === 0) {
+          return;
+        }
+
+        const captureKey = exitPlanCaptureKey({
+          toolUseId: input.toolUseId,
+          planMarkdown,
+        });
+        if (turnState.capturedProposedPlanKeys.has(captureKey)) {
+          return;
+        }
+        turnState.capturedProposedPlanKeys.add(captureKey);
+
+        const stamp = yield* makeEventStamp();
+        yield* offerRuntimeEvent({
+          type: "turn.proposed.completed",
+          eventId: stamp.eventId,
+          provider: PROVIDER,
+          createdAt: stamp.createdAt,
+          threadId: context.session.threadId,
+          turnId: turnState.turnId,
+          payload: {
+            planMarkdown,
+          },
+          providerRefs: nativeProviderRefs(context, {
+            providerItemId: input.toolUseId,
+          }),
+          raw: {
+            source: input.rawSource,
+            method: input.rawMethod,
+            payload: input.rawPayload,
           },
         });
       });
@@ -834,82 +1300,65 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         const turnState = context.turnState;
         if (!turnState) {
           const stamp = yield* makeEventStamp();
-          const fallbackTurnId = context.lastTurnId;
           yield* offerRuntimeEvent({
             type: "turn.completed",
             eventId: stamp.eventId,
             provider: PROVIDER,
             createdAt: stamp.createdAt,
             threadId: context.session.threadId,
-            ...(fallbackTurnId ? { turnId: fallbackTurnId } : {}),
             payload: {
               state: status,
               ...(result?.stop_reason !== undefined ? { stopReason: result.stop_reason } : {}),
               ...(result?.usage ? { usage: result.usage } : {}),
-              ...(result?.modelUsage ? { modelUsage: toUnknownRecord(result.modelUsage) } : {}),
+              ...(result?.modelUsage ? { modelUsage: result.modelUsage } : {}),
               ...(typeof result?.total_cost_usd === "number"
                 ? { totalCostUsd: result.total_cost_usd }
                 : {}),
               ...(errorMessage ? { errorMessage } : {}),
             },
-            providerRefs: fallbackTurnId ? { providerTurnId: String(fallbackTurnId) } : {},
+            providerRefs: {},
           });
-
-          const updatedAt = yield* nowIso;
-          context.session = {
-            ...context.session,
-            status: "ready",
-            activeTurnId: undefined,
-            updatedAt,
-            lastError: status === "failed" && errorMessage ? errorMessage : undefined,
-          };
-          yield* updateResumeCursor(context);
           return;
         }
 
-        if (!turnState.messageCompleted) {
-          if (!turnState.emittedTextDelta && turnState.fallbackAssistantText.length > 0) {
-            const deltaStamp = yield* makeEventStamp();
-            yield* offerRuntimeEvent({
-              type: "content.delta",
-              eventId: deltaStamp.eventId,
-              provider: PROVIDER,
-              createdAt: deltaStamp.createdAt,
-              threadId: context.session.threadId,
-              turnId: turnState.turnId,
-              itemId: asRuntimeItemId(turnState.assistantItemId),
-              payload: {
-                streamKind: "assistant_text",
-                delta: turnState.fallbackAssistantText,
-              },
-              providerRefs: {
-                ...providerThreadRef(context),
-                providerTurnId: String(turnState.turnId),
-                providerItemId: ProviderItemId.makeUnsafe(turnState.assistantItemId),
-              },
-            });
-          }
-
-          const stamp = yield* makeEventStamp();
+        for (const [index, tool] of context.inFlightTools.entries()) {
+          const toolStamp = yield* makeEventStamp();
           yield* offerRuntimeEvent({
             type: "item.completed",
-            eventId: stamp.eventId,
+            eventId: toolStamp.eventId,
             provider: PROVIDER,
-            createdAt: stamp.createdAt,
-            itemId: asRuntimeItemId(turnState.assistantItemId),
+            createdAt: toolStamp.createdAt,
             threadId: context.session.threadId,
             turnId: turnState.turnId,
+            itemId: asRuntimeItemId(tool.itemId),
             payload: {
-              itemType: "assistant_message",
-              status: "completed",
-              title: "Assistant message",
+              itemType: tool.itemType,
+              status: status === "completed" ? "completed" : "failed",
+              title: tool.title,
+              ...(tool.detail ? { detail: tool.detail } : {}),
+              data: {
+                toolName: tool.toolName,
+                input: tool.input,
+              },
             },
-            providerRefs: {
-              ...providerThreadRef(context),
-              providerTurnId: turnState.turnId,
-              providerItemId: ProviderItemId.makeUnsafe(turnState.assistantItemId),
+            providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
+            raw: {
+              source: "claude.sdk.message",
+              method: "claude/result",
+              payload: result ?? { status },
             },
           });
+          context.inFlightTools.delete(index);
+        }
+        // Clear any remaining stale entries (e.g. from interrupted content blocks)
+        context.inFlightTools.clear();
+
+        for (const block of turnState.assistantTextBlockOrder) {
+          yield* completeAssistantTextBlock(context, block, {
+            force: true,
+            rawMethod: "claude/result",
+            rawPayload: result ?? { status },
+          });
         }
 
         context.turns.push({
@@ -929,16 +1378,13 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             state: status,
             ...(result?.stop_reason !== undefined ? { stopReason: result.stop_reason } : {}),
             ...(result?.usage ? { usage: result.usage } : {}),
-            ...(result?.modelUsage ? { modelUsage: toUnknownRecord(result.modelUsage) } : {}),
+            ...(result?.modelUsage ? { modelUsage: result.modelUsage } : {}),
             ...(typeof result?.total_cost_usd === "number"
               ? { totalCostUsd: result.total_cost_usd }
               : {}),
             ...(errorMessage ? { errorMessage } : {}),
           },
-          providerRefs: {
-            ...providerThreadRef(context),
-            providerTurnId: turnState.turnId,
-          },
+          providerRefs: nativeProviderRefs(context),
         });
 
         const updatedAt = yield* nowIso;
@@ -948,55 +1394,145 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           status: "ready",
           activeTurnId: undefined,
           updatedAt,
-          lastError: status === "failed" && errorMessage ? errorMessage : undefined,
+          ...(status === "failed" && errorMessage ? { lastError: errorMessage } : {}),
         };
         yield* updateResumeCursor(context);
       });
 
     const handleStreamEvent = (
       context: ClaudeSessionContext,
-      message: SDKMessageLoose,
+      message: SDKMessage,
     ): Effect.Effect<void> =>
       Effect.gen(function* () {
         if (message.type !== "stream_event") {
           return;
         }
 
-        const { event } = message;
+        const event = message.event as ClaudeStreamEvent | undefined;
+        if (!event) {
+          return;
+        }
+
+        if (event.type === "content_block_delta") {
+          const delta = event.delta;
+          if (!delta) {
+            return;
+          }
+          if (
+            (delta.type === "text_delta" || delta.type === "thinking_delta") &&
+            context.turnState
+          ) {
+            const deltaText =
+              delta.type === "text_delta"
+                ? delta.text
+                : typeof delta.thinking === "string"
+                  ? delta.thinking
+                  : "";
+            if (deltaText?.length === 0) {
+              return;
+            }
+            const streamKind = streamKindFromDeltaType(delta.type!);
+            const blockIndex = event.index as number;
+            const assistantBlockEntry =
+              delta.type === "text_delta"
+                ? yield* ensureAssistantTextBlock(context, blockIndex)
+                : context.turnState.assistantTextBlocks.get(blockIndex)
+                  ? {
+                      blockIndex,
+                      block: context.turnState.assistantTextBlocks.get(
+                        blockIndex,
+                      ) as AssistantTextBlockState,
+                    }
+                  : undefined;
+            if (assistantBlockEntry?.block && delta.type === "text_delta") {
+              assistantBlockEntry.block.emittedTextDelta = true;
+            }
+            const stamp = yield* makeEventStamp();
+            yield* offerRuntimeEvent({
+              type: "content.delta",
+              eventId: stamp.eventId,
+              provider: PROVIDER,
+              createdAt: stamp.createdAt,
+              threadId: context.session.threadId,
+              turnId: context.turnState.turnId,
+              ...(assistantBlockEntry?.block
+                ? { itemId: asRuntimeItemId(assistantBlockEntry.block.itemId) }
+                : {}),
+              payload: {
+                streamKind,
+                delta: deltaText ?? "",
+              },
+              providerRefs: nativeProviderRefs(context),
+              raw: {
+                source: "claude.sdk.message",
+                method: "claude/stream_event/content_block_delta",
+                payload: message,
+              },
+            });
+            return;
+          }
+
+          if (delta.type === "input_json_delta") {
+            const tool = context.inFlightTools.get(event.index as number);
+            if (!tool || typeof delta.partial_json !== "string") {
+              return;
+            }
 
-        if (event.type === "content_block_delta") {
-          if (
-            event.delta.type === "text_delta" &&
-            event.delta.text.length > 0 &&
-            context.turnState
-          ) {
-            if (!context.turnState.emittedTextDelta) {
-              context.turnState = {
-                ...context.turnState,
-                emittedTextDelta: true,
-              };
+            const partialInputJson = tool.partialInputJson + delta.partial_json;
+            const parsedInput = tryParseJsonRecord(partialInputJson);
+            const detail = parsedInput
+              ? summarizeToolRequest(tool.toolName, parsedInput)
+              : tool.detail;
+            let nextTool: ToolInFlight = {
+              ...tool,
+              partialInputJson,
+              ...(parsedInput ? { input: parsedInput } : {}),
+              ...(detail ? { detail } : {}),
+            };
+
+            const nextFingerprint =
+              parsedInput && Object.keys(parsedInput).length > 0
+                ? toolInputFingerprint(parsedInput)
+                : undefined;
+            context.inFlightTools.set(event.index as number, nextTool);
+
+            if (
+              !parsedInput ||
+              !nextFingerprint ||
+              tool.lastEmittedInputFingerprint === nextFingerprint
+            ) {
+              return;
             }
+
+            nextTool = {
+              ...nextTool,
+              lastEmittedInputFingerprint: nextFingerprint,
+            };
+            context.inFlightTools.set(event.index as number, nextTool);
+
             const stamp = yield* makeEventStamp();
             yield* offerRuntimeEvent({
-              type: "content.delta",
+              type: "item.updated",
               eventId: stamp.eventId,
               provider: PROVIDER,
               createdAt: stamp.createdAt,
               threadId: context.session.threadId,
-              turnId: context.turnState.turnId,
-              itemId: asRuntimeItemId(context.turnState.assistantItemId),
+              ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+              itemId: asRuntimeItemId(nextTool.itemId),
               payload: {
-                streamKind: streamKindFromDeltaType(event.delta.type),
-                delta: event.delta.text,
-              },
-              providerRefs: {
-                ...providerThreadRef(context),
-                providerTurnId: context.turnState.turnId,
-                providerItemId: ProviderItemId.makeUnsafe(context.turnState.assistantItemId),
+                itemType: nextTool.itemType,
+                status: "inProgress",
+                title: nextTool.title,
+                ...(nextTool.detail ? { detail: nextTool.detail } : {}),
+                data: {
+                  toolName: nextTool.toolName,
+                  input: nextTool.input,
+                },
               },
+              providerRefs: nativeProviderRefs(context, { providerItemId: nextTool.itemId }),
               raw: {
                 source: "claude.sdk.message",
-                method: "claude/stream_event/content_block_delta",
+                method: "claude/stream_event/content_block_delta/input_json_delta",
                 payload: message,
               },
             });
@@ -1005,7 +1541,14 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         }
 
         if (event.type === "content_block_start") {
-          const { index, content_block: block } = event;
+          const index = event.index as number;
+          const block = event.content_block as Record<string, unknown>;
+          if (block.type === "text") {
+            yield* ensureAssistantTextBlock(context, index, {
+              fallbackText: extractContentBlockText(block),
+            });
+            return;
+          }
           if (
             block.type !== "tool_use" &&
             block.type !== "server_tool_use" &&
@@ -1014,14 +1557,16 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             return;
           }
 
-          const toolName = block.name;
+          const toolName = block.name as string;
           const itemType = classifyToolItemType(toolName);
           const toolInput =
             typeof block.input === "object" && block.input !== null
               ? (block.input as Record<string, unknown>)
               : {};
-          const itemId = block.id;
+          const itemId = block.id as string;
           const detail = summarizeToolRequest(toolName, toolInput);
+          const inputFingerprint =
+            Object.keys(toolInput).length > 0 ? toolInputFingerprint(toolInput) : undefined;
 
           const tool: ToolInFlight = {
             itemId,
@@ -1029,6 +1574,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             toolName,
             title: titleForTool(itemType),
             detail,
+            input: toolInput,
+            partialInputJson: "",
+            ...(inputFingerprint ? { lastEmittedInputFingerprint: inputFingerprint } : {}),
           };
           context.inFlightTools.set(index, tool);
 
@@ -1039,7 +1587,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             provider: PROVIDER,
             createdAt: stamp.createdAt,
             threadId: context.session.threadId,
-            ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+            ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
             itemId: asRuntimeItemId(tool.itemId),
             payload: {
               itemType: tool.itemType,
@@ -1051,11 +1599,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                 input: toolInput,
               },
             },
-            providerRefs: {
-              ...providerThreadRef(context),
-              ...(context.turnState ? { providerTurnId: String(context.turnState.turnId) } : {}),
-              providerItemId: ProviderItemId.makeUnsafe(tool.itemId),
-            },
+            providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
             raw: {
               source: "claude.sdk.message",
               method: "claude/stream_event/content_block_start",
@@ -1066,39 +1610,125 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         }
 
         if (event.type === "content_block_stop") {
-          const { index } = event;
+          const index = event.index as number;
+          const assistantBlock = context.turnState?.assistantTextBlocks.get(index);
+          if (assistantBlock) {
+            assistantBlock.streamClosed = true;
+            yield* completeAssistantTextBlock(context, assistantBlock, {
+              rawMethod: "claude/stream_event/content_block_stop",
+              rawPayload: message,
+            });
+            return;
+          }
           const tool = context.inFlightTools.get(index);
           if (!tool) {
             return;
           }
-          context.inFlightTools.delete(index);
+        }
+      });
 
-          const stamp = yield* makeEventStamp();
+    const handleUserMessage = (
+      context: ClaudeSessionContext,
+      message: SDKMessage,
+    ): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        if (message.type !== "user") {
+          return;
+        }
+
+        if (context.turnState) {
+          context.turnState.items.push(message.message);
+        }
+
+        for (const toolResult of toolResultBlocksFromUserMessage(message)) {
+          const toolEntry = Array.from(context.inFlightTools.entries()).find(
+            ([, tool]) => tool.itemId === toolResult.toolUseId,
+          );
+          if (!toolEntry) {
+            continue;
+          }
+
+          const [index, tool] = toolEntry;
+          const itemStatus = toolResult.isError ? "failed" : "completed";
+          const toolData = {
+            toolName: tool.toolName,
+            input: tool.input,
+            result: toolResult.block,
+          };
+
+          const updatedStamp = yield* makeEventStamp();
           yield* offerRuntimeEvent({
-            type: "item.completed",
-            eventId: stamp.eventId,
+            type: "item.updated",
+            eventId: updatedStamp.eventId,
             provider: PROVIDER,
-            createdAt: stamp.createdAt,
+            createdAt: updatedStamp.createdAt,
             threadId: context.session.threadId,
-            ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+            ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
             itemId: asRuntimeItemId(tool.itemId),
             payload: {
               itemType: tool.itemType,
-              status: "completed",
+              status: toolResult.isError ? "failed" : "inProgress",
               title: tool.title,
               ...(tool.detail ? { detail: tool.detail } : {}),
+              data: toolData,
             },
-            providerRefs: {
-              ...providerThreadRef(context),
-              ...(context.turnState ? { providerTurnId: String(context.turnState.turnId) } : {}),
-              providerItemId: ProviderItemId.makeUnsafe(tool.itemId),
+            providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
+            raw: {
+              source: "claude.sdk.message",
+              method: "claude/user",
+              payload: message,
+            },
+          });
+
+          const streamKind = toolResultStreamKind(tool.itemType);
+          if (streamKind && toolResult.text.length > 0 && context.turnState) {
+            const deltaStamp = yield* makeEventStamp();
+            yield* offerRuntimeEvent({
+              type: "content.delta",
+              eventId: deltaStamp.eventId,
+              provider: PROVIDER,
+              createdAt: deltaStamp.createdAt,
+              threadId: context.session.threadId,
+              turnId: context.turnState.turnId,
+              itemId: asRuntimeItemId(tool.itemId),
+              payload: {
+                streamKind,
+                delta: toolResult.text,
+              },
+              providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
+              raw: {
+                source: "claude.sdk.message",
+                method: "claude/user",
+                payload: message,
+              },
+            });
+          }
+
+          const completedStamp = yield* makeEventStamp();
+          yield* offerRuntimeEvent({
+            type: "item.completed",
+            eventId: completedStamp.eventId,
+            provider: PROVIDER,
+            createdAt: completedStamp.createdAt,
+            threadId: context.session.threadId,
+            ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+            itemId: asRuntimeItemId(tool.itemId),
+            payload: {
+              itemType: tool.itemType,
+              status: itemStatus,
+              title: tool.title,
+              ...(tool.detail ? { detail: tool.detail } : {}),
+              data: toolData,
             },
+            providerRefs: nativeProviderRefs(context, { providerItemId: tool.itemId }),
             raw: {
               source: "claude.sdk.message",
-              method: "claude/stream_event/content_block_stop",
+              method: "claude/user",
               payload: message,
             },
           });
+
+          context.inFlightTools.delete(index);
         }
       });
 
@@ -1111,47 +1741,81 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           return;
         }
 
-        if (context.turnState) {
-          context.turnState.items.push(message.message);
-          const fallbackAssistantText = extractAssistantText(message);
-          if (
-            fallbackAssistantText.length > 0 &&
-            fallbackAssistantText !== context.turnState.fallbackAssistantText
-          ) {
-            context.turnState = {
-              ...context.turnState,
-              fallbackAssistantText,
-            };
-          }
-
-          const stamp = yield* makeEventStamp();
+        // Auto-start a synthetic turn for assistant messages that arrive without
+        // an active turn (e.g., background agent/subagent responses between user prompts).
+        if (!context.turnState) {
+          const turnId = TurnId.makeUnsafe(yield* Random.nextUUIDv4);
+          const startedAt = yield* nowIso;
+          context.turnState = {
+            turnId,
+            startedAt,
+            items: [],
+            assistantTextBlocks: new Map(),
+            assistantTextBlockOrder: [],
+            capturedProposedPlanKeys: new Set(),
+            nextSyntheticAssistantBlockIndex: -1,
+          };
+          context.session = {
+            ...context.session,
+            status: "running",
+            activeTurnId: turnId,
+            updatedAt: startedAt,
+          };
+          const turnStartedStamp = yield* makeEventStamp();
           yield* offerRuntimeEvent({
-            type: "item.updated",
-            eventId: stamp.eventId,
+            type: "turn.started",
+            eventId: turnStartedStamp.eventId,
             provider: PROVIDER,
-            createdAt: stamp.createdAt,
+            createdAt: turnStartedStamp.createdAt,
             threadId: context.session.threadId,
-            turnId: context.turnState.turnId,
-            itemId: asRuntimeItemId(context.turnState.assistantItemId),
-            payload: {
-              itemType: "assistant_message",
-              status: "inProgress",
-              title: "Assistant message",
-              data: message.message,
-            },
+            turnId,
+            payload: {},
             providerRefs: {
-              ...providerThreadRef(context),
-              providerTurnId: context.turnState.turnId,
-              providerItemId: ProviderItemId.makeUnsafe(context.turnState.assistantItemId),
+              ...nativeProviderRefs(context),
+              providerTurnId: turnId,
             },
             raw: {
               source: "claude.sdk.message",
-              method: "claude/assistant",
-              payload: message,
+              method: "claude/synthetic-turn-start",
+              payload: {},
             },
           });
         }
 
+        const content = message.message?.content;
+        if (Array.isArray(content)) {
+          for (const block of content) {
+            if (!block || typeof block !== "object") {
+              continue;
+            }
+            const toolUse = block as {
+              type?: unknown;
+              id?: unknown;
+              name?: unknown;
+              input?: unknown;
+            };
+            if (toolUse.type !== "tool_use" || toolUse.name !== "ExitPlanMode") {
+              continue;
+            }
+            const planMarkdown = extractExitPlanModePlan(toolUse.input);
+            if (!planMarkdown) {
+              continue;
+            }
+            yield* emitProposedPlanCompleted(context, {
+              planMarkdown,
+              toolUseId: typeof toolUse.id === "string" ? toolUse.id : undefined,
+              rawSource: "claude.sdk.message",
+              rawMethod: "claude/assistant",
+              rawPayload: message,
+            });
+          }
+        }
+
+        if (context.turnState) {
+          context.turnState.items.push(message.message);
+          yield* backfillAssistantTextBlocksFromSnapshot(context, message);
+        }
+
         context.lastAssistantUuid = message.uuid;
         yield* updateResumeCursor(context);
       });
@@ -1166,8 +1830,8 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         }
 
         const status = turnStatusFromResult(message);
-        const errorMessage =
-          message.subtype === "success" ? undefined : toStringOrUndefined(message.errors?.[0]);
+        const rawError = message.subtype === "success" ? undefined : message.errors?.[0];
+        const errorMessage = typeof rawError === "string" ? rawError : undefined;
 
         if (status === "failed") {
           yield* emitRuntimeError(context, errorMessage ?? "Claude turn failed.");
@@ -1178,7 +1842,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
 
     const handleSystemMessage = (
       context: ClaudeSessionContext,
-      message: SDKMessageLoose,
+      message: SDKMessage,
     ): Effect.Effect<void> =>
       Effect.gen(function* () {
         if (message.type !== "system") {
@@ -1191,11 +1855,8 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           provider: PROVIDER,
           createdAt: stamp.createdAt,
           threadId: context.session.threadId,
-          ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
-          providerRefs: {
-            ...providerThreadRef(context),
-            ...(context.turnState ? { providerTurnId: context.turnState.turnId } : {}),
-          },
+          ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+          providerRefs: nativeProviderRefs(context),
           raw: {
             source: "claude.sdk.message" as const,
             method: sdkNativeMethod(message),
@@ -1240,9 +1901,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "hook.started",
               payload: {
-                hookId: message.hook_id,
-                hookName: message.hook_name,
-                hookEvent: message.hook_event,
+                hookId: message.hook_id!,
+                hookName: message.hook_name!,
+                hookEvent: message.hook_event!,
               },
             });
             return;
@@ -1251,7 +1912,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "hook.progress",
               payload: {
-                hookId: message.hook_id,
+                hookId: message.hook_id!,
                 output: message.output,
                 stdout: message.stdout,
                 stderr: message.stderr,
@@ -1263,8 +1924,8 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "hook.completed",
               payload: {
-                hookId: message.hook_id,
-                outcome: message.outcome,
+                hookId: message.hook_id!,
+                outcome: message.outcome!,
                 output: message.output,
                 stdout: message.stdout,
                 stderr: message.stderr,
@@ -1277,7 +1938,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "task.started",
               payload: {
-                taskId: RuntimeTaskId.makeUnsafe(message.task_id),
+                taskId: RuntimeTaskId.makeUnsafe(message.task_id!),
                 description: message.description,
                 ...(message.task_type ? { taskType: message.task_type } : {}),
               },
@@ -1288,8 +1949,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "task.progress",
               payload: {
-                taskId: RuntimeTaskId.makeUnsafe(message.task_id),
-                description: message.description,
+                taskId: RuntimeTaskId.makeUnsafe(message.task_id!),
+                description: message.description!,
+                ...(message.summary ? { summary: message.summary } : {}),
                 ...(message.usage ? { usage: message.usage } : {}),
                 ...(message.last_tool_name ? { lastToolName: message.last_tool_name } : {}),
               },
@@ -1300,8 +1962,8 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
               ...base,
               type: "task.completed",
               payload: {
-                taskId: RuntimeTaskId.makeUnsafe(message.task_id),
-                status: message.status,
+                taskId: RuntimeTaskId.makeUnsafe(message.task_id!),
+                status: message.status as "stopped" | "completed" | "failed",
                 ...(message.summary ? { summary: message.summary } : {}),
                 ...(message.usage ? { usage: message.usage } : {}),
               },
@@ -1341,7 +2003,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
 
     const handleSdkTelemetryMessage = (
       context: ClaudeSessionContext,
-      message: SDKMessageLoose,
+      message: SDKMessage,
     ): Effect.Effect<void> =>
       Effect.gen(function* () {
         const stamp = yield* makeEventStamp();
@@ -1350,11 +2012,8 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           provider: PROVIDER,
           createdAt: stamp.createdAt,
           threadId: context.session.threadId,
-          ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
-          providerRefs: {
-            ...providerThreadRef(context),
-            ...(context.turnState ? { providerTurnId: context.turnState.turnId } : {}),
-          },
+          ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+          providerRefs: nativeProviderRefs(context),
           raw: {
             source: "claude.sdk.message" as const,
             method: sdkNativeMethod(message),
@@ -1382,7 +2041,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             ...base,
             type: "tool.summary",
             payload: {
-              summary: message.summary,
+              summary: message.summary!,
               ...((message.preceding_tool_use_ids?.length ?? 0) > 0
                 ? { precedingToolUseIds: message.preceding_tool_use_ids }
                 : {}),
@@ -1397,7 +2056,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             type: "auth.status",
             payload: {
               isAuthenticating: message.isAuthenticating,
-              output: message.output,
+              ...(message.output ? { output: [message.output] } : {}),
               ...(message.error ? { error: message.error } : {}),
             },
           });
@@ -1405,7 +2064,6 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         }
 
         if (message.type === "rate_limit_event") {
-          storeClaudeRateLimits(message as Record<string, unknown>);
           yield* offerRuntimeEvent({
             ...base,
             type: "account.rate-limits.updated",
@@ -1419,7 +2077,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
 
     const handleSdkMessage = (
       context: ClaudeSessionContext,
-      message: SDKMessageLoose,
+      message: SDKMessage,
     ): Effect.Effect<void> =>
       Effect.gen(function* () {
         yield* logNativeSdkMessage(context, message);
@@ -1430,6 +2088,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             yield* handleStreamEvent(context, message);
             return;
           case "user":
+            yield* handleUserMessage(context, message);
             return;
           case "assistant":
             yield* handleAssistantMessage(context, message);
@@ -1456,21 +2115,48 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         }
       });
 
-    const runSdkStream = (context: ClaudeSessionContext): Effect.Effect<void> =>
-      Stream.fromAsyncIterable(context.query, (cause) => cause).pipe(
+    const runSdkStream = (context: ClaudeSessionContext): Effect.Effect<void, Error> =>
+      Stream.fromAsyncIterable(context.query, (cause) =>
+        toError(cause, "Claude runtime stream failed."),
+      ).pipe(
         Stream.takeWhile(() => !context.stopped),
         Stream.runForEach((message) => handleSdkMessage(context, message)),
-        Effect.catchCause((cause) =>
-          Effect.gen(function* () {
-            if (Cause.hasInterruptsOnly(cause) || context.stopped) {
-              return;
+      );
+
+    const handleStreamExit = (
+      context: ClaudeSessionContext,
+      exit: Exit.Exit<void, Error>,
+    ): Effect.Effect<void> =>
+      Effect.gen(function* () {
+        if (context.stopped) {
+          return;
+        }
+
+        if (Exit.isFailure(exit)) {
+          if (isClaudeInterruptedCause(exit.cause)) {
+            if (context.turnState) {
+              yield* completeTurn(
+                context,
+                "interrupted",
+                interruptionMessageFromClaudeCause(exit.cause),
+              );
             }
-            const message = toMessage(Cause.squash(cause), "Claude runtime stream failed.");
-            yield* emitRuntimeError(context, message, cause);
+          } else {
+            const message = messageFromClaudeStreamCause(
+              exit.cause,
+              "Claude runtime stream failed.",
+            );
+            yield* emitRuntimeError(context, message, Cause.pretty(exit.cause));
             yield* completeTurn(context, "failed", message);
-          }),
-        ),
-      );
+          }
+        } else if (context.turnState) {
+          yield* completeTurn(context, "interrupted", "Claude runtime stream ended.");
+        }
+
+        yield* stopSessionInternal(context, {
+          emitExitEvent: true,
+        });
+      });
 
     const stopSessionInternal = (
       context: ClaudeSessionContext,
@@ -1490,17 +2176,13 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             provider: PROVIDER,
             createdAt: stamp.createdAt,
             threadId: context.session.threadId,
-            ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+            ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
             requestId: asRuntimeRequestId(requestId),
             payload: {
               requestType: pending.requestType,
               decision: "cancel",
             },
-            providerRefs: {
-              ...providerThreadRef(context),
-              ...(context.turnState ? { providerTurnId: String(context.turnState.turnId) } : {}),
-              providerRequestId: requestId,
-            },
+            providerRefs: nativeProviderRefs(context),
           });
         }
         context.pendingApprovals.clear();
@@ -1511,8 +2193,18 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
 
         yield* Queue.shutdown(context.promptQueue);
 
-        // The SDK may throw if internal session files were already cleaned up
-        yield* Effect.sync(() => context.query.close()).pipe(Effect.ignore);
+        const streamFiber = context.streamFiber;
+        context.streamFiber = undefined;
+        if (streamFiber && streamFiber.pollUnsafe() === undefined) {
+          yield* Fiber.interrupt(streamFiber);
+        }
+
+        // @effect-diagnostics-next-line tryCatchInEffectGen:off
+        try {
+          context.query.close();
+        } catch (cause) {
+          yield* emitRuntimeError(context, "Failed to close Claude runtime query.", cause);
+        }
 
         const updatedAt = yield* nowIso;
         context.session = {
@@ -1564,7 +2256,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
       return Effect.succeed(context);
     };
 
-    const startSession: ClaudeCodeAdapterShape["startSession"] = (input) =>
+    const startSession: ClaudeAdapterShape["startSession"] = (input) =>
       Effect.gen(function* () {
         if (input.provider !== undefined && input.provider !== PROVIDER) {
           return yield* new ProviderAdapterValidationError({
@@ -1576,7 +2268,11 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
 
         const startedAt = yield* nowIso;
         const resumeState = readClaudeResumeState(input.resumeCursor);
-        const threadId = resumeState?.threadId ?? input.threadId;
+        const threadId = input.threadId;
+        const existingResumeSessionId = resumeState?.resume;
+        const newSessionId =
+          existingResumeSessionId === undefined ? yield* Random.nextUUIDv4 : undefined;
+        const sessionId = existingResumeSessionId ?? newSessionId;
 
         const promptQueue = yield* Queue.unbounded<PromptQueueItem>();
         const prompt = Stream.fromQueue(promptQueue).pipe(
@@ -1586,10 +2282,124 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         );
 
         const pendingApprovals = new Map<ApprovalRequestId, PendingApproval>();
+        const pendingUserInputs = new Map<ApprovalRequestId, PendingUserInput>();
         const inFlightTools = new Map<number, ToolInFlight>();
 
         const contextRef = yield* Ref.make<ClaudeSessionContext | undefined>(undefined);
 
+        /**
+         * Handle AskUserQuestion tool calls by emitting a `user-input.requested`
+         * runtime event and waiting for the user to respond via `respondToUserInput`.
+         */
+        const handleAskUserQuestion = (
+          context: ClaudeSessionContext,
+          toolInput: Record<string, unknown>,
+          callbackOptions: { readonly signal: AbortSignal; readonly toolUseID?: string },
+        ) =>
+          Effect.gen(function* () {
+            const requestId = ApprovalRequestId.makeUnsafe(yield* Random.nextUUIDv4);
+
+            // Parse questions from the SDK's AskUserQuestion input.
+            const rawQuestions = Array.isArray(toolInput.questions) ? toolInput.questions : [];
+            const questions: Array<UserInputQuestion> = rawQuestions.map(
+              (q: Record<string, unknown>, idx: number) => ({
+                id: typeof q.header === "string" ? q.header : `q-${idx}`,
+                header: typeof q.header === "string" ? q.header : `Question ${idx + 1}`,
+                question: typeof q.question === "string" ? q.question : "",
+                options: Array.isArray(q.options)
+                  ? q.options.map((opt: Record<string, unknown>) => ({
+                      label: typeof opt.label === "string" ? opt.label : "",
+                      description: typeof opt.description === "string" ? opt.description : "",
+                    }))
+                  : [],
+                multiSelect: typeof q.multiSelect === "boolean" ? q.multiSelect : false,
+              }),
+            );
+
+            const answersDeferred = yield* Deferred.make<ProviderUserInputAnswers>();
+            let aborted = false;
+            const pendingInput: PendingUserInput = {
+              questions,
+              answers: answersDeferred,
+            };
+
+            // Emit user-input.requested so the UI can present the questions.
+            const requestedStamp = yield* makeEventStamp();
+            yield* offerRuntimeEvent({
+              type: "user-input.requested",
+              eventId: requestedStamp.eventId,
+              provider: PROVIDER,
+              createdAt: requestedStamp.createdAt,
+              threadId: context.session.threadId,
+              ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+              requestId: asRuntimeRequestId(requestId),
+              payload: { questions },
+              providerRefs: nativeProviderRefs(context, {
+                providerItemId: callbackOptions.toolUseID as string | undefined,
+              }),
+              raw: {
+                source: "claude.sdk.permission",
+                method: "canUseTool/AskUserQuestion",
+                payload: { toolName: "AskUserQuestion", input: toolInput },
+              },
+            });
+
+            pendingUserInputs.set(requestId, pendingInput);
+
+            // Handle abort (e.g. turn interrupted while waiting for user input).
+            const onAbort = () => {
+              if (!pendingUserInputs.has(requestId)) {
+                return;
+              }
+              aborted = true;
+              pendingUserInputs.delete(requestId);
+              Effect.runFork(Deferred.succeed(answersDeferred, {} as ProviderUserInputAnswers));
+            };
+            callbackOptions.signal.addEventListener("abort", onAbort, { once: true });
+
+            // Block until the user provides answers.
+            const answers = yield* Deferred.await(answersDeferred);
+            pendingUserInputs.delete(requestId);
+
+            // Emit user-input.resolved so the UI knows the interaction completed.
+            const resolvedStamp = yield* makeEventStamp();
+            yield* offerRuntimeEvent({
+              type: "user-input.resolved",
+              eventId: resolvedStamp.eventId,
+              provider: PROVIDER,
+              createdAt: resolvedStamp.createdAt,
+              threadId: context.session.threadId,
+              ...(context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {}),
+              requestId: asRuntimeRequestId(requestId),
+              payload: { answers },
+              providerRefs: nativeProviderRefs(context, {
+                providerItemId: callbackOptions.toolUseID as string | undefined,
+              }),
+              raw: {
+                source: "claude.sdk.permission",
+                method: "canUseTool/AskUserQuestion/resolved",
+                payload: { answers },
+              },
+            });
+
+            if (aborted) {
+              return {
+                behavior: "deny",
+                message: "User cancelled tool execution.",
+              } satisfies PermissionResult;
+            }
+
+            // Return the answers to the SDK in the expected format:
+            // { questions: [...], answers: { questionText: selectedLabel } }
+            return {
+              behavior: "allow",
+              updatedInput: {
+                questions: toolInput.questions,
+                answers,
+              },
+            } satisfies PermissionResult;
+          });
+
         const canUseTool: CanUseTool = (toolName, toolInput, callbackOptions) =>
           Effect.runPromise(
             Effect.gen(function* () {
@@ -1601,6 +2411,35 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                 } satisfies PermissionResult;
               }
 
+              // Handle AskUserQuestion: surface clarifying questions to the
+              // user via the user-input runtime event channel, regardless of
+              // runtime mode (plan mode relies on this heavily).
+              if (toolName === "AskUserQuestion") {
+                return yield* handleAskUserQuestion(context, toolInput, callbackOptions);
+              }
+
+              if (toolName === "ExitPlanMode") {
+                const planMarkdown = extractExitPlanModePlan(toolInput);
+                if (planMarkdown) {
+                  yield* emitProposedPlanCompleted(context, {
+                    planMarkdown,
+                    toolUseId: callbackOptions.toolUseID,
+                    rawSource: "claude.sdk.permission",
+                    rawMethod: "canUseTool/ExitPlanMode",
+                    rawPayload: {
+                      toolName,
+                      input: toolInput,
+                    },
+                  });
+                }
+
+                return {
+                  behavior: "deny",
+                  message:
+                    "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn.",
+                } satisfies PermissionResult;
+              }
+
               const runtimeMode = input.runtimeMode ?? "full-access";
               if (runtimeMode === "full-access") {
                 return {
@@ -1629,7 +2468,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                 provider: PROVIDER,
                 createdAt: requestedStamp.createdAt,
                 threadId: context.session.threadId,
-                ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+                ...(context.turnState
+                  ? { turnId: asCanonicalTurnId(context.turnState.turnId) }
+                  : {}),
                 requestId: asRuntimeRequestId(requestId),
                 payload: {
                   requestType,
@@ -1640,13 +2481,9 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                     ...(callbackOptions.toolUseID ? { toolUseId: callbackOptions.toolUseID } : {}),
                   },
                 },
-                providerRefs: {
-                  ...providerThreadRef(context),
-                  ...(context.turnState
-                    ? { providerTurnId: String(context.turnState.turnId) }
-                    : {}),
-                  providerRequestId: requestId,
-                },
+                providerRefs: nativeProviderRefs(context, {
+                  providerItemId: callbackOptions.toolUseID as string | undefined,
+                }),
                 raw: {
                   source: "claude.sdk.permission",
                   method: "canUseTool/request",
@@ -1667,7 +2504,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                 Effect.runFork(Deferred.succeed(decisionDeferred, "cancel"));
               };
 
-              callbackOptions.signal?.addEventListener("abort", onAbort, {
+              callbackOptions.signal.addEventListener("abort", onAbort, {
                 once: true,
               });
 
@@ -1681,19 +2518,17 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
                 provider: PROVIDER,
                 createdAt: resolvedStamp.createdAt,
                 threadId: context.session.threadId,
-                ...(context.turnState ? { turnId: context.turnState.turnId } : {}),
+                ...(context.turnState
+                  ? { turnId: asCanonicalTurnId(context.turnState.turnId) }
+                  : {}),
                 requestId: asRuntimeRequestId(requestId),
                 payload: {
                   requestType,
                   decision,
                 },
-                providerRefs: {
-                  ...providerThreadRef(context),
-                  ...(context.turnState
-                    ? { providerTurnId: String(context.turnState.turnId) }
-                    : {}),
-                  providerRequestId: requestId,
-                },
+                providerRefs: nativeProviderRefs(context, {
+                  providerItemId: callbackOptions.toolUseID as string | undefined,
+                }),
                 raw: {
                   source: "claude.sdk.permission",
                   method: "canUseTool/decision",
@@ -1723,63 +2558,53 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             }),
           );
 
-        const providerOptions = input.providerOptions?.claudeCode;
-        const claudeCodeModelOptions = input.modelOptions?.claudeCode;
+        const providerOptions = input.providerOptions?.claudeAgent;
+        const requestedEffort = resolveReasoningEffortForProvider(
+          "claudeAgent",
+          input.modelOptions?.claudeAgent?.effort ?? null,
+        );
+        const supportedEffortOptions = getReasoningEffortOptions("claudeAgent", input.model);
+        const effort =
+          requestedEffort && supportedEffortOptions.includes(requestedEffort)
+            ? requestedEffort
+            : null;
+        const fastMode =
+          input.modelOptions?.claudeAgent?.fastMode === true && supportsClaudeFastMode(input.model);
+        const thinking =
+          typeof input.modelOptions?.claudeAgent?.thinking === "boolean" &&
+          supportsClaudeThinkingToggle(input.model)
+            ? input.modelOptions.claudeAgent.thinking
+            : undefined;
+        const effectiveEffort = getEffectiveClaudeCodeEffort(effort);
         const permissionMode =
           toPermissionMode(providerOptions?.permissionMode) ??
           (input.runtimeMode === "full-access" ? "bypassPermissions" : undefined);
-        const effort = claudeCodeModelOptions?.effort as EffortLevel | undefined;
-
-        const pathToClaudeCodeExecutable = yield* Effect.try({
-          try: () =>
-            (providerOptions?.binaryPath as string | undefined) ?? defaultClaudeSdkCliPath(),
-          catch: (cause) =>
-            new ProviderAdapterProcessError({
-              provider: PROVIDER,
-              threadId,
-              detail: toMessage(cause, "Failed to resolve Claude Code executable."),
-              cause,
-            }),
-        });
+        const settings = {
+          ...(typeof thinking === "boolean" ? { alwaysThinkingEnabled: thinking } : {}),
+          ...(fastMode ? { fastMode: true } : {}),
+        };
 
         const queryOptions: ClaudeQueryOptions = {
           ...(input.cwd ? { cwd: input.cwd } : {}),
           ...(input.model ? { model: input.model } : {}),
-          pathToClaudeCodeExecutable,
+          pathToClaudeCodeExecutable: providerOptions?.binaryPath ?? "claude",
+          ...(effectiveEffort ? { effort: effectiveEffort } : {}),
           ...(permissionMode ? { permissionMode } : {}),
           ...(permissionMode === "bypassPermissions"
             ? { allowDangerouslySkipPermissions: true }
             : {}),
           ...(providerOptions?.maxThinkingTokens !== undefined
-            ? { maxThinkingTokens: providerOptions.maxThinkingTokens as number }
+            ? { maxThinkingTokens: providerOptions.maxThinkingTokens }
             : {}),
-          ...(effort ? { effort } : {}),
-          ...(resumeState?.resume ? { resume: resumeState.resume } : {}),
-          ...(resumeState?.resumeSessionAt ? { resumeSessionAt: resumeState.resumeSessionAt } : {}),
+          ...(Object.keys(settings).length > 0 ? { settings } : {}),
+          ...(existingResumeSessionId ? { resume: existingResumeSessionId } : {}),
+          ...(newSessionId ? { sessionId: newSessionId } : {}),
           includePartialMessages: true,
           canUseTool,
-          env: sanitizedEnv(),
-          ...(isDesktopRuntime()
-            ? {
-                stderr: (message: string) => {
-                  const trimmed = message.trimEnd();
-                  if (trimmed.length > 0) {
-                    logger.warn(`[stderr] ${trimmed}`);
-                  }
-                },
-              }
-            : {}),
+          env: process.env,
           ...(input.cwd ? { additionalDirectories: [input.cwd] } : {}),
         };
 
-        logDesktopClaudeDiagnostic("starting Claude query", {
-          blockedEnvKeys: Array.from(SPAWN_ENV_BLOCKLIST).toSorted(),
-          inheritedDiagnosticEnvKeys: diagnosticEnvKeys(process.env),
-          forwardedDiagnosticEnvKeys: diagnosticEnvKeys(queryOptions.env ?? {}),
-          model: input.model,
-          cwd: input.cwd,
-        });
-
         const queryRuntime = yield* Effect.try({
           try: () =>
             createQuery({
@@ -1795,13 +2620,6 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             }),
         });
 
-        // Guard against duplicate threadId: stop/cleanup any existing session AFTER the
-        // replacement runtime is successfully created so the thread is never left unusable.
-        const existingContext = sessions.get(threadId);
-        if (existingContext) {
-          yield* stopSessionInternal(existingContext, { emitExitEvent: true });
-        }
-
         const session: ProviderSession = {
           threadId,
           provider: PROVIDER,
@@ -1809,9 +2627,10 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           runtimeMode: input.runtimeMode,
           ...(input.cwd ? { cwd: input.cwd } : {}),
           ...(input.model ? { model: input.model } : {}),
+          ...(threadId ? { threadId } : {}),
           resumeCursor: {
             ...(threadId ? { threadId } : {}),
-            ...(resumeState?.resume ? { resume: resumeState.resume } : {}),
+            ...(sessionId ? { resume: sessionId } : {}),
             ...(resumeState?.resumeSessionAt
               ? { resumeSessionAt: resumeState.resumeSessionAt }
               : {}),
@@ -1825,13 +2644,15 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           session,
           promptQueue,
           query: queryRuntime,
+          streamFiber: undefined,
           startedAt,
-          resumeSessionId: resumeState?.resume,
+          basePermissionMode: permissionMode,
+          resumeSessionId: sessionId,
           pendingApprovals,
+          pendingUserInputs,
           turns: [],
           inFlightTools,
           turnState: undefined,
-          lastTurnId: undefined,
           lastAssistantUuid: resumeState?.resumeSessionAt,
           lastThreadStartedId: undefined,
           stopped: false,
@@ -1861,10 +2682,12 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
             config: {
               ...(input.model ? { model: input.model } : {}),
               ...(input.cwd ? { cwd: input.cwd } : {}),
+              ...(effectiveEffort ? { effort: effectiveEffort } : {}),
               ...(permissionMode ? { permissionMode } : {}),
               ...(providerOptions?.maxThinkingTokens !== undefined
                 ? { maxThinkingTokens: providerOptions.maxThinkingTokens }
                 : {}),
+              ...(fastMode ? { fastMode: true } : {}),
             },
           },
           providerRefs: {},
@@ -1883,23 +2706,31 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           providerRefs: {},
         });
 
-        yield* runSdkStream(context).pipe(Effect.forkDetach);
+        const streamFiber = Effect.runFork(runSdkStream(context));
+        context.streamFiber = streamFiber;
+        streamFiber.addObserver((exit) => {
+          if (context.stopped) {
+            return;
+          }
+          if (context.streamFiber === streamFiber) {
+            context.streamFiber = undefined;
+          }
+          Effect.runFork(handleStreamExit(context, exit));
+        });
 
         return {
           ...session,
         };
       });
 
-    const sendTurn: ClaudeCodeAdapterShape["sendTurn"] = (input) =>
+    const sendTurn: ClaudeAdapterShape["sendTurn"] = (input) =>
       Effect.gen(function* () {
         const context = yield* requireSession(input.threadId);
 
         if (context.turnState) {
-          return yield* new ProviderAdapterValidationError({
-            provider: PROVIDER,
-            operation: "sendTurn",
-            issue: `Thread '${input.threadId}' already has an active turn '${context.turnState.turnId}'.`,
-          });
+          // Auto-close a stale synthetic turn (from background agent responses
+          // between user prompts) to prevent blocking the user's next turn.
+          yield* completeTurn(context, "completed");
         }
 
         if (input.model) {
@@ -1909,30 +2740,41 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           });
         }
 
-        // Validate the user message BEFORE mutating any session state so that
-        // a buildUserMessage failure leaves the session unchanged.
-        const message = yield* buildUserMessage(input);
+        // Apply interaction mode by switching the SDK's permission mode.
+        // "plan" maps directly to the SDK's "plan" permission mode;
+        // "default" restores the session's original permission mode.
+        // When interactionMode is absent we leave the current mode unchanged.
+        if (input.interactionMode === "plan") {
+          yield* Effect.tryPromise({
+            try: () => context.query.setPermissionMode("plan"),
+            catch: (cause) => toRequestError(input.threadId, "turn/setPermissionMode", cause),
+          });
+        } else if (input.interactionMode === "default") {
+          yield* Effect.tryPromise({
+            try: () =>
+              context.query.setPermissionMode(context.basePermissionMode ?? "bypassPermissions"),
+            catch: (cause) => toRequestError(input.threadId, "turn/setPermissionMode", cause),
+          });
+        }
 
         const turnId = TurnId.makeUnsafe(yield* Random.nextUUIDv4);
         const turnState: ClaudeTurnState = {
           turnId,
-          assistantItemId: yield* Random.nextUUIDv4,
           startedAt: yield* nowIso,
           items: [],
-          messageCompleted: false,
-          emittedTextDelta: false,
-          fallbackAssistantText: "",
+          assistantTextBlocks: new Map(),
+          assistantTextBlockOrder: [],
+          capturedProposedPlanKeys: new Set(),
+          nextSyntheticAssistantBlockIndex: -1,
         };
 
         const updatedAt = yield* nowIso;
         context.turnState = turnState;
-        context.lastTurnId = turnId;
         context.session = {
           ...context.session,
           status: "running",
           activeTurnId: turnId,
           updatedAt,
-          lastError: undefined,
         };
 
         const turnStartedStamp = yield* makeEventStamp();
@@ -1944,9 +2786,12 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
           threadId: context.session.threadId,
           turnId,
           payload: input.model ? { model: input.model } : {},
-          providerRefs: {
-            providerTurnId: String(turnId),
-          },
+          providerRefs: {},
+        });
+
+        const message = yield* buildUserMessageEffect(input, {
+          fileSystem,
+          stateDir: serverConfig.stateDir,
         });
 
         yield* Queue.offer(context.promptQueue, {
@@ -1963,7 +2808,7 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         };
       });
 
-    const interruptTurn: ClaudeCodeAdapterShape["interruptTurn"] = (threadId, _turnId) =>
+    const interruptTurn: ClaudeAdapterShape["interruptTurn"] = (threadId, _turnId) =>
       Effect.gen(function* () {
         const context = yield* requireSession(threadId);
         yield* Effect.tryPromise({
@@ -1972,24 +2817,22 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         });
       });
 
-    const readThread: ClaudeCodeAdapterShape["readThread"] = (threadId) =>
+    const readThread: ClaudeAdapterShape["readThread"] = (threadId) =>
       Effect.gen(function* () {
         const context = yield* requireSession(threadId);
         return yield* snapshotThread(context);
       });
 
-    const rollbackThread: ClaudeCodeAdapterShape["rollbackThread"] = (threadId, _numTurns) =>
+    const rollbackThread: ClaudeAdapterShape["rollbackThread"] = (threadId, numTurns) =>
       Effect.gen(function* () {
-        yield* requireSession(threadId);
-        return yield* new ProviderAdapterRequestError({
-          provider: PROVIDER,
-          method: "thread.rollback",
-          detail:
-            "Claude Code rollback is not supported without rewinding the underlying provider session.",
-        });
+        const context = yield* requireSession(threadId);
+        const nextLength = Math.max(0, context.turns.length - numTurns);
+        context.turns.splice(nextLength);
+        yield* updateResumeCursor(context);
+        return yield* snapshotThread(context);
       });
 
-    const respondToRequest: ClaudeCodeAdapterShape["respondToRequest"] = (
+    const respondToRequest: ClaudeAdapterShape["respondToRequest"] = (
       threadId,
       requestId,
       decision,
@@ -2009,20 +2852,27 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         yield* Deferred.succeed(pending.decision, decision);
       });
 
-    const respondToUserInput: ClaudeCodeAdapterShape["respondToUserInput"] = (
+    const respondToUserInput: ClaudeAdapterShape["respondToUserInput"] = (
       threadId,
       requestId,
-      _answers,
+      answers,
     ) =>
-      Effect.fail(
-        new ProviderAdapterRequestError({
-          provider: PROVIDER,
-          method: "item/tool/requestUserInput",
-          detail: `Claude Code does not yet support structured user-input responses for thread '${threadId}' and request '${requestId}'.`,
-        }),
-      );
+      Effect.gen(function* () {
+        const context = yield* requireSession(threadId);
+        const pending = context.pendingUserInputs.get(requestId);
+        if (!pending) {
+          return yield* new ProviderAdapterRequestError({
+            provider: PROVIDER,
+            method: "item/tool/respondToUserInput",
+            detail: `Unknown pending user-input request: ${requestId}`,
+          });
+        }
+
+        context.pendingUserInputs.delete(requestId);
+        yield* Deferred.succeed(pending.answers, answers);
+      });
 
-    const stopSession: ClaudeCodeAdapterShape["stopSession"] = (threadId) =>
+    const stopSession: ClaudeAdapterShape["stopSession"] = (threadId) =>
       Effect.gen(function* () {
         const context = yield* requireSession(threadId);
         yield* stopSessionInternal(context, {
@@ -2030,16 +2880,16 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
         });
       });
 
-    const listSessions: ClaudeCodeAdapterShape["listSessions"] = () =>
+    const listSessions: ClaudeAdapterShape["listSessions"] = () =>
       Effect.sync(() => Array.from(sessions.values(), ({ session }) => ({ ...session })));
 
-    const hasSession: ClaudeCodeAdapterShape["hasSession"] = (threadId) =>
+    const hasSession: ClaudeAdapterShape["hasSession"] = (threadId) =>
       Effect.sync(() => {
         const context = sessions.get(threadId);
         return context !== undefined && !context.stopped;
       });
 
-    const stopAll: ClaudeCodeAdapterShape["stopAll"] = () =>
+    const stopAll: ClaudeAdapterShape["stopAll"] = () =>
       Effect.forEach(
         sessions,
         ([, context]) =>
@@ -2075,12 +2925,12 @@ function makeClaudeCodeAdapter(options?: ClaudeCodeAdapterLiveOptions) {
       hasSession,
       stopAll,
       streamEvents: Stream.fromQueue(runtimeEventQueue),
-    } satisfies ClaudeCodeAdapterShape;
+    } satisfies ClaudeAdapterShape;
   });
 }
 
-export const ClaudeCodeAdapterLive = Layer.effect(ClaudeCodeAdapter, makeClaudeCodeAdapter());
+export const ClaudeAdapterLive = Layer.effect(ClaudeAdapter, makeClaudeAdapter());
 
-export function makeClaudeCodeAdapterLive(options?: ClaudeCodeAdapterLiveOptions) {
-  return Layer.effect(ClaudeCodeAdapter, makeClaudeCodeAdapter(options));
+export function makeClaudeAdapterLive(options?: ClaudeAdapterLiveOptions) {
+  return Layer.effect(ClaudeAdapter, makeClaudeAdapter(options));
 }
diff --git a/apps/server/src/provider/Layers/ClaudeCodeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeCodeAdapter.test.ts
deleted file mode 100644
index 46c444f2a3..0000000000
--- a/apps/server/src/provider/Layers/ClaudeCodeAdapter.test.ts
+++ /dev/null
@@ -1,958 +0,0 @@
-import type {
-  Options as ClaudeQueryOptions,
-  PermissionMode,
-  PermissionResult,
-  SDKMessage,
-  SDKUserMessage,
-} from "@anthropic-ai/claude-agent-sdk";
-import * as Path from "node:path";
-import { ApprovalRequestId, ThreadId } from "@t3tools/contracts";
-import { assert, describe, it } from "@effect/vitest";
-import { Effect, Fiber, Random, Stream } from "effect";
-
-import { ProviderAdapterValidationError } from "../Errors.ts";
-import { ClaudeCodeAdapter } from "../Services/ClaudeCodeAdapter.ts";
-import {
-  makeClaudeCodeAdapterLive,
-  type ClaudeCodeAdapterLiveOptions,
-} from "./ClaudeCodeAdapter.ts";
-
-class FakeClaudeQuery implements AsyncIterable<SDKMessage> {
-  private readonly queue: Array<SDKMessage> = [];
-  private readonly resolvers: Array<(value: IteratorResult<SDKMessage>) => void> = [];
-  private done = false;
-
-  public readonly interruptCalls: Array<void> = [];
-  public readonly setModelCalls: Array<string | undefined> = [];
-  public readonly setPermissionModeCalls: Array<string> = [];
-  public readonly setMaxThinkingTokensCalls: Array<number | null> = [];
-  public closeCalls = 0;
-
-  emit(message: SDKMessage): void {
-    if (this.done) {
-      return;
-    }
-    const resolver = this.resolvers.shift();
-    if (resolver) {
-      resolver({ done: false, value: message });
-      return;
-    }
-    this.queue.push(message);
-  }
-
-  finish(): void {
-    if (this.done) {
-      return;
-    }
-    this.done = true;
-    for (const resolver of this.resolvers.splice(0)) {
-      resolver({ done: true, value: undefined });
-    }
-  }
-
-  readonly interrupt = async (): Promise<void> => {
-    this.interruptCalls.push(undefined);
-  };
-
-  readonly setModel = async (model?: string): Promise<void> => {
-    this.setModelCalls.push(model);
-  };
-
-  readonly setPermissionMode = async (mode: PermissionMode): Promise<void> => {
-    this.setPermissionModeCalls.push(mode);
-  };
-
-  readonly setMaxThinkingTokens = async (maxThinkingTokens: number | null): Promise<void> => {
-    this.setMaxThinkingTokensCalls.push(maxThinkingTokens);
-  };
-
-  readonly close = (): void => {
-    this.closeCalls += 1;
-    this.finish();
-  };
-
-  [Symbol.asyncIterator](): AsyncIterator<SDKMessage> {
-    return {
-      next: () => {
-        if (this.queue.length > 0) {
-          const value = this.queue.shift();
-          if (value) {
-            return Promise.resolve({
-              done: false,
-              value,
-            });
-          }
-        }
-        if (this.done) {
-          return Promise.resolve({
-            done: true,
-            value: undefined,
-          });
-        }
-        return new Promise((resolve) => {
-          this.resolvers.push(resolve);
-        });
-      },
-    };
-  }
-}
-
-interface Harness {
-  readonly layer: ReturnType<typeof makeClaudeCodeAdapterLive>;
-  readonly query: FakeClaudeQuery;
-  readonly getLastCreateQueryInput: () =>
-    | {
-        readonly prompt: AsyncIterable<SDKUserMessage>;
-        readonly options: ClaudeQueryOptions;
-      }
-    | undefined;
-}
-
-function makeHarness(config?: {
-  readonly nativeEventLogPath?: string;
-  readonly nativeEventLogger?: ClaudeCodeAdapterLiveOptions["nativeEventLogger"];
-}): Harness {
-  const query = new FakeClaudeQuery();
-  let createInput:
-    | {
-        readonly prompt: AsyncIterable<SDKUserMessage>;
-        readonly options: ClaudeQueryOptions;
-      }
-    | undefined;
-
-  const adapterOptions: ClaudeCodeAdapterLiveOptions = {
-    createQuery: (input) => {
-      createInput = input;
-      return query;
-    },
-    ...(config?.nativeEventLogger
-      ? {
-          nativeEventLogger: config.nativeEventLogger,
-        }
-      : {}),
-    ...(config?.nativeEventLogPath
-      ? {
-          nativeEventLogPath: config.nativeEventLogPath,
-        }
-      : {}),
-  };
-
-  return {
-    layer: makeClaudeCodeAdapterLive(adapterOptions),
-    query,
-    getLastCreateQueryInput: () => createInput,
-  };
-}
-
-function makeDeterministicRandomService(seed = 0x1234_5678): {
-  nextIntUnsafe: () => number;
-  nextDoubleUnsafe: () => number;
-} {
-  let state = seed >>> 0;
-  const nextIntUnsafe = (): number => {
-    state = (Math.imul(1_664_525, state) + 1_013_904_223) >>> 0;
-    return state;
-  };
-
-  return {
-    nextIntUnsafe,
-    nextDoubleUnsafe: () => nextIntUnsafe() / 0x1_0000_0000,
-  };
-}
-
-const THREAD_ID = ThreadId.makeUnsafe("thread-claude-1");
-const RESUME_THREAD_ID = ThreadId.makeUnsafe("thread-claude-resume");
-
-describe("ClaudeCodeAdapterLive", () => {
-  it.effect("returns validation error for non-claudeCode provider on startSession", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-      const result = yield* adapter
-        .startSession({ threadId: THREAD_ID, provider: "codex", runtimeMode: "full-access" })
-        .pipe(Effect.result);
-
-      assert.equal(result._tag, "Failure");
-      if (result._tag !== "Failure") {
-        return;
-      }
-      assert.deepEqual(
-        result.failure,
-        new ProviderAdapterValidationError({
-          provider: "claudeCode",
-          operation: "startSession",
-          issue: "Expected provider 'claudeCode' but received 'codex'.",
-        }),
-      );
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("derives bypass permission mode from full-access runtime policy", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-      yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-
-      const createInput = harness.getLastCreateQueryInput();
-      assert.equal(createInput?.options.permissionMode, "bypassPermissions");
-      assert.equal(createInput?.options.allowDangerouslySkipPermissions, true);
-      assert.equal(Path.basename(createInput?.options.pathToClaudeCodeExecutable ?? ""), "cli.js");
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("keeps explicit claude permission mode over runtime-derived defaults", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-      yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-        providerOptions: {
-          claudeCode: {
-            permissionMode: "plan",
-          },
-        },
-      });
-
-      const createInput = harness.getLastCreateQueryInput();
-      assert.equal(createInput?.options.permissionMode, "plan");
-      assert.equal(createInput?.options.allowDangerouslySkipPermissions, undefined);
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("strips Electron bootstrap env vars before starting Claude query", () => {
-    const harness = makeHarness();
-    const originalRunAsNode = process.env.ELECTRON_RUN_AS_NODE;
-    const originalRendererPort = process.env.ELECTRON_RENDERER_PORT;
-    const originalClaudeCode = process.env.CLAUDECODE;
-    const originalPath = process.env.PATH;
-
-    process.env.ELECTRON_RUN_AS_NODE = "1";
-    process.env.ELECTRON_RENDERER_PORT = "54321";
-    process.env.CLAUDECODE = "1";
-    process.env.PATH = "/usr/bin:/bin";
-
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-      yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-
-      const createInput = harness.getLastCreateQueryInput();
-      assert.isDefined(createInput);
-      assert.equal(createInput?.options.env?.ELECTRON_RUN_AS_NODE, undefined);
-      assert.equal(createInput?.options.env?.ELECTRON_RENDERER_PORT, undefined);
-      assert.equal(createInput?.options.env?.CLAUDECODE, undefined);
-      assert.equal(createInput?.options.env?.PATH, "/usr/bin:/bin");
-    }).pipe(
-      Effect.ensuring(
-        Effect.sync(() => {
-          if (originalRunAsNode === undefined) {
-            delete process.env.ELECTRON_RUN_AS_NODE;
-          } else {
-            process.env.ELECTRON_RUN_AS_NODE = originalRunAsNode;
-          }
-
-          if (originalRendererPort === undefined) {
-            delete process.env.ELECTRON_RENDERER_PORT;
-          } else {
-            process.env.ELECTRON_RENDERER_PORT = originalRendererPort;
-          }
-
-          if (originalClaudeCode === undefined) {
-            delete process.env.CLAUDECODE;
-          } else {
-            process.env.CLAUDECODE = originalClaudeCode;
-          }
-
-          if (originalPath === undefined) {
-            delete process.env.PATH;
-          } else {
-            process.env.PATH = originalPath;
-          }
-        }),
-      ),
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("maps Claude stream/runtime messages to canonical provider runtime events", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 11).pipe(
-        Stream.runCollect,
-        Effect.forkChild,
-      );
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        model: "claude-sonnet-4-5",
-        runtimeMode: "full-access",
-      });
-
-      const turn = yield* adapter.sendTurn({
-        threadId: session.threadId,
-        input: "hello",
-        attachments: [],
-      });
-
-      harness.query.emit({
-        type: "stream_event",
-        session_id: "sdk-session-1",
-        uuid: "stream-1",
-        parent_tool_use_id: null,
-        event: {
-          type: "content_block_delta",
-          index: 0,
-          delta: {
-            type: "text_delta",
-            text: "Hi",
-          },
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "stream_event",
-        session_id: "sdk-session-1",
-        uuid: "stream-2",
-        parent_tool_use_id: null,
-        event: {
-          type: "content_block_start",
-          index: 1,
-          content_block: {
-            type: "tool_use",
-            id: "tool-1",
-            name: "Bash",
-            input: {
-              command: "ls",
-            },
-          },
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "stream_event",
-        session_id: "sdk-session-1",
-        uuid: "stream-3",
-        parent_tool_use_id: null,
-        event: {
-          type: "content_block_stop",
-          index: 1,
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "assistant",
-        session_id: "sdk-session-1",
-        uuid: "assistant-1",
-        parent_tool_use_id: null,
-        message: {
-          id: "assistant-message-1",
-          content: [{ type: "text", text: "Hi" }],
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "result",
-        subtype: "success",
-        is_error: false,
-        errors: [],
-        session_id: "sdk-session-1",
-        uuid: "result-1",
-      } as unknown as SDKMessage);
-
-      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
-      assert.deepEqual(
-        runtimeEvents.map((event) => event.type),
-        [
-          "session.started",
-          "session.configured",
-          "session.state.changed",
-          "turn.started",
-          "thread.started",
-          "content.delta",
-          "item.started",
-          "item.completed",
-          "item.updated",
-          "item.completed",
-          "turn.completed",
-        ],
-      );
-
-      const turnStarted = runtimeEvents[3];
-      assert.equal(turnStarted?.type, "turn.started");
-      if (turnStarted?.type === "turn.started") {
-        assert.equal(String(turnStarted.turnId), String(turn.turnId));
-      }
-
-      const deltaEvent = runtimeEvents.find((event) => event.type === "content.delta");
-      assert.equal(deltaEvent?.type, "content.delta");
-      if (deltaEvent?.type === "content.delta") {
-        assert.equal(deltaEvent.payload.delta, "Hi");
-        assert.equal(String(deltaEvent.turnId), String(turn.turnId));
-      }
-
-      const toolStarted = runtimeEvents.find((event) => event.type === "item.started");
-      assert.equal(toolStarted?.type, "item.started");
-      if (toolStarted?.type === "item.started") {
-        assert.equal(toolStarted.payload.itemType, "command_execution");
-      }
-
-      const turnCompleted = runtimeEvents[runtimeEvents.length - 1];
-      assert.equal(turnCompleted?.type, "turn.completed");
-      if (turnCompleted?.type === "turn.completed") {
-        assert.equal(String(turnCompleted.turnId), String(turn.turnId));
-        assert.equal(turnCompleted.payload.state, "completed");
-      }
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect(
-    "emits completion only after turn result when assistant frames arrive before deltas",
-    () => {
-      const harness = makeHarness();
-      return Effect.gen(function* () {
-        const adapter = yield* ClaudeCodeAdapter;
-
-        const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 9).pipe(
-          Stream.runCollect,
-          Effect.forkChild,
-        );
-
-        const session = yield* adapter.startSession({
-          threadId: THREAD_ID,
-          provider: "claudeCode",
-          runtimeMode: "full-access",
-        });
-
-        const turn = yield* adapter.sendTurn({
-          threadId: session.threadId,
-          input: "hello",
-          attachments: [],
-        });
-
-        harness.query.emit({
-          type: "assistant",
-          session_id: "sdk-session-early-assistant",
-          uuid: "assistant-early",
-          parent_tool_use_id: null,
-          message: {
-            id: "assistant-message-early",
-            content: [
-              { type: "tool_use", id: "tool-early", name: "Read", input: { path: "a.ts" } },
-            ],
-          },
-        } as unknown as SDKMessage);
-
-        harness.query.emit({
-          type: "stream_event",
-          session_id: "sdk-session-early-assistant",
-          uuid: "stream-early",
-          parent_tool_use_id: null,
-          event: {
-            type: "content_block_delta",
-            index: 0,
-            delta: {
-              type: "text_delta",
-              text: "Late text",
-            },
-          },
-        } as unknown as SDKMessage);
-
-        harness.query.emit({
-          type: "result",
-          subtype: "success",
-          is_error: false,
-          errors: [],
-          session_id: "sdk-session-early-assistant",
-          uuid: "result-early",
-        } as unknown as SDKMessage);
-
-        const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
-        assert.deepEqual(
-          runtimeEvents.map((event) => event.type),
-          [
-            "session.started",
-            "session.configured",
-            "session.state.changed",
-            "turn.started",
-            "thread.started",
-            "item.updated",
-            "content.delta",
-            "item.completed",
-            "turn.completed",
-          ],
-        );
-
-        const deltaIndex = runtimeEvents.findIndex((event) => event.type === "content.delta");
-        const completedIndex = runtimeEvents.findIndex((event) => event.type === "item.completed");
-        assert.equal(deltaIndex >= 0 && completedIndex >= 0 && deltaIndex < completedIndex, true);
-
-        const deltaEvent = runtimeEvents[deltaIndex];
-        assert.equal(deltaEvent?.type, "content.delta");
-        if (deltaEvent?.type === "content.delta") {
-          assert.equal(deltaEvent.payload.delta, "Late text");
-          assert.equal(String(deltaEvent.turnId), String(turn.turnId));
-        }
-      }).pipe(
-        Effect.provideService(Random.Random, makeDeterministicRandomService()),
-        Effect.provide(harness.layer),
-      );
-    },
-  );
-
-  it.effect("falls back to assistant payload text when stream deltas are absent", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 9).pipe(
-        Stream.runCollect,
-        Effect.forkChild,
-      );
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-
-      const turn = yield* adapter.sendTurn({
-        threadId: session.threadId,
-        input: "hello",
-        attachments: [],
-      });
-
-      harness.query.emit({
-        type: "assistant",
-        session_id: "sdk-session-fallback-text",
-        uuid: "assistant-fallback",
-        parent_tool_use_id: null,
-        message: {
-          id: "assistant-message-fallback",
-          content: [{ type: "text", text: "Fallback hello" }],
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "result",
-        subtype: "success",
-        is_error: false,
-        errors: [],
-        session_id: "sdk-session-fallback-text",
-        uuid: "result-fallback",
-      } as unknown as SDKMessage);
-
-      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
-      assert.deepEqual(
-        runtimeEvents.map((event) => event.type),
-        [
-          "session.started",
-          "session.configured",
-          "session.state.changed",
-          "turn.started",
-          "thread.started",
-          "item.updated",
-          "content.delta",
-          "item.completed",
-          "turn.completed",
-        ],
-      );
-
-      const deltaEvent = runtimeEvents.find((event) => event.type === "content.delta");
-      assert.equal(deltaEvent?.type, "content.delta");
-      if (deltaEvent?.type === "content.delta") {
-        assert.equal(deltaEvent.payload.delta, "Fallback hello");
-        assert.equal(String(deltaEvent.turnId), String(turn.turnId));
-      }
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("does not fabricate provider thread ids before first SDK session_id", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const runtimeEventsFiber = yield* Stream.take(adapter.streamEvents, 5).pipe(
-        Stream.runCollect,
-        Effect.forkChild,
-      );
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-      assert.equal(session.threadId, THREAD_ID);
-      assert.equal(
-        "resume" in (session.resumeCursor as Record<string, unknown>),
-        false,
-        "resumeCursor should not have a fabricated 'resume' (SDK session_id) before stream provides one",
-      );
-
-      const turn = yield* adapter.sendTurn({
-        threadId: session.threadId,
-        input: "hello",
-        attachments: [],
-      });
-      assert.equal(turn.threadId, THREAD_ID);
-
-      harness.query.emit({
-        type: "stream_event",
-        session_id: "sdk-thread-real",
-        uuid: "stream-thread-real",
-        parent_tool_use_id: null,
-        event: {
-          type: "message_start",
-          message: {
-            id: "msg-thread-real",
-          },
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "result",
-        subtype: "success",
-        is_error: false,
-        errors: [],
-        session_id: "sdk-thread-real",
-        uuid: "result-thread-real",
-      } as unknown as SDKMessage);
-
-      const runtimeEvents = Array.from(yield* Fiber.join(runtimeEventsFiber));
-      assert.deepEqual(
-        runtimeEvents.map((event) => event.type),
-        [
-          "session.started",
-          "session.configured",
-          "session.state.changed",
-          "turn.started",
-          "thread.started",
-        ],
-      );
-
-      const sessionStarted = runtimeEvents[0];
-      assert.equal(sessionStarted?.type, "session.started");
-      if (sessionStarted?.type === "session.started") {
-        assert.equal(sessionStarted.threadId, THREAD_ID);
-        assert.equal(
-          (sessionStarted.providerRefs as Record<string, unknown> | undefined)?.providerThreadId,
-          undefined,
-          "providerRefs should not contain a fabricated providerThreadId before stream provides one",
-        );
-      }
-
-      const threadStarted = runtimeEvents[4];
-      assert.equal(threadStarted?.type, "thread.started");
-      if (threadStarted?.type === "thread.started") {
-        assert.equal(threadStarted.threadId, THREAD_ID);
-        assert.equal(
-          threadStarted.payload.providerThreadId,
-          "sdk-thread-real",
-          "thread.started should carry the real SDK session_id in payload.providerThreadId",
-        );
-      }
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("bridges approval request/response lifecycle through canUseTool", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "approval-required",
-      });
-
-      yield* Stream.take(adapter.streamEvents, 3).pipe(Stream.runDrain);
-
-      const createInput = harness.getLastCreateQueryInput();
-      const canUseTool = createInput?.options.canUseTool;
-      assert.equal(typeof canUseTool, "function");
-      if (!canUseTool) {
-        return;
-      }
-
-      const permissionPromise = canUseTool(
-        "Bash",
-        { command: "pwd" },
-        {
-          signal: new AbortController().signal,
-          suggestions: [
-            {
-              type: "setMode",
-              mode: "default",
-              destination: "session",
-            },
-          ],
-          toolUseID: "tool-use-1",
-        },
-      );
-
-      const requested = yield* Stream.runHead(adapter.streamEvents);
-      assert.equal(requested._tag, "Some");
-      if (requested._tag !== "Some") {
-        return;
-      }
-      assert.equal(requested.value.type, "request.opened");
-      if (requested.value.type !== "request.opened") {
-        return;
-      }
-      const runtimeRequestId = requested.value.requestId;
-      assert.equal(typeof runtimeRequestId, "string");
-      if (runtimeRequestId === undefined) {
-        return;
-      }
-
-      yield* adapter.respondToRequest(
-        session.threadId,
-        ApprovalRequestId.makeUnsafe(runtimeRequestId),
-        "accept",
-      );
-
-      const resolved = yield* Stream.runHead(adapter.streamEvents);
-      assert.equal(resolved._tag, "Some");
-      if (resolved._tag !== "Some") {
-        return;
-      }
-      assert.equal(resolved.value.type, "request.resolved");
-      if (resolved.value.type !== "request.resolved") {
-        return;
-      }
-      assert.equal(resolved.value.requestId, requested.value.requestId);
-      assert.equal(resolved.value.payload.decision, "accept");
-
-      const permissionResult = yield* Effect.promise(() => permissionPromise);
-      assert.equal((permissionResult as PermissionResult).behavior, "allow");
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("passes parsed resume cursor values to Claude query options", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const session = yield* adapter.startSession({
-        threadId: RESUME_THREAD_ID,
-        provider: "claudeCode",
-        resumeCursor: {
-          threadId: "resume-thread-1",
-          resume: "550e8400-e29b-41d4-a716-446655440000",
-          resumeSessionAt: "assistant-99",
-          turnCount: 3,
-        },
-        runtimeMode: "full-access",
-      });
-
-      assert.equal(session.threadId, "resume-thread-1");
-      assert.deepEqual(session.resumeCursor, {
-        threadId: "resume-thread-1",
-        resume: "550e8400-e29b-41d4-a716-446655440000",
-        resumeSessionAt: "assistant-99",
-        turnCount: 3,
-      });
-
-      const createInput = harness.getLastCreateQueryInput();
-      assert.equal(createInput?.options.resume, "550e8400-e29b-41d4-a716-446655440000");
-      assert.equal(createInput?.options.resumeSessionAt, "assistant-99");
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("does not synthesize resume session id from generated thread ids", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-
-      assert.equal("resume" in (session.resumeCursor as Record<string, unknown>), false);
-
-      const createInput = harness.getLastCreateQueryInput();
-      assert.equal(createInput?.options.resume, undefined);
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect(
-    "rollbackThread returns ProviderAdapterRequestError because Claude Code does not support rewinding",
-    () => {
-      const harness = makeHarness();
-      return Effect.gen(function* () {
-        const adapter = yield* ClaudeCodeAdapter;
-
-        const session = yield* adapter.startSession({
-          threadId: THREAD_ID,
-          provider: "claudeCode",
-          runtimeMode: "full-access",
-        });
-
-        const result = yield* adapter.rollbackThread(session.threadId, 1).pipe(Effect.flip);
-        assert.equal(result._tag, "ProviderAdapterRequestError");
-        if (result._tag === "ProviderAdapterRequestError") {
-          assert.equal(result.method, "thread.rollback");
-          assert.ok(result.detail?.includes("not supported"));
-        }
-      }).pipe(
-        Effect.provideService(Random.Random, makeDeterministicRandomService()),
-        Effect.provide(harness.layer),
-      );
-    },
-  );
-
-  it.effect("updates model on sendTurn when model override is provided", () => {
-    const harness = makeHarness();
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-      yield* adapter.sendTurn({
-        threadId: session.threadId,
-        input: "hello",
-        model: "claude-opus-4-6",
-        attachments: [],
-      });
-
-      assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6"]);
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-
-  it.effect("writes provider-native observability records when enabled", () => {
-    const nativeEvents: Array<{
-      event?: {
-        provider?: string;
-        method?: string;
-        threadId?: string;
-        turnId?: string;
-      };
-    }> = [];
-    const harness = makeHarness({
-      nativeEventLogger: {
-        filePath: "memory://claude-native-events",
-        write: (event) => {
-          nativeEvents.push(event as (typeof nativeEvents)[number]);
-          return Effect.void;
-        },
-        close: () => Effect.void,
-      },
-    });
-    return Effect.gen(function* () {
-      const adapter = yield* ClaudeCodeAdapter;
-
-      const session = yield* adapter.startSession({
-        threadId: THREAD_ID,
-        provider: "claudeCode",
-        runtimeMode: "full-access",
-      });
-      const turn = yield* adapter.sendTurn({
-        threadId: session.threadId,
-        input: "hello",
-        attachments: [],
-      });
-
-      const turnCompletedFiber = yield* Stream.filter(
-        adapter.streamEvents,
-        (event) => event.type === "turn.completed",
-      ).pipe(Stream.runHead, Effect.forkChild);
-
-      harness.query.emit({
-        type: "stream_event",
-        session_id: "sdk-session-native-log",
-        uuid: "stream-native-log",
-        parent_tool_use_id: null,
-        event: {
-          type: "content_block_delta",
-          index: 0,
-          delta: {
-            type: "text_delta",
-            text: "hi",
-          },
-        },
-      } as unknown as SDKMessage);
-
-      harness.query.emit({
-        type: "result",
-        subtype: "success",
-        is_error: false,
-        errors: [],
-        session_id: "sdk-session-native-log",
-        uuid: "result-native-log",
-      } as unknown as SDKMessage);
-
-      const turnCompleted = yield* Fiber.join(turnCompletedFiber);
-      assert.equal(turnCompleted._tag, "Some");
-
-      assert.equal(nativeEvents.length > 0, true);
-      assert.equal(
-        nativeEvents.some((record) => record.event?.provider === "claudeCode"),
-        true,
-      );
-      assert.equal(
-        nativeEvents.some((record) => String(record.event?.threadId) === String(session.threadId)),
-        true,
-      );
-      assert.equal(
-        nativeEvents.some((record) => String(record.event?.turnId) === String(turn.turnId)),
-        true,
-      );
-      assert.equal(
-        nativeEvents.some(
-          (record) => record.event?.method === "claude/stream_event/content_block_delta/text_delta",
-        ),
-        true,
-      );
-    }).pipe(
-      Effect.provideService(Random.Random, makeDeterministicRandomService()),
-      Effect.provide(harness.layer),
-    );
-  });
-});
diff --git a/apps/server/src/provider/Layers/ClaudeSdkFastMode.probe.test.ts b/apps/server/src/provider/Layers/ClaudeSdkFastMode.probe.test.ts
new file mode 100644
index 0000000000..ca6c9b44f2
--- /dev/null
+++ b/apps/server/src/provider/Layers/ClaudeSdkFastMode.probe.test.ts
@@ -0,0 +1,149 @@
+import { EventEmitter } from "node:events";
+import { PassThrough } from "node:stream";
+import { query, type SpawnOptions, type SpawnedProcess } from "@anthropic-ai/claude-agent-sdk";
+import { afterEach, describe, expect, it } from "vitest";
+
+async function* emptyPrompt(): AsyncGenerator<never, void, void> {}
+
+class FakeClaudeCodeProcess implements SpawnedProcess {
+  readonly stdin = new PassThrough();
+  readonly stdout = new PassThrough();
+  killed = false;
+  exitCode: number | null = null;
+
+  private readonly events = new EventEmitter();
+  private bufferedInput = "";
+
+  constructor(
+    private readonly onMessage: (
+      message: Record<string, unknown>,
+      process: FakeClaudeCodeProcess,
+    ) => void,
+  ) {
+    this.stdin.setEncoding("utf8");
+    this.stdin.on("data", (chunk: string) => {
+      this.bufferedInput += chunk;
+      this.drainInput();
+    });
+  }
+
+  emitJson(message: unknown): void {
+    this.stdout.write(`${JSON.stringify(message)}\n`);
+  }
+
+  kill(_signal: NodeJS.Signals): boolean {
+    this.killed = true;
+    this.exitCode = 0;
+    this.stdout.end();
+    this.events.emit("exit", 0, null);
+    return true;
+  }
+
+  on(
+    event: "exit" | "error",
+    listener:
+      | ((code: number | null, signal: NodeJS.Signals | null) => void)
+      | ((error: Error) => void),
+  ): void {
+    this.events.on(event, listener);
+  }
+
+  once(
+    event: "exit" | "error",
+    listener:
+      | ((code: number | null, signal: NodeJS.Signals | null) => void)
+      | ((error: Error) => void),
+  ): void {
+    this.events.once(event, listener);
+  }
+
+  off(
+    event: "exit" | "error",
+    listener:
+      | ((code: number | null, signal: NodeJS.Signals | null) => void)
+      | ((error: Error) => void),
+  ): void {
+    this.events.off(event, listener);
+  }
+
+  private drainInput(): void {
+    while (true) {
+      const newlineIndex = this.bufferedInput.indexOf("\n");
+      if (newlineIndex === -1) {
+        return;
+      }
+      const line = this.bufferedInput.slice(0, newlineIndex).trim();
+      this.bufferedInput = this.bufferedInput.slice(newlineIndex + 1);
+      if (line.length === 0) {
+        continue;
+      }
+      this.onMessage(JSON.parse(line) as Record<string, unknown>, this);
+    }
+  }
+}
+
+describe("Claude SDK fast mode probe", () => {
+  let activeQuery: ReturnType<typeof query> | null = null;
+
+  afterEach(() => {
+    activeQuery?.close?.();
+    activeQuery = null;
+  });
+
+  it("passes fast mode through the SDK settings flag", async () => {
+    let spawnOptions: SpawnOptions | undefined;
+
+    activeQuery = query({
+      prompt: emptyPrompt(),
+      options: {
+        persistSession: false,
+        settings: {
+          fastMode: true,
+        },
+        spawnClaudeCodeProcess: (options): SpawnedProcess => {
+          spawnOptions = options;
+          return new FakeClaudeCodeProcess((message, process) => {
+            if (
+              message.type !== "control_request" ||
+              typeof message.request_id !== "string" ||
+              !message.request ||
+              typeof message.request !== "object" ||
+              (message.request as { subtype?: unknown }).subtype !== "initialize"
+            ) {
+              return;
+            }
+
+            process.emitJson({
+              type: "control_response",
+              response: {
+                subtype: "success",
+                request_id: message.request_id,
+                response: {
+                  commands: [],
+                  agents: [],
+                  output_style: "default",
+                  available_output_styles: ["default"],
+                  models: [],
+                  account: {
+                    subscriptionType: "max",
+                  },
+                  fast_mode_state: "on",
+                },
+              },
+            });
+          });
+        },
+      },
+    });
+
+    const initialization = await activeQuery.initializationResult!();
+    expect(initialization.fast_mode_state).toBe("on");
+
+    expect(spawnOptions).toBeDefined();
+    const settingsFlagIndex = spawnOptions?.args.indexOf("--settings") ?? -1;
+    expect(settingsFlagIndex).toBeGreaterThan(-1);
+    expect(JSON.parse(spawnOptions?.args[settingsFlagIndex + 1] ?? "")).toEqual({
+      fastMode: true,
+    });
+  });
+});
diff --git a/apps/server/src/provider/Layers/CodexAdapter.test.ts b/apps/server/src/provider/Layers/CodexAdapter.test.ts
index 394b275456..cc9ae0bc8b 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.test.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.test.ts
@@ -172,7 +172,7 @@ validationLayer("CodexAdapterLive validation", (it) => {
       const adapter = yield* CodexAdapter;
       const result = yield* adapter
         .startSession({
-          provider: "claudeCode",
+          provider: "claudeAgent",
           threadId: asThreadId("thread-1"),
           runtimeMode: "full-access",
         })
@@ -184,7 +184,7 @@ validationLayer("CodexAdapterLive validation", (it) => {
         new ProviderAdapterValidationError({
           provider: "codex",
           operation: "startSession",
-          issue: "Expected provider 'codex' but received 'claudeCode'.",
+          issue: "Expected provider 'codex' but received 'claudeAgent'.",
         }),
       );
       assert.equal(validationManager.startSessionImpl.mock.calls.length, 0);
@@ -845,6 +845,45 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
       }
     }),
   );
+
+  it.effect("prefers manager-assigned turn ids for Codex task events", () =>
+    Effect.gen(function* () {
+      const adapter = yield* CodexAdapter;
+      const firstEventFiber = yield* Stream.runHead(adapter.streamEvents).pipe(Effect.forkChild);
+
+      lifecycleManager.emit("event", {
+        id: asEventId("evt-codex-task-started-parent-turn"),
+        kind: "notification",
+        provider: "codex",
+        threadId: asThreadId("thread-1"),
+        turnId: asTurnId("turn-parent"),
+        createdAt: new Date().toISOString(),
+        method: "codex/event/task_started",
+        payload: {
+          id: "turn-child",
+          msg: {
+            type: "task_started",
+            turn_id: "turn-child",
+            collaboration_mode_kind: "default",
+          },
+          conversationId: "child-provider-thread",
+        },
+      } satisfies ProviderEvent);
+
+      const firstEvent = yield* Fiber.join(firstEventFiber);
+      assert.equal(firstEvent._tag, "Some");
+      if (firstEvent._tag !== "Some") {
+        return;
+      }
+      assert.equal(firstEvent.value.type, "task.started");
+      if (firstEvent.value.type !== "task.started") {
+        return;
+      }
+      assert.equal(firstEvent.value.turnId, "turn-parent");
+      assert.equal(firstEvent.value.providerRefs?.providerTurnId, "turn-parent");
+      assert.equal(firstEvent.value.payload.taskId, "turn-child");
+    }),
+  );
 });
 
 afterAll(() => {
diff --git a/apps/server/src/provider/Layers/CodexAdapter.ts b/apps/server/src/provider/Layers/CodexAdapter.ts
index 7317fdea84..13be631b58 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.ts
@@ -107,6 +107,14 @@ function asNumber(value: unknown): number | undefined {
   return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
 
+function toTurnId(value: string | undefined): TurnId | undefined {
+  return value?.trim() ? TurnId.makeUnsafe(value) : undefined;
+}
+
+function toProviderItemId(value: string | undefined): ProviderItemId | undefined {
+  return value?.trim() ? ProviderItemId.makeUnsafe(value) : undefined;
+}
+
 function toTurnStatus(value: unknown): "completed" | "failed" | "cancelled" | "interrupted" {
   switch (value) {
     case "completed":
@@ -413,27 +421,27 @@ function codexEventBase(
 ): Omit<ProviderRuntimeEvent, "type" | "payload"> {
   const payload = asObject(event.payload);
   const msg = codexEventMessage(payload);
-  const turnId = asString(msg?.turn_id) ?? asString(msg?.turnId);
-  const itemId = asString(msg?.item_id) ?? asString(msg?.itemId);
+  const turnId = event.turnId ?? toTurnId(asString(msg?.turn_id) ?? asString(msg?.turnId));
+  const itemId = event.itemId ?? toProviderItemId(asString(msg?.item_id) ?? asString(msg?.itemId));
   const requestId = asString(msg?.request_id) ?? asString(msg?.requestId);
   const base = runtimeEventBase(event, canonicalThreadId);
   const providerRefs = base.providerRefs
     ? {
         ...base.providerRefs,
         ...(turnId ? { providerTurnId: turnId } : {}),
-        ...(itemId ? { providerItemId: ProviderItemId.makeUnsafe(itemId) } : {}),
+        ...(itemId ? { providerItemId: itemId } : {}),
         ...(requestId ? { providerRequestId: requestId } : {}),
       }
     : {
         ...(turnId ? { providerTurnId: turnId } : {}),
-        ...(itemId ? { providerItemId: ProviderItemId.makeUnsafe(itemId) } : {}),
+        ...(itemId ? { providerItemId: itemId } : {}),
         ...(requestId ? { providerRequestId: requestId } : {}),
       };
 
   return {
     ...base,
-    ...(turnId ? { turnId: TurnId.makeUnsafe(turnId) } : {}),
-    ...(itemId ? { itemId: asRuntimeItemId(ProviderItemId.makeUnsafe(itemId)) } : {}),
+    ...(turnId ? { turnId } : {}),
+    ...(itemId ? { itemId: asRuntimeItemId(itemId) } : {}),
     ...(requestId ? { requestId: asRuntimeRequestId(requestId) } : {}),
     ...(Object.keys(providerRefs).length > 0 ? { providerRefs } : {}),
   };
diff --git a/apps/server/src/provider/Layers/ProviderAdapterConformance.test.ts b/apps/server/src/provider/Layers/ProviderAdapterConformance.test.ts
index ec40f84752..a3bcee6758 100644
--- a/apps/server/src/provider/Layers/ProviderAdapterConformance.test.ts
+++ b/apps/server/src/provider/Layers/ProviderAdapterConformance.test.ts
@@ -7,7 +7,7 @@ import { AmpServerManager } from "../../ampServerManager.ts";
 import { GeminiCliServerManager } from "../../geminiCliServerManager.ts";
 import { ServerConfig } from "../../config.ts";
 import { makeAmpAdapterLive } from "./AmpAdapter.ts";
-import { makeClaudeCodeAdapterLive } from "./ClaudeCodeAdapter.ts";
+import { makeClaudeAdapterLive } from "./ClaudeAdapter.ts";
 import { makeCodexAdapterLive } from "./CodexAdapter.ts";
 import { makeCopilotAdapterLive } from "./CopilotAdapter.ts";
 import { makeCursorAdapterLive } from "./CursorAdapter.ts";
@@ -18,7 +18,7 @@ import {
   validateProviderAdapterConformance,
 } from "../Services/ProviderAdapter.ts";
 import { AmpAdapter } from "../Services/AmpAdapter.ts";
-import { ClaudeCodeAdapter } from "../Services/ClaudeCodeAdapter.ts";
+import { ClaudeAdapter } from "../Services/ClaudeAdapter.ts";
 import { CodexAdapter } from "../Services/CodexAdapter.ts";
 import { CopilotAdapter } from "../Services/CopilotAdapter.ts";
 import { CursorAdapter } from "../Services/CursorAdapter.ts";
@@ -57,7 +57,7 @@ const copilotLayer = makeCopilotAdapterLive({
   Layer.provideMerge(NodeServices.layer),
 );
 
-const claudeLayer = makeClaudeCodeAdapterLive({
+const claudeLayer = makeClaudeAdapterLive({
   createQuery: () =>
     ({
       [Symbol.asyncIterator]: async function* () {
@@ -69,7 +69,10 @@ const claudeLayer = makeClaudeCodeAdapterLive({
       setMaxThinkingTokens: async () => undefined,
       close: () => undefined,
     }) as never,
-});
+}).pipe(
+  Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),
+  Layer.provideMerge(NodeServices.layer),
+);
 
 const cursorLayer = makeCursorAdapterLive({
   createProcess: () => ({}) as never,
@@ -104,11 +107,11 @@ describe("provider adapter conformance", () => {
         ),
     },
     {
-      provider: "claudeCode" as const,
+      provider: "claudeAgent" as const,
       load: () =>
         Effect.runPromise(
           Effect.gen(function* () {
-            return yield* ClaudeCodeAdapter;
+            return yield* ClaudeAdapter;
           }).pipe(Effect.provide(claudeLayer)),
         ),
     },
diff --git a/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts b/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
index 6b52803dd3..cce8d43c9c 100644
--- a/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
+++ b/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
@@ -5,7 +5,7 @@ import type { ProviderKind } from "@t3tools/contracts";
 import { Effect, Layer, Stream } from "effect";
 
 import { ProviderUnsupportedError } from "../Errors.ts";
-import { ClaudeCodeAdapter, type ClaudeCodeAdapterShape } from "../Services/ClaudeCodeAdapter.ts";
+import { ClaudeAdapter, type ClaudeAdapterShape } from "../Services/ClaudeAdapter.ts";
 import { CopilotAdapter, type CopilotAdapterShape } from "../Services/CopilotAdapter.ts";
 import { CodexAdapter, type CodexAdapterShape } from "../Services/CodexAdapter.ts";
 import { CursorAdapter, type CursorAdapterShape } from "../Services/CursorAdapter.ts";
@@ -34,9 +34,9 @@ const fakeCodexAdapter: CodexAdapterShape = {
   streamEvents: Stream.empty,
 };
 
-const fakeClaudeAdapter: ClaudeCodeAdapterShape = {
-  provider: "claudeCode",
-  capabilities: getProviderCapabilities("claudeCode"),
+const fakeClaudeAdapter: ClaudeAdapterShape = {
+  provider: "claudeAgent",
+  capabilities: getProviderCapabilities("claudeAgent"),
   startSession: vi.fn(),
   sendTurn: vi.fn(),
   interruptTurn: vi.fn(),
@@ -159,7 +159,7 @@ const layer = it.layer(
       Layer.mergeAll(
         Layer.succeed(CodexAdapter, fakeCodexAdapter),
         Layer.succeed(CopilotAdapter, fakeCopilotAdapter),
-        Layer.succeed(ClaudeCodeAdapter, fakeClaudeAdapter),
+        Layer.succeed(ClaudeAdapter, fakeClaudeAdapter),
         Layer.succeed(CursorAdapter, fakeCursorAdapter),
         Layer.succeed(OpenCodeAdapter, fakeOpenCodeAdapter),
         Layer.succeed(GeminiCliAdapter, fakeGeminiCliAdapter),
@@ -177,7 +177,7 @@ layer("ProviderAdapterRegistryLive", (it) => {
       const registry = yield* ProviderAdapterRegistry;
       const codex = yield* registry.getByProvider("codex");
       const copilot = yield* registry.getByProvider("copilot");
-      const claude = yield* registry.getByProvider("claudeCode");
+      const claude = yield* registry.getByProvider("claudeAgent");
       const cursor = yield* registry.getByProvider("cursor");
       const opencode = yield* registry.getByProvider("opencode");
       const geminiCli = yield* registry.getByProvider("geminiCli");
@@ -197,7 +197,7 @@ layer("ProviderAdapterRegistryLive", (it) => {
       assert.deepEqual(providers, [
         "codex",
         "copilot",
-        "claudeCode",
+        "claudeAgent",
         "cursor",
         "opencode",
         "geminiCli",
diff --git a/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts b/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
index aed87db0ac..fdee2162b1 100644
--- a/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
+++ b/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
@@ -1,7 +1,7 @@
 /**
  * ProviderAdapterRegistryLive - In-memory provider adapter lookup layer.
  *
- * Binds provider kinds (codex/cursor/...) to concrete adapter services.
+ * Binds provider kinds (codex/claudeAgent/...) to concrete adapter services.
  * This layer only performs adapter lookup; it does not route session-scoped
  * calls or own provider lifecycle workflows.
  *
@@ -16,7 +16,7 @@ import {
   ProviderAdapterRegistry,
   type ProviderAdapterRegistryShape,
 } from "../Services/ProviderAdapterRegistry.ts";
-import { ClaudeCodeAdapter } from "../Services/ClaudeCodeAdapter.ts";
+import { ClaudeAdapter } from "../Services/ClaudeAdapter.ts";
 import { CopilotAdapter } from "../Services/CopilotAdapter.ts";
 import { CodexAdapter } from "../Services/CodexAdapter.ts";
 import { CursorAdapter } from "../Services/CursorAdapter.ts";
@@ -37,7 +37,7 @@ const makeProviderAdapterRegistry = (options?: ProviderAdapterRegistryLiveOption
         : [
             yield* CodexAdapter,
             yield* CopilotAdapter,
-            yield* ClaudeCodeAdapter,
+            yield* ClaudeAdapter,
             yield* CursorAdapter,
             yield* OpenCodeAdapter,
             yield* GeminiCliAdapter,
diff --git a/apps/server/src/provider/Layers/ProviderHealth.test.ts b/apps/server/src/provider/Layers/ProviderHealth.test.ts
index 10bd12a7cf..e24f07bcfa 100644
--- a/apps/server/src/provider/Layers/ProviderHealth.test.ts
+++ b/apps/server/src/provider/Layers/ProviderHealth.test.ts
@@ -5,9 +5,11 @@ import * as PlatformError from "effect/PlatformError";
 import { ChildProcessSpawner } from "effect/unstable/process";
 
 import {
+  checkClaudeProviderStatus,
   checkCodexProviderStatus,
   hasCustomModelProvider,
   parseAuthStatusFromOutput,
+  parseClaudeAuthStatusFromOutput,
   readCodexConfigModelProvider,
 } from "./ProviderHealth";
 
@@ -464,4 +466,175 @@ it.layer(NodeServices.layer)("ProviderHealth", (it) => {
       }),
     );
   });
+
+  // ── checkClaudeProviderStatus tests ──────────────────────────
+
+  describe("checkClaudeProviderStatus", () => {
+    it.effect("returns ready when claude is installed and authenticated", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "ready");
+        assert.strictEqual(status.available, true);
+        assert.strictEqual(status.authStatus, "authenticated");
+      }).pipe(
+        Effect.provide(
+          mockSpawnerLayer((args) => {
+            const joined = args.join(" ");
+            if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 };
+            if (joined === "auth status")
+              return {
+                stdout: '{"loggedIn":true,"authMethod":"claude.ai"}\n',
+                stderr: "",
+                code: 0,
+              };
+            throw new Error(`Unexpected args: ${joined}`);
+          }),
+        ),
+      ),
+    );
+
+    it.effect("returns unavailable when claude is missing", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "error");
+        assert.strictEqual(status.available, false);
+        assert.strictEqual(status.authStatus, "unknown");
+        assert.strictEqual(
+          status.message,
+          "Claude Agent CLI (`claude`) is not installed or not on PATH.",
+        );
+      }).pipe(Effect.provide(failingSpawnerLayer("spawn claude ENOENT"))),
+    );
+
+    it.effect("returns error when version check fails with non-zero exit code", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "error");
+        assert.strictEqual(status.available, false);
+      }).pipe(
+        Effect.provide(
+          mockSpawnerLayer((args) => {
+            const joined = args.join(" ");
+            if (joined === "--version")
+              return { stdout: "", stderr: "Something went wrong", code: 1 };
+            throw new Error(`Unexpected args: ${joined}`);
+          }),
+        ),
+      ),
+    );
+
+    it.effect("returns unauthenticated when auth status reports not logged in", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "error");
+        assert.strictEqual(status.available, true);
+        assert.strictEqual(status.authStatus, "unauthenticated");
+        assert.strictEqual(
+          status.message,
+          "Claude is not authenticated. Run `claude auth login` and try again.",
+        );
+      }).pipe(
+        Effect.provide(
+          mockSpawnerLayer((args) => {
+            const joined = args.join(" ");
+            if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 };
+            if (joined === "auth status")
+              return {
+                stdout: '{"loggedIn":false}\n',
+                stderr: "",
+                code: 1,
+              };
+            throw new Error(`Unexpected args: ${joined}`);
+          }),
+        ),
+      ),
+    );
+
+    it.effect("returns unauthenticated when output includes 'not logged in'", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "error");
+        assert.strictEqual(status.available, true);
+        assert.strictEqual(status.authStatus, "unauthenticated");
+      }).pipe(
+        Effect.provide(
+          mockSpawnerLayer((args) => {
+            const joined = args.join(" ");
+            if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 };
+            if (joined === "auth status") return { stdout: "Not logged in\n", stderr: "", code: 1 };
+            throw new Error(`Unexpected args: ${joined}`);
+          }),
+        ),
+      ),
+    );
+
+    it.effect("returns warning when auth status command is unsupported", () =>
+      Effect.gen(function* () {
+        const status = yield* checkClaudeProviderStatus;
+        assert.strictEqual(status.provider, "claudeAgent");
+        assert.strictEqual(status.status, "warning");
+        assert.strictEqual(status.available, true);
+        assert.strictEqual(status.authStatus, "unknown");
+        assert.strictEqual(
+          status.message,
+          "Claude Agent authentication status command is unavailable in this version of Claude.",
+        );
+      }).pipe(
+        Effect.provide(
+          mockSpawnerLayer((args) => {
+            const joined = args.join(" ");
+            if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 };
+            if (joined === "auth status")
+              return { stdout: "", stderr: "error: unknown command 'auth'", code: 2 };
+            throw new Error(`Unexpected args: ${joined}`);
+          }),
+        ),
+      ),
+    );
+  });
+
+  // ── parseClaudeAuthStatusFromOutput pure tests ────────────────────
+
+  describe("parseClaudeAuthStatusFromOutput", () => {
+    it("exit code 0 with no auth markers is ready", () => {
+      const parsed = parseClaudeAuthStatusFromOutput({ stdout: "OK\n", stderr: "", code: 0 });
+      assert.strictEqual(parsed.status, "ready");
+      assert.strictEqual(parsed.authStatus, "authenticated");
+    });
+
+    it("JSON with loggedIn=true is authenticated", () => {
+      const parsed = parseClaudeAuthStatusFromOutput({
+        stdout: '{"loggedIn":true,"authMethod":"claude.ai"}\n',
+        stderr: "",
+        code: 0,
+      });
+      assert.strictEqual(parsed.status, "ready");
+      assert.strictEqual(parsed.authStatus, "authenticated");
+    });
+
+    it("JSON with loggedIn=false is unauthenticated", () => {
+      const parsed = parseClaudeAuthStatusFromOutput({
+        stdout: '{"loggedIn":false}\n',
+        stderr: "",
+        code: 0,
+      });
+      assert.strictEqual(parsed.status, "error");
+      assert.strictEqual(parsed.authStatus, "unauthenticated");
+    });
+
+    it("JSON without auth marker is warning", () => {
+      const parsed = parseClaudeAuthStatusFromOutput({
+        stdout: '{"ok":true}\n',
+        stderr: "",
+        code: 0,
+      });
+      assert.strictEqual(parsed.status, "warning");
+      assert.strictEqual(parsed.authStatus, "unknown");
+    });
+  });
 });
diff --git a/apps/server/src/provider/Layers/ProviderHealth.ts b/apps/server/src/provider/Layers/ProviderHealth.ts
index 777839c97e..86c0050ca2 100644
--- a/apps/server/src/provider/Layers/ProviderHealth.ts
+++ b/apps/server/src/provider/Layers/ProviderHealth.ts
@@ -43,6 +43,7 @@ const DEFAULT_TIMEOUT_MS = 4_000;
 const CODEX_PROVIDER = "codex" as const;
 const GEMINI_CLI_PROVIDER = "geminiCli" as const;
 const COPILOT_PROVIDER = "copilot" as const;
+const CLAUDE_AGENT_PROVIDER = "claudeAgent" as const;
 
 // ── Pure helpers ────────────────────────────────────────────────────
 
@@ -61,12 +62,7 @@ function nonEmptyTrimmed(value: string | undefined): string | undefined {
 function isCommandMissingCause(error: unknown): boolean {
   if (!(error instanceof Error)) return false;
   const lower = error.message.toLowerCase();
-  return (
-    lower.includes("command not found: codex") ||
-    lower.includes("spawn codex enoent") ||
-    lower.includes("enoent") ||
-    lower.includes("notfound")
-  );
+  return lower.includes("enoent") || lower.includes("notfound");
 }
 
 function detailFromResult(
@@ -283,6 +279,27 @@ const runCodexCommand = (args: ReadonlyArray<string>) =>
     return { stdout, stderr, code: exitCode } satisfies CommandResult;
   }).pipe(Effect.scoped);
 
+const runClaudeCommand = (args: ReadonlyArray<string>) =>
+  Effect.gen(function* () {
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    const command = ChildProcess.make("claude", [...args], {
+      shell: process.platform === "win32",
+    });
+
+    const child = yield* spawner.spawn(command);
+
+    const [stdout, stderr, exitCode] = yield* Effect.all(
+      [
+        collectStreamAsString(child.stdout),
+        collectStreamAsString(child.stderr),
+        child.exitCode.pipe(Effect.map(Number)),
+      ],
+      { concurrency: "unbounded" },
+    );
+
+    return { stdout, stderr, code: exitCode } satisfies CommandResult;
+  }).pipe(Effect.scoped);
+
 // ── Health check ────────────────────────────────────────────────────
 
 export const checkCodexProviderStatus: Effect.Effect<
@@ -679,13 +696,197 @@ export const checkCopilotProviderStatus: Effect.Effect<ServerProviderStatus> = E
   },
 );
 
+// ── Claude Agent health check ───────────────────────────────────────
+
+export function parseClaudeAuthStatusFromOutput(result: CommandResult): {
+  readonly status: ServerProviderStatusState;
+  readonly authStatus: ServerProviderAuthStatus;
+  readonly message?: string;
+} {
+  const lowerOutput = `${result.stdout}\n${result.stderr}`.toLowerCase();
+
+  if (
+    lowerOutput.includes("unknown command") ||
+    lowerOutput.includes("unrecognized command") ||
+    lowerOutput.includes("unexpected argument")
+  ) {
+    return {
+      status: "warning",
+      authStatus: "unknown",
+      message:
+        "Claude Agent authentication status command is unavailable in this version of Claude.",
+    };
+  }
+
+  if (
+    lowerOutput.includes("not logged in") ||
+    lowerOutput.includes("login required") ||
+    lowerOutput.includes("authentication required") ||
+    lowerOutput.includes("run `claude login`") ||
+    lowerOutput.includes("run claude login")
+  ) {
+    return {
+      status: "error",
+      authStatus: "unauthenticated",
+      message: "Claude is not authenticated. Run `claude auth login` and try again.",
+    };
+  }
+
+  // `claude auth status` returns JSON with a `loggedIn` boolean.
+  const parsedAuth = (() => {
+    const trimmed = result.stdout.trim();
+    if (!trimmed || (!trimmed.startsWith("{") && !trimmed.startsWith("["))) {
+      return { attemptedJsonParse: false as const, auth: undefined as boolean | undefined };
+    }
+    try {
+      return {
+        attemptedJsonParse: true as const,
+        auth: extractAuthBoolean(JSON.parse(trimmed)),
+      };
+    } catch {
+      return { attemptedJsonParse: false as const, auth: undefined as boolean | undefined };
+    }
+  })();
+
+  if (parsedAuth.auth === true) {
+    return { status: "ready", authStatus: "authenticated" };
+  }
+  if (parsedAuth.auth === false) {
+    return {
+      status: "error",
+      authStatus: "unauthenticated",
+      message: "Claude is not authenticated. Run `claude auth login` and try again.",
+    };
+  }
+  if (parsedAuth.attemptedJsonParse) {
+    return {
+      status: "warning",
+      authStatus: "unknown",
+      message:
+        "Could not verify Claude authentication status from JSON output (missing auth marker).",
+    };
+  }
+  if (result.code === 0) {
+    return { status: "ready", authStatus: "authenticated" };
+  }
+
+  const detail = detailFromResult(result);
+  return {
+    status: "warning",
+    authStatus: "unknown",
+    message: detail
+      ? `Could not verify Claude authentication status. ${detail}`
+      : "Could not verify Claude authentication status.",
+  };
+}
+
+export const checkClaudeProviderStatus: Effect.Effect<
+  ServerProviderStatus,
+  never,
+  ChildProcessSpawner.ChildProcessSpawner
+> = Effect.gen(function* () {
+  const checkedAt = new Date().toISOString();
+
+  // Probe 1: `claude --version` — is the CLI reachable?
+  const versionProbe = yield* runClaudeCommand(["--version"]).pipe(
+    Effect.timeoutOption(DEFAULT_TIMEOUT_MS),
+    Effect.result,
+  );
+
+  if (Result.isFailure(versionProbe)) {
+    const error = versionProbe.failure;
+    return {
+      provider: CLAUDE_AGENT_PROVIDER,
+      status: "error" as const,
+      available: false,
+      authStatus: "unknown" as const,
+      checkedAt,
+      message: isCommandMissingCause(error)
+        ? "Claude Agent CLI (`claude`) is not installed or not on PATH."
+        : `Failed to execute Claude Agent CLI health check: ${error instanceof Error ? error.message : String(error)}.`,
+    };
+  }
+
+  if (Option.isNone(versionProbe.success)) {
+    return {
+      provider: CLAUDE_AGENT_PROVIDER,
+      status: "error" as const,
+      available: false,
+      authStatus: "unknown" as const,
+      checkedAt,
+      message: "Claude Agent CLI is installed but failed to run. Timed out while running command.",
+    };
+  }
+
+  const version = versionProbe.success.value;
+  if (version.code !== 0) {
+    const detail = detailFromResult(version);
+    return {
+      provider: CLAUDE_AGENT_PROVIDER,
+      status: "error" as const,
+      available: false,
+      authStatus: "unknown" as const,
+      checkedAt,
+      message: detail
+        ? `Claude Agent CLI is installed but failed to run. ${detail}`
+        : "Claude Agent CLI is installed but failed to run.",
+    };
+  }
+
+  // Probe 2: `claude auth status` — is the user authenticated?
+  const authProbe = yield* runClaudeCommand(["auth", "status"]).pipe(
+    Effect.timeoutOption(DEFAULT_TIMEOUT_MS),
+    Effect.result,
+  );
+
+  if (Result.isFailure(authProbe)) {
+    const error = authProbe.failure;
+    return {
+      provider: CLAUDE_AGENT_PROVIDER,
+      status: "warning" as const,
+      available: true,
+      authStatus: "unknown" as const,
+      checkedAt,
+      message:
+        error instanceof Error
+          ? `Could not verify Claude authentication status: ${error.message}.`
+          : "Could not verify Claude authentication status.",
+    };
+  }
+
+  if (Option.isNone(authProbe.success)) {
+    return {
+      provider: CLAUDE_AGENT_PROVIDER,
+      status: "warning" as const,
+      available: true,
+      authStatus: "unknown" as const,
+      checkedAt,
+      message: "Could not verify Claude authentication status. Timed out while running command.",
+    };
+  }
+
+  const parsed = parseClaudeAuthStatusFromOutput(authProbe.success.value);
+  return {
+    provider: CLAUDE_AGENT_PROVIDER,
+    status: parsed.status,
+    available: true,
+    authStatus: parsed.authStatus,
+    checkedAt,
+    ...(parsed.message ? { message: parsed.message } : {}),
+  } satisfies ServerProviderStatus;
+});
 // ── Layer ───────────────────────────────────────────────────────────
 
 export const ProviderHealthLive = Layer.effect(
   ProviderHealth,
   Effect.gen(function* () {
     const healthCheckFiber = yield* Effect.all(
-      [checkCodexProviderStatus, checkGeminiCliProviderStatus, checkCopilotProviderStatus],
+      [
+        checkCodexProviderStatus,
+        checkGeminiCliProviderStatus,
+        checkCopilotProviderStatus,
+        checkClaudeProviderStatus,
+      ],
       { concurrency: "unbounded" },
     ).pipe(Effect.forkScoped);
 
diff --git a/apps/server/src/provider/Layers/ProviderService.test.ts b/apps/server/src/provider/Layers/ProviderService.test.ts
index 41d9a098a6..3a96b5ec87 100644
--- a/apps/server/src/provider/Layers/ProviderService.test.ts
+++ b/apps/server/src/provider/Layers/ProviderService.test.ts
@@ -53,15 +53,7 @@ const asTurnId = (value: string): TurnId => TurnId.makeUnsafe(value);
 type LegacyProviderRuntimeEvent = {
   readonly type: string;
   readonly eventId: EventId;
-  readonly provider:
-    | "codex"
-    | "copilot"
-    | "claudeCode"
-    | "cursor"
-    | "opencode"
-    | "geminiCli"
-    | "amp"
-    | "kilo";
+  readonly provider: ProviderKind;
   readonly createdAt: string;
   readonly threadId: ThreadId;
   readonly turnId?: string | undefined;
@@ -83,7 +75,7 @@ function makeFakeCodexAdapter(provider: ProviderKind = "codex") {
         status: "ready",
         runtimeMode: input.runtimeMode,
         threadId: input.threadId,
-        resumeCursor: input.resumeCursor ?? { opaque: `cursor-${String(input.threadId)}` },
+        resumeCursor: input.resumeCursor ?? { opaque: `resume-${String(input.threadId)}` },
         cwd: input.cwd ?? process.cwd(),
         createdAt: now,
         updatedAt: now,
@@ -202,9 +194,21 @@ function makeFakeCodexAdapter(provider: ProviderKind = "codex") {
     Effect.runSync(PubSub.publish(runtimeEventPubSub, event as unknown as ProviderRuntimeEvent));
   };
 
+  const updateSession = (
+    threadId: ThreadId,
+    update: (session: ProviderSession) => ProviderSession,
+  ): void => {
+    const existing = sessions.get(threadId);
+    if (!existing) {
+      return;
+    }
+    sessions.set(threadId, update(existing));
+  };
+
   return {
     adapter,
     emit,
+    updateSession,
     startSession,
     sendTurn,
     interruptTurn,
@@ -224,15 +228,15 @@ const sleep = (ms: number) =>
 
 function makeProviderServiceLayer() {
   const codex = makeFakeCodexAdapter();
-  const claude = makeFakeCodexAdapter("claudeCode");
+  const claude = makeFakeCodexAdapter("claudeAgent");
   const registry: typeof ProviderAdapterRegistry.Service = {
     getByProvider: (provider) =>
       provider === "codex"
         ? Effect.succeed(codex.adapter)
-        : provider === "claudeCode"
+        : provider === "claudeAgent"
           ? Effect.succeed(claude.adapter)
           : Effect.fail(new ProviderUnsupportedError({ provider })),
-    listProviders: () => Effect.succeed(["codex", "claudeCode"]),
+    listProviders: () => Effect.succeed(["codex", "claudeAgent"]),
   };
 
   const providerAdapterLayer = Layer.succeed(ProviderAdapterRegistry, registry);
@@ -355,16 +359,29 @@ it.effect(
         Layer.provide(firstDirectoryLayer),
         Layer.provide(AnalyticsService.layerTest),
       );
+      const updatedResumeCursor = {
+        threadId: asThreadId("thread-1"),
+        resume: "resume-session-1",
+        resumeSessionAt: "assistant-message-1",
+        turnCount: 1,
+      };
 
       const startedSession = yield* Effect.gen(function* () {
         const provider = yield* ProviderService;
         const threadId = asThreadId("thread-1");
-        return yield* provider.startSession(threadId, {
+        const session = yield* provider.startSession(threadId, {
           provider: "codex",
           cwd: "/tmp/project",
           runtimeMode: "full-access",
           threadId,
         });
+        firstCodex.updateSession(threadId, (existing) => ({
+          ...existing,
+          status: "ready",
+          resumeCursor: updatedResumeCursor,
+          updatedAt: new Date(Date.now() + 1_000).toISOString(),
+        }));
+        return session;
       }).pipe(Effect.provide(firstProviderLayer));
 
       const persistedAfterStopAll = yield* Effect.gen(function* () {
@@ -374,7 +391,7 @@ it.effect(
       assert.equal(Option.isSome(persistedAfterStopAll), true);
       if (Option.isSome(persistedAfterStopAll)) {
         assert.equal(persistedAfterStopAll.value.status, "stopped");
-        assert.deepEqual(persistedAfterStopAll.value.resumeCursor, startedSession.resumeCursor);
+        assert.deepEqual(persistedAfterStopAll.value.resumeCursor, updatedResumeCursor);
       }
 
       const secondCodex = makeFakeCodexAdapter();
@@ -417,7 +434,7 @@ it.effect(
         };
         assert.equal(startPayload.provider, "codex");
         assert.equal(startPayload.cwd, "/tmp/project");
-        assert.deepEqual(startPayload.resumeCursor, startedSession.resumeCursor);
+        assert.deepEqual(startPayload.resumeCursor, updatedResumeCursor);
         assert.equal(startPayload.threadId, startedSession.threadId);
       }
       assert.equal(secondCodex.rollbackThread.mock.calls.length, 1);
@@ -504,24 +521,24 @@ routing.layer("ProviderServiceLive routing", (it) => {
     }),
   );
 
-  it.effect("routes explicit claudeCode provider session starts to the claude adapter", () =>
+  it.effect("routes explicit claudeAgent provider session starts to the claude adapter", () =>
     Effect.gen(function* () {
       const provider = yield* ProviderService;
 
       const session = yield* provider.startSession(asThreadId("thread-claude"), {
-        provider: "claudeCode",
+        provider: "claudeAgent",
         threadId: asThreadId("thread-claude"),
         cwd: "/tmp/project-claude",
         runtimeMode: "full-access",
       });
 
-      assert.equal(session.provider, "claudeCode");
+      assert.equal(session.provider, "claudeAgent");
       assert.equal(routing.claude.startSession.mock.calls.length, 1);
       const startInput = routing.claude.startSession.mock.calls[0]?.[0];
       assert.equal(typeof startInput === "object" && startInput !== null, true);
       if (startInput && typeof startInput === "object") {
         const startPayload = startInput as { provider?: string; cwd?: string };
-        assert.equal(startPayload.provider, "claudeCode");
+        assert.equal(startPayload.provider, "claudeAgent");
         assert.equal(startPayload.cwd, "/tmp/project-claude");
       }
     }),
@@ -607,6 +624,57 @@ routing.layer("ProviderServiceLive routing", (it) => {
     }),
   );
 
+  it.effect("recovers stale claudeAgent sessions for sendTurn using persisted cwd", () =>
+    Effect.gen(function* () {
+      const provider = yield* ProviderService;
+
+      const initial = yield* provider.startSession(asThreadId("thread-claude-send-turn"), {
+        provider: "claudeAgent",
+        threadId: asThreadId("thread-claude-send-turn"),
+        cwd: "/tmp/project-claude-send-turn",
+        modelOptions: {
+          claudeAgent: {
+            effort: "max",
+          },
+        },
+        runtimeMode: "full-access",
+      });
+
+      yield* routing.claude.stopAll();
+      routing.claude.startSession.mockClear();
+      routing.claude.sendTurn.mockClear();
+
+      yield* provider.sendTurn({
+        threadId: initial.threadId,
+        input: "resume with claude",
+        attachments: [],
+      });
+
+      assert.equal(routing.claude.startSession.mock.calls.length, 1);
+      const resumedStartInput = routing.claude.startSession.mock.calls[0]?.[0];
+      assert.equal(typeof resumedStartInput === "object" && resumedStartInput !== null, true);
+      if (resumedStartInput && typeof resumedStartInput === "object") {
+        const startPayload = resumedStartInput as {
+          provider?: string;
+          cwd?: string;
+          modelOptions?: unknown;
+          resumeCursor?: unknown;
+          threadId?: string;
+        };
+        assert.equal(startPayload.provider, "claudeAgent");
+        assert.equal(startPayload.cwd, "/tmp/project-claude-send-turn");
+        assert.deepEqual(startPayload.modelOptions, {
+          claudeAgent: {
+            effort: "max",
+          },
+        });
+        assert.deepEqual(startPayload.resumeCursor, initial.resumeCursor);
+        assert.equal(startPayload.threadId, initial.threadId);
+      }
+      assert.equal(routing.claude.sendTurn.mock.calls.length, 1);
+    }),
+  );
+
   it.effect("lists no sessions after adapter runtime clears", () =>
     Effect.gen(function* () {
       const provider = yield* ProviderService;
@@ -672,6 +740,96 @@ routing.layer("ProviderServiceLive routing", (it) => {
       }
     }),
   );
+
+  it.effect("reuses persisted resume cursor when startSession is called after a restart", () =>
+    Effect.gen(function* () {
+      const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-provider-service-start-"));
+      const dbPath = path.join(tempDir, "orchestration.sqlite");
+      const persistenceLayer = makeSqlitePersistenceLive(dbPath);
+      const runtimeRepositoryLayer = ProviderSessionRuntimeRepositoryLive.pipe(
+        Layer.provide(persistenceLayer),
+      );
+
+      const firstClaude = makeFakeCodexAdapter("claudeAgent");
+      const firstRegistry: typeof ProviderAdapterRegistry.Service = {
+        getByProvider: (provider) =>
+          provider === "claudeAgent"
+            ? Effect.succeed(firstClaude.adapter)
+            : Effect.fail(new ProviderUnsupportedError({ provider })),
+        listProviders: () => Effect.succeed(["claudeAgent"]),
+      };
+      const firstDirectoryLayer = ProviderSessionDirectoryLive.pipe(
+        Layer.provide(runtimeRepositoryLayer),
+      );
+      const firstProviderLayer = makeProviderServiceLive().pipe(
+        Layer.provide(Layer.succeed(ProviderAdapterRegistry, firstRegistry)),
+        Layer.provide(firstDirectoryLayer),
+        Layer.provide(AnalyticsService.layerTest),
+      );
+
+      const initial = yield* Effect.gen(function* () {
+        const provider = yield* ProviderService;
+        return yield* provider.startSession(asThreadId("thread-claude-start"), {
+          provider: "claudeAgent",
+          threadId: asThreadId("thread-claude-start"),
+          cwd: "/tmp/project-claude-start",
+          runtimeMode: "full-access",
+        });
+      }).pipe(Effect.provide(firstProviderLayer));
+
+      yield* Effect.gen(function* () {
+        const provider = yield* ProviderService;
+        yield* provider.listSessions();
+      }).pipe(Effect.provide(firstProviderLayer));
+
+      const secondClaude = makeFakeCodexAdapter("claudeAgent");
+      const secondRegistry: typeof ProviderAdapterRegistry.Service = {
+        getByProvider: (provider) =>
+          provider === "claudeAgent"
+            ? Effect.succeed(secondClaude.adapter)
+            : Effect.fail(new ProviderUnsupportedError({ provider })),
+        listProviders: () => Effect.succeed(["claudeAgent"]),
+      };
+      const secondDirectoryLayer = ProviderSessionDirectoryLive.pipe(
+        Layer.provide(runtimeRepositoryLayer),
+      );
+      const secondProviderLayer = makeProviderServiceLive().pipe(
+        Layer.provide(Layer.succeed(ProviderAdapterRegistry, secondRegistry)),
+        Layer.provide(secondDirectoryLayer),
+        Layer.provide(AnalyticsService.layerTest),
+      );
+
+      secondClaude.startSession.mockClear();
+
+      yield* Effect.gen(function* () {
+        const provider = yield* ProviderService;
+        yield* provider.startSession(initial.threadId, {
+          provider: "claudeAgent",
+          threadId: initial.threadId,
+          cwd: "/tmp/project-claude-start",
+          runtimeMode: "full-access",
+        });
+      }).pipe(Effect.provide(secondProviderLayer));
+
+      assert.equal(secondClaude.startSession.mock.calls.length, 1);
+      const resumedStartInput = secondClaude.startSession.mock.calls[0]?.[0];
+      assert.equal(typeof resumedStartInput === "object" && resumedStartInput !== null, true);
+      if (resumedStartInput && typeof resumedStartInput === "object") {
+        const startPayload = resumedStartInput as {
+          provider?: string;
+          cwd?: string;
+          resumeCursor?: unknown;
+          threadId?: string;
+        };
+        assert.equal(startPayload.provider, "claudeAgent");
+        assert.equal(startPayload.cwd, "/tmp/project-claude-start");
+        assert.deepEqual(startPayload.resumeCursor, initial.resumeCursor);
+        assert.equal(startPayload.threadId, initial.threadId);
+      }
+
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
 });
 
 const fanout = makeProviderServiceLayer();
@@ -689,7 +847,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
       const consumer = yield* Stream.runForEach(provider.streamEvents, (event) =>
         Ref.update(eventsRef, (current) => [...current, event]),
       ).pipe(Effect.forkChild);
-      yield* sleep(20);
+      yield* sleep(50);
 
       const completedEvent: LegacyProviderRuntimeEvent = {
         type: "turn.completed",
@@ -702,7 +860,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
       };
 
       fanout.codex.emit(completedEvent);
-      yield* sleep(20);
+      yield* sleep(50);
 
       const events = yield* Ref.get(eventsRef);
       yield* Fiber.interrupt(consumer);
@@ -728,7 +886,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         Stream.runForEach((event) => Ref.update(receivedRef, (current) => [...current, event])),
         Effect.forkChild,
       );
-      yield* sleep(20);
+      yield* sleep(50);
 
       fanout.codex.emit({
         type: "tool.started",
@@ -792,7 +950,7 @@ fanout.layer("ProviderServiceLive fanout", (it) => {
         Stream.runForEach(() => Effect.fail("listener crash")),
         Effect.forkChild,
       );
-      yield* sleep(20);
+      yield* sleep(50);
 
       const events: ReadonlyArray<LegacyProviderRuntimeEvent> = [
         {
diff --git a/apps/server/src/provider/Layers/ProviderService.ts b/apps/server/src/provider/Layers/ProviderService.ts
index 5117bcee04..2c2b6051b4 100644
--- a/apps/server/src/provider/Layers/ProviderService.ts
+++ b/apps/server/src/provider/Layers/ProviderService.ts
@@ -97,7 +97,12 @@ function redactProviderOptions(providerOptions: unknown): unknown {
 
 function toRuntimePayloadFromSession(
   session: ProviderSession,
-  extra?: { readonly providerOptions?: unknown },
+  extra?: {
+    readonly modelOptions?: unknown;
+    readonly providerOptions?: unknown;
+    readonly lastRuntimeEvent?: string;
+    readonly lastRuntimeEventAt?: string;
+  },
 ): Record<string, unknown> {
   const safeProviderOptions =
     extra?.providerOptions !== undefined ? redactProviderOptions(extra.providerOptions) : undefined;
@@ -106,10 +111,26 @@ function toRuntimePayloadFromSession(
     model: session.model ?? null,
     activeTurnId: session.activeTurnId ?? null,
     lastError: session.lastError ?? null,
+    ...(extra?.modelOptions !== undefined ? { modelOptions: extra.modelOptions } : {}),
     ...(safeProviderOptions !== undefined ? { providerOptions: safeProviderOptions } : {}),
+    ...(extra?.lastRuntimeEvent !== undefined ? { lastRuntimeEvent: extra.lastRuntimeEvent } : {}),
+    ...(extra?.lastRuntimeEventAt !== undefined
+      ? { lastRuntimeEventAt: extra.lastRuntimeEventAt }
+      : {}),
   };
 }
 
+function readPersistedModelOptions(
+  runtimePayload: ProviderRuntimeBinding["runtimePayload"],
+): Record<string, unknown> | undefined {
+  if (!runtimePayload || typeof runtimePayload !== "object" || Array.isArray(runtimePayload)) {
+    return undefined;
+  }
+  const raw = "modelOptions" in runtimePayload ? runtimePayload.modelOptions : undefined;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return undefined;
+  return raw as Record<string, unknown>;
+}
+
 function readPersistedProviderOptions(
   runtimePayload: ProviderRuntimeBinding["runtimePayload"],
 ): Record<string, unknown> | undefined {
@@ -169,7 +190,12 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
     const upsertSessionBinding = (
       session: ProviderSession,
       threadId: ThreadId,
-      extra?: { readonly providerOptions?: unknown },
+      extra?: {
+        readonly modelOptions?: unknown;
+        readonly providerOptions?: unknown;
+        readonly lastRuntimeEvent?: string;
+        readonly lastRuntimeEventAt?: string;
+      },
     ) =>
       directory.upsert({
         threadId,
@@ -184,7 +210,6 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
     const adapters = yield* Effect.forEach(providers, (provider) =>
       registry.getByProvider(provider),
     );
-
     const processRuntimeEvent = (event: ProviderRuntimeEvent): Effect.Effect<void> =>
       publishRuntimeEvent(event);
 
@@ -241,12 +266,14 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
         }
 
         const persistedCwd = readPersistedCwd(input.binding.runtimePayload);
+        const persistedModelOptions = readPersistedModelOptions(input.binding.runtimePayload);
         const persistedProviderOptions = readPersistedProviderOptions(input.binding.runtimePayload);
 
         const resumed = yield* adapter.startSession({
           threadId: input.binding.threadId,
           provider: input.binding.provider,
           ...(persistedCwd ? { cwd: persistedCwd } : {}),
+          ...(persistedModelOptions ? { modelOptions: persistedModelOptions } : {}),
           ...(persistedProviderOptions !== undefined
             ? { providerOptions: persistedProviderOptions }
             : {}),
@@ -317,8 +344,17 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
           threadId,
           provider: parsed.provider ?? "codex",
         };
+        const persistedBinding = Option.getOrUndefined(yield* directory.getBinding(threadId));
+        const effectiveResumeCursor =
+          input.resumeCursor ??
+          (persistedBinding?.provider === input.provider
+            ? persistedBinding.resumeCursor
+            : undefined);
         const adapter = yield* registry.getByProvider(input.provider);
-        const session = yield* adapter.startSession(input);
+        const session = yield* adapter.startSession({
+          ...input,
+          ...(effectiveResumeCursor !== undefined ? { resumeCursor: effectiveResumeCursor } : {}),
+        });
 
         if (session.provider !== adapter.provider) {
           return yield* toValidationError(
@@ -328,6 +364,7 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
         }
 
         yield* upsertSessionBinding(session, threadId, {
+          modelOptions: input.modelOptions,
           providerOptions: input.providerOptions,
         });
         yield* analytics.record("provider.session.started", {
@@ -549,6 +586,17 @@ const makeProviderService = (options?: ProviderServiceLiveOptions) =>
     const runStopAll = () =>
       Effect.gen(function* () {
         const threadIds = yield* directory.listThreadIds();
+        const activeSessions = yield* Effect.forEach(adapters, (adapter) =>
+          adapter.listSessions(),
+        ).pipe(
+          Effect.map((sessionsByAdapter) => sessionsByAdapter.flatMap((sessions) => sessions)),
+        );
+        yield* Effect.forEach(activeSessions, (session) =>
+          upsertSessionBinding(session, session.threadId, {
+            lastRuntimeEvent: "provider.stopAll",
+            lastRuntimeEventAt: new Date().toISOString(),
+          }),
+        ).pipe(Effect.asVoid);
         yield* Effect.forEach(adapters, (adapter) => adapter.stopAll()).pipe(Effect.asVoid);
         yield* Effect.forEach(threadIds, (threadId) =>
           directory.getBinding(threadId).pipe(
diff --git a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
index 942d04fd0e..9afe27dda6 100644
--- a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
@@ -141,8 +141,8 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL
 
       yield* runtimeRepository.upsert({
         threadId,
-        providerName: "cursor",
-        adapterKey: "cursor",
+        providerName: "claudeAgent",
+        adapterKey: "claudeAgent",
         runtimeMode: "full-access",
         status: "running",
         lastSeenAt: new Date().toISOString(),
diff --git a/apps/server/src/provider/Layers/ProviderSessionDirectory.ts b/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
index 937a883dbf..26f62e4dd1 100644
--- a/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
@@ -25,7 +25,7 @@ function decodeProviderKind(
   if (
     providerName === "codex" ||
     providerName === "copilot" ||
-    providerName === "claudeCode" ||
+    providerName === "claudeAgent" ||
     providerName === "cursor" ||
     providerName === "opencode" ||
     providerName === "geminiCli" ||
diff --git a/apps/server/src/provider/Services/ClaudeAdapter.ts b/apps/server/src/provider/Services/ClaudeAdapter.ts
new file mode 100644
index 0000000000..3a3f616ea5
--- /dev/null
+++ b/apps/server/src/provider/Services/ClaudeAdapter.ts
@@ -0,0 +1,30 @@
+/**
+ * ClaudeAdapter - Claude Agent implementation of the generic provider adapter contract.
+ *
+ * This service owns Claude runtime/session semantics and emits canonical
+ * provider runtime events. It does not perform cross-provider routing, shared
+ * event fan-out, or checkpoint orchestration.
+ *
+ * Uses Effect `ServiceMap.Service` for dependency injection and returns the
+ * shared provider-adapter error channel with `provider: "claudeAgent"` context.
+ *
+ * @module ClaudeAdapter
+ */
+import { ServiceMap } from "effect";
+
+import type { ProviderAdapterError } from "../Errors.ts";
+import type { ProviderAdapterShape } from "./ProviderAdapter.ts";
+
+/**
+ * ClaudeAdapterShape - Service API for the Claude Agent provider adapter.
+ */
+export interface ClaudeAdapterShape extends ProviderAdapterShape<ProviderAdapterError> {
+  readonly provider: "claudeAgent";
+}
+
+/**
+ * ClaudeAdapter - Service tag for Claude Agent provider adapter operations.
+ */
+export class ClaudeAdapter extends ServiceMap.Service<ClaudeAdapter, ClaudeAdapterShape>()(
+  "t3/provider/Services/ClaudeAdapter",
+) {}
diff --git a/apps/server/src/provider/Services/ClaudeCodeAdapter.ts b/apps/server/src/provider/Services/ClaudeCodeAdapter.ts
deleted file mode 100644
index 6ef6876061..0000000000
--- a/apps/server/src/provider/Services/ClaudeCodeAdapter.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * ClaudeCodeAdapter - Claude Code implementation of the generic provider adapter contract.
- *
- * This service owns Claude runtime/session semantics and emits canonical
- * provider runtime events. It does not perform cross-provider routing, shared
- * event fan-out, or checkpoint orchestration.
- *
- * Uses Effect `ServiceMap.Service` for dependency injection and returns the
- * shared provider-adapter error channel with `provider: "claudeCode"` context.
- *
- * @module ClaudeCodeAdapter
- */
-import { ServiceMap } from "effect";
-
-import type { ProviderAdapterError } from "../Errors.ts";
-import type { ProviderAdapterShape } from "./ProviderAdapter.ts";
-
-/**
- * ClaudeCodeAdapterShape - Service API for the Claude Code provider adapter.
- */
-export interface ClaudeCodeAdapterShape extends ProviderAdapterShape<ProviderAdapterError> {
-  readonly provider: "claudeCode";
-}
-
-/**
- * ClaudeCodeAdapter - Service tag for Claude Code provider adapter operations.
- */
-export class ClaudeCodeAdapter extends ServiceMap.Service<
-  ClaudeCodeAdapter,
-  ClaudeCodeAdapterShape
->()("t3/provider/Services/ClaudeCodeAdapter") {}
diff --git a/apps/server/src/provider/Services/ProviderAdapter.ts b/apps/server/src/provider/Services/ProviderAdapter.ts
index be6f8b61eb..f153c2bf07 100644
--- a/apps/server/src/provider/Services/ProviderAdapter.ts
+++ b/apps/server/src/provider/Services/ProviderAdapter.ts
@@ -121,7 +121,7 @@ export const PROVIDER_CAPABILITIES_BY_PROVIDER: Readonly<
     supportsAttachments: true,
     persistentRuntime: true,
   },
-  claudeCode: {
+  claudeAgent: {
     sessionModelSwitch: "in-session",
     transport: "sdk-query",
     modelDiscovery: "session-native",
diff --git a/apps/server/src/provider/Services/ProviderHealth.ts b/apps/server/src/provider/Services/ProviderHealth.ts
index 318d7e18d0..ec3b2d318d 100644
--- a/apps/server/src/provider/Services/ProviderHealth.ts
+++ b/apps/server/src/provider/Services/ProviderHealth.ts
@@ -1,8 +1,8 @@
 /**
  * ProviderHealth - Provider readiness snapshot service.
  *
- * Owns startup-time provider health checks (install/auth reachability) and
- * exposes the cached results to transport layers.
+ * Owns provider health checks (install/auth reachability) and exposes the
+ * latest results to transport layers.
  *
  * @module ProviderHealth
  */
@@ -12,7 +12,7 @@ import type { Effect } from "effect";
 
 export interface ProviderHealthShape {
   /**
-   * Read provider health statuses computed at server startup.
+   * Read the latest provider health statuses.
    */
   readonly getStatuses: Effect.Effect<ReadonlyArray<ServerProviderStatus>>;
 }
diff --git a/apps/server/src/provider/claude-agent-sdk.d.ts b/apps/server/src/provider/claude-agent-sdk.d.ts
index 5cb57402ab..37169ac76e 100644
--- a/apps/server/src/provider/claude-agent-sdk.d.ts
+++ b/apps/server/src/provider/claude-agent-sdk.d.ts
@@ -17,14 +17,17 @@ declare module "@anthropic-ai/claude-agent-sdk" {
         readonly message?: string;
       };
 
+  export interface CanUseToolCallbackOptions {
+    readonly signal: AbortSignal;
+    readonly toolUseID?: string;
+    readonly suggestions?: ReadonlyArray<PermissionUpdate>;
+    readonly [key: string]: unknown;
+  }
+
   export type CanUseTool = (
     toolName: string,
     toolInput: Record<string, unknown>,
-    callbackOptions: {
-      readonly signal?: AbortSignal;
-      readonly suggestions?: ReadonlyArray<PermissionUpdate>;
-      readonly [key: string]: unknown;
-    },
+    callbackOptions: CanUseToolCallbackOptions,
   ) => Promise<PermissionResult>;
 
   export interface SDKUserMessage {
@@ -50,6 +53,7 @@ declare module "@anthropic-ai/claude-agent-sdk" {
         readonly web_search_requests?: number;
       };
     };
+    readonly modelUsage?: { readonly [key: string]: unknown };
     readonly result?: string;
     readonly session_id?: string;
     readonly [key: string]: unknown;
@@ -79,6 +83,39 @@ declare module "@anthropic-ai/claude-agent-sdk" {
     readonly preceding_tool_use_ids?: ReadonlyArray<string>;
     readonly is_error?: boolean;
     readonly suggestions?: ReadonlyArray<PermissionUpdate>;
+
+    // System message fields
+    readonly status?: string;
+    readonly hook_id?: string;
+    readonly hook_name?: string;
+    readonly hook_event?: string;
+    readonly output?: string;
+    readonly stdout?: string;
+    readonly stderr?: string;
+    readonly outcome?: "error" | "cancelled" | "success";
+    readonly exit_code?: number;
+
+    // Task fields
+    readonly task_id?: string;
+    readonly description?: string;
+    readonly task_type?: string;
+    readonly summary?: string;
+    readonly usage?: { readonly [key: string]: unknown };
+    readonly last_tool_name?: string;
+
+    // File persistence fields
+    readonly files?: ReadonlyArray<{ readonly filename: string; readonly file_id: string }>;
+    readonly failed?: ReadonlyArray<{ readonly filename: string; readonly error: string }>;
+
+    // Tool progress fields
+    readonly elapsed_time_seconds?: number;
+
+    // Auth status fields
+    readonly isAuthenticating?: boolean;
+
+    // Stream event fields
+    readonly event?: Record<string, unknown>;
+
     readonly [key: string]: unknown;
   }
 
@@ -89,6 +126,24 @@ declare module "@anthropic-ai/claude-agent-sdk" {
 
   export type EffortLevel = "low" | "medium" | "high" | "max";
 
+  export interface SpawnOptions {
+    readonly args: string[];
+    readonly env?: Record<string, string | undefined>;
+    readonly cwd?: string;
+    readonly [key: string]: unknown;
+  }
+
+  export interface SpawnedProcess {
+    readonly stdin: NodeJS.WritableStream;
+    readonly stdout: NodeJS.ReadableStream;
+    killed: boolean;
+    exitCode: number | null;
+    kill(signal: NodeJS.Signals): boolean;
+    on(event: "exit" | "error", listener: (...args: unknown[]) => void): void;
+    once(event: "exit" | "error", listener: (...args: unknown[]) => void): void;
+    off(event: "exit" | "error", listener: (...args: unknown[]) => void): void;
+  }
+
   export interface Options {
     readonly cwd?: string;
     readonly model?: string;
@@ -102,6 +157,10 @@ declare module "@anthropic-ai/claude-agent-sdk" {
     readonly resume?: string;
     readonly resumeSessionAt?: string;
     readonly includePartialMessages?: boolean;
+    readonly persistSession?: boolean;
+    readonly sessionId?: string;
+    readonly settings?: Record<string, unknown>;
+    readonly spawnClaudeCodeProcess?: (options: SpawnOptions) => SpawnedProcess;
     readonly canUseTool?: CanUseTool;
     readonly env?: Record<string, string | undefined>;
     readonly additionalDirectories?: ReadonlyArray<string>;
@@ -114,6 +173,7 @@ declare module "@anthropic-ai/claude-agent-sdk" {
     readonly setPermissionMode?: (mode: PermissionMode) => Promise<void>;
     readonly setMaxThinkingTokens?: (maxThinkingTokens: number | null) => Promise<void>;
     readonly close?: () => void;
+    readonly initializationResult?: () => Promise<Record<string, unknown>>;
   };
 
   export function query(input: {
diff --git a/apps/server/src/serverLayers.ts b/apps/server/src/serverLayers.ts
index 08457d5bf4..3b489c1d6e 100644
--- a/apps/server/src/serverLayers.ts
+++ b/apps/server/src/serverLayers.ts
@@ -19,7 +19,7 @@ import { OrchestrationProjectionSnapshotQueryLive } from "./orchestration/Layers
 import { ProviderRuntimeIngestionLive } from "./orchestration/Layers/ProviderRuntimeIngestion";
 import { RuntimeReceiptBusLive } from "./orchestration/Layers/RuntimeReceiptBus";
 import { ProviderUnsupportedError } from "./provider/Errors";
-import { makeClaudeCodeAdapterLive } from "./provider/Layers/ClaudeCodeAdapter";
+import { makeClaudeAdapterLive } from "./provider/Layers/ClaudeAdapter";
 import { makeCopilotAdapterLive } from "./provider/Layers/CopilotAdapter";
 import { makeCodexAdapterLive } from "./provider/Layers/CodexAdapter";
 import { makeCursorAdapterLive } from "./provider/Layers/CursorAdapter";
@@ -69,7 +69,7 @@ export function makeServerProviderLayer(): Layer.Layer<
     const copilotAdapterLayer = makeCopilotAdapterLive(
       nativeEventLogger ? { nativeEventLogger } : undefined,
     );
-    const claudeAdapterLayer = makeClaudeCodeAdapterLive(
+    const claudeAdapterLayer = makeClaudeAdapterLive(
       nativeEventLogger ? { nativeEventLogger } : undefined,
     );
     const cursorAdapterLayer = makeCursorAdapterLive(
diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.ts
index 99c1daaf2b..e5554606d3 100644
--- a/apps/server/src/wsServer.ts
+++ b/apps/server/src/wsServer.ts
@@ -77,7 +77,6 @@ import { fetchOpenCodeModels } from "./opencodeServerManager.ts";
 import { fetchCopilotModels, fetchCopilotUsage } from "./provider/Layers/CopilotAdapter.ts";
 import { fetchCursorModels } from "./provider/Layers/CursorAdapter.ts";
 import { fetchCursorUsage } from "./provider/Layers/CursorUsage.ts";
-import { fetchClaudeCodeUsage } from "./provider/Layers/ClaudeCodeAdapter.ts";
 import { fetchCodexUsage } from "./provider/Layers/CodexAdapter.ts";
 
 import {
@@ -984,8 +983,8 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
           });
           return usage satisfies ProviderUsageResult;
         }
-        if (provider === "claudeCode") {
-          return fetchClaudeCodeUsage() satisfies ProviderUsageResult;
+        if (provider === "claudeAgent") {
+          return { provider } satisfies ProviderUsageResult;
         }
         if (provider === "geminiCli") {
           return fetchGeminiCliUsage() satisfies ProviderUsageResult;
diff --git a/apps/web/package.json b/apps/web/package.json
index e12f4902bd..19d7d8b6fb 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/web",
-  "version": "0.0.5",
+  "version": "0.0.13",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/web/public/mockServiceWorker.js b/apps/web/public/mockServiceWorker.js
index daa58d0f12..8fa9dca80e 100644
--- a/apps/web/public/mockServiceWorker.js
+++ b/apps/web/public/mockServiceWorker.js
@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.12.10'
+const PACKAGE_VERSION = '2.12.11'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
diff --git a/apps/web/src/appSettings.test.ts b/apps/web/src/appSettings.test.ts
index 2085b727aa..ab05a221f0 100644
--- a/apps/web/src/appSettings.test.ts
+++ b/apps/web/src/appSettings.test.ts
@@ -1,6 +1,8 @@
+import { Schema } from "effect";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 import {
+  AppSettingsSchema,
   DEFAULT_TIMESTAMP_FORMAT,
   getAppModelOptions,
   getAppSettingsSnapshot,
@@ -79,8 +81,8 @@ describe("normalizeCustomModelSlugs", () => {
   });
 
   it("normalizes provider-specific aliases for claude and cursor", () => {
-    expect(normalizeCustomModelSlugs(["sonnet"], "claudeCode")).toEqual([]);
-    expect(normalizeCustomModelSlugs(["claude/custom-sonnet"], "claudeCode")).toEqual([
+    expect(normalizeCustomModelSlugs(["sonnet"], "claudeAgent")).toEqual([]);
+    expect(normalizeCustomModelSlugs(["claude/custom-sonnet"], "claudeAgent")).toEqual([
       "claude/custom-sonnet",
     ]);
     expect(normalizeCustomModelSlugs(["composer"], "cursor")).toEqual([]);
@@ -116,7 +118,7 @@ describe("getAppModelOptions", () => {
   });
 
   it("keeps a saved custom provider model available as an exact slug option", () => {
-    const options = getAppModelOptions("claudeCode", ["claude/custom-opus"], "claude/custom-opus");
+    const options = getAppModelOptions("claudeAgent", ["claude/custom-opus"], "claude/custom-opus");
 
     expect(options.some((option) => option.slug === "claude/custom-opus" && option.isCustom)).toBe(
       true,
@@ -169,7 +171,7 @@ describe("timestamp format defaults", () => {
   });
 
   it("includes provider-specific custom slugs in non-codex model lists", () => {
-    const claudeOptions = getAppModelOptions("claudeCode", ["claude/custom-opus"]);
+    const claudeOptions = getAppModelOptions("claudeAgent", ["claude/custom-opus"]);
     const cursorOptions = getAppModelOptions("cursor", ["cursor/custom-model"]);
 
     expect(claudeOptions.some((option) => option.slug === "claude/custom-opus")).toBe(true);
@@ -203,3 +205,35 @@ describe("getAppSettingsSnapshot", () => {
     expect(getAppSettingsSnapshot().providerLogoAppearance).toBe("grayscale");
   });
 });
+
+describe("provider-specific custom models", () => {
+  it("includes provider-specific custom slugs in non-codex model lists", () => {
+    const claudeOptions = getAppModelOptions("claudeAgent", ["claude/custom-opus"]);
+
+    expect(claudeOptions.some((option) => option.slug === "claude/custom-opus")).toBe(true);
+  });
+});
+
+describe("AppSettingsSchema", () => {
+  it("fills decoding defaults for persisted settings that predate newer keys", () => {
+    const decode = Schema.decodeUnknownSync(Schema.fromJsonString(AppSettingsSchema));
+
+    expect(
+      decode(
+        JSON.stringify({
+          codexBinaryPath: "/usr/local/bin/codex",
+          confirmThreadDelete: false,
+        }),
+      ),
+    ).toMatchObject({
+      codexBinaryPath: "/usr/local/bin/codex",
+      codexHomePath: "",
+      defaultThreadEnvMode: "local",
+      confirmThreadDelete: false,
+      enableAssistantStreaming: false,
+      timestampFormat: DEFAULT_TIMESTAMP_FORMAT,
+      customCodexModels: [],
+      customClaudeModels: [],
+    });
+  });
+});
diff --git a/apps/web/src/appSettings.ts b/apps/web/src/appSettings.ts
index c1d4200a7b..a2ca6a2cf3 100644
--- a/apps/web/src/appSettings.ts
+++ b/apps/web/src/appSettings.ts
@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
 import { Option, Schema } from "effect";
 import {
   DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER,
@@ -7,6 +7,7 @@ import {
 import { getDefaultModel, getModelOptions, normalizeModelSlug } from "@t3tools/shared/model";
 import { DEFAULT_ACCENT_COLOR, isValidAccentColor, normalizeAccentColor } from "./accentColor";
 import { useLocalStorage } from "./hooks/useLocalStorage";
+import { EnvMode } from "./components/BranchToolbar.logic";
 
 const APP_SETTINGS_STORAGE_KEY = "t3code:app-settings:v1";
 const MAX_CUSTOM_MODEL_COUNT = 32;
@@ -34,10 +35,11 @@ const AppProviderLogoAppearanceSchema = Schema.Literals(["original", "grayscale"
 export const TIMESTAMP_FORMAT_OPTIONS = ["locale", "12-hour", "24-hour"] as const;
 export type TimestampFormat = (typeof TIMESTAMP_FORMAT_OPTIONS)[number];
 export const DEFAULT_TIMESTAMP_FORMAT: TimestampFormat = "locale";
+
 const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>> = {
   codex: new Set(getModelOptions("codex").map((option) => option.slug)),
   copilot: new Set(getModelOptions("copilot").map((option) => option.slug)),
-  claudeCode: new Set(getModelOptions("claudeCode").map((option) => option.slug)),
+  claudeAgent: new Set(getModelOptions("claudeAgent").map((option) => option.slug)),
   cursor: new Set(getModelOptions("cursor").map((option) => option.slug)),
   opencode: new Set(getModelOptions("opencode").map((option) => option.slug)),
   geminiCli: new Set(getModelOptions("geminiCli").map((option) => option.slug)),
@@ -47,7 +49,7 @@ const BUILT_IN_MODEL_SLUGS_BY_PROVIDER: Record<ProviderKind, ReadonlySet<string>
 const PROVIDER_KINDS = [
   "codex",
   "copilot",
-  "claudeCode",
+  "claudeAgent",
   "cursor",
   "opencode",
   "geminiCli",
@@ -55,96 +57,69 @@ const PROVIDER_KINDS = [
   "kilo",
 ] as const satisfies readonly ProviderKind[];
 
-const AppSettingsSchema = Schema.Struct({
-  codexBinaryPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  copilotCliPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  copilotConfigDir: Schema.String.check(Schema.isMaxLength(4096)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
+const withDefaults =
+  <
+    S extends Schema.Top & Schema.WithoutConstructorDefault,
+    D extends S["~type.make.in"] & S["Encoded"],
+  >(
+    fallback: () => D,
+  ) =>
+  (schema: S) =>
+    schema.pipe(
+      Schema.withConstructorDefault(() => Option.some(fallback())),
+      Schema.withDecodingDefault(() => fallback()),
+    );
+
+export const AppSettingsSchema = Schema.Struct({
+  codexBinaryPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
+  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
+  copilotCliPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
+  copilotConfigDir: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
   defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
-    Schema.withConstructorDefault(() => Option.some("local")),
+    withDefaults(() => "local" as const),
   ),
-  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
-  enableAssistantStreaming: Schema.Boolean.pipe(
-    Schema.withConstructorDefault(() => Option.some(false)),
-  ),
-  showCommandOutput: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
-  showFileChangeDiffs: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
+  confirmThreadDelete: Schema.Boolean.pipe(withDefaults(() => true)),
+  enableAssistantStreaming: Schema.Boolean.pipe(withDefaults(() => false)),
+  showCommandOutput: Schema.Boolean.pipe(withDefaults(() => true)),
+  showFileChangeDiffs: Schema.Boolean.pipe(withDefaults(() => true)),
   timestampFormat: Schema.Literals(["locale", "12-hour", "24-hour"]).pipe(
-    Schema.withConstructorDefault(() => Option.some(DEFAULT_TIMESTAMP_FORMAT)),
-  ),
-  customCodexModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customCopilotModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customClaudeModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customCursorModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customOpencodeModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customGeminiCliModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customAmpModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
-  ),
-  customKiloModels: Schema.Array(Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some([])),
+    withDefaults(() => DEFAULT_TIMESTAMP_FORMAT),
   ),
+  customCodexModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customCopilotModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customClaudeModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customCursorModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customOpencodeModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customGeminiCliModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customAmpModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
+  customKiloModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
   gitTextGenerationModelByProvider: Schema.Record(Schema.String, Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some({} as Record<string, string>)),
+    withDefaults(() => ({}) as Record<string, string>),
   ),
   providerLogoAppearance: AppProviderLogoAppearanceSchema.pipe(
-    Schema.withConstructorDefault(() => Option.some("original")),
-  ),
-  grayscaleProviderLogos: Schema.Boolean.pipe(
-    Schema.withConstructorDefault(() => Option.some(false)),
+    withDefaults(() => "original" as const),
   ),
+  grayscaleProviderLogos: Schema.Boolean.pipe(withDefaults(() => false)),
   accentColor: Schema.String.check(Schema.isMaxLength(16)).pipe(
-    Schema.withConstructorDefault(() => Option.some(DEFAULT_ACCENT_COLOR)),
+    withDefaults(() => DEFAULT_ACCENT_COLOR),
   ),
   providerAccentColors: Schema.Record(Schema.String, Schema.String).pipe(
-    Schema.withConstructorDefault(() => Option.some({} as Record<string, string>)),
+    withDefaults(() => ({}) as Record<string, string>),
   ),
   customAccentPresets: Schema.Array(
     Schema.Struct({
       label: Schema.String.check(Schema.isMaxLength(64)),
       value: Schema.String.check(Schema.isMaxLength(16)),
     }),
-  ).pipe(
-    Schema.withConstructorDefault(() =>
-      Option.some([] as ReadonlyArray<{ label: string; value: string }>),
-    ),
-  ),
-  backgroundColorOverride: Schema.String.check(Schema.isMaxLength(16)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  foregroundColorOverride: Schema.String.check(Schema.isMaxLength(16)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  uiFont: Schema.String.check(Schema.isMaxLength(256)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  codeFont: Schema.String.check(Schema.isMaxLength(256)).pipe(
-    Schema.withConstructorDefault(() => Option.some("")),
-  ),
-  uiFontSize: Schema.Number.pipe(Schema.withConstructorDefault(() => Option.some(0))),
-  codeFontSize: Schema.Number.pipe(Schema.withConstructorDefault(() => Option.some(0))),
-  contrast: Schema.Number.pipe(Schema.withConstructorDefault(() => Option.some(0))),
-  translucency: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(false))),
+  ).pipe(withDefaults(() => [] as ReadonlyArray<{ label: string; value: string }>)),
+  backgroundColorOverride: Schema.String.check(Schema.isMaxLength(16)).pipe(withDefaults(() => "")),
+  foregroundColorOverride: Schema.String.check(Schema.isMaxLength(16)).pipe(withDefaults(() => "")),
+  uiFont: Schema.String.check(Schema.isMaxLength(256)).pipe(withDefaults(() => "")),
+  codeFont: Schema.String.check(Schema.isMaxLength(256)).pipe(withDefaults(() => "")),
+  uiFontSize: Schema.Number.pipe(withDefaults(() => 0)),
+  codeFontSize: Schema.Number.pipe(withDefaults(() => 0)),
+  contrast: Schema.Number.pipe(withDefaults(() => 0)),
+  translucency: Schema.Boolean.pipe(withDefaults(() => false)),
 });
 export type AppSettings = typeof AppSettingsSchema.Type;
 export interface AppModelOption {
@@ -216,7 +191,7 @@ export function getCustomModelsForProvider(
   switch (provider) {
     case "copilot":
       return settings.customCopilotModels;
-    case "claudeCode":
+    case "claudeAgent":
       return settings.customClaudeModels;
     case "cursor":
       return settings.customCursorModels;
@@ -238,7 +213,7 @@ export function patchCustomModels(provider: ProviderKind, models: string[]): Par
   switch (provider) {
     case "copilot":
       return { customCopilotModels: models };
-    case "claudeCode":
+    case "claudeAgent":
       return { customClaudeModels: models };
     case "cursor":
       return { customCursorModels: models };
@@ -283,7 +258,7 @@ function normalizeAppSettings(settings: AppSettings): AppSettings {
     ...settings,
     customCodexModels: normalizeCustomModelSlugs(settings.customCodexModels, "codex"),
     customCopilotModels: normalizeCustomModelSlugs(settings.customCopilotModels, "copilot"),
-    customClaudeModels: normalizeCustomModelSlugs(settings.customClaudeModels, "claudeCode"),
+    customClaudeModels: normalizeCustomModelSlugs(settings.customClaudeModels, "claudeAgent"),
     customCursorModels: normalizeCustomModelSlugs(settings.customCursorModels, "cursor"),
     customOpencodeModels: normalizeCustomModelSlugs(settings.customOpencodeModels, "opencode"),
     customGeminiCliModels: normalizeCustomModelSlugs(settings.customGeminiCliModels, "geminiCli"),
@@ -426,6 +401,18 @@ function migratePersistedAppSettings(value: unknown): unknown {
     settings.providerLogoAppearance = "grayscale";
   }
 
+  // Migrate legacy "claudeCode" key to "claudeAgent" in record-typed settings
+  for (const key of ["gitTextGenerationModelByProvider", "providerAccentColors"] as const) {
+    const record = settings[key];
+    if (record && typeof record === "object" && !Array.isArray(record)) {
+      const obj = record as Record<string, unknown>;
+      if ("claudeCode" in obj && !("claudeAgent" in obj)) {
+        const { claudeCode, ...rest } = obj;
+        settings[key] = { ...rest, claudeAgent: claudeCode };
+      }
+    }
+  }
+
   return settings;
 }
 
@@ -466,12 +453,28 @@ export function useAppSettings() {
     AppSettingsSchema,
   );
 
+  // Apply legacy key migration that the schema decode path doesn't handle
+  // Migrate legacy "claudeCode" keys to "claudeAgent" in record-typed settings
+  // (e.g. gitTextGenerationModelByProvider.claudeCode, providerAccentColors.claudeCode).
+  const migratedSettings = useMemo(() => {
+    let patched = settings;
+    for (const key of ["gitTextGenerationModelByProvider", "providerAccentColors"] as const) {
+      const val = patched[key];
+      if (val && typeof val === "object" && "claudeCode" in val) {
+        const record = { ...val } as Record<string, string>;
+        if (typeof record.claudeAgent !== "string" && typeof record.claudeCode === "string") {
+          record.claudeAgent = record.claudeCode;
+        }
+        delete record.claudeCode;
+        patched = { ...patched, [key]: record };
+      }
+    }
+    return patched;
+  }, [settings]);
+
   const updateSettings = useCallback(
     (patch: Partial<AppSettings>) => {
-      setSettings((prev) => ({
-        ...prev,
-        ...patch,
-      }));
+      setSettings((prev) => normalizeAppSettings({ ...prev, ...patch }));
     },
     [setSettings],
   );
@@ -481,7 +484,7 @@ export function useAppSettings() {
   }, [setSettings]);
 
   return {
-    settings,
+    settings: migratedSettings,
     updateSettings,
     resetSettings,
     defaults: DEFAULT_APP_SETTINGS,
diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
index 888c52cfd0..2215569c83 100644
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -1,6 +1,8 @@
 import type { GitBranch } from "@t3tools/contracts";
+import { Schema } from "effect";
 
-export type EnvMode = "local" | "worktree";
+export const EnvMode = Schema.Literals(["local", "worktree"]);
+export type EnvMode = typeof EnvMode.Type;
 
 export function resolveEffectiveEnvMode(input: {
   activeWorktreePath: string | null;
diff --git a/apps/web/src/components/ChatView.browser.tsx b/apps/web/src/components/ChatView.browser.tsx
index 7b31dbdf38..6cbef09bd6 100644
--- a/apps/web/src/components/ChatView.browser.tsx
+++ b/apps/web/src/components/ChatView.browser.tsx
@@ -368,6 +368,8 @@ function createSnapshotWithLongProposedPlan(): OrchestrationReadModel {
                 id: "plan-browser-test",
                 turnId: null,
                 planMarkdown,
+                implementedAt: null,
+                implementationThreadId: null,
                 createdAt: isoAt(1_000),
                 updatedAt: isoAt(1_001),
               },
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index dbf352a715..b509bf33dd 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -7,33 +7,39 @@ import {
   type CodexReasoningEffort,
   type CursorReasoningOption,
   type MessageId,
-  type ProjectId,
-  type ProjectEntry,
   type ProjectScript,
   type ModelSlug,
+  type ProviderKind,
+  type ProjectEntry,
+  type ProjectId,
+  type ProviderApprovalDecision,
   PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
   PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
   type ResolvedKeybindingsConfig,
-  type ProviderApprovalDecision,
   type ServerProviderStatus,
-  type ProviderKind,
   type ThreadId,
   type TurnId,
   OrchestrationThreadActivity,
-  RuntimeMode,
   ProviderInteractionMode,
+  RuntimeMode,
 } from "@t3tools/contracts";
 import {
+  applyClaudePromptEffortPrefix,
   getClaudeCodeEffortOptions,
   getDefaultClaudeCodeEffort,
   getDefaultModel,
   getDefaultReasoningEffort,
   getCursorModelCapabilities,
   getReasoningEffortOptions,
+  isClaudeUltrathinkPrompt,
+  normalizeClaudeModelOptions,
+  normalizeCodexModelOptions,
   normalizeModelSlug,
   parseCursorModelSelection,
   resolveCursorModelFromSelection,
+  resolveReasoningEffortForProvider,
   resolveModelSlugForProvider,
+  supportsClaudeUltrathinkKeyword,
 } from "@t3tools/shared/model";
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
@@ -62,8 +68,11 @@ import {
   deriveTimelineEntries,
   deriveActiveWorkStartedAt,
   deriveActivePlanState,
+  findSidebarProposedPlan,
   findLatestProposedPlan,
   PROVIDER_OPTIONS,
+  deriveWorkLogEntries,
+  hasActionableProposedPlan,
   hasToolActivityForTurn,
   hasToolActivitySince,
   isLatestTurnSettled,
@@ -159,8 +168,8 @@ import {
 } from "./chat/ProviderModelPicker";
 import { ComposerCommandItem, ComposerCommandMenu } from "./chat/ComposerCommandMenu";
 import { ComposerPendingApprovalActions } from "./chat/ComposerPendingApprovalActions";
-import { CodexTraitsPicker } from "./chat/CodexTraitsPicker";
-import { ClaudeCodeTraitsPicker } from "./chat/ClaudeCodeTraitsPicker";
+import { ClaudeTraitsMenuContent, ClaudeTraitsPicker } from "./chat/ClaudeTraitsPicker";
+import { CodexTraitsMenuContent, CodexTraitsPicker } from "./chat/CodexTraitsPicker";
 import { CursorTraitsPicker } from "./chat/CursorTraitsPicker";
 import { CompactComposerControlsMenu } from "./chat/CompactComposerControlsMenu";
 import { ComposerPendingApprovalPanel } from "./chat/ComposerPendingApprovalPanel";
@@ -197,6 +206,17 @@ const EMPTY_PROJECT_ENTRIES: ProjectEntry[] = [];
 const EMPTY_AVAILABLE_EDITORS: EditorId[] = [];
 const EMPTY_PROVIDER_STATUSES: ServerProviderStatus[] = [];
 const EMPTY_PENDING_USER_INPUT_ANSWERS: Record<string, PendingUserInputDraftAnswer> = {};
+
+function formatOutgoingPrompt(params: {
+  provider: ProviderKind;
+  effort: string | null;
+  text: string;
+}): string {
+  if (params.provider === "claudeAgent" && params.effort === "ultrathink") {
+    return applyClaudePromptEffortPrefix(params.text, params.effort as ClaudeCodeEffort | null);
+  }
+  return params.text;
+}
 const COMPOSER_PATH_QUERY_DEBOUNCE_MS = 120;
 const SCRIPT_TERMINAL_COLS = 120;
 const SCRIPT_TERMINAL_ROWS = 30;
@@ -271,11 +291,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
   const setComposerDraftInteractionMode = useComposerDraftStore(
     (store) => store.setInteractionMode,
   );
-  const setComposerDraftEffort = useComposerDraftStore((store) => store.setEffort);
-  const setComposerDraftCodexFastMode = useComposerDraftStore((store) => store.setCodexFastMode);
-  const setComposerDraftClaudeCodeEffort = useComposerDraftStore(
-    (store) => store.setClaudeCodeEffort,
-  );
+  const setComposerDraftModelOptions = useComposerDraftStore((store) => store.setModelOptions);
   const addComposerDraftImage = useComposerDraftStore((store) => store.addImage);
   const addComposerDraftImages = useComposerDraftStore((store) => store.addImages);
   const removeComposerDraftImage = useComposerDraftStore((store) => store.removeImage);
@@ -603,7 +619,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     () => ({
       codex: settings.customCodexModels,
       copilot: settings.customCopilotModels,
-      claudeCode: settings.customClaudeModels,
+      claudeAgent: settings.customClaudeModels,
       cursor: settings.customCursorModels,
       opencode: settings.customOpencodeModels,
       geminiCli: settings.customGeminiCliModels,
@@ -637,35 +653,53 @@ export default function ChatView({ threadId }: ChatViewProps) {
       draftModel,
     ) as ModelSlug;
   }, [baseThreadModel, composerDraft.model, customModelsForSelectedProvider, selectedProvider]);
-  const reasoningOptions = getReasoningEffortOptions(selectedProvider);
-  const supportsReasoningEffort = reasoningOptions.length > 0;
-  const selectedEffort = composerDraft.effort ?? getDefaultReasoningEffort(selectedProvider);
-  const selectedCodexFastModeEnabled =
-    selectedProvider === "codex" ? composerDraft.codexFastMode : false;
-  const claudeCodeEffortOptions = getClaudeCodeEffortOptions(selectedProvider);
-  const supportsClaudeCodeEffort = claudeCodeEffortOptions.length > 0;
-  const selectedClaudeCodeEffort =
-    composerDraft.claudeCodeEffort ?? getDefaultClaudeCodeEffort(selectedProvider);
+  const draftModelOptions = composerDraft.modelOptions;
+  const selectedCodexEffort =
+    selectedProvider === "codex"
+      ? (resolveReasoningEffortForProvider("codex", draftModelOptions?.codex?.reasoningEffort) ??
+        getDefaultReasoningEffort("codex"))
+      : null;
+  const selectedClaudeReasoningOptions =
+    selectedProvider === "claudeAgent"
+      ? getReasoningEffortOptions("claudeAgent", selectedModel)
+      : ([] as const);
+  const selectedClaudeBaseEffort =
+    selectedProvider === "claudeAgent" && selectedClaudeReasoningOptions.length > 0
+      ? (() => {
+          const draftEffort = resolveReasoningEffortForProvider(
+            "claudeAgent",
+            draftModelOptions?.claudeAgent?.effort,
+          );
+          if (
+            draftEffort &&
+            draftEffort !== "ultrathink" &&
+            selectedClaudeReasoningOptions.includes(draftEffort)
+          ) {
+            return draftEffort;
+          }
+          const defaultEffort = getDefaultReasoningEffort("claudeAgent");
+          return selectedClaudeReasoningOptions.includes(defaultEffort) ? defaultEffort : null;
+        })()
+      : null;
+  const isClaudeUltrathink =
+    selectedProvider === "claudeAgent" &&
+    supportsClaudeUltrathinkKeyword(selectedModel) &&
+    isClaudeUltrathinkPrompt(prompt);
+  const selectedPromptEffort = selectedCodexEffort ?? selectedClaudeBaseEffort;
   const selectedModelOptionsForDispatch = useMemo(() => {
     if (selectedProvider === "codex") {
-      const codexOptions = {
-        ...(supportsReasoningEffort && selectedEffort ? { reasoningEffort: selectedEffort } : {}),
-        ...(selectedCodexFastModeEnabled ? { fastMode: true } : {}),
-      };
-      return Object.keys(codexOptions).length > 0 ? { codex: codexOptions } : undefined;
+      const codexOptions = normalizeCodexModelOptions(draftModelOptions?.codex);
+      return codexOptions ? { codex: codexOptions } : undefined;
     }
-    if (selectedProvider === "claudeCode" && supportsClaudeCodeEffort && selectedClaudeCodeEffort) {
-      return { claudeCode: { effort: selectedClaudeCodeEffort } };
+    if (selectedProvider === "claudeAgent") {
+      const claudeOptions = normalizeClaudeModelOptions(
+        selectedModel,
+        draftModelOptions?.claudeAgent,
+      );
+      return claudeOptions ? { claudeAgent: claudeOptions } : undefined;
     }
     return undefined;
-  }, [
-    selectedClaudeCodeEffort,
-    selectedCodexFastModeEnabled,
-    selectedEffort,
-    selectedProvider,
-    supportsClaudeCodeEffort,
-    supportsReasoningEffort,
-  ]);
+  }, [draftModelOptions, selectedModel, selectedProvider]);
   const selectedCursorModel = useMemo(
     () => (selectedProvider === "cursor" ? parseCursorModelSelection(selectedModel) : null),
     [selectedModel, selectedProvider],
@@ -832,6 +866,16 @@ export default function ChatView({ threadId }: ChatViewProps) {
       activeLatestTurn?.turnId ?? null,
     );
   }, [activeLatestTurn?.turnId, activeThread?.proposedPlans, latestTurnSettled]);
+  const sidebarProposedPlan = useMemo(
+    () =>
+      findSidebarProposedPlan({
+        threads,
+        latestTurn: activeLatestTurn,
+        latestTurnSettled,
+        threadId: activeThread?.id ?? null,
+      }),
+    [activeLatestTurn, activeThread?.id, latestTurnSettled, threads],
+  );
   const activePlan = useMemo(
     () => deriveActivePlanState(threadActivities, activeLatestTurn?.turnId ?? undefined),
     [activeLatestTurn?.turnId, threadActivities],
@@ -840,7 +884,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     pendingUserInputs.length === 0 &&
     interactionMode === "plan" &&
     latestTurnSettled &&
-    activeProposedPlan !== null;
+    hasActionableProposedPlan(activeProposedPlan);
   const activePendingApproval = pendingApprovals[0] ?? null;
   const isComposerApprovalState = activePendingApproval !== null;
   const hasComposerHeader =
@@ -1675,7 +1719,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
   const togglePlanSidebar = useCallback(() => {
     setPlanSidebarOpen((open) => {
       if (open) {
-        const turnKey = activePlan?.turnId ?? activeProposedPlan?.turnId ?? null;
+        const turnKey = activePlan?.turnId ?? sidebarProposedPlan?.turnId ?? null;
         if (turnKey) {
           planSidebarDismissedForTurnRef.current = turnKey;
         }
@@ -1684,7 +1728,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
       }
       return !open;
     });
-  }, [activePlan?.turnId, activeProposedPlan?.turnId]);
+  }, [activePlan?.turnId, sidebarProposedPlan?.turnId]);
 
   const persistThreadSettingsForNextTurn = useCallback(
     async (input: {
@@ -2486,7 +2530,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
         ? parseStandaloneComposerSlashCommand(trimmed)
         : null;
     if (standaloneSlashCommand) {
-      await handleInteractionModeChange(standaloneSlashCommand);
+      handleInteractionModeChange(standaloneSlashCommand);
       promptRef.current = "";
       clearComposerDraftContent(activeThread.id);
       setComposerHighlightedItemId(null);
@@ -2539,6 +2583,11 @@ export default function ChatView({ threadId }: ChatViewProps) {
     );
     const messageIdForSend = newMessageId();
     const messageCreatedAt = new Date().toISOString();
+    const outgoingMessageText = formatOutgoingPrompt({
+      provider: selectedProvider,
+      effort: selectedPromptEffort,
+      text: messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT,
+    });
     const turnAttachmentsPromise = Promise.all(
       composerImagesSnapshot.map(async (image) => ({
         type: "image" as const,
@@ -2561,7 +2610,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
       {
         id: messageIdForSend,
         role: "user",
-        text: messageTextForSend,
+        text: outgoingMessageText,
         ...(optimisticAttachments.length > 0 ? { attachments: optimisticAttachments } : {}),
         createdAt: messageCreatedAt,
         streaming: false,
@@ -2712,7 +2761,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
         message: {
           messageId: messageIdForSend,
           role: "user",
-          text: messageTextForSend || IMAGE_ONLY_BOOTSTRAP_PROMPT,
+          text: outgoingMessageText,
           attachments: turnAttachments,
         },
         model: selectedModel || undefined,
@@ -2955,6 +3004,11 @@ export default function ChatView({ threadId }: ChatViewProps) {
       const threadIdForSend = activeThread.id;
       const messageIdForSend = newMessageId();
       const messageCreatedAt = new Date().toISOString();
+      const outgoingMessageText = formatOutgoingPrompt({
+        provider: selectedProvider,
+        effort: selectedPromptEffort,
+        text: trimmed,
+      });
 
       sendInFlightRef.current = true;
       beginSendPhase("sending-turn");
@@ -2964,7 +3018,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
         {
           id: messageIdForSend,
           role: "user",
-          text: trimmed,
+          text: outgoingMessageText,
           createdAt: messageCreatedAt,
           streaming: false,
         },
@@ -2992,7 +3046,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
           message: {
             messageId: messageIdForSend,
             role: "user",
-            text: trimmed,
+            text: outgoingMessageText,
             attachments: [],
           },
           provider: selectedProvider,
@@ -3004,6 +3058,14 @@ export default function ChatView({ threadId }: ChatViewProps) {
           assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
           runtimeMode,
           interactionMode: nextInteractionMode,
+          ...(nextInteractionMode === "default" && activeProposedPlan
+            ? {
+                sourceProposedPlan: {
+                  threadId: activeThread.id,
+                  planId: activeProposedPlan.id,
+                },
+              }
+            : {}),
           createdAt: messageCreatedAt,
         });
         // Optimistically open the plan sidebar when implementing (not refining).
@@ -3028,6 +3090,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     },
     [
       activeThread,
+      activeProposedPlan,
       beginSendPhase,
       forceStickToBottom,
       isConnecting,
@@ -3036,6 +3099,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
       persistThreadSettingsForNextTurn,
       resetSendPhase,
       runtimeMode,
+      selectedPromptEffort,
       selectedModel,
       selectedModelOptionsForDispatch,
       providerOptionsForDispatch,
@@ -3065,6 +3129,11 @@ export default function ChatView({ threadId }: ChatViewProps) {
     const nextThreadId = newThreadId();
     const planMarkdown = activeProposedPlan.planMarkdown;
     const implementationPrompt = buildPlanImplementationPrompt(planMarkdown);
+    const outgoingImplementationPrompt = formatOutgoingPrompt({
+      provider: selectedProvider,
+      effort: selectedPromptEffort,
+      text: implementationPrompt,
+    });
     const nextThreadTitle = truncateTitle(buildPlanImplementationThreadTitle(planMarkdown));
     const nextThreadModel: ModelSlug =
       selectedModel ||
@@ -3101,7 +3170,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
           message: {
             messageId: newMessageId(),
             role: "user",
-            text: implementationPrompt,
+            text: outgoingImplementationPrompt,
             attachments: [],
           },
           provider: selectedProvider,
@@ -3159,6 +3228,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     navigate,
     resetSendPhase,
     runtimeMode,
+    selectedPromptEffort,
     selectedModel,
     selectedModelOptionsForDispatch,
     providerOptionsForDispatch,
@@ -3190,12 +3260,21 @@ export default function ChatView({ threadId }: ChatViewProps) {
       setComposerDraftProvider,
     ],
   );
-  const onEffortSelect = useCallback(
-    (effort: CodexReasoningEffort) => {
-      setComposerDraftEffort(threadId, effort);
+  const setPromptFromTraits = useCallback(
+    (nextPrompt: string) => {
+      const currentPrompt = promptRef.current;
+      if (nextPrompt === currentPrompt) {
+        scheduleComposerFocus();
+        return;
+      }
+      promptRef.current = nextPrompt;
+      setPrompt(nextPrompt);
+      const nextCursor = collapseExpandedComposerCursor(nextPrompt, nextPrompt.length);
+      setComposerCursor(nextCursor);
+      setComposerTrigger(detectComposerTrigger(nextPrompt, nextPrompt.length));
       scheduleComposerFocus();
     },
-    [scheduleComposerFocus, setComposerDraftEffort, threadId],
+    [scheduleComposerFocus, setPrompt],
   );
   const onCursorReasoningSelect = useCallback(
     (reasoning: CursorReasoningOption) => {
@@ -3239,20 +3318,6 @@ export default function ChatView({ threadId }: ChatViewProps) {
     },
     [onProviderModelSelect, selectedModel, selectedProvider],
   );
-  const onCodexFastModeChange = useCallback(
-    (enabled: boolean) => {
-      setComposerDraftCodexFastMode(threadId, enabled);
-      scheduleComposerFocus();
-    },
-    [scheduleComposerFocus, setComposerDraftCodexFastMode, threadId],
-  );
-  const onClaudeCodeEffortSelect = useCallback(
-    (effort: ClaudeCodeEffort) => {
-      setComposerDraftClaudeCodeEffort(threadId, effort);
-      scheduleComposerFocus();
-    },
-    [scheduleComposerFocus, setComposerDraftClaudeCodeEffort, threadId],
-  );
   const onEnvModeChange = useCallback(
     (mode: DraftThreadEnvMode) => {
       if (isLocalDraftThread) {
@@ -3686,74 +3751,71 @@ export default function ChatView({ threadId }: ChatViewProps) {
               data-chat-composer-form="true"
             >
               <div
-                className={`group relative rounded-[20px] border bg-card transition-colors duration-200 ${
-                  isDragOverComposer
-                    ? interactionMode === "plan"
-                      ? "border-ring-plan/70 bg-accent/30"
-                      : "border-primary/70 bg-accent/30"
-                    : "border-border"
-                } ${interactionMode === "plan" ? "focus-within:border-ring-plan/45" : "focus-within:border-ring/45"}`}
+                className={cn(
+                  "group rounded-[22px] p-px transition-colors duration-200",
+                  isClaudeUltrathink ? "ultrathink-frame" : undefined,
+                )}
                 onDragEnter={onComposerDragEnter}
                 onDragOver={onComposerDragOver}
                 onDragLeave={onComposerDragLeave}
                 onDrop={onComposerDrop}
               >
-                {interactionMode === "plan" && (
-                  <span className="absolute -top-2.5 left-4 z-10 rounded-full bg-card px-2 py-0.5 text-[10px] font-semibold tracking-wider text-ring-plan/50 group-focus-within:text-ring-plan">
-                    PLAN
-                  </span>
-                )}
-                {activePendingApproval ? (
-                  <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
-                    <ComposerPendingApprovalPanel
-                      approval={activePendingApproval}
-                      pendingCount={pendingApprovals.length}
-                    />
-                  </div>
-                ) : pendingUserInputs.length > 0 ? (
-                  <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
-                    <ComposerPendingUserInputPanel
-                      pendingUserInputs={pendingUserInputs}
-                      respondingRequestIds={respondingUserInputRequestIds}
-                      answers={activePendingDraftAnswers}
-                      questionIndex={activePendingQuestionIndex}
-                      onSelectOption={onSelectActivePendingUserInputOption}
-                      onAdvance={onAdvanceActivePendingUserInput}
-                    />
-                  </div>
-                ) : showPlanFollowUpPrompt && activeProposedPlan ? (
-                  <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
-                    <ComposerPlanFollowUpBanner
-                      key={activeProposedPlan.id}
-                      planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}
-                    />
-                  </div>
-                ) : null}
-
-                {/* Textarea area */}
                 <div
                   className={cn(
-                    "relative px-3 pb-2 sm:px-4",
-                    hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",
+                    "rounded-[20px] border bg-card transition-colors duration-200 focus-within:border-ring/45",
+                    isDragOverComposer ? "border-primary/70 bg-accent/30" : "border-border",
+                    isClaudeUltrathink ? "shadow-[0_0_0_1px_rgba(255,255,255,0.04)_inset]" : "",
                   )}
                 >
-                  {composerMenuOpen && !isComposerApprovalState && (
-                    <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">
-                      <ComposerCommandMenu
-                        items={composerMenuItems}
-                        resolvedTheme={resolvedTheme}
-                        isLoading={isComposerMenuLoading}
-                        triggerKind={composerTriggerKind}
-                        activeItemId={activeComposerMenuItem?.id ?? null}
-                        onHighlightedItemChange={onComposerMenuItemHighlighted}
-                        onSelect={onSelectComposerItem}
+                  {activePendingApproval ? (
+                    <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+                      <ComposerPendingApprovalPanel
+                        approval={activePendingApproval}
+                        pendingCount={pendingApprovals.length}
                       />
                     </div>
-                  )}
+                  ) : pendingUserInputs.length > 0 ? (
+                    <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+                      <ComposerPendingUserInputPanel
+                        pendingUserInputs={pendingUserInputs}
+                        respondingRequestIds={respondingUserInputRequestIds}
+                        answers={activePendingDraftAnswers}
+                        questionIndex={activePendingQuestionIndex}
+                        onSelectOption={onSelectActivePendingUserInputOption}
+                        onAdvance={onAdvanceActivePendingUserInput}
+                      />
+                    </div>
+                  ) : showPlanFollowUpPrompt && activeProposedPlan ? (
+                    <div className="rounded-t-[19px] border-b border-border/65 bg-muted/20">
+                      <ComposerPlanFollowUpBanner
+                        key={activeProposedPlan.id}
+                        planTitle={proposedPlanTitle(activeProposedPlan.planMarkdown) ?? null}
+                      />
+                    </div>
+                  ) : null}
+                  <div
+                    className={cn(
+                      "relative px-3 pb-2 sm:px-4",
+                      hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4",
+                    )}
+                  >
+                    {composerMenuOpen && !isComposerApprovalState && (
+                      <div className="absolute inset-x-0 bottom-full z-20 mb-2 px-1">
+                        <ComposerCommandMenu
+                          items={composerMenuItems}
+                          resolvedTheme={resolvedTheme}
+                          isLoading={isComposerMenuLoading}
+                          triggerKind={composerTriggerKind}
+                          activeItemId={activeComposerMenuItem?.id ?? null}
+                          onHighlightedItemChange={onComposerMenuItemHighlighted}
+                          onSelect={onSelectComposerItem}
+                        />
+                      </div>
+                    )}
 
-                  {!isComposerApprovalState && pendingUserInputs.length === 0 && (
-                    <>
-                      {composerImages.length > 0 && (
+                    {!isComposerApprovalState &&
+                      pendingUserInputs.length === 0 &&
+                      composerImages.length > 0 && (
                         <div className="mb-3 flex flex-wrap gap-2">
                           {composerImages.map((image) => (
                             <div
@@ -3820,423 +3882,394 @@ export default function ChatView({ threadId }: ChatViewProps) {
                           ))}
                         </div>
                       )}
-                    </>
-                  )}
-                  <ComposerPromptEditor
-                    ref={composerEditorRef}
-                    value={
-                      isComposerApprovalState
-                        ? ""
-                        : activePendingProgress
-                          ? activePendingProgress.customAnswer
-                          : prompt
-                    }
-                    cursor={composerCursor}
-                    terminalContexts={
-                      !isComposerApprovalState && pendingUserInputs.length === 0
-                        ? composerTerminalContexts
-                        : []
-                    }
-                    onRemoveTerminalContext={removeComposerTerminalContextFromDraft}
-                    onChange={onPromptChange}
-                    onCommandKeyDown={onComposerCommandKey}
-                    onPaste={onComposerPaste}
-                    placeholder={
-                      isComposerApprovalState
-                        ? (activePendingApproval?.detail ??
-                          "Resolve this approval request to continue")
-                        : activePendingProgress
-                          ? "Type your own answer, or leave this blank to use the selected option"
-                          : showPlanFollowUpPrompt && activeProposedPlan
-                            ? "Add feedback to refine the plan, or leave this blank to implement it"
-                            : phase === "disconnected"
-                              ? "Ask for follow-up changes or attach images"
-                              : "Ask anything, @tag files/folders, or use / to show available commands"
-                    }
-                    disabled={isConnecting || isComposerApprovalState}
-                  />
-                </div>
-
-                {/* Bottom toolbar */}
-                {activePendingApproval ? (
-                  <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">
-                    <ComposerPendingApprovalActions
-                      requestId={activePendingApproval.requestId}
-                      isResponding={respondingRequestIds.includes(activePendingApproval.requestId)}
-                      onRespondToApproval={onRespondToApproval}
+                    <ComposerPromptEditor
+                      ref={composerEditorRef}
+                      value={
+                        isComposerApprovalState
+                          ? ""
+                          : activePendingProgress
+                            ? activePendingProgress.customAnswer
+                            : prompt
+                      }
+                      cursor={composerCursor}
+                      terminalContexts={
+                        !isComposerApprovalState && pendingUserInputs.length === 0
+                          ? composerTerminalContexts
+                          : []
+                      }
+                      onRemoveTerminalContext={removeComposerTerminalContextFromDraft}
+                      onChange={onPromptChange}
+                      onCommandKeyDown={onComposerCommandKey}
+                      onPaste={onComposerPaste}
+                      placeholder={
+                        isComposerApprovalState
+                          ? (activePendingApproval?.detail ??
+                            "Resolve this approval request to continue")
+                          : activePendingProgress
+                            ? "Type your own answer, or leave this blank to use the selected option"
+                            : showPlanFollowUpPrompt && activeProposedPlan
+                              ? "Add feedback to refine the plan, or leave this blank to implement it"
+                              : phase === "disconnected"
+                                ? "Ask for follow-up changes or attach images"
+                                : "Ask anything, @tag files/folders, or use / to show available commands"
+                      }
+                      disabled={isConnecting || isComposerApprovalState}
                     />
                   </div>
-                ) : (
-                  <div
-                    data-chat-composer-footer="true"
-                    className={cn(
-                      "flex items-center justify-between px-2.5 pb-2.5 sm:px-3 sm:pb-3",
-                      isComposerFooterCompact
-                        ? "gap-1.5"
-                        : "flex-wrap gap-2 sm:flex-nowrap sm:gap-0",
-                    )}
-                  >
+
+                  {/* Bottom toolbar */}
+                  {activePendingApproval ? (
+                    <div className="flex items-center justify-end gap-2 px-2.5 pb-2.5 sm:px-3 sm:pb-3">
+                      <ComposerPendingApprovalActions
+                        requestId={activePendingApproval.requestId}
+                        isResponding={respondingRequestIds.includes(
+                          activePendingApproval.requestId,
+                        )}
+                        onRespondToApproval={onRespondToApproval}
+                      />
+                    </div>
+                  ) : (
                     <div
+                      data-chat-composer-footer="true"
                       className={cn(
-                        "flex min-w-0 flex-1 items-center",
+                        "flex items-center justify-between px-2.5 pb-2.5 sm:px-3 sm:pb-3",
                         isComposerFooterCompact
-                          ? "gap-1 overflow-hidden"
-                          : "gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden sm:min-w-max sm:overflow-visible",
+                          ? "gap-1.5"
+                          : "flex-wrap gap-2 sm:flex-nowrap sm:gap-0",
                       )}
                     >
-                      {/* Provider/model picker */}
-                      <ProviderModelPicker
-                        compact={isComposerFooterCompact}
-                        provider={selectedProvider}
-                        model={selectedModelForPickerWithCustomFallback}
-                        lockedProvider={lockedProvider}
-                        modelOptionsByProvider={modelOptionsByProvider}
-                        onProviderModelChange={onProviderModelSelect}
-                      />
-
-                      {isComposerFooterCompact ? (
-                        <>
-                          {selectedProvider === "cursor" &&
-                            hasSelectedCursorTraits &&
-                            selectedCursorModel &&
-                            selectedCursorModelCapabilities && (
-                              <CursorTraitsPicker
-                                selection={selectedCursorModel}
-                                capabilities={selectedCursorModelCapabilities}
-                                onReasoningChange={onCursorReasoningSelect}
-                                onFastModeChange={onCursorFastModeChange}
-                                onThinkingModeChange={onCursorThinkingModeChange}
-                              />
-                            )}
-                          {selectedProvider === "claudeCode" &&
-                            supportsClaudeCodeEffort &&
-                            selectedClaudeCodeEffort != null && (
-                              <ClaudeCodeTraitsPicker
-                                effort={selectedClaudeCodeEffort}
-                                options={claudeCodeEffortOptions}
-                                onEffortChange={onClaudeCodeEffortSelect}
-                              />
-                            )}
+                      <div
+                        className={cn(
+                          "flex min-w-0 flex-1 items-center",
+                          isComposerFooterCompact
+                            ? "gap-1 overflow-hidden"
+                            : "gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden sm:min-w-max sm:overflow-visible",
+                        )}
+                      >
+                        {/* Provider/model picker */}
+                        <ProviderModelPicker
+                          compact={isComposerFooterCompact}
+                          provider={selectedProvider}
+                          model={selectedModelForPickerWithCustomFallback}
+                          lockedProvider={lockedProvider}
+                          modelOptionsByProvider={modelOptionsByProvider}
+                          ultrathinkActive={isClaudeUltrathink}
+                          onProviderModelChange={onProviderModelSelect}
+                        />
+
+                        {isComposerFooterCompact ? (
                           <CompactComposerControlsMenu
                             activePlan={Boolean(
-                              activePlan || activeProposedPlan || planSidebarOpen,
+                              activePlan || sidebarProposedPlan || planSidebarOpen,
                             )}
                             interactionMode={interactionMode}
                             planSidebarOpen={planSidebarOpen}
                             runtimeMode={runtimeMode}
-                            selectedEffort={selectedEffort}
-                            selectedProvider={selectedProvider}
-                            selectedCodexFastModeEnabled={selectedCodexFastModeEnabled}
-                            reasoningOptions={reasoningOptions}
-                            onEffortSelect={onEffortSelect}
-                            onCodexFastModeChange={onCodexFastModeChange}
+                            traitsMenuContent={
+                              selectedProvider === "codex" ? (
+                                <CodexTraitsMenuContent threadId={threadId} />
+                              ) : selectedProvider === "claudeAgent" ? (
+                                <ClaudeTraitsMenuContent
+                                  threadId={threadId}
+                                  model={selectedModel}
+                                  onPromptChange={setPromptFromTraits}
+                                />
+                              ) : null
+                            }
                             onToggleInteractionMode={toggleInteractionMode}
                             onTogglePlanSidebar={togglePlanSidebar}
                             onToggleRuntimeMode={toggleRuntimeMode}
                           />
-                        </>
-                      ) : (
-                        <>
-                          {selectedProvider === "cursor" ? (
-                            <>
-                              {hasSelectedCursorTraits && (
+                        ) : (
+                          <>
+                            {selectedProvider === "cursor" ? (
+                              <>
+                                {hasSelectedCursorTraits && (
+                                  <Separator
+                                    orientation="vertical"
+                                    className="mx-0.5 hidden h-4 sm:block"
+                                  />
+                                )}
+                                {selectedCursorModel &&
+                                  selectedCursorModelCapabilities &&
+                                  hasSelectedCursorTraits && (
+                                    <CursorTraitsPicker
+                                      selection={selectedCursorModel}
+                                      capabilities={selectedCursorModelCapabilities}
+                                      onReasoningChange={onCursorReasoningSelect}
+                                      onFastModeChange={onCursorFastModeChange}
+                                      onThinkingModeChange={onCursorThinkingModeChange}
+                                    />
+                                  )}
+                              </>
+                            ) : selectedProvider === "codex" ? (
+                              <>
                                 <Separator
                                   orientation="vertical"
                                   className="mx-0.5 hidden h-4 sm:block"
                                 />
-                              )}
+                                <CodexTraitsPicker threadId={threadId} />
+                              </>
+                            ) : selectedProvider === "claudeAgent" ? (
+                              <>
+                                <Separator
+                                  orientation="vertical"
+                                  className="mx-0.5 hidden h-4 sm:block"
+                                />
+                                <ClaudeTraitsPicker
+                                  threadId={threadId}
+                                  model={selectedModel}
+                                  onPromptChange={setPromptFromTraits}
+                                />
+                              </>
+                            ) : null}
 
-                              {selectedCursorModel &&
-                                selectedCursorModelCapabilities &&
-                                hasSelectedCursorTraits && (
-                                  <CursorTraitsPicker
-                                    selection={selectedCursorModel}
-                                    capabilities={selectedCursorModelCapabilities}
-                                    onReasoningChange={onCursorReasoningSelect}
-                                    onFastModeChange={onCursorFastModeChange}
-                                    onThinkingModeChange={onCursorThinkingModeChange}
-                                  />
-                                )}
-                            </>
-                          ) : selectedProvider === "codex" && selectedEffort != null ? (
-                            <>
-                              <Separator
-                                orientation="vertical"
-                                className="mx-0.5 hidden h-4 sm:block"
-                              />
-                              <CodexTraitsPicker
-                                effort={selectedEffort}
-                                fastModeEnabled={selectedCodexFastModeEnabled}
-                                options={reasoningOptions}
-                                onEffortChange={onEffortSelect}
-                                onFastModeChange={onCodexFastModeChange}
-                              />
-                            </>
-                          ) : selectedProvider === "claudeCode" &&
-                            supportsClaudeCodeEffort &&
-                            selectedClaudeCodeEffort != null ? (
-                            <>
-                              <Separator
-                                orientation="vertical"
-                                className="mx-0.5 hidden h-4 sm:block"
-                              />
-                              <ClaudeCodeTraitsPicker
-                                effort={selectedClaudeCodeEffort}
-                                options={claudeCodeEffortOptions}
-                                onEffortChange={onClaudeCodeEffortSelect}
-                              />
-                            </>
-                          ) : null}
-
-                          <Separator
-                            orientation="vertical"
-                            className="mx-0.5 hidden h-4 sm:block"
-                          />
+                            <Separator
+                              orientation="vertical"
+                              className="mx-0.5 hidden h-4 sm:block"
+                            />
 
-                          <Button
-                            variant="ghost"
-                            className={`shrink-0 whitespace-nowrap px-2 hover:text-foreground/80 sm:px-3 ${
-                              interactionMode === "plan"
-                                ? "text-ring-plan"
-                                : "text-muted-foreground/70"
-                            }`}
-                            size="sm"
-                            type="button"
-                            onClick={toggleInteractionMode}
-                            title={
-                              interactionMode === "plan"
-                                ? "Plan mode — click to return to normal chat mode"
-                                : "Default mode — click to enter plan mode"
-                            }
-                          >
-                            <BotIcon />
-                            <span className="sr-only sm:not-sr-only">
-                              {interactionMode === "plan" ? "Plan" : "Chat"}
-                            </span>
-                          </Button>
-
-                          <Separator
-                            orientation="vertical"
-                            className="mx-0.5 hidden h-4 sm:block"
-                          />
+                            <Button
+                              variant="ghost"
+                              className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
+                              size="sm"
+                              type="button"
+                              onClick={toggleInteractionMode}
+                              title={
+                                interactionMode === "plan"
+                                  ? "Plan mode — click to return to normal chat mode"
+                                  : "Default mode — click to enter plan mode"
+                              }
+                            >
+                              <BotIcon />
+                              <span className="sr-only sm:not-sr-only">
+                                {interactionMode === "plan" ? "Plan" : "Chat"}
+                              </span>
+                            </Button>
 
-                          <Button
-                            variant="ghost"
-                            className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
-                            size="sm"
-                            type="button"
-                            onClick={() =>
-                              void handleRuntimeModeChange(
-                                runtimeMode === "full-access" ? "approval-required" : "full-access",
-                              )
-                            }
-                            title={
-                              runtimeMode === "full-access"
-                                ? "Full access — click to require approvals"
-                                : "Approval required — click for full access"
-                            }
-                          >
-                            {runtimeMode === "full-access" ? <LockOpenIcon /> : <LockIcon />}
-                            <span className="sr-only sm:not-sr-only">
-                              {runtimeMode === "full-access" ? "Full access" : "Supervised"}
-                            </span>
-                          </Button>
-
-                          {activePlan || activeProposedPlan || planSidebarOpen ? (
-                            <>
-                              <Separator
-                                orientation="vertical"
-                                className="mx-0.5 hidden h-4 sm:block"
-                              />
-                              <Button
-                                variant="ghost"
-                                className={cn(
-                                  "shrink-0 whitespace-nowrap px-2 sm:px-3",
-                                  planSidebarOpen
-                                    ? "text-blue-400 hover:text-blue-300"
-                                    : "text-muted-foreground/70 hover:text-foreground/80",
-                                )}
-                                size="sm"
-                                type="button"
-                                onClick={togglePlanSidebar}
-                                title={planSidebarOpen ? "Hide plan sidebar" : "Show plan sidebar"}
-                              >
-                                <ListTodoIcon />
-                                <span className="sr-only sm:not-sr-only">Plan</span>
-                              </Button>
-                            </>
-                          ) : null}
-                        </>
-                      )}
-                    </div>
+                            <Separator
+                              orientation="vertical"
+                              className="mx-0.5 hidden h-4 sm:block"
+                            />
 
-                    {/* Right side: send / stop button */}
-                    <div
-                      data-chat-composer-actions="right"
-                      className="flex shrink-0 items-center gap-2"
-                    >
-                      {isPreparingWorktree ? (
-                        <span className="text-muted-foreground/70 text-xs">
-                          Preparing worktree...
-                        </span>
-                      ) : null}
-                      {activePendingProgress ? (
-                        <div className="flex items-center gap-2">
-                          {activePendingProgress.questionIndex > 0 ? (
                             <Button
+                              variant="ghost"
+                              className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
                               size="sm"
-                              variant="outline"
-                              className="rounded-full"
-                              onClick={onPreviousActivePendingUserInputQuestion}
-                              disabled={activePendingIsResponding}
+                              type="button"
+                              onClick={() =>
+                                void handleRuntimeModeChange(
+                                  runtimeMode === "full-access"
+                                    ? "approval-required"
+                                    : "full-access",
+                                )
+                              }
+                              title={
+                                runtimeMode === "full-access"
+                                  ? "Full access — click to require approvals"
+                                  : "Approval required — click for full access"
+                              }
                             >
-                              Previous
+                              {runtimeMode === "full-access" ? <LockOpenIcon /> : <LockIcon />}
+                              <span className="sr-only sm:not-sr-only">
+                                {runtimeMode === "full-access" ? "Full access" : "Supervised"}
+                              </span>
                             </Button>
-                          ) : null}
-                          <Button
-                            type="submit"
-                            size="sm"
-                            className="shrink-0 whitespace-nowrap rounded-full px-4"
-                            disabled={
-                              activePendingIsResponding ||
-                              (activePendingProgress.isLastQuestion
-                                ? !activePendingResolvedAnswers
-                                : !activePendingProgress.canAdvance)
-                            }
-                          >
-                            {activePendingIsResponding
-                              ? "Submitting..."
-                              : activePendingProgress.isLastQuestion
-                                ? "Submit answers"
-                                : "Next question"}
-                          </Button>
-                        </div>
-                      ) : phase === "running" ? (
-                        <button
-                          type="button"
-                          className="flex size-8 cursor-pointer items-center justify-center rounded-full bg-rose-500/90 text-white transition-all duration-150 hover:bg-rose-500 hover:scale-105 sm:h-8 sm:w-8"
-                          onClick={() => void onInterrupt()}
-                          aria-label="Stop generation"
-                        >
-                          <svg
-                            width="12"
-                            height="12"
-                            viewBox="0 0 12 12"
-                            fill="currentColor"
-                            aria-hidden="true"
-                          >
-                            <rect x="2" y="2" width="8" height="8" rx="1.5" />
-                          </svg>
-                        </button>
-                      ) : pendingUserInputs.length === 0 ? (
-                        showPlanFollowUpPrompt ? (
-                          prompt.trim().length > 0 ? (
+
+                            {activePlan || sidebarProposedPlan || planSidebarOpen ? (
+                              <>
+                                <Separator
+                                  orientation="vertical"
+                                  className="mx-0.5 hidden h-4 sm:block"
+                                />
+                                <Button
+                                  variant="ghost"
+                                  className={cn(
+                                    "shrink-0 whitespace-nowrap px-2 sm:px-3",
+                                    planSidebarOpen
+                                      ? "text-blue-400 hover:text-blue-300"
+                                      : "text-muted-foreground/70 hover:text-foreground/80",
+                                  )}
+                                  size="sm"
+                                  type="button"
+                                  onClick={togglePlanSidebar}
+                                  title={
+                                    planSidebarOpen ? "Hide plan sidebar" : "Show plan sidebar"
+                                  }
+                                >
+                                  <ListTodoIcon />
+                                  <span className="sr-only sm:not-sr-only">Plan</span>
+                                </Button>
+                              </>
+                            ) : null}
+                          </>
+                        )}
+                      </div>
+
+                      {/* Right side: send / stop button */}
+                      <div
+                        data-chat-composer-actions="right"
+                        className="flex shrink-0 items-center gap-2"
+                      >
+                        {isPreparingWorktree ? (
+                          <span className="text-muted-foreground/70 text-xs">
+                            Preparing worktree...
+                          </span>
+                        ) : null}
+                        {activePendingProgress ? (
+                          <div className="flex items-center gap-2">
+                            {activePendingProgress.questionIndex > 0 ? (
+                              <Button
+                                size="sm"
+                                variant="outline"
+                                className="rounded-full"
+                                onClick={onPreviousActivePendingUserInputQuestion}
+                                disabled={activePendingIsResponding}
+                              >
+                                Previous
+                              </Button>
+                            ) : null}
                             <Button
                               type="submit"
                               size="sm"
-                              className="h-9 rounded-full px-4 sm:h-8"
-                              disabled={isSendBusy || isConnecting}
+                              className="rounded-full px-4"
+                              disabled={
+                                activePendingIsResponding ||
+                                (activePendingProgress.isLastQuestion
+                                  ? !activePendingResolvedAnswers
+                                  : !activePendingProgress.canAdvance)
+                              }
                             >
-                              {isConnecting || isSendBusy ? "Sending..." : "Refine"}
+                              {activePendingIsResponding
+                                ? "Submitting..."
+                                : activePendingProgress.isLastQuestion
+                                  ? "Submit answers"
+                                  : "Next question"}
                             </Button>
-                          ) : (
-                            <div className="flex items-center">
+                          </div>
+                        ) : phase === "running" ? (
+                          <button
+                            type="button"
+                            className="flex size-8 cursor-pointer items-center justify-center rounded-full bg-rose-500/90 text-white transition-all duration-150 hover:bg-rose-500 hover:scale-105 sm:h-8 sm:w-8"
+                            onClick={() => void onInterrupt()}
+                            aria-label="Stop generation"
+                          >
+                            <svg
+                              width="12"
+                              height="12"
+                              viewBox="0 0 12 12"
+                              fill="currentColor"
+                              aria-hidden="true"
+                            >
+                              <rect x="2" y="2" width="8" height="8" rx="1.5" />
+                            </svg>
+                          </button>
+                        ) : pendingUserInputs.length === 0 ? (
+                          showPlanFollowUpPrompt ? (
+                            prompt.trim().length > 0 ? (
                               <Button
                                 type="submit"
                                 size="sm"
-                                className="h-9 rounded-l-full rounded-r-none px-4 sm:h-8"
+                                className="h-9 rounded-full px-4 sm:h-8"
                                 disabled={isSendBusy || isConnecting}
                               >
-                                {isConnecting || isSendBusy ? "Sending..." : "Implement"}
+                                {isConnecting || isSendBusy ? "Sending..." : "Refine"}
                               </Button>
-                              <Menu>
-                                <MenuTrigger
-                                  render={
-                                    <Button
-                                      size="sm"
-                                      variant="default"
-                                      className="h-9 rounded-l-none rounded-r-full border-l-white/12 px-2 sm:h-8"
-                                      aria-label="Implementation actions"
-                                      disabled={isSendBusy || isConnecting}
-                                    />
-                                  }
+                            ) : (
+                              <div className="flex items-center">
+                                <Button
+                                  type="submit"
+                                  size="sm"
+                                  className="h-9 rounded-l-full rounded-r-none px-4 sm:h-8"
+                                  disabled={isSendBusy || isConnecting}
                                 >
-                                  <ChevronDownIcon className="size-3.5" />
-                                </MenuTrigger>
-                                <MenuPopup align="end" side="top">
-                                  <MenuItem
-                                    disabled={isSendBusy || isConnecting}
-                                    onClick={() => void onImplementPlanInNewThread()}
+                                  {isConnecting || isSendBusy ? "Sending..." : "Implement"}
+                                </Button>
+                                <Menu>
+                                  <MenuTrigger
+                                    render={
+                                      <Button
+                                        size="sm"
+                                        variant="default"
+                                        className="h-9 rounded-l-none rounded-r-full border-l-white/12 px-2 sm:h-8"
+                                        aria-label="Implementation actions"
+                                        disabled={isSendBusy || isConnecting}
+                                      />
+                                    }
                                   >
-                                    Implement in a new thread
-                                  </MenuItem>
-                                </MenuPopup>
-                              </Menu>
-                            </div>
+                                    <ChevronDownIcon className="size-3.5" />
+                                  </MenuTrigger>
+                                  <MenuPopup align="end" side="top">
+                                    <MenuItem
+                                      disabled={isSendBusy || isConnecting}
+                                      onClick={() => void onImplementPlanInNewThread()}
+                                    >
+                                      Implement in a new thread
+                                    </MenuItem>
+                                  </MenuPopup>
+                                </Menu>
+                              </div>
+                            )
+                          ) : (
+                            <button
+                              type="submit"
+                              className="flex h-9 w-9 items-center justify-center rounded-full bg-primary/90 text-primary-foreground transition-all duration-150 hover:bg-primary hover:scale-105 disabled:opacity-30 disabled:hover:scale-100 sm:h-8 sm:w-8"
+                              disabled={
+                                isSendBusy || isConnecting || !composerSendState.hasSendableContent
+                              }
+                              aria-label={
+                                isConnecting
+                                  ? "Connecting"
+                                  : isPreparingWorktree
+                                    ? "Preparing worktree"
+                                    : isSendBusy
+                                      ? "Sending"
+                                      : "Send message"
+                              }
+                            >
+                              {isConnecting || isSendBusy ? (
+                                <svg
+                                  width="14"
+                                  height="14"
+                                  viewBox="0 0 14 14"
+                                  fill="none"
+                                  className="animate-spin"
+                                  aria-hidden="true"
+                                >
+                                  <circle
+                                    cx="7"
+                                    cy="7"
+                                    r="5.5"
+                                    stroke="currentColor"
+                                    strokeWidth="1.5"
+                                    strokeLinecap="round"
+                                    strokeDasharray="20 12"
+                                  />
+                                </svg>
+                              ) : (
+                                <svg
+                                  width="14"
+                                  height="14"
+                                  viewBox="0 0 14 14"
+                                  fill="none"
+                                  aria-hidden="true"
+                                >
+                                  <path
+                                    d="M7 11.5V2.5M7 2.5L3 6.5M7 2.5L11 6.5"
+                                    stroke="currentColor"
+                                    strokeWidth="1.8"
+                                    strokeLinecap="round"
+                                    strokeLinejoin="round"
+                                  />
+                                </svg>
+                              )}
+                            </button>
                           )
-                        ) : (
-                          <button
-                            type="submit"
-                            className={`flex h-9 w-9 items-center justify-center rounded-full transition-all duration-150 hover:scale-105 disabled:opacity-30 disabled:hover:scale-100 sm:h-8 sm:w-8 ${
-                              interactionMode === "plan"
-                                ? "bg-ring-plan/90 text-white hover:bg-ring-plan"
-                                : "bg-primary/90 text-primary-foreground hover:bg-primary"
-                            }`}
-                            disabled={
-                              isSendBusy || isConnecting || !composerSendState.hasSendableContent
-                            }
-                            aria-label={
-                              isConnecting
-                                ? "Connecting"
-                                : isPreparingWorktree
-                                  ? "Preparing worktree"
-                                  : isSendBusy
-                                    ? "Sending"
-                                    : "Send message"
-                            }
-                          >
-                            {isConnecting || isSendBusy ? (
-                              <svg
-                                width="14"
-                                height="14"
-                                viewBox="0 0 14 14"
-                                fill="none"
-                                className="animate-spin"
-                                aria-hidden="true"
-                              >
-                                <circle
-                                  cx="7"
-                                  cy="7"
-                                  r="5.5"
-                                  stroke="currentColor"
-                                  strokeWidth="1.5"
-                                  strokeLinecap="round"
-                                  strokeDasharray="20 12"
-                                />
-                              </svg>
-                            ) : (
-                              <svg
-                                width="14"
-                                height="14"
-                                viewBox="0 0 14 14"
-                                fill="none"
-                                aria-hidden="true"
-                              >
-                                <path
-                                  d="M7 11.5V2.5M7 2.5L3 6.5M7 2.5L11 6.5"
-                                  stroke="currentColor"
-                                  strokeWidth="1.8"
-                                  strokeLinecap="round"
-                                  strokeLinejoin="round"
-                                />
-                              </svg>
-                            )}
-                          </button>
-                        )
-                      ) : null}
+                        ) : null}
+                      </div>
                     </div>
-                  </div>
-                )}
+                  )}
+                </div>
               </div>
             </form>
           </div>
@@ -4273,14 +4306,14 @@ export default function ChatView({ threadId }: ChatViewProps) {
         {planSidebarOpen ? (
           <PlanSidebar
             activePlan={activePlan}
-            activeProposedPlan={activeProposedPlan}
+            activeProposedPlan={sidebarProposedPlan}
             markdownCwd={gitCwd ?? undefined}
             workspaceRoot={activeProject?.cwd ?? undefined}
             timestampFormat={timestampFormat}
             onClose={() => {
               setPlanSidebarOpen(false);
               // Track that the user explicitly dismissed for this turn so auto-open won't fight them.
-              const turnKey = activePlan?.turnId ?? activeProposedPlan?.turnId ?? null;
+              const turnKey = activePlan?.turnId ?? sidebarProposedPlan?.turnId ?? null;
               if (turnKey) {
                 planSidebarDismissedForTurnRef.current = turnKey;
               }
diff --git a/apps/web/src/components/ProviderLogo.tsx b/apps/web/src/components/ProviderLogo.tsx
index ec6d63dd4b..a3bb15259c 100644
--- a/apps/web/src/components/ProviderLogo.tsx
+++ b/apps/web/src/components/ProviderLogo.tsx
@@ -18,7 +18,7 @@ import {
 const PROVIDER_ICON_BY_PROVIDER: Record<ProviderKind, Icon> = {
   codex: OpenAI,
   copilot: GitHubIcon,
-  claudeCode: ClaudeAI,
+  claudeAgent: ClaudeAI,
   cursor: CursorIcon,
   opencode: OpenCodeIcon,
   geminiCli: Gemini,
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.ts
index a8f84d564a..8c3b470105 100644
--- a/apps/web/src/components/Sidebar.logic.test.ts
+++ b/apps/web/src/components/Sidebar.logic.test.ts
@@ -141,6 +141,8 @@ describe("resolveThreadStatusPill", () => {
               createdAt: "2026-03-09T10:00:00.000Z",
               updatedAt: "2026-03-09T10:05:00.000Z",
               planMarkdown: "# Plan",
+              implementedAt: null,
+              implementationThreadId: null,
             },
           ],
           session: {
@@ -155,6 +157,35 @@ describe("resolveThreadStatusPill", () => {
     ).toMatchObject({ label: "Plan Ready", pulse: false });
   });
 
+  it("does not show plan ready after the proposed plan was implemented elsewhere", () => {
+    expect(
+      resolveThreadStatusPill({
+        thread: {
+          ...baseThread,
+          latestTurn: makeLatestTurn(),
+          proposedPlans: [
+            {
+              id: "plan-1" as never,
+              turnId: "turn-1" as never,
+              createdAt: "2026-03-09T10:00:00.000Z",
+              updatedAt: "2026-03-09T10:05:00.000Z",
+              planMarkdown: "# Plan",
+              implementedAt: "2026-03-09T10:06:00.000Z",
+              implementationThreadId: "thread-implement" as never,
+            },
+          ],
+          session: {
+            ...baseThread.session,
+            status: "ready",
+            orchestrationStatus: "ready",
+          },
+        },
+        hasPendingApprovals: false,
+        hasPendingUserInput: false,
+      }),
+    ).toMatchObject({ label: "Completed", pulse: false });
+  });
+
   it("shows completed when there is an unseen completion and no active blocker", () => {
     expect(
       resolveThreadStatusPill({
diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.ts
index d48873f7a6..d9b394e4dd 100644
--- a/apps/web/src/components/Sidebar.logic.ts
+++ b/apps/web/src/components/Sidebar.logic.ts
@@ -1,6 +1,10 @@
 import type { Thread } from "../types";
 import { cn } from "../lib/utils";
-import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
+import {
+  findLatestProposedPlan,
+  hasActionableProposedPlan,
+  isLatestTurnSettled,
+} from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
 export type SidebarNewThreadEnvMode = "local" | "worktree";
@@ -124,7 +128,9 @@ export function resolveThreadStatusPill(input: {
     !hasPendingUserInput &&
     thread.interactionMode === "plan" &&
     isLatestTurnSettled(thread.latestTurn, thread.session) &&
-    findLatestProposedPlan(thread.proposedPlans, thread.latestTurn?.turnId ?? null) !== null;
+    hasActionableProposedPlan(
+      findLatestProposedPlan(thread.proposedPlans, thread.latestTurn?.turnId ?? null),
+    );
   if (hasPlanReadyPrompt) {
     return {
       label: "Plan Ready",
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index c241b82ff2..963a7f0529 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -45,7 +45,13 @@ import { useAppSettings } from "../appSettings";
 import { isElectron } from "../env";
 import { APP_STAGE_LABEL, APP_VERSION } from "../branding";
 import { resolveThreadProvider } from "../lib/threadProvider";
-import { formatRelativeTime, isMacPlatform, newCommandId, newProjectId } from "../lib/utils";
+import {
+  formatRelativeTime,
+  isLinuxPlatform,
+  isMacPlatform,
+  newCommandId,
+  newProjectId,
+} from "../lib/utils";
 import { useStore } from "../store";
 import { shortcutLabelForCommand } from "../keybindings";
 
@@ -516,7 +522,7 @@ const USAGE_PROVIDERS: ReadonlyArray<{ provider: ProviderKind; label: string }>
   { provider: "copilot", label: "Copilot" },
   { provider: "codex", label: "Codex" },
   { provider: "cursor", label: "Cursor" },
-  { provider: "claudeCode", label: "Claude Code" },
+  { provider: "claudeAgent", label: "Claude Code" },
   { provider: "geminiCli", label: "Gemini" },
   { provider: "amp", label: "Amp" },
 ];
@@ -547,7 +553,7 @@ function ProviderUsageSection() {
   const copilotUsage = useProviderUsage("copilot");
   const codexUsage = useProviderUsage("codex");
   const cursorUsage = useProviderUsage("cursor");
-  const claudeUsage = useProviderUsage("claudeCode");
+  const claudeUsage = useProviderUsage("claudeAgent");
   const geminiUsage = useProviderUsage("geminiCli");
   const ampUsage = useProviderUsage("amp");
 
@@ -555,7 +561,7 @@ function ProviderUsageSection() {
     copilot: copilotUsage.data,
     codex: codexUsage.data,
     cursor: cursorUsage.data,
-    claudeCode: claudeUsage.data,
+    claudeAgent: claudeUsage.data,
     geminiCli: geminiUsage.data,
     amp: ampUsage.data,
   };
@@ -617,7 +623,7 @@ function ProviderUsageSection() {
     }
     // Session usage (no quota) — show token/cost summary
     if (
-      provider !== "claudeCode" &&
+      provider !== "claudeAgent" &&
       data?.sessionUsage &&
       (data.sessionUsage.totalTokens || data.sessionUsage.totalCostUsd)
     ) {
@@ -734,7 +740,8 @@ export default function Sidebar() {
   const clearSelection = useThreadSelectionStore((s) => s.clearSelection);
   const removeFromSelection = useThreadSelectionStore((s) => s.removeFromSelection);
   const setSelectionAnchor = useThreadSelectionStore((s) => s.setAnchor);
-  const shouldBrowseForProjectImmediately = isElectron;
+  const isLinuxDesktop = isElectron && isLinuxPlatform(navigator.platform);
+  const shouldBrowseForProjectImmediately = isElectron && !isLinuxDesktop;
   const shouldShowProjectPathEntry = addingProject && !shouldBrowseForProjectImmediately;
   const projectCwdById = useMemo(
     () => new Map(projects.map((project) => [project.id, project.cwd] as const)),
diff --git a/apps/web/src/components/chat/ClaudeCodeTraitsPicker.tsx b/apps/web/src/components/chat/ClaudeCodeTraitsPicker.tsx
deleted file mode 100644
index 41f917294a..0000000000
--- a/apps/web/src/components/chat/ClaudeCodeTraitsPicker.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { type ClaudeCodeEffort } from "@t3tools/contracts";
-import { getDefaultClaudeCodeEffort } from "@t3tools/shared/model";
-import { memo, useState } from "react";
-import { ChevronDownIcon } from "lucide-react";
-import { Button } from "../ui/button";
-import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";
-
-export const CLAUDE_CODE_EFFORT_LABEL: Record<ClaudeCodeEffort, string> = {
-  low: "Low",
-  medium: "Medium",
-  high: "High",
-  max: "Max",
-};
-
-export const ClaudeCodeTraitsPicker = memo(function ClaudeCodeTraitsPicker(props: {
-  effort: ClaudeCodeEffort;
-  options: ReadonlyArray<ClaudeCodeEffort>;
-  onEffortChange: (effort: ClaudeCodeEffort) => void;
-}) {
-  const [isMenuOpen, setIsMenuOpen] = useState(false);
-  const defaultEffort = getDefaultClaudeCodeEffort("claudeCode");
-
-  return (
-    <Menu
-      open={isMenuOpen}
-      onOpenChange={(open) => {
-        setIsMenuOpen(open);
-      }}
-    >
-      <MenuTrigger
-        render={
-          <Button
-            size="sm"
-            variant="ghost"
-            className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
-          />
-        }
-      >
-        <span>{CLAUDE_CODE_EFFORT_LABEL[props.effort]}</span>
-        <ChevronDownIcon aria-hidden="true" className="size-3 opacity-60" />
-      </MenuTrigger>
-      <MenuPopup align="start">
-        <MenuGroup>
-          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Effort</div>
-          <MenuRadioGroup
-            value={props.effort}
-            onValueChange={(value) => {
-              if (!value) return;
-              const nextEffort = props.options.find((option) => option === value);
-              if (!nextEffort) return;
-              props.onEffortChange(nextEffort);
-            }}
-          >
-            {props.options.map((effort) => (
-              <MenuRadioItem key={effort} value={effort}>
-                {CLAUDE_CODE_EFFORT_LABEL[effort]}
-                {effort === defaultEffort ? " (default)" : ""}
-              </MenuRadioItem>
-            ))}
-          </MenuRadioGroup>
-        </MenuGroup>
-      </MenuPopup>
-    </Menu>
-  );
-});
diff --git a/apps/web/src/components/chat/ClaudeTraitsPicker.browser.tsx b/apps/web/src/components/chat/ClaudeTraitsPicker.browser.tsx
new file mode 100644
index 0000000000..fd80e10473
--- /dev/null
+++ b/apps/web/src/components/chat/ClaudeTraitsPicker.browser.tsx
@@ -0,0 +1,176 @@
+import "../../index.css";
+
+import { ThreadId } from "@t3tools/contracts";
+import { page } from "vitest/browser";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { render } from "vitest-browser-react";
+
+import { ClaudeTraitsPicker } from "./ClaudeTraitsPicker";
+import { useComposerDraftStore } from "../../composerDraftStore";
+
+async function mountPicker(props?: {
+  model?: string;
+  prompt?: string;
+  effort?: "low" | "medium" | "high" | "max" | "ultrathink" | null;
+  thinkingEnabled?: boolean | null;
+  fastModeEnabled?: boolean;
+}) {
+  const threadId = ThreadId.makeUnsafe("thread-claude-traits");
+  const draftsByThreadId = {} as ReturnType<
+    typeof useComposerDraftStore.getState
+  >["draftsByThreadId"];
+  draftsByThreadId[threadId] = {
+    prompt: props?.prompt ?? "",
+    images: [],
+    nonPersistedImageIds: [],
+    persistedAttachments: [],
+    terminalContexts: [],
+    provider: "claudeAgent",
+    model: props?.model ?? "claude-opus-4-6",
+    modelOptions: {
+      claudeAgent: {
+        ...(props?.effort ? { effort: props.effort } : {}),
+        ...(props?.thinkingEnabled === false ? { thinking: false } : {}),
+        ...(props?.fastModeEnabled ? { fastMode: true } : {}),
+      },
+    },
+    runtimeMode: null,
+    interactionMode: null,
+  };
+  useComposerDraftStore.setState({
+    draftsByThreadId,
+    draftThreadsByThreadId: {},
+    projectDraftThreadIdByProjectId: {},
+  });
+  const host = document.createElement("div");
+  document.body.append(host);
+  const onPromptChange = vi.fn();
+  const screen = await render(
+    <ClaudeTraitsPicker
+      threadId={threadId}
+      model={props?.model ?? "claude-opus-4-6"}
+      onPromptChange={onPromptChange}
+    />,
+    { container: host },
+  );
+
+  return {
+    onPromptChange,
+    cleanup: async () => {
+      await screen.unmount();
+      host.remove();
+    },
+  };
+}
+
+describe("ClaudeTraitsPicker", () => {
+  afterEach(() => {
+    document.body.innerHTML = "";
+    useComposerDraftStore.setState({
+      draftsByThreadId: {},
+      draftThreadsByThreadId: {},
+      projectDraftThreadIdByProjectId: {},
+    });
+  });
+
+  it("shows fast mode controls for Opus", async () => {
+    const mounted = await mountPicker();
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Fast Mode");
+        expect(text).toContain("off");
+        expect(text).toContain("on");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("hides fast mode controls for non-Opus models", async () => {
+    const mounted = await mountPicker({ model: "claude-sonnet-4-6" });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").not.toContain("Fast Mode");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows only the provided effort options", async () => {
+    const mounted = await mountPicker({
+      model: "claude-sonnet-4-6",
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Low");
+        expect(text).toContain("Medium");
+        expect(text).toContain("High");
+        expect(text).not.toContain("Max");
+        expect(text).toContain("Ultrathink");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows a thinking on/off dropdown for Haiku", async () => {
+    const mounted = await mountPicker({
+      model: "claude-haiku-4-5",
+      thinkingEnabled: true,
+    });
+
+    try {
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").toContain("Thinking On");
+      });
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Thinking");
+        expect(text).toContain("On (default)");
+        expect(text).toContain("Off");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows prompt-controlled Ultrathink state with disabled effort controls", async () => {
+    const mounted = await mountPicker({
+      effort: "high",
+      model: "claude-opus-4-6",
+      prompt: "Ultrathink:\nInvestigate this",
+      fastModeEnabled: false,
+    });
+
+    try {
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").toContain("Ultrathink");
+        expect(document.body.textContent ?? "").not.toContain("Ultrathink · Prompt");
+      });
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Effort");
+        expect(text).toContain("Remove Ultrathink from the prompt to change effort.");
+        expect(text).not.toContain("Fallback Effort");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+});
diff --git a/apps/web/src/components/chat/ClaudeTraitsPicker.tsx b/apps/web/src/components/chat/ClaudeTraitsPicker.tsx
new file mode 100644
index 0000000000..2baf197ab0
--- /dev/null
+++ b/apps/web/src/components/chat/ClaudeTraitsPicker.tsx
@@ -0,0 +1,257 @@
+import {
+  type ClaudeCodeEffort,
+  type ClaudeModelOptions,
+  type ProviderModelOptions,
+  type ThreadId,
+} from "@t3tools/contracts";
+import {
+  applyClaudePromptEffortPrefix,
+  getDefaultReasoningEffort,
+  getReasoningEffortOptions,
+  normalizeClaudeModelOptions,
+  resolveReasoningEffortForProvider,
+  supportsClaudeFastMode,
+  supportsClaudeThinkingToggle,
+  supportsClaudeUltrathinkKeyword,
+  isClaudeUltrathinkPrompt,
+} from "@t3tools/shared/model";
+import { memo, useState } from "react";
+import { ChevronDownIcon } from "lucide-react";
+import { Button } from "../ui/button";
+import {
+  Menu,
+  MenuGroup,
+  MenuPopup,
+  MenuRadioGroup,
+  MenuRadioItem,
+  MenuSeparator as MenuDivider,
+  MenuTrigger,
+} from "../ui/menu";
+import { useComposerDraftStore, useComposerThreadDraft } from "../../composerDraftStore";
+
+const CLAUDE_EFFORT_LABELS: Record<ClaudeCodeEffort, string> = {
+  low: "Low",
+  medium: "Medium",
+  high: "High",
+  max: "Max",
+  ultrathink: "Ultrathink",
+};
+
+const ULTRATHINK_PROMPT_PREFIX = "Ultrathink:\n";
+
+function getSelectedClaudeTraits(
+  model: string | null | undefined,
+  prompt: string,
+  modelOptions: ClaudeModelOptions | null | undefined,
+): {
+  effort: Exclude<ClaudeCodeEffort, "ultrathink"> | null;
+  thinkingEnabled: boolean | null;
+  fastModeEnabled: boolean;
+  options: ReadonlyArray<ClaudeCodeEffort>;
+  ultrathinkPromptControlled: boolean;
+  supportsFastMode: boolean;
+} {
+  const options = getReasoningEffortOptions("claudeAgent", model);
+  const defaultReasoningEffort = getDefaultReasoningEffort("claudeAgent") as Exclude<
+    ClaudeCodeEffort,
+    "ultrathink"
+  >;
+  const resolvedEffort = resolveReasoningEffortForProvider("claudeAgent", modelOptions?.effort);
+  const effort =
+    resolvedEffort && resolvedEffort !== "ultrathink" && options.includes(resolvedEffort)
+      ? resolvedEffort
+      : options.includes(defaultReasoningEffort)
+        ? defaultReasoningEffort
+        : null;
+  const thinkingEnabled = supportsClaudeThinkingToggle(model)
+    ? (modelOptions?.thinking ?? true)
+    : null;
+  const supportsFastMode = supportsClaudeFastMode(model);
+  return {
+    effort,
+    thinkingEnabled,
+    fastModeEnabled: supportsFastMode && modelOptions?.fastMode === true,
+    options,
+    ultrathinkPromptControlled:
+      supportsClaudeUltrathinkKeyword(model) && isClaudeUltrathinkPrompt(prompt),
+    supportsFastMode,
+  };
+}
+
+function ClaudeTraitsMenuContentImpl(props: {
+  threadId: ThreadId;
+  model: string | null | undefined;
+  onPromptChange: (prompt: string) => void;
+}) {
+  const draft = useComposerThreadDraft(props.threadId);
+  const prompt = draft.prompt;
+  const modelOptions = draft.modelOptions?.claudeAgent;
+  const setModelOptions = useComposerDraftStore((store) => store.setModelOptions);
+  const {
+    effort,
+    thinkingEnabled,
+    fastModeEnabled,
+    options,
+    ultrathinkPromptControlled,
+    supportsFastMode,
+  } = getSelectedClaudeTraits(props.model, prompt, modelOptions);
+  const defaultReasoningEffort = getDefaultReasoningEffort("claudeAgent");
+
+  const setClaudeModelOptions = (nextClaudeModelOptions: ClaudeModelOptions | undefined) => {
+    const { claudeAgent: _discardedClaude, ...otherProviderModelOptions } =
+      draft.modelOptions ?? {};
+    const nextProviderModelOptions: ProviderModelOptions | undefined = nextClaudeModelOptions
+      ? { ...otherProviderModelOptions, claudeAgent: nextClaudeModelOptions }
+      : Object.keys(otherProviderModelOptions).length > 0
+        ? otherProviderModelOptions
+        : undefined;
+    setModelOptions(props.threadId, nextProviderModelOptions);
+  };
+
+  if (effort === null && thinkingEnabled === null) {
+    return null;
+  }
+
+  return (
+    <>
+      {effort ? (
+        <>
+          <MenuGroup>
+            <div className="px-2 pt-1.5 pb-1 font-medium text-muted-foreground text-xs">Effort</div>
+            {ultrathinkPromptControlled ? (
+              <div className="px-2 pb-1.5 text-muted-foreground/80 text-xs">
+                Remove Ultrathink from the prompt to change effort.
+              </div>
+            ) : null}
+            <MenuRadioGroup
+              value={effort}
+              onValueChange={(value) => {
+                if (ultrathinkPromptControlled) return;
+                if (!value) return;
+                const nextEffort = options.find((option) => option === value);
+                if (!nextEffort) return;
+                if (nextEffort === "ultrathink") {
+                  const nextPrompt =
+                    prompt.trim().length === 0
+                      ? ULTRATHINK_PROMPT_PREFIX
+                      : applyClaudePromptEffortPrefix(prompt, "ultrathink");
+                  props.onPromptChange(nextPrompt);
+                  return;
+                }
+                setClaudeModelOptions(
+                  normalizeClaudeModelOptions(props.model, {
+                    ...modelOptions,
+                    effort: nextEffort,
+                  }),
+                );
+              }}
+            >
+              {options.map((option) => (
+                <MenuRadioItem key={option} value={option} disabled={ultrathinkPromptControlled}>
+                  {CLAUDE_EFFORT_LABELS[option]}
+                  {option === defaultReasoningEffort ? " (default)" : ""}
+                </MenuRadioItem>
+              ))}
+            </MenuRadioGroup>
+          </MenuGroup>
+        </>
+      ) : thinkingEnabled !== null ? (
+        <MenuGroup>
+          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Thinking</div>
+          <MenuRadioGroup
+            value={thinkingEnabled ? "on" : "off"}
+            onValueChange={(value) => {
+              setClaudeModelOptions(
+                normalizeClaudeModelOptions(props.model, {
+                  ...modelOptions,
+                  thinking: value === "on",
+                }),
+              );
+            }}
+          >
+            <MenuRadioItem value="on">On (default)</MenuRadioItem>
+            <MenuRadioItem value="off">Off</MenuRadioItem>
+          </MenuRadioGroup>
+        </MenuGroup>
+      ) : null}
+      {supportsFastMode ? (
+        <>
+          <MenuDivider />
+          <MenuGroup>
+            <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Fast Mode</div>
+            <MenuRadioGroup
+              value={fastModeEnabled ? "on" : "off"}
+              onValueChange={(value) => {
+                setClaudeModelOptions(
+                  normalizeClaudeModelOptions(props.model, {
+                    ...modelOptions,
+                    fastMode: value === "on",
+                  }),
+                );
+              }}
+            >
+              <MenuRadioItem value="off">off</MenuRadioItem>
+              <MenuRadioItem value="on">on</MenuRadioItem>
+            </MenuRadioGroup>
+          </MenuGroup>
+        </>
+      ) : null}
+    </>
+  );
+}
+
+export const ClaudeTraitsMenuContent = memo(ClaudeTraitsMenuContentImpl);
+
+export const ClaudeTraitsPicker = memo(function ClaudeTraitsPicker(props: {
+  threadId: ThreadId;
+  model: string | null | undefined;
+  onPromptChange: (prompt: string) => void;
+}) {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const draft = useComposerThreadDraft(props.threadId);
+  const prompt = draft.prompt;
+  const modelOptions = draft.modelOptions?.claudeAgent;
+  const { effort, thinkingEnabled, fastModeEnabled, ultrathinkPromptControlled, supportsFastMode } =
+    getSelectedClaudeTraits(props.model, prompt, modelOptions);
+  const triggerLabel = [
+    ultrathinkPromptControlled
+      ? "Ultrathink"
+      : effort
+        ? CLAUDE_EFFORT_LABELS[effort]
+        : thinkingEnabled === null
+          ? null
+          : `Thinking ${thinkingEnabled ? "On" : "Off"}`,
+    ...(supportsFastMode && fastModeEnabled ? ["Fast"] : []),
+  ]
+    .filter(Boolean)
+    .join(" · ");
+
+  return (
+    <Menu
+      open={isMenuOpen}
+      onOpenChange={(open) => {
+        setIsMenuOpen(open);
+      }}
+    >
+      <MenuTrigger
+        render={
+          <Button
+            size="sm"
+            variant="ghost"
+            className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
+          />
+        }
+      >
+        <span>{triggerLabel}</span>
+        <ChevronDownIcon aria-hidden="true" className="size-3 opacity-60" />
+      </MenuTrigger>
+      <MenuPopup align="start">
+        <ClaudeTraitsMenuContent
+          threadId={props.threadId}
+          model={props.model}
+          onPromptChange={props.onPromptChange}
+        />
+      </MenuPopup>
+    </Menu>
+  );
+});
diff --git a/apps/web/src/components/chat/CodexTraitsPicker.browser.tsx b/apps/web/src/components/chat/CodexTraitsPicker.browser.tsx
new file mode 100644
index 0000000000..d717f91923
--- /dev/null
+++ b/apps/web/src/components/chat/CodexTraitsPicker.browser.tsx
@@ -0,0 +1,169 @@
+import "../../index.css";
+
+import { ProjectId, ThreadId } from "@t3tools/contracts";
+import { page } from "vitest/browser";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { render } from "vitest-browser-react";
+
+import { CodexTraitsPicker } from "./CodexTraitsPicker";
+import { COMPOSER_DRAFT_STORAGE_KEY, useComposerDraftStore } from "../../composerDraftStore";
+
+async function mountPicker(props: {
+  reasoningEffort?: "low" | "medium" | "high" | "xhigh";
+  fastModeEnabled: boolean;
+}) {
+  const threadId = ThreadId.makeUnsafe("thread-codex-traits");
+  const draftsByThreadId = {} as ReturnType<
+    typeof useComposerDraftStore.getState
+  >["draftsByThreadId"];
+  draftsByThreadId[threadId] = {
+    prompt: "",
+    images: [],
+    nonPersistedImageIds: [],
+    persistedAttachments: [],
+    terminalContexts: [],
+    provider: "codex",
+    model: null,
+    modelOptions: {
+      codex: {
+        ...(props.reasoningEffort ? { reasoningEffort: props.reasoningEffort } : {}),
+        ...(props.fastModeEnabled ? { fastMode: true } : {}),
+      },
+    },
+    runtimeMode: null,
+    interactionMode: null,
+  };
+  useComposerDraftStore.setState({
+    draftsByThreadId,
+    draftThreadsByThreadId: {},
+    projectDraftThreadIdByProjectId: {
+      [ProjectId.makeUnsafe("project-codex-traits")]: threadId,
+    },
+  });
+  const host = document.createElement("div");
+  document.body.append(host);
+  const screen = await render(<CodexTraitsPicker threadId={threadId} />, { container: host });
+
+  return {
+    cleanup: async () => {
+      await screen.unmount();
+      host.remove();
+    },
+  };
+}
+
+describe("CodexTraitsPicker", () => {
+  afterEach(() => {
+    document.body.innerHTML = "";
+    localStorage.removeItem(COMPOSER_DRAFT_STORAGE_KEY);
+    useComposerDraftStore.setState({
+      draftsByThreadId: {},
+      draftThreadsByThreadId: {},
+      projectDraftThreadIdByProjectId: {},
+    });
+  });
+
+  it("shows fast mode controls", async () => {
+    const mounted = await mountPicker({
+      fastModeEnabled: false,
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Fast Mode");
+        expect(text).toContain("off");
+        expect(text).toContain("on");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows Fast in the trigger label when fast mode is active", async () => {
+    const mounted = await mountPicker({
+      fastModeEnabled: true,
+    });
+
+    try {
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").toContain("High · Fast");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows only the provided effort options", async () => {
+    const mounted = await mountPicker({
+      fastModeEnabled: false,
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Low");
+        expect(text).toContain("Medium");
+        expect(text).toContain("High");
+        expect(text).toContain("Extra High");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("hydrates legacy codex persisted state into modelOptions through the picker", async () => {
+    const threadId = ThreadId.makeUnsafe("thread-codex-legacy");
+    localStorage.setItem(
+      COMPOSER_DRAFT_STORAGE_KEY,
+      JSON.stringify({
+        state: {
+          draftsByThreadId: {
+            [threadId]: {
+              prompt: "",
+              attachments: [],
+              provider: "codex",
+              model: "gpt-5.3-codex",
+              effort: "xhigh",
+              codexFastMode: true,
+              serviceTier: "fast",
+            },
+          },
+          draftThreadsByThreadId: {},
+          projectDraftThreadIdByProjectId: {},
+        },
+        version: 1,
+      }),
+    );
+    useComposerDraftStore.setState({
+      draftsByThreadId: {},
+      draftThreadsByThreadId: {},
+      projectDraftThreadIdByProjectId: {},
+    });
+
+    const host = document.createElement("div");
+    document.body.append(host);
+    const screen = await render(<CodexTraitsPicker threadId={threadId} />, { container: host });
+
+    try {
+      await useComposerDraftStore.persist.rehydrate();
+
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").toContain("Extra High · Fast");
+        expect(useComposerDraftStore.getState().draftsByThreadId[threadId]?.modelOptions).toEqual({
+          codex: {
+            reasoningEffort: "xhigh",
+            fastMode: true,
+          },
+        });
+      });
+    } finally {
+      await screen.unmount();
+      host.remove();
+    }
+  });
+});
diff --git a/apps/web/src/components/chat/CodexTraitsPicker.tsx b/apps/web/src/components/chat/CodexTraitsPicker.tsx
index 6c72f497ba..641d39277e 100644
--- a/apps/web/src/components/chat/CodexTraitsPicker.tsx
+++ b/apps/web/src/components/chat/CodexTraitsPicker.tsx
@@ -1,7 +1,18 @@
-import { type CodexReasoningEffort } from "@t3tools/contracts";
-import { getDefaultReasoningEffort } from "@t3tools/shared/model";
+import type {
+  CodexModelOptions,
+  CodexReasoningEffort,
+  ProviderModelOptions,
+  ThreadId,
+} from "@t3tools/contracts";
+import {
+  getDefaultReasoningEffort,
+  getReasoningEffortOptions,
+  normalizeCodexModelOptions,
+  resolveReasoningEffortForProvider,
+} from "@t3tools/shared/model";
 import { memo, useState } from "react";
 import { ChevronDownIcon } from "lucide-react";
+import { useComposerDraftStore, useComposerThreadDraft } from "../../composerDraftStore";
 import { Button } from "../ui/button";
 import {
   Menu,
@@ -13,25 +24,99 @@ import {
   MenuTrigger,
 } from "../ui/menu";
 
-export const CodexTraitsPicker = memo(function CodexTraitsPicker(props: {
+const CODEX_REASONING_LABELS: Record<CodexReasoningEffort, string> = {
+  low: "Low",
+  medium: "Medium",
+  high: "High",
+  xhigh: "Extra High",
+};
+
+function getSelectedCodexTraits(modelOptions: CodexModelOptions | null | undefined): {
   effort: CodexReasoningEffort;
   fastModeEnabled: boolean;
-  options: ReadonlyArray<CodexReasoningEffort>;
-  onEffortChange: (effort: CodexReasoningEffort) => void;
-  onFastModeChange: (enabled: boolean) => void;
-}) {
-  const [isMenuOpen, setIsMenuOpen] = useState(false);
+} {
   const defaultReasoningEffort = getDefaultReasoningEffort("codex");
-  const reasoningLabelByOption: Record<CodexReasoningEffort, string> = {
-    low: "Low",
-    medium: "Medium",
-    high: "High",
-    xhigh: "Extra High",
+  return {
+    effort:
+      resolveReasoningEffortForProvider("codex", modelOptions?.reasoningEffort) ??
+      defaultReasoningEffort,
+    fastModeEnabled: modelOptions?.fastMode === true,
+  };
+}
+
+function CodexTraitsMenuContentImpl(props: { threadId: ThreadId }) {
+  const draft = useComposerThreadDraft(props.threadId);
+  const modelOptions = draft.modelOptions?.codex;
+  const setModelOptions = useComposerDraftStore((store) => store.setModelOptions);
+  const options = getReasoningEffortOptions("codex");
+  const defaultReasoningEffort = getDefaultReasoningEffort("codex");
+  const { effort, fastModeEnabled } = getSelectedCodexTraits(modelOptions);
+
+  const setCodexModelOptions = (nextCodexModelOptions: CodexModelOptions | undefined) => {
+    const { codex: _discardedCodex, ...otherProviderModelOptions } = draft.modelOptions ?? {};
+    const nextProviderModelOptions: ProviderModelOptions | undefined = nextCodexModelOptions
+      ? { ...otherProviderModelOptions, codex: nextCodexModelOptions }
+      : Object.keys(otherProviderModelOptions).length > 0
+        ? otherProviderModelOptions
+        : undefined;
+    setModelOptions(props.threadId, nextProviderModelOptions);
   };
-  const triggerLabel = [
-    reasoningLabelByOption[props.effort],
-    ...(props.fastModeEnabled ? ["Fast"] : []),
-  ]
+
+  return (
+    <>
+      <MenuGroup>
+        <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Reasoning</div>
+        <MenuRadioGroup
+          value={effort}
+          onValueChange={(value) => {
+            if (!value) return;
+            const nextEffort = options.find((option) => option === value);
+            if (!nextEffort) return;
+            setCodexModelOptions(
+              normalizeCodexModelOptions({
+                ...modelOptions,
+                reasoningEffort: nextEffort,
+              }),
+            );
+          }}
+        >
+          {options.map((option) => (
+            <MenuRadioItem key={option} value={option}>
+              {CODEX_REASONING_LABELS[option]}
+              {option === defaultReasoningEffort ? " (default)" : ""}
+            </MenuRadioItem>
+          ))}
+        </MenuRadioGroup>
+      </MenuGroup>
+      <MenuDivider />
+      <MenuGroup>
+        <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Fast Mode</div>
+        <MenuRadioGroup
+          value={fastModeEnabled ? "on" : "off"}
+          onValueChange={(value) => {
+            setCodexModelOptions(
+              normalizeCodexModelOptions({
+                ...modelOptions,
+                fastMode: value === "on",
+              }),
+            );
+          }}
+        >
+          <MenuRadioItem value="off">off</MenuRadioItem>
+          <MenuRadioItem value="on">on</MenuRadioItem>
+        </MenuRadioGroup>
+      </MenuGroup>
+    </>
+  );
+}
+
+export const CodexTraitsMenuContent = memo(CodexTraitsMenuContentImpl);
+
+export const CodexTraitsPicker = memo(function CodexTraitsPicker(props: { threadId: ThreadId }) {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const modelOptions = useComposerThreadDraft(props.threadId).modelOptions?.codex;
+  const { effort, fastModeEnabled } = getSelectedCodexTraits(modelOptions);
+  const triggerLabel = [CODEX_REASONING_LABELS[effort], ...(fastModeEnabled ? ["Fast"] : [])]
     .filter(Boolean)
     .join(" · ");
 
@@ -47,46 +132,17 @@ export const CodexTraitsPicker = memo(function CodexTraitsPicker(props: {
           <Button
             size="sm"
             variant="ghost"
-            className="shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:px-3"
+            className="min-w-0 max-w-40 shrink justify-start overflow-hidden whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 sm:max-w-48 sm:px-3 [&_svg]:mx-0"
           />
         }
       >
-        <span>{triggerLabel}</span>
-        <ChevronDownIcon aria-hidden="true" className="size-3 opacity-60" />
+        <span className="flex min-w-0 w-full items-center gap-2 overflow-hidden">
+          {triggerLabel}
+          <ChevronDownIcon aria-hidden="true" className="size-3 shrink-0 opacity-60" />
+        </span>
       </MenuTrigger>
       <MenuPopup align="start">
-        <MenuGroup>
-          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Reasoning</div>
-          <MenuRadioGroup
-            value={props.effort}
-            onValueChange={(value) => {
-              if (!value) return;
-              const nextEffort = props.options.find((option) => option === value);
-              if (!nextEffort) return;
-              props.onEffortChange(nextEffort);
-            }}
-          >
-            {props.options.map((effort) => (
-              <MenuRadioItem key={effort} value={effort}>
-                {reasoningLabelByOption[effort]}
-                {effort === defaultReasoningEffort ? " (default)" : ""}
-              </MenuRadioItem>
-            ))}
-          </MenuRadioGroup>
-        </MenuGroup>
-        <MenuDivider />
-        <MenuGroup>
-          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Fast Mode</div>
-          <MenuRadioGroup
-            value={props.fastModeEnabled ? "on" : "off"}
-            onValueChange={(value) => {
-              props.onFastModeChange(value === "on");
-            }}
-          >
-            <MenuRadioItem value="off">off</MenuRadioItem>
-            <MenuRadioItem value="on">on</MenuRadioItem>
-          </MenuRadioGroup>
-        </MenuGroup>
+        <CodexTraitsMenuContent threadId={props.threadId} />
       </MenuPopup>
     </Menu>
   );
diff --git a/apps/web/src/components/chat/CompactComposerControlsMenu.browser.tsx b/apps/web/src/components/chat/CompactComposerControlsMenu.browser.tsx
new file mode 100644
index 0000000000..83716d619a
--- /dev/null
+++ b/apps/web/src/components/chat/CompactComposerControlsMenu.browser.tsx
@@ -0,0 +1,186 @@
+import { type ProviderModelOptions, ThreadId } from "@t3tools/contracts";
+import "../../index.css";
+
+import { page } from "vitest/browser";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { render } from "vitest-browser-react";
+
+import { CompactComposerControlsMenu } from "./CompactComposerControlsMenu";
+import { ClaudeTraitsMenuContent } from "./ClaudeTraitsPicker";
+import { CodexTraitsMenuContent } from "./CodexTraitsPicker";
+import { useComposerDraftStore } from "../../composerDraftStore";
+
+async function mountMenu(props?: {
+  model?: string;
+  prompt?: string;
+  provider?: "codex" | "claudeAgent";
+  modelOptions?: ProviderModelOptions | null;
+}) {
+  const threadId = ThreadId.makeUnsafe("thread-compact-menu");
+  const provider = props?.provider ?? "claudeAgent";
+  const draftsByThreadId = {} as ReturnType<
+    typeof useComposerDraftStore.getState
+  >["draftsByThreadId"];
+  draftsByThreadId[threadId] = {
+    prompt: props?.prompt ?? "",
+    images: [],
+    nonPersistedImageIds: [],
+    persistedAttachments: [],
+    terminalContexts: [],
+    provider,
+    model: props?.model ?? "claude-opus-4-6",
+    modelOptions: props?.modelOptions ?? null,
+    runtimeMode: null,
+    interactionMode: null,
+  };
+  useComposerDraftStore.setState({
+    draftsByThreadId,
+    draftThreadsByThreadId: {},
+    projectDraftThreadIdByProjectId: {},
+  });
+  const host = document.createElement("div");
+  document.body.append(host);
+  const onPromptChange = vi.fn();
+  const screen = await render(
+    <CompactComposerControlsMenu
+      activePlan={false}
+      interactionMode="default"
+      planSidebarOpen={false}
+      runtimeMode="approval-required"
+      traitsMenuContent={
+        provider === "codex" ? (
+          <CodexTraitsMenuContent threadId={threadId} />
+        ) : (
+          <ClaudeTraitsMenuContent
+            threadId={threadId}
+            model={props?.model ?? "claude-opus-4-6"}
+            onPromptChange={onPromptChange}
+          />
+        )
+      }
+      onToggleInteractionMode={vi.fn()}
+      onTogglePlanSidebar={vi.fn()}
+      onToggleRuntimeMode={vi.fn()}
+    />,
+    { container: host },
+  );
+
+  return {
+    cleanup: async () => {
+      await screen.unmount();
+      host.remove();
+    },
+  };
+}
+
+describe("CompactComposerControlsMenu", () => {
+  afterEach(() => {
+    document.body.innerHTML = "";
+    useComposerDraftStore.setState({
+      draftsByThreadId: {},
+      draftThreadsByThreadId: {},
+      projectDraftThreadIdByProjectId: {},
+    });
+  });
+
+  it("shows fast mode controls for Opus", async () => {
+    const mounted = await mountMenu();
+
+    try {
+      await page.getByLabelText("More composer controls").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Fast Mode");
+        expect(text).toContain("off");
+        expect(text).toContain("on");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("hides fast mode controls for non-Opus Claude models", async () => {
+    const mounted = await mountMenu({ model: "claude-sonnet-4-6" });
+
+    try {
+      await page.getByLabelText("More composer controls").click();
+
+      await vi.waitFor(() => {
+        expect(document.body.textContent ?? "").not.toContain("Fast Mode");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows only the provided effort options", async () => {
+    const mounted = await mountMenu({
+      model: "claude-sonnet-4-6",
+    });
+
+    try {
+      await page.getByLabelText("More composer controls").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Low");
+        expect(text).toContain("Medium");
+        expect(text).toContain("High");
+        expect(text).not.toContain("Max");
+        expect(text).toContain("Ultrathink");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows a Claude thinking on/off section for Haiku", async () => {
+    const mounted = await mountMenu({
+      model: "claude-haiku-4-5",
+      modelOptions: {
+        claudeAgent: {
+          thinking: true,
+        },
+      },
+    });
+
+    try {
+      await page.getByLabelText("More composer controls").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Thinking");
+        expect(text).toContain("On (default)");
+        expect(text).toContain("Off");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("shows prompt-controlled Ultrathink messaging with disabled effort controls", async () => {
+    const mounted = await mountMenu({
+      model: "claude-opus-4-6",
+      prompt: "Ultrathink:\nInvestigate this",
+      modelOptions: {
+        claudeAgent: {
+          effort: "high",
+        },
+      },
+    });
+
+    try {
+      await page.getByLabelText("More composer controls").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Effort");
+        expect(text).toContain("Remove Ultrathink from the prompt to change effort.");
+        expect(text).not.toContain("Fallback Effort");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+});
diff --git a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
index 0af50ff01e..db38ed8c1e 100644
--- a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+++ b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
@@ -1,16 +1,9 @@
-import {
-  type CodexReasoningEffort,
-  type ProviderKind,
-  RuntimeMode,
-  ProviderInteractionMode,
-} from "@t3tools/contracts";
-import { getDefaultReasoningEffort } from "@t3tools/shared/model";
-import { memo } from "react";
+import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
+import { memo, type ReactNode } from "react";
 import { EllipsisIcon, ListTodoIcon } from "lucide-react";
 import { Button } from "../ui/button";
 import {
   Menu,
-  MenuGroup,
   MenuItem,
   MenuPopup,
   MenuRadioGroup,
@@ -24,24 +17,11 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
   interactionMode: ProviderInteractionMode;
   planSidebarOpen: boolean;
   runtimeMode: RuntimeMode;
-  selectedEffort: CodexReasoningEffort | null;
-  selectedProvider: ProviderKind;
-  selectedCodexFastModeEnabled: boolean;
-  reasoningOptions: ReadonlyArray<CodexReasoningEffort>;
-  onEffortSelect: (effort: CodexReasoningEffort) => void;
-  onCodexFastModeChange: (enabled: boolean) => void;
+  traitsMenuContent?: ReactNode;
   onToggleInteractionMode: () => void;
   onTogglePlanSidebar: () => void;
   onToggleRuntimeMode: () => void;
 }) {
-  const defaultReasoningEffort = getDefaultReasoningEffort("codex");
-  const reasoningLabelByOption: Record<CodexReasoningEffort, string> = {
-    low: "Low",
-    medium: "Medium",
-    high: "High",
-    xhigh: "Extra High",
-  };
-
   return (
     <Menu>
       <MenuTrigger
@@ -57,70 +37,35 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
         <EllipsisIcon aria-hidden="true" className="size-4" />
       </MenuTrigger>
       <MenuPopup align="start">
-        {props.selectedProvider === "codex" && props.selectedEffort != null ? (
+        {props.traitsMenuContent ? (
           <>
-            <MenuGroup>
-              <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Reasoning</div>
-              <MenuRadioGroup
-                value={props.selectedEffort}
-                onValueChange={(value) => {
-                  if (!value) return;
-                  const nextEffort = props.reasoningOptions.find((option) => option === value);
-                  if (!nextEffort) return;
-                  props.onEffortSelect(nextEffort);
-                }}
-              >
-                {props.reasoningOptions.map((effort) => (
-                  <MenuRadioItem key={effort} value={effort}>
-                    {reasoningLabelByOption[effort]}
-                    {effort === defaultReasoningEffort ? " (default)" : ""}
-                  </MenuRadioItem>
-                ))}
-              </MenuRadioGroup>
-            </MenuGroup>
-            <MenuDivider />
-            <MenuGroup>
-              <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Fast Mode</div>
-              <MenuRadioGroup
-                value={props.selectedCodexFastModeEnabled ? "on" : "off"}
-                onValueChange={(value) => {
-                  props.onCodexFastModeChange(value === "on");
-                }}
-              >
-                <MenuRadioItem value="off">off</MenuRadioItem>
-                <MenuRadioItem value="on">on</MenuRadioItem>
-              </MenuRadioGroup>
-            </MenuGroup>
+            {props.traitsMenuContent}
             <MenuDivider />
           </>
         ) : null}
-        <MenuGroup>
-          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Mode</div>
-          <MenuRadioGroup
-            value={props.interactionMode}
-            onValueChange={(value) => {
-              if (!value || value === props.interactionMode) return;
-              props.onToggleInteractionMode();
-            }}
-          >
-            <MenuRadioItem value="default">Chat</MenuRadioItem>
-            <MenuRadioItem value="plan">Plan</MenuRadioItem>
-          </MenuRadioGroup>
-        </MenuGroup>
+        <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Mode</div>
+        <MenuRadioGroup
+          value={props.interactionMode}
+          onValueChange={(value) => {
+            if (!value || value === props.interactionMode) return;
+            props.onToggleInteractionMode();
+          }}
+        >
+          <MenuRadioItem value="default">Chat</MenuRadioItem>
+          <MenuRadioItem value="plan">Plan</MenuRadioItem>
+        </MenuRadioGroup>
         <MenuDivider />
-        <MenuGroup>
-          <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Access</div>
-          <MenuRadioGroup
-            value={props.runtimeMode}
-            onValueChange={(value) => {
-              if (!value || value === props.runtimeMode) return;
-              props.onToggleRuntimeMode();
-            }}
-          >
-            <MenuRadioItem value="approval-required">Supervised</MenuRadioItem>
-            <MenuRadioItem value="full-access">Full access</MenuRadioItem>
-          </MenuRadioGroup>
-        </MenuGroup>
+        <div className="px-2 py-1.5 font-medium text-muted-foreground text-xs">Access</div>
+        <MenuRadioGroup
+          value={props.runtimeMode}
+          onValueChange={(value) => {
+            if (!value || value === props.runtimeMode) return;
+            props.onToggleRuntimeMode();
+          }}
+        >
+          <MenuRadioItem value="approval-required">Supervised</MenuRadioItem>
+          <MenuRadioItem value="full-access">Full access</MenuRadioItem>
+        </MenuRadioGroup>
         {props.activePlan ? (
           <>
             <MenuDivider />
diff --git a/apps/web/src/components/chat/ProviderHealthBanner.tsx b/apps/web/src/components/chat/ProviderHealthBanner.tsx
index 12c7f60544..9da45ba3ff 100644
--- a/apps/web/src/components/chat/ProviderHealthBanner.tsx
+++ b/apps/web/src/components/chat/ProviderHealthBanner.tsx
@@ -12,18 +12,23 @@ export const ProviderHealthBanner = memo(function ProviderHealthBanner({
     return null;
   }
 
+  const providerLabel =
+    status.provider === "codex"
+      ? "Codex"
+      : status.provider === "claudeAgent"
+        ? "Claude"
+        : status.provider;
   const defaultMessage =
     status.status === "error"
-      ? `${status.provider} provider is unavailable.`
-      : `${status.provider} provider has limited availability.`;
+      ? `${providerLabel} provider is unavailable.`
+      : `${providerLabel} provider has limited availability.`;
+  const title = providerLabel === "Codex" ? "Codex provider status" : `${providerLabel} status`;
 
   return (
     <div className="pt-3 mx-auto max-w-3xl">
       <Alert variant={status.status === "error" ? "error" : "warning"}>
         <CircleAlertIcon />
-        <AlertTitle>
-          {status.provider === "codex" ? "Codex provider status" : `${status.provider} status`}
-        </AlertTitle>
+        <AlertTitle>{title}</AlertTitle>
         <AlertDescription className="line-clamp-3" title={status.message ?? defaultMessage}>
           {status.message ?? defaultMessage}
         </AlertDescription>
diff --git a/apps/web/src/components/chat/ProviderModelPicker.browser.tsx b/apps/web/src/components/chat/ProviderModelPicker.browser.tsx
new file mode 100644
index 0000000000..a17c9cdcd1
--- /dev/null
+++ b/apps/web/src/components/chat/ProviderModelPicker.browser.tsx
@@ -0,0 +1,100 @@
+import { type ModelSlug, type ProviderKind } from "@t3tools/contracts";
+import { page } from "vitest/browser";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { render } from "vitest-browser-react";
+
+import { ProviderModelPicker } from "./ProviderModelPicker";
+
+const MODEL_OPTIONS_BY_PROVIDER = {
+  claudeAgent: [
+    { slug: "claude-opus-4-6", name: "Claude Opus 4.6" },
+    { slug: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
+    { slug: "claude-haiku-4-5", name: "Claude Haiku 4.5" },
+  ],
+  codex: [
+    { slug: "gpt-5-codex", name: "GPT-5 Codex" },
+    { slug: "gpt-5.3-codex", name: "GPT-5.3 Codex" },
+  ],
+  copilot: [],
+  cursor: [],
+  opencode: [],
+  geminiCli: [],
+  amp: [],
+  kilo: [],
+} as const satisfies Record<ProviderKind, ReadonlyArray<{ slug: ModelSlug; name: string }>>;
+
+async function mountPicker(props: {
+  provider: ProviderKind;
+  model: ModelSlug;
+  lockedProvider: ProviderKind | null;
+}) {
+  const host = document.createElement("div");
+  document.body.append(host);
+  const onProviderModelChange = vi.fn();
+  const screen = await render(
+    <ProviderModelPicker
+      provider={props.provider}
+      model={props.model}
+      lockedProvider={props.lockedProvider}
+      modelOptionsByProvider={MODEL_OPTIONS_BY_PROVIDER}
+      onProviderModelChange={onProviderModelChange}
+    />,
+    { container: host },
+  );
+
+  return {
+    onProviderModelChange,
+    cleanup: async () => {
+      await screen.unmount();
+      host.remove();
+    },
+  };
+}
+
+describe("ProviderModelPicker", () => {
+  afterEach(() => {
+    document.body.innerHTML = "";
+  });
+
+  it("shows provider submenus when provider switching is allowed", async () => {
+    const mounted = await mountPicker({
+      provider: "claudeAgent",
+      model: "claude-opus-4-6",
+      lockedProvider: null,
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        expect(text).toContain("Codex");
+        expect(text).toContain("Claude");
+        expect(text).not.toContain("Claude Sonnet 4.6");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
+  it("disables non-locked providers when provider is locked mid-thread", async () => {
+    const mounted = await mountPicker({
+      provider: "claudeAgent",
+      model: "claude-opus-4-6",
+      lockedProvider: "claudeAgent",
+    });
+
+    try {
+      await page.getByRole("button").click();
+
+      await vi.waitFor(() => {
+        const text = document.body.textContent ?? "";
+        // All providers still appear in the menu
+        expect(text).toContain("Claude");
+        expect(text).toContain("Codex");
+      });
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+});
diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx
index a2b92ae386..95d1b24fbe 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx
@@ -5,7 +5,7 @@ import {
   resolveCursorPickerModelSlug,
 } from "@t3tools/shared/model";
 import { memo, useState } from "react";
-import { PROVIDER_OPTIONS } from "../../session-logic";
+import { PROVIDER_OPTIONS, type ProviderPickerKind } from "../../session-logic";
 import { ChevronDownIcon } from "lucide-react";
 import { Button } from "../ui/button";
 import {
@@ -64,7 +64,7 @@ export function getCustomModelOptionsByProvider(settings: {
   return {
     codex: getAppModelOptions("codex", settings.customCodexModels),
     copilot: getAppModelOptions("copilot", settings.customCopilotModels),
-    claudeCode: getAppModelOptions("claudeCode", settings.customClaudeModels),
+    claudeAgent: getAppModelOptions("claudeAgent", settings.customClaudeModels),
     cursor: [
       ...cursorFamilyOptions,
       ...getAppModelOptions("cursor", settings.customCursorModels).filter(
@@ -177,6 +177,14 @@ function groupModelsBySubProvider(
   return result;
 }
 
+function isAvailableProviderOption(option: (typeof PROVIDER_OPTIONS)[number]): option is {
+  value: ProviderKind;
+  label: string;
+  available: true;
+} {
+  return option.available;
+}
+
 function resolveModelForProviderPicker(
   provider: ProviderKind,
   value: string,
@@ -222,7 +230,7 @@ export function formatPricingTier(tier: string): string {
 const PROVIDER_ICON_BY_PROVIDER: Record<ProviderKind, Icon> = {
   codex: OpenAI,
   copilot: GitHubIcon,
-  claudeCode: ClaudeAI,
+  claudeAgent: ClaudeAI,
   cursor: CursorIcon,
   opencode: OpenCodeIcon,
   geminiCli: Gemini,
@@ -234,21 +242,42 @@ export const AVAILABLE_PROVIDER_OPTIONS = PROVIDER_OPTIONS.filter((option) => op
 const UNAVAILABLE_PROVIDER_OPTIONS = PROVIDER_OPTIONS.filter((option) => !option.available);
 const COMING_SOON_PROVIDER_OPTIONS: ReadonlyArray<{ id: string; label: string; icon: Icon }> = [];
 
+function providerIconClassName(
+  provider: ProviderKind | ProviderPickerKind,
+  fallbackClassName: string,
+): string {
+  return provider === "claudeAgent" ? "text-[#d97757]" : fallbackClassName;
+}
+
 export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
   provider: ProviderKind;
   model: ModelSlug;
   lockedProvider: ProviderKind | null;
   modelOptionsByProvider: Record<ProviderKind, ReadonlyArray<ModelOptionEntry>>;
+  ultrathinkActive?: boolean;
   compact?: boolean;
   disabled?: boolean;
   onProviderModelChange: (provider: ProviderKind, model: ModelSlug) => void;
 }) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
-  const selectedProviderOptions = props.modelOptionsByProvider[props.provider];
+  const activeProvider = props.lockedProvider ?? props.provider;
+  const selectedProviderOptions = props.modelOptionsByProvider[activeProvider];
   const selectedModelOption = selectedProviderOptions.find((option) => option.slug === props.model);
   const selectedModelLabel = selectedModelOption?.name ?? props.model;
   const selectedPricingTier = selectedModelOption?.pricingTier;
-  const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.provider];
+  const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[activeProvider];
+  const handleModelChange = (provider: ProviderKind, value: string) => {
+    if (props.disabled) return;
+    if (!value) return;
+    const resolvedModel = resolveModelForProviderPicker(
+      provider,
+      value,
+      props.modelOptionsByProvider[provider],
+    );
+    if (!resolvedModel) return;
+    props.onProviderModelChange(provider, resolvedModel);
+    setIsMenuOpen(false);
+  };
 
   return (
     <Menu
@@ -267,30 +296,36 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
             size="sm"
             variant="ghost"
             className={cn(
-              "min-w-0 shrink-0 whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80",
-              props.compact ? "max-w-42" : "sm:px-3",
+              "min-w-0 justify-start overflow-hidden whitespace-nowrap px-2 text-muted-foreground/70 hover:text-foreground/80 [&_svg]:mx-0",
+              props.compact ? "max-w-42 shrink-0" : "max-w-48 shrink sm:max-w-56 sm:px-3",
             )}
             disabled={props.disabled}
           />
         }
       >
         <span
-          className={cn("flex min-w-0 items-center gap-2", props.compact ? "max-w-36" : undefined)}
+          className={cn(
+            "flex min-w-0 w-full items-center gap-2 overflow-hidden",
+            props.compact ? "max-w-36" : undefined,
+          )}
         >
           <ProviderIcon
             aria-hidden="true"
             className={cn(
               "size-4 shrink-0",
-              props.provider === "claudeCode" ? "" : "text-muted-foreground/70",
+              providerIconClassName(activeProvider, "text-muted-foreground/70"),
+              activeProvider === "claudeAgent" && props.ultrathinkActive
+                ? "ultrathink-chroma"
+                : undefined,
             )}
           />
-          <span className="truncate">{selectedModelLabel}</span>
+          <span className="min-w-0 flex-1 truncate">{selectedModelLabel}</span>
           {selectedPricingTier ? (
             <span className="shrink-0 rounded bg-muted px-1 py-0.5 text-[10px] font-medium tabular-nums text-muted-foreground">
               {formatPricingTier(selectedPricingTier)}
             </span>
           ) : null}
-          <ChevronDownIcon aria-hidden="true" className="size-3 opacity-60" />
+          <ChevronDownIcon aria-hidden="true" className="size-3 shrink-0 opacity-60" />
         </span>
       </MenuTrigger>
       <MenuPopup align="start">
@@ -357,7 +392,10 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
                 <MenuSubTrigger disabled={isDisabledByProviderLock}>
                   <OptionIcon
                     aria-hidden="true"
-                    className="size-4 shrink-0 text-muted-foreground/85"
+                    className={cn(
+                      "size-4 shrink-0",
+                      providerIconClassName(option.value, "text-muted-foreground/85"),
+                    )}
                   />
                   {option.label}
                 </MenuSubTrigger>
@@ -397,7 +435,10 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
               <MenuSubTrigger disabled={isDisabledByProviderLock}>
                 <OptionIcon
                   aria-hidden="true"
-                  className="size-4 shrink-0 text-muted-foreground/85"
+                  className={cn(
+                    "size-4 shrink-0",
+                    providerIconClassName(option.value, "text-muted-foreground/85"),
+                  )}
                 />
                 {option.label}
               </MenuSubTrigger>
@@ -438,7 +479,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
                 aria-hidden="true"
                 className={cn(
                   "size-4 shrink-0 opacity-80",
-                  option.value === "claudeCode" ? "" : "text-muted-foreground/85",
+                  providerIconClassName(option.value, "text-muted-foreground/85"),
                 )}
               />
               <span>{option.label}</span>
diff --git a/apps/web/src/composerDraftStore.test.ts b/apps/web/src/composerDraftStore.test.ts
index a802968b28..0d989b062f 100644
--- a/apps/web/src/composerDraftStore.test.ts
+++ b/apps/web/src/composerDraftStore.test.ts
@@ -1,16 +1,19 @@
+import * as Schema from "effect/Schema";
 import { ProjectId, ThreadId } from "@t3tools/contracts";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
+  COMPOSER_DRAFT_STORAGE_KEY,
   type ComposerImageAttachment,
-  createDebouncedStorage,
   useComposerDraftStore,
 } from "./composerDraftStore";
+import { removeLocalStorageItem, setLocalStorageItem } from "./hooks/useLocalStorage";
 import {
   INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
   insertInlineTerminalContextPlaceholder,
   type TerminalContextDraft,
 } from "./lib/terminalContext";
+import { createDebouncedStorage } from "./lib/storage";
 
 function makeImage(input: {
   id: string;
@@ -183,6 +186,63 @@ describe("composerDraftStore clearComposerContent", () => {
   });
 });
 
+describe("composerDraftStore syncPersistedAttachments", () => {
+  const threadId = ThreadId.makeUnsafe("thread-sync-persisted");
+
+  beforeEach(() => {
+    removeLocalStorageItem(COMPOSER_DRAFT_STORAGE_KEY);
+    useComposerDraftStore.setState({
+      draftsByThreadId: {},
+      draftThreadsByThreadId: {},
+      projectDraftThreadIdByProjectId: {},
+    });
+  });
+
+  afterEach(() => {
+    removeLocalStorageItem(COMPOSER_DRAFT_STORAGE_KEY);
+  });
+
+  it("treats malformed persisted draft storage as empty", async () => {
+    const image = makeImage({
+      id: "img-persisted",
+      previewUrl: "blob:persisted",
+    });
+    useComposerDraftStore.getState().addImage(threadId, image);
+    setLocalStorageItem(
+      COMPOSER_DRAFT_STORAGE_KEY,
+      {
+        version: 2,
+        state: {
+          draftsByThreadId: {
+            [threadId]: {
+              attachments: "not-an-array",
+            },
+          },
+        },
+      },
+      Schema.Unknown,
+    );
+
+    useComposerDraftStore.getState().syncPersistedAttachments(threadId, [
+      {
+        id: image.id,
+        name: image.name,
+        mimeType: image.mimeType,
+        sizeBytes: image.sizeBytes,
+        dataUrl: image.previewUrl,
+      },
+    ]);
+    await Promise.resolve();
+
+    expect(
+      useComposerDraftStore.getState().draftsByThreadId[threadId]?.persistedAttachments,
+    ).toEqual([]);
+    expect(
+      useComposerDraftStore.getState().draftsByThreadId[threadId]?.nonPersistedImageIds,
+    ).toEqual([image.id]);
+  });
+});
+
 describe("composerDraftStore terminal contexts", () => {
   const threadId = ThreadId.makeUnsafe("thread-dedupe");
 
@@ -323,6 +383,37 @@ describe("composerDraftStore terminal contexts", () => {
       },
     ]);
   });
+
+  it("sanitizes malformed persisted drafts during merge", () => {
+    const persistApi = useComposerDraftStore.persist as unknown as {
+      getOptions: () => {
+        merge: (
+          persistedState: unknown,
+          currentState: ReturnType<typeof useComposerDraftStore.getState>,
+        ) => ReturnType<typeof useComposerDraftStore.getState>;
+      };
+    };
+    const mergedState = persistApi.getOptions().merge(
+      {
+        draftsByThreadId: {
+          [threadId]: {
+            prompt: "",
+            attachments: "not-an-array",
+            terminalContexts: "not-an-array",
+            provider: "bogus-provider",
+            modelOptions: "not-an-object",
+          },
+        },
+        draftThreadsByThreadId: "not-an-object",
+        projectDraftThreadIdByProjectId: "not-an-object",
+      },
+      useComposerDraftStore.getInitialState(),
+    );
+
+    expect(mergedState.draftsByThreadId[threadId]).toBeUndefined();
+    expect(mergedState.draftThreadsByThreadId).toEqual({});
+    expect(mergedState.projectDraftThreadIdByProjectId).toEqual({});
+  });
 });
 
 describe("composerDraftStore project draft thread mapping", () => {
@@ -504,8 +595,8 @@ describe("composerDraftStore project draft thread mapping", () => {
   });
 });
 
-describe("composerDraftStore codex fast mode", () => {
-  const threadId = ThreadId.makeUnsafe("thread-service-tier");
+describe("composerDraftStore modelOptions", () => {
+  const threadId = ThreadId.makeUnsafe("thread-model-options");
 
   beforeEach(() => {
     useComposerDraftStore.setState({
@@ -515,17 +606,39 @@ describe("composerDraftStore codex fast mode", () => {
     });
   });
 
-  it("stores codex fast mode in the draft", () => {
+  it("stores provider-scoped model options in the draft", () => {
     const store = useComposerDraftStore.getState();
-    store.setCodexFastMode(threadId, true);
+    store.setModelOptions(threadId, {
+      codex: {
+        reasoningEffort: "xhigh",
+        fastMode: true,
+      },
+      claudeAgent: {
+        thinking: false,
+      },
+    });
 
-    expect(useComposerDraftStore.getState().draftsByThreadId[threadId]?.codexFastMode).toBe(true);
+    expect(useComposerDraftStore.getState().draftsByThreadId[threadId]?.modelOptions).toEqual({
+      codex: {
+        reasoningEffort: "xhigh",
+        fastMode: true,
+      },
+      claudeAgent: {
+        thinking: false,
+      },
+    });
   });
 
-  it("clears codex fast mode when reset to the default", () => {
+  it("drops default-only model options from the draft", () => {
     const store = useComposerDraftStore.getState();
-    store.setCodexFastMode(threadId, true);
-    store.setCodexFastMode(threadId, false);
+    store.setModelOptions(threadId, {
+      codex: {
+        reasoningEffort: "high",
+      },
+      claudeAgent: {
+        thinking: true,
+      },
+    });
 
     expect(useComposerDraftStore.getState().draftsByThreadId[threadId]).toBeUndefined();
   });
diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.ts
index 0e82d3fa08..ba55d9607e 100644
--- a/apps/web/src/composerDraftStore.ts
+++ b/apps/web/src/composerDraftStore.ts
@@ -1,63 +1,40 @@
 import {
-  CLAUDE_CODE_EFFORT_OPTIONS_BY_PROVIDER,
-  DEFAULT_CLAUDE_CODE_EFFORT_BY_PROVIDER,
+  CODEX_REASONING_EFFORT_OPTIONS,
+  type ClaudeCodeEffort,
+  type CodexReasoningEffort,
   DEFAULT_REASONING_EFFORT_BY_PROVIDER,
   ProjectId,
-  REASONING_EFFORT_OPTIONS_BY_PROVIDER,
+  ProviderInteractionMode,
+  ProviderKind,
+  ProviderModelOptions,
+  RuntimeMode,
   ThreadId,
-  type ClaudeCodeEffort,
-  type CodexReasoningEffort,
-  type ProviderKind,
-  type ProviderInteractionMode,
-  type RuntimeMode,
 } from "@t3tools/contracts";
+import * as Schema from "effect/Schema";
+import { DeepMutable } from "effect/Types";
 import { normalizeModelSlug } from "@t3tools/shared/model";
+import { getLocalStorageItem } from "./hooks/useLocalStorage";
 import { DEFAULT_INTERACTION_MODE, DEFAULT_RUNTIME_MODE, type ChatImageAttachment } from "./types";
 import {
   type TerminalContextDraft,
   ensureInlineTerminalContextPlaceholders,
   normalizeTerminalContextText,
 } from "./lib/terminalContext";
-import { Debouncer } from "@tanstack/react-pacer";
 import { create } from "zustand";
-import { createJSONStorage, persist, type StateStorage } from "zustand/middleware";
+import { createJSONStorage, persist } from "zustand/middleware";
+import { createDebouncedStorage, createMemoryStorage } from "./lib/storage";
 
 export const COMPOSER_DRAFT_STORAGE_KEY = "t3code:composer-drafts:v1";
-export type DraftThreadEnvMode = "local" | "worktree";
+const COMPOSER_DRAFT_STORAGE_VERSION = 2;
+const DraftThreadEnvModeSchema = Schema.Literals(["local", "worktree"]);
+export type DraftThreadEnvMode = typeof DraftThreadEnvModeSchema.Type;
 
 const COMPOSER_PERSIST_DEBOUNCE_MS = 300;
 
-interface DebouncedStorage extends StateStorage {
-  flush: () => void;
-}
-
-export function createDebouncedStorage(baseStorage: StateStorage): DebouncedStorage {
-  const debouncedSetItem = new Debouncer(
-    (name: string, value: string) => {
-      baseStorage.setItem(name, value);
-    },
-    { wait: COMPOSER_PERSIST_DEBOUNCE_MS },
-  );
-
-  return {
-    getItem: (name) => baseStorage.getItem(name),
-    setItem: (name, value) => {
-      debouncedSetItem.maybeExecute(name, value);
-    },
-    removeItem: (name) => {
-      debouncedSetItem.cancel();
-      baseStorage.removeItem(name);
-    },
-    flush: () => {
-      debouncedSetItem.flush();
-    },
-  };
-}
-
-const composerDebouncedStorage: DebouncedStorage =
-  typeof localStorage !== "undefined"
-    ? createDebouncedStorage(localStorage)
-    : { getItem: () => null, setItem: () => {}, removeItem: () => {}, flush: () => {} };
+const composerDebouncedStorage = createDebouncedStorage(
+  typeof localStorage !== "undefined" ? localStorage : createMemoryStorage(),
+  COMPOSER_PERSIST_DEBOUNCE_MS,
+);
 
 // Flush pending composer draft writes before page unload to prevent data loss.
 if (typeof window !== "undefined") {
@@ -66,58 +43,74 @@ if (typeof window !== "undefined") {
   });
 }
 
-export interface PersistedComposerImageAttachment {
-  id: string;
-  name: string;
-  mimeType: string;
-  sizeBytes: number;
-  dataUrl: string;
-}
+export const PersistedComposerImageAttachment = Schema.Struct({
+  id: Schema.String,
+  name: Schema.String,
+  mimeType: Schema.String,
+  sizeBytes: Schema.Number,
+  dataUrl: Schema.String,
+});
+export type PersistedComposerImageAttachment = typeof PersistedComposerImageAttachment.Type;
 
 export interface ComposerImageAttachment extends Omit<ChatImageAttachment, "previewUrl"> {
   previewUrl: string;
   file: File;
 }
 
-interface PersistedTerminalContextDraft {
-  id: string;
-  threadId: ThreadId;
-  createdAt: string;
-  terminalId: string;
-  terminalLabel: string;
-  lineStart: number;
-  lineEnd: number;
-}
+const PersistedTerminalContextDraft = Schema.Struct({
+  id: Schema.String,
+  threadId: ThreadId,
+  createdAt: Schema.String,
+  terminalId: Schema.String,
+  terminalLabel: Schema.String,
+  lineStart: Schema.Number,
+  lineEnd: Schema.Number,
+});
+type PersistedTerminalContextDraft = typeof PersistedTerminalContextDraft.Type;
 
-interface PersistedComposerThreadDraftState {
-  prompt: string;
-  attachments: PersistedComposerImageAttachment[];
-  terminalContexts?: PersistedTerminalContextDraft[];
-  provider?: ProviderKind | null;
-  model?: string | null;
-  runtimeMode?: RuntimeMode | null;
-  interactionMode?: ProviderInteractionMode | null;
-  effort?: CodexReasoningEffort | null;
-  codexFastMode?: boolean | null;
-  claudeCodeEffort?: ClaudeCodeEffort | null;
-  serviceTier?: string | null;
-}
+const PersistedComposerThreadDraftState = Schema.Struct({
+  prompt: Schema.String,
+  attachments: Schema.Array(PersistedComposerImageAttachment),
+  terminalContexts: Schema.optionalKey(Schema.Array(PersistedTerminalContextDraft)),
+  provider: Schema.optionalKey(ProviderKind),
+  model: Schema.optionalKey(Schema.String),
+  modelOptions: Schema.optionalKey(ProviderModelOptions),
+  runtimeMode: Schema.optionalKey(RuntimeMode),
+  interactionMode: Schema.optionalKey(ProviderInteractionMode),
+});
+type PersistedComposerThreadDraftState = typeof PersistedComposerThreadDraftState.Type;
 
-interface PersistedDraftThreadState {
-  projectId: ProjectId;
-  createdAt: string;
-  runtimeMode: RuntimeMode;
-  interactionMode: ProviderInteractionMode;
-  branch: string | null;
-  worktreePath: string | null;
-  envMode: DraftThreadEnvMode;
-}
+const LegacyCodexFields = Schema.Struct({
+  effort: Schema.optionalKey(Schema.Literals(CODEX_REASONING_EFFORT_OPTIONS)),
+  codexFastMode: Schema.optionalKey(Schema.Boolean),
+  serviceTier: Schema.optionalKey(Schema.String),
+});
+type LegacyCodexFields = typeof LegacyCodexFields.Type;
 
-interface PersistedComposerDraftStoreState {
-  draftsByThreadId: Record<ThreadId, PersistedComposerThreadDraftState>;
-  draftThreadsByThreadId: Record<ThreadId, PersistedDraftThreadState>;
-  projectDraftThreadIdByProjectId: Record<ProjectId, ThreadId>;
-}
+type LegacyPersistedCodexThreadDraftState = PersistedComposerThreadDraftState & LegacyCodexFields;
+
+const PersistedDraftThreadState = Schema.Struct({
+  projectId: ProjectId,
+  createdAt: Schema.String,
+  runtimeMode: RuntimeMode,
+  interactionMode: ProviderInteractionMode,
+  branch: Schema.NullOr(Schema.String),
+  worktreePath: Schema.NullOr(Schema.String),
+  envMode: DraftThreadEnvModeSchema,
+});
+type PersistedDraftThreadState = typeof PersistedDraftThreadState.Type;
+
+const PersistedComposerDraftStoreState = Schema.Struct({
+  draftsByThreadId: Schema.Record(ThreadId, PersistedComposerThreadDraftState),
+  draftThreadsByThreadId: Schema.Record(ThreadId, PersistedDraftThreadState),
+  projectDraftThreadIdByProjectId: Schema.Record(ProjectId, ThreadId),
+});
+type PersistedComposerDraftStoreState = typeof PersistedComposerDraftStoreState.Type;
+
+const PersistedComposerDraftStoreStorage = Schema.Struct({
+  version: Schema.Number,
+  state: PersistedComposerDraftStoreState,
+});
 
 interface ComposerThreadDraftState {
   prompt: string;
@@ -127,11 +120,9 @@ interface ComposerThreadDraftState {
   terminalContexts: TerminalContextDraft[];
   provider: ProviderKind | null;
   model: string | null;
+  modelOptions: ProviderModelOptions | null;
   runtimeMode: RuntimeMode | null;
   interactionMode: ProviderInteractionMode | null;
-  effort: CodexReasoningEffort | null;
-  codexFastMode: boolean;
-  claudeCodeEffort: ClaudeCodeEffort | null;
 }
 
 export interface DraftThreadState {
@@ -185,14 +176,15 @@ interface ComposerDraftStoreState {
   setTerminalContexts: (threadId: ThreadId, contexts: TerminalContextDraft[]) => void;
   setProvider: (threadId: ThreadId, provider: ProviderKind | null | undefined) => void;
   setModel: (threadId: ThreadId, model: string | null | undefined) => void;
+  setModelOptions: (
+    threadId: ThreadId,
+    modelOptions: ProviderModelOptions | null | undefined,
+  ) => void;
   setRuntimeMode: (threadId: ThreadId, runtimeMode: RuntimeMode | null | undefined) => void;
   setInteractionMode: (
     threadId: ThreadId,
     interactionMode: ProviderInteractionMode | null | undefined,
   ) => void;
-  setEffort: (threadId: ThreadId, effort: CodexReasoningEffort | null | undefined) => void;
-  setCodexFastMode: (threadId: ThreadId, enabled: boolean | null | undefined) => void;
-  setClaudeCodeEffort: (threadId: ThreadId, effort: ClaudeCodeEffort | null | undefined) => void;
   addImage: (threadId: ThreadId, image: ComposerImageAttachment) => void;
   addImages: (threadId: ThreadId, images: ComposerImageAttachment[]) => void;
   removeImage: (threadId: ThreadId, imageId: string) => void;
@@ -228,8 +220,7 @@ const EMPTY_TERMINAL_CONTEXTS: TerminalContextDraft[] = [];
 Object.freeze(EMPTY_IMAGES);
 Object.freeze(EMPTY_IDS);
 Object.freeze(EMPTY_PERSISTED_ATTACHMENTS);
-Object.freeze(EMPTY_TERMINAL_CONTEXTS);
-const EMPTY_THREAD_DRAFT = Object.freeze({
+const EMPTY_THREAD_DRAFT = Object.freeze<ComposerThreadDraftState>({
   prompt: "",
   images: EMPTY_IMAGES,
   nonPersistedImageIds: EMPTY_IDS,
@@ -237,20 +228,10 @@ const EMPTY_THREAD_DRAFT = Object.freeze({
   terminalContexts: EMPTY_TERMINAL_CONTEXTS,
   provider: null,
   model: null,
+  modelOptions: null,
   runtimeMode: null,
   interactionMode: null,
-  effort: null,
-  codexFastMode: false,
-  claudeCodeEffort: null,
-}) as ComposerThreadDraftState;
-
-const REASONING_EFFORT_VALUES = new Set<CodexReasoningEffort>(
-  REASONING_EFFORT_OPTIONS_BY_PROVIDER.codex,
-);
-
-const CLAUDE_CODE_EFFORT_VALUES = new Set<ClaudeCodeEffort>(
-  CLAUDE_CODE_EFFORT_OPTIONS_BY_PROVIDER.claudeCode,
-);
+});
 
 function createEmptyThreadDraft(): ComposerThreadDraftState {
   return {
@@ -261,11 +242,9 @@ function createEmptyThreadDraft(): ComposerThreadDraftState {
     terminalContexts: [],
     provider: null,
     model: null,
+    modelOptions: null,
     runtimeMode: null,
     interactionMode: null,
-    effort: null,
-    codexFastMode: false,
-    claudeCodeEffort: null,
   };
 }
 
@@ -334,18 +313,16 @@ function shouldRemoveDraft(draft: ComposerThreadDraftState): boolean {
     draft.terminalContexts.length === 0 &&
     draft.provider === null &&
     draft.model === null &&
+    draft.modelOptions === null &&
     draft.runtimeMode === null &&
-    draft.interactionMode === null &&
-    draft.effort === null &&
-    draft.codexFastMode === false &&
-    draft.claudeCodeEffort === null
+    draft.interactionMode === null
   );
 }
 
 function normalizeProviderKind(value: unknown): ProviderKind | null {
   return value === "codex" ||
     value === "copilot" ||
-    value === "claudeCode" ||
+    value === "claudeAgent" ||
     value === "cursor" ||
     value === "opencode" ||
     value === "geminiCli" ||
@@ -355,6 +332,90 @@ function normalizeProviderKind(value: unknown): ProviderKind | null {
     : null;
 }
 
+function normalizeProviderModelOptions(
+  value: unknown,
+  provider?: ProviderKind | null,
+  legacy?: LegacyCodexFields,
+): ProviderModelOptions | null {
+  const candidate = value && typeof value === "object" ? (value as Record<string, unknown>) : null;
+  const codexCandidate =
+    candidate?.codex && typeof candidate.codex === "object"
+      ? (candidate.codex as Record<string, unknown>)
+      : null;
+  const claudeCandidate =
+    candidate?.claudeAgent && typeof candidate.claudeAgent === "object"
+      ? (candidate.claudeAgent as Record<string, unknown>)
+      : null;
+
+  const codexReasoningEffort: CodexReasoningEffort | undefined =
+    codexCandidate?.reasoningEffort === "low" ||
+    codexCandidate?.reasoningEffort === "medium" ||
+    codexCandidate?.reasoningEffort === "high" ||
+    codexCandidate?.reasoningEffort === "xhigh"
+      ? codexCandidate.reasoningEffort
+      : provider === "codex" &&
+          (legacy?.effort === "low" ||
+            legacy?.effort === "medium" ||
+            legacy?.effort === "high" ||
+            legacy?.effort === "xhigh")
+        ? legacy.effort
+        : undefined;
+  const codexFastMode =
+    codexCandidate?.fastMode === true ||
+    (provider === "codex" && legacy?.codexFastMode === true) ||
+    (typeof legacy?.serviceTier === "string" && legacy.serviceTier === "fast");
+  const codex =
+    codexReasoningEffort && codexReasoningEffort !== DEFAULT_REASONING_EFFORT_BY_PROVIDER.codex
+      ? {
+          reasoningEffort: codexReasoningEffort,
+          ...(codexFastMode ? { fastMode: true } : {}),
+        }
+      : codexFastMode
+        ? { fastMode: true }
+        : undefined;
+
+  const claudeThinking = claudeCandidate?.thinking === false ? false : undefined;
+  const claudeEffort: ClaudeCodeEffort | undefined =
+    claudeCandidate?.effort === "low" ||
+    claudeCandidate?.effort === "medium" ||
+    claudeCandidate?.effort === "high" ||
+    claudeCandidate?.effort === "max" ||
+    claudeCandidate?.effort === "ultrathink"
+      ? claudeCandidate.effort
+      : undefined;
+  const claudeFastMode = claudeCandidate?.fastMode === true;
+  const claude =
+    claudeThinking === false ||
+    (claudeEffort && claudeEffort !== DEFAULT_REASONING_EFFORT_BY_PROVIDER.claudeAgent) ||
+    claudeFastMode
+      ? {
+          ...(claudeThinking === false ? { thinking: false } : {}),
+          ...(claudeEffort && claudeEffort !== DEFAULT_REASONING_EFFORT_BY_PROVIDER.claudeAgent
+            ? { effort: claudeEffort }
+            : {}),
+          ...(claudeFastMode ? { fastMode: true } : {}),
+        }
+      : undefined;
+
+  // Preserve other provider model options that we don't specifically normalize
+  const otherProviderKeys = ["copilot", "cursor", "opencode", "geminiCli", "amp", "kilo"] as const;
+  const otherOptions: Record<string, unknown> = {};
+  for (const key of otherProviderKeys) {
+    if (candidate?.[key] && typeof candidate[key] === "object") {
+      otherOptions[key] = candidate[key];
+    }
+  }
+
+  if (!codex && !claude && Object.keys(otherOptions).length === 0) {
+    return null;
+  }
+  return {
+    ...otherOptions,
+    ...(codex ? { codex } : {}),
+    ...(claude ? { claudeAgent: claude } : {}),
+  } as ProviderModelOptions;
+}
+
 function revokeObjectPreviewUrl(previewUrl: string): void {
   if (typeof URL === "undefined") {
     return;
@@ -451,15 +512,14 @@ function normalizeDraftThreadEnvMode(
   return fallbackWorktreePath ? "worktree" : "local";
 }
 
-function normalizePersistedComposerDraftState(value: unknown): PersistedComposerDraftStoreState {
-  if (!value || typeof value !== "object") {
-    return EMPTY_PERSISTED_DRAFT_STORE_STATE;
-  }
-  const candidate = value as Record<string, unknown>;
-  const rawDraftMap = candidate.draftsByThreadId;
-  const rawDraftThreadsByThreadId = candidate.draftThreadsByThreadId;
-  const rawProjectDraftThreadIdByProjectId = candidate.projectDraftThreadIdByProjectId;
-  const draftThreadsByThreadId: PersistedComposerDraftStoreState["draftThreadsByThreadId"] = {};
+function normalizePersistedDraftThreads(
+  rawDraftThreadsByThreadId: unknown,
+  rawProjectDraftThreadIdByProjectId: unknown,
+): Pick<
+  PersistedComposerDraftStoreState,
+  "draftThreadsByThreadId" | "projectDraftThreadIdByProjectId"
+> {
+  const draftThreadsByThreadId: Record<ThreadId, PersistedDraftThreadState> = {};
   if (rawDraftThreadsByThreadId && typeof rawDraftThreadsByThreadId === "object") {
     for (const [threadId, rawDraftThread] of Object.entries(
       rawDraftThreadsByThreadId as Record<string, unknown>,
@@ -501,8 +561,8 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
       };
     }
   }
-  const projectDraftThreadIdByProjectId: PersistedComposerDraftStoreState["projectDraftThreadIdByProjectId"] =
-    {};
+
+  const projectDraftThreadIdByProjectId: Record<ProjectId, ThreadId> = {};
   if (
     rawProjectDraftThreadIdByProjectId &&
     typeof rawProjectDraftThreadIdByProjectId === "object"
@@ -536,10 +596,23 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
       }
     }
   }
+
+  return { draftThreadsByThreadId, projectDraftThreadIdByProjectId };
+}
+
+function normalizePersistedDraftsByThreadId(
+  rawDraftMap: unknown,
+  resolveModelOptions: (
+    draftCandidate: PersistedComposerThreadDraftState | LegacyPersistedCodexThreadDraftState,
+    provider: ProviderKind | null,
+  ) => ProviderModelOptions | null,
+): PersistedComposerDraftStoreState["draftsByThreadId"] {
   if (!rawDraftMap || typeof rawDraftMap !== "object") {
-    return { draftsByThreadId: {}, draftThreadsByThreadId, projectDraftThreadIdByProjectId };
+    return {};
   }
-  const nextDraftsByThreadId: PersistedComposerDraftStoreState["draftsByThreadId"] = {};
+
+  const nextDraftsByThreadId: DeepMutable<PersistedComposerDraftStoreState["draftsByThreadId"]> =
+    {};
   for (const [threadId, draftValue] of Object.entries(rawDraftMap as Record<string, unknown>)) {
     if (typeof threadId !== "string" || threadId.length === 0) {
       continue;
@@ -547,7 +620,9 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
     if (!draftValue || typeof draftValue !== "object") {
       continue;
     }
-    const draftCandidate = draftValue as Record<string, unknown>;
+    const draftCandidate = draftValue as
+      | PersistedComposerThreadDraftState
+      | LegacyPersistedCodexThreadDraftState;
     const promptCandidate = typeof draftCandidate.prompt === "string" ? draftCandidate.prompt : "";
     const attachments = Array.isArray(draftCandidate.attachments)
       ? draftCandidate.attachments.flatMap((entry) => {
@@ -575,22 +650,7 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
       draftCandidate.interactionMode === "plan" || draftCandidate.interactionMode === "default"
         ? draftCandidate.interactionMode
         : null;
-    const effortCandidate =
-      typeof draftCandidate.effort === "string" ? draftCandidate.effort : null;
-    const effort =
-      effortCandidate && REASONING_EFFORT_VALUES.has(effortCandidate as CodexReasoningEffort)
-        ? (effortCandidate as CodexReasoningEffort)
-        : null;
-    const codexFastMode =
-      draftCandidate.codexFastMode === true ||
-      (typeof draftCandidate.serviceTier === "string" && draftCandidate.serviceTier === "fast");
-    const claudeCodeEffortCandidate =
-      typeof draftCandidate.claudeCodeEffort === "string" ? draftCandidate.claudeCodeEffort : null;
-    const claudeCodeEffort =
-      claudeCodeEffortCandidate &&
-      CLAUDE_CODE_EFFORT_VALUES.has(claudeCodeEffortCandidate as ClaudeCodeEffort)
-        ? (claudeCodeEffortCandidate as ClaudeCodeEffort)
-        : null;
+    const modelOptions = resolveModelOptions(draftCandidate, provider);
     const prompt = ensureInlineTerminalContextPlaceholders(
       promptCandidate,
       terminalContexts.length,
@@ -601,11 +661,9 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
       terminalContexts.length === 0 &&
       !provider &&
       !model &&
+      modelOptions === null &&
       !runtimeMode &&
-      !interactionMode &&
-      !effort &&
-      !codexFastMode &&
-      !claudeCodeEffort
+      !interactionMode
     ) {
       continue;
     }
@@ -615,33 +673,120 @@ function normalizePersistedComposerDraftState(value: unknown): PersistedComposer
       ...(terminalContexts.length > 0 ? { terminalContexts } : {}),
       ...(provider ? { provider } : {}),
       ...(model ? { model } : {}),
+      ...(modelOptions ? { modelOptions } : {}),
       ...(runtimeMode ? { runtimeMode } : {}),
       ...(interactionMode ? { interactionMode } : {}),
-      ...(effort ? { effort } : {}),
-      ...(codexFastMode ? { codexFastMode } : {}),
-      ...(claudeCodeEffort ? { claudeCodeEffort } : {}),
     };
   }
+
+  return nextDraftsByThreadId;
+}
+
+function migratePersistedComposerDraftStoreState(
+  persistedState: unknown,
+  persistedVersion: number,
+): PersistedComposerDraftStoreState {
+  if (!persistedState || typeof persistedState !== "object") {
+    return EMPTY_PERSISTED_DRAFT_STORE_STATE;
+  }
+  const candidate = persistedState as Record<string, unknown>;
+  const rawDraftMap = candidate.draftsByThreadId;
+  const rawDraftThreadsByThreadId = candidate.draftThreadsByThreadId;
+  const rawProjectDraftThreadIdByProjectId = candidate.projectDraftThreadIdByProjectId;
+  const { draftThreadsByThreadId, projectDraftThreadIdByProjectId } =
+    normalizePersistedDraftThreads(rawDraftThreadsByThreadId, rawProjectDraftThreadIdByProjectId);
+  const draftsByThreadId = normalizePersistedDraftsByThreadId(
+    rawDraftMap,
+    (draftCandidate, provider) =>
+      persistedVersion >= COMPOSER_DRAFT_STORAGE_VERSION
+        ? normalizeProviderModelOptions(draftCandidate.modelOptions, provider)
+        : normalizeProviderModelOptions(
+            draftCandidate.modelOptions,
+            provider,
+            draftCandidate as LegacyPersistedCodexThreadDraftState,
+          ),
+  );
   return {
-    draftsByThreadId: nextDraftsByThreadId,
+    draftsByThreadId,
     draftThreadsByThreadId,
     projectDraftThreadIdByProjectId,
   };
 }
 
-function parsePersistedDraftStateRaw(raw: string | null): PersistedComposerDraftStoreState {
-  if (!raw) {
-    return EMPTY_PERSISTED_DRAFT_STORE_STATE;
-  }
-  try {
-    const parsed = JSON.parse(raw) as unknown;
-    if (parsed && typeof parsed === "object" && "state" in parsed) {
-      return normalizePersistedComposerDraftState((parsed as { state?: unknown }).state);
+function partializeComposerDraftStoreState(
+  state: ComposerDraftStoreState,
+): PersistedComposerDraftStoreState {
+  const persistedDraftsByThreadId: DeepMutable<
+    PersistedComposerDraftStoreState["draftsByThreadId"]
+  > = {};
+  for (const [threadId, draft] of Object.entries(state.draftsByThreadId)) {
+    if (typeof threadId !== "string" || threadId.length === 0) {
+      continue;
     }
-    return normalizePersistedComposerDraftState(parsed);
-  } catch {
+    if (
+      draft.prompt.length === 0 &&
+      draft.persistedAttachments.length === 0 &&
+      draft.terminalContexts.length === 0 &&
+      draft.provider === null &&
+      draft.model === null &&
+      draft.modelOptions === null &&
+      draft.runtimeMode === null &&
+      draft.interactionMode === null
+    ) {
+      continue;
+    }
+    const persistedDraft: DeepMutable<PersistedComposerThreadDraftState> = {
+      prompt: draft.prompt,
+      attachments: draft.persistedAttachments,
+      ...(draft.terminalContexts.length > 0
+        ? {
+            terminalContexts: draft.terminalContexts.map((context) => ({
+              id: context.id,
+              threadId: context.threadId,
+              createdAt: context.createdAt,
+              terminalId: context.terminalId,
+              terminalLabel: context.terminalLabel,
+              lineStart: context.lineStart,
+              lineEnd: context.lineEnd,
+            })),
+          }
+        : {}),
+      ...(draft.model ? { model: draft.model } : {}),
+      ...(draft.modelOptions ? { modelOptions: draft.modelOptions } : {}),
+      ...(draft.provider ? { provider: draft.provider } : {}),
+      ...(draft.runtimeMode ? { runtimeMode: draft.runtimeMode } : {}),
+      ...(draft.interactionMode ? { interactionMode: draft.interactionMode } : {}),
+    };
+    persistedDraftsByThreadId[threadId as ThreadId] = persistedDraft;
+  }
+  return {
+    draftsByThreadId: persistedDraftsByThreadId,
+    draftThreadsByThreadId: state.draftThreadsByThreadId,
+    projectDraftThreadIdByProjectId: state.projectDraftThreadIdByProjectId,
+  };
+}
+
+function normalizeCurrentPersistedComposerDraftStoreState(
+  persistedState: unknown,
+): PersistedComposerDraftStoreState {
+  if (!persistedState || typeof persistedState !== "object") {
     return EMPTY_PERSISTED_DRAFT_STORE_STATE;
   }
+  const normalizedPersistedState = persistedState as Record<string, unknown>;
+  const { draftThreadsByThreadId, projectDraftThreadIdByProjectId } =
+    normalizePersistedDraftThreads(
+      normalizedPersistedState.draftThreadsByThreadId,
+      normalizedPersistedState.projectDraftThreadIdByProjectId,
+    );
+  return {
+    draftsByThreadId: normalizePersistedDraftsByThreadId(
+      normalizedPersistedState.draftsByThreadId,
+      (draftCandidate, provider) =>
+        normalizeProviderModelOptions(draftCandidate.modelOptions, provider),
+    ),
+    draftThreadsByThreadId,
+    projectDraftThreadIdByProjectId,
+  };
 }
 
 function readPersistedAttachmentIdsFromStorage(threadId: ThreadId): string[] {
@@ -649,9 +794,14 @@ function readPersistedAttachmentIdsFromStorage(threadId: ThreadId): string[] {
     return [];
   }
   try {
-    const raw = localStorage.getItem(COMPOSER_DRAFT_STORAGE_KEY);
-    const persisted = parsePersistedDraftStateRaw(raw);
-    return (persisted.draftsByThreadId[threadId]?.attachments ?? []).map(
+    const persisted = getLocalStorageItem(
+      COMPOSER_DRAFT_STORAGE_KEY,
+      PersistedComposerDraftStoreStorage,
+    );
+    if (!persisted || persisted.version !== COMPOSER_DRAFT_STORAGE_VERSION) {
+      return [];
+    }
+    return (persisted.state.draftsByThreadId[threadId]?.attachments ?? []).map(
       (attachment) => attachment.id,
     );
   } catch {
@@ -692,7 +842,7 @@ function hydreatePersistedComposerImageAttachment(
 }
 
 function hydrateImagesFromPersisted(
-  attachments: PersistedComposerImageAttachment[],
+  attachments: ReadonlyArray<PersistedComposerImageAttachment>,
 ): ComposerImageAttachment[] {
   return attachments.flatMap((attachment) => {
     const file = hydreatePersistedComposerImageAttachment(attachment);
@@ -719,7 +869,7 @@ function toHydratedThreadDraft(
     prompt: persistedDraft.prompt,
     images: hydrateImagesFromPersisted(persistedDraft.attachments),
     nonPersistedImageIds: [],
-    persistedAttachments: persistedDraft.attachments,
+    persistedAttachments: [...persistedDraft.attachments],
     terminalContexts:
       persistedDraft.terminalContexts?.map((context) => ({
         ...context,
@@ -727,11 +877,9 @@ function toHydratedThreadDraft(
       })) ?? [],
     provider: persistedDraft.provider ?? null,
     model: persistedDraft.model ?? null,
+    modelOptions: persistedDraft.modelOptions ?? null,
     runtimeMode: persistedDraft.runtimeMode ?? null,
     interactionMode: persistedDraft.interactionMode ?? null,
-    effort: persistedDraft.effort ?? null,
-    codexFastMode: persistedDraft.codexFastMode === true,
-    claudeCodeEffort: persistedDraft.claudeCodeEffort ?? null,
   };
 }
 
@@ -1053,9 +1201,9 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
         if (threadId.length === 0) {
           return;
         }
-        const normalizedModel = normalizeModelSlug(model) ?? null;
         set((state) => {
           const existing = state.draftsByThreadId[threadId];
+          const normalizedModel = normalizeModelSlug(model, existing?.provider ?? "codex") ?? null;
           if (!existing && normalizedModel === null) {
             return state;
           }
@@ -1076,84 +1224,24 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           return { draftsByThreadId: nextDraftsByThreadId };
         });
       },
-      setRuntimeMode: (threadId, runtimeMode) => {
-        if (threadId.length === 0) {
-          return;
-        }
-        const nextRuntimeMode =
-          runtimeMode === "approval-required" || runtimeMode === "full-access" ? runtimeMode : null;
-        set((state) => {
-          const existing = state.draftsByThreadId[threadId];
-          if (!existing && nextRuntimeMode === null) {
-            return state;
-          }
-          const base = existing ?? createEmptyThreadDraft();
-          if (base.runtimeMode === nextRuntimeMode) {
-            return state;
-          }
-          const nextDraft: ComposerThreadDraftState = {
-            ...base,
-            runtimeMode: nextRuntimeMode,
-          };
-          const nextDraftsByThreadId = { ...state.draftsByThreadId };
-          if (shouldRemoveDraft(nextDraft)) {
-            delete nextDraftsByThreadId[threadId];
-          } else {
-            nextDraftsByThreadId[threadId] = nextDraft;
-          }
-          return { draftsByThreadId: nextDraftsByThreadId };
-        });
-      },
-      setInteractionMode: (threadId, interactionMode) => {
-        if (threadId.length === 0) {
-          return;
-        }
-        const nextInteractionMode =
-          interactionMode === "plan" || interactionMode === "default" ? interactionMode : null;
-        set((state) => {
-          const existing = state.draftsByThreadId[threadId];
-          if (!existing && nextInteractionMode === null) {
-            return state;
-          }
-          const base = existing ?? createEmptyThreadDraft();
-          if (base.interactionMode === nextInteractionMode) {
-            return state;
-          }
-          const nextDraft: ComposerThreadDraftState = {
-            ...base,
-            interactionMode: nextInteractionMode,
-          };
-          const nextDraftsByThreadId = { ...state.draftsByThreadId };
-          if (shouldRemoveDraft(nextDraft)) {
-            delete nextDraftsByThreadId[threadId];
-          } else {
-            nextDraftsByThreadId[threadId] = nextDraft;
-          }
-          return { draftsByThreadId: nextDraftsByThreadId };
-        });
-      },
-      setEffort: (threadId, effort) => {
+      setModelOptions: (threadId, modelOptions) => {
         if (threadId.length === 0) {
           return;
         }
-        const nextEffort =
-          effort &&
-          REASONING_EFFORT_VALUES.has(effort) &&
-          effort !== DEFAULT_REASONING_EFFORT_BY_PROVIDER.codex
-            ? effort
-            : null;
         set((state) => {
           const existing = state.draftsByThreadId[threadId];
-          if (!existing && nextEffort === null) {
+          const provider = existing?.provider ?? null;
+          const nextModelOptions = normalizeProviderModelOptions(modelOptions, provider);
+          if (!existing && nextModelOptions === null) {
             return state;
           }
           const base = existing ?? createEmptyThreadDraft();
-          if (base.effort === nextEffort) {
+          if (JSON.stringify(base.modelOptions) === JSON.stringify(nextModelOptions)) {
             return state;
           }
           const nextDraft: ComposerThreadDraftState = {
             ...base,
-            effort: nextEffort,
+            modelOptions: nextModelOptions,
           };
           const nextDraftsByThreadId = { ...state.draftsByThreadId };
           if (shouldRemoveDraft(nextDraft)) {
@@ -1164,23 +1252,24 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           return { draftsByThreadId: nextDraftsByThreadId };
         });
       },
-      setCodexFastMode: (threadId, enabled) => {
+      setRuntimeMode: (threadId, runtimeMode) => {
         if (threadId.length === 0) {
           return;
         }
-        const nextCodexFastMode = enabled === true;
+        const nextRuntimeMode =
+          runtimeMode === "approval-required" || runtimeMode === "full-access" ? runtimeMode : null;
         set((state) => {
           const existing = state.draftsByThreadId[threadId];
-          if (!existing && nextCodexFastMode === false) {
+          if (!existing && nextRuntimeMode === null) {
             return state;
           }
           const base = existing ?? createEmptyThreadDraft();
-          if (base.codexFastMode === nextCodexFastMode) {
+          if (base.runtimeMode === nextRuntimeMode) {
             return state;
           }
           const nextDraft: ComposerThreadDraftState = {
             ...base,
-            codexFastMode: nextCodexFastMode,
+            runtimeMode: nextRuntimeMode,
           };
           const nextDraftsByThreadId = { ...state.draftsByThreadId };
           if (shouldRemoveDraft(nextDraft)) {
@@ -1191,28 +1280,24 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           return { draftsByThreadId: nextDraftsByThreadId };
         });
       },
-      setClaudeCodeEffort: (threadId, effort) => {
+      setInteractionMode: (threadId, interactionMode) => {
         if (threadId.length === 0) {
           return;
         }
-        const nextEffort =
-          effort &&
-          CLAUDE_CODE_EFFORT_VALUES.has(effort) &&
-          effort !== DEFAULT_CLAUDE_CODE_EFFORT_BY_PROVIDER.claudeCode
-            ? effort
-            : null;
+        const nextInteractionMode =
+          interactionMode === "plan" || interactionMode === "default" ? interactionMode : null;
         set((state) => {
           const existing = state.draftsByThreadId[threadId];
-          if (!existing && nextEffort === null) {
+          if (!existing && nextInteractionMode === null) {
             return state;
           }
           const base = existing ?? createEmptyThreadDraft();
-          if (base.claudeCodeEffort === nextEffort) {
+          if (base.interactionMode === nextInteractionMode) {
             return state;
           }
           const nextDraft: ComposerThreadDraftState = {
             ...base,
-            claudeCodeEffort: nextEffort,
+            interactionMode: nextInteractionMode,
           };
           const nextDraftsByThreadId = { ...state.draftsByThreadId };
           if (shouldRemoveDraft(nextDraft)) {
@@ -1563,74 +1648,13 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
     }),
     {
       name: COMPOSER_DRAFT_STORAGE_KEY,
-      version: 1,
+      version: COMPOSER_DRAFT_STORAGE_VERSION,
       storage: createJSONStorage(() => composerDebouncedStorage),
-      partialize: (state) => {
-        const persistedDraftsByThreadId: PersistedComposerDraftStoreState["draftsByThreadId"] = {};
-        for (const [threadId, draft] of Object.entries(state.draftsByThreadId)) {
-          if (typeof threadId !== "string" || threadId.length === 0) {
-            continue;
-          }
-          if (
-            draft.prompt.length === 0 &&
-            draft.persistedAttachments.length === 0 &&
-            draft.terminalContexts.length === 0 &&
-            draft.provider === null &&
-            draft.model === null &&
-            draft.runtimeMode === null &&
-            draft.interactionMode === null &&
-            draft.effort === null &&
-            draft.codexFastMode === false &&
-            draft.claudeCodeEffort === null
-          ) {
-            continue;
-          }
-          const persistedDraft: PersistedComposerThreadDraftState = {
-            prompt: draft.prompt,
-            attachments: draft.persistedAttachments,
-          };
-          if (draft.terminalContexts.length > 0) {
-            persistedDraft.terminalContexts = draft.terminalContexts.map((context) => ({
-              id: context.id,
-              threadId: context.threadId,
-              createdAt: context.createdAt,
-              terminalId: context.terminalId,
-              terminalLabel: context.terminalLabel,
-              lineStart: context.lineStart,
-              lineEnd: context.lineEnd,
-            }));
-          }
-          if (draft.model) {
-            persistedDraft.model = draft.model;
-          }
-          if (draft.provider) {
-            persistedDraft.provider = draft.provider;
-          }
-          if (draft.runtimeMode) {
-            persistedDraft.runtimeMode = draft.runtimeMode;
-          }
-          if (draft.interactionMode) {
-            persistedDraft.interactionMode = draft.interactionMode;
-          }
-          if (draft.effort) {
-            persistedDraft.effort = draft.effort;
-          }
-          if (draft.codexFastMode) {
-            persistedDraft.codexFastMode = true;
-          }
-          if (draft.claudeCodeEffort) {
-            persistedDraft.claudeCodeEffort = draft.claudeCodeEffort;
-          }
-          persistedDraftsByThreadId[threadId as ThreadId] = persistedDraft;
-        }
-        return {
-          draftsByThreadId: persistedDraftsByThreadId,
-          draftThreadsByThreadId: state.draftThreadsByThreadId,
-          projectDraftThreadIdByProjectId: state.projectDraftThreadIdByProjectId,
-        };
-      },
+      migrate: migratePersistedComposerDraftStoreState,
+      partialize: partializeComposerDraftStoreState,
       merge: (persistedState, currentState) => {
-        const normalizedPersisted = normalizePersistedComposerDraftState(persistedState);
+        const normalizedPersisted =
+          normalizeCurrentPersistedComposerDraftStoreState(persistedState);
         const draftsByThreadId = Object.fromEntries(
           Object.entries(normalizedPersisted.draftsByThreadId).map(([threadId, draft]) => [
             threadId,
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 3ea82aa6f7..971670fe7b 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -417,3 +417,66 @@ label:has(> select#reasoning-effort) select {
   overflow: clip;
   background: color-mix(in srgb, var(--card) 92%, var(--background));
 }
+
+@keyframes ultrathink-rainbow {
+  0% {
+    background-position: 0% 50%;
+  }
+  100% {
+    background-position: 200% 50%;
+  }
+}
+
+@keyframes ultrathink-chroma-shift {
+  0% {
+    filter: hue-rotate(0deg) saturate(1.2);
+  }
+  100% {
+    filter: hue-rotate(360deg) saturate(1.2);
+  }
+}
+
+.ultrathink-frame {
+  --ultrathink-spectrum: linear-gradient(
+    120deg,
+    #ff6b6b 0%,
+    #f59e0b 18%,
+    #22c55e 36%,
+    #14b8a6 54%,
+    #3b82f6 72%,
+    #ec4899 90%,
+    #ff6b6b 100%
+  );
+  background-image: var(--ultrathink-spectrum);
+  background-size: 220% 220%;
+  animation: ultrathink-rainbow 10s linear infinite;
+}
+
+.ultrathink-chroma {
+  animation: ultrathink-chroma-shift 10s linear infinite;
+}
+
+.ultrathink-pill {
+  background:
+    linear-gradient(var(--card), var(--card)) padding-box,
+    var(--ultrathink-spectrum) border-box;
+  background-size:
+    100% 100%,
+    220% 220%;
+  background-position:
+    0 0,
+    0% 50%;
+  animation: ultrathink-rainbow 10s linear infinite;
+  box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--card) 82%, transparent);
+}
+
+.ultrathink-word {
+  display: inline-block;
+  color: transparent;
+  background-image: var(--ultrathink-spectrum);
+  background-size: 220% 220%;
+  background-position: 0% 50%;
+  background-clip: text;
+  -webkit-background-clip: text;
+  animation: ultrathink-rainbow 10s linear infinite;
+}
diff --git a/apps/web/src/lib/storage.ts b/apps/web/src/lib/storage.ts
new file mode 100644
index 0000000000..eeb3a03a82
--- /dev/null
+++ b/apps/web/src/lib/storage.ts
@@ -0,0 +1,50 @@
+import { Debouncer } from "@tanstack/react-pacer";
+
+export interface StateStorage<R = unknown> {
+  getItem: (name: string) => string | null | Promise<string | null>;
+  setItem: (name: string, value: string) => R;
+  removeItem: (name: string) => R;
+}
+
+export interface DebouncedStorage<R = unknown> extends StateStorage<R> {
+  flush: () => void;
+}
+
+export function createMemoryStorage(): StateStorage {
+  const store = new Map<string, string>();
+  return {
+    getItem: (name) => store.get(name) ?? null,
+    setItem: (name, value) => {
+      store.set(name, value);
+    },
+    removeItem: (name) => {
+      store.delete(name);
+    },
+  };
+}
+
+export function createDebouncedStorage(
+  baseStorage: StateStorage,
+  debounceMs: number = 300,
+): DebouncedStorage {
+  const debouncedSetItem = new Debouncer(
+    (name: string, value: string) => {
+      baseStorage.setItem(name, value);
+    },
+    { wait: debounceMs },
+  );
+
+  return {
+    getItem: (name) => baseStorage.getItem(name),
+    setItem: (name, value) => {
+      debouncedSetItem.maybeExecute(name, value);
+    },
+    removeItem: (name) => {
+      debouncedSetItem.cancel();
+      baseStorage.removeItem(name);
+    },
+    flush: () => {
+      debouncedSetItem.flush();
+    },
+  };
+}
diff --git a/apps/web/src/lib/threadDraftDefaults.test.ts b/apps/web/src/lib/threadDraftDefaults.test.ts
index 49c1a273e5..c7a003471e 100644
--- a/apps/web/src/lib/threadDraftDefaults.test.ts
+++ b/apps/web/src/lib/threadDraftDefaults.test.ts
@@ -53,7 +53,7 @@ describe("resolveDraftThreadDefaults", () => {
         makeThread({
           id: ThreadId.makeUnsafe("thread-other-project"),
           projectId: ProjectId.makeUnsafe("project-2"),
-          provider: "claudeCode",
+          provider: "claudeAgent",
           model: "claude-sonnet-4-6",
           createdAt: "2026-03-09T10:00:00.000Z",
         }),
@@ -80,7 +80,7 @@ describe("resolveDraftThreadDefaults", () => {
         makeThread({
           id: ThreadId.makeUnsafe("thread-newest"),
           projectId: ProjectId.makeUnsafe("project-2"),
-          provider: "claudeCode",
+          provider: "claudeAgent",
           model: "claude-sonnet-4-6",
           createdAt: "2026-03-09T10:00:00.000Z",
         }),
@@ -90,7 +90,7 @@ describe("resolveDraftThreadDefaults", () => {
     });
 
     expect(defaults).toEqual({
-      provider: "claudeCode",
+      provider: "claudeAgent",
       model: "claude-sonnet-4-6",
     });
   });
@@ -108,7 +108,7 @@ describe("resolveDraftThreadDefaults", () => {
         }),
         makeThread({
           id: ThreadId.makeUnsafe("thread-newer"),
-          provider: "claudeCode",
+          provider: "claudeAgent",
           model: "claude-sonnet-4-6",
           createdAt: "2026-03-08T10:00:00.000Z",
         }),
@@ -131,7 +131,7 @@ describe("resolveDraftThreadDefaults", () => {
     });
 
     expect(defaults).toEqual({
-      provider: "claudeCode",
+      provider: "claudeAgent",
       model: "claude-sonnet-4-6",
     });
   });
diff --git a/apps/web/src/lib/threadProvider.test.ts b/apps/web/src/lib/threadProvider.test.ts
index 2737379da2..eb7f59a236 100644
--- a/apps/web/src/lib/threadProvider.test.ts
+++ b/apps/web/src/lib/threadProvider.test.ts
@@ -6,9 +6,9 @@ describe("inferProviderForThreadModel", () => {
     expect(
       inferProviderForThreadModel({
         model: "gpt-5.3-codex",
-        sessionProviderName: "claudeCode",
+        sessionProviderName: "claudeAgent",
       }),
-    ).toBe("claudeCode");
+    ).toBe("claudeAgent");
   });
 
   it("infers cursor threads from composer models", () => {
diff --git a/apps/web/src/lib/threadProvider.ts b/apps/web/src/lib/threadProvider.ts
index 3689401c4e..fdf019353f 100644
--- a/apps/web/src/lib/threadProvider.ts
+++ b/apps/web/src/lib/threadProvider.ts
@@ -5,7 +5,7 @@ import type { Thread } from "../types";
 const PROVIDER_KINDS = [
   "codex",
   "copilot",
-  "claudeCode",
+  "claudeAgent",
   "cursor",
   "opencode",
   "geminiCli",
@@ -20,7 +20,7 @@ const COPILOT_MODEL_SLUGS = new Set<string>(
   getModelOptions("copilot").map((option) => option.slug),
 );
 const CLAUDE_MODEL_SLUGS = new Set<string>(
-  getModelOptions("claudeCode").map((option) => option.slug),
+  getModelOptions("claudeAgent").map((option) => option.slug),
 );
 const CURSOR_MODEL_SLUGS = new Set<string>(getModelOptions("cursor").map((option) => option.slug));
 const OPENCODE_MODEL_SLUGS = new Set<string>(
@@ -89,9 +89,9 @@ export function inferProviderForThreadModel(input: {
     return "cursor";
   }
 
-  const normalizedClaude = normalizeModelSlug(input.model, "claudeCode");
+  const normalizedClaude = normalizeModelSlug(input.model, "claudeAgent");
   if (normalizedClaude && CLAUDE_MODEL_SLUGS.has(normalizedClaude)) {
-    return "claudeCode";
+    return "claudeAgent";
   }
 
   const normalizedCodex = normalizeModelSlug(input.model, "codex");
@@ -117,7 +117,7 @@ export function inferProviderForThreadModel(input: {
     return "cursor";
   }
 
-  return input.model.trim().startsWith("claude-") ? "claudeCode" : "codex";
+  return input.model.trim().startsWith("claude-") ? "claudeAgent" : "codex";
 }
 
 export function resolveThreadProvider(thread: Pick<Thread, "model" | "session">): ProviderKind {
diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
index f30436f571..0e3a02b1f9 100644
--- a/apps/web/src/lib/utils.ts
+++ b/apps/web/src/lib/utils.ts
@@ -16,6 +16,10 @@ export function isWindowsPlatform(platform: string): boolean {
   return /^win(dows)?/i.test(platform);
 }
 
+export function isLinuxPlatform(platform: string): boolean {
+  return /linux/i.test(platform);
+}
+
 export function randomUUID(): string {
   if (typeof crypto.randomUUID === "function") {
     return crypto.randomUUID();
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index 3be2df7320..883204b74d 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -41,7 +41,7 @@ export const Route = createRootRouteWithContext<{
 const PROVIDER_KINDS = [
   "codex",
   "copilot",
-  "claudeCode",
+  "claudeAgent",
   "cursor",
   "opencode",
   "geminiCli",
diff --git a/apps/web/src/routes/_chat.settings.tsx b/apps/web/src/routes/_chat.settings.tsx
index 01107dae57..dd0aa3cfda 100644
--- a/apps/web/src/routes/_chat.settings.tsx
+++ b/apps/web/src/routes/_chat.settings.tsx
@@ -76,7 +76,7 @@ const MODEL_PROVIDER_SETTINGS: Array<{
     example: "gpt-5.1-codex-max",
   },
   {
-    provider: "claudeCode",
+    provider: "claudeAgent",
     title: "Claude Code",
     description: "Save additional Claude model slugs for the picker and `/model` command.",
     placeholder: "your-claude-model-slug",
@@ -231,7 +231,7 @@ function SettingsRouteView() {
   >({
     codex: "",
     copilot: "",
-    claudeCode: "",
+    claudeAgent: "",
     cursor: "",
     opencode: "",
     geminiCli: "",
diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.ts
index fbd0104332..416386636e 100644
--- a/apps/web/src/session-logic.test.ts
+++ b/apps/web/src/session-logic.test.ts
@@ -1,4 +1,10 @@
-import { EventId, MessageId, TurnId, type OrchestrationThreadActivity } from "@t3tools/contracts";
+import {
+  EventId,
+  MessageId,
+  ThreadId,
+  TurnId,
+  type OrchestrationThreadActivity,
+} from "@t3tools/contracts";
 import { describe, expect, it } from "vitest";
 
 import {
@@ -10,6 +16,8 @@ import {
   deriveTimelineEntries,
   deriveWorkLogEntries,
   findLatestProposedPlan,
+  findSidebarProposedPlan,
+  hasActionableProposedPlan,
   hasToolActivityForTurn,
   hasToolActivitySince,
   isLatestTurnSettled,
@@ -135,6 +143,36 @@ describe("derivePendingApprovals", () => {
 
     expect(derivePendingApprovals(activities)).toEqual([]);
   });
+
+  it("clears stale pending approvals when the backend marks them stale after restart", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "approval-open-stale-restart",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "approval.requested",
+        summary: "Command approval requested",
+        tone: "approval",
+        payload: {
+          requestId: "req-stale-restart-1",
+          requestKind: "command",
+        },
+      }),
+      makeActivity({
+        id: "approval-failed-stale-restart",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "provider.approval.respond.failed",
+        summary: "Provider approval response failed",
+        tone: "error",
+        payload: {
+          requestId: "req-stale-restart-1",
+          detail:
+            "Stale pending approval request: req-stale-restart-1. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.",
+        },
+      }),
+    ];
+
+    expect(derivePendingApprovals(activities)).toEqual([]);
+  });
 });
 
 describe("derivePendingUserInputs", () => {
@@ -221,6 +259,48 @@ describe("derivePendingUserInputs", () => {
       },
     ]);
   });
+
+  it("clears stale pending user-input prompts when the provider reports an orphaned request", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "user-input-open-stale",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "user-input.requested",
+        summary: "User input requested",
+        tone: "info",
+        payload: {
+          requestId: "req-user-input-stale-1",
+          questions: [
+            {
+              id: "sandbox_mode",
+              header: "Sandbox",
+              question: "Which mode should be used?",
+              options: [
+                {
+                  label: "workspace-write",
+                  description: "Allow workspace writes only",
+                },
+              ],
+            },
+          ],
+        },
+      }),
+      makeActivity({
+        id: "user-input-failed-stale",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "provider.user-input.respond.failed",
+        summary: "Provider user input response failed",
+        tone: "error",
+        payload: {
+          requestId: "req-user-input-stale-1",
+          detail:
+            "Stale pending user-input request: req-user-input-stale-1. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.",
+        },
+      }),
+    ];
+
+    expect(derivePendingUserInputs(activities)).toEqual([]);
+  });
 });
 
 describe("deriveActivePlanState", () => {
@@ -270,6 +350,8 @@ describe("findLatestProposedPlan", () => {
             id: "plan:thread-1:turn:turn-1",
             turnId: TurnId.makeUnsafe("turn-1"),
             planMarkdown: "# Older",
+            implementedAt: null,
+            implementationThreadId: null,
             createdAt: "2026-02-23T00:00:01.000Z",
             updatedAt: "2026-02-23T00:00:01.000Z",
           },
@@ -277,6 +359,8 @@ describe("findLatestProposedPlan", () => {
             id: "plan:thread-1:turn:turn-1",
             turnId: TurnId.makeUnsafe("turn-1"),
             planMarkdown: "# Latest",
+            implementedAt: null,
+            implementationThreadId: null,
             createdAt: "2026-02-23T00:00:01.000Z",
             updatedAt: "2026-02-23T00:00:02.000Z",
           },
@@ -284,6 +368,8 @@ describe("findLatestProposedPlan", () => {
             id: "plan:thread-1:turn:turn-2",
             turnId: TurnId.makeUnsafe("turn-2"),
             planMarkdown: "# Different turn",
+            implementedAt: null,
+            implementationThreadId: null,
             createdAt: "2026-02-23T00:00:03.000Z",
             updatedAt: "2026-02-23T00:00:03.000Z",
           },
@@ -294,6 +380,8 @@ describe("findLatestProposedPlan", () => {
       id: "plan:thread-1:turn:turn-1",
       turnId: "turn-1",
       planMarkdown: "# Latest",
+      implementedAt: null,
+      implementationThreadId: null,
       createdAt: "2026-02-23T00:00:01.000Z",
       updatedAt: "2026-02-23T00:00:02.000Z",
     });
@@ -306,6 +394,8 @@ describe("findLatestProposedPlan", () => {
           id: "plan:thread-1:turn:turn-1",
           turnId: TurnId.makeUnsafe("turn-1"),
           planMarkdown: "# First",
+          implementedAt: null,
+          implementationThreadId: null,
           createdAt: "2026-02-23T00:00:01.000Z",
           updatedAt: "2026-02-23T00:00:01.000Z",
         },
@@ -313,6 +403,8 @@ describe("findLatestProposedPlan", () => {
           id: "plan:thread-1:turn:turn-2",
           turnId: TurnId.makeUnsafe("turn-2"),
           planMarkdown: "# Latest",
+          implementedAt: null,
+          implementationThreadId: null,
           createdAt: "2026-02-23T00:00:02.000Z",
           updatedAt: "2026-02-23T00:00:03.000Z",
         },
@@ -324,6 +416,133 @@ describe("findLatestProposedPlan", () => {
   });
 });
 
+describe("hasActionableProposedPlan", () => {
+  it("returns true for an unimplemented proposed plan", () => {
+    expect(
+      hasActionableProposedPlan({
+        id: "plan-1",
+        turnId: TurnId.makeUnsafe("turn-1"),
+        planMarkdown: "# Plan",
+        implementedAt: null,
+        implementationThreadId: null,
+        createdAt: "2026-02-23T00:00:00.000Z",
+        updatedAt: "2026-02-23T00:00:01.000Z",
+      }),
+    ).toBe(true);
+  });
+
+  it("returns false for a proposed plan already implemented elsewhere", () => {
+    expect(
+      hasActionableProposedPlan({
+        id: "plan-1",
+        turnId: TurnId.makeUnsafe("turn-1"),
+        planMarkdown: "# Plan",
+        implementedAt: "2026-02-23T00:00:02.000Z",
+        implementationThreadId: ThreadId.makeUnsafe("thread-implement"),
+        createdAt: "2026-02-23T00:00:00.000Z",
+        updatedAt: "2026-02-23T00:00:02.000Z",
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("findSidebarProposedPlan", () => {
+  it("prefers the running turn source proposed plan when available on the same thread", () => {
+    expect(
+      findSidebarProposedPlan({
+        threads: [
+          {
+            id: ThreadId.makeUnsafe("thread-1"),
+            proposedPlans: [
+              {
+                id: "plan-1",
+                turnId: TurnId.makeUnsafe("turn-plan"),
+                planMarkdown: "# Source plan",
+                implementedAt: "2026-02-23T00:00:03.000Z",
+                implementationThreadId: ThreadId.makeUnsafe("thread-2"),
+                createdAt: "2026-02-23T00:00:01.000Z",
+                updatedAt: "2026-02-23T00:00:02.000Z",
+              },
+            ],
+          },
+          {
+            id: ThreadId.makeUnsafe("thread-2"),
+            proposedPlans: [
+              {
+                id: "plan-2",
+                turnId: TurnId.makeUnsafe("turn-other"),
+                planMarkdown: "# Latest elsewhere",
+                implementedAt: null,
+                implementationThreadId: null,
+                createdAt: "2026-02-23T00:00:04.000Z",
+                updatedAt: "2026-02-23T00:00:05.000Z",
+              },
+            ],
+          },
+        ],
+        latestTurn: {
+          turnId: TurnId.makeUnsafe("turn-implementation"),
+          sourceProposedPlan: {
+            threadId: ThreadId.makeUnsafe("thread-1"),
+            planId: "plan-1",
+          },
+        },
+        latestTurnSettled: false,
+        threadId: ThreadId.makeUnsafe("thread-1"),
+      }),
+    ).toEqual({
+      id: "plan-1",
+      turnId: "turn-plan",
+      planMarkdown: "# Source plan",
+      implementedAt: "2026-02-23T00:00:03.000Z",
+      implementationThreadId: "thread-2",
+      createdAt: "2026-02-23T00:00:01.000Z",
+      updatedAt: "2026-02-23T00:00:02.000Z",
+    });
+  });
+
+  it("falls back to the latest proposed plan once the turn is settled", () => {
+    expect(
+      findSidebarProposedPlan({
+        threads: [
+          {
+            id: ThreadId.makeUnsafe("thread-1"),
+            proposedPlans: [
+              {
+                id: "plan-1",
+                turnId: TurnId.makeUnsafe("turn-plan"),
+                planMarkdown: "# Older",
+                implementedAt: null,
+                implementationThreadId: null,
+                createdAt: "2026-02-23T00:00:01.000Z",
+                updatedAt: "2026-02-23T00:00:02.000Z",
+              },
+              {
+                id: "plan-2",
+                turnId: TurnId.makeUnsafe("turn-latest"),
+                planMarkdown: "# Latest",
+                implementedAt: null,
+                implementationThreadId: null,
+                createdAt: "2026-02-23T00:00:03.000Z",
+                updatedAt: "2026-02-23T00:00:04.000Z",
+              },
+            ],
+          },
+        ],
+        latestTurn: {
+          turnId: TurnId.makeUnsafe("turn-implementation"),
+          sourceProposedPlan: {
+            threadId: ThreadId.makeUnsafe("thread-1"),
+            planId: "plan-1",
+          },
+        },
+        latestTurnSettled: true,
+        threadId: ThreadId.makeUnsafe("thread-1"),
+      })?.planMarkdown,
+    ).toBe("# Latest");
+  });
+});
+
 describe("deriveWorkLogEntries", () => {
   it("omits tool started entries and keeps completed entries", () => {
     const activities: OrchestrationThreadActivity[] = [
@@ -411,6 +630,42 @@ describe("deriveWorkLogEntries", () => {
     expect(entries.map((entry) => entry.id)).toEqual(["tool-complete"]);
   });
 
+  it("omits ExitPlanMode lifecycle entries once the plan card is shown", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "exit-plan-updated",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          detail: 'ExitPlanMode: {"allowedPrompts":[{"tool":"Bash","prompt":"run tests"}]}',
+        },
+      }),
+      makeActivity({
+        id: "exit-plan-completed",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "tool.completed",
+        summary: "Tool call",
+        payload: {
+          detail: "ExitPlanMode: {}",
+        },
+      }),
+      makeActivity({
+        id: "real-work-log",
+        createdAt: "2026-02-23T00:00:03.000Z",
+        kind: "tool.completed",
+        summary: "Ran command",
+        payload: {
+          itemType: "command_execution",
+          detail: "Bash: bun test",
+        },
+      }),
+    ];
+
+    const entries = deriveWorkLogEntries(activities, undefined);
+    expect(entries.map((entry) => entry.id)).toEqual(["real-work-log"]);
+  });
+
   it("orders work log by activity sequence when present", () => {
     const activities: OrchestrationThreadActivity[] = [
       makeActivity({
@@ -584,6 +839,158 @@ describe("deriveWorkLogEntries", () => {
       "after-user-second-turn",
     ]);
   });
+
+  it("collapses repeated lifecycle updates for the same tool call into one entry", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "tool-update-1",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "tool-update-2",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+          data: {
+            item: {
+              command: ["sed", "-n", "1,40p", "/tmp/app.ts"],
+            },
+          },
+        },
+      }),
+      makeActivity({
+        id: "tool-complete",
+        createdAt: "2026-02-23T00:00:03.000Z",
+        kind: "tool.completed",
+        summary: "Tool call completed",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+    ];
+
+    const entries = deriveWorkLogEntries(activities, undefined);
+
+    expect(entries).toHaveLength(1);
+    expect(entries[0]).toMatchObject({
+      id: "tool-complete",
+      createdAt: "2026-02-23T00:00:03.000Z",
+      label: "Tool call completed",
+      detail: 'Read: {"file_path":"/tmp/app.ts"}',
+      command: "sed -n 1,40p /tmp/app.ts",
+      itemType: "dynamic_tool_call",
+      toolTitle: "Tool call",
+    });
+  });
+
+  it("keeps separate tool entries when an identical call starts after the prior one completed", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "tool-1-update",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "tool-1-complete",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "tool.completed",
+        summary: "Tool call completed",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "tool-2-update",
+        createdAt: "2026-02-23T00:00:03.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "tool-2-complete",
+        createdAt: "2026-02-23T00:00:04.000Z",
+        kind: "tool.completed",
+        summary: "Tool call completed",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+    ];
+
+    const entries = deriveWorkLogEntries(activities, undefined);
+
+    expect(entries.map((entry) => entry.id)).toEqual(["tool-1-complete", "tool-2-complete"]);
+  });
+
+  it("collapses same-timestamp lifecycle rows even when completed sorts before updated by id", () => {
+    const activities: OrchestrationThreadActivity[] = [
+      makeActivity({
+        id: "z-update-earlier",
+        createdAt: "2026-02-23T00:00:01.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "a-complete-same-timestamp",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "tool.completed",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+      makeActivity({
+        id: "z-update-same-timestamp",
+        createdAt: "2026-02-23T00:00:02.000Z",
+        kind: "tool.updated",
+        summary: "Tool call",
+        payload: {
+          itemType: "dynamic_tool_call",
+          title: "Tool call",
+          detail: 'Read: {"file_path":"/tmp/app.ts"}',
+        },
+      }),
+    ];
+
+    const entries = deriveWorkLogEntries(activities, undefined);
+
+    expect(entries).toHaveLength(1);
+    expect(entries[0]?.id).toBe("a-complete-same-timestamp");
+  });
 });
 
 describe("deriveTimelineEntries", () => {
@@ -603,6 +1010,8 @@ describe("deriveTimelineEntries", () => {
           id: "plan:thread-1:turn:turn-1",
           turnId: TurnId.makeUnsafe("turn-1"),
           planMarkdown: "# Ship it",
+          implementedAt: null,
+          implementationThreadId: null,
           createdAt: "2026-02-23T00:00:02.000Z",
           updatedAt: "2026-02-23T00:00:02.000Z",
         },
@@ -623,6 +1032,8 @@ describe("deriveTimelineEntries", () => {
       kind: "proposed-plan",
       proposedPlan: {
         planMarkdown: "# Ship it",
+        implementedAt: null,
+        implementationThreadId: null,
       },
     });
   });
@@ -772,7 +1183,7 @@ describe("deriveActiveWorkStartedAt", () => {
 describe("PROVIDER_OPTIONS", () => {
   it("advertises all currently integrated providers", () => {
     const copilot = PROVIDER_OPTIONS.find((option) => option.value === "copilot");
-    const claude = PROVIDER_OPTIONS.find((option) => option.value === "claudeCode");
+    const claude = PROVIDER_OPTIONS.find((option) => option.value === "claudeAgent");
     const cursor = PROVIDER_OPTIONS.find((option) => option.value === "cursor");
     const opencode = PROVIDER_OPTIONS.find((option) => option.value === "opencode");
     const geminiCli = PROVIDER_OPTIONS.find((option) => option.value === "geminiCli");
@@ -780,7 +1191,7 @@ describe("PROVIDER_OPTIONS", () => {
     expect(PROVIDER_OPTIONS).toEqual([
       { value: "codex", label: "Codex", available: true },
       { value: "copilot", label: "GitHub Copilot", available: true },
-      { value: "claudeCode", label: "Claude Code", available: true },
+      { value: "claudeAgent", label: "Claude Code", available: true },
       { value: "cursor", label: "Cursor Agent", available: true },
       { value: "opencode", label: "OpenCode", available: true },
       { value: "geminiCli", label: "Gemini CLI", available: true },
@@ -793,7 +1204,7 @@ describe("PROVIDER_OPTIONS", () => {
       available: true,
     });
     expect(claude).toEqual({
-      value: "claudeCode",
+      value: "claudeAgent",
       label: "Claude Code",
       available: true,
     });
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
index 50cc33e5d2..aa69904d78 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -7,6 +7,7 @@ import {
   type ProviderKind,
   type ToolLifecycleItemType,
   type UserInputQuestion,
+  type ThreadId,
   type TurnId,
 } from "@t3tools/contracts";
 
@@ -14,11 +15,12 @@ import type {
   ChatMessage,
   ProposedPlan,
   SessionPhase,
+  Thread,
   ThreadSession,
   TurnDiffSummary,
 } from "./types";
 
-export type ProviderPickerKind = ProviderKind | "claudeCode" | "cursor";
+export type ProviderPickerKind = ProviderKind | "claudeAgent" | "cursor";
 
 export const PROVIDER_OPTIONS: Array<{
   value: ProviderPickerKind;
@@ -27,7 +29,7 @@ export const PROVIDER_OPTIONS: Array<{
 }> = [
   { value: "codex", label: "Codex", available: true },
   { value: "copilot", label: "GitHub Copilot", available: true },
-  { value: "claudeCode", label: "Claude Code", available: true },
+  { value: "claudeAgent", label: "Claude Code", available: true },
   { value: "cursor", label: "Cursor Agent", available: true },
   { value: "opencode", label: "OpenCode", available: true },
   { value: "geminiCli", label: "Gemini CLI", available: true },
@@ -49,6 +51,11 @@ export interface WorkLogEntry {
   requestKind?: PendingApproval["requestKind"];
 }
 
+interface DerivedWorkLogEntry extends WorkLogEntry {
+  activityKind: OrchestrationThreadActivity["kind"];
+  collapseKey?: string;
+}
+
 export interface PendingApproval {
   requestId: ApprovalRequestId;
   requestKind: "command" | "file-read" | "file-change";
@@ -78,6 +85,8 @@ export interface LatestProposedPlanState {
   updatedAt: string;
   turnId: TurnId | null;
   planMarkdown: string;
+  implementedAt: string | null;
+  implementationThreadId: ThreadId | null;
 }
 
 export type TimelineEntry =
@@ -162,6 +171,20 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
   }
 }
 
+function isStalePendingRequestFailureDetail(detail: string | undefined): boolean {
+  const normalized = detail?.toLowerCase();
+  if (!normalized) {
+    return false;
+  }
+  return (
+    normalized.includes("stale pending approval request") ||
+    normalized.includes("stale pending user-input request") ||
+    normalized.includes("unknown pending approval request") ||
+    normalized.includes("unknown pending permission request") ||
+    normalized.includes("unknown pending user-input request")
+  );
+}
+
 export function derivePendingApprovals(
   activities: ReadonlyArray<OrchestrationThreadActivity>,
 ): PendingApproval[] {
@@ -206,7 +229,7 @@ export function derivePendingApprovals(
     if (
       activity.kind === "provider.approval.respond.failed" &&
       requestId &&
-      detail?.includes("Unknown pending permission request")
+      isStalePendingRequestFailureDetail(detail)
     ) {
       openByRequestId.delete(requestId);
       continue;
@@ -282,6 +305,7 @@ export function derivePendingUserInputs(
       payload && typeof payload.requestId === "string"
         ? ApprovalRequestId.makeUnsafe(payload.requestId)
         : null;
+    const detail = payload && typeof payload.detail === "string" ? payload.detail : undefined;
 
     if (activity.kind === "user-input.requested" && requestId) {
       const questions = parseUserInputQuestions(payload);
@@ -298,6 +322,15 @@ export function derivePendingUserInputs(
 
     if (activity.kind === "user-input.resolved" && requestId) {
       openByRequestId.delete(requestId);
+      continue;
+    }
+
+    if (
+      activity.kind === "provider.user-input.respond.failed" &&
+      requestId &&
+      isStalePendingRequestFailureDetail(detail)
+    ) {
+      openByRequestId.delete(requestId);
     }
   }
 
@@ -380,13 +413,7 @@ export function findLatestProposedPlan(
       )
       .at(-1);
     if (matchingTurnPlan) {
-      return {
-        id: matchingTurnPlan.id,
-        createdAt: matchingTurnPlan.createdAt,
-        updatedAt: matchingTurnPlan.updatedAt,
-        turnId: matchingTurnPlan.turnId,
-        planMarkdown: matchingTurnPlan.planMarkdown,
-      };
+      return toLatestProposedPlanState(matchingTurnPlan);
     }
   }
 
@@ -400,13 +427,37 @@ export function findLatestProposedPlan(
     return null;
   }
 
-  return {
-    id: latestPlan.id,
-    createdAt: latestPlan.createdAt,
-    updatedAt: latestPlan.updatedAt,
-    turnId: latestPlan.turnId,
-    planMarkdown: latestPlan.planMarkdown,
-  };
+  return toLatestProposedPlanState(latestPlan);
+}
+
+export function findSidebarProposedPlan(input: {
+  threads: ReadonlyArray<Pick<Thread, "id" | "proposedPlans">>;
+  latestTurn: Pick<OrchestrationLatestTurn, "turnId" | "sourceProposedPlan"> | null;
+  latestTurnSettled: boolean;
+  threadId: ThreadId | string | null | undefined;
+}): LatestProposedPlanState | null {
+  const activeThreadPlans =
+    input.threads.find((thread) => thread.id === input.threadId)?.proposedPlans ?? [];
+
+  if (!input.latestTurnSettled) {
+    const sourceProposedPlan = input.latestTurn?.sourceProposedPlan;
+    if (sourceProposedPlan) {
+      const sourcePlan = input.threads
+        .find((thread) => thread.id === sourceProposedPlan.threadId)
+        ?.proposedPlans.find((plan) => plan.id === sourceProposedPlan.planId);
+      if (sourcePlan) {
+        return toLatestProposedPlanState(sourcePlan);
+      }
+    }
+  }
+
+  return findLatestProposedPlan(activeThreadPlans, input.latestTurn?.turnId ?? null);
+}
+
+export function hasActionableProposedPlan(
+  proposedPlan: LatestProposedPlanState | Pick<ProposedPlan, "implementedAt"> | null,
+): boolean {
+  return proposedPlan !== null && proposedPlan.implementedAt === null;
 }
 
 export function deriveWorkLogEntries(
@@ -415,7 +466,7 @@ export function deriveWorkLogEntries(
   sinceCreatedAt?: string,
 ): WorkLogEntry[] {
   const ordered = [...activities].toSorted(compareActivitiesByOrder);
-  return ordered
+  const entries = ordered
     .filter((activity) =>
       latestTurnId ? activity.turnId === latestTurnId || activity.turnId === null : true,
     )
@@ -423,46 +474,163 @@ export function deriveWorkLogEntries(
     .filter((activity) => activity.kind !== "tool.started")
     .filter((activity) => activity.kind !== "task.started" && activity.kind !== "task.completed")
     .filter((activity) => activity.summary !== "Checkpoint captured")
-    .map((activity) => {
-      const payload =
-        activity.payload && typeof activity.payload === "object"
-          ? (activity.payload as Record<string, unknown>)
-          : null;
-      const command = extractToolCommand(payload);
-      const changedFiles = extractChangedFiles(payload);
-      const title = extractToolTitle(payload);
-      const entry: WorkLogEntry = {
-        id: activity.id,
-        createdAt: activity.createdAt,
-        label: activity.summary,
-        tone: activity.tone === "approval" ? "info" : activity.tone,
-        activityKind: activity.kind,
-      };
-      const itemType = extractWorkLogItemType(payload);
-      const requestKind = extractWorkLogRequestKind(payload);
-      if (payload && typeof payload.detail === "string" && payload.detail.length > 0) {
-        const detail = stripTrailingExitCode(payload.detail).output;
-        if (detail) {
-          entry.detail = detail;
-        }
-      }
-      if (command) {
-        entry.command = command;
-      }
-      if (changedFiles.length > 0) {
-        entry.changedFiles = changedFiles;
-      }
-      if (title) {
-        entry.toolTitle = title;
-      }
-      if (itemType) {
-        entry.itemType = itemType;
-      }
-      if (requestKind) {
-        entry.requestKind = requestKind;
-      }
-      return entry;
-    });
+    .filter((activity) => !isPlanBoundaryToolActivity(activity))
+    .map(toDerivedWorkLogEntry);
+  return collapseDerivedWorkLogEntries(entries).map(
+    ({ collapseKey: _collapseKey, ...entry }) => entry,
+  );
+}
+
+function isPlanBoundaryToolActivity(activity: OrchestrationThreadActivity): boolean {
+  if (activity.kind !== "tool.updated" && activity.kind !== "tool.completed") {
+    return false;
+  }
+
+  const payload =
+    activity.payload && typeof activity.payload === "object"
+      ? (activity.payload as Record<string, unknown>)
+      : null;
+  return typeof payload?.detail === "string" && payload.detail.startsWith("ExitPlanMode:");
+}
+
+function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWorkLogEntry {
+  const payload =
+    activity.payload && typeof activity.payload === "object"
+      ? (activity.payload as Record<string, unknown>)
+      : null;
+  const command = extractToolCommand(payload);
+  const changedFiles = extractChangedFiles(payload);
+  const title = extractToolTitle(payload);
+  const entry: DerivedWorkLogEntry = {
+    id: activity.id,
+    createdAt: activity.createdAt,
+    label: activity.summary,
+    tone: activity.tone === "approval" ? "info" : activity.tone,
+    activityKind: activity.kind,
+  };
+  const itemType = extractWorkLogItemType(payload);
+  const requestKind = extractWorkLogRequestKind(payload);
+  if (payload && typeof payload.detail === "string" && payload.detail.length > 0) {
+    const detail = stripTrailingExitCode(payload.detail).output;
+    if (detail) {
+      entry.detail = detail;
+    }
+  }
+  if (command) {
+    entry.command = command;
+  }
+  if (changedFiles.length > 0) {
+    entry.changedFiles = changedFiles;
+  }
+  if (title) {
+    entry.toolTitle = title;
+  }
+  if (itemType) {
+    entry.itemType = itemType;
+  }
+  if (requestKind) {
+    entry.requestKind = requestKind;
+  }
+  const collapseKey = deriveToolLifecycleCollapseKey(entry);
+  if (collapseKey) {
+    entry.collapseKey = collapseKey;
+  }
+  return entry;
+}
+
+function collapseDerivedWorkLogEntries(
+  entries: ReadonlyArray<DerivedWorkLogEntry>,
+): DerivedWorkLogEntry[] {
+  const collapsed: DerivedWorkLogEntry[] = [];
+  for (const entry of entries) {
+    const previous = collapsed.at(-1);
+    if (previous && shouldCollapseToolLifecycleEntries(previous, entry)) {
+      collapsed[collapsed.length - 1] = mergeDerivedWorkLogEntries(previous, entry);
+      continue;
+    }
+    collapsed.push(entry);
+  }
+  return collapsed;
+}
+
+function shouldCollapseToolLifecycleEntries(
+  previous: DerivedWorkLogEntry,
+  next: DerivedWorkLogEntry,
+): boolean {
+  if (previous.activityKind !== "tool.updated" && previous.activityKind !== "tool.completed") {
+    return false;
+  }
+  if (next.activityKind !== "tool.updated" && next.activityKind !== "tool.completed") {
+    return false;
+  }
+  if (previous.activityKind === "tool.completed") {
+    return false;
+  }
+  return previous.collapseKey !== undefined && previous.collapseKey === next.collapseKey;
+}
+
+function mergeDerivedWorkLogEntries(
+  previous: DerivedWorkLogEntry,
+  next: DerivedWorkLogEntry,
+): DerivedWorkLogEntry {
+  const changedFiles = mergeChangedFiles(previous.changedFiles, next.changedFiles);
+  const detail = next.detail ?? previous.detail;
+  const command = next.command ?? previous.command;
+  const toolTitle = next.toolTitle ?? previous.toolTitle;
+  const itemType = next.itemType ?? previous.itemType;
+  const requestKind = next.requestKind ?? previous.requestKind;
+  const collapseKey = next.collapseKey ?? previous.collapseKey;
+  return {
+    ...previous,
+    ...next,
+    ...(detail ? { detail } : {}),
+    ...(command ? { command } : {}),
+    ...(changedFiles.length > 0 ? { changedFiles } : {}),
+    ...(toolTitle ? { toolTitle } : {}),
+    ...(itemType ? { itemType } : {}),
+    ...(requestKind ? { requestKind } : {}),
+    ...(collapseKey ? { collapseKey } : {}),
+  };
+}
+
+function mergeChangedFiles(
+  previous: ReadonlyArray<string> | undefined,
+  next: ReadonlyArray<string> | undefined,
+): string[] {
+  const merged = [...(previous ?? []), ...(next ?? [])];
+  if (merged.length === 0) {
+    return [];
+  }
+  return [...new Set(merged)];
+}
+
+function deriveToolLifecycleCollapseKey(entry: DerivedWorkLogEntry): string | undefined {
+  if (entry.activityKind !== "tool.updated" && entry.activityKind !== "tool.completed") {
+    return undefined;
+  }
+  const normalizedLabel = normalizeCompactToolLabel(entry.toolTitle ?? entry.label);
+  const detail = entry.detail?.trim() ?? "";
+  const itemType = entry.itemType ?? "";
+  if (normalizedLabel.length === 0 && detail.length === 0 && itemType.length === 0) {
+    return undefined;
+  }
+  return [itemType, normalizedLabel, detail].join("\u001f");
+}
+
+function normalizeCompactToolLabel(value: string): string {
+  return value.replace(/\s+(?:complete|completed)\s*$/i, "").trim();
+}
+
+function toLatestProposedPlanState(proposedPlan: ProposedPlan): LatestProposedPlanState {
+  return {
+    id: proposedPlan.id,
+    createdAt: proposedPlan.createdAt,
+    updatedAt: proposedPlan.updatedAt,
+    turnId: proposedPlan.turnId,
+    planMarkdown: proposedPlan.planMarkdown,
+    implementedAt: proposedPlan.implementedAt,
+    implementationThreadId: proposedPlan.implementationThreadId,
+  };
 }
 
 function asRecord(value: unknown): Record<string, unknown> | null {
@@ -630,7 +798,31 @@ function compareActivitiesByOrder(
     return -1;
   }
 
-  return left.createdAt.localeCompare(right.createdAt) || left.id.localeCompare(right.id);
+  const createdAtComparison = left.createdAt.localeCompare(right.createdAt);
+  if (createdAtComparison !== 0) {
+    return createdAtComparison;
+  }
+
+  const lifecycleRankComparison =
+    compareActivityLifecycleRank(left.kind) - compareActivityLifecycleRank(right.kind);
+  if (lifecycleRankComparison !== 0) {
+    return lifecycleRankComparison;
+  }
+
+  return left.id.localeCompare(right.id);
+}
+
+function compareActivityLifecycleRank(kind: string): number {
+  if (kind.endsWith(".started") || kind === "tool.started") {
+    return 0;
+  }
+  if (kind.endsWith(".progress") || kind.endsWith(".updated")) {
+    return 1;
+  }
+  if (kind.endsWith(".completed") || kind.endsWith(".resolved")) {
+    return 2;
+  }
+  return 1;
 }
 
 export function hasToolActivityForTurn(
diff --git a/apps/web/src/store.test.ts b/apps/web/src/store.test.ts
index 77e822b97c..8c3816d231 100644
--- a/apps/web/src/store.test.ts
+++ b/apps/web/src/store.test.ts
@@ -199,7 +199,7 @@ describe("store read model sync", () => {
     expect(next.threads[0]?.model).toBe("claude-opus-4-6");
   });
 
-  it("resolves claude aliases when session provider is claudeCode", () => {
+  it("resolves claude aliases when session provider is claudeAgent", () => {
     const initialState = makeState(makeThread());
     const readModel = makeReadModel(
       makeReadModelThread({
@@ -207,7 +207,7 @@ describe("store read model sync", () => {
         session: {
           threadId: ThreadId.makeUnsafe("thread-1"),
           status: "ready",
-          providerName: "claudeCode",
+          providerName: "claudeAgent",
           runtimeMode: "approval-required",
           activeTurnId: null,
           lastError: null,
@@ -247,10 +247,10 @@ describe("store read model sync", () => {
   it("preserves the previous provider when a thread session closes", () => {
     const initialState = makeState(
       makeThread({
-        provider: "claudeCode",
+        provider: "claudeAgent",
         model: "claude-sonnet-4-6",
         session: {
-          provider: "claudeCode",
+          provider: "claudeAgent",
           status: "ready",
           orchestrationStatus: "ready",
           createdAt: "2026-02-27T00:00:00.000Z",
@@ -267,7 +267,7 @@ describe("store read model sync", () => {
 
     const next = syncServerReadModel(initialState, readModel);
 
-    expect(next.threads[0]?.provider).toBe("claudeCode");
+    expect(next.threads[0]?.provider).toBe("claudeAgent");
     expect(next.threads[0]?.model).toBe("claude-sonnet-4-6");
     expect(next.threads[0]?.session).toBeNull();
   });
diff --git a/apps/web/src/store.ts b/apps/web/src/store.ts
index c1893e60a4..00aec5c68a 100644
--- a/apps/web/src/store.ts
+++ b/apps/web/src/store.ts
@@ -6,7 +6,11 @@ import {
   type OrchestrationReadModel,
   type OrchestrationSessionStatus,
 } from "@t3tools/contracts";
-import { resolveModelSlug, resolveModelSlugForProvider } from "@t3tools/shared/model";
+import {
+  inferProviderForModel,
+  resolveModelSlug,
+  resolveModelSlugForProvider,
+} from "@t3tools/shared/model";
 import { create } from "zustand";
 import { inferProviderForThreadModel, toProviderKind } from "./lib/threadProvider";
 import { type ChatMessage, type Project, type Thread } from "./types";
@@ -289,6 +293,8 @@ function normalizeProposedPlan(
     id: proposedPlan.id,
     turnId: proposedPlan.turnId,
     planMarkdown: proposedPlan.planMarkdown,
+    implementedAt: proposedPlan.implementedAt,
+    implementationThreadId: proposedPlan.implementationThreadId,
     createdAt: proposedPlan.createdAt,
     updatedAt: proposedPlan.updatedAt,
   };
@@ -297,6 +303,8 @@ function normalizeProposedPlan(
     existing.id === normalized.id &&
     existing.turnId === normalized.turnId &&
     existing.planMarkdown === normalized.planMarkdown &&
+    existing.implementedAt === normalized.implementedAt &&
+    existing.implementationThreadId === normalized.implementationThreadId &&
     existing.createdAt === normalized.createdAt &&
     existing.updatedAt === normalized.updatedAt
   ) {
diff --git a/apps/web/src/types.ts b/apps/web/src/types.ts
index 18ea07cddd..7be5156dd6 100644
--- a/apps/web/src/types.ts
+++ b/apps/web/src/types.ts
@@ -53,6 +53,8 @@ export interface ProposedPlan {
   id: OrchestrationProposedPlanId;
   turnId: TurnId | null;
   planMarkdown: string;
+  implementedAt: string | null;
+  implementationThreadId: ThreadId | null;
   createdAt: string;
   updatedAt: string;
 }
diff --git a/apps/web/vitest.browser.config.ts b/apps/web/vitest.browser.config.ts
index c67fdfbe99..b152d82210 100644
--- a/apps/web/vitest.browser.config.ts
+++ b/apps/web/vitest.browser.config.ts
@@ -15,10 +15,7 @@ export default mergeConfig(
       },
     },
     test: {
-      include: [
-        "src/components/ChatView.browser.tsx",
-        "src/components/KeybindingsToast.browser.tsx",
-      ],
+      include: ["src/components/**/*.browser.tsx"],
       browser: {
         enabled: true,
         provider: playwright(),
diff --git a/bun.lock b/bun.lock
index c9c35e7604..1d3d29dfa3 100644
--- a/bun.lock
+++ b/bun.lock
@@ -14,7 +14,7 @@
     },
     "apps/desktop": {
       "name": "@t3tools/desktop",
-      "version": "0.0.5",
+      "version": "0.0.13",
       "dependencies": {
         "effect": "catalog:",
         "electron": "40.6.0",
@@ -43,12 +43,12 @@
     },
     "apps/server": {
       "name": "t3",
-      "version": "0.0.5",
+      "version": "0.0.13",
       "bin": {
         "t3": "./dist/index.mjs",
       },
       "dependencies": {
-        "@anthropic-ai/claude-agent-sdk": "^0.2.71",
+        "@anthropic-ai/claude-agent-sdk": "^0.2.77",
         "@effect/platform-node": "catalog:",
         "@effect/sql-sqlite-bun": "catalog:",
         "@github/copilot": "1.0.2",
@@ -76,7 +76,7 @@
     },
     "apps/web": {
       "name": "@t3tools/web",
-      "version": "0.0.5",
+      "version": "0.0.13",
       "dependencies": {
         "@base-ui/react": "^1.2.0",
         "@dnd-kit/core": "^6.3.1",
@@ -127,7 +127,7 @@
     },
     "packages/contracts": {
       "name": "@t3tools/contracts",
-      "version": "0.0.5",
+      "version": "0.0.13",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -157,6 +157,7 @@
     "scripts": {
       "name": "@t3tools/scripts",
       "dependencies": {
+        "@anthropic-ai/claude-agent-sdk": "^0.2.77",
         "@effect/platform-node": "catalog:",
         "@t3tools/contracts": "workspace:*",
         "@t3tools/shared": "workspace:*",
@@ -187,15 +188,15 @@
     "vitest": "^4.0.0",
   },
   "packages": {
-    "@anthropic-ai/claude-agent-sdk": ["@anthropic-ai/claude-agent-sdk@0.2.74", "", { "optionalDependencies": { "@img/sharp-darwin-arm64": "^0.34.2", "@img/sharp-darwin-x64": "^0.34.2", "@img/sharp-linux-arm": "^0.34.2", "@img/sharp-linux-arm64": "^0.34.2", "@img/sharp-linux-x64": "^0.34.2", "@img/sharp-linuxmusl-arm64": "^0.34.2", "@img/sharp-linuxmusl-x64": "^0.34.2", "@img/sharp-win32-arm64": "^0.34.2", "@img/sharp-win32-x64": "^0.34.2" }, "peerDependencies": { "zod": "^4.0.0" } }, "sha512-S/SFSSbZHPL1HiQxAqCCxU3iHuE5nM+ir0OK1n0bZ+9hlVUH7OOn88AsV9s54E0c1kvH9YF4/foWH8J9kICsBw=="],
+    "@anthropic-ai/claude-agent-sdk": ["@anthropic-ai/claude-agent-sdk@0.2.77", "", { "optionalDependencies": { "@img/sharp-darwin-arm64": "^0.34.2", "@img/sharp-darwin-x64": "^0.34.2", "@img/sharp-linux-arm": "^0.34.2", "@img/sharp-linux-arm64": "^0.34.2", "@img/sharp-linux-x64": "^0.34.2", "@img/sharp-linuxmusl-arm64": "^0.34.2", "@img/sharp-linuxmusl-x64": "^0.34.2", "@img/sharp-win32-arm64": "^0.34.2", "@img/sharp-win32-x64": "^0.34.2" }, "peerDependencies": { "zod": "^4.0.0" } }, "sha512-t+R1BW3ahCFMNM7/8WJq7+Gw9KPA9Cl7UUK8fWPokJZ75cf/xwEd9MqB+MVNoQT45dJiom/wxybT7tqYPkCqyg=="],
 
-    "@astrojs/check": ["@astrojs/check@0.9.7", "", { "dependencies": { "@astrojs/language-server": "^2.16.1", "chokidar": "^4.0.3", "kleur": "^4.1.5", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": "^5.0.0" }, "bin": { "astro-check": "bin/astro-check.js" } }, "sha512-dA7U5/OFg8/xaMUb2vUOOJuuJXnMpHy6F0BM8ZhL7WT5OkTBwJ0GoW38n4fC4CXt+lT9mLWL0y8Pa74tFByBpQ=="],
+    "@astrojs/check": ["@astrojs/check@0.9.8", "", { "dependencies": { "@astrojs/language-server": "^2.16.5", "chokidar": "^4.0.3", "kleur": "^4.1.5", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": "^5.0.0" }, "bin": { "astro-check": "bin/astro-check.js" } }, "sha512-LDng8446QLS5ToKjRHd3bgUdirvemVVExV7nRyJfW2wV36xuv7vDxwy5NWN9zqeSEDgg0Tv84sP+T3yEq+Zlkw=="],
 
-    "@astrojs/compiler": ["@astrojs/compiler@3.0.0", "", {}, "sha512-MwAbDE5mawZ1SS+D8qWiHdprdME5Tlj2e0YjxnEICvcOpbSukNS7Sa7hA5PK+6RrmUr/t6Gi5YgrdZKjbO/WPQ=="],
+    "@astrojs/compiler": ["@astrojs/compiler@3.0.1", "", {}, "sha512-z97oYbdebO5aoWzuJ/8q5hLK232+17KcLZ7cJ8BCWk6+qNzVxn/gftC0KzMBUTD8WAaBkPpNSQK6PXLnNrZ0CA=="],
 
     "@astrojs/internal-helpers": ["@astrojs/internal-helpers@0.8.0", "", { "dependencies": { "picomatch": "^4.0.3" } }, "sha512-J56GrhEiV+4dmrGLPNOl2pZjpHXAndWVyiVDYGDuw6MWKpBSEMLdFxHzeM/6sqaknw9M+HFfHZAcvi3OfT3D/w=="],
 
-    "@astrojs/language-server": ["@astrojs/language-server@2.16.4", "", { "dependencies": { "@astrojs/compiler": "^2.13.1", "@astrojs/yaml2ts": "^0.2.3", "@jridgewell/sourcemap-codec": "^1.5.5", "@volar/kit": "~2.4.28", "@volar/language-core": "~2.4.28", "@volar/language-server": "~2.4.28", "@volar/language-service": "~2.4.28", "muggle-string": "^0.4.1", "tinyglobby": "^0.2.15", "volar-service-css": "0.0.68", "volar-service-emmet": "0.0.68", "volar-service-html": "0.0.68", "volar-service-prettier": "0.0.68", "volar-service-typescript": "0.0.68", "volar-service-typescript-twoslash-queries": "0.0.68", "volar-service-yaml": "0.0.68", "vscode-html-languageservice": "^5.6.1", "vscode-uri": "^3.1.0" }, "peerDependencies": { "prettier": "^3.0.0", "prettier-plugin-astro": ">=0.11.0" }, "optionalPeers": ["prettier", "prettier-plugin-astro"], "bin": { "astro-ls": "bin/nodeServer.js" } }, "sha512-42oqz9uX+hU1/rFniJvtYW9FbfZJ6syM2fYZFi7Ub71/kOvF1GSeMS8sA3Ogs3iOeNUWefk/ImwBiiHeNmJfSA=="],
+    "@astrojs/language-server": ["@astrojs/language-server@2.16.5", "", { "dependencies": { "@astrojs/compiler": "^2.13.1", "@astrojs/yaml2ts": "^0.2.3", "@jridgewell/sourcemap-codec": "^1.5.5", "@volar/kit": "~2.4.28", "@volar/language-core": "~2.4.28", "@volar/language-server": "~2.4.28", "@volar/language-service": "~2.4.28", "muggle-string": "^0.4.1", "tinyglobby": "^0.2.15", "volar-service-css": "0.0.70", "volar-service-emmet": "0.0.70", "volar-service-html": "0.0.70", "volar-service-prettier": "0.0.70", "volar-service-typescript": "0.0.70", "volar-service-typescript-twoslash-queries": "0.0.70", "volar-service-yaml": "0.0.70", "vscode-html-languageservice": "^5.6.2", "vscode-uri": "^3.1.0" }, "peerDependencies": { "prettier": "^3.0.0", "prettier-plugin-astro": ">=0.11.0" }, "optionalPeers": ["prettier", "prettier-plugin-astro"], "bin": { "astro-ls": "bin/nodeServer.js" } }, "sha512-MEQvrbuiFDEo+LCO4vvYuTr3eZ4IluZ/n4BbUv77AWAJNEj/n0j7VqTvdL1rGloNTIKZTUd46p5RwYKsxQGY8w=="],
 
     "@astrojs/markdown-remark": ["@astrojs/markdown-remark@7.0.0", "", { "dependencies": { "@astrojs/internal-helpers": "0.8.0", "@astrojs/prism": "4.0.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "js-yaml": "^4.1.1", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^4.0.0", "smol-toml": "^1.6.0", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.1.0", "unist-util-visit-parents": "^6.0.2", "vfile": "^6.0.3" } }, "sha512-jTAXHPy45L7o1ljH4jYV+ShtOHtyQUa1mGp3a5fJp1soX8lInuTJQ6ihmldHzVM4Q7QptU4SzIDIcKbBJO7sXQ=="],
 
@@ -527,7 +528,7 @@
 
     "@open-draft/until": ["@open-draft/until@2.1.0", "", {}, "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg=="],
 
-    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.2.25", "", {}, "sha512-ikuGWob48OM7LTgfXFqGOZKVOqh50FEjvtIBhXGhGowJhifmjZ+xuq/ypP8nPjTwUX73pbu1C3X9ZBWVkCN9mA=="],
+    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.2.27", "", {}, "sha512-Wk0o/I+Fo+wE3zgvlJDs8Fb67KlKqX0PrV8dK5adSDkANq6r4Z25zXJg2iOir+a8ntg3rAcpel1OY4FV/TwRUA=="],
 
     "@oslojs/encoding": ["@oslojs/encoding@1.1.0", "", {}, "sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ=="],
 
@@ -573,45 +574,45 @@
 
     "@oxfmt/binding-win32-x64-msvc": ["@oxfmt/binding-win32-x64-msvc@0.40.0", "", { "os": "win32", "cpu": "x64" }, "sha512-/Zmj0yTYSvmha6TG1QnoLqVT7ZMRDqXvFXXBQpIjteEwx9qvUYMBH2xbiOFhDeMUJkGwC3D6fdKsFtaqUvkwNA=="],
 
-    "@oxlint/binding-android-arm-eabi": ["@oxlint/binding-android-arm-eabi@1.55.0", "", { "os": "android", "cpu": "arm" }, "sha512-NhvgAhncTSOhRahQSCnkK/4YIGPjTmhPurQQ2dwt2IvwCMTvZRW5vF2K10UBOxFve4GZDMw6LtXZdC2qeuYIVQ=="],
+    "@oxlint/binding-android-arm-eabi": ["@oxlint/binding-android-arm-eabi@1.56.0", "", { "os": "android", "cpu": "arm" }, "sha512-IyfYPthZyiSKwAv/dLjeO18SaK8MxLI9Yss2JrRDyweQAkuL3LhEy7pwIwI7uA3KQc1Vdn20kdmj3q0oUIQL6A=="],
 
-    "@oxlint/binding-android-arm64": ["@oxlint/binding-android-arm64@1.55.0", "", { "os": "android", "cpu": "arm64" }, "sha512-P9iWRh+Ugqhg+D7rkc7boHX8o3H2h7YPcZHQIgvVBgnua5tk4LR2L+IBlreZs58/95cd2x3/004p5VsQM9z4SA=="],
+    "@oxlint/binding-android-arm64": ["@oxlint/binding-android-arm64@1.56.0", "", { "os": "android", "cpu": "arm64" }, "sha512-Ga5zYrzH6vc/VFxhn6MmyUnYEfy9vRpwTIks99mY3j6Nz30yYpIkWryI0QKPCgvGUtDSXVLEaMum5nA+WrNOSg=="],
 
-    "@oxlint/binding-darwin-arm64": ["@oxlint/binding-darwin-arm64@1.55.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-esakkJIt7WFAhT30P/Qzn96ehFpzdZ1mNuzpOb8SCW7lI4oB8VsyQnkSHREM671jfpuBb/o2ppzBCx5l0jpgMA=="],
+    "@oxlint/binding-darwin-arm64": ["@oxlint/binding-darwin-arm64@1.56.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ogmbdJysnw/D4bDcpf1sPLpFThZ48lYp4aKYm10Z/6Nh1SON6NtnNhTNOlhEY296tDFItsZUz+2tgcSYqh8Eyw=="],
 
-    "@oxlint/binding-darwin-x64": ["@oxlint/binding-darwin-x64@1.55.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-xDMFRCCAEK9fOH6As2z8ELsC+VDGSFRHwIKVSilw+xhgLwTDFu37rtmRbmUlx8rRGS6cWKQPTc47AVxAZEVVPQ=="],
+    "@oxlint/binding-darwin-x64": ["@oxlint/binding-darwin-x64@1.56.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-x8QE1h+RAtQ2g+3KPsP6Fk/tdz6zJQUv5c7fTrJxXV3GHOo+Ry5p/PsogU4U+iUZg0rj6hS+E4xi+mnwwlDCWQ=="],
 
-    "@oxlint/binding-freebsd-x64": ["@oxlint/binding-freebsd-x64@1.55.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-mYZqnwUD7ALCRxGenyLd1uuG+rHCL+OTT6S8FcAbVm/ZT2AZMGjvibp3F6k1SKOb2aeqFATmwRykrE41Q0GWVw=="],
+    "@oxlint/binding-freebsd-x64": ["@oxlint/binding-freebsd-x64@1.56.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-6G+WMZvwJpMvY7my+/SHEjb7BTk/PFbePqLpmVmUJRIsJMy/UlyYqjpuh0RCgYYkPLcnXm1rUM04kbTk8yS1Yg=="],
 
-    "@oxlint/binding-linux-arm-gnueabihf": ["@oxlint/binding-linux-arm-gnueabihf@1.55.0", "", { "os": "linux", "cpu": "arm" }, "sha512-LcX6RYcF9vL9ESGwJW3yyIZ/d/ouzdOKXxCdey1q0XJOW1asrHsIg5MmyKdEBR4plQx+shvYeQne7AzW5f3T1w=="],
+    "@oxlint/binding-linux-arm-gnueabihf": ["@oxlint/binding-linux-arm-gnueabihf@1.56.0", "", { "os": "linux", "cpu": "arm" }, "sha512-YYHBsk/sl7fYwQOok+6W5lBPeUEvisznV/HZD2IfZmF3Bns6cPC3Z0vCtSEOaAWTjYWN3jVsdu55jMxKlsdlhg=="],
 
-    "@oxlint/binding-linux-arm-musleabihf": ["@oxlint/binding-linux-arm-musleabihf@1.55.0", "", { "os": "linux", "cpu": "arm" }, "sha512-C+8GS1rPtK+dI7mJFkqoRBkDuqbrNihnyYQsJPS9ez+8zF9JzfvU19lawqt4l/Y23o5uQswE/DORa8aiXUih3w=="],
+    "@oxlint/binding-linux-arm-musleabihf": ["@oxlint/binding-linux-arm-musleabihf@1.56.0", "", { "os": "linux", "cpu": "arm" }, "sha512-+AZK8rOUr78y8WT6XkDb04IbMRqauNV+vgT6f8ZLOH8wnpQ9i7Nol0XLxAu+Cq7Sb+J9wC0j6Km5hG8rj47/yQ=="],
 
-    "@oxlint/binding-linux-arm64-gnu": ["@oxlint/binding-linux-arm64-gnu@1.55.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-ErLE4XbmcCopA4/CIDiH6J1IAaDOMnf/KSx/aFObs4/OjAAM3sFKWGZ57pNOMxhhyBdcmcXwYymph9GwcpcqgQ=="],
+    "@oxlint/binding-linux-arm64-gnu": ["@oxlint/binding-linux-arm64-gnu@1.56.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-urse2SnugwJRojUkGSSeH2LPMaje5Q50yQtvtL9HFckiyeqXzoFwOAZqD5TR29R2lq7UHidfFDM9EGcchcbb8A=="],
 
-    "@oxlint/binding-linux-arm64-musl": ["@oxlint/binding-linux-arm64-musl@1.55.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-/kp65avi6zZfqEng56TTuhiy3P/3pgklKIdf38yvYeJ9/PgEeRA2A2AqKAKbZBNAqUzrzHhz9jF6j/PZvhJzTQ=="],
+    "@oxlint/binding-linux-arm64-musl": ["@oxlint/binding-linux-arm64-musl@1.56.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-rkTZkBfJ4TYLjansjSzL6mgZOdN5IvUnSq3oNJSLwBcNvy3dlgQtpHPrRxrCEbbcp7oQ6If0tkNaqfOsphYZ9g=="],
 
-    "@oxlint/binding-linux-ppc64-gnu": ["@oxlint/binding-linux-ppc64-gnu@1.55.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-A6pTdXwcEEwL/nmz0eUJ6WxmxcoIS+97GbH96gikAyre3s5deC7sts38ZVVowjS2QQFuSWkpA4ZmQC0jZSNvJQ=="],
+    "@oxlint/binding-linux-ppc64-gnu": ["@oxlint/binding-linux-ppc64-gnu@1.56.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-uqL1kMH3u69/e1CH2EJhP3CP28jw2ExLsku4o8RVAZ7fySo9zOyI2fy9pVlTAp4voBLVgzndXi3SgtdyCTa2aA=="],
 
-    "@oxlint/binding-linux-riscv64-gnu": ["@oxlint/binding-linux-riscv64-gnu@1.55.0", "", { "os": "linux", "cpu": "none" }, "sha512-clj0lnIN+V52G9tdtZl0LbdTSurnZ1NZj92Je5X4lC7gP5jiCSW+Y/oiDiSauBAD4wrHt2S7nN3pA0zfKYK/6Q=="],
+    "@oxlint/binding-linux-riscv64-gnu": ["@oxlint/binding-linux-riscv64-gnu@1.56.0", "", { "os": "linux", "cpu": "none" }, "sha512-j0CcMBOgV6KsRaBdsebIeiy7hCjEvq2KdEsiULf2LZqAq0v1M1lWjelhCV57LxsqaIGChXFuFJ0RiFrSRHPhSg=="],
 
-    "@oxlint/binding-linux-riscv64-musl": ["@oxlint/binding-linux-riscv64-musl@1.55.0", "", { "os": "linux", "cpu": "none" }, "sha512-NNu08pllN5x/O94/sgR3DA8lbrGBnTHsINZZR0hcav1sj79ksTiKKm1mRzvZvacwQ0hUnGinFo+JO75ok2PxYg=="],
+    "@oxlint/binding-linux-riscv64-musl": ["@oxlint/binding-linux-riscv64-musl@1.56.0", "", { "os": "linux", "cpu": "none" }, "sha512-7VDOiL8cDG3DQ/CY3yKjbV1c4YPvc4vH8qW09Vv+5ukq3l/Kcyr6XGCd5NvxUmxqDb2vjMpM+eW/4JrEEsUetA=="],
 
-    "@oxlint/binding-linux-s390x-gnu": ["@oxlint/binding-linux-s390x-gnu@1.55.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-BvfQz3PRlWZRoEZ17dZCqgQsMRdpzGZomJkVATwCIGhHVVeHJMQdmdXPSjcT1DCNUrOjXnVyj1RGDj5+/Je2+Q=="],
+    "@oxlint/binding-linux-s390x-gnu": ["@oxlint/binding-linux-s390x-gnu@1.56.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-JGRpX0M+ikD3WpwJ7vKcHKV6Kg0dT52BW2Eu2BupXotYeqGXBrbY+QPkAyKO6MNgKozyTNaRh3r7g+VWgyAQYQ=="],
 
-    "@oxlint/binding-linux-x64-gnu": ["@oxlint/binding-linux-x64-gnu@1.55.0", "", { "os": "linux", "cpu": "x64" }, "sha512-ngSOoFCSBMKVQd24H8zkbcBNc7EHhjnF1sv3mC9NNXQ/4rRjI/4Dj9+9XoDZeFEkF1SX1COSBXF1b2Pr9rqdEw=="],
+    "@oxlint/binding-linux-x64-gnu": ["@oxlint/binding-linux-x64-gnu@1.56.0", "", { "os": "linux", "cpu": "x64" }, "sha512-dNaICPvtmuxFP/VbqdofrLqdS3bM/AKJN3LMJD52si44ea7Be1cBk6NpfIahaysG9Uo+L98QKddU9CD5L8UHnQ=="],
 
-    "@oxlint/binding-linux-x64-musl": ["@oxlint/binding-linux-x64-musl@1.55.0", "", { "os": "linux", "cpu": "x64" }, "sha512-BDpP7W8GlaG7BR6QjGZAleYzxoyKc/D24spZIF2mB3XsfALQJJT/OBmP8YpeTb1rveFSBHzl8T7l0aqwkWNdGA=="],
+    "@oxlint/binding-linux-x64-musl": ["@oxlint/binding-linux-x64-musl@1.56.0", "", { "os": "linux", "cpu": "x64" }, "sha512-pF1vOtM+GuXmbklM1hV8WMsn6tCNPvkUzklj/Ej98JhlanbmA2RB1BILgOpwSuCTRTIYx2MXssmEyQQ90QF5aA=="],
 
-    "@oxlint/binding-openharmony-arm64": ["@oxlint/binding-openharmony-arm64@1.55.0", "", { "os": "none", "cpu": "arm64" }, "sha512-PS6GFvmde/pc3fCA2Srt51glr8Lcxhpf6WIBFfLphndjRrD34NEcses4TSxQrEcxYo6qVywGfylM0ZhSCF2gGA=="],
+    "@oxlint/binding-openharmony-arm64": ["@oxlint/binding-openharmony-arm64@1.56.0", "", { "os": "none", "cpu": "arm64" }, "sha512-bp8NQ4RE6fDIFLa4bdBiOA+TAvkNkg+rslR+AvvjlLTYXLy9/uKAYLQudaQouWihLD/hgkrXIKKzXi5IXOewwg=="],
 
-    "@oxlint/binding-win32-arm64-msvc": ["@oxlint/binding-win32-arm64-msvc@1.55.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-P6JcLJGs/q1UOvDLzN8otd9JsH4tsuuPDv+p7aHqHM3PrKmYdmUvkNj4K327PTd35AYcznOCN+l4ZOaq76QzSw=="],
+    "@oxlint/binding-win32-arm64-msvc": ["@oxlint/binding-win32-arm64-msvc@1.56.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-PxT4OJDfMOQBzo3OlzFb9gkoSD+n8qSBxyVq2wQSZIHFQYGEqIRTo9M0ZStvZm5fdhMqaVYpOnJvH2hUMEDk/g=="],
 
-    "@oxlint/binding-win32-ia32-msvc": ["@oxlint/binding-win32-ia32-msvc@1.55.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-gzkk4zE2zsE+WmRxFOiAZHpCpUNDFytEakqNXoNHW+PnYEOTPKDdW6nrzgSeTbGKVPXNAKQnRnMgrh7+n3Xueg=="],
+    "@oxlint/binding-win32-ia32-msvc": ["@oxlint/binding-win32-ia32-msvc@1.56.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-PTRy6sIEPqy2x8PTP1baBNReN/BNEFmde0L+mYeHmjXE1Vlcc9+I5nsqENsB2yAm5wLkzPoTNCMY/7AnabT4/A=="],
 
-    "@oxlint/binding-win32-x64-msvc": ["@oxlint/binding-win32-x64-msvc@1.55.0", "", { "os": "win32", "cpu": "x64" }, "sha512-ZFALNow2/og75gvYzNP7qe+rREQ5xunktwA+lgykoozHZ6hw9bqg4fn5j2UvG4gIn1FXqrZHkOAXuPf5+GOYTQ=="],
+    "@oxlint/binding-win32-x64-msvc": ["@oxlint/binding-win32-x64-msvc@1.56.0", "", { "os": "win32", "cpu": "x64" }, "sha512-ZHa0clocjLmIDr+1LwoWtxRcoYniAvERotvwKUYKhH41NVfl0Y4LNbyQkwMZzwDvKklKGvGZ5+DAG58/Ik47tQ=="],
 
-    "@pierre/diffs": ["@pierre/diffs@1.1.0-beta.19", "", { "dependencies": { "@pierre/theme": "0.0.22", "@shikijs/transformers": "^3.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-XxGPKkVW+1t2KJQfgjmSnS+93nI9+ACJl1XjhF3Lo4BdQJOxV3pHeyix31ySn/m/1llq6O/7bXucE0OYCK6Kog=="],
+    "@pierre/diffs": ["@pierre/diffs@1.1.0", "", { "dependencies": { "@pierre/theme": "0.0.22", "@shikijs/transformers": "^3.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-wbxrzcmanJuHZb81iir09j42uU9AnKxXDtAuEQJbAnti5f2UfYdCQYejawuHZStFrlsMacCZLh/dDHmqvAaQCw=="],
 
     "@pierre/theme": ["@pierre/theme@0.0.22", "", {}, "sha512-ePUIdQRNGjrveELTU7fY89Xa7YGHHEy5Po5jQy/18lm32eRn96+tnYJEtFooGdffrx55KBUtOXfvVy/7LDFFhA=="],
 
@@ -651,7 +652,7 @@
 
     "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.0.0-rc.3", "", { "os": "win32", "cpu": "x64" }, "sha512-a4VUQZH7LxGbUJ3qJ/TzQG8HxdHvf+jOnqf7B7oFx1TEBm+j2KNL2zr5SQ7wHkNAcaPevF6gf9tQnVBnC4mD+A=="],
 
-    "@rolldown/plugin-babel": ["@rolldown/plugin-babel@0.2.0", "", { "dependencies": { "picomatch": "^4.0.3" }, "peerDependencies": { "@babel/core": "^7.29.0 || ^8.0.0-rc.1", "@babel/plugin-transform-runtime": "^7.29.0 || ^8.0.0-rc.1", "@babel/runtime": "^7.27.0 || ^8.0.0-rc.1", "rolldown": "^1.0.0-rc.5", "vite": "^8.0.0" }, "optionalPeers": ["@babel/plugin-transform-runtime", "@babel/runtime", "vite"] }, "sha512-ZkajPtfcBTfLSZTmm40k2E0cwT5HDosBcj71fdUURXl7FfETb50jEbV39ujPw2RFp3ZpOugK3ATdX+HuFfWr9Q=="],
+    "@rolldown/plugin-babel": ["@rolldown/plugin-babel@0.2.1", "", { "dependencies": { "picomatch": "^4.0.3" }, "peerDependencies": { "@babel/core": "^7.29.0 || ^8.0.0-rc.1", "@babel/plugin-transform-runtime": "^7.29.0 || ^8.0.0-rc.1", "@babel/runtime": "^7.27.0 || ^8.0.0-rc.1", "rolldown": "^1.0.0-rc.5", "vite": "^8.0.0" }, "optionalPeers": ["@babel/plugin-transform-runtime", "@babel/runtime", "vite"] }, "sha512-pHDVHqFv26JNC8I500JZ0H4h1kvSyiE3V9gjEO9pRAgD1KrIdJvcHCokV6f7gG7Rx4vMOD11V8VUOpqdyGbKBw=="],
 
     "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-rc.7", "", {}, "sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA=="],
 
@@ -725,7 +726,7 @@
 
     "@tanstack/devtools-event-client": ["@tanstack/devtools-event-client@0.4.3", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-OZI6QyULw0FI0wjgmeYzCIfbgPsOEzwJtCpa69XrfLMtNXLGnz3d/dIabk7frg0TmHo+Ah49w5I4KC7Tufwsvw=="],
 
-    "@tanstack/history": ["@tanstack/history@1.161.4", "", {}, "sha512-Kp/WSt411ZWYvgXy6uiv5RmhHrz9cAml05AQPrtdAp7eUqvIDbMGPnML25OKbzR3RJ1q4wgENxDTvlGPa9+Mww=="],
+    "@tanstack/history": ["@tanstack/history@1.161.6", "", {}, "sha512-NaOGLRrddszbQj9upGat6HG/4TKvXLvu+osAIgfxPYA+eIvYKv8GKDJOrY2D3/U9MRnKfMWD7bU4jeD4xmqyIg=="],
 
     "@tanstack/pacer": ["@tanstack/pacer@0.18.0", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.0", "@tanstack/store": "^0.8.0" } }, "sha512-qhCRSFei0hokQr3xYcQXqxsRD/LKlgHCxHXtKHrQoImp4x2Zu6tUOpUGVH4y2qexIrzSu3aibQBNNfC3Eay6Mg=="],
 
@@ -735,25 +736,25 @@
 
     "@tanstack/react-query": ["@tanstack/react-query@5.90.21", "", { "dependencies": { "@tanstack/query-core": "5.90.20" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg=="],
 
-    "@tanstack/react-router": ["@tanstack/react-router@1.166.7", "", { "dependencies": { "@tanstack/history": "1.161.4", "@tanstack/react-store": "^0.9.1", "@tanstack/router-core": "1.166.7", "isbot": "^5.1.22", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-LLcXu2nrCn2WL+w0YAbg3CRZIIO2cYVSC3y+ZYlFBxBs4hh8eoNP1EWFvRLZGCFYpqON7x6qUf1u0W7tH0cJJw=="],
+    "@tanstack/react-router": ["@tanstack/react-router@1.167.3", "", { "dependencies": { "@tanstack/history": "1.161.6", "@tanstack/react-store": "^0.9.1", "@tanstack/router-core": "1.167.3", "isbot": "^5.1.22", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-1qbSy4r+O7IBdmPLlcKsjB041Gq2MMnIEAYSGIjaMZIL4duUIQnOWLw4jTfjKil/IJz/9rO5JcvrbxOG5UTSdg=="],
 
     "@tanstack/react-store": ["@tanstack/react-store@0.8.1", "", { "dependencies": { "@tanstack/store": "0.8.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-XItJt+rG8c5Wn/2L/bnxys85rBpm0BfMbhb4zmPVLXAKY9POrp1xd6IbU4PKoOI+jSEGc3vntPRfLGSgXfE2Ig=="],
 
-    "@tanstack/react-virtual": ["@tanstack/react-virtual@3.13.22", "", { "dependencies": { "@tanstack/virtual-core": "3.13.22" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-EaOrBBJLi3M0bTMQRjGkxLXRw7Gizwntoy5E2Q2UnSbML7Mo2a1P/Hfkw5tw9FLzK62bj34Jl6VNbQfRV6eJcA=="],
+    "@tanstack/react-virtual": ["@tanstack/react-virtual@3.13.23", "", { "dependencies": { "@tanstack/virtual-core": "3.13.23" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-XnMRnHQ23piOVj2bzJqHrRrLg4r+F86fuBcwteKfbIjJrtGxb4z7tIvPVAe4B+4UVwo9G4Giuz5fmapcrnZ0OQ=="],
 
-    "@tanstack/router-core": ["@tanstack/router-core@1.166.7", "", { "dependencies": { "@tanstack/history": "1.161.4", "@tanstack/store": "^0.9.1", "cookie-es": "^2.0.0", "seroval": "^1.4.2", "seroval-plugins": "^1.4.2", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" } }, "sha512-MCc8wYIIcxmbeidM8PL2QeaAjUIHyhEDIZPW6NGfn/uwvyi+K2ucn3AGCxxcXl4JGGm0Mx9+7buYl1v3HdcFrg=="],
+    "@tanstack/router-core": ["@tanstack/router-core@1.167.3", "", { "dependencies": { "@tanstack/history": "1.161.6", "@tanstack/store": "^0.9.1", "cookie-es": "^2.0.0", "seroval": "^1.4.2", "seroval-plugins": "^1.4.2", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" } }, "sha512-M/CxrTGKk1fsySJjd+Pzpbi3YLDz+cJSutDjSTMy12owWlOgHV/I6kzR0UxyaBlHraM6XgMHNA0XdgsS1fa4Nw=="],
 
-    "@tanstack/router-generator": ["@tanstack/router-generator@1.166.7", "", { "dependencies": { "@tanstack/router-core": "1.166.7", "@tanstack/router-utils": "1.161.4", "@tanstack/virtual-file-routes": "1.161.4", "prettier": "^3.5.0", "recast": "^0.23.11", "source-map": "^0.7.4", "tsx": "^4.19.2", "zod": "^3.24.2" } }, "sha512-lBI0VS7J1zMrJhfvT+3FMq9jPdOrJ3VgciPXyYvZBF/a9Mr8T94MU78PqrBNuJbYh7qCFO14ZhArUFqkYGuozQ=="],
+    "@tanstack/router-generator": ["@tanstack/router-generator@1.166.11", "", { "dependencies": { "@tanstack/router-core": "1.167.3", "@tanstack/router-utils": "1.161.6", "@tanstack/virtual-file-routes": "1.161.6", "prettier": "^3.5.0", "recast": "^0.23.11", "source-map": "^0.7.4", "tsx": "^4.19.2", "zod": "^3.24.2" } }, "sha512-Q/49wxURbft1oNOvo/eVAWZq/lNLK3nBGlavqhLToAYXY6LCzfMtRlE/y3XPHzYC9pZc09u5jvBR1k1E4hyGDQ=="],
 
-    "@tanstack/router-plugin": ["@tanstack/router-plugin@1.166.7", "", { "dependencies": { "@babel/core": "^7.28.5", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.27.1", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.5", "@babel/types": "^7.28.5", "@tanstack/router-core": "1.166.7", "@tanstack/router-generator": "1.166.7", "@tanstack/router-utils": "1.161.4", "@tanstack/virtual-file-routes": "1.161.4", "chokidar": "^3.6.0", "unplugin": "^2.1.2", "zod": "^3.24.2" }, "peerDependencies": { "@rsbuild/core": ">=1.0.2", "@tanstack/react-router": "^1.166.7", "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0", "vite-plugin-solid": "^2.11.10", "webpack": ">=5.92.0" }, "optionalPeers": ["@rsbuild/core", "@tanstack/react-router", "vite", "vite-plugin-solid", "webpack"] }, "sha512-R06qe5UwApb/u02wDITVxN++6QE4xsLFQCr029VZ+4V8gyIe35kr8UCg3Jiyl6D5GXxhj62U2Ei8jccdkQaivw=="],
+    "@tanstack/router-plugin": ["@tanstack/router-plugin@1.166.12", "", { "dependencies": { "@babel/core": "^7.28.5", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.27.1", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.5", "@babel/types": "^7.28.5", "@tanstack/router-core": "1.167.3", "@tanstack/router-generator": "1.166.11", "@tanstack/router-utils": "1.161.6", "@tanstack/virtual-file-routes": "1.161.6", "chokidar": "^3.6.0", "unplugin": "^2.1.2", "zod": "^3.24.2" }, "peerDependencies": { "@rsbuild/core": ">=1.0.2", "@tanstack/react-router": "^1.167.3", "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0", "vite-plugin-solid": "^2.11.10", "webpack": ">=5.92.0" }, "optionalPeers": ["@rsbuild/core", "@tanstack/react-router", "vite", "vite-plugin-solid", "webpack"] }, "sha512-PYsnN6goK6zBaVo63UVKjofv69+HHMKRQXymwN55JYKguNnNR8OZ6E12icPb0Olc5uIpPiGz1YI2+rbpmNKGHA=="],
 
-    "@tanstack/router-utils": ["@tanstack/router-utils@1.161.4", "", { "dependencies": { "@babel/core": "^7.28.5", "@babel/generator": "^7.28.5", "@babel/parser": "^7.28.5", "@babel/types": "^7.28.5", "ansis": "^4.1.0", "babel-dead-code-elimination": "^1.0.12", "diff": "^8.0.2", "pathe": "^2.0.3", "tinyglobby": "^0.2.15" } }, "sha512-r8TpjyIZoqrXXaf2DDyjd44gjGBoyE+/oEaaH68yLI9ySPO1gUWmQENZ1MZnmBnpUGN24NOZxdjDLc8npK0SAw=="],
+    "@tanstack/router-utils": ["@tanstack/router-utils@1.161.6", "", { "dependencies": { "@babel/core": "^7.28.5", "@babel/generator": "^7.28.5", "@babel/parser": "^7.28.5", "@babel/types": "^7.28.5", "ansis": "^4.1.0", "babel-dead-code-elimination": "^1.0.12", "diff": "^8.0.2", "pathe": "^2.0.3", "tinyglobby": "^0.2.15" } }, "sha512-nRcYw+w2OEgK6VfjirYvGyPLOK+tZQz1jkYcmH5AjMamQ9PycnlxZF2aEZtPpNoUsaceX2bHptn6Ub5hGXqNvw=="],
 
     "@tanstack/store": ["@tanstack/store@0.9.2", "", {}, "sha512-K013lUJEFJK2ofFQ/hZKJUmCnpcV00ebLyOyFOWQvyQHUOZp/iYO84BM6aOGiV81JzwbX0APTVmW8YI7yiG5oA=="],
 
-    "@tanstack/virtual-core": ["@tanstack/virtual-core@3.13.22", "", {}, "sha512-isuUGKsc5TAPDoHSbWTbl1SCil54zOS2MiWz/9GCWHPUQOvNTQx8qJEWC7UWR0lShhbK0Lmkcf0SZYxvch7G3g=="],
+    "@tanstack/virtual-core": ["@tanstack/virtual-core@3.13.23", "", {}, "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg=="],
 
-    "@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.161.4", "", {}, "sha512-42WoRePf8v690qG8yGRe/YOh+oHni9vUaUUfoqlS91U2scd3a5rkLtVsc6b7z60w3RogH0I00vdrC5AaeiZ18w=="],
+    "@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.161.6", "", {}, "sha512-EGWs9yvJA821pUkwkiZLQW89CzUumHyJy8NKq229BubyoWXfDw1oWnTJYSS/hhbLiwP9+KpopjeF5wWwnCCyeQ=="],
 
     "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],
 
@@ -811,7 +812,7 @@
 
     "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="],
 
-    "@vitejs/plugin-react": ["@vitejs/plugin-react@6.0.0", "", { "dependencies": { "@rolldown/pluginutils": "1.0.0-rc.7" }, "peerDependencies": { "@rolldown/plugin-babel": "^0.1.7", "babel-plugin-react-compiler": "^1.0.0", "vite": "^8.0.0" }, "optionalPeers": ["@rolldown/plugin-babel", "babel-plugin-react-compiler"] }, "sha512-Bu5/eP6td3WI654+tRq+ryW1PbgA90y5pqMKpb3U7UpNk6VjI53P/ncPUd192U9dSrepLy7DHnq1XEMDz5H++w=="],
+    "@vitejs/plugin-react": ["@vitejs/plugin-react@6.0.1", "", { "dependencies": { "@rolldown/pluginutils": "1.0.0-rc.7" }, "peerDependencies": { "@rolldown/plugin-babel": "^0.1.7 || ^0.2.0", "babel-plugin-react-compiler": "^1.0.0", "vite": "^8.0.0" }, "optionalPeers": ["@rolldown/plugin-babel", "babel-plugin-react-compiler"] }, "sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ=="],
 
     "@vitest/browser": ["@vitest/browser@4.1.0", "", { "dependencies": { "@blazediff/core": "1.9.1", "@vitest/mocker": "4.1.0", "@vitest/utils": "4.1.0", "magic-string": "^0.30.21", "pngjs": "^7.0.0", "sirv": "^3.0.2", "tinyrainbow": "^3.0.3", "ws": "^8.19.0" }, "peerDependencies": { "vitest": "4.1.0" } }, "sha512-tG/iOrgbiHQks0ew7CdelUyNEHkv8NLrt+CqdTivIuoSnXvO7scWMn4Kqo78/UGY1NJ6Hv+vp8BvRnED/bjFdQ=="],
 
@@ -877,7 +878,7 @@
 
     "ast-types": ["ast-types@0.16.1", "", { "dependencies": { "tslib": "^2.0.1" } }, "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg=="],
 
-    "astro": ["astro@6.0.4", "", { "dependencies": { "@astrojs/compiler": "^3.0.0", "@astrojs/internal-helpers": "0.8.0", "@astrojs/markdown-remark": "7.0.0", "@astrojs/telemetry": "3.3.0", "@capsizecss/unpack": "^4.0.0", "@clack/prompts": "^1.0.1", "@oslojs/encoding": "^1.1.0", "@rollup/pluginutils": "^5.3.0", "aria-query": "^5.3.2", "axobject-query": "^4.1.0", "ci-info": "^4.4.0", "clsx": "^2.1.1", "common-ancestor-path": "^2.0.0", "cookie": "^1.1.1", "devalue": "^5.6.3", "diff": "^8.0.3", "dlv": "^1.1.3", "dset": "^3.1.4", "es-module-lexer": "^2.0.0", "esbuild": "^0.27.3", "flattie": "^1.1.1", "fontace": "~0.4.1", "github-slugger": "^2.0.0", "html-escaper": "3.0.3", "http-cache-semantics": "^4.2.0", "js-yaml": "^4.1.1", "magic-string": "^0.30.21", "magicast": "^0.5.2", "mrmime": "^2.0.1", "neotraverse": "^0.6.18", "obug": "^2.1.1", "p-limit": "^7.3.0", "p-queue": "^9.1.0", "package-manager-detector": "^1.6.0", "piccolore": "^0.1.3", "picomatch": "^4.0.3", "rehype": "^13.0.2", "semver": "^7.7.4", "shiki": "^4.0.0", "smol-toml": "^1.6.0", "svgo": "^4.0.0", "tinyclip": "^0.1.6", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tsconfck": "^3.1.6", "ultrahtml": "^1.6.0", "unifont": "~0.7.4", "unist-util-visit": "^5.1.0", "unstorage": "^1.17.4", "vfile": "^6.0.3", "vite": "^7.3.1", "vitefu": "^1.1.2", "xxhash-wasm": "^1.1.0", "yargs-parser": "^22.0.0", "zod": "^4.3.6" }, "optionalDependencies": { "sharp": "^0.34.0" }, "bin": { "astro": "bin/astro.mjs" } }, "sha512-1piLJCPTL/x7AMO2cjVFSTFyRqKuC3W8sSEySCt1aJio+p/wGs5H3K+Xr/rE9ftKtknLUtjxCqCE7/0NsXfGpQ=="],
+    "astro": ["astro@6.0.5", "", { "dependencies": { "@astrojs/compiler": "^3.0.0", "@astrojs/internal-helpers": "0.8.0", "@astrojs/markdown-remark": "7.0.0", "@astrojs/telemetry": "3.3.0", "@capsizecss/unpack": "^4.0.0", "@clack/prompts": "^1.0.1", "@oslojs/encoding": "^1.1.0", "@rollup/pluginutils": "^5.3.0", "aria-query": "^5.3.2", "axobject-query": "^4.1.0", "ci-info": "^4.4.0", "clsx": "^2.1.1", "common-ancestor-path": "^2.0.0", "cookie": "^1.1.1", "devalue": "^5.6.3", "diff": "^8.0.3", "dlv": "^1.1.3", "dset": "^3.1.4", "es-module-lexer": "^2.0.0", "esbuild": "^0.27.3", "flattie": "^1.1.1", "fontace": "~0.4.1", "github-slugger": "^2.0.0", "html-escaper": "3.0.3", "http-cache-semantics": "^4.2.0", "js-yaml": "^4.1.1", "magic-string": "^0.30.21", "magicast": "^0.5.2", "mrmime": "^2.0.1", "neotraverse": "^0.6.18", "obug": "^2.1.1", "p-limit": "^7.3.0", "p-queue": "^9.1.0", "package-manager-detector": "^1.6.0", "piccolore": "^0.1.3", "picomatch": "^4.0.3", "rehype": "^13.0.2", "semver": "^7.7.4", "shiki": "^4.0.0", "smol-toml": "^1.6.0", "svgo": "^4.0.0", "tinyclip": "^0.1.6", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tsconfck": "^3.1.6", "ultrahtml": "^1.6.0", "unifont": "~0.7.4", "unist-util-visit": "^5.1.0", "unstorage": "^1.17.4", "vfile": "^6.0.3", "vite": "^7.3.1", "vitefu": "^1.1.2", "xxhash-wasm": "^1.1.0", "yargs-parser": "^22.0.0", "zod": "^4.3.6" }, "optionalDependencies": { "sharp": "^0.34.0" }, "bin": { "astro": "bin/astro.mjs" } }, "sha512-JnLCwaoCaRXIHuIB8yNztJrd7M3hXrHUMAoQmeXtEBKxRu/738REhaCZ1lapjrS9HlpHsWTu3JUXTERB/0PA7g=="],
 
     "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="],
 
@@ -891,7 +892,7 @@
 
     "bail": ["bail@2.0.2", "", {}, "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw=="],
 
-    "baseline-browser-mapping": ["baseline-browser-mapping@2.10.7", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-1ghYO3HnxGec0TCGBXiDLVns4eCSx4zJpxnHrlqFQajmhfKMQBzUGDdkMK7fUW7PTHTeLf+j87aTuKuuwWzMGw=="],
+    "baseline-browser-mapping": ["baseline-browser-mapping@2.10.8", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-PCLz/LXGBsNTErbtB6i5u4eLpHeMfi93aUv5duMmj6caNu6IphS4q6UevDnL36sZQv9lrP11dbPKGMaXPwMKfQ=="],
 
     "binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
 
@@ -921,7 +922,7 @@
 
     "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="],
 
-    "caniuse-lite": ["caniuse-lite@1.0.30001778", "", {}, "sha512-PN7uxFL+ExFJO61aVmP1aIEG4i9whQd4eoSCebav62UwDyp5OHh06zN4jqKSMePVgxHifCw1QJxdRkA1Pisekg=="],
+    "caniuse-lite": ["caniuse-lite@1.0.30001779", "", {}, "sha512-U5og2PN7V4DMgF50YPNtnZJGWVLFjjsN3zb6uMT5VGYIewieDj1upwfuVNXf4Kor+89c3iCRJnSzMD5LmTvsfA=="],
 
     "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="],
 
@@ -1183,7 +1184,7 @@
 
     "headers-polyfill": ["headers-polyfill@4.0.3", "", {}, "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ=="],
 
-    "hookable": ["hookable@6.0.1", "", {}, "sha512-uKGyY8BuzN/a5gvzvA+3FVWo0+wUjgtfSdnmjtrOVwQCZPHpHDH2WRO3VZSOeluYrHoDCiXFffZXs8Dj1ULWtw=="],
+    "hookable": ["hookable@6.1.0", "", {}, "sha512-ZoKZSJgu8voGK2geJS+6YtYjvIzu9AOM/KZXsBxr83uhLL++e9pEv/dlgwgy3dvHg06kTz6JOh1hk3C8Ceiymw=="],
 
     "html-escaper": ["html-escaper@3.0.3", "", {}, "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ=="],
 
@@ -1309,7 +1310,7 @@
 
     "lowercase-keys": ["lowercase-keys@2.0.0", "", {}, "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="],
 
-    "lru-cache": ["lru-cache@11.2.6", "", {}, "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ=="],
+    "lru-cache": ["lru-cache@11.2.7", "", {}, "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA=="],
 
     "lru_map": ["lru_map@0.4.1", "", {}, "sha512-I+lBvqMMFfqaV8CJCISjI3wbjmwVu/VyOoU7+qtu9d7ioW5klMgsTTiUOUp+DJvfTTzKXoPbyC6YfgkNcyPSOg=="],
 
@@ -1433,7 +1434,7 @@
 
     "msgpackr-extract": ["msgpackr-extract@3.0.3", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA=="],
 
-    "msw": ["msw@2.12.10", "", { "dependencies": { "@inquirer/confirm": "^5.0.0", "@mswjs/interceptors": "^0.41.2", "@open-draft/deferred-promise": "^2.2.0", "@types/statuses": "^2.0.6", "cookie": "^1.0.2", "graphql": "^16.12.0", "headers-polyfill": "^4.0.2", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", "path-to-regexp": "^6.3.0", "picocolors": "^1.1.1", "rettime": "^0.10.1", "statuses": "^2.0.2", "strict-event-emitter": "^0.5.1", "tough-cookie": "^6.0.0", "type-fest": "^5.2.0", "until-async": "^3.0.2", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": ">= 4.8.x" }, "optionalPeers": ["typescript"], "bin": { "msw": "cli/index.js" } }, "sha512-G3VUymSE0/iegFnuipujpwyTM2GuZAKXNeerUSrG2+Eg391wW63xFs5ixWsK9MWzr1AGoSkYGmyAzNgbR3+urw=="],
+    "msw": ["msw@2.12.11", "", { "dependencies": { "@inquirer/confirm": "^5.0.0", "@mswjs/interceptors": "^0.41.2", "@open-draft/deferred-promise": "^2.2.0", "@types/statuses": "^2.0.6", "cookie": "^1.0.2", "graphql": "^16.12.0", "headers-polyfill": "^4.0.2", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", "path-to-regexp": "^6.3.0", "picocolors": "^1.1.1", "rettime": "^0.10.1", "statuses": "^2.0.2", "strict-event-emitter": "^0.5.1", "tough-cookie": "^6.0.0", "type-fest": "^5.2.0", "until-async": "^3.0.2", "yargs": "^17.7.2" }, "peerDependencies": { "typescript": ">= 4.8.x" }, "optionalPeers": ["typescript"], "bin": { "msw": "cli/index.js" } }, "sha512-dVg20zi2I2EvnwH/+WupzsOC2mCa7qsIhyMAWtfRikn6RKtwL9+7SaF1IQ5LyZry4tlUtf6KyTVhnlQiZXozTQ=="],
 
     "muggle-string": ["muggle-string@0.4.1", "", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],
 
@@ -1477,7 +1478,7 @@
 
     "oniguruma-parser": ["oniguruma-parser@0.12.1", "", {}, "sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w=="],
 
-    "oniguruma-to-es": ["oniguruma-to-es@4.3.4", "", { "dependencies": { "oniguruma-parser": "^0.12.1", "regex": "^6.0.1", "regex-recursion": "^6.0.2" } }, "sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA=="],
+    "oniguruma-to-es": ["oniguruma-to-es@4.3.5", "", { "dependencies": { "oniguruma-parser": "^0.12.1", "regex": "^6.1.0", "regex-recursion": "^6.0.2" } }, "sha512-Zjygswjpsewa0NLTsiizVuMQZbp0MDyM6lIt66OxsF21npUDlzpHi1Mgb/qhQdkb+dWFTzJmFbEWdvZgRho8eQ=="],
 
     "open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],
 
@@ -1485,7 +1486,7 @@
 
     "oxfmt": ["oxfmt@0.40.0", "", { "dependencies": { "tinypool": "2.1.0" }, "optionalDependencies": { "@oxfmt/binding-android-arm-eabi": "0.40.0", "@oxfmt/binding-android-arm64": "0.40.0", "@oxfmt/binding-darwin-arm64": "0.40.0", "@oxfmt/binding-darwin-x64": "0.40.0", "@oxfmt/binding-freebsd-x64": "0.40.0", "@oxfmt/binding-linux-arm-gnueabihf": "0.40.0", "@oxfmt/binding-linux-arm-musleabihf": "0.40.0", "@oxfmt/binding-linux-arm64-gnu": "0.40.0", "@oxfmt/binding-linux-arm64-musl": "0.40.0", "@oxfmt/binding-linux-ppc64-gnu": "0.40.0", "@oxfmt/binding-linux-riscv64-gnu": "0.40.0", "@oxfmt/binding-linux-riscv64-musl": "0.40.0", "@oxfmt/binding-linux-s390x-gnu": "0.40.0", "@oxfmt/binding-linux-x64-gnu": "0.40.0", "@oxfmt/binding-linux-x64-musl": "0.40.0", "@oxfmt/binding-openharmony-arm64": "0.40.0", "@oxfmt/binding-win32-arm64-msvc": "0.40.0", "@oxfmt/binding-win32-ia32-msvc": "0.40.0", "@oxfmt/binding-win32-x64-msvc": "0.40.0" }, "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-g0C3I7xUj4b4DcagevM9kgH6+pUHytikxUcn3/VUkvzTNaaXBeyZqb7IBsHwojeXm4mTBEC/aBjBTMVUkZwWUQ=="],
 
-    "oxlint": ["oxlint@1.55.0", "", { "optionalDependencies": { "@oxlint/binding-android-arm-eabi": "1.55.0", "@oxlint/binding-android-arm64": "1.55.0", "@oxlint/binding-darwin-arm64": "1.55.0", "@oxlint/binding-darwin-x64": "1.55.0", "@oxlint/binding-freebsd-x64": "1.55.0", "@oxlint/binding-linux-arm-gnueabihf": "1.55.0", "@oxlint/binding-linux-arm-musleabihf": "1.55.0", "@oxlint/binding-linux-arm64-gnu": "1.55.0", "@oxlint/binding-linux-arm64-musl": "1.55.0", "@oxlint/binding-linux-ppc64-gnu": "1.55.0", "@oxlint/binding-linux-riscv64-gnu": "1.55.0", "@oxlint/binding-linux-riscv64-musl": "1.55.0", "@oxlint/binding-linux-s390x-gnu": "1.55.0", "@oxlint/binding-linux-x64-gnu": "1.55.0", "@oxlint/binding-linux-x64-musl": "1.55.0", "@oxlint/binding-openharmony-arm64": "1.55.0", "@oxlint/binding-win32-arm64-msvc": "1.55.0", "@oxlint/binding-win32-ia32-msvc": "1.55.0", "@oxlint/binding-win32-x64-msvc": "1.55.0" }, "peerDependencies": { "oxlint-tsgolint": ">=0.15.0" }, "optionalPeers": ["oxlint-tsgolint"], "bin": { "oxlint": "bin/oxlint" } }, "sha512-T+FjepiyWpaZMhekqRpH8Z3I4vNM610p6w+Vjfqgj5TZUxHXl7N8N5IPvmOU8U4XdTRxqtNNTh9Y4hLtr7yvFg=="],
+    "oxlint": ["oxlint@1.56.0", "", { "optionalDependencies": { "@oxlint/binding-android-arm-eabi": "1.56.0", "@oxlint/binding-android-arm64": "1.56.0", "@oxlint/binding-darwin-arm64": "1.56.0", "@oxlint/binding-darwin-x64": "1.56.0", "@oxlint/binding-freebsd-x64": "1.56.0", "@oxlint/binding-linux-arm-gnueabihf": "1.56.0", "@oxlint/binding-linux-arm-musleabihf": "1.56.0", "@oxlint/binding-linux-arm64-gnu": "1.56.0", "@oxlint/binding-linux-arm64-musl": "1.56.0", "@oxlint/binding-linux-ppc64-gnu": "1.56.0", "@oxlint/binding-linux-riscv64-gnu": "1.56.0", "@oxlint/binding-linux-riscv64-musl": "1.56.0", "@oxlint/binding-linux-s390x-gnu": "1.56.0", "@oxlint/binding-linux-x64-gnu": "1.56.0", "@oxlint/binding-linux-x64-musl": "1.56.0", "@oxlint/binding-openharmony-arm64": "1.56.0", "@oxlint/binding-win32-arm64-msvc": "1.56.0", "@oxlint/binding-win32-ia32-msvc": "1.56.0", "@oxlint/binding-win32-x64-msvc": "1.56.0" }, "peerDependencies": { "oxlint-tsgolint": ">=0.15.0" }, "optionalPeers": ["oxlint-tsgolint"], "bin": { "oxlint": "bin/oxlint" } }, "sha512-Q+5Mj5PVaH/R6/fhMMFzw4dT+KPB+kQW4kaL8FOIq7tfhlnEVp6+3lcWqFruuTNlUo9srZUW3qH7Id4pskeR6g=="],
 
     "p-cancelable": ["p-cancelable@2.1.1", "", {}, "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="],
 
@@ -1537,7 +1538,7 @@
 
     "pump": ["pump@3.0.4", "", { "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" } }, "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA=="],
 
-    "pure-rand": ["pure-rand@8.0.0", "", {}, "sha512-7rgWlxG2gAvFPIQfUreo1XYlNvrQ9VnQPFWdncPkdl3icucLK0InOxsaafbvxGTnI6Bk/Rxmslg0lQlRCuzOXw=="],
+    "pure-rand": ["pure-rand@8.1.0", "", {}, "sha512-53B3MB8wetRdD6JZ4W/0gDKaOvKwuXrEmV1auQc0hASWge8rieKV4PCCVNVbJ+i24miiubb4c/B+dg8Ho0ikYw=="],
 
     "quansync": ["quansync@1.0.0", "", {}, "sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA=="],
 
@@ -1703,7 +1704,7 @@
 
     "tinyclip": ["tinyclip@0.1.12", "", {}, "sha512-Ae3OVUqifDw0wBriIBS7yVaW44Dp6eSHQcyq4Igc7eN2TJH/2YsicswaW+J/OuMvhpDPOKEgpAZCjkb4hpoyeA=="],
 
-    "tinyexec": ["tinyexec@1.0.2", "", {}, "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg=="],
+    "tinyexec": ["tinyexec@1.0.4", "", {}, "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw=="],
 
     "tinyglobby": ["tinyglobby@0.2.15", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.3" } }, "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="],
 
@@ -1711,9 +1712,9 @@
 
     "tinyrainbow": ["tinyrainbow@3.1.0", "", {}, "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw=="],
 
-    "tldts": ["tldts@7.0.25", "", { "dependencies": { "tldts-core": "^7.0.25" }, "bin": { "tldts": "bin/cli.js" } }, "sha512-keinCnPbwXEUG3ilrWQZU+CqcTTzHq9m2HhoUP2l7Xmi8l1LuijAXLpAJ5zRW+ifKTNscs4NdCkfkDCBYm352w=="],
+    "tldts": ["tldts@7.0.26", "", { "dependencies": { "tldts-core": "^7.0.26" }, "bin": { "tldts": "bin/cli.js" } }, "sha512-WiGwQjr0qYdNNG8KpMKlSvpxz652lqa3Rd+/hSaDcY4Uo6SKWZq2LAF+hsAhUewTtYhXlorBKgNF3Kk8hnjGoQ=="],
 
-    "tldts-core": ["tldts-core@7.0.25", "", {}, "sha512-ZjCZK0rppSBu7rjHYDYsEaMOIbbT+nWF57hKkv4IUmZWBNrBWBOjIElc0mKRgLM8bm7x/BBlof6t2gi/Oq/Asw=="],
+    "tldts-core": ["tldts-core@7.0.26", "", {}, "sha512-5WJ2SqFsv4G2Dwi7ZFVRnz6b2H1od39QME1lc2y5Ew3eWiZMAeqOAfWpRP9jHvhUl881406QtZTODvjttJs+ew=="],
 
     "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="],
 
@@ -1737,19 +1738,19 @@
 
     "tsx": ["tsx@4.21.0", "", { "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw=="],
 
-    "turbo": ["turbo@2.8.16", "", { "optionalDependencies": { "turbo-darwin-64": "2.8.16", "turbo-darwin-arm64": "2.8.16", "turbo-linux-64": "2.8.16", "turbo-linux-arm64": "2.8.16", "turbo-windows-64": "2.8.16", "turbo-windows-arm64": "2.8.16" }, "bin": { "turbo": "bin/turbo" } }, "sha512-u6e9e3cTTpE2adQ1DYm3A3r8y3LAONEx1jYvJx6eIgSY4bMLxIxs0riWzI0Z/IK903ikiUzRPZ2c1Ph5lVLkhA=="],
+    "turbo": ["turbo@2.8.17", "", { "optionalDependencies": { "turbo-darwin-64": "2.8.17", "turbo-darwin-arm64": "2.8.17", "turbo-linux-64": "2.8.17", "turbo-linux-arm64": "2.8.17", "turbo-windows-64": "2.8.17", "turbo-windows-arm64": "2.8.17" }, "bin": { "turbo": "bin/turbo" } }, "sha512-YwPsNSqU2f/RXU/+Kcb7cPkPZARxom4+me7LKEdN5jsvy2tpfze3zDZ4EiGrJnvOm9Avu9rK0aaYsP7qZ3iz7A=="],
 
-    "turbo-darwin-64": ["turbo-darwin-64@2.8.16", "", { "os": "darwin", "cpu": "x64" }, "sha512-KWa4hUMWrpADC6Q/wIHRkBLw6X6MV9nx6X7hSXbTrrMz0KdaKhmfudUZ3sS76bJFmgArBU25cSc0AUyyrswYxg=="],
+    "turbo-darwin-64": ["turbo-darwin-64@2.8.17", "", { "os": "darwin", "cpu": "x64" }, "sha512-ZFkv2hv7zHpAPEXBF6ouRRXshllOavYc+jjcrYyVHvxVTTwJWsBZwJ/gpPzmOKGvkSjsEyDO5V6aqqtZzwVF+Q=="],
 
-    "turbo-darwin-arm64": ["turbo-darwin-arm64@2.8.16", "", { "os": "darwin", "cpu": "arm64" }, "sha512-NBgaqBDLQSZlJR4D5XCkQq6noaO0RvIgwm5eYFJYL3bH5dNu8o0UBpq7C5DYnQI8+ybyoHFjT5/icN4LeUYLow=="],
+    "turbo-darwin-arm64": ["turbo-darwin-arm64@2.8.17", "", { "os": "darwin", "cpu": "arm64" }, "sha512-5DXqhQUt24ycEryXDfMNKEkW5TBHs+QmU23a2qxXwwFDaJsWcPo2obEhBxxdEPOv7qmotjad+09RGeWCcJ9JDw=="],
 
-    "turbo-linux-64": ["turbo-linux-64@2.8.16", "", { "os": "linux", "cpu": "x64" }, "sha512-VYPdcCRevI9kR/hr1H1xwXy7QQt/jNKiim1e1mjANBXD2E9VZWMkIL74J1Huad5MbU3/jw7voHOqDPLJPC2p6w=="],
+    "turbo-linux-64": ["turbo-linux-64@2.8.17", "", { "os": "linux", "cpu": "x64" }, "sha512-KLUbz6w7F73D/Ihh51hVagrKR0/CTsPEbRkvXLXvoND014XJ4BCrQUqSxlQ4/hu+nqp1v5WlM85/h3ldeyujuA=="],
 
-    "turbo-linux-arm64": ["turbo-linux-arm64@2.8.16", "", { "os": "linux", "cpu": "arm64" }, "sha512-beq8tgUVI3uwkQkXJMiOr/hfxQRw54M3elpBwqgYFfemiK5LhCjjcwO0DkE8GZZfElBIlk+saMAQOZy3885wNQ=="],
+    "turbo-linux-arm64": ["turbo-linux-arm64@2.8.17", "", { "os": "linux", "cpu": "arm64" }, "sha512-pJK67XcNJH40lTAjFu7s/rUlobgVXyB3A3lDoq+/JccB3hf+SysmkpR4Itlc93s8LEaFAI4mamhFuTV17Z6wOg=="],
 
-    "turbo-windows-64": ["turbo-windows-64@2.8.16", "", { "os": "win32", "cpu": "x64" }, "sha512-Ig7b46iUgiOIkea/D3Z7H+zNzvzSnIJcLYFpZLA0RxbUTrbLhv9qIPwv3pT9p/abmu0LXVKHxaOo+p26SuDhzw=="],
+    "turbo-windows-64": ["turbo-windows-64@2.8.17", "", { "os": "win32", "cpu": "x64" }, "sha512-EijeQ6zszDMmGZLP2vT2RXTs/GVi9rM0zv2/G4rNu2SSRSGFapgZdxgW4b5zUYLVaSkzmkpWlGfPfj76SW9yUg=="],
 
-    "turbo-windows-arm64": ["turbo-windows-arm64@2.8.16", "", { "os": "win32", "cpu": "arm64" }, "sha512-fOWjbEA2PiE2HEnFQrwNZKYEdjewyPc2no9GmrXklZnTCuMsxeCN39aVlKpKpim03Zq/ykIuvApGwq8ZbfS2Yw=="],
+    "turbo-windows-arm64": ["turbo-windows-arm64@2.8.17", "", { "os": "win32", "cpu": "arm64" }, "sha512-crpfeMPkfECd4V1PQ/hMoiyVcOy04+bWedu/if89S15WhOalHZ2BYUi6DOJhZrszY+mTT99OwpOsj4wNfb/GHQ=="],
 
     "type-fest": ["type-fest@5.4.4", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw=="],
 
@@ -1767,7 +1768,7 @@
 
     "uncrypto": ["uncrypto@0.1.3", "", {}, "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q=="],
 
-    "undici": ["undici@7.24.0", "", {}, "sha512-jxytwMHhsbdpBXxLAcuu0fzlQeXCNnWdDyRHpvWsUl8vd98UwYdl9YTyn8/HcpcJPC3pwUveefsa3zTxyD/ERg=="],
+    "undici": ["undici@7.24.4", "", {}, "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w=="],
 
     "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
 
@@ -1821,21 +1822,21 @@
 
     "vitest": ["vitest@4.1.0", "", { "dependencies": { "@vitest/expect": "4.1.0", "@vitest/mocker": "4.1.0", "@vitest/pretty-format": "4.1.0", "@vitest/runner": "4.1.0", "@vitest/snapshot": "4.1.0", "@vitest/spy": "4.1.0", "@vitest/utils": "4.1.0", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.0.3", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@vitest/browser-playwright": "4.1.0", "@vitest/browser-preview": "4.1.0", "@vitest/browser-webdriverio": "4.1.0", "@vitest/ui": "4.1.0", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw=="],
 
-    "vitest-browser-react": ["vitest-browser-react@2.0.5", "", { "peerDependencies": { "@types/react": "^18.0.0 || ^19.0.0", "@types/react-dom": "^18.0.0 || ^19.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "vitest": "^4.0.0" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-YODQX8mHTJCyKNVYTWJrLEYrUtw+QfLl78owgvuE7C5ydgmGBq6v5s4jK2w6wdPhIZsN9PpV1rQbmAevWJjO9g=="],
+    "vitest-browser-react": ["vitest-browser-react@2.1.0", "", { "peerDependencies": { "@types/react": "^18.0.0 || ^19.0.0", "@types/react-dom": "^18.0.0 || ^19.0.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "vitest": "^4.0.0" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-/cOVQ+dZojhavfsbHjcfzB3zrUxG39HIbGdvK9vSBdGc8b8HRu5Bql0p8aXtKw4sb8/E8n5XEncQxvqHtfjjag=="],
 
-    "volar-service-css": ["volar-service-css@0.0.68", "", { "dependencies": { "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-lJSMh6f3QzZ1tdLOZOzovLX0xzAadPhx8EKwraDLPxBndLCYfoTvnNuiFFV8FARrpAlW5C0WkH+TstPaCxr00Q=="],
+    "volar-service-css": ["volar-service-css@0.0.70", "", { "dependencies": { "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-K1qyOvBpE3rzdAv3e4/6Rv5yizrYPy5R/ne3IWCAzLBuMO4qBMV3kSqWzj6KUVe6S0AnN6wxF7cRkiaKfYMYJw=="],
 
-    "volar-service-emmet": ["volar-service-emmet@0.0.68", "", { "dependencies": { "@emmetio/css-parser": "^0.4.1", "@emmetio/html-matcher": "^1.3.0", "@vscode/emmet-helper": "^2.9.3", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-nHvixrRQ83EzkQ4G/jFxu9Y4eSsXS/X2cltEPDM+K9qZmIv+Ey1w0tg1+6caSe8TU5Hgw4oSTwNMf/6cQb3LzQ=="],
+    "volar-service-emmet": ["volar-service-emmet@0.0.70", "", { "dependencies": { "@emmetio/css-parser": "^0.4.1", "@emmetio/html-matcher": "^1.3.0", "@vscode/emmet-helper": "^2.9.3", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-xi5bC4m/VyE3zy/n2CXspKeDZs3qA41tHLTw275/7dNWM/RqE2z3BnDICQybHIVp/6G1iOQj5c1qXMgQC08TNg=="],
 
-    "volar-service-html": ["volar-service-html@0.0.68", "", { "dependencies": { "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-fru9gsLJxy33xAltXOh4TEdi312HP80hpuKhpYQD4O5hDnkNPEBdcQkpB+gcX0oK0VxRv1UOzcGQEUzWCVHLfA=="],
+    "volar-service-html": ["volar-service-html@0.0.70", "", { "dependencies": { "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-eR6vCgMdmYAo4n+gcT7DSyBQbwB8S3HZZvSagTf0sxNaD4WppMCFfpqWnkrlGStPKMZvMiejRRVmqsX9dYcTvQ=="],
 
-    "volar-service-prettier": ["volar-service-prettier@0.0.68", "", { "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0", "prettier": "^2.2 || ^3.0" }, "optionalPeers": ["@volar/language-service", "prettier"] }, "sha512-grUmWHkHlebMOd6V8vXs2eNQUw/bJGJMjekh/EPf/p2ZNTK0Uyz7hoBRngcvGfJHMsSXZH8w/dZTForIW/4ihw=="],
+    "volar-service-prettier": ["volar-service-prettier@0.0.70", "", { "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0", "prettier": "^2.2 || ^3.0" }, "optionalPeers": ["@volar/language-service", "prettier"] }, "sha512-Z6BCFSpGVCd8BPAsZ785Kce1BGlWd5ODqmqZGVuB14MJvrR4+CYz6cDy4F+igmE1gMifqfvMhdgT8Aud4M5ngg=="],
 
-    "volar-service-typescript": ["volar-service-typescript@0.0.68", "", { "dependencies": { "path-browserify": "^1.0.1", "semver": "^7.6.2", "typescript-auto-import-cache": "^0.3.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-nls": "^5.2.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-z7B/7CnJ0+TWWFp/gh2r5/QwMObHNDiQiv4C9pTBNI2Wxuwymd4bjEORzrJ/hJ5Yd5+OzeYK+nFCKevoGEEeKw=="],
+    "volar-service-typescript": ["volar-service-typescript@0.0.70", "", { "dependencies": { "path-browserify": "^1.0.1", "semver": "^7.6.2", "typescript-auto-import-cache": "^0.3.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-nls": "^5.2.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-l46Bx4cokkUedTd74ojO5H/zqHZJ8SUuyZ0IB8JN4jfRqUM3bQFBHoOwlZCyZmOeO0A3RQNkMnFclxO4c++gsg=="],
 
-    "volar-service-typescript-twoslash-queries": ["volar-service-typescript-twoslash-queries@0.0.68", "", { "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-NugzXcM0iwuZFLCJg47vI93su5YhTIweQuLmZxvz5ZPTaman16JCvmDZexx2rd5T/75SNuvvZmrTOTNYUsfe5w=="],
+    "volar-service-typescript-twoslash-queries": ["volar-service-typescript-twoslash-queries@0.0.70", "", { "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-IdD13Z9N2Bu8EM6CM0fDV1E69olEYGHDU25X51YXmq8Y0CmJ2LNj6gOiBJgpS5JGUqFzECVhMNBW7R0sPdRTMQ=="],
 
-    "volar-service-yaml": ["volar-service-yaml@0.0.68", "", { "dependencies": { "vscode-uri": "^3.0.8", "yaml-language-server": "~1.19.2" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-84XgE02LV0OvTcwfqhcSwVg4of3MLNUWPMArO6Aj8YXqyEVnPu8xTEMY2btKSq37mVAPuaEVASI4e3ptObmqcA=="],
+    "volar-service-yaml": ["volar-service-yaml@0.0.70", "", { "dependencies": { "vscode-uri": "^3.0.8", "yaml-language-server": "~1.20.0" }, "peerDependencies": { "@volar/language-service": "~2.4.0" }, "optionalPeers": ["@volar/language-service"] }, "sha512-0c8bXDBeoATF9F6iPIlOuYTuZAC4c+yi0siQo920u7eiBJk8oQmUmg9cDUbR4+Gl++bvGP4plj3fErbJuPqdcQ=="],
 
     "vscode-css-languageservice": ["vscode-css-languageservice@6.3.10", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", "vscode-uri": "^3.1.0" } }, "sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA=="],
 
@@ -1883,7 +1884,7 @@
 
     "yaml": ["yaml@2.8.2", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A=="],
 
-    "yaml-language-server": ["yaml-language-server@1.19.2", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "ajv": "^8.17.1", "ajv-draft-04": "^1.0.0", "lodash": "4.17.21", "prettier": "^3.5.0", "request-light": "^0.5.7", "vscode-json-languageservice": "4.1.8", "vscode-languageserver": "^9.0.0", "vscode-languageserver-textdocument": "^1.0.1", "vscode-languageserver-types": "^3.16.0", "vscode-uri": "^3.0.2", "yaml": "2.7.1" }, "bin": { "yaml-language-server": "bin/yaml-language-server" } }, "sha512-9F3myNmJzUN/679jycdMxqtydPSDRAarSj3wPiF7pchEPnO9Dg07Oc+gIYLqXR4L+g+FSEVXXv2+mr54StLFOg=="],
+    "yaml-language-server": ["yaml-language-server@1.20.0", "", { "dependencies": { "@vscode/l10n": "^0.0.18", "ajv": "^8.17.1", "ajv-draft-04": "^1.0.0", "prettier": "^3.5.0", "request-light": "^0.5.7", "vscode-json-languageservice": "4.1.8", "vscode-languageserver": "^9.0.0", "vscode-languageserver-textdocument": "^1.0.1", "vscode-languageserver-types": "^3.16.0", "vscode-uri": "^3.0.2", "yaml": "2.7.1" }, "bin": { "yaml-language-server": "bin/yaml-language-server" } }, "sha512-qhjK/bzSRZ6HtTvgeFvjNPJGWdZ0+x5NREV/9XZWFjIGezew2b4r5JPy66IfOhd5OA7KeFwk1JfmEbnTvev0cA=="],
 
     "yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],
 
@@ -1891,7 +1892,7 @@
 
     "yauzl": ["yauzl@2.10.0", "", { "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" } }, "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="],
 
-    "yjs": ["yjs@13.6.29", "", { "dependencies": { "lib0": "^0.2.99" } }, "sha512-kHqDPdltoXH+X4w1lVmMtddE3Oeqq48nM40FD5ojTd8xYhQpzIDcfE2keMSU5bAgRPJBe225WTUdyUgj1DtbiQ=="],
+    "yjs": ["yjs@13.6.30", "", { "dependencies": { "lib0": "^0.2.99" } }, "sha512-vv/9h42eCMC81ZHDFswuu/MKzkl/vyq1BhaNGfHyOonwlG4CJbQF4oiBBJPvfdeCt/PlVDWh7Nov9D34YY09uQ=="],
 
     "yocto-queue": ["yocto-queue@1.2.2", "", {}, "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ=="],
 
@@ -1899,7 +1900,7 @@
 
     "zod": ["zod@4.3.6", "", {}, "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg=="],
 
-    "zustand": ["zustand@5.0.11", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg=="],
+    "zustand": ["zustand@5.0.12", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g=="],
 
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
@@ -1925,13 +1926,13 @@
 
     "@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="],
 
-    "@effect/platform-node/effect": ["effect@4.0.0-beta.31", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-w3QwJnlaLtWWiUSzhCXUTIisnULPsxLzpO6uqaBFjXybKx6FvCqsLJT6v4dV7G9eA9jeTtG6Gv7kF+jGe3HxzA=="],
+    "@effect/platform-node/effect": ["effect@4.0.0-beta.33", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-ln9emWPd1SemokSdOV43r2CbH1j8GTe9qbPvttmh9/j2OR0WNmj7UpjbN34llQgF9QV4IdcN6QdV2w8G7B7RyQ=="],
 
-    "@effect/platform-node-shared/effect": ["effect@4.0.0-beta.31", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-w3QwJnlaLtWWiUSzhCXUTIisnULPsxLzpO6uqaBFjXybKx6FvCqsLJT6v4dV7G9eA9jeTtG6Gv7kF+jGe3HxzA=="],
+    "@effect/platform-node-shared/effect": ["effect@4.0.0-beta.33", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-ln9emWPd1SemokSdOV43r2CbH1j8GTe9qbPvttmh9/j2OR0WNmj7UpjbN34llQgF9QV4IdcN6QdV2w8G7B7RyQ=="],
 
-    "@effect/sql-sqlite-bun/effect": ["effect@4.0.0-beta.31", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-w3QwJnlaLtWWiUSzhCXUTIisnULPsxLzpO6uqaBFjXybKx6FvCqsLJT6v4dV7G9eA9jeTtG6Gv7kF+jGe3HxzA=="],
+    "@effect/sql-sqlite-bun/effect": ["effect@4.0.0-beta.33", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-ln9emWPd1SemokSdOV43r2CbH1j8GTe9qbPvttmh9/j2OR0WNmj7UpjbN34llQgF9QV4IdcN6QdV2w8G7B7RyQ=="],
 
-    "@effect/vitest/effect": ["effect@4.0.0-beta.31", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-w3QwJnlaLtWWiUSzhCXUTIisnULPsxLzpO6uqaBFjXybKx6FvCqsLJT6v4dV7G9eA9jeTtG6Gv7kF+jGe3HxzA=="],
+    "@effect/vitest/effect": ["effect@4.0.0-beta.33", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-ln9emWPd1SemokSdOV43r2CbH1j8GTe9qbPvttmh9/j2OR0WNmj7UpjbN34llQgF9QV4IdcN6QdV2w8G7B7RyQ=="],
 
     "@electron/get/fs-extra": ["fs-extra@8.1.0", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="],
 
@@ -2017,8 +2018,6 @@
 
     "vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="],
 
-    "yaml-language-server/lodash": ["lodash@4.17.21", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="],
-
     "yaml-language-server/request-light": ["request-light@0.5.8", "", {}, "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="],
 
     "yaml-language-server/yaml": ["yaml@2.7.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ=="],
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 679a0ef369..5e58266fc5 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/contracts",
-  "version": "0.0.5",
+  "version": "0.0.13",
   "private": true,
   "files": [
     "dist"
diff --git a/packages/contracts/src/model.ts b/packages/contracts/src/model.ts
index 60b46f8f62..b3904b42f0 100644
--- a/packages/contracts/src/model.ts
+++ b/packages/contracts/src/model.ts
@@ -6,9 +6,9 @@ export type CursorReasoningOption = (typeof CURSOR_REASONING_OPTIONS)[number];
 
 export const CODEX_REASONING_EFFORT_OPTIONS = ["xhigh", "high", "medium", "low"] as const;
 export type CodexReasoningEffort = (typeof CODEX_REASONING_EFFORT_OPTIONS)[number];
-
-export const CLAUDE_CODE_EFFORT_OPTIONS = ["low", "medium", "high", "max"] as const;
+export const CLAUDE_CODE_EFFORT_OPTIONS = ["low", "medium", "high", "max", "ultrathink"] as const;
 export type ClaudeCodeEffort = (typeof CLAUDE_CODE_EFFORT_OPTIONS)[number];
+export type ProviderReasoningEffort = CodexReasoningEffort | ClaudeCodeEffort;
 
 export const CodexModelOptions = Schema.Struct({
   reasoningEffort: Schema.optional(Schema.Literals(CODEX_REASONING_EFFORT_OPTIONS)),
@@ -30,11 +30,12 @@ export const OpencodeModelOptions = Schema.Struct({
 });
 export type OpencodeModelOptions = typeof OpencodeModelOptions.Type;
 
-export const ClaudeCodeModelOptions = Schema.Struct({
+export const ClaudeModelOptions = Schema.Struct({
   thinking: Schema.optional(Schema.Boolean),
   effort: Schema.optional(Schema.Literals(CLAUDE_CODE_EFFORT_OPTIONS)),
+  fastMode: Schema.optional(Schema.Boolean),
 });
-export type ClaudeCodeModelOptions = typeof ClaudeCodeModelOptions.Type;
+export type ClaudeModelOptions = typeof ClaudeModelOptions.Type;
 
 export const CursorModelOptions = Schema.Struct({
   reasoning: Schema.optional(Schema.Literals(CURSOR_REASONING_OPTIONS)),
@@ -65,7 +66,7 @@ export type KiloModelOptions = typeof KiloModelOptions.Type;
 export const ProviderModelOptions = Schema.Struct({
   codex: Schema.optional(CodexModelOptions),
   copilot: Schema.optional(CopilotModelOptions),
-  claudeCode: Schema.optional(ClaudeCodeModelOptions),
+  claudeAgent: Schema.optional(ClaudeModelOptions),
   cursor: Schema.optional(CursorModelOptions),
   opencode: Schema.optional(OpencodeModelOptions),
   geminiCli: Schema.optional(GeminiCliModelOptions),
@@ -146,7 +147,7 @@ export const MODEL_OPTIONS_BY_PROVIDER = {
     { slug: "gpt-5-mini", name: "GPT-5 mini" },
     { slug: "gpt-4.1", name: "GPT-4.1" },
   ],
-  claudeCode: [
+  claudeAgent: [
     { slug: "claude-opus-4-6", name: "Claude Opus 4.6" },
     { slug: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
     { slug: "claude-haiku-4-5", name: "Claude Haiku 4.5" },
@@ -216,14 +217,14 @@ export const MODEL_OPTIONS_BY_PROVIDER = {
 } as const satisfies Record<ProviderKind, readonly ModelOption[]>;
 export type ModelOptionsByProvider = typeof MODEL_OPTIONS_BY_PROVIDER;
 
-type BuiltInModelSlug = ModelOptionsByProvider[ProviderKind][number]["slug"];
+type BuiltInModelSlug = (typeof MODEL_OPTIONS_BY_PROVIDER)[ProviderKind][number]["slug"];
 export type ModelSlug = BuiltInModelSlug | (string & {});
 export type CursorModelSlug = (typeof MODEL_OPTIONS_BY_PROVIDER)["cursor"][number]["slug"];
 
-export const DEFAULT_MODEL_BY_PROVIDER = {
+export const DEFAULT_MODEL_BY_PROVIDER: Record<ProviderKind, ModelSlug> = {
   codex: "gpt-5.4",
   copilot: "claude-sonnet-4.6",
-  claudeCode: "claude-sonnet-4-6",
+  claudeAgent: "claude-sonnet-4-6",
   cursor: "opus-4.6-thinking",
   opencode: "gpt-5",
   geminiCli: "gemini-2.5-pro",
@@ -234,6 +235,7 @@ export const DEFAULT_MODEL_BY_PROVIDER = {
 // Backward compatibility for existing Codex-only call sites.
 export const MODEL_OPTIONS = MODEL_OPTIONS_BY_PROVIDER.codex;
 export const DEFAULT_MODEL = DEFAULT_MODEL_BY_PROVIDER.codex;
+export const DEFAULT_GIT_TEXT_GENERATION_MODEL = "gpt-5.4-mini" as const;
 export const DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER = {
   ...DEFAULT_MODEL_BY_PROVIDER,
   codex: "gpt-5.4-mini",
@@ -263,7 +265,7 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Record<ProviderKind, Record<string,
     opus: "claude-opus-4.6",
     gemini: "gemini-3-pro-preview",
   },
-  claudeCode: {
+  claudeAgent: {
     opus: "claude-opus-4-6",
     "opus-4.6": "claude-opus-4-6",
     "claude-opus-4.6": "claude-opus-4-6",
@@ -326,29 +328,29 @@ export const MODEL_SLUG_ALIASES_BY_PROVIDER: Record<ProviderKind, Record<string,
 export const REASONING_EFFORT_OPTIONS_BY_PROVIDER = {
   codex: CODEX_REASONING_EFFORT_OPTIONS,
   copilot: [],
-  claudeCode: [],
+  claudeAgent: CLAUDE_CODE_EFFORT_OPTIONS,
   cursor: [],
   opencode: [],
   kilo: [],
   geminiCli: [],
   amp: [],
-} as const satisfies Record<ProviderKind, readonly CodexReasoningEffort[]>;
+} as const satisfies Record<ProviderKind, readonly ProviderReasoningEffort[]>;
 
 export const DEFAULT_REASONING_EFFORT_BY_PROVIDER = {
   codex: "high",
   copilot: null,
-  claudeCode: null,
+  claudeAgent: "high",
   cursor: null,
   opencode: null,
   kilo: null,
   geminiCli: null,
   amp: null,
-} as const satisfies Record<ProviderKind, CodexReasoningEffort | null>;
+} as const satisfies Record<ProviderKind, ProviderReasoningEffort | null>;
 
 export const CLAUDE_CODE_EFFORT_OPTIONS_BY_PROVIDER = {
   codex: [],
   copilot: [],
-  claudeCode: CLAUDE_CODE_EFFORT_OPTIONS,
+  claudeAgent: CLAUDE_CODE_EFFORT_OPTIONS,
   cursor: [],
   opencode: [],
   kilo: [],
@@ -359,7 +361,7 @@ export const CLAUDE_CODE_EFFORT_OPTIONS_BY_PROVIDER = {
 export const DEFAULT_CLAUDE_CODE_EFFORT_BY_PROVIDER = {
   codex: null,
   copilot: null,
-  claudeCode: "high",
+  claudeAgent: "high",
   cursor: null,
   opencode: null,
   kilo: null,
diff --git a/packages/contracts/src/orchestration.test.ts b/packages/contracts/src/orchestration.test.ts
index 5f72062067..fcede8798e 100644
--- a/packages/contracts/src/orchestration.test.ts
+++ b/packages/contracts/src/orchestration.test.ts
@@ -6,6 +6,8 @@ import {
   DEFAULT_PROVIDER_INTERACTION_MODE,
   DEFAULT_RUNTIME_MODE,
   OrchestrationGetTurnDiffInput,
+  OrchestrationLatestTurn,
+  OrchestrationProposedPlan,
   OrchestrationSession,
   ProjectCreateCommand,
   ThreadTurnStartCommand,
@@ -21,6 +23,8 @@ const decodeThreadTurnStartCommand = Schema.decodeUnknownEffect(ThreadTurnStartC
 const decodeThreadTurnStartRequestedPayload = Schema.decodeUnknownEffect(
   ThreadTurnStartRequestedPayload,
 );
+const decodeOrchestrationLatestTurn = Schema.decodeUnknownEffect(OrchestrationLatestTurn);
+const decodeOrchestrationProposedPlan = Schema.decodeUnknownEffect(OrchestrationProposedPlan);
 const decodeOrchestrationSession = Schema.decodeUnknownEffect(OrchestrationSession);
 const decodeThreadCreatedPayload = Schema.decodeUnknownEffect(ThreadCreatedPayload);
 
@@ -130,11 +134,11 @@ it.effect("preserves explicit provider and runtime mode in thread.turn.start", (
         text: "hello",
         attachments: [],
       },
-      provider: "claudeCode",
+      provider: "claudeAgent",
       runtimeMode: "full-access",
       createdAt: "2026-01-01T00:00:00.000Z",
     });
-    assert.strictEqual(parsed.provider, "claudeCode");
+    assert.strictEqual(parsed.provider, "claudeAgent");
     assert.strictEqual(parsed.runtimeMode, "full-access");
     assert.strictEqual(parsed.interactionMode, DEFAULT_PROVIDER_INTERACTION_MODE);
   }),
@@ -206,6 +210,31 @@ it.effect("accepts cursor provider in thread.turn.start", () =>
   }),
 );
 
+it.effect("accepts a source proposed plan reference in thread.turn.start", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeThreadTurnStartCommand({
+      type: "thread.turn.start",
+      commandId: "cmd-turn-source-plan",
+      threadId: "thread-2",
+      message: {
+        messageId: "msg-source-plan",
+        role: "user",
+        text: "implement this",
+        attachments: [],
+      },
+      sourceProposedPlan: {
+        threadId: "thread-1",
+        planId: "plan-1",
+      },
+      createdAt: "2026-01-01T00:00:00.000Z",
+    });
+    assert.deepStrictEqual(parsed.sourceProposedPlan, {
+      threadId: "thread-1",
+      planId: "plan-1",
+    });
+  }),
+);
+
 it.effect(
   "decodes thread.turn-start-requested defaults for provider, runtime mode, and interaction mode",
   () =>
@@ -218,9 +247,49 @@ it.effect(
       assert.strictEqual(parsed.provider, undefined);
       assert.strictEqual(parsed.runtimeMode, DEFAULT_RUNTIME_MODE);
       assert.strictEqual(parsed.interactionMode, DEFAULT_PROVIDER_INTERACTION_MODE);
+      assert.strictEqual(parsed.sourceProposedPlan, undefined);
     }),
 );
 
+it.effect("decodes thread.turn-start-requested source proposed plan metadata when present", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeThreadTurnStartRequestedPayload({
+      threadId: "thread-2",
+      messageId: "msg-2",
+      sourceProposedPlan: {
+        threadId: "thread-1",
+        planId: "plan-1",
+      },
+      createdAt: "2026-01-01T00:00:00.000Z",
+    });
+    assert.deepStrictEqual(parsed.sourceProposedPlan, {
+      threadId: "thread-1",
+      planId: "plan-1",
+    });
+  }),
+);
+
+it.effect("decodes latest turn source proposed plan metadata when present", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeOrchestrationLatestTurn({
+      turnId: "turn-2",
+      state: "running",
+      requestedAt: "2026-01-01T00:00:00.000Z",
+      startedAt: "2026-01-01T00:00:01.000Z",
+      completedAt: null,
+      assistantMessageId: null,
+      sourceProposedPlan: {
+        threadId: "thread-1",
+        planId: "plan-1",
+      },
+    });
+    assert.deepStrictEqual(parsed.sourceProposedPlan, {
+      threadId: "thread-1",
+      planId: "plan-1",
+    });
+  }),
+);
+
 it.effect("decodes orchestration session runtime mode defaults", () =>
   Effect.gen(function* () {
     const parsed = yield* decodeOrchestrationSession({
@@ -236,3 +305,33 @@ it.effect("decodes orchestration session runtime mode defaults", () =>
     assert.strictEqual(parsed.runtimeMode, DEFAULT_RUNTIME_MODE);
   }),
 );
+
+it.effect("defaults proposed plan implementation metadata for historical rows", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeOrchestrationProposedPlan({
+      id: "plan-1",
+      turnId: "turn-1",
+      planMarkdown: "# Plan",
+      createdAt: "2026-01-01T00:00:00.000Z",
+      updatedAt: "2026-01-01T00:00:00.000Z",
+    });
+    assert.strictEqual(parsed.implementedAt, null);
+    assert.strictEqual(parsed.implementationThreadId, null);
+  }),
+);
+
+it.effect("preserves proposed plan implementation metadata when present", () =>
+  Effect.gen(function* () {
+    const parsed = yield* decodeOrchestrationProposedPlan({
+      id: "plan-2",
+      turnId: "turn-2",
+      planMarkdown: "# Plan",
+      implementedAt: "2026-01-02T00:00:00.000Z",
+      implementationThreadId: "thread-2",
+      createdAt: "2026-01-01T00:00:00.000Z",
+      updatedAt: "2026-01-02T00:00:00.000Z",
+    });
+    assert.strictEqual(parsed.implementedAt, "2026-01-02T00:00:00.000Z");
+    assert.strictEqual(parsed.implementationThreadId, "thread-2");
+  }),
+);
diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.ts
index 7031bee311..e02a6efcc1 100644
--- a/packages/contracts/src/orchestration.ts
+++ b/packages/contracts/src/orchestration.ts
@@ -31,7 +31,7 @@ export const ORCHESTRATION_WS_CHANNELS = {
 export const ProviderKind = Schema.Union([
   Schema.Literal("codex"),
   Schema.Literal("copilot"),
-  Schema.Literal("claudeCode"),
+  Schema.Literal("claudeAgent"),
   Schema.Literal("cursor"),
   Schema.Literal("opencode"),
   Schema.Literal("geminiCli"),
@@ -53,6 +53,7 @@ export const ProviderSandboxMode = Schema.Literals([
 ]);
 export type ProviderSandboxMode = typeof ProviderSandboxMode.Type;
 export const DEFAULT_PROVIDER_KIND: ProviderKind = "codex";
+
 export const CodexProviderStartOptions = Schema.Struct({
   binaryPath: Schema.optional(TrimmedNonEmptyString),
   homePath: Schema.optional(TrimmedNonEmptyString),
@@ -65,12 +66,12 @@ export const CopilotProviderStartOptions = Schema.Struct({
 });
 export type CopilotProviderStartOptions = typeof CopilotProviderStartOptions.Type;
 
-export const ClaudeCodeProviderStartOptions = Schema.Struct({
+export const ClaudeProviderStartOptions = Schema.Struct({
   binaryPath: Schema.optional(TrimmedNonEmptyString),
   permissionMode: Schema.optional(TrimmedNonEmptyString),
   maxThinkingTokens: Schema.optional(NonNegativeInt),
 });
-export type ClaudeCodeProviderStartOptions = typeof ClaudeCodeProviderStartOptions.Type;
+export type ClaudeProviderStartOptions = typeof ClaudeProviderStartOptions.Type;
 
 export const CursorProviderStartOptions = Schema.Struct({
   binaryPath: Schema.optional(TrimmedNonEmptyString),
@@ -112,7 +113,7 @@ export type KiloProviderStartOptions = typeof KiloProviderStartOptions.Type;
 export const ProviderStartOptions = Schema.Struct({
   codex: Schema.optional(CodexProviderStartOptions),
   copilot: Schema.optional(CopilotProviderStartOptions),
-  claudeCode: Schema.optional(ClaudeCodeProviderStartOptions),
+  claudeAgent: Schema.optional(ClaudeProviderStartOptions),
   cursor: Schema.optional(CursorProviderStartOptions),
   amp: Schema.optional(AmpProviderStartOptions),
   geminiCli: Schema.optional(GeminiCliProviderStartOptions),
@@ -143,7 +144,7 @@ const KiloProviderStartOptionsRedacted = Schema.Struct({
 export const ProviderStartOptionsRedacted = Schema.Struct({
   codex: Schema.optional(CodexProviderStartOptions),
   copilot: Schema.optional(CopilotProviderStartOptions),
-  claudeCode: Schema.optional(ClaudeCodeProviderStartOptions),
+  claudeAgent: Schema.optional(ClaudeProviderStartOptions),
   cursor: Schema.optional(CursorProviderStartOptions),
   amp: Schema.optional(AmpProviderStartOptions),
   geminiCli: Schema.optional(GeminiCliProviderStartOptions),
@@ -264,11 +265,18 @@ export const OrchestrationProposedPlan = Schema.Struct({
   id: OrchestrationProposedPlanId,
   turnId: Schema.NullOr(TurnId),
   planMarkdown: TrimmedNonEmptyString,
+  implementedAt: Schema.NullOr(IsoDateTime).pipe(Schema.withDecodingDefault(() => null)),
+  implementationThreadId: Schema.NullOr(ThreadId).pipe(Schema.withDecodingDefault(() => null)),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
 });
 export type OrchestrationProposedPlan = typeof OrchestrationProposedPlan.Type;
 
+const SourceProposedPlanReference = Schema.Struct({
+  threadId: ThreadId,
+  planId: OrchestrationProposedPlanId,
+});
+
 export const OrchestrationSessionStatus = Schema.Literals([
   "idle",
   "starting",
@@ -359,6 +367,7 @@ export const OrchestrationLatestTurn = Schema.Struct({
   completedAt: Schema.NullOr(IsoDateTime),
   assistantMessageId: Schema.NullOr(MessageId),
   usage: Schema.optional(OrchestrationTurnUsage),
+  sourceProposedPlan: Schema.optional(SourceProposedPlanReference),
 });
 export type OrchestrationLatestTurn = typeof OrchestrationLatestTurn.Type;
 
@@ -486,6 +495,7 @@ export const ThreadTurnStartCommand = Schema.Struct({
   interactionMode: ProviderInteractionMode.pipe(
     Schema.withDecodingDefault(() => DEFAULT_PROVIDER_INTERACTION_MODE),
   ),
+  sourceProposedPlan: Schema.optional(SourceProposedPlanReference),
   createdAt: IsoDateTime,
 });
 
@@ -506,6 +516,7 @@ const ClientThreadTurnStartCommand = Schema.Struct({
   assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),
   runtimeMode: RuntimeMode,
   interactionMode: ProviderInteractionMode,
+  sourceProposedPlan: Schema.optional(SourceProposedPlanReference),
   createdAt: IsoDateTime,
 });
 
@@ -791,6 +802,7 @@ export const ThreadTurnStartRequestedPayload = Schema.Struct({
   interactionMode: ProviderInteractionMode.pipe(
     Schema.withDecodingDefault(() => DEFAULT_PROVIDER_INTERACTION_MODE),
   ),
+  sourceProposedPlan: Schema.optional(SourceProposedPlanReference),
   createdAt: IsoDateTime,
 });
 
diff --git a/packages/contracts/src/provider.test.ts b/packages/contracts/src/provider.test.ts
index 3c5650907a..72ba834310 100644
--- a/packages/contracts/src/provider.test.ts
+++ b/packages/contracts/src/provider.test.ts
@@ -66,11 +66,18 @@ describe("ProviderSessionStartInput", () => {
   it("accepts claude runtime knobs", () => {
     const parsed = decodeProviderSessionStartInput({
       threadId: "thread-1",
-      provider: "claudeCode",
+      provider: "claudeAgent",
       cwd: "/tmp/workspace",
       model: "claude-sonnet-4-6",
+      modelOptions: {
+        claudeAgent: {
+          thinking: true,
+          effort: "max",
+          fastMode: true,
+        },
+      },
       providerOptions: {
-        claudeCode: {
+        claudeAgent: {
           binaryPath: "/usr/local/bin/claude",
           permissionMode: "plan",
           maxThinkingTokens: 12_000,
@@ -78,10 +85,13 @@ describe("ProviderSessionStartInput", () => {
       },
       runtimeMode: "full-access",
     });
-    expect(parsed.provider).toBe("claudeCode");
-    expect(parsed.providerOptions?.claudeCode?.binaryPath).toBe("/usr/local/bin/claude");
-    expect(parsed.providerOptions?.claudeCode?.permissionMode).toBe("plan");
-    expect(parsed.providerOptions?.claudeCode?.maxThinkingTokens).toBe(12_000);
+    expect(parsed.provider).toBe("claudeAgent");
+    expect(parsed.modelOptions?.claudeAgent?.thinking).toBe(true);
+    expect(parsed.modelOptions?.claudeAgent?.effort).toBe("max");
+    expect(parsed.modelOptions?.claudeAgent?.fastMode).toBe(true);
+    expect(parsed.providerOptions?.claudeAgent?.binaryPath).toBe("/usr/local/bin/claude");
+    expect(parsed.providerOptions?.claudeAgent?.permissionMode).toBe("plan");
+    expect(parsed.providerOptions?.claudeAgent?.maxThinkingTokens).toBe(12_000);
     expect(parsed.runtimeMode).toBe("full-access");
   });
 
@@ -128,4 +138,20 @@ describe("ProviderSendTurnInput", () => {
     expect(parsed.modelOptions?.codex?.reasoningEffort).toBe("xhigh");
     expect(parsed.modelOptions?.codex?.fastMode).toBe(true);
   });
+
+  it("accepts claude provider effort options including ultrathink", () => {
+    const parsed = decodeProviderSendTurnInput({
+      threadId: "thread-1",
+      model: "claude-sonnet-4-6",
+      modelOptions: {
+        claudeAgent: {
+          effort: "ultrathink",
+          fastMode: true,
+        },
+      },
+    });
+
+    expect(parsed.modelOptions?.claudeAgent?.effort).toBe("ultrathink");
+    expect(parsed.modelOptions?.claudeAgent?.fastMode).toBe(true);
+  });
 });
diff --git a/packages/contracts/src/provider.ts b/packages/contracts/src/provider.ts
index dd6432b405..26eec6230e 100644
--- a/packages/contracts/src/provider.ts
+++ b/packages/contracts/src/provider.ts
@@ -24,7 +24,6 @@ import {
   RuntimeMode,
 } from "./orchestration";
 
-const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
 const ProviderSessionStatus = Schema.Literals([
   "connecting",
   "ready",
@@ -37,14 +36,14 @@ export const ProviderSession = Schema.Struct({
   provider: ProviderKind,
   status: ProviderSessionStatus,
   runtimeMode: RuntimeMode,
-  cwd: Schema.optional(TrimmedNonEmptyStringSchema),
-  model: Schema.optional(TrimmedNonEmptyStringSchema),
+  cwd: Schema.optional(TrimmedNonEmptyString),
+  model: Schema.optional(TrimmedNonEmptyString),
   threadId: ThreadId,
   resumeCursor: Schema.optional(Schema.Unknown),
   activeTurnId: Schema.optional(TurnId),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
-  lastError: Schema.optional(TrimmedNonEmptyStringSchema),
+  lastError: Schema.optional(TrimmedNonEmptyString),
 });
 export type ProviderSession = typeof ProviderSession.Type;
 
@@ -53,8 +52,8 @@ export { ProviderStartOptions };
 export const ProviderSessionStartInput = Schema.Struct({
   threadId: ThreadId,
   provider: Schema.optional(ProviderKind),
-  cwd: Schema.optional(TrimmedNonEmptyStringSchema),
-  model: Schema.optional(TrimmedNonEmptyStringSchema),
+  cwd: Schema.optional(TrimmedNonEmptyString),
+  model: Schema.optional(TrimmedNonEmptyString),
   modelOptions: Schema.optional(ProviderModelOptions),
   resumeCursor: Schema.optional(Schema.Unknown),
   approvalPolicy: Schema.optional(ProviderApprovalPolicy),
@@ -67,12 +66,12 @@ export type ProviderSessionStartInput = typeof ProviderSessionStartInput.Type;
 export const ProviderSendTurnInput = Schema.Struct({
   threadId: ThreadId,
   input: Schema.optional(
-    TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_INPUT_CHARS)),
+    TrimmedNonEmptyString.check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_INPUT_CHARS)),
   ),
   attachments: Schema.optional(
     Schema.Array(ChatAttachment).check(Schema.isMaxLength(PROVIDER_SEND_TURN_MAX_ATTACHMENTS)),
   ),
-  model: Schema.optional(TrimmedNonEmptyStringSchema),
+  model: Schema.optional(TrimmedNonEmptyString),
   modelOptions: Schema.optional(ProviderModelOptions),
   interactionMode: Schema.optional(ProviderInteractionMode),
 });
@@ -174,8 +173,8 @@ export const ProviderEvent = Schema.Struct({
   provider: ProviderKind,
   threadId: ThreadId,
   createdAt: IsoDateTime,
-  method: TrimmedNonEmptyStringSchema,
-  message: Schema.optional(TrimmedNonEmptyStringSchema),
+  method: TrimmedNonEmptyString,
+  message: Schema.optional(TrimmedNonEmptyString),
   turnId: Schema.optional(TurnId),
   itemId: Schema.optional(ProviderItemId),
   requestId: Schema.optional(ApprovalRequestId),
diff --git a/packages/contracts/src/providerRuntime.test.ts b/packages/contracts/src/providerRuntime.test.ts
index 6daf679fe2..3dc0091add 100644
--- a/packages/contracts/src/providerRuntime.test.ts
+++ b/packages/contracts/src/providerRuntime.test.ts
@@ -10,7 +10,7 @@ describe("ProviderRuntimeEvent", () => {
     const parsed = decodeRuntimeEvent({
       type: "turn.plan.updated",
       eventId: "event-1",
-      provider: "claudeCode",
+      provider: "claudeAgent",
       sessionId: "runtime-session-1",
       createdAt: "2026-02-28T00:00:00.000Z",
       threadId: "thread-1",
@@ -56,7 +56,7 @@ describe("ProviderRuntimeEvent", () => {
     const parsed = decodeRuntimeEvent({
       type: "user-input.requested",
       eventId: "event-2",
-      provider: "codex",
+      provider: "claudeAgent",
       sessionId: "runtime-session-2",
       createdAt: "2026-02-28T00:00:01.000Z",
       threadId: "thread-2",
@@ -94,7 +94,7 @@ describe("ProviderRuntimeEvent", () => {
     const parsed = decodeRuntimeEvent({
       type: "user-input.resolved",
       eventId: "event-3",
-      provider: "codex",
+      provider: "claudeAgent",
       sessionId: "runtime-session-2",
       createdAt: "2026-02-28T00:00:02.000Z",
       threadId: "thread-2",
diff --git a/packages/contracts/src/providerRuntime.ts b/packages/contracts/src/providerRuntime.ts
index 6d94479b56..b14b969167 100644
--- a/packages/contracts/src/providerRuntime.ts
+++ b/packages/contracts/src/providerRuntime.ts
@@ -1,4 +1,4 @@
-import { Schema } from "effect";
+import { Option, Schema } from "effect";
 import {
   EventId,
   IsoDateTime,
@@ -428,6 +428,10 @@ export const UserInputQuestion = Schema.Struct({
   header: TrimmedNonEmptyStringSchema,
   question: TrimmedNonEmptyStringSchema,
   options: Schema.Array(UserInputQuestionOption),
+  multiSelect: Schema.optional(Schema.Boolean).pipe(
+    Schema.withDecodingDefault(() => false),
+    Schema.withConstructorDefault(() => Option.some(false)),
+  ),
 });
 export type UserInputQuestion = typeof UserInputQuestion.Type;
 
@@ -451,6 +455,7 @@ export type TaskStartedPayload = typeof TaskStartedPayload.Type;
 const TaskProgressPayload = Schema.Struct({
   taskId: RuntimeTaskId,
   description: TrimmedNonEmptyStringSchema,
+  summary: Schema.optional(TrimmedNonEmptyStringSchema),
   usage: Schema.optional(Schema.Unknown),
   lastToolName: Schema.optional(TrimmedNonEmptyStringSchema),
 });
diff --git a/packages/shared/src/model.test.ts b/packages/shared/src/model.test.ts
index 9587045643..6a7ab7234e 100644
--- a/packages/shared/src/model.test.ts
+++ b/packages/shared/src/model.test.ts
@@ -11,17 +11,29 @@ import {
 } from "@t3tools/contracts";
 
 import {
+  applyClaudePromptEffortPrefix,
+  getEffectiveClaudeCodeEffort,
   getDefaultModel,
   getDefaultReasoningEffort,
   getCursorModelFamilyOptions,
   getModelOptions,
   getReasoningEffortOptions,
+  inferProviderForModel,
+  isClaudeUltrathinkPrompt,
+  normalizeClaudeModelOptions,
+  normalizeCodexModelOptions,
   normalizeModelSlug,
   parseCursorModelSelection,
   resolveCursorPickerModelSlug,
   resolveCursorModelFromSelection,
+  resolveReasoningEffortForProvider,
   resolveModelSlug,
   resolveModelSlugForProvider,
+  supportsClaudeAdaptiveReasoning,
+  supportsClaudeFastMode,
+  supportsClaudeMaxEffort,
+  supportsClaudeThinkingToggle,
+  supportsClaudeUltrathinkKeyword,
 } from "./model";
 
 describe("normalizeModelSlug", () => {
@@ -43,9 +55,9 @@ describe("normalizeModelSlug", () => {
   });
 
   it("uses provider-specific aliases", () => {
-    expect(normalizeModelSlug("sonnet", "claudeCode")).toBe("claude-sonnet-4-6");
-    expect(normalizeModelSlug("opus-4.6", "claudeCode")).toBe("claude-opus-4-6");
-    expect(normalizeModelSlug("claude-haiku-4-5-20251001", "claudeCode")).toBe("claude-haiku-4-5");
+    expect(normalizeModelSlug("sonnet", "claudeAgent")).toBe("claude-sonnet-4-6");
+    expect(normalizeModelSlug("opus-4.6", "claudeAgent")).toBe("claude-opus-4-6");
+    expect(normalizeModelSlug("claude-haiku-4-5-20251001", "claudeAgent")).toBe("claude-haiku-4-5");
     expect(normalizeModelSlug("composer", "cursor")).toBe("composer-1.5");
     expect(normalizeModelSlug("gpt-5.3-codex-spark", "cursor")).toBe("gpt-5.3-codex-spark-preview");
     expect(normalizeModelSlug("gpt-5.4", "cursor")).toBe("gpt-5.4-medium");
@@ -59,32 +71,38 @@ describe("normalizeModelSlug", () => {
     expect(normalizeModelSlug("toString")).toBe("toString");
     expect(normalizeModelSlug("constructor")).toBe("constructor");
   });
+
+  it("uses provider-specific aliases", () => {
+    expect(normalizeModelSlug("sonnet", "claudeAgent")).toBe("claude-sonnet-4-6");
+    expect(normalizeModelSlug("opus-4.6", "claudeAgent")).toBe("claude-opus-4-6");
+    expect(normalizeModelSlug("claude-haiku-4-5-20251001", "claudeAgent")).toBe("claude-haiku-4-5");
+  });
 });
 
 describe("resolveModelSlug", () => {
   it("returns default only when the model is missing", () => {
-    expect(resolveModelSlug(undefined)).toBe(DEFAULT_MODEL_BY_PROVIDER.codex);
-    expect(resolveModelSlug(null)).toBe(DEFAULT_MODEL_BY_PROVIDER.codex);
+    expect(resolveModelSlug(undefined)).toBe(DEFAULT_MODEL);
+    expect(resolveModelSlug(null)).toBe(DEFAULT_MODEL);
   });
 
   it("preserves unknown custom models", () => {
-    expect(resolveModelSlug("gpt-4.1")).toBe(DEFAULT_MODEL_BY_PROVIDER.codex);
-    expect(resolveModelSlug("custom/internal-model")).toBe(DEFAULT_MODEL_BY_PROVIDER.codex);
+    expect(resolveModelSlug("gpt-4.1")).toBe(DEFAULT_MODEL);
+    expect(resolveModelSlug("custom/internal-model")).toBe(DEFAULT_MODEL);
   });
 
   it("resolves only supported model options", () => {
-    for (const model of MODEL_OPTIONS_BY_PROVIDER.codex) {
+    for (const model of MODEL_OPTIONS) {
       expect(resolveModelSlug(model.slug)).toBe(model.slug);
     }
   });
 
   it("supports provider-aware resolution", () => {
-    expect(resolveModelSlugForProvider("claudeCode", undefined)).toBe(
-      DEFAULT_MODEL_BY_PROVIDER.claudeCode,
+    expect(resolveModelSlugForProvider("claudeAgent", undefined)).toBe(
+      DEFAULT_MODEL_BY_PROVIDER.claudeAgent,
     );
-    expect(resolveModelSlugForProvider("claudeCode", "sonnet")).toBe("claude-sonnet-4-6");
-    expect(resolveModelSlugForProvider("claudeCode", "gpt-5.3-codex")).toBe(
-      DEFAULT_MODEL_BY_PROVIDER.claudeCode,
+    expect(resolveModelSlugForProvider("claudeAgent", "sonnet")).toBe("claude-sonnet-4-6");
+    expect(resolveModelSlugForProvider("claudeAgent", "gpt-5.3-codex")).toBe(
+      DEFAULT_MODEL_BY_PROVIDER.claudeAgent,
     );
     expect(resolveModelSlugForProvider("cursor", undefined)).toBe(DEFAULT_MODEL_BY_PROVIDER.cursor);
     expect(resolveModelSlugForProvider("cursor", "composer")).toBe("composer-1.5");
@@ -99,7 +117,7 @@ describe("resolveModelSlug", () => {
   it("keeps codex defaults for backward compatibility", () => {
     expect(getDefaultModel()).toBe(DEFAULT_MODEL);
     expect(getModelOptions()).toEqual(MODEL_OPTIONS);
-    expect(getModelOptions("claudeCode")).toEqual(MODEL_OPTIONS_BY_PROVIDER.claudeCode);
+    expect(getModelOptions("claudeAgent")).toEqual(MODEL_OPTIONS_BY_PROVIDER.claudeAgent);
     expect(getModelOptions("cursor")).toEqual(MODEL_OPTIONS_BY_PROVIDER.cursor);
     expect(getCursorModelFamilyOptions()).toEqual(CURSOR_MODEL_FAMILY_OPTIONS);
   });
@@ -190,8 +208,27 @@ describe("getReasoningEffortOptions", () => {
     expect(getReasoningEffortOptions("codex")).toEqual(REASONING_EFFORT_OPTIONS_BY_PROVIDER.codex);
   });
 
-  it("returns no reasoning options for claudeCode", () => {
-    expect(getReasoningEffortOptions("claudeCode")).toEqual([]);
+  it("returns claude effort options for Opus 4.6", () => {
+    expect(getReasoningEffortOptions("claudeAgent", "claude-opus-4-6")).toEqual([
+      "low",
+      "medium",
+      "high",
+      "max",
+      "ultrathink",
+    ]);
+  });
+
+  it("returns claude effort options for Sonnet 4.6", () => {
+    expect(getReasoningEffortOptions("claudeAgent", "claude-sonnet-4-6")).toEqual([
+      "low",
+      "medium",
+      "high",
+      "ultrathink",
+    ]);
+  });
+
+  it("returns no claude effort options for Haiku 4.5", () => {
+    expect(getReasoningEffortOptions("claudeAgent", "claude-haiku-4-5")).toEqual([]);
   });
 
   it("returns no reasoning options for cursor", () => {
@@ -199,12 +236,160 @@ describe("getReasoningEffortOptions", () => {
   });
 });
 
+describe("inferProviderForModel", () => {
+  it("detects known provider model slugs", () => {
+    expect(inferProviderForModel("gpt-5.3-codex")).toBe("codex");
+    expect(inferProviderForModel("claude-sonnet-4-6")).toBe("claudeAgent");
+    expect(inferProviderForModel("sonnet")).toBe("claudeAgent");
+  });
+
+  it("falls back when the model is unknown", () => {
+    expect(inferProviderForModel("custom/internal-model")).toBe("codex");
+    expect(inferProviderForModel("custom/internal-model", "claudeAgent")).toBe("claudeAgent");
+  });
+
+  it("treats claude-prefixed custom slugs as claude", () => {
+    expect(inferProviderForModel("claude-custom-internal")).toBe("claudeAgent");
+  });
+});
+
 describe("getDefaultReasoningEffort", () => {
   it("returns provider-scoped defaults", () => {
     expect(getDefaultReasoningEffort("codex")).toBe(DEFAULT_REASONING_EFFORT_BY_PROVIDER.codex);
-    expect(getDefaultReasoningEffort("claudeCode")).toBe(
-      DEFAULT_REASONING_EFFORT_BY_PROVIDER.claudeCode,
+    expect(getDefaultReasoningEffort("claudeAgent")).toBe(
+      DEFAULT_REASONING_EFFORT_BY_PROVIDER.claudeAgent,
     );
     expect(getDefaultReasoningEffort("cursor")).toBe(DEFAULT_REASONING_EFFORT_BY_PROVIDER.cursor);
   });
 });
+
+describe("resolveReasoningEffortForProvider", () => {
+  it("accepts provider-scoped effort values", () => {
+    expect(resolveReasoningEffortForProvider("codex", "xhigh")).toBe("xhigh");
+    expect(resolveReasoningEffortForProvider("claudeAgent", "ultrathink")).toBe("ultrathink");
+  });
+
+  it("rejects effort values from the wrong provider", () => {
+    expect(resolveReasoningEffortForProvider("codex", "max")).toBeNull();
+    expect(resolveReasoningEffortForProvider("claudeAgent", "xhigh")).toBeNull();
+  });
+});
+
+describe("applyClaudePromptEffortPrefix", () => {
+  it("prefixes ultrathink prompts exactly once", () => {
+    expect(applyClaudePromptEffortPrefix("Investigate this", "ultrathink")).toBe(
+      "Ultrathink:\nInvestigate this",
+    );
+    expect(applyClaudePromptEffortPrefix("Ultrathink:\nInvestigate this", "ultrathink")).toBe(
+      "Ultrathink:\nInvestigate this",
+    );
+  });
+
+  it("leaves non-ultrathink prompts unchanged", () => {
+    expect(applyClaudePromptEffortPrefix("Investigate this", "high")).toBe("Investigate this");
+  });
+});
+
+describe("getEffectiveClaudeCodeEffort", () => {
+  it("does not persist ultrathink into Claude runtime configuration", () => {
+    expect(getEffectiveClaudeCodeEffort("ultrathink")).toBeNull();
+    expect(getEffectiveClaudeCodeEffort("high")).toBe("high");
+  });
+
+  it("returns null when no claude effort is selected", () => {
+    expect(getEffectiveClaudeCodeEffort(null)).toBeNull();
+    expect(getEffectiveClaudeCodeEffort(undefined)).toBeNull();
+  });
+});
+
+describe("normalizeCodexModelOptions", () => {
+  it("drops default-only codex options", () => {
+    expect(
+      normalizeCodexModelOptions({ reasoningEffort: "high", fastMode: false }),
+    ).toBeUndefined();
+  });
+
+  it("preserves non-default codex options", () => {
+    expect(normalizeCodexModelOptions({ reasoningEffort: "xhigh", fastMode: true })).toEqual({
+      reasoningEffort: "xhigh",
+      fastMode: true,
+    });
+  });
+});
+
+describe("normalizeClaudeModelOptions", () => {
+  it("drops unsupported fast mode and max effort for Sonnet", () => {
+    expect(
+      normalizeClaudeModelOptions("claude-sonnet-4-6", {
+        effort: "max",
+        fastMode: true,
+      }),
+    ).toBeUndefined();
+  });
+
+  it("keeps the Haiku thinking toggle and removes unsupported effort", () => {
+    expect(
+      normalizeClaudeModelOptions("claude-haiku-4-5", {
+        thinking: false,
+        effort: "high",
+      }),
+    ).toEqual({
+      thinking: false,
+    });
+  });
+});
+
+describe("supportsClaudeAdaptiveReasoning", () => {
+  it("only enables adaptive reasoning for Opus 4.6 and Sonnet 4.6", () => {
+    expect(supportsClaudeAdaptiveReasoning("claude-opus-4-6")).toBe(true);
+    expect(supportsClaudeAdaptiveReasoning("claude-sonnet-4-6")).toBe(true);
+    expect(supportsClaudeAdaptiveReasoning("claude-haiku-4-5")).toBe(false);
+    expect(supportsClaudeAdaptiveReasoning(undefined)).toBe(false);
+  });
+});
+
+describe("supportsClaudeMaxEffort", () => {
+  it("only enables max effort for Opus 4.6", () => {
+    expect(supportsClaudeMaxEffort("claude-opus-4-6")).toBe(true);
+    expect(supportsClaudeMaxEffort("claude-sonnet-4-6")).toBe(false);
+    expect(supportsClaudeMaxEffort("claude-haiku-4-5")).toBe(false);
+    expect(supportsClaudeMaxEffort(undefined)).toBe(false);
+  });
+});
+
+describe("supportsClaudeFastMode", () => {
+  it("only enables Claude fast mode for Opus 4.6", () => {
+    expect(supportsClaudeFastMode("claude-opus-4-6")).toBe(true);
+    expect(supportsClaudeFastMode("opus")).toBe(true);
+    expect(supportsClaudeFastMode("claude-sonnet-4-6")).toBe(false);
+    expect(supportsClaudeFastMode("claude-haiku-4-5")).toBe(false);
+    expect(supportsClaudeFastMode(undefined)).toBe(false);
+  });
+});
+
+describe("supportsClaudeUltrathinkKeyword", () => {
+  it("only enables ultrathink keyword handling for Opus 4.6 and Sonnet 4.6", () => {
+    expect(supportsClaudeUltrathinkKeyword("claude-opus-4-6")).toBe(true);
+    expect(supportsClaudeUltrathinkKeyword("claude-sonnet-4-6")).toBe(true);
+    expect(supportsClaudeUltrathinkKeyword("claude-haiku-4-5")).toBe(false);
+  });
+});
+
+describe("supportsClaudeThinkingToggle", () => {
+  it("only enables the Claude thinking toggle for Haiku 4.5", () => {
+    expect(supportsClaudeThinkingToggle("claude-opus-4-6")).toBe(false);
+    expect(supportsClaudeThinkingToggle("claude-sonnet-4-6")).toBe(false);
+    expect(supportsClaudeThinkingToggle("claude-haiku-4-5")).toBe(true);
+    expect(supportsClaudeThinkingToggle("haiku")).toBe(true);
+    expect(supportsClaudeThinkingToggle(undefined)).toBe(false);
+  });
+});
+
+describe("isClaudeUltrathinkPrompt", () => {
+  it("detects ultrathink prompts case-insensitively", () => {
+    expect(isClaudeUltrathinkPrompt("Please ultrathink about this")).toBe(true);
+    expect(isClaudeUltrathinkPrompt("Ultrathink:\nInvestigate")).toBe(true);
+    expect(isClaudeUltrathinkPrompt("Think hard about this")).toBe(false);
+    expect(isClaudeUltrathinkPrompt(undefined)).toBe(false);
+  });
+});
diff --git a/packages/shared/src/model.ts b/packages/shared/src/model.ts
index 7ad63ca16d..d5801eeb8d 100644
--- a/packages/shared/src/model.ts
+++ b/packages/shared/src/model.ts
@@ -10,12 +10,15 @@ import {
   MODEL_OPTIONS_BY_PROVIDER,
   MODEL_SLUG_ALIASES_BY_PROVIDER,
   REASONING_EFFORT_OPTIONS_BY_PROVIDER,
+  type ClaudeModelOptions,
   type ClaudeCodeEffort,
+  type CodexModelOptions,
   type CodexReasoningEffort,
   type CursorModelFamily,
   type CursorModelSlug,
   type CursorReasoningOption,
   type ModelSlug,
+  type ProviderReasoningEffort,
   type ProviderKind,
 } from "@t3tools/contracts";
 
@@ -222,7 +225,7 @@ const CURSOR_MODEL_CAPABILITY_BY_FAMILY: Record<CursorModelFamily, CursorModelCa
 const MODEL_SLUG_SET_BY_PROVIDER: Record<ProviderKind, ReadonlySet<ModelSlug>> = {
   codex: new Set(MODEL_OPTIONS_BY_PROVIDER.codex.map((option) => option.slug)),
   copilot: new Set(MODEL_OPTIONS_BY_PROVIDER.copilot.map((option) => option.slug)),
-  claudeCode: new Set(MODEL_OPTIONS_BY_PROVIDER.claudeCode.map((option) => option.slug)),
+  claudeAgent: new Set(MODEL_OPTIONS_BY_PROVIDER.claudeAgent.map((option) => option.slug)),
   cursor: new Set(MODEL_OPTIONS_BY_PROVIDER.cursor.map((option) => option.slug)),
   opencode: new Set(MODEL_OPTIONS_BY_PROVIDER.opencode.map((option) => option.slug)),
   kilo: new Set(MODEL_OPTIONS_BY_PROVIDER.kilo.map((option) => option.slug)),
@@ -234,6 +237,10 @@ const CURSOR_MODEL_FAMILY_SET = new Set<CursorModelFamily>(
   CURSOR_MODEL_FAMILY_OPTIONS.map((option) => option.slug),
 );
 
+const CLAUDE_OPUS_4_6_MODEL = "claude-opus-4-6";
+const CLAUDE_SONNET_4_6_MODEL = "claude-sonnet-4-6";
+const CLAUDE_HAIKU_4_5_MODEL = "claude-haiku-4-5";
+
 export interface CursorModelSelection {
   readonly family: CursorModelFamily;
   readonly reasoning: CursorReasoningOption;
@@ -387,6 +394,31 @@ export function getDefaultModel(provider: ProviderKind = "codex"): ModelSlug {
   return DEFAULT_MODEL_BY_PROVIDER[provider];
 }
 
+export function supportsClaudeFastMode(model: string | null | undefined): boolean {
+  return normalizeModelSlug(model, "claudeAgent") === CLAUDE_OPUS_4_6_MODEL;
+}
+
+export function supportsClaudeAdaptiveReasoning(model: string | null | undefined): boolean {
+  const normalized = normalizeModelSlug(model, "claudeAgent");
+  return normalized === CLAUDE_OPUS_4_6_MODEL || normalized === CLAUDE_SONNET_4_6_MODEL;
+}
+
+export function supportsClaudeMaxEffort(model: string | null | undefined): boolean {
+  return normalizeModelSlug(model, "claudeAgent") === CLAUDE_OPUS_4_6_MODEL;
+}
+
+export function supportsClaudeUltrathinkKeyword(model: string | null | undefined): boolean {
+  return supportsClaudeAdaptiveReasoning(model);
+}
+
+export function supportsClaudeThinkingToggle(model: string | null | undefined): boolean {
+  return normalizeModelSlug(model, "claudeAgent") === CLAUDE_HAIKU_4_5_MODEL;
+}
+
+export function isClaudeUltrathinkPrompt(text: string | null | undefined): boolean {
+  return typeof text === "string" && /\bultrathink\b/i.test(text);
+}
+
 export function normalizeModelSlug(
   model: string | null | undefined,
   provider: ProviderKind = "codex",
@@ -400,8 +432,11 @@ export function normalizeModelSlug(
     return null;
   }
 
-  const aliases = MODEL_SLUG_ALIASES_BY_PROVIDER[provider];
-  return Object.hasOwn(aliases, trimmed) ? aliases[trimmed]! : (trimmed as ModelSlug);
+  const aliases = MODEL_SLUG_ALIASES_BY_PROVIDER[provider] as Record<string, ModelSlug>;
+  const aliased = Object.prototype.hasOwnProperty.call(aliases, trimmed)
+    ? aliases[trimmed]
+    : undefined;
+  return typeof aliased === "string" ? aliased : (trimmed as ModelSlug);
 }
 
 export function resolveModelSlug(
@@ -428,32 +463,165 @@ export function resolveModelSlugForProvider(
   return resolveModelSlug(model, provider);
 }
 
+export function inferProviderForModel(
+  model: string | null | undefined,
+  fallback: ProviderKind = "codex",
+): ProviderKind {
+  const normalizedClaude = normalizeModelSlug(model, "claudeAgent");
+  if (normalizedClaude && MODEL_SLUG_SET_BY_PROVIDER.claudeAgent.has(normalizedClaude)) {
+    return "claudeAgent";
+  }
+
+  const normalizedCodex = normalizeModelSlug(model, "codex");
+  if (normalizedCodex && MODEL_SLUG_SET_BY_PROVIDER.codex.has(normalizedCodex)) {
+    return "codex";
+  }
+
+  return typeof model === "string" && model.trim().startsWith("claude-") ? "claudeAgent" : fallback;
+}
+
+export function getReasoningEffortOptions(provider: "codex"): ReadonlyArray<CodexReasoningEffort>;
+export function getReasoningEffortOptions(
+  provider: "claudeAgent",
+  model?: string | null | undefined,
+): ReadonlyArray<ClaudeCodeEffort>;
+export function getReasoningEffortOptions(
+  provider?: ProviderKind,
+  model?: string | null | undefined,
+): ReadonlyArray<ProviderReasoningEffort>;
 export function getReasoningEffortOptions(
   provider: ProviderKind = "codex",
-): ReadonlyArray<CodexReasoningEffort> {
+  model?: string | null | undefined,
+): ReadonlyArray<ProviderReasoningEffort> {
+  if (provider === "claudeAgent") {
+    if (supportsClaudeMaxEffort(model)) {
+      return ["low", "medium", "high", "max", "ultrathink"];
+    }
+    if (supportsClaudeAdaptiveReasoning(model)) {
+      return ["low", "medium", "high", "ultrathink"];
+    }
+    return [];
+  }
   return REASONING_EFFORT_OPTIONS_BY_PROVIDER[provider];
 }
 
 export function getDefaultReasoningEffort(provider: "codex"): CodexReasoningEffort;
-export function getDefaultReasoningEffort(provider: ProviderKind): CodexReasoningEffort | null;
+export function getDefaultReasoningEffort(provider: "claudeAgent"): ClaudeCodeEffort;
+export function getDefaultReasoningEffort(provider?: ProviderKind): ProviderReasoningEffort | null;
 export function getDefaultReasoningEffort(
   provider: ProviderKind = "codex",
-): CodexReasoningEffort | null {
+): ProviderReasoningEffort | null {
   return DEFAULT_REASONING_EFFORT_BY_PROVIDER[provider];
 }
 
 export function getClaudeCodeEffortOptions(
-  provider: ProviderKind = "claudeCode",
+  provider: ProviderKind = "claudeAgent",
 ): ReadonlyArray<ClaudeCodeEffort> {
   return CLAUDE_CODE_EFFORT_OPTIONS_BY_PROVIDER[provider];
 }
 
-export function getDefaultClaudeCodeEffort(provider: "claudeCode"): ClaudeCodeEffort;
+export function getDefaultClaudeCodeEffort(provider: "claudeAgent"): ClaudeCodeEffort;
 export function getDefaultClaudeCodeEffort(provider: ProviderKind): ClaudeCodeEffort | null;
 export function getDefaultClaudeCodeEffort(
-  provider: ProviderKind = "claudeCode",
+  provider: ProviderKind = "claudeAgent",
 ): ClaudeCodeEffort | null {
   return DEFAULT_CLAUDE_CODE_EFFORT_BY_PROVIDER[provider];
 }
 
+export function resolveReasoningEffortForProvider(
+  provider: "codex",
+  effort: string | null | undefined,
+): CodexReasoningEffort | null;
+export function resolveReasoningEffortForProvider(
+  provider: "claudeAgent",
+  effort: string | null | undefined,
+): ClaudeCodeEffort | null;
+export function resolveReasoningEffortForProvider(
+  provider: ProviderKind,
+  effort: string | null | undefined,
+): ProviderReasoningEffort | null;
+export function resolveReasoningEffortForProvider(
+  provider: ProviderKind,
+  effort: string | null | undefined,
+): ProviderReasoningEffort | null {
+  if (typeof effort !== "string") {
+    return null;
+  }
+
+  const trimmed = effort.trim();
+  if (!trimmed) {
+    return null;
+  }
+
+  const options = REASONING_EFFORT_OPTIONS_BY_PROVIDER[provider] as ReadonlyArray<string>;
+  return options.includes(trimmed) ? (trimmed as ProviderReasoningEffort) : null;
+}
+
+export function getEffectiveClaudeCodeEffort(
+  effort: ClaudeCodeEffort | null | undefined,
+): Exclude<ClaudeCodeEffort, "ultrathink"> | null {
+  if (!effort) {
+    return null;
+  }
+  return effort === "ultrathink" ? null : effort;
+}
+
+export function normalizeCodexModelOptions(
+  modelOptions: CodexModelOptions | null | undefined,
+): CodexModelOptions | undefined {
+  const defaultReasoningEffort = getDefaultReasoningEffort("codex");
+  const reasoningEffort =
+    resolveReasoningEffortForProvider("codex", modelOptions?.reasoningEffort) ??
+    defaultReasoningEffort;
+  const fastModeEnabled = modelOptions?.fastMode === true;
+  const nextOptions: CodexModelOptions = {
+    ...(reasoningEffort !== defaultReasoningEffort ? { reasoningEffort } : {}),
+    ...(fastModeEnabled ? { fastMode: true } : {}),
+  };
+  return Object.keys(nextOptions).length > 0 ? nextOptions : undefined;
+}
+
+export function normalizeClaudeModelOptions(
+  model: string | null | undefined,
+  modelOptions: ClaudeModelOptions | null | undefined,
+): ClaudeModelOptions | undefined {
+  const reasoningOptions = getReasoningEffortOptions("claudeAgent", model);
+  const defaultReasoningEffort = getDefaultReasoningEffort("claudeAgent");
+  const resolvedEffort = resolveReasoningEffortForProvider("claudeAgent", modelOptions?.effort);
+  const effort =
+    resolvedEffort &&
+    resolvedEffort !== "ultrathink" &&
+    reasoningOptions.includes(resolvedEffort) &&
+    resolvedEffort !== defaultReasoningEffort
+      ? resolvedEffort
+      : undefined;
+  const thinking =
+    supportsClaudeThinkingToggle(model) && modelOptions?.thinking === false ? false : undefined;
+  const fastMode =
+    supportsClaudeFastMode(model) && modelOptions?.fastMode === true ? true : undefined;
+  const nextOptions: ClaudeModelOptions = {
+    ...(thinking === false ? { thinking: false } : {}),
+    ...(effort ? { effort } : {}),
+    ...(fastMode ? { fastMode: true } : {}),
+  };
+  return Object.keys(nextOptions).length > 0 ? nextOptions : undefined;
+}
+
+export function applyClaudePromptEffortPrefix(
+  text: string,
+  effort: ClaudeCodeEffort | null | undefined,
+): string {
+  const trimmed = text.trim();
+  if (!trimmed) {
+    return trimmed;
+  }
+  if (effort !== "ultrathink") {
+    return trimmed;
+  }
+  if (trimmed.startsWith("Ultrathink:")) {
+    return trimmed;
+  }
+  return `Ultrathink:\n${trimmed}`;
+}
+
 export { CLAUDE_CODE_EFFORT_OPTIONS, CODEX_REASONING_EFFORT_OPTIONS };
diff --git a/scripts/claude-fast-mode-probe.ts b/scripts/claude-fast-mode-probe.ts
new file mode 100644
index 0000000000..272cc743f1
--- /dev/null
+++ b/scripts/claude-fast-mode-probe.ts
@@ -0,0 +1,129 @@
+import { query, type SDKMessage } from "@anthropic-ai/claude-agent-sdk";
+
+type ProbeMode = "off" | "on";
+
+async function* emptyPrompt(): AsyncGenerator<never, void, void> {}
+
+function parseArgs(argv: ReadonlyArray<string>): {
+  readonly mode: ProbeMode | "both";
+  readonly model?: string;
+  readonly cwd?: string;
+  readonly prompt?: string;
+} {
+  let mode: ProbeMode | "both" = "both";
+  let model: string | undefined;
+  let cwd: string | undefined;
+  let prompt: string | undefined;
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const value = argv[index];
+    if (!value) {
+      continue;
+    }
+    if (value === "--mode") {
+      const next = argv[index + 1];
+      if (next === "off" || next === "on" || next === "both") {
+        mode = next;
+        index += 1;
+      }
+      continue;
+    }
+    if (value === "--model") {
+      model = argv[index + 1];
+      index += 1;
+      continue;
+    }
+    if (value === "--cwd") {
+      cwd = argv[index + 1];
+      index += 1;
+      continue;
+    }
+    if (value === "--prompt") {
+      prompt = argv[index + 1] ?? prompt;
+      index += 1;
+    }
+  }
+
+  return {
+    mode,
+    ...(model ? { model } : {}),
+    ...(cwd ? { cwd } : {}),
+    ...(prompt ? { prompt } : {}),
+  };
+}
+
+async function runProbe(input: {
+  readonly mode: ProbeMode;
+  readonly model?: string;
+  readonly cwd?: string;
+  readonly prompt?: string;
+}): Promise<void> {
+  const messages = query({
+    prompt: input.prompt ?? emptyPrompt(),
+    options: {
+      ...(input.model ? { model: input.model } : {}),
+      ...(input.cwd ? { cwd: input.cwd } : {}),
+      persistSession: false,
+      tools: [],
+      permissionMode: "plan",
+      includePartialMessages: true,
+      ...(input.mode === "on" ? { settings: { fastMode: true } } : {}),
+    },
+  });
+
+  const summary = {
+    mode: input.mode,
+    initFastModeState: null as string | null,
+    resultFastModeState: null as string | null,
+    resultSubtype: null as string | null,
+    resultText: null as string | null,
+  };
+
+  const initialization = await messages.initializationResult();
+  summary.initFastModeState = initialization.fast_mode_state ?? null;
+
+  if (!input.prompt) {
+    messages.close();
+    console.log(JSON.stringify(summary, null, 2));
+    return;
+  }
+
+  for await (const message of messages) {
+    handleProbeMessage(message, summary);
+  }
+  console.log(JSON.stringify(summary, null, 2));
+}
+
+function handleProbeMessage(
+  message: SDKMessage,
+  summary: {
+    mode: ProbeMode;
+    initFastModeState: string | null;
+    resultFastModeState: string | null;
+    resultSubtype: string | null;
+    resultText: string | null;
+  },
+): void {
+  if (message.type !== "result") {
+    return;
+  }
+  summary.resultSubtype = message.subtype;
+  summary.resultFastModeState = message.fast_mode_state ?? null;
+  summary.resultText = message.subtype === "success" ? message.result : message.errors.join("\n");
+}
+
+async function main(): Promise<void> {
+  const args = parseArgs(process.argv.slice(2));
+  const modes = args.mode === "both" ? (["off", "on"] as const) : [args.mode];
+
+  for (const mode of modes) {
+    await runProbe({
+      mode,
+      ...(args.model ? { model: args.model } : {}),
+      ...(args.cwd ? { cwd: args.cwd } : {}),
+      ...(args.prompt ? { prompt: args.prompt } : {}),
+    });
+  }
+}
+
+await main();
diff --git a/scripts/claude-haiku-thinking-probe.ts b/scripts/claude-haiku-thinking-probe.ts
new file mode 100644
index 0000000000..8254e9d3dc
--- /dev/null
+++ b/scripts/claude-haiku-thinking-probe.ts
@@ -0,0 +1,261 @@
+import { query, type SDKMessage, type ThinkingConfig } from "@anthropic-ai/claude-agent-sdk";
+
+type ProbeCase =
+  | "default"
+  | "effort-low"
+  | "effort-high"
+  | "settings-off"
+  | "settings-on"
+  | "thinking-disabled"
+  | "thinking-enabled";
+
+function parseArgs(argv: ReadonlyArray<string>): {
+  readonly model: string;
+  readonly cwd?: string;
+  readonly prompt: string;
+  readonly cases: ReadonlyArray<ProbeCase>;
+} {
+  let model = "claude-haiku-4-5";
+  let cwd: string | undefined;
+  let prompt =
+    "Think step by step about this before answering: what is 27 multiplied by 43? Return the final number only.";
+  let cases: ReadonlyArray<ProbeCase> = [
+    "default",
+    "effort-low",
+    "effort-high",
+    "settings-off",
+    "settings-on",
+    "thinking-disabled",
+    "thinking-enabled",
+  ];
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const value = argv[index];
+    if (!value) {
+      continue;
+    }
+    if (value === "--model") {
+      model = argv[index + 1] ?? model;
+      index += 1;
+      continue;
+    }
+    if (value === "--cwd") {
+      cwd = argv[index + 1] ?? cwd;
+      index += 1;
+      continue;
+    }
+    if (value === "--prompt") {
+      prompt = argv[index + 1] ?? prompt;
+      index += 1;
+      continue;
+    }
+    if (value === "--cases") {
+      const next = argv[index + 1];
+      if (next) {
+        const requested = next
+          .split(",")
+          .map((entry) => entry.trim())
+          .filter(
+            (entry): entry is ProbeCase =>
+              entry === "default" ||
+              entry === "effort-low" ||
+              entry === "effort-high" ||
+              entry === "settings-off" ||
+              entry === "settings-on" ||
+              entry === "thinking-disabled" ||
+              entry === "thinking-enabled",
+          );
+        if (requested.length > 0) {
+          cases = requested;
+        }
+      }
+      index += 1;
+    }
+  }
+
+  return {
+    model,
+    prompt,
+    ...(cwd ? { cwd } : {}),
+    cases,
+  };
+}
+
+function caseOptions(caseName: ProbeCase): {
+  readonly label: ProbeCase;
+  readonly effort?: "low" | "high";
+  readonly settings?: { alwaysThinkingEnabled: boolean };
+  readonly thinking?: ThinkingConfig;
+} {
+  switch (caseName) {
+    case "effort-low":
+      return {
+        label: caseName,
+        effort: "low",
+      };
+    case "effort-high":
+      return {
+        label: caseName,
+        effort: "high",
+      };
+    case "settings-off":
+      return {
+        label: caseName,
+        settings: {
+          alwaysThinkingEnabled: false,
+        },
+      };
+    case "settings-on":
+      return {
+        label: caseName,
+        settings: {
+          alwaysThinkingEnabled: true,
+        },
+      };
+    case "thinking-disabled":
+      return {
+        label: caseName,
+        thinking: {
+          type: "disabled",
+        },
+      };
+    case "thinking-enabled":
+      return {
+        label: caseName,
+        thinking: {
+          type: "enabled",
+          budgetTokens: 1024,
+        },
+      };
+    default:
+      return {
+        label: caseName,
+      };
+  }
+}
+
+type ProbeSummary = {
+  readonly case: ProbeCase;
+  readonly model: string;
+  initModelInfo: {
+    value: string | null;
+    supportsEffort: boolean | null;
+    supportsAdaptiveThinking: boolean | null;
+    supportedEffortLevels: ReadonlyArray<string> | null;
+  } | null;
+  resultSubtype: string | null;
+  resultText: string | null;
+  assistantThinkingBlockCount: number;
+  streamThinkingEventTypes: Record<string, number>;
+  error: string | null;
+};
+
+async function runCase(input: {
+  readonly caseName: ProbeCase;
+  readonly model: string;
+  readonly cwd?: string;
+  readonly prompt: string;
+}): Promise<ProbeSummary> {
+  const caseConfig = caseOptions(input.caseName);
+  const summary: ProbeSummary = {
+    case: input.caseName,
+    model: input.model,
+    initModelInfo: null,
+    resultSubtype: null,
+    resultText: null,
+    assistantThinkingBlockCount: 0,
+    streamThinkingEventTypes: {},
+    error: null,
+  };
+
+  try {
+    const messages = query({
+      prompt: input.prompt,
+      options: {
+        model: input.model,
+        ...(input.cwd ? { cwd: input.cwd } : {}),
+        persistSession: false,
+        tools: [],
+        permissionMode: "bypassPermissions",
+        includePartialMessages: true,
+        maxTurns: 1,
+        ...(caseConfig.effort ? { effort: caseConfig.effort } : {}),
+        ...(caseConfig.settings ? { settings: caseConfig.settings } : {}),
+        ...(caseConfig.thinking ? { thinking: caseConfig.thinking } : {}),
+      },
+    });
+
+    const initialization = await messages.initializationResult();
+    const initModel =
+      initialization.models.find((candidate) => candidate.value === input.model) ??
+      initialization.models.find((candidate) => candidate.value.includes("haiku")) ??
+      null;
+    summary.initModelInfo = initModel
+      ? {
+          value: initModel.value,
+          supportsEffort: initModel.supportsEffort ?? null,
+          supportsAdaptiveThinking: initModel.supportsAdaptiveThinking ?? null,
+          supportedEffortLevels: initModel.supportedEffortLevels ?? null,
+        }
+      : null;
+
+    for await (const message of messages) {
+      handleMessage(summary, message);
+    }
+  } catch (error) {
+    summary.error = error instanceof Error ? error.message : String(error);
+  }
+
+  return summary;
+}
+
+function handleMessage(summary: ProbeSummary, message: SDKMessage): void {
+  if (message.type === "stream_event") {
+    const event = message.event as {
+      type?: string;
+      delta?: {
+        type?: string;
+      };
+    };
+    const eventType = event.delta?.type ?? event.type;
+    if (typeof eventType === "string" && eventType.includes("thinking")) {
+      summary.streamThinkingEventTypes[eventType] =
+        (summary.streamThinkingEventTypes[eventType] ?? 0) + 1;
+    }
+    return;
+  }
+
+  if (message.type === "assistant") {
+    for (const block of message.message.content) {
+      if (typeof block?.type === "string" && block.type.includes("thinking")) {
+        summary.assistantThinkingBlockCount += 1;
+      }
+    }
+    return;
+  }
+
+  if (message.type === "result") {
+    summary.resultSubtype = message.subtype;
+    summary.resultText = message.subtype === "success" ? message.result : message.errors.join("\n");
+  }
+}
+
+async function main(): Promise<void> {
+  const args = parseArgs(process.argv.slice(2));
+  const results: ProbeSummary[] = [];
+
+  for (const caseName of args.cases) {
+    results.push(
+      await runCase({
+        caseName,
+        model: args.model,
+        ...(args.cwd ? { cwd: args.cwd } : {}),
+        prompt: args.prompt,
+      }),
+    );
+  }
+
+  console.log(JSON.stringify(results, null, 2));
+}
+
+await main();
diff --git a/scripts/package.json b/scripts/package.json
index 1e45e6ed9e..d9db897ea2 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -4,10 +4,13 @@
   "type": "module",
   "scripts": {
     "prepare": "effect-language-service patch",
+    "claude-fast-mode-probe": "bun run claude-fast-mode-probe.ts",
+    "claude-haiku-thinking-probe": "bun run claude-haiku-thinking-probe.ts",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   },
   "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "^0.2.77",
     "@effect/platform-node": "catalog:",
     "@t3tools/contracts": "workspace:*",
     "@t3tools/shared": "workspace:*",