@wrongstack/acp 0.295.0 → 0.296.2

package/dist/index.js

@@ -9,9 +9,9 @@ function assertNeverSessionUpdate(x) {
 // src/version.ts
 import { createRequire } from "node:module";
 var require2 = createRequire(import.meta.url);
-function readPackageVersion() {
+function readPackageVersion(load = () => require2("../package.json")) {
   try {
-    const packageJson = require2("../package.json");
+    const packageJson = load();
     if (typeof packageJson.version === "string" && packageJson.version.length > 0) {
       return packageJson.version;
     }
@@ -79,7 +79,7 @@ var ACPProtocolHandler = class {
     this.replayFor = opts.replayFor;
     this.seedFor = opts.seedFor;
     this.disposeFor = opts.disposeFor;
-    this.maxSessions = Number.isFinite(opts.maxSessions) && (opts.maxSessions ?? 0) > 0 ? Math.floor(opts.maxSessions) : DEFAULT_MAX_SESSIONS;
+    this.maxSessions = Number.isFinite(opts.maxSessions) && opts.maxSessions > 0 ? Math.floor(opts.maxSessions) : DEFAULT_MAX_SESSIONS;
     this.store = opts.store;
     if (typeof this.transport.onMessage === "function") {
       this.transport.onMessage((m) => this.maybeResolvePending(m));
@@ -361,7 +361,7 @@ var ACPProtocolHandler = class {
     }
     if (existing) {
       existing.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      const replay = sessionId ? this.replayFor?.(sessionId) : void 0;
+      const replay = this.replayFor?.(sessionId);
       if (replay) {
         for (const update of replay) {
           await this.sendNotification({ sessionId, update });
@@ -426,10 +426,8 @@ var ACPProtocolHandler = class {
       return false;
     }
     session.abort.abort();
-    if (sessionId) {
-      this.sessions.delete(sessionId);
-      this.disposeSession(sessionId);
-    }
+    this.sessions.delete(sessionId);
+    this.disposeSession(sessionId);
     await this.transport.send(toWire({
       jsonrpc: "2.0",
       id,
@@ -738,6 +736,7 @@ function errorToJsonRpc(err) {
 
 // src/agent/stdio-transport.ts
 import { expectDefined, writeErr } from "@wrongstack/core/utils";
+import { treeKill } from "@wrongstack/core/utils/tree-kill";
 
 // src/win32-cmd.ts
 var WIN32_CMD_META = /[&|<>"\r\n\0]/;
@@ -767,7 +766,7 @@ function quoteWin32CmdArg(arg) {
 var DEFAULT_MAX_FRAME_CHARS = 20 * 1024 * 1024;
 var DEFAULT_MAX_QUEUED_MESSAGES = 1e3;
 function positiveLimit(value, fallback) {
-  return Number.isFinite(value) && (value ?? 0) > 0 ? Math.floor(value) : fallback;
+  return value !== void 0 && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
 var StdioTransport = class {
   stdin = process.stdin;
@@ -782,10 +781,7 @@ var StdioTransport = class {
   maxQueuedMessages;
   constructor(opts = {}) {
     this.maxFrameChars = positiveLimit(opts.maxFrameChars, DEFAULT_MAX_FRAME_CHARS);
-    this.maxQueuedMessages = positiveLimit(
-      opts.maxQueuedMessages,
-      DEFAULT_MAX_QUEUED_MESSAGES
-    );
+    this.maxQueuedMessages = positiveLimit(opts.maxQueuedMessages, DEFAULT_MAX_QUEUED_MESSAGES);
     this.stdin.resume();
     this.stdin.setEncoding("utf8");
     this.stdin.on("data", (chunk) => this.onData(chunk));
@@ -806,7 +802,8 @@ var StdioTransport = class {
     this.stdout.write(chunk, "utf8");
   }
   read() {
-    if (this.messageQueue.length > 0) return Promise.resolve(expectDefined(this.messageQueue.shift()));
+    if (this.messageQueue.length > 0)
+      return Promise.resolve(expectDefined(this.messageQueue.shift()));
     if (this.closed) return Promise.resolve(null);
     return new Promise((resolve3) => {
       this.resolveRead = resolve3;
@@ -908,10 +905,7 @@ var ClientTransport = class {
       ...options
     };
     this.maxFrameChars = positiveLimit(options.maxFrameChars, DEFAULT_MAX_FRAME_CHARS);
-    this.maxQueuedMessages = positiveLimit(
-      options.maxQueuedMessages,
-      DEFAULT_MAX_QUEUED_MESSAGES
-    );
+    this.maxQueuedMessages = positiveLimit(options.maxQueuedMessages, DEFAULT_MAX_QUEUED_MESSAGES);
   }
   async start() {
     if (this.child) return;
@@ -930,13 +924,13 @@ var ClientTransport = class {
       const spawnCwd = isPkgLauncher ? os.homedir() : this.opts.cwd;
       try {
         const childArgs = this.opts.args ?? [];
-        const shim = process.platform === "win32" ? buildWin32CmdShimInvocation(this.opts.command, childArgs) : null;
-        this.child = spawn3(shim?.command ?? this.opts.command, shim?.args ?? childArgs, {
+        const invocation = spawnInvocation(this.opts.command, childArgs, process.platform);
+        this.child = spawn3(invocation.command, invocation.args, {
           env: { ...buildChildEnv2(), ...this.opts.env },
           cwd: spawnCwd,
           stdio: ["pipe", "pipe", "pipe"],
           windowsHide: true,
-          ...shim ? { windowsVerbatimArguments: shim.windowsVerbatimArguments } : {}
+          ...verbatimOptions(invocation)
         });
       } catch (err) {
         clearTimeout(timeout);
@@ -980,6 +974,9 @@ var ClientTransport = class {
       };
       const waitForMarker = (chunk) => {
         this.buffer += chunk;
+        if (this.buffer.length > this.maxFrameChars) {
+          this.buffer = this.buffer.slice(-this.maxFrameChars);
+        }
         const idx = this.buffer.indexOf("[wstack-acp]\n");
         if (idx !== -1) {
           this.buffer = this.buffer.slice(idx + "[wstack-acp]\n".length);
@@ -1001,7 +998,8 @@ var ClientTransport = class {
     });
   }
   read() {
-    if (this.messageQueue.length > 0) return Promise.resolve(expectDefined(this.messageQueue.shift()));
+    if (this.messageQueue.length > 0)
+      return Promise.resolve(expectDefined(this.messageQueue.shift()));
     if (this.closed) return Promise.resolve(null);
     return new Promise((resolve3) => {
       this.resolveRead = resolve3;
@@ -1020,10 +1018,7 @@ var ClientTransport = class {
     this.handlers.clear();
     const child = this.child;
     if (!child) return;
-    try {
-      child.kill();
-    } catch {
-    }
+    treeKill(child);
     this.child = null;
   }
   onChildData(chunk) {
@@ -1087,6 +1082,13 @@ var ClientTransport = class {
     }
   }
 };
+function spawnInvocation(command, args, platform) {
+  if (platform !== "win32") return { command, args };
+  return buildWin32CmdShimInvocation(command, args);
+}
+function verbatimOptions(invocation) {
+  return invocation.windowsVerbatimArguments ? { windowsVerbatimArguments: invocation.windowsVerbatimArguments } : {};
+}
 
 // src/agent/tools-registry.ts
 var ACPToolsRegistry = class {
@@ -1203,8 +1205,8 @@ function toolToPriority(tool) {
 }
 
 // src/agent/wrongstack-acp-agent.ts
-import { fileURLToPath } from "node:url";
 import { createServer } from "node:http";
+import { fileURLToPath } from "node:url";
 import { writeErr as writeErr2 } from "@wrongstack/core/utils";
 var WrongStackACPServer = class {
   transport;
@@ -1265,10 +1267,9 @@ var WrongStackACPServer = class {
     let httpChain = Promise.resolve();
     this.httpServer = createServer(async (req, res) => {
       if (authToken) {
-        const url = new URL(req.url ?? "/", `http://${host}:${port}`);
+        const url = new URL(requestPath(req.url), `http://${host}:${port}`);
         const queryToken = url.searchParams.get("token");
-        const authHeader = req.headers["authorization"];
-        const bearerToken = Array.isArray(authHeader) ? authHeader[0]?.replace(/^Bearer\s+/i, "") : authHeader?.replace(/^Bearer\s+/i, "");
+        const bearerToken = headerValue(req.headers.authorization)?.replace(/^Bearer\s+/i, "");
         const supplied = queryToken ?? bearerToken ?? "";
         if (supplied !== authToken) {
           res.writeHead(401, { "Content-Type": "application/json" });
@@ -1277,7 +1278,7 @@ var WrongStackACPServer = class {
         }
       }
       const selfOrigin = `http://${host}:${port}`;
-      const reqOrigin = Array.isArray(req.headers.origin) ? req.headers.origin[0] : req.headers.origin;
+      const reqOrigin = headerValue(req.headers.origin);
       if (reqOrigin && reqOrigin !== selfOrigin) {
         res.writeHead(403);
         res.end(JSON.stringify({ error: "cross-origin request forbidden" }));
@@ -1357,6 +1358,8 @@ var WrongStackACPServer = class {
       try {
         await requestPromise;
       } catch {
+        res.writeHead(500, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: { code: -32603, message: "Internal error" } }));
       }
     });
     return new Promise((resolve3) => {
@@ -1382,6 +1385,12 @@ var WrongStackACPServer = class {
 var defaultEchoRunTurn = async (_input, _emit) => {
   return { stopReason: "end_turn" };
 };
+function headerValue(value) {
+  return Array.isArray(value) ? value[0] : value;
+}
+function requestPath(value) {
+  return value ?? "/";
+}
 async function main() {
   const server = new WrongStackACPServer();
   await server.start();
@@ -1395,11 +1404,52 @@ if (isEntrypoint) {
   });
 }
 
+// src/client/acp-session-content.ts
+function textContent(text) {
+  return { type: "text", text };
+}
+function imageContent(mimeType, data) {
+  return { type: "image", mimeType, data };
+}
+function audioContent(mimeType, data) {
+  return { type: "audio", mimeType, data };
+}
+function extractText(block) {
+  if (typeof block !== "object" || block === null) return "";
+  const b = block;
+  if (b.type === "text" && typeof b.text === "string") return b.text;
+  if (b.type === "resource" && b.resource && typeof b.resource === "object" && typeof b.resource.text === "string") {
+    return b.resource.text;
+  }
+  return "";
+}
+function isRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function emptyRunResult(stopReason) {
+  return {
+    text: "",
+    stopReason,
+    hasText: false,
+    toolCalls: [],
+    diffs: [],
+    thoughts: ""
+  };
+}
+
 // src/client/file-server.ts
 import { randomBytes } from "node:crypto";
 import { realpathSync } from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
+var DEFAULT_FILE_OPERATIONS = {
+  stat: fsp.stat,
+  readFile: fsp.readFile,
+  writeFile: fsp.writeFile,
+  realpath: fsp.realpath,
+  rename: fsp.rename,
+  unlink: fsp.unlink
+};
 var DEFAULT_MAX_READ_BYTES = 5 * 1024 * 1024;
 var DEFAULT_MAX_WRITE_BYTES = 5 * 1024 * 1024;
 var FsError = class extends Error {
@@ -1418,12 +1468,14 @@ var FileServer = class {
   timeoutMs;
   maxReadBytes;
   maxWriteBytes;
+  operations;
   constructor(opts) {
     this.root = path.resolve(opts.projectRoot);
     this.realRoot = safeRealpathSync(this.root);
     this.timeoutMs = opts.timeoutMs ?? 3e4;
     this.maxReadBytes = opts.maxReadBytes ?? DEFAULT_MAX_READ_BYTES;
     this.maxWriteBytes = opts.maxWriteBytes ?? DEFAULT_MAX_WRITE_BYTES;
+    this.operations = opts.operations ?? DEFAULT_FILE_OPERATIONS;
   }
   /** Read a text file. Returns the content as a string. */
   async readTextFile(params) {
@@ -1431,7 +1483,7 @@ var FileServer = class {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), this.timeoutMs);
     try {
-      const stat2 = await fsp.stat(safe).catch((err) => {
+      const stat2 = await this.operations.stat(safe).catch((err) => {
         throw mapFsError(err, safe);
       });
       if (stat2.size > this.maxReadBytes) {
@@ -1441,7 +1493,7 @@ var FileServer = class {
           `file is ${stat2.size} bytes, max read is ${this.maxReadBytes} bytes`
         );
       }
-      const content = await fsp.readFile(safe, {
+      const content = await this.operations.readFile(safe, {
         encoding: "utf8",
         signal: controller.signal
       });
@@ -1471,20 +1523,20 @@ var FileServer = class {
     const timer = setTimeout(() => controller.abort(), this.timeoutMs);
     const tmp = `${safe}.${randomBytes(6).toString("hex")}.tmp`;
     try {
-      await fsp.writeFile(tmp, params.content, {
+      await this.operations.writeFile(tmp, params.content, {
         encoding: "utf8",
         signal: controller.signal
       });
       await this.assertRealInside(tmp);
       await this.assertRealInside(path.dirname(safe));
-      await fsp.rename(tmp, safe);
+      await this.operations.rename(tmp, safe);
     } catch (err) {
       if (err instanceof FsError) {
-        await fsp.unlink(tmp).catch(() => void 0);
+        await this.operations.unlink(tmp).catch(() => void 0);
         throw err;
       }
       try {
-        await fsp.unlink(tmp);
+        await this.operations.unlink(tmp);
       } catch {
       }
       if (controller.signal.aborted) {
@@ -1528,12 +1580,14 @@ var FileServer = class {
     for (; ; ) {
       let real;
       try {
-        real = await fsp.realpath(probe);
+        real = await this.operations.realpath(probe);
       } catch (err) {
         const code = err.code;
         if (code === "ENOENT") {
           const parent = path.dirname(probe);
-          if (parent === probe) return;
+          if (parent === probe) {
+            throw new FsError("ENOENT", resolvedPath, `no existing ancestor: ${resolvedPath}`);
+          }
           probe = parent;
           continue;
         }
@@ -1631,7 +1685,6 @@ var TerminalServer = class {
     this.outputByteLimit = opts.outputByteLimit ?? 1024 * 1024;
     this.maxOutputByteLimit = opts.maxOutputByteLimit ?? 16 * 1024 * 1024;
     this.maxTerminals = this.clampFiniteInt(opts.maxTerminals, 32);
-    if (this.maxTerminals < 1) throw new RangeError("maxTerminals must be at least 1");
     this.abortSignal = opts.signal;
     if (opts.signal) {
       opts.signal.addEventListener("abort", this.abortHandler, { once: true });
@@ -1962,7 +2015,6 @@ var WebSocketClientTransport = class {
       const ws = new WS(this.opts.url, this.opts.protocols);
       this.ws = ws;
       const timer = setTimeout(() => {
-        if (settled) return;
         settled = true;
         try {
           ws.close();
@@ -2000,7 +2052,7 @@ var WebSocketClientTransport = class {
     }
     try {
       const serialized = JSON.stringify(msg);
-      const buffered = Number.isFinite(this.ws.bufferedAmount) ? this.ws.bufferedAmount ?? 0 : 0;
+      const buffered = Number.isFinite(this.ws.bufferedAmount) ? this.ws.bufferedAmount : 0;
       if (buffered + Buffer.byteLength(serialized, "utf8") > this.maxBufferedBytes) {
         this.stop();
         return Promise.reject(new Error("WebSocket transport send buffer limit exceeded"));
@@ -2057,10 +2109,10 @@ var WebSocketClientTransport = class {
   }
 };
 function finitePositiveLimit(value, fallback) {
-  return Number.isFinite(value) && (value ?? 0) > 0 ? Math.floor(value) : fallback;
+  return value !== void 0 && Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
 
-// src/client/acp-session.ts
+// src/client/acp-session-errors.ts
 var ACPSessionError = class extends Error {
   kind;
   cause;
@@ -2074,6 +2126,264 @@ var ACPSessionError = class extends Error {
 function isJsonRpcError(v) {
   return typeof v === "object" && v !== null && typeof v.code === "number" && typeof v.message === "string";
 }
+
+// src/client/acp-session-updates.ts
+function createSessionScratch() {
+  return { text: "", thoughts: "", toolCalls: /* @__PURE__ */ new Map(), diffs: [] };
+}
+function handleAcpSessionUpdate(msg, scratch, emitProgress) {
+  const update = msg.params?.update;
+  if (typeof update !== "object" || update === null) return;
+  const u = update;
+  emitProgress({ type: "raw", update: u });
+  switch (u.sessionUpdate) {
+    case "agent_message_chunk": {
+      const text = extractText(u.content);
+      if (text) {
+        scratch.text += text;
+        emitProgress({ type: "message", text });
+      }
+      return;
+    }
+    case "thought_chunk": {
+      const text = extractText(u.content);
+      if (text) {
+        scratch.thoughts += text;
+        emitProgress({ type: "thought", text });
+      }
+      return;
+    }
+    case "tool_call":
+    case "tool_call_update":
+      captureToolCall(u, u.sessionUpdate === "tool_call", scratch, emitProgress);
+      return;
+    case "plan":
+      if (Array.isArray(u.entries)) {
+        scratch.plan = u.entries;
+        emitProgress({ type: "plan", entries: u.entries });
+      }
+      return;
+    case "usage_update":
+      if (typeof u.used === "number" && typeof u.size === "number") {
+        const usage = {
+          used: u.used,
+          size: u.size,
+          ...typeof u.cost === "object" && u.cost !== null ? { cost: u.cost } : {}
+        };
+        scratch.usage = usage;
+        emitProgress({ type: "usage", usage });
+      }
+      return;
+    case "available_commands_update":
+    case "current_mode_update":
+    case "config_option_update":
+    case "session_info_update":
+    case "user_message_chunk":
+    case "next_edit_suggestions":
+    case "elicitation":
+      return;
+    default:
+      return;
+  }
+}
+function captureToolCall(u, isNew, scratch, emitProgress) {
+  const toolCallId = typeof u.toolCallId === "string" ? u.toolCallId : "";
+  if (!toolCallId) return;
+  const prev = scratch.toolCalls.get(toolCallId);
+  const record = {
+    toolCallId,
+    title: typeof u.title === "string" ? u.title : prev?.title ?? toolCallId,
+    kind: typeof u.kind === "string" ? u.kind : prev?.kind,
+    status: typeof u.status === "string" ? u.status : prev?.status ?? (isNew ? "pending" : "in_progress"),
+    rawInput: isRecord(u.rawInput) ? u.rawInput : prev?.rawInput,
+    rawOutput: isRecord(u.rawOutput) ? u.rawOutput : prev?.rawOutput
+  };
+  scratch.toolCalls.set(toolCallId, record);
+  if (Array.isArray(u.content)) {
+    for (const c of u.content) {
+      if (c && typeof c === "object" && c.type === "diff") {
+        const diff = {
+          path: c.path,
+          oldText: c.oldText,
+          newText: c.newText
+        };
+        scratch.diffs.push(diff);
+        emitProgress({ type: "diff", diff });
+      }
+    }
+  }
+  emitProgress({
+    type: isNew ? "tool_call" : "tool_call_update",
+    toolCall: record
+  });
+}
+
+// src/client/acp-session-callbacks.ts
+async function handleAcpPermissionRequest(msg, permissionPolicy, sender) {
+  const id = msg.id;
+  if (id === void 0) return;
+  const params = msg.params;
+  const toolCall = params?.toolCall;
+  const options = Array.isArray(params?.options) ? params.options : [];
+  if (!toolCall) {
+    await sender.sendErrorResponse(id, -32602, "toolCall is required");
+    return;
+  }
+  const policyAbort = new AbortController();
+  try {
+    const outcome = await permissionPolicy({
+      toolCall,
+      options,
+      signal: policyAbort.signal
+    });
+    await sender.sendResult(id, { outcome });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    await sender.sendErrorResponse(id, -32603, `permission policy failed: ${message}`);
+  }
+}
+async function handleAcpFsRequest(msg, fileServer, permissionPolicy, sender) {
+  const id = msg.id;
+  if (id === void 0) return;
+  const params = msg.params;
+  if (!params?.path) {
+    await sender.sendErrorResponse(id, -32602, "path is required");
+    return;
+  }
+  if (msg.method === "fs/write_text_file") {
+    const allowed = await authorizeAcpCallback(permissionPolicy, {
+      toolCallId: `acp-fs-write-${id}`,
+      title: `Write file: ${params.path}`,
+      kind: "edit",
+      rawInput: { path: params.path, sessionId: params.sessionId }
+    });
+    if (!allowed) {
+      await sender.sendErrorResponse(id, -32602, "filesystem write denied by permission policy");
+      return;
+    }
+  }
+  try {
+    if (msg.method === "fs/read_text_file") {
+      const result = await fileServer.readTextFile({
+        sessionId: params.sessionId ?? "",
+        path: params.path
+      });
+      await sender.sendResult(id, result);
+    } else {
+      await fileServer.writeTextFile({
+        sessionId: params.sessionId ?? "",
+        path: params.path,
+        content: params.content ?? ""
+      });
+      await sender.sendResult(id, {});
+    }
+  } catch (err) {
+    const code = err instanceof FsError ? -32602 : -32603;
+    const message = err instanceof Error ? err.message : String(err);
+    await sender.sendErrorResponse(id, code, message);
+  }
+}
+async function handleAcpTerminalRequest(msg, terminalServer, permissionPolicy, sender) {
+  const id = msg.id;
+  if (id === void 0) return;
+  const params = msg.params ?? {};
+  try {
+    switch (msg.method) {
+      case "terminal/create": {
+        const allowed = await authorizeAcpCallback(permissionPolicy, {
+          toolCallId: `acp-terminal-create-${id}`,
+          title: `Run command: ${String(params.command ?? "")} ${(Array.isArray(params.args) ? params.args : []).join(" ")}`.trim(),
+          kind: "execute",
+          rawInput: {
+            command: params.command,
+            args: params.args,
+            cwd: params.cwd,
+            sessionId: params.sessionId
+          }
+        });
+        if (!allowed) {
+          await sender.sendErrorResponse(id, -32602, "terminal create denied by permission policy");
+          return;
+        }
+        const createOpts = {
+          sessionId: String(params.sessionId ?? ""),
+          command: String(params.command ?? ""),
+          args: Array.isArray(params.args) ? params.args : []
+        };
+        if (Array.isArray(params.env)) {
+          createOpts.env = params.env;
+        }
+        if (typeof params.cwd === "string") {
+          createOpts.cwd = params.cwd;
+        }
+        if (typeof params.outputByteLimit === "number") {
+          createOpts.outputByteLimit = params.outputByteLimit;
+        }
+        const result = terminalServer.create(createOpts);
+        await sender.sendResult(id, result);
+        return;
+      }
+      case "terminal/output": {
+        const terminalId = String(params.terminalId ?? "");
+        const out = terminalServer.output(terminalId);
+        await sender.sendResult(id, out);
+        return;
+      }
+      case "terminal/wait_for_exit": {
+        const terminalId = String(params.terminalId ?? "");
+        const exit = await terminalServer.waitForExit(terminalId);
+        await sender.sendResult(id, exit);
+        return;
+      }
+      case "terminal/kill": {
+        const terminalId = String(params.terminalId ?? "");
+        terminalServer.kill(terminalId);
+        await sender.sendResult(id, {});
+        return;
+      }
+      case "terminal/release": {
+        const terminalId = String(params.terminalId ?? "");
+        terminalServer.release(terminalId);
+        await sender.sendResult(id, {});
+        return;
+      }
+      default:
+        await sender.sendErrorResponse(id, -32601, `unknown method: ${msg.method}`);
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    await sender.sendErrorResponse(id, -32603, message);
+  }
+}
+async function authorizeAcpCallback(permissionPolicy, partial) {
+  try {
+    const outcome = await permissionPolicy({
+      toolCall: {
+        sessionUpdate: "tool_call_update",
+        toolCallId: partial.toolCallId,
+        title: partial.title,
+        kind: partial.kind,
+        status: "pending",
+        ...partial.rawInput ? { rawInput: partial.rawInput } : {}
+      },
+      options: [
+        { optionId: "allow", name: "Allow", kind: "allow_once" },
+        { optionId: "reject", name: "Reject", kind: "reject_once" }
+      ],
+      signal: new AbortController().signal
+    });
+    return outcome.outcome === "selected" && outcome.optionId !== "reject" && outcome.optionId !== "reject_once" && outcome.optionId !== "reject_always";
+  } catch {
+    return false;
+  }
+}
+
+// src/client/acp-message-routing.ts
+function isBestEffortAckMethod(method) {
+  return method === "mcp/connect" || method === "mcp/message" || method === "mcp/disconnect" || method === "elicitation/create" || method === "elicitation/complete";
+}
+
+// src/client/acp-session.ts
 var ACPSession = class _ACPSession {
   transport;
   fileServer;
@@ -2767,6 +3077,12 @@ var ACPSession = class _ACPSession {
       error: { code, message }
     });
   }
+  responseSender() {
+    return {
+      sendResult: (id, result) => this.sendResult(id, result),
+      sendErrorResponse: (id, code, message) => this.sendErrorResponse(id, code, message)
+    };
+  }
   handleMessage(msg) {
     if (msg.id !== void 0 && (msg.result !== void 0 || msg.error !== void 0)) {
       const pending = this.pending.get(msg.id);
@@ -2781,29 +3097,32 @@ var ACPSession = class _ACPSession {
       return;
     }
     if (msg.method === "session/update") {
-      this.handleUpdate(msg);
+      handleAcpSessionUpdate(msg, this.scratch, (event) => this.emitProgress(event));
       return;
     }
     if (msg.method === "session/request_permission") {
-      void this.handlePermissionRequest(msg);
+      void handleAcpPermissionRequest(msg, this.permissionPolicy, this.responseSender());
       return;
     }
     if (msg.method === "fs/read_text_file" || msg.method === "fs/write_text_file") {
-      void this.handleFsRequest(msg);
+      void handleAcpFsRequest(
+        msg,
+        this.fileServer,
+        this.permissionPolicy,
+        this.responseSender()
+      );
       return;
     }
     if (msg.method?.startsWith("terminal/")) {
-      void this.handleTerminalRequest(msg);
-      return;
-    }
-    if (msg.method === "mcp/connect" || msg.method === "mcp/message" || msg.method === "mcp/disconnect") {
-      if (msg.id !== void 0) {
-        this.sendResult(msg.id, {}).catch(() => {
-        });
-      }
+      void handleAcpTerminalRequest(
+        msg,
+        this.terminalServer,
+        this.permissionPolicy,
+        this.responseSender()
+      );
       return;
     }
-    if (msg.method === "elicitation/create" || msg.method === "elicitation/complete") {
+    if (isBestEffortAckMethod(msg.method)) {
       if (msg.id !== void 0) {
         this.sendResult(msg.id, {}).catch(() => {
         });
@@ -2824,98 +3143,6 @@ var ACPSession = class _ACPSession {
       );
     }
   }
-  handleUpdate(msg) {
-    const update = msg.params?.update;
-    if (typeof update !== "object" || update === null) return;
-    const u = update;
-    this.emitProgress({ type: "raw", update: u });
-    switch (u.sessionUpdate) {
-      case "agent_message_chunk": {
-        const text = extractText(u.content);
-        if (text) {
-          this.scratch.text += text;
-          this.emitProgress({ type: "message", text });
-        }
-        return;
-      }
-      case "thought_chunk": {
-        const text = extractText(u.content);
-        if (text) {
-          this.scratch.thoughts += text;
-          this.emitProgress({ type: "thought", text });
-        }
-        return;
-      }
-      case "tool_call":
-      case "tool_call_update": {
-        this.captureToolCall(u, u.sessionUpdate === "tool_call");
-        return;
-      }
-      case "plan":
-        if (Array.isArray(u.entries)) {
-          this.scratch.plan = u.entries;
-          this.emitProgress({ type: "plan", entries: u.entries });
-        }
-        return;
-      case "usage_update":
-        if (typeof u.used === "number" && typeof u.size === "number") {
-          const usage = {
-            used: u.used,
-            size: u.size,
-            ...typeof u.cost === "object" && u.cost !== null ? { cost: u.cost } : {}
-          };
-          this.scratch.usage = usage;
-          this.emitProgress({ type: "usage", usage });
-        }
-        return;
-      case "available_commands_update":
-      case "current_mode_update":
-      case "config_option_update":
-      case "session_info_update":
-      case "user_message_chunk":
-      case "next_edit_suggestions":
-      case "elicitation":
-        return;
-      default:
-        return;
-    }
-  }
-  /**
-   * Fold a `tool_call` / `tool_call_update` notification into the scratch
-   * tool-call map (deduped by toolCallId), extract any `diff` content into
-   * the diffs list, and emit live progress.
-   */
-  captureToolCall(u, isNew) {
-    const toolCallId = typeof u.toolCallId === "string" ? u.toolCallId : "";
-    if (!toolCallId) return;
-    const prev = this.scratch.toolCalls.get(toolCallId);
-    const record = {
-      toolCallId,
-      title: typeof u.title === "string" ? u.title : prev?.title ?? toolCallId,
-      kind: typeof u.kind === "string" ? u.kind : prev?.kind,
-      status: typeof u.status === "string" ? u.status : prev?.status ?? (isNew ? "pending" : "in_progress"),
-      rawInput: isRecord(u.rawInput) ? u.rawInput : prev?.rawInput,
-      rawOutput: isRecord(u.rawOutput) ? u.rawOutput : prev?.rawOutput
-    };
-    this.scratch.toolCalls.set(toolCallId, record);
-    if (Array.isArray(u.content)) {
-      for (const c of u.content) {
-        if (c && typeof c === "object" && c.type === "diff") {
-          const diff = {
-            path: c.path,
-            oldText: c.oldText,
-            newText: c.newText
-          };
-          this.scratch.diffs.push(diff);
-          this.emitProgress({ type: "diff", diff });
-        }
-      }
-    }
-    this.emitProgress({
-      type: isNew ? "tool_call" : "tool_call_update",
-      toolCall: record
-    });
-  }
   emitProgress(event) {
     if (!this.progressHandler) return;
     try {
@@ -2926,217 +3153,11 @@ var ACPSession = class _ACPSession {
   /** Live progress handler installed for the duration of a `prompt()` turn. */
   progressHandler = null;
   // Per-prompt scratch state
-  scratch = { text: "", thoughts: "", toolCalls: /* @__PURE__ */ new Map(), diffs: [] };
+  scratch = createSessionScratch();
   resetScratch() {
-    this.scratch = { text: "", thoughts: "", toolCalls: /* @__PURE__ */ new Map(), diffs: [] };
-  }
-  async handlePermissionRequest(msg) {
-    const id = msg.id;
-    if (id === void 0) return;
-    const params = msg.params;
-    const toolCall = params?.toolCall;
-    const options = Array.isArray(params?.options) ? params.options : [];
-    if (!toolCall) {
-      await this.sendErrorResponse(id, -32602, "toolCall is required");
-      return;
-    }
-    const policyAbort = new AbortController();
-    try {
-      const outcome = await this.permissionPolicy({
-        toolCall,
-        options,
-        signal: policyAbort.signal
-      });
-      await this.sendResult(id, { outcome });
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      await this.sendErrorResponse(id, -32603, `permission policy failed: ${message}`);
-    }
-  }
-  /**
-   * Enforce authorization at privileged callback sinks (fs/write,
-   * terminal/create). Unlike `handlePermissionRequest` which responds to
-   * agent-initiated `session/request_permission` messages, this method is
-   * called by the handler BEFORE dispatching to FileServer/TerminalServer,
-   * closing the gap where the agent simply skips the voluntary permission
-   * request and sends the privileged callback directly.
-   *
-   * Uses the session's permission policy. The default
-   * (`readOnlyPermissionPolicy`) auto-approves only side-effect-free tool
-   * calls (read/search/fetch/think) and rejects everything else — this is
-   * the safe-by-default posture. For trusted local agents (CLI `acp spawn`,
-   * Director fan-out), inject `defaultPermissionPolicy` to grant
-   * write/execute access.
-   *
-   * Returns true if the callback is authorized, false if denied.
-   */
-  async authorizeCallback(partial) {
-    try {
-      const outcome = await this.permissionPolicy({
-        toolCall: {
-          sessionUpdate: "tool_call_update",
-          toolCallId: partial.toolCallId,
-          title: partial.title,
-          kind: partial.kind,
-          status: "pending",
-          ...partial.rawInput ? { rawInput: partial.rawInput } : {}
-        },
-        options: [
-          { optionId: "allow", name: "Allow", kind: "allow_once" },
-          { optionId: "reject", name: "Reject", kind: "reject_once" }
-        ],
-        signal: new AbortController().signal
-      });
-      return outcome.outcome === "selected" && outcome.optionId !== "reject" && outcome.optionId !== "reject_once" && outcome.optionId !== "reject_always";
-    } catch {
-      return false;
-    }
-  }
-  async handleFsRequest(msg) {
-    const id = msg.id;
-    if (id === void 0) return;
-    const params = msg.params;
-    if (!params?.path) {
-      await this.sendErrorResponse(id, -32602, "path is required");
-      return;
-    }
-    if (msg.method === "fs/write_text_file") {
-      const allowed = await this.authorizeCallback({
-        toolCallId: `acp-fs-write-${id}`,
-        title: `Write file: ${params.path}`,
-        kind: "edit",
-        rawInput: { path: params.path, sessionId: params.sessionId }
-      });
-      if (!allowed) {
-        await this.sendErrorResponse(id, -32602, "filesystem write denied by permission policy");
-        return;
-      }
-    }
-    try {
-      if (msg.method === "fs/read_text_file") {
-        const result = await this.fileServer.readTextFile({
-          sessionId: params.sessionId ?? "",
-          path: params.path
-        });
-        await this.sendResult(id, result);
-      } else {
-        await this.fileServer.writeTextFile({
-          sessionId: params.sessionId ?? "",
-          path: params.path,
-          content: params.content ?? ""
-        });
-        await this.sendResult(id, {});
-      }
-    } catch (err) {
-      const code = err instanceof FsError ? -32602 : -32603;
-      const message = err instanceof Error ? err.message : String(err);
-      await this.sendErrorResponse(id, code, message);
-    }
-  }
-  async handleTerminalRequest(msg) {
-    const id = msg.id;
-    if (id === void 0) return;
-    const params = msg.params ?? {};
-    try {
-      switch (msg.method) {
-        case "terminal/create": {
-          const allowed = await this.authorizeCallback({
-            toolCallId: `acp-terminal-create-${id}`,
-            title: `Run command: ${String(params.command ?? "")} ${(Array.isArray(params.args) ? params.args : []).join(" ")}`.trim(),
-            kind: "execute",
-            rawInput: {
-              command: params.command,
-              args: params.args,
-              cwd: params.cwd,
-              sessionId: params.sessionId
-            }
-          });
-          if (!allowed) {
-            await this.sendErrorResponse(id, -32602, "terminal create denied by permission policy");
-            return;
-          }
-          const createOpts = {
-            sessionId: String(params.sessionId ?? ""),
-            command: String(params.command ?? ""),
-            args: Array.isArray(params.args) ? params.args : []
-          };
-          if (Array.isArray(params.env)) {
-            createOpts.env = params.env;
-          }
-          if (typeof params.cwd === "string") {
-            createOpts.cwd = params.cwd;
-          }
-          if (typeof params.outputByteLimit === "number") {
-            createOpts.outputByteLimit = params.outputByteLimit;
-          }
-          const result = this.terminalServer.create(createOpts);
-          await this.sendResult(id, result);
-          return;
-        }
-        case "terminal/output": {
-          const terminalId = String(params.terminalId ?? "");
-          const out = this.terminalServer.output(terminalId);
-          await this.sendResult(id, out);
-          return;
-        }
-        case "terminal/wait_for_exit": {
-          const terminalId = String(params.terminalId ?? "");
-          const exit = await this.terminalServer.waitForExit(terminalId);
-          await this.sendResult(id, exit);
-          return;
-        }
-        case "terminal/kill": {
-          const terminalId = String(params.terminalId ?? "");
-          this.terminalServer.kill(terminalId);
-          await this.sendResult(id, {});
-          return;
-        }
-        case "terminal/release": {
-          const terminalId = String(params.terminalId ?? "");
-          this.terminalServer.release(terminalId);
-          await this.sendResult(id, {});
-          return;
-        }
-        default:
-          await this.sendErrorResponse(id, -32601, `unknown method: ${msg.method}`);
-      }
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      await this.sendErrorResponse(id, -32603, message);
-    }
+    this.scratch = createSessionScratch();
   }
 };
-function textContent(text) {
-  return { type: "text", text };
-}
-function imageContent(mimeType, data) {
-  return { type: "image", mimeType, data };
-}
-function audioContent(mimeType, data) {
-  return { type: "audio", mimeType, data };
-}
-function extractText(block) {
-  if (typeof block !== "object" || block === null) return "";
-  const b = block;
-  if (b.type === "text" && typeof b.text === "string") return b.text;
-  if (b.type === "resource" && b.resource && typeof b.resource === "object" && typeof b.resource.text === "string") {
-    return b.resource.text;
-  }
-  return "";
-}
-function isRecord(v) {
-  return typeof v === "object" && v !== null && !Array.isArray(v);
-}
-function emptyRunResult(stopReason) {
-  return {
-    text: "",
-    stopReason,
-    hasText: false,
-    toolCalls: [],
-    diffs: [],
-    thoughts: ""
-  };
-}
 
 // src/client/tool-translator.ts
 import { expectDefined as expectDefined2 } from "@wrongstack/core/utils";
@@ -3286,12 +3307,12 @@ async function benchOne(agentId, cmd, opts) {
           signal
         );
         fsOk = fsRes.text.includes(fileToken);
-        if (!fsOk) fsDetail = "agent did not return the file contents (may not have used a read tool)";
+        if (!fsOk)
+          fsDetail = "agent did not return the file contents (may not have used a read tool)";
       } catch (err) {
         fsDetail = err instanceof Error ? err.message : String(err);
       } finally {
-        await fsp2.rm(filePath, { force: true }).catch(() => {
-        });
+        await removeBenchFile(filePath);
       }
       checks.push({ name: "fs", ok: fsOk, detail: fsDetail });
     }
@@ -3306,8 +3327,7 @@ async function benchOne(agentId, cmd, opts) {
   }
   const required = checks.filter((c) => c.name !== "fs" || opts.checkFs);
   const allReq = required.every((c) => c.ok);
-  const handshakeOk = checks.find((c) => c.name === "handshake")?.ok === true;
-  const status = allReq ? "pass" : handshakeOk ? "partial" : "fail";
+  const status = allReq ? "pass" : "partial";
   return {
     agentId,
     status,
@@ -3399,7 +3419,9 @@ function renderAcpBenchText(result) {
   for (const r of result.results) {
     const checks = r.checks.map((c) => `${c.ok ? "\u2713" : "\u2717"}${c.name}`).join(" ");
     const timing = r.handshakeMs !== void 0 ? `  hs=${r.handshakeMs}ms${r.promptMs !== void 0 ? ` prompt=${r.promptMs}ms` : ""}` : "";
-    lines.push(`  ${icon(r.status)} ${r.agentId.padEnd(16)} ${r.status.toUpperCase().padEnd(7)} ${checks}${timing}`);
+    lines.push(
+      `  ${icon(r.status)} ${r.agentId.padEnd(16)} ${r.status.toUpperCase().padEnd(7)} ${checks}${timing}`
+    );
     if (r.agentInfo) lines.push(`      agent: ${r.agentInfo.name} ${r.agentInfo.version}`);
     if (r.sample) lines.push(`      reply: ${r.sample}`);
     if (r.reason) lines.push(`      reason: ${r.reason}`);
@@ -3411,6 +3433,9 @@ function renderAcpBenchText(result) {
   );
   return lines.join("\n");
 }
+async function removeBenchFile(filePath, remove = fsp2.rm) {
+  await remove(filePath, { force: true }).catch(() => void 0);
+}
 
 // src/registry/agents.catalog.ts
 var AGENTS_CATALOG = [
@@ -3799,16 +3824,8 @@ function mapACPKind(acpKind) {
   }
 }
 function isRetryable(kind) {
-  switch (kind) {
-    case "provider_5xx":
-    case "provider_rate_limit":
-    case "provider_timeout":
-    case "tool_threw":
-    case "budget_timeout":
-      return true;
-    default:
-      return false;
-  }
+  void kind;
+  return false;
 }
 var REGISTRY_ID_ALIASES = {
   "claude-code": "claude-acp",
@@ -3948,11 +3965,15 @@ async function probeAcpAgents(opts) {
   }
   await runPhase(local, opts.concurrency ?? 4, localTimeout);
   await runPhase(pkg, 2, pkgTimeout);
-  return ids.map((id) => byId.get(id) ?? { id, ok: false, ms: 0, error: "not probed" });
+  return ids.map((id) => byId.get(id));
 }
 
+// src/integration/ensemble-runner.ts
+import { SubagentBudget } from "@wrongstack/core/coordination";
+
 // src/registry/ensemble-registry.ts
 import { spawn as spawn2 } from "node:child_process";
+import { treeKill as treeKill2 } from "@wrongstack/core/utils/tree-kill";
 var PROBE_TIMEOUT_MS = 5e3;
 var PROBE_CACHE_MS = 5e3;
 var MAX_PARALLEL_PROBES = 4;
@@ -3976,7 +3997,7 @@ async function probeWithBound(items, worker, limit) {
   await Promise.all(runners);
   return results;
 }
-async function defaultProbe(desc, timeoutMs) {
+async function defaultProbe(desc, timeoutMs, spawnProcess = spawn2, platform = process.platform) {
   const start = Date.now();
   return new Promise((resolve3) => {
     let settled = false;
@@ -3986,7 +4007,9 @@ async function defaultProbe(desc, timeoutMs) {
       if (settled) return;
       settled = true;
       try {
-        child.kill();
+        if (child.exitCode === null && child.signalCode === null) {
+          treeKill2(child);
+        }
       } catch {
       }
       resolve3(result);
@@ -3994,8 +4017,8 @@ async function defaultProbe(desc, timeoutMs) {
     let child;
     try {
       const probeArgs = [...desc.probe.args ?? []];
-      const shim = process.platform === "win32" ? buildWin32CmdShimInvocation(desc.probe.command, probeArgs) : null;
-      child = spawn2(shim?.command ?? desc.probe.command, shim?.args ?? probeArgs, {
+      const shim = platform === "win32" ? buildWin32CmdShimInvocation(desc.probe.command, probeArgs) : null;
+      child = spawnProcess(shim?.command ?? desc.probe.command, shim?.args ?? probeArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         windowsHide: true,
         ...shim ? { windowsVerbatimArguments: shim.windowsVerbatimArguments } : {}
@@ -4028,7 +4051,7 @@ async function defaultProbe(desc, timeoutMs) {
       clearTimeout(timer);
       const durationMs = Date.now() - start;
       const out = (stdout + stderr).trim();
-      const isWindowsShellMiss = process.platform === "win32" && out.toLowerCase().includes("is not recognized");
+      const isWindowsShellMiss = platform === "win32" && out.toLowerCase().includes("is not recognized");
       if (isWindowsShellMiss) {
         finish({
           ok: false,
@@ -4040,7 +4063,7 @@ async function defaultProbe(desc, timeoutMs) {
       if (out.length > 0) {
         finish({
           ok: true,
-          version: out.split("\n")[0]?.trim() ?? "",
+          version: out.split("\n")[0].trim(),
           path: desc.probe.command,
           durationMs
         });
@@ -4116,7 +4139,6 @@ var EnsembleRegistry = class {
 };
 
 // src/integration/ensemble-runner.ts
-import { SubagentBudget } from "@wrongstack/core/coordination";
 var DEFAULT_MAX_CONCURRENCY = 4;
 async function mapBound(items, worker, limit) {
   const results = new Array(items.length);
@@ -4259,10 +4281,7 @@ async function runEnsemble(opts) {
     }
     runnable.push({ id, cmd });
   }
-  const concurrency = Math.max(
-    1,
-    opts.maxConcurrency ?? DEFAULT_MAX_CONCURRENCY
-  );
+  const concurrency = Math.max(1, opts.maxConcurrency ?? DEFAULT_MAX_CONCURRENCY);
   await mapBound(
     runnable,
     async ({ id, cmd }) => {
@@ -4311,15 +4330,11 @@ function renderEnsembleText(result) {
         );
         break;
       case "failed":
-        lines.push(
-          `[${r.error?.kind ?? "unknown"}] ${r.error?.message ?? "failed"}`
-        );
+        lines.push(`[${r.error?.kind ?? "unknown"}] ${r.error?.message ?? "failed"}`);
         lines.push(`[${r.agentId}] failed  ${r.durationMs}ms`);
         break;
       case "cancelled":
-        lines.push(
-          `[${r.error?.kind ?? "aborted"}] ${r.error?.message ?? "cancelled"}`
-        );
+        lines.push(`[${r.error?.kind ?? "aborted"}] ${r.error?.message ?? "cancelled"}`);
         lines.push(`[${r.agentId}] cancelled  ${r.durationMs}ms`);
         break;
       case "skipped":
@@ -4381,15 +4396,14 @@ async function runOneAcpTask(opts) {
 
 // src/registry/acp-registry-fetch.ts
 var ACP_REGISTRY_URL = "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json";
-function currentPlatformKey() {
-  const os = process.platform === "win32" ? "windows" : process.platform === "darwin" ? "darwin" : "linux";
-  const arch = process.arch === "arm64" ? "aarch64" : process.arch === "x64" ? "x86_64" : process.arch;
+function currentPlatformKey(platform = process.platform, architecture = process.arch) {
+  const os = platform === "win32" ? "windows" : platform === "darwin" ? "darwin" : "linux";
+  const arch = architecture === "arm64" ? "aarch64" : architecture === "x64" ? "x86_64" : architecture;
   return `${os}-${arch}`;
 }
 function basename(cmd) {
   const cleaned = cmd.replace(/^\.\//, "").replace(/\\/g, "/");
-  const parts = cleaned.split("/");
-  return parts[parts.length - 1] || cleaned;
+  return cleaned.slice(cleaned.lastIndexOf("/") + 1);
 }
 function mapRegistryEntry(entry, platformKey = currentPlatformKey()) {
   if (!entry || typeof entry.id !== "string" || entry.id.length === 0) return null;