@prismatic-io/lux 0.0.2-preview.3 → 0.0.2-preview.32

package/lib/drivers/claude-code/index.js

@@ -1,12 +1,17 @@
-import { cp, mkdir, readdir, realpath, rm, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { dirname, join, resolve, sep } from "node:path";
+import { cp, mkdir, realpath, rm, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
 import { temporaryDirectory } from "tempy";
 import { z } from "zod";
-import { DEFAULT_CLAUDE_MODEL, discoverCliVersion, exec, TypedEmitter, } from "../../core/index.js";
+import { agentEnvironment, InheritEnvironmentSchema } from "../../core/agent-environment.js";
+import { DurationSchema, durationMs } from "../../core/duration.js";
+import { applyCatalogEffort, claudeCodeCatalog, DEFAULT_CLAUDE_MODEL, defineDriver, discoverCliVersion, selectModelAndReasoningEffort, TypedEmitter, } from "../../core/index.js";
+import { copyRegularFileNoFollow } from "../../core/secure-copy.js";
 import { walkArtifacts } from "../shared/artifacts.js";
-import { copyRegularFileNoFollow } from "../shared/secure-copy.js";
+import { claudeConfigRoot, claudeUserBehaviorHash, configuredClaudeSourceHashes, } from "../shared/experiment-behavior.js";
+import { prepareClaudeExperimentConfig } from "../shared/experiment-policy.js";
 import { subprocessDriver } from "../subprocess/index.js";
+import { runDeferredProcess } from "./deferred-process.js";
+import { isolatedLaunch } from "./isolation.js";
 import { ClaudeCodeLineSchema, makeParseEvent } from "./parse-events.js";
 const LUX_BOOKKEEPING_FILES = new Set([
     "events.jsonl",
@@ -19,12 +24,23 @@ const LUX_BOOKKEEPING_FILES = new Set([
 const commandName = (command) => command.split(/[\\/]/).at(-1) ?? command;
 const ISOLATION_RESERVED_ARGS = new Set([
     "--add-dir",
+    "--dangerously-skip-permissions",
+    "--allow-dangerously-skip-permissions",
+    "--permission-mode",
+    "--teleport",
+    "--continue",
+    "-c",
+    "--resume",
+    "-r",
+    "--fork-session",
+    "--session-id",
     "--agent",
     "--agents",
     "--bare",
     "--mcp-config",
     "--no-session-persistence",
     "--plugin-dir",
+    "--plugin-dir-no-mcp",
     "--plugin-url",
     "--safe-mode",
     "--setting-sources",
@@ -39,6 +55,8 @@ const IsolationSchema = z
      * and `addDirs` paths are included automatically.
      */
     allowRead: z.array(z.string()).default([]),
+    /** Additional protected trees and files, including other evaluation runs. */
+    denyRead: z.array(z.string()).optional(),
 })
     .strict();
 export const ClaudeCodeDriverConfigSchema = z
@@ -50,15 +68,15 @@ export const ClaudeCodeDriverConfigSchema = z
     cwdMode: z.enum(["artifacts", "runDir"]).default("artifacts"),
     cwd: z.string().optional(),
     env: z.record(z.string(), z.string()).optional(),
+    inheritEnv: InheritEnvironmentSchema.default(true),
     /** Low-cost by default; choose a larger model explicitly when needed. */
     model: z.string().min(1).default(DEFAULT_CLAUDE_MODEL),
-    /** Claude effort level; low by default to control eval cost. */
-    effort: z.enum(["low", "medium", "high", "max"]).default("low"),
+    reasoningEffort: z.enum(claudeCodeCatalog.efforts).optional(),
     /** Permission mode passed to claude. */
     permissionMode: z
         .enum(["acceptEdits", "auto", "bypassPermissions", "default", "dontAsk", "manual", "plan"])
         .optional(),
-    /** Additional tools pre-approved beyond Lux's minimal coding and ask tools. */
+    /** Additional pre-approvals; auto mode omits the baseline coding-tool grants. */
     allowedTools: z.array(z.string().min(1)).optional(),
     /** Plugin directories to load (`--plugin-dir`): skills, subagents, commands, hooks. */
     pluginDirs: z.array(z.string()).optional(),
@@ -83,15 +101,32 @@ export const ClaudeCodeDriverConfigSchema = z
      * when a weaker model asks in text instead of calling `askToolName`.
      */
     textQuestionFallback: z.boolean().default(false),
-    /** Per-event idle timeout. */
-    idleTimeoutMs: z.number().positive().default(600_000),
+    /** Maximum silence between recognized protocol events; excludes answerer wait time. */
+    idleTimeout: DurationSchema.default("10 minutes"),
+    /** Optional elapsed-time cap per defer-resume CLI invocation, regardless of activity. */
+    turnTimeout: DurationSchema.optional(),
     /** Cap on outstanding interrupts before the driver aborts. */
     maxInterrupts: z.number().positive().default(20),
 })
     .strict()
     .superRefine((config, ctx) => {
+    if (config.turnTimeout !== undefined && config.interactionMode !== "defer-resume") {
+        ctx.addIssue({
+            code: "custom",
+            path: ["turnTimeout"],
+            message: "turnTimeout requires defer-resume mode",
+        });
+    }
     if (config.interactionMode === "defer-resume") {
-        const reserved = config.extraArgs?.find((arg) => ["--input-format", "--no-session-persistence", "--resume", "-r", "--settings"].some((name) => arg === name || arg.startsWith(`${name}=`)));
+        const reserved = config.extraArgs?.find((arg) => [
+            "--input-format",
+            "--no-session-persistence",
+            "--resume",
+            "-r",
+            "--settings",
+            "--permission-prompt-tool",
+            "--permission-prompts",
+        ].some((name) => arg === name || arg.startsWith(`${name}=`)));
         if (reserved) {
             ctx.addIssue({
                 code: "custom",
@@ -109,11 +144,11 @@ export const ClaudeCodeDriverConfigSchema = z
             message: "isolation requires permissionMode to be omitted or 'default'; Claude Code forces default mode while subprocess environment scrubbing is enabled",
         });
     }
-    if (config.interactionMode === "defer-resume") {
+    if (config.interactionMode === "defer-resume" && config.pluginDirs?.length) {
         ctx.addIssue({
             code: "custom",
-            path: ["interactionMode"],
-            message: "defer-resume requires session persistence and is incompatible with isolation",
+            path: ["pluginDirs"],
+            message: "isolated defer-resume cannot load plugin hooks; use addDirs for read-only skill files",
         });
     }
     if (config.cwd || config.cwdMode !== "artifacts") {
@@ -131,7 +166,8 @@ export const ClaudeCodeDriverConfigSchema = z
             message: `isolation owns ${reserved}; configure isolation instead`,
         });
     }
-});
+})
+    .transform(applyCatalogEffort(claudeCodeCatalog));
 const buildArgs = (config) => {
     const out = [
         "--print",
@@ -141,7 +177,7 @@ const buildArgs = (config) => {
         "stream-json",
         "--verbose",
     ];
-    out.push("--model", config.model, "--effort", config.effort);
+    out.push("--model", config.model, ...effortArgs(config));
     if (config.permissionMode)
         out.push("--permission-mode", config.permissionMode);
     out.push("--allowed-tools", ...allowedTools(config));
@@ -171,12 +207,26 @@ const deferredHookSettings = (config, hookPath) => ({
         ],
     },
 });
+const effortArgs = (config) => config.reasoningEffort ? ["--effort", config.reasoningEffort] : [];
 const allowedTools = (config) => [
-    ...new Set([...MINIMAL_ALLOWED_TOOLS, config.askToolName, ...(config.allowedTools ?? [])]),
+    ...new Set([
+        ...(config.permissionMode === "auto" ? [] : MINIMAL_ALLOWED_TOOLS),
+        config.askToolName,
+        ...(config.allowedTools ?? []),
+    ]),
 ];
-const buildDeferredArgs = (config, hookPath, sessionId) => {
-    const out = ["--print", "--output-format", "stream-json", "--verbose"];
-    out.push("--model", config.model, "--effort", config.effort);
+const buildDeferredArgs = (config, hookPath, sessionId, isolation) => {
+    // Native print mode removes AskUserQuestion unless a host permission surface exists.
+    // The trusted PreToolUse hook handles the question before that surface is consulted.
+    const out = [
+        "--print",
+        "--output-format",
+        "stream-json",
+        "--verbose",
+        "--permission-prompt-tool",
+        "stdio",
+    ];
+    out.push("--model", config.model, ...effortArgs(config));
     if (config.permissionMode)
         out.push("--permission-mode", config.permissionMode);
     out.push("--allowed-tools", ...allowedTools(config));
@@ -184,9 +234,16 @@ const buildDeferredArgs = (config, hookPath, sessionId) => {
         out.push("--plugin-dir", dir);
     if (config.agent)
         out.push("--agent", config.agent);
-    for (const dir of config.addDirs ?? [])
-        out.push("--add-dir", dir);
-    out.push("--settings", JSON.stringify(deferredHookSettings(config, hookPath)));
+    if (!isolation)
+        for (const dir of config.addDirs ?? [])
+            out.push("--add-dir", dir);
+    out.push("--settings", JSON.stringify({
+        ...isolation?.settings,
+        ...deferredHookSettings(config, hookPath),
+        ...(isolation ? { disableAllHooks: false } : {}),
+    }));
+    if (isolation)
+        out.push("--strict-mcp-config", "--setting-sources", "");
     if (sessionId)
         out.push("--resume", sessionId);
     if (config.extraArgs)
@@ -242,163 +299,6 @@ process.stdin.on("end", () => {
   }));
 });
 `;
-const isWithin = (parent, child) => child === parent || child.startsWith(`${parent}${sep}`);
-const permissionPath = (tool, path, directory) => {
-    const absolute = resolve(path).replaceAll("\\", "/");
-    return `${tool}(//${absolute.replace(/^\/+/, "")}${directory ? "/**" : ""})`;
-};
-/**
- * Permission rules have no "allow inside deny" override, so isolate a root by
- * denying every sibling around explicitly allowed descendants.
- */
-const carvedPermissionDenials = async (tool, root, allowed) => {
-    const normalizedRoot = resolve(root);
-    const inside = allowed
-        .map((path) => resolve(path))
-        .filter((path) => isWithin(normalizedRoot, path));
-    if (inside.some((path) => path === normalizedRoot))
-        return [];
-    if (inside.length === 0)
-        return [permissionPath(tool, normalizedRoot, true)];
-    const out = [];
-    const walk = async (dir) => {
-        const entries = await readdir(dir, { withFileTypes: true });
-        entries.sort((a, b) => a.name.localeCompare(b.name));
-        for (const entry of entries) {
-            const path = join(dir, entry.name);
-            if (inside.some((allowedPath) => allowedPath === path))
-                continue;
-            if (entry.isDirectory() && inside.some((allowedPath) => isWithin(path, allowedPath))) {
-                await walk(path);
-            }
-            else {
-                out.push(permissionPath(tool, path, entry.isDirectory()));
-            }
-        }
-    };
-    await walk(normalizedRoot);
-    return out;
-};
-const carvedReadDenials = (root, allowed) => carvedPermissionDenials("Read", root, allowed);
-const existingRealpaths = async (paths) => {
-    const found = await Promise.all(paths.map(async (path) => {
-        try {
-            return await realpath(resolve(path));
-        }
-        catch {
-            return null;
-        }
-    }));
-    return [...new Set(found.filter((path) => path !== null))];
-};
-const compactRoots = (paths) => [...new Set(paths)]
-    .sort((a, b) => a.length - b.length || a.localeCompare(b))
-    .filter((path, index, roots) => !roots.slice(0, index).some((root) => isWithin(root, path)));
-const isolatedLaunch = async (config, ctx, workspace) => {
-    const homeRoots = await existingRealpaths([
-        homedir(),
-        ...(config.env?.HOME ? [config.env.HOME] : []),
-    ]);
-    const sensitiveHomePaths = homeRoots.flatMap((home) => [
-        join(home, ".aws"),
-        join(home, ".config", "gcloud"),
-        join(home, ".docker", "config.json"),
-        join(home, ".git-credentials"),
-        join(home, ".gnupg"),
-        join(home, ".kube"),
-        join(home, ".netrc"),
-        join(home, ".npmrc"),
-        join(home, ".ssh"),
-    ]);
-    const protectedRoots = await existingRealpaths([
-        ...(ctx.runsRoot ? [ctx.runsRoot] : [ctx.runDir]),
-        ...(process.env.CLAUDE_CONFIG_DIR ? [process.env.CLAUDE_CONFIG_DIR] : []),
-        ...(config.env?.CLAUDE_CONFIG_DIR ? [config.env.CLAUDE_CONFIG_DIR] : []),
-        ...sensitiveHomePaths,
-        ...homeRoots.flatMap((home) => [
-            join(home, ".claude", "projects"),
-            join(home, ".claude", "memory"),
-        ]),
-    ]);
-    const denyRoots = compactRoots(protectedRoots);
-    const allowed = compactRoots(await existingRealpaths([
-        ...(config.pluginDirs ?? []),
-        ...(config.addDirs ?? []),
-        ...(config.isolation?.allowRead ?? []),
-    ]));
-    const overlapping = allowed.find((path) => (path !== workspace && isWithin(path, workspace)) ||
-        denyRoots.some((root) => isWithin(path, root)) ||
-        protectedRoots.some((root) => isWithin(root, path)));
-    if (overlapping) {
-        throw new Error(`isolation read carve-out overlaps a protected boundary: ${overlapping}`);
-    }
-    const readOnlyRoots = allowed.filter((path) => !isWithin(workspace, path));
-    const editDenyRoots = compactRoots([...denyRoots, ...readOnlyRoots]);
-    const [readDenials, writeDenials] = await Promise.all([
-        Promise.all(denyRoots.map((root) => carvedPermissionDenials("Read", root, allowed))),
-        Promise.all(editDenyRoots.map((root) => carvedPermissionDenials("Edit", root, []))),
-    ]);
-    const denyRules = [...readDenials.flat(), ...writeDenials.flat()];
-    const sandboxSettings = {
-        disableAllHooks: true,
-        permissions: { deny: denyRules },
-        sandbox: {
-            enabled: true,
-            failIfUnavailable: true,
-            allowUnsandboxedCommands: false,
-            filesystem: {
-                denyRead: denyRoots,
-                denyWrite: denyRoots,
-                allowRead: allowed,
-            },
-            // Filesystem isolation does not disable the live docs and package
-            // registry access that cases are intended to exercise.
-            network: { allowedDomains: ["*"] },
-        },
-    };
-    const stateDir = join(workspace, ".lux-claude");
-    const tmpDir = join(stateDir, "tmp");
-    const cacheDir = join(stateDir, "cache");
-    const pluginCacheDir = join(stateDir, "plugins");
-    await Promise.all([
-        mkdir(tmpDir, { recursive: true }),
-        mkdir(cacheDir, { recursive: true }),
-        mkdir(pluginCacheDir, { recursive: true }),
-    ]);
-    return {
-        args: [
-            // --add-dir also discovers skills and agents. Isolation treats addDirs
-            // as data-only read grants, so expose them through the filesystem policy
-            // above without passing the discovery flag to Claude.
-            ...buildArgs({ ...config, addDirs: undefined }),
-            "--no-session-persistence",
-            "--strict-mcp-config",
-            // Authentication is independent of filesystem setting sources. Keep
-            // these empty instead of using --safe-mode: safe mode would also disable
-            // the explicitly requested plugin's skills, commands, and agents.
-            "--setting-sources",
-            "",
-            "--settings",
-            JSON.stringify(sandboxSettings),
-        ],
-        env: {
-            ...(config.env ?? {}),
-            CLAUDE_CODE_DISABLE_AUTO_MEMORY: "1",
-            CLAUDE_CODE_DISABLE_CLAUDE_MDS: "1",
-            CLAUDE_CODE_SKIP_PROMPT_HISTORY: "1",
-            CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1",
-            CLAUDE_CODE_SUBPROCESS_ENV_SCRUB: "1",
-            CLAUDE_CODE_AUTO_CONNECT_IDE: "false",
-            CLAUDE_CODE_PLUGIN_CACHE_DIR: pluginCacheDir,
-            CLAUDE_CODE_DISABLE_OFFICIAL_MARKETPLACE_AUTOINSTALL: "1",
-            DISABLE_AUTOUPDATER: "1",
-            TMPDIR: tmpDir,
-            XDG_CACHE_HOME: cacheDir,
-            npm_config_cache: join(cacheDir, "npm"),
-            BUN_INSTALL_CACHE_DIR: join(cacheDir, "bun"),
-        },
-    };
-};
 const formatPrompt = (text) => `${JSON.stringify({
     type: "user",
     message: { role: "user", content: [{ type: "text", text }] },
@@ -426,15 +326,15 @@ const formatAnswer = (answer) => {
 class ClaudeCodeDriverImpl {
     inner = null;
     emitter = new TypedEmitter();
-    // The attach closure captures its (event, handler) pair with narrow types,
-    // so the queue stays type-safe without per-entry casts; the identity pair
-    // rides along so off() can drop a queued attach symmetrically.
+    // Typed closures retain handler identity so off() can detach queued listeners.
     pendingAttach = [];
     config;
     collectDir = null;
     artifactsDir = null;
     runDir = null;
     isolatedWorkspace = null;
+    isolationControlDir = null;
+    deferredIsolation;
     deferredContext = null;
     deferredCwd = null;
     deferredHookPath = null;
@@ -448,6 +348,7 @@ class ClaudeCodeDriverImpl {
     deferredInterrupts = 0;
     deferredTerminal = false;
     deferredTurn = null;
+    deferredAbort = new AbortController();
     constructor(config) {
         this.config = config;
     }
@@ -479,15 +380,20 @@ class ClaudeCodeDriverImpl {
         }
         let cwd = this.config.cwd ?? (this.config.cwdMode === "artifacts" ? ctx.artifactsDir : ctx.runDir);
         let args = buildArgs(this.config);
-        let env = this.config.env;
+        let env = agentEnvironment(process.env, this.config.inheritEnv, this.config.env);
         if (this.config.isolation) {
-            const workspace = await realpath(temporaryDirectory({ prefix: "lux-claude-workspace-" }));
-            await cp(ctx.artifactsDir, workspace, { recursive: true });
-            this.isolatedWorkspace = workspace;
-            cwd = workspace;
-            const launch = await isolatedLaunch(this.config, ctx, workspace);
-            args = launch.args;
-            env = launch.env;
+            const launch = await this.prepareIsolation(ctx);
+            cwd = this.isolatedWorkspace;
+            args = [
+                ...buildArgs({ ...this.config, addDirs: undefined }),
+                "--no-session-persistence",
+                "--strict-mcp-config",
+                "--setting-sources",
+                "",
+                "--settings",
+                JSON.stringify(launch.settings),
+            ];
+            env = agentEnvironment(process.env, this.config.inheritEnv, launch.env);
         }
         this.collectDir = cwd;
         this.artifactsDir = ctx.artifactsDir;
@@ -500,11 +406,12 @@ class ClaudeCodeDriverImpl {
             args,
             cwd,
             env,
+            inheritEnv: false,
             protocol: "custom",
             parseEvent: makeParseEvent(this.config, cliVersion),
             formatAnswer,
             formatPrompt,
-            idleTimeoutMs: this.config.idleTimeoutMs,
+            idleTimeout: this.config.idleTimeout,
             maxInterrupts: this.config.maxInterrupts,
         });
         for (const queued of this.pendingAttach)
@@ -534,10 +441,8 @@ class ClaudeCodeDriverImpl {
     async collect() {
         if (!this.collectDir)
             return [];
-        // A terminal protocol event can arrive before the CLI and its descendants
-        // have exited. Quiesce the whole process tree before walking/copying files
-        // so it cannot swap a checked regular file into a symlink.
-        await this.inner?.close();
+        // Stop descendants before collecting: terminal events can precede their exit.
+        await this.quiesce();
         const artifacts = await walkArtifacts(this.collectDir);
         if (this.isolatedWorkspace && this.artifactsDir) {
             await Promise.all(artifacts.map(async (artifact) => {
@@ -548,21 +453,23 @@ class ClaudeCodeDriverImpl {
             }));
             return artifacts;
         }
-        // Consumers resolve artifact paths against <runDir>/artifacts by default;
-        // a walk of any other root must say what its paths are relative to, or
-        // the judge and file assertions silently miss every file.
+        // Assertions need an explicit root for artifacts collected outside artifactsDir.
         if (this.collectDir === this.artifactsDir)
             return artifacts;
         const root = this.collectDir;
-        // Walking the run dir itself would list Lux's own bookkeeping as agent
-        // work product; only top-level files can collide with these names.
+        // Top-level bookkeeping in runDir is not agent work product.
         const withRoot = artifacts.map((a) => ({ ...a, root }));
         return root === this.runDir
             ? withRoot.filter((a) => !LUX_BOOKKEEPING_FILES.has(a.path))
             : withRoot;
     }
+    async verificationWorkspace() {
+        await this.quiesce();
+        return this.isolatedWorkspace ?? undefined;
+    }
     async quiesce() {
         if (this.config.interactionMode === "defer-resume") {
+            this.deferredAbort.abort();
             await this.deferredTurn;
             return;
         }
@@ -571,6 +478,7 @@ class ClaudeCodeDriverImpl {
     async close() {
         try {
             if (this.config.interactionMode === "defer-resume") {
+                await this.quiesce();
                 this.emitter.removeAllListeners();
                 if (this.deferredHookPath) {
                     await rm(this.deferredHookPath, { force: true });
@@ -582,14 +490,25 @@ class ClaudeCodeDriverImpl {
             }
         }
         finally {
-            if (this.isolatedWorkspace) {
-                await rm(this.isolatedWorkspace, { recursive: true, force: true });
-                this.isolatedWorkspace = null;
-            }
+            await Promise.all([this.isolatedWorkspace, this.isolationControlDir]
+                .filter((path) => path !== null)
+                .map((path) => rm(path, { recursive: true, force: true })));
+            this.isolatedWorkspace = null;
+            this.isolationControlDir = null;
         }
     }
+    async prepareIsolation(ctx) {
+        this.isolatedWorkspace = await realpath(temporaryDirectory({ prefix: "lux-claude-workspace-" }));
+        this.isolationControlDir = await realpath(temporaryDirectory({ prefix: "lux-claude-control-" }));
+        await cp(ctx.artifactsDir, this.isolatedWorkspace, { recursive: true });
+        return isolatedLaunch(this.config, ctx, this.isolatedWorkspace, this.isolationControlDir);
+    }
     async startDeferred(ctx) {
-        const cwd = this.config.cwd ?? (this.config.cwdMode === "artifacts" ? ctx.artifactsDir : ctx.runDir);
+        let cwd = this.config.cwd ?? (this.config.cwdMode === "artifacts" ? ctx.artifactsDir : ctx.runDir);
+        if (this.config.isolation) {
+            this.deferredIsolation = await this.prepareIsolation(ctx);
+            cwd = this.isolatedWorkspace;
+        }
         this.collectDir = cwd;
         this.artifactsDir = ctx.artifactsDir;
         this.runDir = ctx.runDir;
@@ -639,56 +558,45 @@ class ClaudeCodeDriverImpl {
         else if (resumeWithAnswer && answer?.kind === "ask") {
             input = { input: answer.text };
         }
-        const result = await exec(this.config.command, buildDeferredArgs(this.config, hookPath, this.deferredSessionId ?? undefined), {
+        const terminal = await runDeferredProcess({
+            command: this.config.command,
+            args: buildDeferredArgs(this.config, hookPath, this.deferredSessionId ?? undefined, this.deferredIsolation),
             cwd,
-            env: {
-                ...process.env,
+            env: agentEnvironment(process.env, this.config.inheritEnv, {
+                ...(this.deferredIsolation?.env ?? this.config.env),
                 LUX_RUN_DIR: ctx.runDir,
                 LUX_ARTIFACTS_DIR: ctx.artifactsDir,
-                ...this.config.env,
                 ...(answer ? { LUX_CLAUDE_DEFERRED_ANSWER: JSON.stringify(answer) } : {}),
-            },
+            }),
             ...input,
-            timeoutMs: this.config.idleTimeoutMs,
-            signal: ctx.abortSignal,
-        });
-        if (result.stderr.trim()) {
-            for (const line of result.stderr.trimEnd().split("\n")) {
-                process.stderr.write(`[claude-code] ${line}\n`);
-            }
-        }
-        for (const line of result.stdout.split("\n")) {
-            if (!line.trim())
-                continue;
-            try {
-                const envelope = ClaudeCodeLineSchema.safeParse(JSON.parse(line));
-                if (envelope.success &&
-                    (envelope.data.type === "system" || envelope.data.type === "result") &&
-                    envelope.data.session_id) {
-                    this.deferredSessionId = envelope.data.session_id;
+            idleTimeoutMs: durationMs(this.config.idleTimeout),
+            ...(this.config.turnTimeout === undefined
+                ? {}
+                : { turnTimeoutMs: durationMs(this.config.turnTimeout) }),
+            signal: AbortSignal.any([ctx.abortSignal, this.deferredAbort.signal]),
+            parse: (line) => {
+                try {
+                    const envelope = ClaudeCodeLineSchema.safeParse(JSON.parse(line));
+                    if (envelope.success &&
+                        (envelope.data.type === "system" || envelope.data.type === "result") &&
+                        envelope.data.session_id) {
+                        this.deferredSessionId = envelope.data.session_id;
+                    }
                 }
-            }
-            catch {
-                // The parser below deliberately ignores unmodeled output.
-            }
-            const parsed = parse(line);
-            if (!parsed)
-                continue;
-            for (const event of Array.isArray(parsed) ? parsed : [parsed]) {
-                await this.dispatchDeferred(event);
-            }
-        }
-        if (result.timedOut) {
-            throw new Error(`no event for ${this.config.idleTimeoutMs}ms`);
-        }
-        if (result.signal)
-            throw new Error(`claude exited from signal ${result.signal}`);
-        if (result.exitCode !== 0 && !this.deferredTerminal) {
-            throw new Error(`claude exited ${result.exitCode}`);
-        }
-        if (!resuming && this.deferredReady) {
-            throw new Error("claude exited before ready");
+                catch {
+                    // The parser below deliberately ignores unmodeled output.
+                }
+                return parse(line);
+            },
+            onEvent: (event) => this.dispatchDeferred(event),
+        });
+        if (this.deferredReady) {
+            throw new Error(terminal?.tag === "error" ? terminal.error.reason : "claude exited before ready");
         }
+        if (terminal)
+            await this.dispatchDeferred(terminal);
+        if (!terminal)
+            throw new Error("claude exited before a terminal result");
     }
     async dispatchDeferred(event) {
         if (this.deferredTerminal)
@@ -769,11 +677,37 @@ class ClaudeCodeDriverImpl {
         });
     }
 }
-export const claudeCodeDriver = {
+export const claudeCodeDriver = defineDriver({
     name: "claude-code",
     configSchema: ClaudeCodeDriverConfigSchema,
+    runtime: (config) => ({
+        commands: [config.command],
+        capabilities: {
+            interactive: true,
+            "tool-calls": true,
+            "tool-results": true,
+            artifacts: true,
+            subagents: true,
+            usage: true,
+            cost: true,
+            isolation: Boolean(config.isolation),
+        },
+    }),
+    experiment: {
+        version: "1",
+        prepare: prepareClaudeExperimentConfig,
+        identity: async (config, { rootDir }) => {
+            const configRoot = claudeConfigRoot({ config });
+            return {
+                configRoot,
+                userBehaviorHash: await claudeUserBehaviorHash(configRoot),
+                sources: await configuredClaudeSourceHashes({ name: "claude-code", config }, rootDir),
+            };
+        },
+    },
+    selectHarness: selectModelAndReasoningEffort,
     create: (config) => new ClaudeCodeDriverImpl(config),
-};
+});
 // Internal exports for testing
-export { buildArgs, buildDeferredArgs, carvedReadDenials, copyRegularFileNoFollow, formatAnswer, formatPrompt, makeParseEvent, walkArtifacts, };
+export { buildArgs, buildDeferredArgs, copyRegularFileNoFollow, formatAnswer, formatPrompt, makeParseEvent, walkArtifacts, };
 //# sourceMappingURL=index.js.map