@wrongstack/acp 1.0.33 → 1.0.35

package/dist/client.js

@@ -691,39 +691,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";
@@ -1195,6 +1162,39 @@ function resolvePermissionDeadline(value) {
   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: [] };
@@ -1390,6 +1390,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) => {
@@ -2288,142 +2428,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
@@ -2593,6 +2598,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/integration/acp-subagent-runner.ts