@lucascouts/claude-agent-tui 0.2.1 → 0.3.0

package/README.md

@@ -6,6 +6,16 @@ An [ACP](https://agentclientprotocol.com)-compatible agent that drives the **Cla
 
 > **Fork** of [`@agentclientprotocol/claude-agent-acp`](https://github.com/agentclientprotocol/claude-agent-acp) v0.39.0. Where the upstream adapter calls the Claude Agent **SDK**, this fork spawns the `claude` **subscription CLI** in a pseudo-terminal and translates its JSONL transcript into ACP `session/update` notifications. See [`.fork-provenance.json`](.fork-provenance.json) for the exact fork point.
 
+## Why this exists
+
+On **June 15, 2026**, [Anthropic split Claude subscription billing](https://zed.dev/blog/anthropic-subscription-changes) into two pools: Anthropic's **first-party tools** (chat and the official **Claude Code CLI**) keep using your **Pro/Max subscription**, while **third-party agents and SDK usage** are billed separately at **API rates** — roughly **15–30× more expensive** (separate monthly credits: $20 Pro / $100 Max 5x / $200 Max 20x).
+
+In practice, Zed's built-in Claude integration now draws from those expensive third-party credits instead of your subscription. The official `claude` CLI/TUI, however, **still runs on your subscription**.
+
+This project bridges the two: it drives the **official Claude Code TUI** over a PTY and exposes it through the **ACP** protocol, so Zed renders it as a native agent panel — giving you the full Claude Code experience inside Zed **on your existing subscription**, not API credits.
+
+> Not affiliated with or endorsed by Anthropic or Zed Industries. Use of the `claude` CLI remains subject to Anthropic's terms.
+
 ## Requirements
 
 - The **`claude` CLI** (Claude Code subscription) available on your `PATH`.
@@ -45,6 +55,22 @@ npm test
 - Token-usage updates
 - Prompt input, cancellation, and session load/replay
 
+## Supply-chain notes
+
+[Socket](https://socket.dev/npm/package/@lucascouts/claude-agent-tui) flags some
+dependency alerts (`Native code`, `Install scripts`, `Shell access`, plus
+heuristic flags on the Anthropic SDK tree). **None are CVEs or malware** — they
+are expected capability flags:
+
+- `node-pty` (the same PTY that powers VS Code) needs `Native code` /
+  `Install scripts` / `Shell access` — driving the `claude` TUI in a real PTY is
+  the whole point of this bridge.
+- The remaining flags come from the minified bundles inside
+  `@anthropic-ai/claude-agent-sdk`, of which this fork uses only two pure,
+  billing-free functions (`getSessionMessages`, `resolveSettings`).
+
+All direct dependencies are first-party publishers (Microsoft, Anthropic, Zed).
+
 ## License
 
 [Apache-2.0](LICENSE). This is a derivative work; original copyright belongs to Zed Industries and the Agent Client Protocol authors.

package/dist/acp-agent.d.ts

@@ -97,6 +97,28 @@ type Session = {
      * once and a prior turn's terminal boundary is never re-observed.
      */
     detectorCursor?: number;
+    /**
+     * Story 046 (R1.3, design §5/§9) — a model-switch (`/model <alias>`) requested WHILE a turn is in
+     * flight is deferred here (last-write-wins, §9 coalescing) and flushed as a side-channel PTY write
+     * once the turn settles (prompt()'s finally → {@link flushPendingControlInjections}). Undefined when
+     * nothing is queued.
+     */
+    pendingModelInjection?: string;
+    /**
+     * Story 046 (R3.8) — true WHILE an in-place re-spawn (R3.4 dontAsk/bypass switch) is between the old
+     * PTY teardown and the new PTY being ready. Selector changes arriving in this window are rejected
+     * rather than written to a dead PTY.
+     */
+    respawning?: boolean;
+    /**
+     * Story 046 (R3.4 LIVE FIX) — true once the session's transcript has materialised (the watcher armed
+     * and pumped at least once, i.e. the FIRST interaction happened). An in-place re-spawn reattaches via
+     * `claude --resume <id>`, which needs that transcript to exist; before it, --resume falls back
+     * (buildResumeArgv `|| claude`) to a NEW untracked id and stalls. {@link respawnSession} refuses while
+     * this is falsy — a boot-time default_config_options dontAsk/bypass stays at the fresh spawn's mode
+     * until the user sends the first prompt.
+     */
+    interacted?: boolean;
     /**
      * Story 034 (§9 / R3.3) — the per-session HYBRID permission-gate runtime: loopback `PreToolUse`
      * hook server + scratch `--settings` backup + `tool_use.id` correlator. Present only when the
@@ -186,6 +208,28 @@ export interface StartEngineArgs {
      * (`buildResumeArgv`) is NOT extended here; the replay-only load path spawns nothing.
      */
     settingsFile?: string;
+    /**
+     * Story 046 (R3.2, choose-before-start): the seeded permission mode, forwarded to the spawn as
+     * `--permission-mode <mode>` (non-"default" only). Threaded to BOTH the fresh ({@link
+     * createSessionEngine}) and resume ({@link spawnResumePty}) paths so the R3.4 re-spawn carries it too.
+     */
+    permissionMode?: string;
+    /**
+     * Story 046 (R2.2): the seeded/re-spawn reasoning effort, forwarded to the spawn as `--effort
+     * <level>` (non-"default" only). Threaded to BOTH the fresh and resume spawn paths.
+     */
+    effortLevel?: string;
+    /**
+     * Story 046 (R3.4 LIVE FIX): this resume is an IN-PLACE re-spawn ({@link respawnSession} for a
+     * dontAsk/bypass mode or an effort change), NOT a fork/resume of an already-lived session. An
+     * in-place re-spawn can fire BEFORE the first interaction (e.g. a boot-time `bypassPermissions`
+     * switch driven by Zed's `default_config_options`), when the re-spawned `claude` has NOT written its
+     * transcript yet. So this branch DEFERS discovery like the fresh path (`watchdogMs: Infinity`,
+     * arm-on-appearance) instead of the resume default's 2000ms FATAL watchdog — which would otherwise
+     * throw not-found and stall the next turn until the 120s turn watchdog. The fork/resume path (flag
+     * absent) keeps its blocking 2000ms watchdog (R2.1, resume-discovery-unchanged.test.ts).
+     */
+    inPlaceRespawn?: boolean;
 }
 /** The createSession injection seam: spawn the PTY engine + JSONL watcher + locate the transcript. */
 export type StartEngine = (args: StartEngineArgs) => Promise<StartedEngine> | StartedEngine;
@@ -446,7 +490,89 @@ export declare class ClaudeAcpAgent implements Agent {
     unstable_deleteSession(params: DeleteSessionRequest): Promise<DeleteSessionResponse>;
     setSessionMode(params: SetSessionModeRequest): Promise<SetSessionModeResponse>;
     setSessionConfigOption(params: SetSessionConfigOptionRequest): Promise<SetSessionConfigOptionResponse>;
+    /**
+     * Story 046 (R3, Bug A fix) — drive a permission-mode change INTO the claude TUI (the load-bearing
+     * half). Cyclable modes (default/acceptEdits/plan/auto) drive via closed-loop Shift+Tab; dontAsk/
+     * bypassPermissions re-spawn with `--permission-mode`. Idle-guarded (R3.8); a no-op change applies
+     * nothing. SHARED by setSessionMode AND setSessionConfigOption(configId:"mode") — Zed sends mode
+     * changes via the latter, so the driving MUST live on both paths (it previously lived only on
+     * setSessionMode, while the config-option path was read-only → claude stuck on its spawn mode). The
+     * caller has already validated `target` via {@link applySessionMode}.
+     */
+    private driveModeIntoTui;
     private applySessionMode;
+    /**
+     * Story 046 (R1.2–R1.4, design §5) — apply a live model switch by injecting `/model <alias>` into
+     * the PTY as a SIDE-CHANNEL write. `/model` is a local TUI command: no assistant turn, no
+     * stop_reason — so it is NEVER routed through prompt()/createTurnResolver (that would hang) and
+     * never sets turnDetector (R1.4). The write goes through sendPrompt for its Ctrl+U input-clear but
+     * with a SYNCHRONOUS schedule so the command + `\r` commit immediately (resolves now; it awaits no
+     * turn). Idle-guard: inject only when no turn is in flight; otherwise defer (last-write-wins, §9)
+     * and flush when the turn settles (R1.3).
+     */
+    private applyModelSwitch;
+    /**
+     * Side-channel `/model <alias>` write — synchronous, resolves immediately (never a turn). claude
+     * 2.1.176 (GrowthBook `tengu_immediate_model_command=false`) does NOT apply `/model` inline mid-
+     * conversation: it opens a blocking **"Switch model?" → 1. Yes / 2. No** dialog and leaves it OPEN.
+     * Unconfirmed, the dialog survives until the NEXT prompt — whose `\r` then confirms the switch AND
+     * discards the prompt text, so no turn is born and the story-024 stall watchdog trips (the live
+     * 39a93bfc hang; root cause proved headless by experiments/probe-c-model-then-prompt.mjs). So after
+     * the command we schedule ONE Enter to accept the default "Yes, switch" once the dialog has rendered;
+     * if no dialog appears (same model / flag flipped on) Enter-on-empty-input is a harmless no-op.
+     */
+    private injectModelCommand;
+    /**
+     * Story 046 (R1.3) — flush a deferred model-switch once the session is idle again (called from
+     * prompt()'s finally, the moment the turn settles). Last-write-wins: only the most recent queued
+     * alias is injected; the field is cleared so a settled session with nothing queued injects nothing.
+     */
+    private flushPendingControlInjections;
+    /**
+     * Story 046 (R3.3, design §6b) — drive the TUI to `target` with closed-loop raw Shift+Tab. Writes
+     * `\x1b[Z` DIRECTLY to the PTY (NOT sendPrompt — its Ctrl+U clear corrupts the escape), then awaits
+     * the confirming `permission-mode` transcript event (the tail-as-truth fence: mode is read from the
+     * transcript, NEVER from p.onData). A per-step Δt budget + a one-full-cycle safety stop guarantee the
+     * loop ABORTS rather than hangs/false-stalls (Probe A gated this; story-044 awareness).
+     */
+    private driveCyclableMode;
+    /**
+     * Story 046 (R3.3) — poll the transcript (the pump's getMessages seam) for a `permission-mode` event
+     * whose mode differs from `before`, up to MODE_CYCLE_STEP_TIMEOUT_MS. Returns the new mode, or
+     * undefined on the Δt timeout (the caller aborts rather than hangs). The confirming event is usually
+     * already present right after the TUI processes the keystroke, so this returns at once in tests.
+     */
+    private awaitModeChange;
+    /** Story 046 (R3.3/R4.1) — the most recent `permission-mode` event's mode from the transcript (the
+     *  same getMessages seam the pump reads), or undefined when none is present yet. */
+    private readLatestPermissionMode;
+    /**
+     * Story 046 (R3.4/R3.7/R3.8, design §6c) — apply a non-cyclable mode (dontAsk/bypassPermissions) by
+     * re-spawning the SAME sessionId in place with a flag-carrying resume argv, preserving the transcript.
+     * Order is load-bearing for R3.7: re-spawn FIRST, and swap in + tear down the old PTY ONLY once the new
+     * one is live — so a failed re-spawn leaves the prior PTY/currentValue intact (never
+     * torn-down-without-replacement). Re-spawn runs only while idle, so the old PTY has no pending turn to
+     * double-resolve. The `respawning` latch defers concurrent selector changes (R3.8).
+     */
+    private respawnSession;
+    /** Story 046 — the session's current effort configOption value (undefined when no effort option). */
+    private currentEffort;
+    /**
+     * Story 046 (R2.2, design §7) — apply a reasoning-effort change. Probe B verdict: effort has no live
+     * mid-session mechanism (`--effort` is a spawn flag), so a change re-spawns in place with the flag
+     * (mirroring the dontAsk/bypass mode path), idle-guarded, with the R3.7 failure path and R3.8 latch.
+     * A no-op change applies nothing. Throwing here leaves the caller's applyConfigOptionValue unrun, so
+     * the prior currentValue is left unchanged on failure (R3.7).
+     */
+    private applyEffortChange;
+    /**
+     * Story 046 (R4.1/R4.2/R4.3, design §8) — reconcile the `mode` configOption from the latest
+     * permission-mode event in the exactly-once `messages` slice. Emits current_mode_update EXACTLY ONCE
+     * and only when the transcript's mode differs from the advertised currentModeId (no spurious emit when
+     * already in sync, or when no permission-mode event is present). Model/effort have no transcript drift
+     * event, so they are NOT reconciled here — optimistic-on-apply only (R4.3).
+     */
+    private reconcileModeFromTranscript;
     private replaySessionHistory;
     /**
      * Shared per-turn ACP emission used by BOTH the `session/load` replay ({@link replaySessionHistory})

package/dist/acp-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-agent.d.ts","sourceRoot":"","sources":["../src/acp-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acp-agent.d.ts","sourceRoot":"","sources":["../src/acp-agent.ts"],"names":[],"mappings":"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"}

package/dist/acp-agent.js

@@ -9,7 +9,7 @@ import { applyTaskCreate, applyTaskUpdate, parseTaskCreateOutput, planEntries, r
 import { nodeToWebReadable, nodeToWebWritable, unreachable } from "./utils.js";
 // === SEAM(011): engine boundary — inject a temporary no-op engine so the agent
 // boots without the cut SDK query() path; the real PTY engine arrives in 013–015/023.
-// See SEAM-MAP.md (createSession/prompt CUT→023) and src/engine.ts. ===
+// See fork/SEAM-MAP.md (createSession/prompt CUT→023) and src/engine.ts. ===
 import { createStubEngine } from "./engine.js";
 import { createSessionEngine, spawnResumePty, SessionEngine } from "./engine-lifecycle.js";
 import { createJsonlWatcher } from "./engine-watcher.js";
@@ -23,6 +23,7 @@ import { guardEvent } from "./billing/entrypoint-guard.js";
 import { usageUpdatesFor } from "./usage.js";
 import { createTurnResolver } from "./end-of-turn.js";
 import { sendPrompt } from "./engine-pty.js";
+import { MODEL_CATALOG, DEFAULT_MODEL_INFO } from "./model-catalog.js";
 import { setupSessionGate } from "./permissions/gate-wiring.js";
 export const CLAUDE_CONFIG_DIR = process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
 const MAX_TITLE_LENGTH = 256;
@@ -92,7 +93,55 @@ export async function defaultStartEngine(args) {
             cwd: args.cwd,
             baseEnv: args.baseEnv,
             spawn: args.spawn,
+            // Story 046 (R3.4/R2.2): the in-place re-spawn (dontAsk/bypass or an effort change) reattaches the
+            // SAME sessionId carrying its mode/effort flags through the resume argv (buildResumeArgv).
+            permissionMode: args.permissionMode,
+            effortLevel: args.effortLevel,
         });
+        if (args.inPlaceRespawn) {
+            // === SEAM(046 R3.4 LIVE FIX): DEFER discovery for an in-place re-spawn ======================
+            // An in-place re-spawn (respawnSession: dontAsk/bypass or effort) can fire BEFORE the first
+            // interaction — e.g. Zed sends set_config_option(mode:bypassPermissions) at boot from
+            // default_config_options, so the re-spawned `claude` has not written its transcript yet. The
+            // blocking 2000ms watchdog below would then throw not-found, fail the re-spawn, and the next
+            // turn would stall until the 120s turn watchdog. Mirror the fresh path: return as soon as the
+            // PTY is live and discover in the BACKGROUND under watchdogMs:Infinity (cancellable), arming the
+            // watcher + firing the first onEvent only when the transcript APPEARS (the first interaction).
+            const engine = new SessionEngine({ handle, watcher: undefined, sessions: args.sessions });
+            const ac = new AbortController();
+            engine.setPendingDiscovery(ac);
+            void (async () => {
+                try {
+                    const { transcriptPath, cwd } = await resolveWatchTarget(args.sessionId, {
+                        watchdogMs: Infinity,
+                        ...args.locateOptions,
+                        signal: ac.signal,
+                    });
+                    const watcher = createJsonlWatcher({
+                        sessionId: args.sessionId,
+                        transcriptPath,
+                        dir: cwd ?? args.cwd,
+                        onEvent: () => args.onEvent?.(args.sessionId),
+                    });
+                    engine.watcher = watcher;
+                    args.onEvent?.(args.sessionId);
+                }
+                catch (err) {
+                    // Swallow ONLY the abort sentinel (the session was torn down before any interaction).
+                    // SURFACE everything else (multi-match ambiguity, IO error) — never silently drop it.
+                    if (err?.name === "AbortError")
+                        return;
+                    console.error(`[acp-agent] in-place re-spawn transcript discovery failed for ${args.sessionId}:`, err);
+                }
+            })();
+            return {
+                sessionId: args.sessionId,
+                pty: handle.pty,
+                watcher: undefined,
+                engine,
+                cwd: args.cwd,
+            };
+        }
         const { transcriptPath, cwd } = await resolveWatchTarget(args.sessionId, {
             ...args.locateOptions,
         });
@@ -119,6 +168,10 @@ export async function defaultStartEngine(args) {
         baseEnv: args.baseEnv,
         sessions: args.sessions,
         spawn: args.spawn,
+        // Story 046 (R3.2/R2.2): the seeded permission mode + effort → `--permission-mode`/`--effort` on
+        // the fresh spawn (non-"default" only; "default"/undefined keep the byte-for-byte pre-046 argv).
+        permissionMode: args.permissionMode,
+        effortLevel: args.effortLevel,
         // Story 034 (§9): the per-session gate scratch settings, already on disk — claude reads them at
         // startup, so the hook gates the FIRST tool call (blocker c). Absent → ungated (pre-034) spawn.
         settingsFile: args.settingsFile,
@@ -174,13 +227,6 @@ export async function defaultStartEngine(args) {
         cwd: args.cwd,
     };
 }
-/** A single default Degrau-1 model entry. The TUI owns real model selection in Degrau-1; this is an
- *  honest non-interactive default so configOptions/modes have a coherent current model to anchor on. */
-const DEGRAU1_DEFAULT_MODEL_INFO = {
-    value: "default",
-    displayName: "Default",
-    description: "Default model (selection is owned by the interactive TUI in Degrau-1)",
-};
 /** Compute a stable fingerprint of the session-defining params so we can
  *  detect when a loadSession/resumeSession call requires tearing down and
  *  recreating the underlying Query process.  MCP servers are sorted by name
@@ -194,7 +240,7 @@ function computeSessionFingerprint(params) {
 // spawns the subscription `claude` through the login shell (`bash -lc 'claude …'`), so it resolves
 // from PATH — the same E1 keystone (experiments/DEGRAU0-RESULTS.md), via the shell rather than an
 // explicit resolveClaudePath() call here. resolveClaudePath() (story 012) is retained for the
-// `--cli` auth spawn in index.ts. See src/claude-path.ts, SEAM-MAP.md, IMPLEMENTACAO §3/§5. ===
+// `--cli` auth spawn in index.ts. See fork/src/claude-path.ts, fork/SEAM-MAP.md, IMPLEMENTACAO §3/§5. ===
 function shouldHideClaudeAuth() {
     return process.argv.includes("--hide-claude-auth");
 }
@@ -282,6 +328,25 @@ export function resolvePermissionMode(defaultMode, logger = console) {
     }
     return mapped;
 }
+/**
+ * Story 046 (R3.3): the permission modes the TUI cycles through with Shift+Tab (`\x1b[Z`), reachable
+ * by the closed-loop driver by stepping. `dontAsk`/`bypassPermissions` are NOT on this cycle — they
+ * are applied by an in-place re-spawn instead (R3.4).
+ */
+const CYCLABLE_MODES = new Set(["default", "acceptEdits", "plan", "auto"]);
+/** Story 046 (R3.3): the raw Shift+Tab bytes that cycle the TUI permission mode. Written DIRECTLY to
+ *  the PTY — NEVER via sendPrompt, whose leading Ctrl+U clear would corrupt the escape (design GOTCHA). */
+const MODE_CYCLE_KEY = "\x1b[Z";
+/** Story 046 (R3.3): per-step budget for the closed-loop to see the confirming permission-mode
+ *  transcript event before aborting (no hang, story-044 awareness); polled every MODE_CYCLE_POLL_MS. */
+const MODE_CYCLE_STEP_TIMEOUT_MS = 2000;
+const MODE_CYCLE_POLL_MS = 50;
+/** Story 046 (hang fix): claude 2.1.176 opens a blocking "Switch model?" confirm dialog on a mid-
+ *  conversation `/model <alias>` (GrowthBook `tengu_immediate_model_command=false`). Delay before the
+ *  blind confirm Enter so the dialog has rendered first; the dialog stays open until confirmed, so a
+ *  late Enter still lands while an early (pre-render) one would be lost. 800 ms validated headless
+ *  (experiments/probe-c-model-then-prompt.mjs: the dialog rendered + the switch applied within it). */
+const MODEL_CONFIRM_DELAY_MS = 800;
 /**
  * Builds the label for the "Always Allow" permission option so the user can see
  * the exact scope they are committing to. Uses the SDK-provided suggestions
@@ -644,6 +709,8 @@ export class ClaudeAcpAgent {
             // so the in-turn sub-agent watcher dies with it (covers turn-resolve AND markCancelled paths).
             sessionRecord.subagentWatcher?.stop();
             sessionRecord.subagentWatcher = undefined;
+            // Story 046 (R1.3): the session is idle again — flush any model switch deferred mid-turn.
+            this.flushPendingControlInjections(sessionRecord);
         }
     }
     async cancel(params) {
@@ -741,10 +808,15 @@ export class ClaudeAcpAgent {
         return {};
     }
     async setSessionMode(params) {
-        if (!this.sessions[params.sessionId]) {
+        const session = this.sessions[params.sessionId];
+        if (!session) {
             throw new Error("Session not found");
         }
+        // Validate the requested mode against the session's availableModes (throws on an unknown/unavailable
+        // mode — preserved). No state change here (Degrau-1 shim); the drive/re-spawn below applies it.
         await this.applySessionMode(params.sessionId, params.modeId);
+        // Drive the validated mode INTO the claude TUI (shared with the set_config_option path, Bug A fix).
+        await this.driveModeIntoTui(params.sessionId, session, params.modeId);
         await this.updateConfigOption(params.sessionId, "mode", params.modeId);
         return {};
     }
@@ -786,6 +858,10 @@ export class ClaudeAcpAgent {
         const resolvedValue = validValue.value;
         if (params.configId === "mode") {
             await this.applySessionMode(params.sessionId, resolvedValue);
+            // Bug A fix (Story 046 R3) — Zed sends mode changes via set_config_option(configId:"mode"), so
+            // the DRIVE must happen HERE too. This path used to only validate (read-only), leaving claude
+            // stuck on its spawn mode — the live permission mode never changed (bypass/acceptEdits no-op'd).
+            await this.driveModeIntoTui(params.sessionId, session, resolvedValue);
             await this.client.sessionUpdate({
                 sessionId: params.sessionId,
                 update: {
@@ -794,12 +870,51 @@ export class ClaudeAcpAgent {
                 },
             });
         }
-        // === SEAM(023) Group 1: the `model` branch's SDK `query.setModel` is dropped — local config
-        // state is updated by applyConfigOptionValue below (read-only Degrau-1 shim).
-        // Degrau 2 (030/032): PTY-backed control. ===
+        // === SEAM(023→046) Group 1: the dropped SDK `query.setModel` is replaced by a PTY side-channel.
+        // `/model <alias>` is a LOCAL TUI command (no assistant turn, no stop_reason) — inject it as a
+        // write that resolves immediately; NEVER route it through prompt()/the turn-resolver (it would
+        // hang forever) and never set turnDetector (R1.4). Idle-guard on turnDetector === undefined
+        // (design §5): mid-turn, defer behind pendingModelInjection and flush when the turn settles (R1.3).
+        // resolvedValue is already the canonical catalog alias. ===
+        if (params.configId === "model") {
+            this.applyModelSwitch(session, resolvedValue);
+        }
+        else if (params.configId === "effort") {
+            // Story 046 (R2.2): Probe B verdict — effort has no live mid-session path, so an effort change
+            // re-spawns in place with `--effort <level>` (idle-guarded, R3.7 failure path). On throw, the
+            // applyConfigOptionValue below is skipped so the prior currentValue stays unchanged.
+            await this.applyEffortChange(params.sessionId, session, resolvedValue);
+        }
         await this.applyConfigOptionValue(params.sessionId, session, params.configId, resolvedValue);
         return { configOptions: session.configOptions };
     }
+    /**
+     * Story 046 (R3, Bug A fix) — drive a permission-mode change INTO the claude TUI (the load-bearing
+     * half). Cyclable modes (default/acceptEdits/plan/auto) drive via closed-loop Shift+Tab; dontAsk/
+     * bypassPermissions re-spawn with `--permission-mode`. Idle-guarded (R3.8); a no-op change applies
+     * nothing. SHARED by setSessionMode AND setSessionConfigOption(configId:"mode") — Zed sends mode
+     * changes via the latter, so the driving MUST live on both paths (it previously lived only on
+     * setSessionMode, while the config-option path was read-only → claude stuck on its spawn mode). The
+     * caller has already validated `target` via {@link applySessionMode}.
+     */
+    async driveModeIntoTui(sessionId, session, target) {
+        if (target === session.modes.currentModeId)
+            return; // no-op change applies nothing to the TUI
+        // Idle-guard (design §9 / R3.8): driving/re-spawning is mutually exclusive with a turn in flight
+        // (incl. the story-031 cancel ladder, observed as a live turnDetector) and with a re-spawn already
+        // underway. Reject rather than write to a busy/dead PTY — the user retries when idle.
+        if (session.turnDetector !== undefined || session.respawning) {
+            throw new Error("Cannot change permission mode while the session is busy (a turn is in flight or a re-spawn is underway); retry when idle");
+        }
+        if (CYCLABLE_MODES.has(target)) {
+            // R3.3: drive the TUI with closed-loop raw Shift+Tab until the transcript confirms `target`.
+            await this.driveCyclableMode(sessionId, session, target);
+        }
+        else {
+            // R3.4: dontAsk/bypassPermissions are not on the Shift+Tab cycle — re-spawn in place.
+            await this.respawnSession(sessionId, session, { permissionMode: target });
+        }
+    }
     async applySessionMode(sessionId, modeId) {
         switch (modeId) {
             case "auto":
@@ -824,6 +939,214 @@ export class ClaudeAcpAgent {
         // emitted by the caller. No SDK `query.setPermissionMode`.
         // Degrau 2 (030/032): PTY-backed control — drive the TUI to apply the permission mode. ===
     }
+    /**
+     * Story 046 (R1.2–R1.4, design §5) — apply a live model switch by injecting `/model <alias>` into
+     * the PTY as a SIDE-CHANNEL write. `/model` is a local TUI command: no assistant turn, no
+     * stop_reason — so it is NEVER routed through prompt()/createTurnResolver (that would hang) and
+     * never sets turnDetector (R1.4). The write goes through sendPrompt for its Ctrl+U input-clear but
+     * with a SYNCHRONOUS schedule so the command + `\r` commit immediately (resolves now; it awaits no
+     * turn). Idle-guard: inject only when no turn is in flight; otherwise defer (last-write-wins, §9)
+     * and flush when the turn settles (R1.3).
+     */
+    applyModelSwitch(session, alias) {
+        if (session.turnDetector !== undefined) {
+            // A turn is in flight — injecting mid-turn corrupts the PTY input. Defer (coalesce, §9).
+            session.pendingModelInjection = alias;
+            return;
+        }
+        // Re-selecting the model the session is already on is a no-op: claude shows no "Switch model?"
+        // dialog for it, so skip the redundant /model (and its confirm Enter) entirely.
+        const current = session.configOptions.find((o) => o.id === "model")?.currentValue;
+        if (current === alias)
+            return;
+        this.injectModelCommand(session, alias);
+    }
+    /**
+     * Side-channel `/model <alias>` write — synchronous, resolves immediately (never a turn). claude
+     * 2.1.176 (GrowthBook `tengu_immediate_model_command=false`) does NOT apply `/model` inline mid-
+     * conversation: it opens a blocking **"Switch model?" → 1. Yes / 2. No** dialog and leaves it OPEN.
+     * Unconfirmed, the dialog survives until the NEXT prompt — whose `\r` then confirms the switch AND
+     * discards the prompt text, so no turn is born and the story-024 stall watchdog trips (the live
+     * 39a93bfc hang; root cause proved headless by experiments/probe-c-model-then-prompt.mjs). So after
+     * the command we schedule ONE Enter to accept the default "Yes, switch" once the dialog has rendered;
+     * if no dialog appears (same model / flag flipped on) Enter-on-empty-input is a harmless no-op.
+     */
+    injectModelCommand(session, alias) {
+        sendPrompt(session.pty, `/model ${alias}`, (fn) => fn());
+        // Confirm the "Switch model?" dialog — blind + scheduled, like the story-031 cancel ladder's Esc.
+        this.schedule(() => {
+            if (session.engine?.isDisposed)
+                return; // PTY exited meanwhile → nothing to confirm
+            session.pty.write("\r");
+        }, MODEL_CONFIRM_DELAY_MS);
+    }
+    /**
+     * Story 046 (R1.3) — flush a deferred model-switch once the session is idle again (called from
+     * prompt()'s finally, the moment the turn settles). Last-write-wins: only the most recent queued
+     * alias is injected; the field is cleared so a settled session with nothing queued injects nothing.
+     */
+    flushPendingControlInjections(session) {
+        if (session.turnDetector !== undefined)
+            return; // still not idle (defensive)
+        const alias = session.pendingModelInjection;
+        if (alias !== undefined) {
+            session.pendingModelInjection = undefined;
+            this.injectModelCommand(session, alias);
+        }
+    }
+    /**
+     * Story 046 (R3.3, design §6b) — drive the TUI to `target` with closed-loop raw Shift+Tab. Writes
+     * `\x1b[Z` DIRECTLY to the PTY (NOT sendPrompt — its Ctrl+U clear corrupts the escape), then awaits
+     * the confirming `permission-mode` transcript event (the tail-as-truth fence: mode is read from the
+     * transcript, NEVER from p.onData). A per-step Δt budget + a one-full-cycle safety stop guarantee the
+     * loop ABORTS rather than hangs/false-stalls (Probe A gated this; story-044 awareness).
+     */
+    async driveCyclableMode(sessionId, session, target) {
+        const cyclableCount = session.modes.availableModes.filter((m) => CYCLABLE_MODES.has(m.id)).length;
+        const maxSteps = Math.max(cyclableCount, 1) + 1; // one-full-cycle safety stop
+        for (let step = 0; step < maxSteps; step++) {
+            if (session.modes.currentModeId === target)
+                return; // converged
+            const before = session.modes.currentModeId;
+            session.pty.write(MODE_CYCLE_KEY); // raw \x1b[Z (Shift+Tab) — never via sendPrompt
+            const observed = await this.awaitModeChange(sessionId, session, before);
+            if (observed === undefined)
+                return; // Δt elapsed with no confirming event → abort (no hang)
+            session.modes.currentModeId = observed; // reconcile local state from the transcript truth
+        }
+    }
+    /**
+     * Story 046 (R3.3) — poll the transcript (the pump's getMessages seam) for a `permission-mode` event
+     * whose mode differs from `before`, up to MODE_CYCLE_STEP_TIMEOUT_MS. Returns the new mode, or
+     * undefined on the Δt timeout (the caller aborts rather than hangs). The confirming event is usually
+     * already present right after the TUI processes the keystroke, so this returns at once in tests.
+     */
+    async awaitModeChange(sessionId, session, before) {
+        let waited = 0;
+        for (;;) {
+            const mode = await this.readLatestPermissionMode(sessionId, session);
+            if (mode !== undefined && mode !== before)
+                return mode;
+            if (waited >= MODE_CYCLE_STEP_TIMEOUT_MS)
+                return undefined;
+            await new Promise((resolve) => this.schedule(() => resolve(), MODE_CYCLE_POLL_MS));
+            waited += MODE_CYCLE_POLL_MS;
+        }
+    }
+    /** Story 046 (R3.3/R4.1) — the most recent `permission-mode` event's mode from the transcript (the
+     *  same getMessages seam the pump reads), or undefined when none is present yet. */
+    async readLatestPermissionMode(sessionId, session) {
+        // Mirror the pump's seam resolution: this.getMessages is the injectable reader, defaulting to
+        // defaultGetMessages when not overridden (it is optional at the constructor seam).
+        const read = this.getMessages ?? defaultGetMessages;
+        const messages = await read(sessionId, { dir: session.cwd });
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const m = messages[i];
+            if (m.type === "permission-mode" && typeof m.permissionMode === "string")
+                return m.permissionMode;
+        }
+        return undefined;
+    }
+    /**
+     * Story 046 (R3.4/R3.7/R3.8, design §6c) — apply a non-cyclable mode (dontAsk/bypassPermissions) by
+     * re-spawning the SAME sessionId in place with a flag-carrying resume argv, preserving the transcript.
+     * Order is load-bearing for R3.7: re-spawn FIRST, and swap in + tear down the old PTY ONLY once the new
+     * one is live — so a failed re-spawn leaves the prior PTY/currentValue intact (never
+     * torn-down-without-replacement). Re-spawn runs only while idle, so the old PTY has no pending turn to
+     * double-resolve. The `respawning` latch defers concurrent selector changes (R3.8).
+     */
+    async respawnSession(sessionId, session, change) {
+        // Story 046 (R3.4 LIVE FIX guard): a re-spawn reattaches via `claude --resume <id>`, which needs the
+        // transcript to ALREADY exist. Before the first interaction it is absent, so --resume falls back
+        // (buildResumeArgv `|| claude`) to a NEW id the fork no longer tracks — stalling the turn until the
+        // 120s watchdog AND discarding the live fresh PTY. Refuse until the session has interacted at least
+        // once. The user/Zed retries after the first prompt; a boot-time default_config_options dontAsk/
+        // bypass therefore stays at the fresh spawn's mode (use a fresh-spawn --permission-mode seed for
+        // start-in-bypass, a documented follow-up). The OTHER selector's currentValue is left unchanged.
+        if (!session.interacted) {
+            throw new Error("Cannot switch to a re-spawn mode/effort before the first interaction (no transcript to resume yet); send a prompt first, then switch.");
+        }
+        session.respawning = true;
+        try {
+            const oldEngine = session.engine;
+            // Preserve the OTHER selector's current value so re-spawning for one (mode OR effort) does not
+            // reset the other — the resume argv carries both flags.
+            const permissionMode = change.permissionMode ?? session.modes.currentModeId;
+            const effortLevel = change.effortLevel ?? this.currentEffort(session);
+            // Re-spawn through the SAME startEngine seam createSession uses, reusing the sessionId so the
+            // transcript is reattached (R3.4); the flags flow into the flag-carrying resume argv.
+            const started = await this.startEngine({
+                sessionId,
+                cwd: session.cwd,
+                resume: true,
+                // Story 046 (R3.4 LIVE FIX): an in-place re-spawn may run before the first interaction (boot
+                // bypass), so DEFER discovery instead of the 2000ms fatal watchdog — see defaultStartEngine.
+                inPlaceRespawn: true,
+                permissionMode,
+                effortLevel,
+                sessions: this.engines,
+                onEvent: (sid) => void this.pumpUpdates(sid),
+            });
+            // New PTY is live — only now retire the old one (idle ⇒ no pending turn to double-resolve) and swap.
+            oldEngine?.cleanup();
+            oldEngine?.kill();
+            session.pty = started.pty;
+            session.engine = started.engine;
+            session.watcher = started.watcher;
+            if (change.permissionMode) {
+                session.modes = { ...session.modes, currentModeId: change.permissionMode };
+            }
+        }
+        finally {
+            session.respawning = false;
+        }
+    }
+    /** Story 046 — the session's current effort configOption value (undefined when no effort option). */
+    currentEffort(session) {
+        const opt = session.configOptions.find((o) => o.id === "effort");
+        return typeof opt?.currentValue === "string" ? opt.currentValue : undefined;
+    }
+    /**
+     * Story 046 (R2.2, design §7) — apply a reasoning-effort change. Probe B verdict: effort has no live
+     * mid-session mechanism (`--effort` is a spawn flag), so a change re-spawns in place with the flag
+     * (mirroring the dontAsk/bypass mode path), idle-guarded, with the R3.7 failure path and R3.8 latch.
+     * A no-op change applies nothing. Throwing here leaves the caller's applyConfigOptionValue unrun, so
+     * the prior currentValue is left unchanged on failure (R3.7).
+     */
+    async applyEffortChange(sessionId, session, level) {
+        if (level === this.currentEffort(session))
+            return; // no value change → no-op
+        if (session.turnDetector !== undefined || session.respawning) {
+            throw new Error("Cannot change effort while the session is busy (a turn is in flight or a re-spawn is underway); retry when idle");
+        }
+        await this.respawnSession(sessionId, session, { effortLevel: level });
+    }
+    /**
+     * Story 046 (R4.1/R4.2/R4.3, design §8) — reconcile the `mode` configOption from the latest
+     * permission-mode event in the exactly-once `messages` slice. Emits current_mode_update EXACTLY ONCE
+     * and only when the transcript's mode differs from the advertised currentModeId (no spurious emit when
+     * already in sync, or when no permission-mode event is present). Model/effort have no transcript drift
+     * event, so they are NOT reconciled here — optimistic-on-apply only (R4.3).
+     */
+    async reconcileModeFromTranscript(sessionId, session, messages) {
+        let latestMode;
+        for (const m of messages) {
+            const w = m;
+            if (w.type === "permission-mode" && typeof w.permissionMode === "string") {
+                latestMode = w.permissionMode;
+            }
+        }
+        if (latestMode === undefined || latestMode === session.modes.currentModeId)
+            return;
+        session.modes = { ...session.modes, currentModeId: latestMode };
+        session.configOptions = session.configOptions.map((o) => o.id === "mode" && typeof o.currentValue === "string"
+            ? { ...o, currentValue: latestMode }
+            : o);
+        await this.client.sessionUpdate({
+            sessionId,
+            update: { sessionUpdate: "current_mode_update", currentModeId: latestMode },
+        });
+    }
     async replaySessionHistory(sessionId) {
         const session = this.sessions[sessionId];
         if (!session)
@@ -1053,6 +1376,11 @@ export class ClaudeAcpAgent {
         const session = this.sessions[sessionId];
         if (!session)
             return; // watcher fired before the handle was registered, or after teardown
+        // Story 046 (R3.4 LIVE FIX): the pump only fires once the watcher has armed against the REAL
+        // transcript, so reaching here proves the transcript exists (the first interaction happened). Mark
+        // it idempotently — respawnSession gates the --resume re-spawn on this (a pre-interaction re-spawn
+        // would --resume a non-existent transcript and fall back to a new untracked id).
+        session.interacted = true;
         const messages = await readOrderedMessages(sessionId, session.cwd, {
             getMessages: this.getMessages,
         });
@@ -1104,6 +1432,15 @@ export class ClaudeAcpAgent {
             for (const m of fed)
                 registerGateToolUses(m, session.gate);
         }
+        // === SEAM(046) §8 — reconcile the `mode` configOption from transcript permission-mode events.
+        // `permission-mode` is lifecycle-classified (event-switch.ts) and emits no SessionUpdate of its own,
+        // and there is no other transcript-driven mode consumer — so intercept it HERE, over the SAME
+        // exactly-once `fed` slice the detector/gate consume. If the latest permission-mode event's mode
+        // differs from the advertised currentModeId, reconcile the mode configOption currentValue and emit
+        // current_mode_update EXACTLY ONCE (covers a manual Shift+Tab in a mirrored TUI, plan-approval, and
+        // the R3.4 re-spawn). Model and effort have NO transcript drift event — they stay optimistic-on-apply
+        // (R4.3, documented). Additive: it never blocks the emit loop below.
+        await this.reconcileModeFromTranscript(sessionId, session, fed);
         // === SEAM(041) §sidechain — source + merge + linearize + emit (BOTH main turns and nested
         // sub-agent rows). Factored into the shared {@link emitLinearizedWithNested} so the `session/load`
         // replay path (`replaySessionHistory`) runs the IDENTICAL loop — loaded == live with no replay-only
@@ -1373,6 +1710,12 @@ export class ClaudeAcpAgent {
             logger: this.logger,
         });
         await settingsManager.initialize();
+        // Story 046 (R3.1/R3.6, choose-before-start): seed the permission mode from
+        // settings.permissions.defaultMode, normalized through resolvePermissionMode (returns "default"
+        // on undefined/invalid AND strips bypassPermissions under the root guard — so R3.1 reconciles
+        // with R3.6). Drives both the spawn flag (--permission-mode, fresh path) and the advertised
+        // currentModeId, replacing the old hardcoded "default".
+        const seededMode = resolvePermissionMode(settingsManager.getSettings().permissions?.defaultMode, this.logger);
         // Per-session task state — still surfaced via plan notifications by the Group 2 pump / hooks.
         const taskState = new Map();
         // === SEAM(034) §9 hybrid gate: set up the per-session permission gate BEFORE the spawn =======
@@ -1405,6 +1748,9 @@ export class ClaudeAcpAgent {
                 replayOnly: creationOpts.replayOnly,
                 sessions: this.engines,
                 onEvent: (sid) => void this.pumpUpdates(sid),
+                // Story 046 (R3.1/R3.2): seed the fresh spawn with the resolved permission mode (the resume
+                // path's mode is carried by the R3.4 re-spawn argv, not here).
+                permissionMode: seededMode,
                 // Story 034: the gate's scratch settings file, consumed as `--settings "<file>"` (fresh path).
                 settingsFile: gate?.settingsPath,
             });
@@ -1438,13 +1784,16 @@ export class ClaudeAcpAgent {
             boundGate.bindPty(started.pty);
             started.pty.onExit(() => void boundGate.teardown());
         }
-        // Static Degrau-1 model/mode/config defaults (the TUI owns real selection in Degrau-1).
-        const availableModes = buildAvailableModes(DEGRAU1_DEFAULT_MODEL_INFO);
+        // Story 046: advertise the full curated model catalog (was a single static "Default" entry),
+        // with the current model seeded to the safe `default`. Populating the catalog also unlocks the
+        // effort selector via buildConfigOptions (§5/§7). The current MODE is still seeded "default" here;
+        // Task 4.1 reseeds it from settings.permissions.defaultMode.
+        const availableModes = buildAvailableModes(DEFAULT_MODEL_INFO);
         const modes = {
-            currentModeId: "default",
+            currentModeId: seededMode,
             availableModes,
         };
-        const configOptions = buildConfigOptions(modes, DEGRAU1_DEFAULT_MODEL_INFO.value, [DEGRAU1_DEFAULT_MODEL_INFO], settingsManager.getSettings().effortLevel);
+        const configOptions = buildConfigOptions(modes, DEFAULT_MODEL_INFO.value, MODEL_CATALOG, settingsManager.getSettings().effortLevel);
         // Runtime cwd is read from inside the JSONL (story 015); fall back to the requested host cwd
         // until the first transcript line carries `.cwd` (the seam may return cwd === undefined early).
         const runtimeCwd = started.cwd ?? params.cwd;
@@ -1468,9 +1817,9 @@ export class ClaudeAcpAgent {
                 cachedWriteTokens: 0,
             },
             modes,
-            modelInfos: [DEGRAU1_DEFAULT_MODEL_INFO],
+            modelInfos: MODEL_CATALOG,
             configOptions,
-            contextWindowSize: inferContextWindowFromModel(DEGRAU1_DEFAULT_MODEL_INFO.value) ?? DEFAULT_CONTEXT_WINDOW,
+            contextWindowSize: inferContextWindowFromModel(DEFAULT_MODEL_INFO.value) ?? DEFAULT_CONTEXT_WINDOW,
             taskState,
             gate,
         };
@@ -1512,13 +1861,13 @@ function buildAvailableModes(modelInfo) {
     }, {
         id: "dontAsk",
         name: "Don't Ask",
-        description: "Don't prompt for permissions, deny if not pre-approved",
+        description: "Don't prompt for permissions, deny if not pre-approved. Selecting this restarts the session.",
     });
     if (ALLOW_BYPASS) {
         modes.push({
             id: "bypassPermissions",
             name: "Bypass Permissions",
-            description: "Bypass all permission checks",
+            description: "Bypass all permission checks. Selecting this restarts the session.",
         });
     }
     return modes;
@@ -2050,6 +2399,9 @@ export function toAcpNotifications(content, role, sessionId, toolUseCache, clien
             case "compaction_delta":
             case "advisor_tool_result":
             case "mid_conv_system":
+            case "fallback":
+                // `fallback`: model-routing marker (@anthropic-ai/sdk >= 0.104) — from/to
+                // model hops, no renderable content. No-op like the control blocks above.
                 break;
             default:
                 unreachable(chunk, logger);

package/dist/engine-lifecycle.d.ts

@@ -142,8 +142,13 @@ export declare class SessionEngine {
  * `|| claude` makes a FAILED `--resume` fall back to a fresh interactive session rather than
  * hanging. The id is double-quoted so it survives shell word-splitting. There is deliberately
  * NO `-p`/`--print`/`stream-json` — those select the SDK/credit non-interactive path.
+ *
+ * Story 046 (R3.4): an optional non-"default" `permissionMode` is carried into BOTH the `--resume`
+ * launch AND the `|| claude` fresh fallback as `--permission-mode <mode>`, so an in-place re-spawn
+ * (a dontAsk/bypass switch) reattaches the SAME sessionId/transcript under the new mode. Still no
+ * `-p`/`--print`/`stream-json` — billing stays subscription `cli`.
  */
-export declare function buildResumeArgv(sessionId: string): [string, string];
+export declare function buildResumeArgv(sessionId: string, permissionMode?: string, effortLevel?: string): [string, string];
 /** Options for {@link spawnResumePty}. */
 export interface SpawnResumeOptions {
     /** The prior session id to reattach to (== the JSONL transcript basename). */
@@ -154,6 +159,13 @@ export interface SpawnResumeOptions {
     baseEnv?: Record<string, string | undefined>;
     /** Injectable spawn function (defaults to node-pty's `spawn`); tests pass a fake. */
     spawn?: typeof pty.spawn;
+    /**
+     * Story 046 (R3.4): carry `--permission-mode <mode>` into the resume argv for an in-place re-spawn
+     * (a dontAsk/bypass switch). Non-"default" only; preserves the same sessionId/transcript.
+     */
+    permissionMode?: string;
+    /** Story 046 (R2.2): carry `--effort <level>` into the resume argv for an effort re-spawn. */
+    effortLevel?: string;
 }
 /**
  * Spawn the resume PTY, reusing story 013's sanitized env (R4.2) so the resumed turn keeps the
@@ -172,6 +184,13 @@ export interface CreateSessionEngineOptions {
     baseEnv?: Record<string, string | undefined>;
     /** Injectable spawn function (defaults to node-pty's `spawn`); tests pass a fake. */
     spawn?: typeof pty.spawn;
+    /**
+     * Story 046 (R3.2): forwarded to {@link spawnClaudePty} as `--permission-mode <mode>` for a fresh
+     * spawn seeded to a non-"default" mode. Absent/"default" → no flag (byte-for-byte pre-046 spawn).
+     */
+    permissionMode?: string;
+    /** Story 046 (R2.2): forwarded to {@link spawnClaudePty} as `--effort <level>` for a non-"default" seed. */
+    effortLevel?: string;
     /**
      * Story 034 (§9 hybrid gate): per-session SCRATCH settings file carrying the fork's
      * `PreToolUse` hook, forwarded to {@link spawnClaudePty} as `--settings "<file>"`. The

package/dist/engine-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-lifecycle.d.ts","sourceRoot":"","sources":["../src/engine-lifecycle.ts"],"names":[],"mappings":"AAuBA,OAAO,GAAG,MAAM,UAAU,CAAC;AAQ3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,IAAI,IAAI,IAAI,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,MAAM,CAAC;AAChC,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B;;;GAGG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,gGAAgG;IAChG,MAAM,EAAE,eAAe,CAAC;IACxB,gFAAgF;IAChF,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,yEAAyE;IACzE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gGAAgG;IAChG,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,cAAc,CAAC,EAAE,OAAO,YAAY,CAAC;IACrC;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED;;;;;;;;GAQG;AACH,qBAAa,aAAa;IACxB,qFAAqF;IACrF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IACrC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,cAAc,CAAC;IAEzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA6B;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,WAAW,CAAC,CAAgC;IACpD,OAAO,CAAC,WAAW,CAAC,CAAiC;IACrD,OAAO,CAAC,QAAQ,CAAS;IACzB;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB,CAAC,CAAkB;IAC3C;;;;;OAKG;IACH,OAAO,CAAC,UAAU,CAAC,CAAc;gBAErB,IAAI,EAAE,oBAAoB;IAwBtC;;;;;OAKG;IACH,aAAa,CAAC,IAAI,GAAE,MAAqB,EAAE,IAAI,GAAE,MAAqB,GAAG,IAAI;IAa7E;;;;;;OAMG;IACH,SAAS,IAAI,IAAI;IAKjB,qFAAqF;IACrF,MAAM,IAAI,IAAI;IAKd;;;OAGG;IACH,IAAI,IAAI,IAAI;IAKZ;;;;;OAKG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiC5D;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,EAAE,eAAe,GAAG,IAAI;IAI9C,gEAAgE;IAChE,IAAI,UAAU,IAAI,OAAO,CAExB;CACF;AAKD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEnE;AAED,0CAA0C;AAC1C,MAAM,WAAW,kBAAkB;IACjC,8EAA8E;IAC9E,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,qFAAqF;IACrF,KAAK,CAAC,EAAE,OAAO,GAAG,CAAC,KAAK,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,eAAe,CAoBxE;AAED,+CAA+C;AAC/C,MAAM,WAAW,0BAA0B;IACzC,wEAAwE;IACxE,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,qFAAqF;IACrF,KAAK,CAAC,EAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IACzB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,KAAK,cAAc,CAAC;IAChF,uFAAuF;IACvF,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,yEAAyE;IACzE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,gGAAgG;IAChG,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,cAAc,CAAC,EAAE,OAAO,YAAY,CAAC;IACrC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,0BAA0B,GAAG,aAAa,CAuBnF"}
+{"version":3,"file":"engine-lifecycle.d.ts","sourceRoot":"","sources":["../src/engine-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/engine-lifecycle.js

@@ -167,9 +167,17 @@ const RESUME_PTY_NAME = "xterm-256color";
  * `|| claude` makes a FAILED `--resume` fall back to a fresh interactive session rather than
  * hanging. The id is double-quoted so it survives shell word-splitting. There is deliberately
  * NO `-p`/`--print`/`stream-json` — those select the SDK/credit non-interactive path.
+ *
+ * Story 046 (R3.4): an optional non-"default" `permissionMode` is carried into BOTH the `--resume`
+ * launch AND the `|| claude` fresh fallback as `--permission-mode <mode>`, so an in-place re-spawn
+ * (a dontAsk/bypass switch) reattaches the SAME sessionId/transcript under the new mode. Still no
+ * `-p`/`--print`/`stream-json` — billing stays subscription `cli`.
  */
-export function buildResumeArgv(sessionId) {
-    return ["-c", `claude --resume "${sessionId}" || claude`];
+export function buildResumeArgv(sessionId, permissionMode, effortLevel) {
+    const pm = permissionMode && permissionMode !== "default" ? ` --permission-mode ${permissionMode}` : "";
+    const ef = effortLevel && effortLevel !== "default" ? ` --effort ${effortLevel}` : "";
+    const flags = `${pm}${ef}`;
+    return ["-c", `claude --resume "${sessionId}"${flags} || claude${flags}`];
 }
 /**
  * Spawn the resume PTY, reusing story 013's sanitized env (R4.2) so the resumed turn keeps the
@@ -182,7 +190,7 @@ export function buildResumeArgv(sessionId) {
 export function spawnResumePty(opts) {
     const { sessionId, cwd, baseEnv = process.env, spawn = pty.spawn } = opts;
     const shell = resolveShell(baseEnv);
-    const argv = buildResumeArgv(sessionId);
+    const argv = buildResumeArgv(sessionId, opts.permissionMode, opts.effortLevel);
     const env = buildSanitizedEnv(baseEnv);
     // §10 refuse-to-spawn guard (R4.2): abort if any forbidden billing var survived sanitization,
     // rather than resume a credit-billed run. Checks the SPAWN env, not process.env.
@@ -218,6 +226,8 @@ export function createSessionEngine(opts) {
         cwd: opts.cwd,
         baseEnv: opts.baseEnv,
         spawn: opts.spawn,
+        permissionMode: opts.permissionMode,
+        effortLevel: opts.effortLevel,
         settingsFile: opts.settingsFile,
     });
     // ONE watcher, started by the story 015 factory and bound to that same PTY.

package/dist/engine-pty.d.ts

@@ -44,15 +44,20 @@ export declare function resolveShell(baseEnv?: Record<string, string | undefined
  * billing). The path is double-quoted so it survives the `-lc` shell word-splitting.
  * Like `--permission-mode plan`, this flag changes only TUI behavior — it adds no
  * `-p`/`stream-json`, so billing stays subscription `cli` (§10).
+ *
+ * Story 046 (R3.2): the `planMode` boolean seam is GENERALIZED to a `permissionMode` string. A
+ * non-"default" mode is emitted as `--permission-mode <mode>`; "default"/undefined emit nothing;
+ * `permissionMode: "plan"` reproduces the old planMode=true path. Still interactive-only — adds no
+ * `-p`/`stream-json`, billing stays subscription `cli`.
  */
-export declare function buildClaudeCmd(sessionId: string, planMode?: boolean, settingsFile?: string): string;
+export declare function buildClaudeCmd(sessionId: string, permissionMode?: string, settingsFile?: string, effortLevel?: string): string;
 /**
  * Login-shell argv (§5, R1.3). The `-lc` flag is MANDATORY: node-pty's `posix_spawnp`
  * does not execute the `claude` npm launcher's `#!/usr/bin/env node` shebang, so the
  * launcher must run *through* a login shell. (The compiled native-binary is the only
  * thing that could be spawned directly — §5 / IMPLEMENTACAO-FORK-ACP.md §17.)
  */
-export declare function buildSpawnArgv(sessionId: string, planMode?: boolean, settingsFile?: string): [string, string];
+export declare function buildSpawnArgv(sessionId: string, permissionMode?: string, settingsFile?: string, effortLevel?: string): [string, string];
 /** Options for {@link spawnClaudePty}. */
 export interface SpawnPtyOptions {
     /** Host working directory the TUI runs in; passed straight through to the PTY (§5). */
@@ -65,11 +70,16 @@ export interface SpawnPtyOptions {
      */
     spawn?: typeof pty.spawn;
     /**
-     * When true, adds `--permission-mode plan` to the spawn command (story 029 / R4.1).
-     * Prefer this over the interactive Shift+Tab cycle (`\x1b[Z`), which is the §5-appendix
-     * UNTESTED fallback and is documented, not wired as primary (R4.2/R4.3).
+     * Story 046 (R3.2): a non-"default" permission mode adds `--permission-mode <mode>` to the spawn
+     * command (generalizes the story-029 planMode=plan seam). `"plan"` reproduces the old planMode
+     * path. Interactive-only — adds no `-p`/`stream-json`; billing stays subscription `cli`.
+     */
+    permissionMode?: string;
+    /**
+     * Story 046 (R2.2): a non-"default" reasoning effort adds `--effort <level>` to the spawn command
+     * (Probe B verdict — effort has no live mid-session path, so it is seeded/re-spawned). Interactive-only.
      */
-    planMode?: boolean;
+    effortLevel?: string;
     /**
      * Story 034 (§9 hybrid gate): absolute path of the per-session SCRATCH settings file
      * carrying the fork's `PreToolUse` hook; appended as `--settings "<file>"`. The file

package/dist/engine-pty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-pty.d.ts","sourceRoot":"","sources":["../src/engine-pty.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQrC;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,8GAKzB,CAAC;AAEX;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACxD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAWpC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CASrF;AAED,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAE9F;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAKR;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,MAAM,GACpB,CAAC,MAAM,EAAE,MAAM,CAAC,CAElB;AAED,0CAA0C;AAC1C,MAAM,WAAW,eAAe;IAC9B,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,kFAAkF;AAClF,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,2BAA2B;IAC3B,GAAG,EAAE,IAAI,CAAC;CACX;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,CA+BrE;AA6BD,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,WAAS,CAAC;AAEtC;;;GAGG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,UAAU,CACxB,CAAC,EAAE,IAAI,EACP,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,KAAK,IAAqC,GAC9E,IAAI,CAON"}
+{"version":3,"file":"engine-pty.d.ts","sourceRoot":"","sources":["../src/engine-pty.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQrC;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,8GAKzB,CAAC;AAEX;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACxD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAWpC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CASrF;AAED,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAE9F;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAQR;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,CAAC,MAAM,EAAE,MAAM,CAAC,CAElB;AAED,0CAA0C;AAC1C,MAAM,WAAW,eAAe;IAC9B,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IACzB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,kFAAkF;AAClF,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,2BAA2B;IAC3B,GAAG,EAAE,IAAI,CAAC;CACX;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,CAsCrE;AA6BD,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,WAAS,CAAC;AAEtC;;;GAGG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,UAAU,CACxB,CAAC,EAAE,IAAI,EACP,IAAI,EAAE,MAAM,EACZ,QAAQ,GAAE,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,KAAK,IAAqC,GAC9E,IAAI,CAON"}

package/dist/engine-pty.js

@@ -89,11 +89,20 @@ export function resolveShell(baseEnv = process.env) {
  * billing). The path is double-quoted so it survives the `-lc` shell word-splitting.
  * Like `--permission-mode plan`, this flag changes only TUI behavior — it adds no
  * `-p`/`stream-json`, so billing stays subscription `cli` (§10).
+ *
+ * Story 046 (R3.2): the `planMode` boolean seam is GENERALIZED to a `permissionMode` string. A
+ * non-"default" mode is emitted as `--permission-mode <mode>`; "default"/undefined emit nothing;
+ * `permissionMode: "plan"` reproduces the old planMode=true path. Still interactive-only — adds no
+ * `-p`/`stream-json`, billing stays subscription `cli`.
  */
-export function buildClaudeCmd(sessionId, planMode, settingsFile) {
+export function buildClaudeCmd(sessionId, permissionMode, settingsFile, effortLevel) {
     let cmd = `claude --session-id ${sessionId}`;
-    if (planMode)
-        cmd += " --permission-mode plan";
+    if (permissionMode && permissionMode !== "default")
+        cmd += ` --permission-mode ${permissionMode}`;
+    // Story 046 (R2.2): effort is a spawn flag (Probe B verdict — no live mid-session path), so a
+    // non-"default" level is seeded/re-spawned with `--effort <level>`. Interactive-only — no credit path.
+    if (effortLevel && effortLevel !== "default")
+        cmd += ` --effort ${effortLevel}`;
     if (settingsFile)
         cmd += ` --settings "${settingsFile}"`;
     return cmd;
@@ -104,8 +113,8 @@ export function buildClaudeCmd(sessionId, planMode, settingsFile) {
  * launcher must run *through* a login shell. (The compiled native-binary is the only
  * thing that could be spawned directly — §5 / IMPLEMENTACAO-FORK-ACP.md §17.)
  */
-export function buildSpawnArgv(sessionId, planMode, settingsFile) {
-    return ["-lc", buildClaudeCmd(sessionId, planMode, settingsFile)];
+export function buildSpawnArgv(sessionId, permissionMode, settingsFile, effortLevel) {
+    return ["-lc", buildClaudeCmd(sessionId, permissionMode, settingsFile, effortLevel)];
 }
 /**
  * Spawn the interactive `claude` TUI under a real PTY with the §5 dimensions and a
@@ -124,10 +133,10 @@ export function buildSpawnArgv(sessionId, planMode, settingsFile) {
  * process-supervisor or non-PTY spawn variant is introduced.
  */
 export function spawnClaudePty(opts) {
-    const { cwd, baseEnv = process.env, spawn = pty.spawn, planMode, settingsFile } = opts;
+    const { cwd, baseEnv = process.env, spawn = pty.spawn, permissionMode, settingsFile, effortLevel, } = opts;
     const sessionId = randomUUID(); // pre-generated → correlates to the JSONL transcript
     const shell = resolveShell(baseEnv);
-    const argv = buildSpawnArgv(sessionId, planMode, settingsFile);
+    const argv = buildSpawnArgv(sessionId, permissionMode, settingsFile, effortLevel);
     // Sanitized, subscription-billing env (§5/§10) via the single shared definition.
     const env = buildSanitizedEnv(baseEnv);
     // §10 no-spoof contract (R3.1/R3.3): the 'cli' entrypoint label MUST be produced

package/dist/model-catalog.d.ts

@@ -0,0 +1,11 @@
+import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
+/**
+ * The static curated catalog advertised to the Zed Agent Panel's `model` selector. Each `value` is a
+ * `claude` TUI alias accepted by `/model <alias>` (live) and `--model <alias>` (spawn). `default` is
+ * first and is the safe fallback. Effort-capable models (`sonnet`, `opus`) carry the metadata that
+ * surfaces the effort selector; `default`/`haiku`/`opusplan` advertise no effort levels.
+ */
+export declare const MODEL_CATALOG: ModelInfo[];
+/** The safe fallback entry, kept as a named export so callers can seed/anchor on it without a lookup. */
+export declare const DEFAULT_MODEL_INFO: ModelInfo;
+//# sourceMappingURL=model-catalog.d.ts.map

package/dist/model-catalog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAShE;;;;;GAKG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,EA8BpC,CAAC;AAEF,yGAAyG;AACzG,eAAO,MAAM,kBAAkB,EAAE,SAA4B,CAAC"}

package/dist/model-catalog.js

@@ -0,0 +1,45 @@
+/** Effort levels offered for reasoning-capable models — the SDK's `supportedEffortLevels` vocabulary. */
+const REASONING_EFFORT_LEVELS = [
+    "low",
+    "medium",
+    "high",
+];
+/**
+ * The static curated catalog advertised to the Zed Agent Panel's `model` selector. Each `value` is a
+ * `claude` TUI alias accepted by `/model <alias>` (live) and `--model <alias>` (spawn). `default` is
+ * first and is the safe fallback. Effort-capable models (`sonnet`, `opus`) carry the metadata that
+ * surfaces the effort selector; `default`/`haiku`/`opusplan` advertise no effort levels.
+ */
+export const MODEL_CATALOG = [
+    {
+        value: "default",
+        displayName: "Default",
+        description: "Use the model the claude TUI is configured with (safe fallback).",
+    },
+    {
+        value: "sonnet",
+        displayName: "Sonnet",
+        description: "Claude Sonnet — balanced speed and capability; supports reasoning effort.",
+        supportsEffort: true,
+        supportedEffortLevels: REASONING_EFFORT_LEVELS,
+    },
+    {
+        value: "opus",
+        displayName: "Opus",
+        description: "Claude Opus — highest capability; supports reasoning effort.",
+        supportsEffort: true,
+        supportedEffortLevels: REASONING_EFFORT_LEVELS,
+    },
+    {
+        value: "haiku",
+        displayName: "Haiku",
+        description: "Claude Haiku — fastest and most economical; no reasoning effort levels.",
+    },
+    {
+        value: "opusplan",
+        displayName: "Opus Plan",
+        description: "Opus while planning, Sonnet for execution (plan-mode workflow).",
+    },
+];
+/** The safe fallback entry, kept as a named export so callers can seed/anchor on it without a lookup. */
+export const DEFAULT_MODEL_INFO = MODEL_CATALOG[0];

package/dist/permissions/gate-wiring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gate-wiring.d.ts","sourceRoot":"","sources":["../../src/permissions/gate-wiring.ts"],"names":[],"mappings":"AAqCA,OAAO,EAEL,iBAAiB,EACjB,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAErF;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,EAAE,SAAS,MAAM,EAO7D,CAAC;AAQF,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED;;;+EAG+E;AAC/E,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,2DAA2D;AAC3D,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAC9C;oGACoG;AACpG,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,sEAAsE;AACtE,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,0FAA0F;AAC1F,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C;;gDAEgD;AAChD,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAI7C,2FAA2F;AAC3F,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAEjE;;0FAE0F;AAC1F,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG;QAAE,OAAO,IAAI,IAAI,CAAA;KAAE,CAAC;CAC1D;AAED,2FAA2F;AAC3F,MAAM,WAAW,kBAAkB;IACjC,gGAAgG;IAChG,MAAM,EAAE,gBAAgB,CAAC;IACzB,gGAAgG;IAChG,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,gGAAgG;IAChG,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uFAAuF;IACvF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6CAA6C;IAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,+FAA+F;AAC/F,MAAM,WAAW,WAAW;IAC1B,mGAAmG;IACnG,IAAI,EAAE,MAAM,CAAC;IACb,kGAAkG;IAClG,YAAY,EAAE,MAAM,CAAC;IACrB;mGAC+F;IAC/F,UAAU,EAAE,iBAAiB,CAAC;IAC9B;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACzD;oFACgF;IAChF,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B;8EAC0E;IAC1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,0CAA0C;IAC1C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AA2RD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAIrF"}
+{"version":3,"file":"gate-wiring.d.ts","sourceRoot":"","sources":["../../src/permissions/gate-wiring.ts"],"names":[],"mappings":"AAqCA,OAAO,EAEL,iBAAiB,EACjB,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAErF;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,EAAE,SAAS,MAAM,EAO7D,CAAC;AAQF,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED;;;+EAG+E;AAC/E,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,2DAA2D;AAC3D,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAC9C;oGACoG;AACpG,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,sEAAsE;AACtE,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C,0FAA0F;AAC1F,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C;;gDAEgD;AAChD,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAI7C,2FAA2F;AAC3F,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAMjE;;0FAE0F;AAC1F,MAAM,WAAW,OAAQ,SAAQ,SAAS;IACxC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG;QAAE,OAAO,IAAI,IAAI,CAAA;KAAE,CAAC;CAC1D;AAED,2FAA2F;AAC3F,MAAM,WAAW,kBAAkB;IACjC,gGAAgG;IAChG,MAAM,EAAE,gBAAgB,CAAC;IACzB,gGAAgG;IAChG,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,gGAAgG;IAChG,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uFAAuF;IACvF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6CAA6C;IAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,+FAA+F;AAC/F,MAAM,WAAW,WAAW;IAC1B,mGAAmG;IACnG,IAAI,EAAE,MAAM,CAAC;IACb,kGAAkG;IAClG,YAAY,EAAE,MAAM,CAAC;IACrB;mGAC+F;IAC/F,UAAU,EAAE,iBAAiB,CAAC;IAC9B;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACzD;oFACgF;IAChF,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B;8EAC0E;IAC1E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,0CAA0C;IAC1C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAqSD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAIrF"}

package/dist/permissions/gate-wiring.js

@@ -83,6 +83,9 @@ export const DEFAULT_CLOSE_TIMEOUT_MS = 2000;
 const OUTPUT_TAIL_CAP = 16384;
 /** Filename prefix of the per-session scratch settings file (diagnosable in `ls /tmp`). */
 export const SCRATCH_SETTINGS_PREFIX = "fork-acp-gate-settings-";
+/** Story 046 (R3) — the file-edit tools that `acceptEdits` auto-allows, mirroring claude's native
+ *  acceptEdits semantics (edits proceed without prompting; every other tool still asks). */
+const EDIT_TOOLS = new Set(["Write", "Edit", "MultiEdit", "NotebookEdit"]);
 const defaultSchedule = (fn, ms) => {
     setTimeout(fn, ms);
 };
@@ -161,6 +164,17 @@ class SessionGateImpl {
     async decide(call) {
         if (this.torndown)
             return "deny"; // a hook racing teardown is never approved
+        // === Story 046 (R3) — honor the live permission mode BEFORE relaying to Zed. =================
+        // The hook payload carries the current mode (probe-d confirmed `permission_mode` matches the
+        // selected mode in acceptEdits/bypassPermissions). Without this branch the gate raises
+        // session/request_permission for EVERY tool, overriding the panel's mode selector — the user sees
+        // a Zed prompt in every mode, even bypass. bypassPermissions auto-allows ALL tools; acceptEdits
+        // auto-allows edit-class tools; default/plan/auto/dontAsk fall through to the ACP relay (ask Zed).
+        // No #52822 sweep on this path: these modes make claude auto-proceed, so no native prompt renders.
+        if (call.permissionMode === "bypassPermissions")
+            return "allow";
+        if (call.permissionMode === "acceptEdits" && EDIT_TOOLS.has(call.toolName))
+            return "allow";
         // Kick the pump so the freshest JSONL (carrying this call's `tool_use` line) is re-read NOW.
         try {
             this.nudge?.();

package/package.json

@@ -3,8 +3,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.1",
-  "description": "ACP agent that drives the Claude Code subscription TUI over a PTY, rendering Claude Code threads in Zed and other ACP-compatible clients.",
+  "version": "0.3.0",
+  "description": "Run the official Claude Code TUI in Zed's agent panel on your Claude Pro/Max subscription — an ACP-over-PTY bridge created for Anthropic's June 2026 billing split.",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "bin": {
@@ -60,20 +60,20 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agentclientprotocol/sdk": "0.25.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.166",
+    "@anthropic-ai/claude-agent-sdk": "0.3.175",
     "node-pty": "1.1.0",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.101.0",
+    "@anthropic-ai/sdk": "0.104.1",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.9.2",
-    "@typescript-eslint/eslint-plugin": "8.60.1",
-    "@typescript-eslint/parser": "8.60.1",
+    "@types/node": "25.9.3",
+    "@typescript-eslint/eslint-plugin": "8.61.0",
+    "@typescript-eslint/parser": "8.61.0",
     "eslint": "10.4.1",
     "eslint-config-prettier": "10.1.8",
     "globals": "17.6.0",
-    "prettier": "3.8.3",
+    "prettier": "3.8.4",
     "ts-node": "10.9.2",
     "typescript": "6.0.3"
   }