subharness 0.0.4 → 0.0.7

package/dist/adapters/claude-worker.js

@@ -0,0 +1,126 @@
+import { parentPort } from "node:worker_threads";
+import { createSdkMcpServer, query, resolveSettings, } from "@anthropic-ai/claude-agent-sdk";
+import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { ClaudeInput } from "./claude-input.js";
+import { ClaudeRemoteProcess } from "./claude-worker-process.js";
+if (!parentPort)
+    throw new Error("Claude worker requires a parent port.");
+const port = parentPort;
+let nextId = 1;
+const pending = new Map();
+const input = new ClaudeInput();
+let native;
+let processProxy;
+function hostRequest(operation, value) {
+    const id = nextId++;
+    return new Promise((resolve, reject) => {
+        pending.set(id, { resolve, reject });
+        port.postMessage({ type: "host-request", id, operation, value });
+    });
+}
+function serializableMetadata(value) {
+    const { signal: _signal, ...metadata } = value;
+    return metadata;
+}
+function abortableHostRequest(operation, value, signal) {
+    const id = nextId++;
+    return new Promise((resolve, reject) => {
+        pending.set(id, { resolve, reject });
+        port.postMessage({ type: "host-request", id, operation, value });
+        const abort = () => port.postMessage({ type: "event", event: "hostRequestAbort", value: id });
+        signal.addEventListener("abort", abort, { once: true });
+        if (signal.aborted)
+            abort();
+    });
+}
+function mcpServer(namespace, tools) {
+    if (!tools.length)
+        return undefined;
+    // An explicit empty list enables the MCP tool capability before the worker
+    // installs descriptor-driven low-level handlers.
+    const server = createSdkMcpServer({ name: namespace, version: "1.0.0", tools: [] });
+    server.instance.server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+    server.instance.server.setRequestHandler(CallToolRequestSchema, async (request) => await hostRequest("toolCall", { name: request.params.name, input: request.params.arguments }));
+    return server;
+}
+async function start(value) {
+    const server = mcpServer(value.namespace, value.tools);
+    const options = value.options;
+    const canUseTool = async (toolName, toolInput, metadata) => await abortableHostRequest("approval", { toolName, toolInput, metadata: serializableMetadata(metadata) }, metadata.signal);
+    native = query({ prompt: input, options: {
+            ...options,
+            ...(server ? { mcpServers: { [value.namespace]: server } } : {}),
+            spawnClaudeCodeProcess(spawnOptions) {
+                processProxy = new ClaudeRemoteProcess(hostRequest, spawnOptions);
+                return processProxy;
+            },
+            canUseTool,
+            onElicitation: async (request, metadata) => await abortableHostRequest("elicitation", { request, metadata: serializableMetadata(metadata) }, metadata.signal),
+            stderr: () => { },
+        } });
+    void (async () => {
+        try {
+            for await (const message of native)
+                port.postMessage({ type: "event", event: "message", value: message });
+            port.postMessage({ type: "event", event: "end" });
+        }
+        catch {
+            port.postMessage({ type: "event", event: "failure", value: "native stream" });
+        }
+    })();
+}
+async function perform(message) {
+    switch (message.operation) {
+        case "managedSettings": {
+            const settings = await resolveSettings({ cwd: String(message.value), settingSources: ["user", "project", "local"] });
+            return settings.sources.filter(source => source.source === "managed").map(source => source.settings);
+        }
+        case "start":
+            await start(message.value);
+            return undefined;
+        case "accountInfo": return await native.accountInfo();
+        case "supportedModels": return await native.supportedModels();
+        case "getSettings": return await native.getSettings?.();
+        case "setModel": return await native.setModel?.(message.value);
+        case "interrupt": return await native.interrupt();
+        default: throw new Error("Unknown Claude worker operation.");
+    }
+}
+port.on("message", (message) => {
+    if (message.type === "host-response") {
+        const current = pending.get(message.id);
+        if (!current)
+            return;
+        pending.delete(message.id);
+        if (message.ok)
+            current.resolve(message.value);
+        else
+            current.reject(new Error("Claude host bridge failed."));
+        return;
+    }
+    if (message.type === "event") {
+        if (message.event === "input")
+            input.push(message.value);
+        else if (message.event === "inputEnd")
+            input.close();
+        else if (message.event === "close") {
+            input.close();
+            native?.close();
+        }
+        else if (message.event === "processExit") {
+            const value = message.value;
+            processProxy?.exited(value.code, value.signal);
+        }
+        else if (message.event === "processError")
+            processProxy?.failed();
+        return;
+    }
+    if (message.type !== "request")
+        return;
+    void perform(message).then(value => port.postMessage({ type: "response", id: message.id, ok: true, value }), error => {
+        const settingsUnavailable = message.operation === "getSettings" && error instanceof Error
+            && /^(?:unknown|unsupported) control request(?: subtype)?:\s*get_settings\.?$/iu.test(error.message.trim());
+        port.postMessage({ type: "response", id: message.id, ok: false, ...(settingsUnavailable ? { failure: "settings-unavailable" } : {}) });
+    });
+});
+//# sourceMappingURL=claude-worker.js.map

