@wrongstack/acp 1.0.27 → 1.0.29

package/dist/agent/server-agent-turn.d.ts

@@ -162,8 +162,10 @@ declare function isRecord(v: unknown): v is Record<string, unknown>;
  * When the prompt is all text we return a plain string (the common,
  * cheapest path). When it carries images we build a multimodal
  * `ContentBlock[]` the provider can pass to a vision-capable model.
- * Audio and resource blocks have no core representation yet, so they're
- * recorded as bracketed text placeholders alongside the other content.
+ * Images go through core's shared ingest (allowlist, base64, size and count
+ * caps, the bytes decide the media type): the client's label used to reach
+ * the provider unchecked. Every other block renders as in the text path, so
+ * an embedded resource keeps its `[embedded resource: <uri>]` header.
  */
 declare function promptToAgentInput(blocks: readonly ContentBlock[]): AgentInput;
 /**

package/dist/agent/stdio-transport.d.ts

@@ -55,6 +55,13 @@ export interface ACPClientTransport {
      * message stream via onMessage, so claim semantics are not needed.
      */
     onMessageClaim?(handler: (msg: ACPMessage) => boolean): () => void;
+    /**
+     * Called once when the connection ends for any reason (the agent exited,
+     * the socket closed, a frame limit tripped, stop()). Optional for custom
+     * transports; without it a client learns of a dead agent only when each
+     * in-flight request times out.
+     */
+    onClose?(handler: (reason: string) => void): () => void;
     stop(): void;
 }
 export declare class StdioTransport implements AgentServerTransport {
@@ -134,6 +141,7 @@ export declare class ClientTransport implements ACPClientTransport {
     private buffer;
     private readonly handlers;
     private readonly claimHandlers;
+    private readonly closeHandlers;
     private closed;
     private resolveRead;
     private messageQueue;
@@ -158,7 +166,10 @@ export declare class ClientTransport implements ACPClientTransport {
      * the gating logic.
      */
     onMessageClaim(handler: (msg: ACPMessage) => boolean): () => void;
-    stop(): void;
+    onClose(handler: (reason: string) => void): () => void;
+    /** Tell close listeners once; the handlers are dropped with the connection. */
+    private notifyClosed;
+    stop(reason?: string): void;
     private onChildData;
     private onChildError;
     private onChildClose;

package/dist/agent.js

@@ -294,7 +294,7 @@ async function handleSessionLoadOp(ctx, id, params, replayHistory = true) {
         await ctx.sendError(id, -32602, `cwd must be an absolute path to an existing directory`);
         return false;
       }
-      const candidateCwd = persisted.cwd ?? loadCwd ?? ctx.defaultCwd;
+      const candidateCwd = loadCwd ?? persisted.cwd ?? ctx.defaultCwd;
       const restoredCwd = await resolveSessionCwd(candidateCwd) ?? ctx.defaultCwd;
       const restored = {
         id: sessionId,
@@ -475,6 +475,7 @@ async function handleSessionPromptOp(ctx, id, params) {
   let result;
   const pendingNotifications = [];
   const emit = (update) => {
+    if (ctx.sessions.get(sessionId) !== session) return;
     const notifPromise = ctx.sendNotification({ sessionId, update });
     pendingNotifications.push(notifPromise.catch(() => {
     }));
@@ -534,6 +535,7 @@ async function handleSetModeOp(ctx, id, params) {
       modeId
     }
   });
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, {});
   return false;
 }
@@ -559,7 +561,7 @@ async function handleSetConfigOptionOp(ctx, id, params) {
       configOptions: options
     }
   });
-  await ctx.persist(session);
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, { configOptions: options });
   return false;
 }
@@ -976,6 +978,7 @@ var ACPProtocolHandler = class {
 };
 
 // src/agent/server-agent-turn.ts
