@wrongstack/acp 1.0.33 → 1.0.36

package/dist/index.js

@@ -1135,7 +1135,11 @@ var StdioTransport = class {
         return;
       }
       try {
-        this.dispatch(JSON.parse(raw), raw.length);
+        const parsed = JSON.parse(raw);
+        if (parsed === null || typeof parsed !== "object") {
+          throw new Error("frame is not a JSON-RPC object");
+        }
+        this.dispatch(parsed, raw.length);
       } catch (err) {
         this.stderr.write(`[wstack-acp parse error] ${err}
 `, "utf8");
@@ -2238,39 +2242,6 @@ async function ensureAuthenticated(host) {
   );
 }
 
-// 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/acp-message-routing.ts
 function isBestEffortAckMethod(method) {
   return method === "mcp/connect" || method === "mcp/message" || method === "mcp/disconnect" || method === "elicitation/create" || method === "elicitation/complete";
@@ -2738,10 +2709,45 @@ function isAbortLikeError(err) {
 }
 function resolvePermissionDeadline(value) {
   if (value === Number.POSITIVE_INFINITY) return null;
-  if (value !== void 0 && Number.isFinite(value) && value > 0) return Math.trunc(value);
+  if (value !== void 0 && Number.isFinite(value) && value > 0) {
+    return Math.min(Math.trunc(value), 2147483647);
+  }
   return DEFAULT_PERMISSION_TIMEOUT_MS;
 }
 
+// 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/acp-session-updates.ts
 function createSessionScratch() {
   return { text: "", thoughts: "", toolCalls: /* @__PURE__ */ new Map(), diffs: [] };
@@ -2937,6 +2943,146 @@ function emitProgress(event) {
   }
 }
 
+// src/client/acp-session-prompt.ts
+async function prompt(host, blocks, signal, onProgress) {
+  if (host.closed) {
+    throw new ACPSessionError("closed", "session is closed");
+  }
+  if (host.state !== "ready" && host.state !== "authenticated" && host.state !== "done") {
+    throw new ACPSessionError("protocol_error", `prompt called in state=${host.state}`);
+  }
+  if (host.promptCallbackAbort) {
+    throw new ACPSessionError("protocol_error", "prompt called while another prompt is running");
+  }
+  if (signal.aborted) {
+    return emptyRunResult("cancelled");
+  }
+  const caps = host.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;
+  host.promptCallbackAbort = new AbortController();
+  const onAbort = () => {
+    cancelled = true;
+    host.promptCallbackAbort?.abort();
+    if (host.sessionId) {
+      host.transport.send({
+        jsonrpc: "2.0",
+        method: "session/cancel",
+        params: { sessionId: host.sessionId }
+      }).catch(() => {
+      });
+    }
+  };
+  signal.addEventListener("abort", onAbort, { once: true });
+  let rejectCreate;
+  const onCreateAbort = () => {
+    signal.removeEventListener("abort", onAbort);
+    rejectCreate?.(new ACPSessionError("aborted", "prompt was aborted by the parent"));
+  };
+  if (!host.sessionId) {
+    let sessionId;
+    const createPromise = host.createSessionWithAuth();
+    try {
+      sessionId = await Promise.race([
+        createPromise,
+        new Promise((_, reject) => {
+          rejectCreate = reject;
+          signal.addEventListener("abort", onCreateAbort, { once: true });
+        })
+      ]);
+    } catch (err) {
+      signal.removeEventListener("abort", onAbort);
+      signal.removeEventListener("abort", onCreateAbort);
+      rejectCreate = void 0;
+      host.promptCallbackAbort?.abort();
+      host.promptCallbackAbort = null;
+      if (err instanceof ACPSessionError && err.kind === "aborted") {
+        host.cancelLateSession(createPromise);
+        return emptyRunResult("cancelled");
+      }
+      throw err;
+    }
+    signal.removeEventListener("abort", onCreateAbort);
+    rejectCreate = void 0;
+    host.sessionId = sessionId;
+  }
+  if (signal.aborted) {
+    host.promptCallbackAbort = null;
+    return emptyRunResult("cancelled");
+  }
+  host.resetScratch();
+  host.progressHandler = onProgress ?? null;
+  const promptId = host.allocId();
+  let rejectTurn;
+  const onTurnAbort = () => {
+    rejectTurn?.(new ACPSessionError("aborted", "prompt was aborted by the parent"));
+  };
+  signal.addEventListener("abort", onTurnAbort, { once: true });
+  const turnPromise = Promise.race([
+    host.sendRequest(
+      promptId,
+      "session/prompt",
+      {
+        sessionId: host.sessionId,
+        prompt: blocks
+      },
+      host.timeoutMs
+    ),
+    new Promise((_, reject) => {
+      rejectTurn = reject;
+    })
+  ]);
+  host.state = "prompting";
+  let response;
+  try {
+    response = await turnPromise;
+  } catch (err) {
+    host.state = "done";
+    const abortedKind = err instanceof ACPSessionError && err.kind === "aborted";
+    if (cancelled || abortedKind) {
+      return emptyRunResult("cancelled");
+    }
+    const msg = err instanceof Error ? err.message : String(err);
+    if (signal.aborted) {
+      throw new ACPSessionError("aborted", "prompt was aborted by the parent", err);
+    }
+    throw new ACPSessionError("prompt_failed", `session/prompt failed: ${msg}`, err);
+  } finally {
+    signal.removeEventListener("abort", onAbort);
+    signal.removeEventListener("abort", onTurnAbort);
+    signal.removeEventListener("abort", onCreateAbort);
+    rejectTurn = void 0;
+    rejectCreate = void 0;
+    host.promptCallbackAbort?.abort();
+    host.promptCallbackAbort = null;
+    host.progressHandler = null;
+  }
+  host.state = "done";
+  if (isJsonRpcError(response)) {
+    throw new ACPSessionError("prompt_failed", `agent error: ${response.message}`, response);
+  }
+  const stopReason = response.stopReason ?? "end_turn";
+  const finalText = host.scratch.text;
+  return {
+    text: finalText,
+    stopReason,
+    hasText: finalText.length > 0,
+    usage: host.scratch.usage,
+    plan: host.scratch.plan,
+    toolCalls: [...host.scratch.toolCalls.values()],
+    diffs: host.scratch.diffs,
+    thoughts: host.scratch.thoughts
+  };
+}
+
 // src/client/permission.ts
 function pickAllow(options) {
   const ranked = [...options].sort((a, b) => {
@@ -2992,7 +3138,8 @@ function win32BatchTarget(command) {
   if (/\.(?:cmd|bat)$/i.test(command)) return command;
   if (/[\\/]/.test(command) || path3.extname(command)) return void 0;
   const exts = (process.env["PATHEXT"] ?? ".COM;.EXE;.BAT;.CMD").toLowerCase().split(";");
-  for (const dir of (process.env["PATH"] ?? "").split(path3.delimiter)) {
+  for (const rawDir of (process.env["PATH"] ?? "").split(path3.delimiter)) {
+    const dir = rawDir.trim().replace(/^"|"$/g, "");
     if (!dir) continue;
     for (const ext of exts) {
       if (!ext) continue;
@@ -3256,15 +3403,13 @@ var TerminalServer = class {
   resolveCwd(cwd) {
     if (!cwd) return this.projectRoot;
     const resolved = path3.resolve(cwd);
-    const rootWithSep = this.projectRoot.endsWith(path3.sep) ? this.projectRoot : this.projectRoot + path3.sep;
-    if (resolved !== this.projectRoot && !resolved.startsWith(rootWithSep)) {
+    if (!isInsideRoot(resolved, this.projectRoot)) {
       return this.projectRoot;
     }
     try {
       const realRoot = realpathSync2(this.projectRoot);
       const realCwd = realpathSync2(resolved);
-      const realRootWithSep = realRoot.endsWith(path3.sep) ? realRoot : realRoot + path3.sep;
-      if (realCwd !== realRoot && !realCwd.startsWith(realRootWithSep)) {
+      if (!isInsideRoot(realCwd, realRoot)) {
         return realRoot;
       }
       return realCwd;
@@ -3296,6 +3441,12 @@ var TerminalServer = class {
     return Math.trunc(value);
   }
 };
+function isInsideRoot(child, root) {
+  const fold = (p) => process.platform === "win32" ? p.toLowerCase() : p;
+  const c = fold(child);
+  const r = fold(root);
+  return c === r || c.startsWith(r.endsWith(path3.sep) ? r : r + path3.sep);
+}
 var DENIED_AGENT_ENV_KEYS = /* @__PURE__ */ new Set([
   "NODE_OPTIONS",
   "LD_PRELOAD",
@@ -3559,6 +3710,7 @@ var WebSocketClientTransport = class {
   }
   dispatch(msg) {
     for (const handler of [...this.handlers]) {
+      if (this.closed) break;
       try {
         handler(msg);
       } catch {
@@ -3835,142 +3987,7 @@ var ACPSession = class _ACPSession {
   // Prompt
   // ──────────────────────────────────────────────────────────────────────
   async prompt(blocks, signal, onProgress) {
-    if (this.closed) {
-      throw new ACPSessionError("closed", "session is closed");
-    }
-    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");
-    }
-    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 = () => {
-      cancelled = true;
-      this.promptCallbackAbort?.abort();
-      if (this.sessionId) {
-        this.transport.send({
-          jsonrpc: "2.0",
-          method: "session/cancel",
-          params: { sessionId: this.sessionId }
-        }).catch(() => {
-        });
-      }
-    };
-    signal.addEventListener("abort", onAbort, { once: true });
-    let rejectCreate;
-    const onCreateAbort = () => {
-      signal.removeEventListener("abort", onAbort);
-      rejectCreate?.(new ACPSessionError("aborted", "prompt was aborted by the parent"));
-    };
-    if (!this.sessionId) {
-      let sessionId;
-      const createPromise = this.createSessionWithAuth();
-      try {
-        sessionId = await Promise.race([
-          createPromise,
-          new Promise((_, reject) => {
-            rejectCreate = reject;
-            signal.addEventListener("abort", onCreateAbort, { once: true });
-          })
-        ]);
-      } catch (err) {
-        signal.removeEventListener("abort", onAbort);
-        signal.removeEventListener("abort", onCreateAbort);
-        rejectCreate = void 0;
-        this.promptCallbackAbort?.abort();
-        this.promptCallbackAbort = null;
-        if (err instanceof ACPSessionError && err.kind === "aborted") {
-          this.cancelLateSession(createPromise);
-          return emptyRunResult("cancelled");
-        }
-        throw err;
-      }
-      signal.removeEventListener("abort", onCreateAbort);
-      rejectCreate = void 0;
-      this.sessionId = sessionId;
-    }
-    if (signal.aborted) {
-      this.promptCallbackAbort = null;
-      return emptyRunResult("cancelled");
-    }
-    this.resetScratch();
-    this.progressHandler = onProgress ?? null;
-    const promptId = this.allocId();
-    let rejectTurn;
-    const onTurnAbort = () => {
-      rejectTurn?.(new ACPSessionError("aborted", "prompt was aborted by the parent"));
-    };
-    signal.addEventListener("abort", onTurnAbort, { once: true });
-    const turnPromise = Promise.race([
-      this.sendRequest(
-        promptId,
-        "session/prompt",
-        {
-          sessionId: this.sessionId,
-          prompt: blocks
-        },
-        this.timeoutMs
-      ),
-      new Promise((_, reject) => {
-        rejectTurn = reject;
-      })
-    ]);
-    this.state = "prompting";
-    let response;
-    try {
-      response = await turnPromise;
-    } catch (err) {
-      this.state = "done";
-      const abortedKind = err instanceof ACPSessionError && err.kind === "aborted";
-      if (cancelled || abortedKind) {
-        return emptyRunResult("cancelled");
-      }
-      const msg = err instanceof Error ? err.message : String(err);
-      if (signal.aborted) {
-        throw new ACPSessionError("aborted", "prompt was aborted by the parent", err);
-      }
-      throw new ACPSessionError("prompt_failed", `session/prompt failed: ${msg}`, err);
-    } finally {
-      signal.removeEventListener("abort", onAbort);
-      signal.removeEventListener("abort", onTurnAbort);
-      signal.removeEventListener("abort", onCreateAbort);
-      rejectTurn = void 0;
-      rejectCreate = void 0;
-      this.promptCallbackAbort?.abort();
-      this.promptCallbackAbort = null;
-      this.progressHandler = null;
-    }
-    this.state = "done";
-    if (isJsonRpcError(response)) {
-      throw new ACPSessionError("prompt_failed", `agent error: ${response.message}`, response);
-    }
-    const stopReason = response.stopReason ?? "end_turn";
-    const finalText = this.scratch.text;
-    return {
-      text: finalText,
-      stopReason,
-      hasText: finalText.length > 0,
-      usage: this.scratch.usage,
-      plan: this.scratch.plan,
-      toolCalls: [...this.scratch.toolCalls.values()],
-      diffs: this.scratch.diffs,
-      thoughts: this.scratch.thoughts
-    };
+    return prompt(this.acpSessionPromptHost(), blocks, signal, onProgress);
   }
   /**
    * Best-effort cancel for a session the server confirmed after we already
@@ -4140,6 +4157,25 @@ var ACPSession = class _ACPSession {
     void this.progressHandler;
     return this;
   }
+  acpSessionPromptHost() {
+    void {
+      closed: this.closed,
+      state: this.state,
+      promptCallbackAbort: this.promptCallbackAbort,
+      agentCapabilities: this.agentCapabilities,
+      sessionId: this.sessionId,
+      transport: this.transport,
+      createSessionWithAuth: this.createSessionWithAuth,
+      cancelLateSession: this.cancelLateSession,
+      resetScratch: this.resetScratch,
+      progressHandler: this.progressHandler,
+      allocId: this.allocId,
+      sendRequest: this.sendRequest,
+      timeoutMs: this.timeoutMs,
+      scratch: this.scratch
+    };
+    return this;
+  }
 };
 
 // src/client/tool-translator.ts

package/dist/wrongstack-acp-agent.js

@@ -1132,7 +1132,11 @@ var StdioTransport = class {
         return;
       }
       try {
-        this.dispatch(JSON.parse(raw), raw.length);
+        const parsed = JSON.parse(raw);
+        if (parsed === null || typeof parsed !== "object") {
+          throw new Error("frame is not a JSON-RPC object");
+        }
+        this.dispatch(parsed, raw.length);
       } catch (err) {
         this.stderr.write(`[wstack-acp parse error] ${err}
 `, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/acp",
-  "version": "1.0.33",
+  "version": "1.0.36",
   "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.33",
-    "@wrongstack/primitives": "1.0.33"
+    "@wrongstack/core": "1.0.36",
+    "@wrongstack/primitives": "1.0.36"
   },
   "devDependencies": {
     "@types/node": "^26.5.1",
@@ -65,8 +65,8 @@
   },
   "scripts": {
     "build": "node ../../scripts/build-package.mjs",
-    "typecheck": "tsc --noEmit",
-    "typecheck:tests": "tsc --noEmit -p tsconfig.test.json",
+    "typecheck": "node ../../scripts/bun-typecheck.mjs --noEmit",
+    "typecheck:tests": "node ../../scripts/bun-typecheck.mjs --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"