package/dist/adapters/claude-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-worker.js","sourceRoot":"","sources":["../../src/adapters/claude-worker.ts"],"names":[],"mappings":"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","sourcesContent":["import { parentPort } from \"node:worker_threads\";\nimport {\n  createSdkMcpServer,\n  query,\n  resolveSettings,\n  type CanUseTool,\n  type Options,\n  type SDKUserMessage,\n} from \"@anthropic-ai/claude-agent-sdk\";\nimport type { ClaudeQuery } from \"./claude.ts\";\nimport { CallToolRequestSchema, ListToolsRequestSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport { ClaudeInput } from \"./claude-input.ts\";\nimport { ClaudeRemoteProcess } from \"./claude-worker-process.ts\";\nimport type {\n  ClaudeBridgeMessage,\n  ClaudeToolDescriptor,\n  ClaudeWorkerRequest,\n} from \"./claude-worker-protocol.ts\";\n\nif (!parentPort) throw new Error(\"Claude worker requires a parent port.\");\nconst port = parentPort;\nlet nextId = 1;\nconst pending = new Map<number, {resolve(value: unknown): void; reject(error: Error): void}>();\nconst input = new ClaudeInput<SDKUserMessage>();\nlet native: ClaudeQuery | undefined;\nlet processProxy: ClaudeRemoteProcess | undefined;\n\nfunction hostRequest(operation: string, value?: unknown): Promise<unknown> {\n  const id = nextId++;\n  return new Promise((resolve, reject) => {\n    pending.set(id, {resolve, reject});\n    port.postMessage({type:\"host-request\", id, operation, value} satisfies ClaudeBridgeMessage);\n  });\n}\n\nfunction serializableMetadata(value: Record<string, unknown>): Record<string, unknown> {\n  const {signal: _signal, ...metadata} = value;\n  return metadata;\n}\n\nfunction abortableHostRequest(operation: string, value: unknown, signal: AbortSignal): Promise<unknown> {\n  const id = nextId++;\n  return new Promise((resolve, reject) => {\n    pending.set(id, {resolve, reject});\n    port.postMessage({type:\"host-request\", id, operation, value} satisfies ClaudeBridgeMessage);\n    const abort = () => port.postMessage({type:\"event\", event:\"hostRequestAbort\", value:id} satisfies ClaudeBridgeMessage);\n    signal.addEventListener(\"abort\", abort, {once:true});\n    if (signal.aborted) abort();\n  });\n}\n\nfunction mcpServer(namespace: string, tools: readonly ClaudeToolDescriptor[]) {\n  if (!tools.length) return undefined;\n  // An explicit empty list enables the MCP tool capability before the worker\n  // installs descriptor-driven low-level handlers.\n  const server = createSdkMcpServer({name:namespace, version:\"1.0.0\", tools:[]});\n  server.instance.server.setRequestHandler(ListToolsRequestSchema, async () => ({tools}));\n  server.instance.server.setRequestHandler(CallToolRequestSchema, async request =>\n    await hostRequest(\"toolCall\", {name:request.params.name, input:request.params.arguments}) as any);\n  return server;\n}\n\nasync function start(value: any): Promise<void> {\n  const server = mcpServer(value.namespace, value.tools);\n  const options = value.options as Options;\n  const canUseTool: CanUseTool = async (toolName, toolInput, metadata) => await abortableHostRequest(\n    \"approval\", {toolName, toolInput, metadata:serializableMetadata(metadata as unknown as Record<string, unknown>)}, metadata.signal,\n  ) as Awaited<ReturnType<CanUseTool>>;\n  native = query({prompt:input, options:{\n    ...options,\n    ...(server ? {mcpServers:{[value.namespace]:server}} : {}),\n    spawnClaudeCodeProcess(spawnOptions) {\n      processProxy = new ClaudeRemoteProcess(hostRequest, spawnOptions);\n      return processProxy;\n    },\n    canUseTool,\n    onElicitation: async (request, metadata) => await abortableHostRequest(\n      \"elicitation\", {request, metadata:serializableMetadata(metadata as unknown as Record<string, unknown>)}, metadata.signal,\n    ) as any,\n    stderr: () => {},\n  }}) as ClaudeQuery;\n  void (async () => {\n    try {\n      for await (const message of native!) port.postMessage({type:\"event\",event:\"message\",value:message} satisfies ClaudeBridgeMessage);\n      port.postMessage({type:\"event\",event:\"end\"} satisfies ClaudeBridgeMessage);\n    } catch {\n      port.postMessage({type:\"event\",event:\"failure\",value:\"native stream\"} satisfies ClaudeBridgeMessage);\n    }\n  })();\n}\n\nasync function perform(message: ClaudeWorkerRequest): Promise<unknown> {\n  switch (message.operation) {\n    case \"managedSettings\": {\n      const settings = await resolveSettings({cwd:String(message.value), settingSources:[\"user\",\"project\",\"local\"]});\n      return settings.sources.filter(source => source.source === \"managed\").map(source => source.settings);\n    }\n    case \"start\": await start(message.value); return undefined;\n    case \"accountInfo\": return await native!.accountInfo();\n    case \"supportedModels\": return await native!.supportedModels();\n    case \"getSettings\": return await native!.getSettings?.();\n    case \"setModel\": return await native!.setModel?.(message.value as string | undefined);\n    case \"interrupt\": return await native!.interrupt();\n    default: throw new Error(\"Unknown Claude worker operation.\");\n  }\n}\n\nport.on(\"message\", (message: ClaudeBridgeMessage) => {\n  if (message.type === \"host-response\") {\n    const current = pending.get(message.id);\n    if (!current) return;\n    pending.delete(message.id);\n    if (message.ok) current.resolve(message.value); else current.reject(new Error(\"Claude host bridge failed.\"));\n    return;\n  }\n  if (message.type === \"event\") {\n    if (message.event === \"input\") input.push(message.value as SDKUserMessage);\n    else if (message.event === \"inputEnd\") input.close();\n    else if (message.event === \"close\") { input.close(); native?.close(); }\n    else if (message.event === \"processExit\") {\n      const value = message.value as {code:number|null; signal:NodeJS.Signals|null};\n      processProxy?.exited(value.code, value.signal);\n    } else if (message.event === \"processError\") processProxy?.failed();\n    return;\n  }\n  if (message.type !== \"request\") return;\n  void perform(message).then(\n    value => port.postMessage({type:\"response\",id:message.id,ok:true,value} satisfies ClaudeBridgeMessage),\n    error => {\n      const settingsUnavailable = message.operation === \"getSettings\" && error instanceof Error\n        && /^(?:unknown|unsupported) control request(?: subtype)?:\\s*get_settings\\.?$/iu.test(error.message.trim());\n      port.postMessage({type:\"response\",id:message.id,ok:false,...(settingsUnavailable ? {failure:\"settings-unavailable\" as const} : {})} satisfies ClaudeBridgeMessage);\n    },\n  );\n});\n"]}

