@wrongstack/acp 1.0.19 → 1.0.24

package/dist/client/file-server.d.ts

@@ -36,6 +36,8 @@ export interface FileServerOperations {
 export interface ReadFileParams {
     sessionId: string;
     path: string;
+    line?: number | undefined;
+    limit?: number | undefined;
 }
 export interface WriteFileParams {
     sessionId: string;

package/dist/client.js

@@ -213,6 +213,7 @@ var ClientTransport = class {
     this.messageQueue.length = 0;
     this.queuedChars = 0;
     this.handlers.clear();
+    this.claimHandlers.clear();
     if (code !== 0 && code !== null) {
       writeErr(`[acp-child exited with code ${code}]
 `);
@@ -223,17 +224,28 @@ var ClientTransport = class {
       const resolve3 = this.resolveRead;
       this.resolveRead = null;
       resolve3(msg);
-    } else if (this.handlers.size === 0) {
-      if (this.messageQueue.length >= this.maxQueuedMessages || this.queuedChars + chars > this.maxQueuedChars) {
-        writeErr(
-          `[acp-child message queue exceeds ${this.maxQueuedMessages} entries or ${this.maxQueuedChars} characters]
+    } else {
+      let claimed = false;
+      for (const handler of this.claimHandlers) {
+        try {
+          if (handler(msg)) claimed = true;
+        } catch (err) {
+          writeErr(`[acp-child handler error] ${err}
+`);
+        }
+      }
+      if (!claimed && this.handlers.size === 0) {
+        if (this.messageQueue.length >= this.maxQueuedMessages || this.queuedChars + chars > this.maxQueuedChars) {
+          writeErr(
+            `[acp-child message queue exceeds ${this.maxQueuedMessages} entries or ${this.maxQueuedChars} characters]
 `
-        );
-        this.stop();
-        return;
+          );
+          this.stop();
+          return;
+        }
+        this.messageQueue.push({ message: msg, chars });
+        this.queuedChars += chars;
       }
-      this.messageQueue.push({ message: msg, chars });
-      this.queuedChars += chars;
     }
     for (const handler of this.handlers) {
       try {
@@ -269,6 +281,55 @@ function readPackageVersion(load = () => require2("../package.json")) {
 }
 var ACP_PACKAGE_VERSION = readPackageVersion();
 
+// src/client/acp-late-session.ts
+var LATE_CANCEL_SEND_TIMEOUT_MS = 1e4;
+function cancelLateAcpSession(transport, createPromise) {
+  createPromise.then(async (lateId) => {
+    try {
+      await new Promise((resolve3, reject) => {
+        const timer = setTimeout(() => {
+          reject(new Error("late session/cancel send timed out"));
+        }, LATE_CANCEL_SEND_TIMEOUT_MS);
+        Promise.resolve(
+          transport.send({
+            jsonrpc: "2.0",
+            method: "session/cancel",
+            params: { sessionId: lateId }
+          })
+        ).then(
+          () => {
+            clearTimeout(timer);
+            resolve3();
+          },
+          (sendErr) => {
+            clearTimeout(timer);
+            reject(sendErr instanceof Error ? sendErr : new Error(String(sendErr)));
+          }
+        );
+      });
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      console.warn(
+        JSON.stringify({
+          level: "warn",
+          event: "acp_session.late_cancel_failed",
+          sessionId: lateId,
+          message
+        })
+      );
+    }
+  }).catch((reason) => {
+    const message = reason instanceof Error ? reason.message : String(reason);
+    console.warn(
+      JSON.stringify({
+        level: "warn",
+        event: "acp_session.late_cancel_failed",
+        reason: message
+      })
+    );
+  });
+}
+
 // 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";
@@ -316,6 +377,13 @@ var FileServer = class {
   }
   /** Read a text file. Returns the content as a string. */
   async readTextFile(params) {
+    if (params.line != null && (!Number.isSafeInteger(params.line) || params.line < 1) || params.limit != null && (!Number.isSafeInteger(params.limit) || params.limit < 0)) {
+      throw new FsError(
+        "INVALID_PATH",
+        params.path,
+        "line must be a positive integer and limit a non-negative integer"
+      );
+    }
     const safe = await this.resolveInside(params.path);
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), this.timeoutMs);
@@ -334,7 +402,12 @@ var FileServer = class {
         encoding: "utf8",
         signal: controller.signal
       });
-      return { content };
+      if (params.line == null && params.limit == null) return { content };
+      const lines = content.match(/[^\n]*\n|[^\n]+$/g) ?? [];
+      const start = (params.line ?? 1) - 1;
+      return {
+        content: lines.slice(start, params.limit == null ? void 0 : start + params.limit).join("")
+      };
     } catch (err) {
       if (err instanceof FsError) throw err;
       if (controller.signal.aborted) {
@@ -439,7 +512,8 @@ var FileServer = class {
         throw mapFsError(err, resolvedPath);
       }
       const normReal = isWindows ? real.toLowerCase() : real;
-      if (normReal === normRealRoot || normReal.startsWith(normRealRoot + path.sep)) return;
+      const realRootWithSep = normRealRoot.endsWith(path.sep) ? normRealRoot : normRealRoot + path.sep;
+      if (normReal === normRealRoot || normReal.startsWith(realRootWithSep)) return;
       throw new FsError(
         "OUTSIDE_ROOT",
         resolvedPath,
@@ -488,9 +562,12 @@ async function handleAcpPermissionRequest(msg, permissionPolicy, sender, callbac
     );
     await sender.sendResult(id, { outcome });
   } catch (err) {
+    if (isAbortLikeError(err)) {
+      await sender.sendResult(id, { outcome: { outcome: "cancelled" } });
+      return;
+    }
     const message = err instanceof Error ? err.message : String(err);
-    const code = isAbortLikeError(err) ? -32800 : -32603;
-    await sender.sendErrorResponse(id, code, `permission policy failed: ${message}`);
+    await sender.sendErrorResponse(id, -32603, `permission policy failed: ${message}`);
   }
 }
 async function handleAcpFsRequest(msg, fileServer, permissionPolicy, sender, callbackOptions = {}) {
@@ -526,7 +603,9 @@ async function handleAcpFsRequest(msg, fileServer, permissionPolicy, sender, cal
     if (msg.method === "fs/read_text_file") {
       const result = await fileServer.readTextFile({
         sessionId: params.sessionId ?? "",
-        path: params.path
+        path: params.path,
+        line: params.line,
+        limit: params.limit
       });
       await sender.sendResult(id, result);
     } else {
@@ -776,7 +855,7 @@ async function executeLoadSession(ctx, sessionId, mcpServers, cwd) {
       "agent does not support session/load (loadSession capability not advertised)"
     );
   }
-  if (ctx.sessionId) {
+  if (ctx.sessionId && ctx.sessionId !== sessionId) {
     await ctx.closeSession();
   }
   ctx.resetScratch();
@@ -800,7 +879,7 @@ async function executeResumeSession(ctx, sessionId, mcpServers, cwd) {
       "agent does not support session/resume (sessionCapabilities.resume not advertised)"
     );
   }
-  if (ctx.sessionId) {
+  if (ctx.sessionId && ctx.sessionId !== sessionId) {
     await ctx.closeSession();
   }
   const servers = filterMcpServers(ctx.agentCapabilities, mcpServers ?? ctx.opts.mcpServers);
@@ -978,6 +1057,7 @@ function handleAcpSessionUpdate(msg, scratch, emitProgress) {
       }
       return;
     }
+    case "agent_thought_chunk":
     case "thought_chunk": {
       const text = extractText(u.content);
       if (text) {
@@ -1643,7 +1723,6 @@ function finitePositiveLimit(value, fallback) {
 }
 
 // src/client/acp-session.ts
-var LATE_CANCEL_SEND_TIMEOUT_MS = 1e4;
 var ACPSession = class _ACPSession {
   transport;
   fileServer;
@@ -1813,7 +1892,7 @@ var ACPSession = class _ACPSession {
       throw new ACPSessionError("protocol_error", "initialize returned no protocolVersion");
     }
     const r = result;
-    if (r.protocolVersion > ACP_PROTOCOL_VERSION) {
+    if (r.protocolVersion !== ACP_PROTOCOL_VERSION) {
       throw new ACPSessionError(
         "unsupported_capability",
         `agent requires protocolVersion=${r.protocolVersion}, client supports up to ${ACP_PROTOCOL_VERSION}`
@@ -1849,6 +1928,12 @@ var ACPSession = class _ACPSession {
         `auth method "${methodId}" not in advertised methods: ${this.authMethods.map((m) => m.id).join(", ")}`
       );
     }
+    if (this.authMethods.find((m) => m.id === methodId)?.type === "terminal") {
+      throw new ACPSessionError(
+        "auth_failed",
+        "Terminal authentication requires interactive login followed by reconnect; it cannot use authenticate"
+      );
+    }
     const id = this.allocId();
     const result = await this.sendRequest(id, "authenticate", { methodId });
     if (isJsonRpcError(result)) {
@@ -1944,6 +2029,16 @@ var ACPSession = class _ACPSession {
     if (signal.aborted) {
       return emptyRunResult("cancelled");
     }
+    const caps = this.agentCapabilities.promptCapabilities;
+    for (const block of blocks) {
+      const supported = block.type === "image" ? caps?.image : block.type === "audio" ? caps?.audio : block.type === "resource" ? caps?.embeddedContext : true;
+      if (supported !== true) {
+        throw new ACPSessionError(
+          "unsupported_capability",
+          `agent does not support ${block.type} prompt content`
+        );
+      }
+    }
     let cancelled = false;
     this.promptCallbackAbort = new AbortController();
     const onAbort = () => {
@@ -2078,50 +2173,7 @@ var ACPSession = class _ACPSession {
    * being silently swallowed.
    */
   cancelLateSession(createPromise) {
-    createPromise.then(async (lateId) => {
-      try {
-        await new Promise((resolve3, reject) => {
-          const timer = setTimeout(() => {
-            reject(new Error("late session/cancel send timed out"));
-          }, LATE_CANCEL_SEND_TIMEOUT_MS);
-          Promise.resolve(
-            this.transport.send({
-              jsonrpc: "2.0",
-              method: "session/cancel",
-              params: { sessionId: lateId }
-            })
-          ).then(
-            () => {
-              clearTimeout(timer);
-              resolve3();
-            },
-            (sendErr) => {
-              clearTimeout(timer);
-              reject(sendErr instanceof Error ? sendErr : new Error(String(sendErr)));
-            }
-          );
-        });
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        console.warn(
-          JSON.stringify({
-            level: "warn",
-            event: "acp_session.late_cancel_failed",
-            sessionId: lateId,
-            message
-          })
-        );
-      }
-    }).catch((reason) => {
-      const message = reason instanceof Error ? reason.message : String(reason);
-      console.warn(
-        JSON.stringify({
-          level: "warn",
-          event: "acp_session.late_cancel_failed",
-          reason: message
-        })
-      );
-    });
+    cancelLateAcpSession(this.transport, createPromise);
   }
   async closeSession() {
     if (!this.sessionId) return;
@@ -2168,7 +2220,13 @@ var ACPSession = class _ACPSession {
   // Wire layer
   // ────────────────────────────────────────────────────────────────────
   allocId() {
-    return this.nextId++;
+    let candidate = Number.isSafeInteger(this.nextId) && this.nextId >= 1 ? this.nextId : 1;
+    for (let probe = 0; probe <= this.pending.size; probe++) {
+      this.nextId = candidate >= Number.MAX_SAFE_INTEGER ? 1 : candidate + 1;
+      if (!this.pending.has(candidate)) return candidate;
+      candidate = this.nextId;
+    }
+    throw new ACPSessionError("protocol_error", "no JSON-RPC request id is available");
   }
   async sendRequest(id, method, params, timeoutMs) {
     return new Promise((resolve3, reject) => {
@@ -2236,7 +2294,7 @@ var ACPSession = class _ACPSession {
     }
     const terminal = this.authMethods.find((m) => m.type === "terminal");
     const setupArgs = terminal?.args?.length ? terminal.args.join(" ") : void 0;
-    const setup = setupArgs !== void 0 ? `${this.opts.command} ${setupArgs}` : `${this.opts.command}${this.opts.args?.length ? ` ${this.opts.args.join(" ")}` : ""}`;
+    const setup = setupArgs !== void 0 ? `${this.opts.command}${this.opts.args?.length ? ` ${this.opts.args.join(" ")}` : ""} ${setupArgs}` : `${this.opts.command}${this.opts.args?.length ? ` ${this.opts.args.join(" ")}` : ""}`;
     throw new ACPSessionError(
       "auth_failed",
       `This agent requires a terminal login before ACP can start. Run \`${setup}\` (or the CLI's /login), then retry.`
@@ -2318,7 +2376,7 @@ var ACPSession = class _ACPSession {
     }
     if (isBestEffortAckMethod(msg.method)) {
       if (msg.id !== void 0) {
-        this.sendResult(msg.id, {}).catch(() => {
+        this.sendErrorResponse(msg.id, -32601, `Unsupported method: ${msg.method}`).catch(() => {
         });
       }
       return;
@@ -2327,6 +2385,13 @@ var ACPSession = class _ACPSession {
       return;
     }
     if (msg.method) {
+      if (msg.id !== void 0) {
+        void this.sendErrorResponse(msg.id, -32601, `Unsupported method: ${msg.method}`).catch(
+          () => {
+          }
+        );
+        return;
+      }
       console.warn(
         JSON.stringify({
           level: "warn",