+import { parseIncomingImages } from "@wrongstack/core/utils";
 function makeACPServerAgentTurn(opts) {
   const agents = /* @__PURE__ */ new Map();
   const timeouts = /* @__PURE__ */ new Map();
@@ -987,6 +990,7 @@ function makeACPServerAgentTurn(opts) {
   const maxHistoryBytes = finitePositiveLimit(opts.maxHistoryBytes, 8 * 1024 * 1024);
   const deliveryNoticeDebounceMs = finiteNonNegativeLimit(opts.deliveryNoticeDebounceMs, 1500);
   const notifiers = /* @__PURE__ */ new Map();
+  const liveTurns = /* @__PURE__ */ new Map();
   const stillPending = (sessionId) => {
     if (!opts.pendingDeliveries) return true;
     try {
@@ -1056,6 +1060,9 @@ function makeACPServerAgentTurn(opts) {
     return state;
   };
   const turn = async (input, emit, api) => {
+    const token = Symbol(input.sessionId);
+    liveTurns.set(input.sessionId, token);
+    const alive = () => liveTurns.get(input.sessionId) === token;
     let agent = agents.get(input.sessionId);
     if (!agent) {
       agent = await opts.agentFor(
@@ -1064,6 +1071,12 @@ function makeACPServerAgentTurn(opts) {
         api,
         input.mcpServers
       );
+      if (!alive()) {
+        const stale = agent;
+        void Promise.resolve().then(() => stale.teardown?.()).catch(() => {
+        });
+        return { stopReason: "cancelled" };
+      }
       agents.set(input.sessionId, agent);
       if (pendingSeed.has(input.sessionId)) {
         pendingSeed.delete(input.sessionId);
@@ -1129,10 +1142,11 @@ function makeACPServerAgentTurn(opts) {
           content: { type: "text", text }
         });
       }
+      const record = alive();
       const userText = promptToText(input.prompt);
       const hist = history.get(input.sessionId) ?? [];
       let retainedHistoryBytes = historyBytes.get(input.sessionId) ?? 0;
-      if (userText) {
+      if (record && userText) {
         const update = {
           sessionUpdate: "user_message_chunk",
           content: { type: "text", text: userText }
@@ -1140,7 +1154,7 @@ function makeACPServerAgentTurn(opts) {
         hist.push(update);
         retainedHistoryBytes += replayEntryBytes(update);
       }
-      if (text) {
+      if (record && text) {
         const update = {
           sessionUpdate: "agent_message_chunk",
           content: { type: "text", text }
@@ -1188,6 +1202,7 @@ function makeACPServerAgentTurn(opts) {
       if (usage) result_out.usage = usage;
       return result_out;
     } finally {
+      if (alive()) liveTurns.delete(input.sessionId);
       clearTimeout(timer);
       timeouts.delete(input.sessionId);
       input.signal.removeEventListener("abort", onParentAbort);
@@ -1214,6 +1229,7 @@ function makeACPServerAgentTurn(opts) {
     pendingSeed.add(sessionId);
   };
   const dispose = (sessionId) => {
+    liveTurns.delete(sessionId);
     const timer = timeouts.get(sessionId);
     if (timer) clearTimeout(timer);
     timeouts.delete(sessionId);
@@ -1322,26 +1338,24 @@ function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function promptToAgentInput(blocks) {
-  const hasImage = blocks.some((b) => b.type === "image");
-  if (!hasImage) {
+  const images = blocks.filter((b) => b.type === "image");
+  if (images.length === 0) {
     return promptToText(blocks);
   }
+  let parsed;
+  try {
+    parsed = parseIncomingImages(images.map((b) => ({ data: b.data, mediaType: b.mimeType })));
+  } catch (err) {
+    throw Object.assign(new Error(err.message), { code: -32602 });
+  }
   const out = [];
+  let next = 0;
   for (const b of blocks) {
-    if (b.type === "text") {
-      out.push({ type: "text", text: b.text });
-    } else if (b.type === "image") {
-      out.push({
-        type: "image",
-        source: { type: "base64", media_type: b.mimeType, data: b.data }
-      });
-    } else if (b.type === "audio") {
-      out.push({ type: "text", text: `[audio: ${b.mimeType}]` });
-    } else if (b.type === "resource") {
-      const text = "text" in b.resource && typeof b.resource.text === "string" ? b.resource.text : `[embedded resource: ${b.resource.uri}]`;
-      out.push({ type: "text", text });
-    } else if (b.type === "resource_link") {
-      out.push({ type: "text", text: `[resource link: ${b.uri}]` });
+    if (b.type === "image") out.push(parsed[next++]);
+    else if (b.type === "text") out.push({ type: "text", text: b.text });
+    else {
+      const text = promptToText([b]);
+      if (text) out.push({ type: "text", text });
     }
   }
   return out;
@@ -2096,16 +2110,17 @@ var WrongStackACPServer = class {
         return;
       }
       const MAX_HTTP_BODY = 10 * 1024 * 1024;
-      let body = "";
+      const chunks = [];
       let bodyBytes = 0;
       let tooLarge = false;
       for await (const chunk of req) {
         bodyBytes += chunk.length;
         if (bodyBytes > MAX_HTTP_BODY) {
           tooLarge = true;
-          break;
+          chunks.length = 0;
+          if (bodyBytes > 2 * MAX_HTTP_BODY) break;
         }
-        body += chunk;
+        if (!tooLarge) chunks.push(chunk);
       }
       if (tooLarge) {
         res.writeHead(413, { "Content-Type": "application/json" });
@@ -2114,7 +2129,7 @@ var WrongStackACPServer = class {
       }
       let msg;
       try {
-        msg = JSON.parse(body);
+        msg = JSON.parse(Buffer.concat(chunks).toString("utf8"));
       } catch {
         res.writeHead(400);
         res.end(JSON.stringify({ error: { code: -32700, message: "Parse error" } }));

package/dist/client/acp-request-state.d.ts

@@ -6,4 +6,11 @@ export interface PendingRequest {
     timeoutHandle: ReturnType<typeof setTimeout>;
 }
 export type State = 'init' | 'ready' | 'authenticated' | 'sessioning' | 'prompting' | 'done' | 'closed';
+/**
+ * Fail and forget every in-flight request. Without a `reason` the session was
+ * closed locally; with one, the agent connection ended (the process exited,
+ * the socket closed), so no reply can arrive and waiting out each request's
+ * timeout would only stall the caller.
+ */
+export declare function rejectPendingRequests(pending: Map<string | number, PendingRequest>, reason?: string): void;
 //# sourceMappingURL=acp-request-state.d.ts.map

package/dist/client/websocket-transport.d.ts

@@ -31,6 +31,7 @@ export interface WebSocketClientTransportOptions {
 export declare class WebSocketClientTransport implements ACPClientTransport {
     private ws;
     private readonly handlers;
+    private readonly closeHandlers;
     private closed;
     private readonly opts;
     private readonly maxBufferedBytes;
@@ -41,7 +42,10 @@ export declare class WebSocketClientTransport implements ACPClientTransport {
     start(): Promise<void>;
     send(msg: ACPMessage): Promise<void>;
     onMessage(handler: (msg: ACPMessage) => void): () => void;
-    stop(): void;
+    onClose(handler: (reason: string) => void): () => void;
+    /** Tell close listeners once; the handlers are dropped with the connection. */
+    private notifyClosed;
+    stop(reason?: string): void;
     private onData;
     private dispatch;
 }

package/dist/client.js

@@ -29,6 +29,7 @@ var ClientTransport = class {
   buffer = "";
   handlers = /* @__PURE__ */ new Set();
   claimHandlers = /* @__PURE__ */ new Set();
+  closeHandlers = /* @__PURE__ */ new Set();
   closed = false;
   resolveRead = null;
   messageQueue = [];
@@ -136,6 +137,7 @@ var ClientTransport = class {
   }
   send(msg) {
     if (!this.child) return Promise.reject(new Error("ClientTransport not started"));
+    if (this.closed) return Promise.reject(new Error("ClientTransport is closed"));
     return new Promise((resolve3, reject) => {
       const line = JSON.stringify(msg) + "\n";
       this.child?.stdin.write(line, "utf8", (err) => {
@@ -173,7 +175,22 @@ var ClientTransport = class {
     this.claimHandlers.add(handler);
     return () => this.claimHandlers.delete(handler);
   }
-  stop() {
+  onClose(handler) {
+    this.closeHandlers.add(handler);
+    return () => this.closeHandlers.delete(handler);
+  }
+  /** Tell close listeners once; the handlers are dropped with the connection. */
+  notifyClosed(reason) {
+    const handlers = [...this.closeHandlers];
+    this.closeHandlers.clear();
+    for (const handler of handlers) {
+      try {
+        handler(reason);
+      } catch {
+      }
+    }
+  }
+  stop(reason = "transport stopped") {
     this.closed = true;
     this.resolveRead?.(null);
     this.resolveRead = null;
@@ -182,6 +199,7 @@ var ClientTransport = class {
     this.queuedChars = 0;
     this.handlers.clear();
     this.claimHandlers.clear();
+    this.notifyClosed(reason);
     const child = this.child;
     if (!child) return;
     treeKill(child);
@@ -193,7 +211,7 @@ var ClientTransport = class {
     if (this.buffer.length > this.maxFrameChars) {
       writeErr(`[acp-child pending frame exceeds ${this.maxFrameChars} characters]
 `);
-      this.stop();
+      this.stop(`agent frame exceeds ${this.maxFrameChars} characters`);
       return;
     }
     for (const raw of lines) {
@@ -201,7 +219,7 @@ var ClientTransport = class {
       if (raw.length > this.maxFrameChars) {
         writeErr(`[acp-child frame exceeds ${this.maxFrameChars} characters]
 `);
-        this.stop();
+        this.stop(`agent frame exceeds ${this.maxFrameChars} characters`);
         return;
       }
       try {
@@ -227,6 +245,7 @@ var ClientTransport = class {
       writeErr(`[acp-child exited with code ${code}]
 `);
     }
+    this.notifyClosed(`agent process exited with code ${code}`);
   }
   dispatch(msg, chars = JSON.stringify(msg).length) {
     if (this.resolveRead) {
@@ -373,6 +392,16 @@ function isAuthRequiredError(err) {
   return false;
 }
 
+// src/client/acp-request-state.ts
+function rejectPendingRequests(pending, reason) {
+  for (const p of pending.values()) {
+    clearTimeout(p.timeoutHandle);
+    const message = reason === void 0 ? "session was closed" : `agent connection closed (${reason}) during ${p.method}`;
+    p.reject(new ACPSessionError("closed", message));
+  }
+  pending.clear();
+}
+
 // src/client/acp-session-ops.ts
 function filterMcpServers(agentCapabilities, servers) {
   if (!servers || servers.length === 0) return [];
@@ -1650,7 +1679,7 @@ function isAllowed(decision) {
 }
 function toTrustBoundaryRequest(request, options) {
   const rawSessionId = request.toolCall.rawInput?.sessionId;
-  const sessionId = typeof rawSessionId === "string" && rawSessionId.length > 0 ? rawSessionId : options.actor?.sessionId;
+  const sessionId = options.actor?.sessionId ?? (typeof rawSessionId === "string" && rawSessionId.length > 0 ? rawSessionId : void 0);
   return {
     version: 1,
     requestId: String(request.toolCall.toolCallId),
@@ -1686,6 +1715,7 @@ function makeTrustBoundaryPermissionPolicy(options) {
 var WebSocketClientTransport = class {
   ws = null;
   handlers = /* @__PURE__ */ new Set();
+  closeHandlers = /* @__PURE__ */ new Set();
   closed = false;
   opts;
   maxBufferedBytes;
@@ -1712,6 +1742,7 @@ var WebSocketClientTransport = class {
     const timeoutMs = this.opts.handshakeTimeoutMs ?? 3e4;
     return new Promise((resolve3, reject) => {
       const ws = new WS(this.opts.url, this.opts.protocols);
+      ws.binaryType = "arraybuffer";
       this.ws = ws;
       const timer = setTimeout(() => {
         const pending = this.pendingStart;
@@ -1737,7 +1768,7 @@ var WebSocketClientTransport = class {
       ws.addEventListener("error", (ev) => {
         const pending = this.pendingStart;
         if (pending === null) {
-          this.stop();
+          this.stop("WebSocket error");
           return;
         }
         this.pendingStart = null;
@@ -1758,6 +1789,7 @@ var WebSocketClientTransport = class {
           clearTimeout(pending.timer);
           pending.reject(new Error("WebSocket closed before the connection opened"));
         }
+        this.notifyClosed("WebSocket closed");
       });
       ws.addEventListener("message", (ev) => {
         this.onData(ev.data);
@@ -1785,9 +1817,25 @@ var WebSocketClientTransport = class {
     this.handlers.add(handler);
     return () => this.handlers.delete(handler);
   }
-  stop() {
+  onClose(handler) {
+    this.closeHandlers.add(handler);
+    return () => this.closeHandlers.delete(handler);
+  }
+  /** Tell close listeners once; the handlers are dropped with the connection. */
+  notifyClosed(reason) {
+    const handlers = [...this.closeHandlers];
+    this.closeHandlers.clear();
+    for (const handler of handlers) {
+      try {
+        handler(reason);
+      } catch {
+      }
+    }
+  }
+  stop(reason = "transport stopped") {
     this.closed = true;
     this.handlers.clear();
+    this.notifyClosed(reason);
     if (this.pendingStart !== null) {
       const pending = this.pendingStart;
       this.pendingStart = null;
@@ -1808,7 +1856,7 @@ var WebSocketClientTransport = class {
   onData(data) {
     const text = typeof data === "string" ? data : data instanceof ArrayBuffer ? Buffer.from(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
     if (text.length > this.maxMessageChars) {
-      this.stop();
+      this.stop(`agent message exceeds ${this.maxMessageChars} characters`);
       return;
     }
     if (!text.trim()) return;
@@ -1977,6 +2025,10 @@ var ACPSession = class _ACPSession {
     }
     const session = new _ACPSession(opts, transport);
     session.transportOff = transport.onMessage((msg) => session.handleMessage(msg));
+    transport.onClose?.((reason) => {
+      if (!session.closed) rejectPendingRequests(session.pending, reason);
+      void session.close();
+    });
     try {
       await session.initialize();
     } catch (err) {
@@ -2103,6 +2155,9 @@ var ACPSession = class _ACPSession {
     if (this.state !== "ready" && this.state !== "authenticated" && this.state !== "done") {
       throw new ACPSessionError("protocol_error", `prompt called in state=${this.state}`);
     }
+    if (this.promptCallbackAbort) {
+      throw new ACPSessionError("protocol_error", "prompt called while another prompt is running");
+    }
     if (signal.aborted) {
       return emptyRunResult("cancelled");
     }
@@ -2144,10 +2199,6 @@ var ACPSession = class _ACPSession {
           createPromise,
           new Promise((_, reject) => {
             rejectCreate = reject;
-            if (signal.aborted) {
-              reject(new ACPSessionError("aborted", "prompt was aborted by the parent"));
-              return;
-            }
             signal.addEventListener("abort", onCreateAbort, { once: true });
           })
         ]);
@@ -2165,15 +2216,10 @@ var ACPSession = class _ACPSession {
       }
       signal.removeEventListener("abort", onCreateAbort);
       rejectCreate = void 0;
-      if (typeof sessionId !== "string" || sessionId.length === 0) {
-        signal.removeEventListener("abort", onAbort);
-        this.promptCallbackAbort?.abort();
-        this.promptCallbackAbort = null;
-        throw new ACPSessionError("protocol_error", "session/new returned no session id");
-      }
       this.sessionId = sessionId;
     }
     if (signal.aborted) {
+      this.promptCallbackAbort = null;
       return emptyRunResult("cancelled");
     }
     this.resetScratch();
@@ -2281,11 +2327,7 @@ var ACPSession = class _ACPSession {
       } catch {
       }
     }
-    for (const [, p] of this.pending) {
-      clearTimeout(p.timeoutHandle);
-      p.reject(new ACPSessionError("closed", "session was closed"));
-    }
-    this.pending.clear();
+    rejectPendingRequests(this.pending);
     this.transportOff?.();
     this.transportOff = null;
     try {
@@ -2384,6 +2426,8 @@ var ACPSession = class _ACPSession {
       return;
     }
     if (msg.method === "session/update") {
+      const updateSessionId = msg.params?.sessionId;
+      if (typeof updateSessionId === "string" && updateSessionId !== this.sessionId) return;
       handleAcpSessionUpdate(msg, this.scratch, (event) => this.emitProgress(event));
       return;
     }
@@ -2501,6 +2545,7 @@ async function makeACPSubagentRunnerWithStop(options) {
   const timeoutMs = options.timeoutMs ?? 5 * 6e4;
   const persistent = options.persistent === true;
   let shared = null;
+  let turns = Promise.resolve();
   const startSession = async () => {
     return ACPSession.start({
       command: options.command,
@@ -2516,10 +2561,17 @@ async function makeACPSubagentRunnerWithStop(options) {
   };
   const runner = async (task, ctx) => {
     let session;
-    const reuse = persistent && shared !== null;
     try {
-      session = reuse ? shared : await startSession();
-      if (persistent) shared = session;
+      if (persistent) {
+        shared ??= startSession();
+        const starting = shared;
+        session = await starting.catch((err) => {
+          if (shared === starting) shared = null;
+          throw err;
+        });
+      } else {
+        session = await startSession();
+      }
     } catch (err) {
       throw acpErrorToSubagentError(err, options.role ?? "acp-subagent");
     }
@@ -2536,7 +2588,10 @@ async function makeACPSubagentRunnerWithStop(options) {
     };
     let result;
     try {
-      result = await session.prompt([textContent(task.description)], ctx.signal, onProgress);
+      const turn = () => session.prompt([textContent(task.description)], ctx.signal, onProgress);
+      const run = persistent ? turns.then(turn, turn) : turn();
+      if (persistent) turns = run;
+      result = await run;
     } catch (err) {
       throw acpErrorToSubagentError(err, options.role ?? "acp-subagent");
     } finally {
@@ -2557,10 +2612,10 @@ async function makeACPSubagentRunnerWithStop(options) {
   };
   const stop = async () => {
     if (shared) {
-      const s = shared;
+      const starting = shared;
       shared = null;
       try {
-        await s.close();
+        await (await starting).close();
       } catch {
       }
     }

package/dist/index.js

@@ -297,7 +297,7 @@ async function handleSessionLoadOp(ctx, id, params, replayHistory = true) {
         await ctx.sendError(id, -32602, `cwd must be an absolute path to an existing directory`);
         return false;
       }
-      const candidateCwd = persisted.cwd ?? loadCwd ?? ctx.defaultCwd;
+      const candidateCwd = loadCwd ?? persisted.cwd ?? ctx.defaultCwd;
       const restoredCwd = await resolveSessionCwd(candidateCwd) ?? ctx.defaultCwd;
       const restored = {
         id: sessionId,
@@ -478,6 +478,7 @@ async function handleSessionPromptOp(ctx, id, params) {
   let result;
   const pendingNotifications = [];
   const emit = (update) => {
+    if (ctx.sessions.get(sessionId) !== session) return;
     const notifPromise = ctx.sendNotification({ sessionId, update });
     pendingNotifications.push(notifPromise.catch(() => {
     }));
@@ -537,6 +538,7 @@ async function handleSetModeOp(ctx, id, params) {
       modeId
     }
   });
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, {});
   return false;
 }
@@ -562,7 +564,7 @@ async function handleSetConfigOptionOp(ctx, id, params) {
       configOptions: options
     }
   });
-  await ctx.persist(session);
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, { configOptions: options });
   return false;
 }
@@ -1170,6 +1172,7 @@ var ClientTransport = class {
   buffer = "";
   handlers = /* @__PURE__ */ new Set();
   claimHandlers = /* @__PURE__ */ new Set();
+  closeHandlers = /* @__PURE__ */ new Set();
   closed = false;
   resolveRead = null;
   messageQueue = [];
@@ -1277,6 +1280,7 @@ var ClientTransport = class {
   }
   send(msg) {
     if (!this.child) return Promise.reject(new Error("ClientTransport not started"));
+    if (this.closed) return Promise.reject(new Error("ClientTransport is closed"));
     return new Promise((resolve5, reject) => {
       const line = JSON.stringify(msg) + "\n";
       this.child?.stdin.write(line, "utf8", (err) => {
@@ -1314,7 +1318,22 @@ var ClientTransport = class {
     this.claimHandlers.add(handler);
     return () => this.claimHandlers.delete(handler);
   }
-  stop() {
+  onClose(handler) {
+    this.closeHandlers.add(handler);
+    return () => this.closeHandlers.delete(handler);
+  }
+  /** Tell close listeners once; the handlers are dropped with the connection. */
+  notifyClosed(reason) {
+    const handlers = [...this.closeHandlers];
+    this.closeHandlers.clear();
+    for (const handler of handlers) {
+      try {
+        handler(reason);
+      } catch {
+      }
+    }
+  }
+  stop(reason = "transport stopped") {
     this.closed = true;
     this.resolveRead?.(null);
     this.resolveRead = null;
@@ -1323,6 +1342,7 @@ var ClientTransport = class {
     this.queuedChars = 0;
     this.handlers.clear();
     this.claimHandlers.clear();
+    this.notifyClosed(reason);
     const child = this.child;
     if (!child) return;
     treeKill(child);
@@ -1334,7 +1354,7 @@ var ClientTransport = class {
     if (this.buffer.length > this.maxFrameChars) {
       writeErr(`[acp-child pending frame exceeds ${this.maxFrameChars} characters]
 `);
-      this.stop();
+      this.stop(`agent frame exceeds ${this.maxFrameChars} characters`);
       return;
     }
     for (const raw of lines) {
@@ -1342,7 +1362,7 @@ var ClientTransport = class {
       if (raw.length > this.maxFrameChars) {
         writeErr(`[acp-child frame exceeds ${this.maxFrameChars} characters]
 `);
-        this.stop();
+        this.stop(`agent frame exceeds ${this.maxFrameChars} characters`);
         return;
       }
       try {
@@ -1368,6 +1388,7 @@ var ClientTransport = class {
       writeErr(`[acp-child exited with code ${code}]
 `);
     }
+    this.notifyClosed(`agent process exited with code ${code}`);
   }
   dispatch(msg, chars = JSON.stringify(msg).length) {
     if (this.resolveRead) {
@@ -1643,16 +1664,17 @@ var WrongStackACPServer = class {
         return;
       }
       const MAX_HTTP_BODY = 10 * 1024 * 1024;
-      let body = "";
+      const chunks = [];
       let bodyBytes = 0;
       let tooLarge = false;
       for await (const chunk of req) {
         bodyBytes += chunk.length;
         if (bodyBytes > MAX_HTTP_BODY) {
           tooLarge = true;
-          break;
+          chunks.length = 0;
+          if (bodyBytes > 2 * MAX_HTTP_BODY) break;
         }
-        body += chunk;
+        if (!tooLarge) chunks.push(chunk);
       }
       if (tooLarge) {
         res.writeHead(413, { "Content-Type": "application/json" });
@@ -1661,7 +1683,7 @@ var WrongStackACPServer = class {
       }
       let msg;
       try {
-        msg = JSON.parse(body);
+        msg = JSON.parse(Buffer.concat(chunks).toString("utf8"));
       } catch {
         res.writeHead(400);
         res.end(JSON.stringify({ error: { code: -32700, message: "Parse error" } }));
@@ -1895,6 +1917,16 @@ function isAuthRequiredError(err) {
   return false;
 }
 
+// src/client/acp-request-state.ts
+function rejectPendingRequests(pending, reason) {
+  for (const p of pending.values()) {
+    clearTimeout(p.timeoutHandle);
+    const message = reason === void 0 ? "session was closed" : `agent connection closed (${reason}) during ${p.method}`;
+    p.reject(new ACPSessionError("closed", message));
+  }
+  pending.clear();
+}
+
 // src/client/acp-session-ops.ts
 function filterMcpServers(agentCapabilities, servers) {
   if (!servers || servers.length === 0) return [];
@@ -3172,7 +3204,7 @@ function isAllowed(decision) {
 }
 function toTrustBoundaryRequest(request, options) {
   const rawSessionId = request.toolCall.rawInput?.sessionId;
-  const sessionId = typeof rawSessionId === "string" && rawSessionId.length > 0 ? rawSessionId : options.actor?.sessionId;
+  const sessionId = options.actor?.sessionId ?? (typeof rawSessionId === "string" && rawSessionId.length > 0 ? rawSessionId : void 0);
   return {
     version: 1,
     requestId: String(request.toolCall.toolCallId),
@@ -3208,6 +3240,7 @@ function makeTrustBoundaryPermissionPolicy(options) {
 var WebSocketClientTransport = class {
   ws = null;
   handlers = /* @__PURE__ */ new Set();
+  closeHandlers = /* @__PURE__ */ new Set();
   closed = false;
   opts;
   maxBufferedBytes;
@@ -3234,6 +3267,7 @@ var WebSocketClientTransport = class {
     const timeoutMs = this.opts.handshakeTimeoutMs ?? 3e4;
     return new Promise((resolve5, reject) => {
       const ws = new WS(this.opts.url, this.opts.protocols);
+      ws.binaryType = "arraybuffer";
       this.ws = ws;
       const timer = setTimeout(() => {
         const pending = this.pendingStart;
@@ -3259,7 +3293,7 @@ var WebSocketClientTransport = class {
       ws.addEventListener("error", (ev) => {
         const pending = this.pendingStart;
         if (pending === null) {
-          this.stop();
+          this.stop("WebSocket error");
           return;
         }
         this.pendingStart = null;
@@ -3280,6 +3314,7 @@ var WebSocketClientTransport = class {
           clearTimeout(pending.timer);
           pending.reject(new Error("WebSocket closed before the connection opened"));
         }
+        this.notifyClosed("WebSocket closed");
       });
       ws.addEventListener("message", (ev) => {
         this.onData(ev.data);
@@ -3307,9 +3342,25 @@ var WebSocketClientTransport = class {
     this.handlers.add(handler);
     return () => this.handlers.delete(handler);
   }
-  stop() {
+  onClose(handler) {
+    this.closeHandlers.add(handler);
+    return () => this.closeHandlers.delete(handler);
+  }
+  /** Tell close listeners once; the handlers are dropped with the connection. */
+  notifyClosed(reason) {
+    const handlers = [...this.closeHandlers];
+    this.closeHandlers.clear();
+    for (const handler of handlers) {
+      try {
+        handler(reason);
+      } catch {
+      }
+    }
+  }
+  stop(reason = "transport stopped") {
     this.closed = true;
     this.handlers.clear();
+    this.notifyClosed(reason);
     if (this.pendingStart !== null) {
       const pending = this.pendingStart;
       this.pendingStart = null;
@@ -3330,7 +3381,7 @@ var WebSocketClientTransport = class {
   onData(data) {
     const text = typeof data === "string" ? data : data instanceof ArrayBuffer ? Buffer.from(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
     if (text.length > this.maxMessageChars) {
-      this.stop();
+      this.stop(`agent message exceeds ${this.maxMessageChars} characters`);
       return;
     }
     if (!text.trim()) return;
@@ -3499,6 +3550,10 @@ var ACPSession = class _ACPSession {
     }
     const session = new _ACPSession(opts, transport);
     session.transportOff = transport.onMessage((msg) => session.handleMessage(msg));
+    transport.onClose?.((reason) => {
+      if (!session.closed) rejectPendingRequests(session.pending, reason);
+      void session.close();
+    });
     try {
       await session.initialize();
     } catch (err) {
@@ -3625,6 +3680,9 @@ var ACPSession = class _ACPSession {
     if (this.state !== "ready" && this.state !== "authenticated" && this.state !== "done") {
       throw new ACPSessionError("protocol_error", `prompt called in state=${this.state}`);
     }
+    if (this.promptCallbackAbort) {
+      throw new ACPSessionError("protocol_error", "prompt called while another prompt is running");
+    }
     if (signal.aborted) {
       return emptyRunResult("cancelled");
     }
@@ -3666,10 +3724,6 @@ var ACPSession = class _ACPSession {
           createPromise,
           new Promise((_, reject) => {
             rejectCreate = reject;
-            if (signal.aborted) {
-              reject(new ACPSessionError("aborted", "prompt was aborted by the parent"));
-              return;
-            }
             signal.addEventListener("abort", onCreateAbort, { once: true });
           })
         ]);
@@ -3687,15 +3741,10 @@ var ACPSession = class _ACPSession {
       }
       signal.removeEventListener("abort", onCreateAbort);
       rejectCreate = void 0;
-      if (typeof sessionId !== "string" || sessionId.length === 0) {
-        signal.removeEventListener("abort", onAbort);
-        this.promptCallbackAbort?.abort();
-        this.promptCallbackAbort = null;
-        throw new ACPSessionError("protocol_error", "session/new returned no session id");
-      }
       this.sessionId = sessionId;
     }
     if (signal.aborted) {
+      this.promptCallbackAbort = null;
       return emptyRunResult("cancelled");
     }
     this.resetScratch();
@@ -3803,11 +3852,7 @@ var ACPSession = class _ACPSession {
       } catch {
       }
     }
-    for (const [, p] of this.pending) {
-      clearTimeout(p.timeoutHandle);
-      p.reject(new ACPSessionError("closed", "session was closed"));
-    }
-    this.pending.clear();
+    rejectPendingRequests(this.pending);
     this.transportOff?.();
     this.transportOff = null;
     try {
@@ -3906,6 +3951,8 @@ var ACPSession = class _ACPSession {
       return;
     }
     if (msg.method === "session/update") {
+      const updateSessionId = msg.params?.sessionId;
+      if (typeof updateSessionId === "string" && updateSessionId !== this.sessionId) return;
       handleAcpSessionUpdate(msg, this.scratch, (event) => this.emitProgress(event));
       return;
     }
@@ -4565,6 +4612,7 @@ async function makeACPSubagentRunnerWithStop(options) {
   const timeoutMs = options.timeoutMs ?? 5 * 6e4;
   const persistent = options.persistent === true;
   let shared = null;
+  let turns = Promise.resolve();
   const startSession = async () => {
     return ACPSession.start({
       command: options.command,
@@ -4580,10 +4628,17 @@ async function makeACPSubagentRunnerWithStop(options) {
   };
   const runner = async (task, ctx) => {
     let session;
-    const reuse = persistent && shared !== null;
     try {
-      session = reuse ? shared : await startSession();
-      if (persistent) shared = session;
+      if (persistent) {
+        shared ??= startSession();
+        const starting = shared;
+        session = await starting.catch((err) => {
+          if (shared === starting) shared = null;
+          throw err;
+        });
+      } else {
+        session = await startSession();
+      }
     } catch (err) {
       throw acpErrorToSubagentError(err, options.role ?? "acp-subagent");
     }
@@ -4600,7 +4655,10 @@ async function makeACPSubagentRunnerWithStop(options) {
     };
     let result;
     try {
-      result = await session.prompt([textContent(task.description)], ctx.signal, onProgress);
+      const turn = () => session.prompt([textContent(task.description)], ctx.signal, onProgress);
+      const run = persistent ? turns.then(turn, turn) : turn();
+      if (persistent) turns = run;
+      result = await run;
     } catch (err) {
       throw acpErrorToSubagentError(err, options.role ?? "acp-subagent");
     } finally {
@@ -4621,10 +4679,10 @@ async function makeACPSubagentRunnerWithStop(options) {
   };
   const stop = async () => {
     if (shared) {
-      const s = shared;
+      const starting = shared;
       shared = null;
       try {
-        await s.close();
+        await (await starting).close();
       } catch {
       }
     }

package/dist/wrongstack-acp-agent.js

@@ -301,7 +301,7 @@ async function handleSessionLoadOp(ctx, id, params, replayHistory = true) {
         await ctx.sendError(id, -32602, `cwd must be an absolute path to an existing directory`);
         return false;
       }
-      const candidateCwd = persisted.cwd ?? loadCwd ?? ctx.defaultCwd;
+      const candidateCwd = loadCwd ?? persisted.cwd ?? ctx.defaultCwd;
       const restoredCwd = await resolveSessionCwd(candidateCwd) ?? ctx.defaultCwd;
       const restored = {
         id: sessionId,
@@ -482,6 +482,7 @@ async function handleSessionPromptOp(ctx, id, params) {
   let result;
   const pendingNotifications = [];
   const emit = (update) => {
+    if (ctx.sessions.get(sessionId) !== session) return;
     const notifPromise = ctx.sendNotification({ sessionId, update });
     pendingNotifications.push(notifPromise.catch(() => {
     }));
@@ -541,6 +542,7 @@ async function handleSetModeOp(ctx, id, params) {
       modeId
     }
   });
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, {});
   return false;
 }
@@ -566,7 +568,7 @@ async function handleSetConfigOptionOp(ctx, id, params) {
       configOptions: options
     }
   });
-  await ctx.persist(session);
+  if (ctx.sessions.get(session.id) === session) await ctx.persist(session);
   await ctx.sendResult(id, { configOptions: options });
   return false;
 }
@@ -1276,16 +1278,17 @@ var WrongStackACPServer = class {
         return;
       }
       const MAX_HTTP_BODY = 10 * 1024 * 1024;
-      let body = "";
+      const chunks = [];
       let bodyBytes = 0;
       let tooLarge = false;
       for await (const chunk of req) {
         bodyBytes += chunk.length;
         if (bodyBytes > MAX_HTTP_BODY) {
           tooLarge = true;
-          break;
+          chunks.length = 0;
+          if (bodyBytes > 2 * MAX_HTTP_BODY) break;
         }
-        body += chunk;
+        if (!tooLarge) chunks.push(chunk);
       }
       if (tooLarge) {
         res.writeHead(413, { "Content-Type": "application/json" });
@@ -1294,7 +1297,7 @@ var WrongStackACPServer = class {
       }
       let msg;
       try {
-        msg = JSON.parse(body);
+        msg = JSON.parse(Buffer.concat(chunks).toString("utf8"));
       } catch {
         res.writeHead(400);
         res.end(JSON.stringify({ error: { code: -32700, message: "Parse error" } }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/acp",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "license": "MIT",
   "description": "ACP (Agent Client Protocol) integration for WrongStack — client + agent support",
   "keywords": [
@@ -52,8 +52,8 @@
   ],
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@wrongstack/core": "1.0.27",
-    "@wrongstack/primitives": "1.0.27"
+    "@wrongstack/core": "1.0.29",
+    "@wrongstack/primitives": "1.0.29"
   },
   "devDependencies": {
     "@types/node": "^26.5.1",
@@ -66,6 +66,7 @@
   "scripts": {
     "build": "node ../../scripts/build-package.mjs",
     "typecheck": "tsc --noEmit",
+    "typecheck:tests": "tsc --noEmit -p tsconfig.test.json",
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\"",
     "test": "vitest run",
     "smoke": "pnpm build && node --experimental-strip-types ../../scripts/acp-smoke-test.mts"