package/dist/adapters/claude.d.ts

@@ -1,6 +1,9 @@
-import { type AccountInfo, type Options, type SDKMessage, type SDKUserMessage, type Settings, type ModelInfo } from "@anthropic-ai/claude-agent-sdk";
+import type { AccountInfo, Options, SDKMessage, SDKUserMessage, Settings, ModelInfo } from "@anthropic-ai/claude-agent-sdk";
 import type { AdapterOptions, NativeSession } from "./types.js";
-interface ClaudeQuery extends AsyncIterable<SDKMessage> {
+import { claudeTools } from "./claude-tools.js";
+import { ClaudeProcessOwner } from "./claude-process.js";
+import type { ClaudeWorkerFactory } from "./claude-worker-protocol.js";
+export interface ClaudeQuery extends AsyncIterable<SDKMessage> {
     accountInfo(): Promise<AccountInfo>;
     supportedModels(): Promise<ModelInfo[]>;
     interrupt(): Promise<unknown>;
@@ -8,15 +11,22 @@ interface ClaudeQuery extends AsyncIterable<SDKMessage> {
     getSettings?(): Promise<unknown>;
     setModel?(model?: string): Promise<void>;
 }
+export interface ClaudeQueryBridge {
+    readonly tools: ReturnType<typeof claudeTools>;
+    readonly processOwner: ClaudeProcessOwner;
+}
 export interface ClaudeDependencies {
     query(args: {
         prompt: AsyncIterable<SDKUserMessage>;
         options: Options;
-    }): ClaudeQuery;
+    }, bridge: ClaudeQueryBridge): ClaudeQuery | Promise<ClaudeQuery>;
     executable(env: NodeJS.ProcessEnv): Promise<string>;
     managedSettings(cwd: string): Promise<Settings[]>;
+    dispose?(): Promise<void>;
+}
+export interface ClaudeOpenerOptions {
+    readonly createWorker?: ClaudeWorkerFactory;
 }
 export declare const openClaude: (options: AdapterOptions) => Promise<NativeSession>;
-/** Dependency injection is internal and replaces only the external SDK boundary in tests. */
-export declare function createClaudeOpener(deps: ClaudeDependencies): (options: AdapterOptions) => Promise<NativeSession>;
-export {};
+/** Dependency injection is internal and replaces only private process boundaries in tests. */
+export declare function createClaudeOpener(configuration?: ClaudeDependencies | ClaudeOpenerOptions): (options: AdapterOptions) => Promise<NativeSession>;

package/dist/adapters/claude.js

@@ -1,8 +1,4 @@
-import { access } from "node:fs/promises";
-import { constants } from "node:fs";
-import { delimiter, join } from "node:path";
 import { randomUUID } from "node:crypto";
-import { query, resolveSettings } from "@anthropic-ai/claude-agent-sdk";
 import { AgentError } from "../errors.js";
 import { privateClaudeConfig } from "./claude-config.js";
 import { claudeTools } from "./claude-tools.js";
@@ -13,24 +9,8 @@ import { ClaudeSettingsUnavailable, claudeDefaultUnavailable, readClaudeAppliedS
 import { NativeApprovals } from "./approval-lifetime.js";
 import { claudeApproval } from "./claude-approvals.js";
 import { ClaudeProcessOwner } from "./claude-process.js";
-const dependencies = {
-    query,
-    async managedSettings(cwd) {
-        const settings = await resolveSettings({ cwd, settingSources: ["user", "project", "local"] });
-        return settings.sources.filter(source => source.source === "managed").map(source => source.settings);
-    },
-    async executable(env) {
-        for (const directory of (env.PATH ?? "").split(delimiter)) {
-            const file = join(directory, "claude");
-            try {
-                await access(file, constants.X_OK);
-                return file;
-            }
-            catch { /* Try the next PATH entry. */ }
-        }
-        throw new AgentError("HARNESS_UNAVAILABLE", "Install Claude Code and make claude available on PATH.");
-    },
-};
+import { claudeResultFailure } from "./claude-result.js";
+import { ClaudeWorkerClient } from "./claude-worker-client.js";
 function addCatalogEquivalentModels(expected, models, selected) {
     expected.add(selected);
     for (const model of models) {
@@ -41,9 +21,33 @@ function addCatalogEquivalentModels(expected, models, selected) {
             expected.add(model.resolvedModel);
     }
 }
-export const openClaude = createClaudeOpener(dependencies);
-/** Dependency injection is internal and replaces only the external SDK boundary in tests. */
-export function createClaudeOpener(deps) {
+function injectedDependencies(value) {
+    return "query" in value;
+}
+export const openClaude = createClaudeOpener();
+/** Dependency injection is internal and replaces only private process boundaries in tests. */
+export function createClaudeOpener(configuration = {}) {
+    if (injectedDependencies(configuration))
+        return openClaudeWithDependencies(configuration);
+    return async (options) => {
+        const client = new ClaudeWorkerClient(options.env, configuration);
+        try {
+            return await openClaudeWithDependencies(client.dependencies)(options);
+        }
+        catch (error) {
+            try {
+                await client.dispose();
+            }
+            catch {
+                const startup = error instanceof AgentError || error instanceof AggregateError
+                    ? error : new AgentError("HARNESS_FAILED", "Claude Code startup failed.");
+                throw new AggregateError([startup, new AgentError("HARNESS_FAILED", "Claude Code worker cleanup failed.")], "Claude Code startup and cleanup failed.");
+            }
+            throw error;
+        }
+    };
+}
+function openClaudeWithDependencies(deps) {
     return async (options) => {
         if (options.harness.kind !== "claudeCode")
             throw new AgentError("INVALID_CONFIG", "Claude Code received configuration for a different harness.");
@@ -54,12 +58,50 @@ export function createClaudeOpener(deps) {
         const tools = claudeTools(options.agent);
         const allowedTools = [
             ...(options.harness.allowedTools ?? []),
-            ...(tools.config.allowedTools ?? []),
+            ...tools.allowedTools,
             ...claudeDelegationPermissions(options),
         ];
         const config = await privateClaudeConfig(settings.settings);
         const input = new ClaudeInput();
         const processOwner = new ClaudeProcessOwner();
+        let cleanupComplete = false;
+        let cleanupAttempt;
+        const cleanupResources = () => {
+            if (cleanupComplete)
+                return Promise.resolve();
+            if (cleanupAttempt)
+                return cleanupAttempt;
+            cleanupAttempt = (async () => {
+                const failures = [];
+                try {
+                    await processOwner.close();
+                }
+                catch (error) {
+                    failures.push(error instanceof AgentError ? error : new AgentError("HARNESS_FAILED", "Claude Code process cleanup failed."));
+                }
+                try {
+                    await config.cleanup();
+                }
+                catch {
+                    failures.push(new AgentError("HARNESS_FAILED", "Claude Code private configuration cleanup failed."));
+                }
+                try {
+                    await deps.dispose?.();
+                }
+                catch (error) {
+                    failures.push(error instanceof AgentError ? error : new AgentError("HARNESS_FAILED", "Claude Code worker cleanup failed."));
+                }
+                if (failures.length === 1)
+                    throw failures[0];
+                if (failures.length > 1)
+                    throw new AggregateError(failures, "Claude Code cleanup failed.");
+                cleanupComplete = true;
+            })().catch(error => {
+                cleanupAttempt = undefined;
+                throw error;
+            });
+            return cleanupAttempt;
+        };
         let inputFailure;
         const approvals = new NativeApprovals();
         let acceptingApprovals = false;
@@ -74,12 +116,11 @@ export function createClaudeOpener(deps) {
         };
         let native;
         try {
-            native = deps.query({ prompt: input, options: {
+            native = await deps.query({ prompt: input, options: {
                     pathToClaudeCodeExecutable: executable,
                     spawnClaudeCodeProcess: processOwner.spawn,
                     cwd: options.cwd,
                     ...settings,
-                    ...tools.config,
                     ...(allowedTools.length ? { allowedTools } : {}),
                     ...(options.harness.disallowedTools !== undefined ? { disallowedTools: [...options.harness.disallowedTools] } : {}),
                     ...(permissionMode !== undefined ? { permissionMode } : {}),
@@ -119,30 +160,37 @@ export function createClaudeOpener(deps) {
                         }
                         return { action: "decline" };
                     },
-                } });
+                } }, { tools, processOwner });
         }
-        catch {
+        catch (error) {
+            const exit = processOwner.exitDescription();
             input.close();
+            const failure = error instanceof AgentError && error.code === "HARNESS_FAILED"
+                ? error : new AgentError("HARNESS_UNAVAILABLE", `Claude Code could not start${exit}.`);
             try {
-                await processOwner.close();
+                await cleanupResources();
             }
-            finally {
-                await config.cleanup();
+            catch (cleanupError) {
+                throw new AggregateError([failure, cleanupError], "Claude Code startup and cleanup failed.");
             }
-            throw new AgentError("HARNESS_UNAVAILABLE", "Claude Code could not start.");
+            throw failure;
         }
         const expectedModels = new Set();
         let retainedModel;
+        let startupPhase = "account inspection";
         try {
-            verifyClaudeAccess(await native.accountInfo(), options.access);
+            const account = await native.accountInfo();
+            verifyClaudeAccess(account, options.access);
+            startupPhase = "model catalog retrieval";
             const models = await native.supportedModels();
             if (options.harness.model) {
                 addCatalogEquivalentModels(expectedModels, models, options.harness.model);
                 verifyClaudeOptions(models, options);
+                startupPhase = "model settings validation";
                 try {
                     const applied = await readClaudeAppliedSettings(native);
                     if (!expectedModels.has(applied.model))
-                        throw new AgentError("INVALID_CONFIG", "Claude Code selected a different model than requested.");
+                        throw new AgentError("INVALID_CONFIG", "Claude Code selected a different model than requested during startup settings validation.");
                     verifyAppliedClaudeEffort(applied.effort, options.harness.effort);
                     retainedModel = applied.model;
                     expectedModels.add(applied.model);
@@ -153,6 +201,7 @@ export function createClaudeOpener(deps) {
                 }
             }
             else {
+                startupPhase = "model settings validation";
                 if (!native.getSettings || !native.setModel)
                     throw claudeDefaultUnavailable();
                 let selected;
@@ -164,9 +213,13 @@ export function createClaudeOpener(deps) {
                         throw claudeDefaultUnavailable();
                     throw error;
                 }
+                startupPhase = "model catalog retrieval";
                 verifyClaudeOptions(models, options, selected.model);
+                startupPhase = "model settings validation";
                 verifyAppliedClaudeEffort(selected.effort, options.harness.effort);
+                startupPhase = "model catalog retrieval";
                 addCatalogEquivalentModels(expectedModels, models, selected.model);
+                startupPhase = "model settings validation";
                 try {
                     await native.setModel(selected.model);
                 }
@@ -182,38 +235,43 @@ export function createClaudeOpener(deps) {
                         throw claudeDefaultUnavailable();
                     throw error;
                 }
-                if (!expectedModels.has(pinned.model))
-                    throw claudeDefaultUnavailable();
+                if (!expectedModels.has(pinned.model)) {
+                    throw new AgentError("INVALID_CONFIG", "Claude Code changed the selected native default during startup settings validation. Supply --model <model>.");
+                }
                 verifyAppliedClaudeEffort(pinned.effort, options.harness.effort);
                 retainedModel = pinned.model;
+                startupPhase = "model catalog retrieval";
                 addCatalogEquivalentModels(expectedModels, models, pinned.model);
+                startupPhase = "model settings validation";
             }
             if (inputFailure)
                 throw inputFailure;
         }
         catch (error) {
+            const exit = processOwner.exitDescription();
             input.close();
             native.close();
+            const failure = error instanceof AgentError ? error
+                : new AgentError("HARNESS_FAILED", `Claude Code ${startupPhase} failed${exit}.`);
             try {
-                await processOwner.close();
+                await cleanupResources();
             }
-            finally {
-                await config.cleanup();
+            catch (cleanupError) {
+                throw new AggregateError([failure, cleanupError], "Claude Code startup and cleanup failed.");
             }
-            if (error instanceof AgentError)
-                throw error;
-            throw new AgentError("ACCESS_UNAVAILABLE", "Claude Code authentication could not be verified.");
+            throw failure;
         }
         let closed = false;
         let preflight;
         let sessionFailure;
+        let exitObservedBeforeClose;
         let active;
         const reading = (async () => {
             try {
                 for await (const message of native) {
                     if (message.type === "system" && message.subtype === "init") {
                         if (!expectedModels.has(message.model)) {
-                            sessionFailure = new AgentError("INVALID_CONFIG", "Claude Code selected a different model than requested.");
+                            sessionFailure = new AgentError("INVALID_CONFIG", "Claude Code selected a different model than requested during native initialization.");
                         }
                         else if (permissionMode !== undefined && message.permissionMode !== permissionMode) {
                             sessionFailure = new AgentError("INVALID_CONFIG", "Claude Code reported a different permission mode than requested.");
@@ -244,30 +302,78 @@ export function createClaudeOpener(deps) {
                             current.resolve(message.result);
                     }
                     else
-                        current.reject(new AgentError("HARNESS_ERROR", "Claude Code could not complete the turn."));
+                        current.reject(claudeResultFailure(message.subtype));
                 }
             }
-            catch {
+            catch (error) {
+                if (error instanceof AgentError) {
+                    sessionFailure = error;
+                }
                 // Native diagnostics may contain credentials; return a stable safe message.
             }
             finally {
                 acceptingApprovals = false;
                 approvals.clear();
-                const code = closed ? "SESSION_CLOSED" : "HARNESS_ERROR";
+                const explicitClose = exitObservedBeforeClose !== undefined;
+                const code = explicitClose ? "SESSION_CLOSED" : "HARNESS_ERROR";
                 closed = true;
                 input.close();
                 await tools.drain();
-                active?.reject(sessionFailure ?? inputFailure ?? new AgentError(code, "The Claude Code process stopped before completing the turn."));
-                active?.stop();
-                active = undefined;
+                const exit = explicitClose ? exitObservedBeforeClose : processOwner.exitDescription();
+                const ending = active;
+                ending?.reject(sessionFailure ?? inputFailure ?? new AgentError(code, `The Claude Code process stopped${exit} before completing the turn.`));
                 try {
-                    await processOwner.close();
+                    await cleanupResources();
                 }
                 finally {
-                    await config.cleanup();
+                    ending?.stop();
+                    if (active === ending)
+                        active = undefined;
                 }
             }
         })();
+        void reading.catch(() => undefined);
+        let closeAttempt;
+        let closeComplete = false;
+        let failedCloseAttempts = 0;
+        const close = () => {
+            if (closeComplete)
+                return Promise.resolve();
+            if (closeAttempt)
+                return closeAttempt;
+            closeAttempt = (async () => {
+                exitObservedBeforeClose ??= processOwner.exitDescription();
+                closed = true;
+                acceptingApprovals = false;
+                approvals.clear();
+                const pending = preflight;
+                if (pending) {
+                    pending.cancel(new AgentError("SESSION_CLOSED", "The native session closed before submission."));
+                    await pending.stopped;
+                }
+                tools.stopAdmission();
+                input.close();
+                native.close();
+                const stoppingFailure = processOwner.close().then(() => new Promise(() => { }));
+                let readingFailure;
+                try {
+                    await Promise.race([reading, stoppingFailure]);
+                }
+                catch (error) {
+                    readingFailure = error;
+                }
+                if (readingFailure && failedCloseAttempts === 0)
+                    throw readingFailure;
+                if (!cleanupComplete)
+                    await cleanupResources();
+                closeComplete = true;
+            })().catch(error => {
+                failedCloseAttempts += 1;
+                closeAttempt = undefined;
+                throw error;
+            });
+            return closeAttempt;
+        };
         return {
             async turn(prompt) {
                 if (closed)
@@ -294,7 +400,7 @@ export function createClaudeOpener(deps) {
                             throw error;
                         }
                         if (!expectedModels.has(applied.model))
-                            throw new AgentError("INVALID_CONFIG", "Claude Code changed the retained session model before submission.");
+                            throw new AgentError("INVALID_CONFIG", "Claude Code changed the model during retained-session validation before submission.");
                         verifyAppliedClaudeEffort(applied.effort, options.harness.effort);
                     }
                     if (closed)
@@ -333,33 +439,16 @@ export function createClaudeOpener(deps) {
                 try {
                     await native.interrupt();
                 }
-                catch {
+                catch (error) {
                     current.interrupted = false;
+                    if (error instanceof AgentError && error.code === "HARNESS_FAILED")
+                        throw error;
                     throw new AgentError("CANCEL_FAILED", "Claude Code did not confirm interruption.");
                 }
                 await current.stopped;
             },
             async resume() { throw new AgentError("RECOVERY_UNSUPPORTED", "Claude Code cannot retry failed execution without replaying input."); },
-            async close() {
-                closed = true;
-                acceptingApprovals = false;
-                approvals.clear();
-                const pending = preflight;
-                if (pending) {
-                    pending.cancel(new AgentError("SESSION_CLOSED", "The native session closed before submission."));
-                    await pending.stopped;
-                }
-                tools.stopAdmission();
-                input.close();
-                native.close();
-                const stopping = processOwner.close();
-                try {
-                    await reading;
-                }
-                finally {
-                    await stopping;
-                }
-            },
+            close,
         };
     };
 }