@wrongstack/acp 0.306.4 → 0.307.0

package/dist/client.js

@@ -1402,6 +1402,220 @@ function isBestEffortAckMethod(method) {
   return method === "mcp/connect" || method === "mcp/message" || method === "mcp/disconnect" || method === "elicitation/create" || method === "elicitation/complete";
 }
 
+// src/client/acp-session-ops.ts
+function filterMcpServers(agentCapabilities, servers) {
+  if (!servers || servers.length === 0) return [];
+  const mcpCaps = agentCapabilities.mcpCapabilities ?? {};
+  return servers.filter((s) => {
+    if ("type" in s && s.type === "http") return mcpCaps.http === true;
+    if ("type" in s && s.type === "sse") return mcpCaps.sse === true;
+    return true;
+  });
+}
+async function executeLoadSession(ctx, sessionId, mcpServers, cwd) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  if (!ctx.agentCapabilities.loadSession) {
+    throw new ACPSessionError(
+      "unsupported_capability",
+      "agent does not support session/load (loadSession capability not advertised)"
+    );
+  }
+  if (ctx.sessionId) {
+    await ctx.closeSession();
+  }
+  ctx.resetScratch();
+  const servers = filterMcpServers(ctx.agentCapabilities, mcpServers ?? ctx.opts.mcpServers);
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/load", {
+    sessionId,
+    cwd: cwd ?? ctx.opts.cwd ?? ctx.opts.projectRoot,
+    mcpServers: servers
+  });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError("prompt_failed", `session/load failed: ${result.message}`, result);
+  }
+  ctx.setSessionId(sessionId);
+}
+async function executeResumeSession(ctx, sessionId, mcpServers, cwd) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  if (!ctx.agentCapabilities.sessionCapabilities?.resume) {
+    throw new ACPSessionError(
+      "unsupported_capability",
+      "agent does not support session/resume (sessionCapabilities.resume not advertised)"
+    );
+  }
+  if (ctx.sessionId) {
+    await ctx.closeSession();
+  }
+  const servers = filterMcpServers(ctx.agentCapabilities, mcpServers ?? ctx.opts.mcpServers);
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/resume", {
+    sessionId,
+    cwd: cwd ?? ctx.opts.cwd ?? ctx.opts.projectRoot,
+    mcpServers: servers
+  });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `session/resume failed: ${result.message}`,
+      result
+    );
+  }
+  ctx.setSessionId(sessionId);
+}
+async function executeListSessions(ctx, cursor, cwd) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  if (!ctx.agentCapabilities.sessionCapabilities?.list) {
+    throw new ACPSessionError(
+      "unsupported_capability",
+      "agent does not support session/list (sessionCapabilities.list not advertised)"
+    );
+  }
+  const id = ctx.allocId();
+  const params = {};
+  if (cursor !== void 0) params.cursor = cursor;
+  if (cwd !== void 0) params.cwd = cwd;
+  const result = await ctx.sendRequest(id, "session/list", params);
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError("prompt_failed", `session/list failed: ${result.message}`, result);
+  }
+  const r = result;
+  return {
+    sessions: r.sessions ?? [],
+    nextCursor: r.nextCursor
+  };
+}
+async function executeDeleteSession(ctx, sessionId) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  if (!ctx.agentCapabilities.sessionCapabilities?.delete) {
+    throw new ACPSessionError(
+      "unsupported_capability",
+      "agent does not support session/delete (sessionCapabilities.delete not advertised)"
+    );
+  }
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/delete", { sessionId });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `session/delete failed: ${result.message}`,
+      result
+    );
+  }
+  if (ctx.sessionId === sessionId) {
+    ctx.setSessionId(null);
+  }
+}
+async function executeForkSession(ctx, sourceSessionId, cwd, mcpServers) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const servers = filterMcpServers(ctx.agentCapabilities, mcpServers ?? ctx.opts.mcpServers);
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/fork", {
+    sessionId: sourceSessionId,
+    cwd: cwd ?? ctx.opts.cwd ?? ctx.opts.projectRoot,
+    ...servers.length > 0 ? { mcpServers: servers } : {}
+  });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError("prompt_failed", `session/fork failed: ${result.message}`, result);
+  }
+  const newId = result.sessionId;
+  if (typeof newId !== "string" || !newId) {
+    throw new ACPSessionError("protocol_error", "session/fork returned no sessionId", result);
+  }
+  return newId;
+}
+async function executeSetMode(ctx, sessionId, modeId) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/set_mode", { sessionId, modeId });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `session/set_mode failed: ${result.message}`,
+      result
+    );
+  }
+}
+async function executeSetConfigOption(ctx, sessionId, configId, value) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/set_config_option", {
+    sessionId,
+    configId,
+    value
+  });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `session/set_config_option failed: ${result.message}`,
+      result
+    );
+  }
+}
+async function executeListProviders(ctx) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "providers/list", {});
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `providers/list failed: ${result.message}`,
+      result
+    );
+  }
+  const r = result;
+  return { providers: r.providers ?? [], currentProviderId: r.currentProviderId ?? null };
+}
+async function executeSetProvider(ctx, providerId, config) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "providers/set", { providerId, ...config ?? {} });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError("prompt_failed", `providers/set failed: ${result.message}`, result);
+  }
+}
+async function executeDisableProvider(ctx) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "providers/disable", {});
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "prompt_failed",
+      `providers/disable failed: ${result.message}`,
+      result
+    );
+  }
+}
+async function executeMcpMessage(ctx, connectionId, message) {
+  if (ctx.closed) throw new ACPSessionError("closed", "session is closed");
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "mcp/message", { connectionId, message });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError("prompt_failed", `mcp/message failed: ${result.message}`, result);
+  }
+  return result;
+}
+async function executeCreateSession(ctx) {
+  const servers = filterMcpServers(ctx.agentCapabilities, ctx.opts.mcpServers);
+  const id = ctx.allocId();
+  const result = await ctx.sendRequest(id, "session/new", {
+    cwd: ctx.opts.cwd ?? ctx.opts.projectRoot,
+    mcpServers: servers
+  });
+  if (isJsonRpcError(result)) {
+    throw new ACPSessionError(
+      "session_create_failed",
+      `session/new failed: ${result.message}`,
+      result
+    );
+  }
+  const sessionId = result.sessionId;
+  if (typeof sessionId !== "string" || sessionId.length === 0) {
+    throw new ACPSessionError("protocol_error", "session/new returned no sessionId", result);
+  }
+  return sessionId;
+}
+
 // src/client/acp-session.ts
 var ACPSession = class _ACPSession {
   transport;
@@ -1590,9 +1804,6 @@ var ACPSession = class _ACPSession {
   /**
    * Authenticate with the agent using one of the advertised auth methods.
    * Call this AFTER start() and BEFORE any session/new call.
-   *
-   * Throws ACPSessionError('auth_failed') if the agent rejects the
-   * authentication or if the methodId is not in the advertised list.
    */
   async authenticate(methodId) {
     if (this.state === "closed") {
@@ -1639,268 +1850,59 @@ var ACPSession = class _ACPSession {
     this.state = "ready";
   }
   // ──────────────────────────────────────────────────────────────────────
-  // Session management
+  // Session management delegation
   // ──────────────────────────────────────────────────────────────────────
-  /**
-   * Load an existing session. The agent replays the conversation history
-   * via session/update notifications before responding.
-   *
-   * Only works if the agent advertises `loadSession` capability.
-   *
-   * @param sessionId - The session to load
-   * @param mcpServers - Optional MCP servers (defaults to options.mcpServers)
-   * @param cwd - Optional working directory (defaults to options.cwd or projectRoot)
-   */
+  opContext() {
+    return {
+      closed: this.closed,
+      sessionId: this.sessionId,
+      agentCapabilities: this.agentCapabilities,
+      opts: this.opts,
+      allocId: () => this.allocId(),
+      sendRequest: (id, method, params, timeoutMs) => this.sendRequest(id, method, params, timeoutMs),
+      setSessionId: (id) => {
+        this.sessionId = id;
+      },
+      resetScratch: () => this.resetScratch(),
+      closeSession: () => this.closeSession()
+    };
+  }
   async loadSession(sessionId, mcpServers, cwd) {
-    if (this.closed) {
-      throw new ACPSessionError("closed", "session is closed");
-    }
-    if (!this.agentCapabilities.loadSession) {
-      throw new ACPSessionError(
-        "unsupported_capability",
-        "agent does not support session/load (loadSession capability not advertised)"
-      );
-    }
-    if (this.sessionId) {
-      await this.closeSession();
-    }
-    this.resetScratch();
-    const servers = this.filterMcpServers(mcpServers ?? this.opts.mcpServers);
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/load", {
-      sessionId,
-      cwd: cwd ?? this.opts.cwd ?? this.opts.projectRoot,
-      mcpServers: servers
-    });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError("prompt_failed", `session/load failed: ${result.message}`, result);
-    }
-    this.sessionId = sessionId;
+    return executeLoadSession(this.opContext(), sessionId, mcpServers, cwd);
   }
-  /**
-   * Resume an existing session without replaying history.
-   *
-   * Only works if the agent advertises `sessionCapabilities.resume`.
-   *
-   * @param sessionId - The session to resume
-   * @param mcpServers - Optional MCP servers (defaults to options.mcpServers)
-   * @param cwd - Optional working directory (defaults to options.cwd or projectRoot)
-   */
   async resumeSession(sessionId, mcpServers, cwd) {
-    if (this.closed) {
-      throw new ACPSessionError("closed", "session is closed");
-    }
-    if (!this.agentCapabilities.sessionCapabilities?.resume) {
-      throw new ACPSessionError(
-        "unsupported_capability",
-        "agent does not support session/resume (sessionCapabilities.resume not advertised)"
-      );
-    }
-    if (this.sessionId) {
-      await this.closeSession();
-    }
-    const servers = this.filterMcpServers(mcpServers ?? this.opts.mcpServers);
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/resume", {
-      sessionId,
-      cwd: cwd ?? this.opts.cwd ?? this.opts.projectRoot,
-      mcpServers: servers
-    });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `session/resume failed: ${result.message}`,
-        result
-      );
-    }
-    this.sessionId = sessionId;
+    return executeResumeSession(this.opContext(), sessionId, mcpServers, cwd);
   }
-  /**
-   * List existing sessions known to the agent.
-   *
-   * Only works if the agent advertises `sessionCapabilities.list`.
-   */
   async listSessions(cursor, cwd) {
-    if (this.closed) {
-      throw new ACPSessionError("closed", "session is closed");
-    }
-    if (!this.agentCapabilities.sessionCapabilities?.list) {
-      throw new ACPSessionError(
-        "unsupported_capability",
-        "agent does not support session/list (sessionCapabilities.list not advertised)"
-      );
-    }
-    const id = this.allocId();
-    const params = {};
-    if (cursor !== void 0) params.cursor = cursor;
-    if (cwd !== void 0) params.cwd = cwd;
-    const result = await this.sendRequest(id, "session/list", params);
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError("prompt_failed", `session/list failed: ${result.message}`, result);
-    }
-    const r = result;
-    return {
-      sessions: r.sessions ?? [],
-      nextCursor: r.nextCursor
-    };
+    return executeListSessions(this.opContext(), cursor, cwd);
   }
-  /**
-   * Delete a session from the agent's session list.
-   *
-   * Only works if the agent advertises `sessionCapabilities.delete`.
-   */
   async deleteSession(sessionId) {
-    if (this.closed) {
-      throw new ACPSessionError("closed", "session is closed");
-    }
-    if (!this.agentCapabilities.sessionCapabilities?.delete) {
-      throw new ACPSessionError(
-        "unsupported_capability",
-        "agent does not support session/delete (sessionCapabilities.delete not advertised)"
-      );
-    }
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/delete", { sessionId });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `session/delete failed: ${result.message}`,
-        result
-      );
-    }
-    if (this.sessionId === sessionId) {
-      this.sessionId = null;
-    }
+    return executeDeleteSession(this.opContext(), sessionId);
   }
-  /**
-   * Fork a session — create a new session from an existing one.
-   */
   async forkSession(sourceSessionId, cwd, mcpServers) {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const servers = this.filterMcpServers(mcpServers ?? this.opts.mcpServers);
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/fork", {
-      sessionId: sourceSessionId,
-      cwd: cwd ?? this.opts.cwd ?? this.opts.projectRoot,
-      ...servers.length > 0 ? { mcpServers: servers } : {}
-    });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError("prompt_failed", `session/fork failed: ${result.message}`, result);
-    }
-    const newId = result.sessionId;
-    if (typeof newId !== "string" || !newId) {
-      throw new ACPSessionError("protocol_error", "session/fork returned no sessionId", result);
-    }
-    return newId;
+    return executeForkSession(this.opContext(), sourceSessionId, cwd, mcpServers);
   }
-  /**
-   * Set the active mode for a session.
-   */
   async setMode(sessionId, modeId) {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/set_mode", { sessionId, modeId });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `session/set_mode failed: ${result.message}`,
-        result
-      );
-    }
+    return executeSetMode(this.opContext(), sessionId, modeId);
   }
-  /**
-   * Set a configuration option for a session.
-   */
   async setConfigOption(sessionId, configId, value) {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/set_config_option", {
-      sessionId,
-      configId,
-      value
-    });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `session/set_config_option failed: ${result.message}`,
-        result
-      );
-    }
+    return executeSetConfigOption(this.opContext(), sessionId, configId, value);
   }
-  /**
-   * List available providers and the current provider.
-   */
   async listProviders() {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "providers/list", {});
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `providers/list failed: ${result.message}`,
-        result
-      );
-    }
-    const r = result;
-    return { providers: r.providers ?? [], currentProviderId: r.currentProviderId ?? null };
+    return executeListProviders(this.opContext());
   }
-  /**
-   * Send an MCP message to the agent for routing.
-   */
   async mcpMessage(connectionId, message) {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "mcp/message", { connectionId, message });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError("prompt_failed", `mcp/message failed: ${result.message}`, result);
-    }
-    return result;
+    return executeMcpMessage(this.opContext(), connectionId, message);
   }
-  /**
-   * Set the active provider for the agent.
-   */
   async setProvider(providerId, config) {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "providers/set", { providerId, ...config ?? {} });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError("prompt_failed", `providers/set failed: ${result.message}`, result);
-    }
+    return executeSetProvider(this.opContext(), providerId, config);
   }
-  /**
-   * Disable the current provider.
-   */
   async disableProvider() {
-    if (this.closed) throw new ACPSessionError("closed", "session is closed");
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "providers/disable", {});
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "prompt_failed",
-        `providers/disable failed: ${result.message}`,
-        result
-      );
-    }
+    return executeDisableProvider(this.opContext());
   }
   // ──────────────────────────────────────────────────────────────────────
   // Prompt
   // ──────────────────────────────────────────────────────────────────────
-  /**
-   * Run one prompt turn. Creates a session if needed, sends the
-   * prompt, streams session/update notifications, and resolves with
-   * the agent's response.
-   *
-   * @param blocks - Content blocks to send. Use `textContent()` for plain
-   *   text, or include ImageContent/AudioContent if the agent's
-   *   `promptCapabilities` allow it.
-   * @param signal - AbortSignal for cancellation.
-   *
-   * Cancellation: if `signal` aborts mid-prompt, we send
-   * `session/cancel` (a notification per spec) and keep accepting
-   * updates until the agent returns with `stopReason: 'cancelled'`.
-   * The result is the same shape as a normal turn, with
-   * `stopReason === 'cancelled'`.
-   */
   async prompt(blocks, signal, onProgress) {
     if (this.closed) {
       throw new ACPSessionError("closed", "session is closed");
@@ -1912,7 +1914,7 @@ var ACPSession = class _ACPSession {
       return emptyRunResult("cancelled");
     }
     if (!this.sessionId) {
-      await this.createSession();
+      this.sessionId = await executeCreateSession(this.opContext());
     }
     this.resetScratch();
     this.progressHandler = onProgress ?? null;
@@ -1974,33 +1976,6 @@ var ACPSession = class _ACPSession {
       thoughts: this.scratch.thoughts
     };
   }
-  async createSession() {
-    const servers = this.filterMcpServers(this.opts.mcpServers);
-    const id = this.allocId();
-    const result = await this.sendRequest(id, "session/new", {
-      cwd: this.opts.cwd ?? this.opts.projectRoot,
-      mcpServers: servers
-    });
-    if (isJsonRpcError(result)) {
-      throw new ACPSessionError(
-        "session_create_failed",
-        `session/new failed: ${result.message}`,
-        result
-      );
-    }
-    const sessionId = result.sessionId;
-    if (typeof sessionId !== "string" || sessionId.length === 0) {
-      throw new ACPSessionError("protocol_error", "session/new returned no sessionId", result);
-    }
-    this.sessionId = sessionId;
-  }
-  /**
-   * Close the current session gracefully (if the agent supports it).
-   *
-   * Sends `session/close` JSON-RPC request, then clears the local
-   * session id. Best-effort — errors are swallowed so the caller can
-   * always proceed to transport teardown.
-   */
   async closeSession() {
     if (!this.sessionId) return;
     const sid = this.sessionId;
@@ -2016,7 +1991,6 @@ var ACPSession = class _ACPSession {
   // ──────────────────────────────────────────────────────────────────────
   // Lifecycle — close
   // ──────────────────────────────────────────────────────────────────────
-  /** Tear down the session and kill the child process. */
   async close() {
     if (this.closed) return;
     this.closed = true;
@@ -2043,24 +2017,6 @@ var ACPSession = class _ACPSession {
     } catch {
     }
   }
-  // ──────────────────────────────────────────────────────────────────────
-  // Helpers
-  // ──────────────────────────────────────────────────────────────────────
-  /**
-   * Filter MCP servers according to agent capabilities.
-   * - Stdio servers are always included.
-   * - HTTP servers are only included if agent supports mcpCapabilities.http.
-   * - SSE servers are only included if agent supports mcpCapabilities.sse.
-   */
-  filterMcpServers(servers) {
-    if (!servers || servers.length === 0) return [];
-    const mcpCaps = this.agentCapabilities.mcpCapabilities ?? {};
-    return servers.filter((s) => {
-      if ("type" in s && s.type === "http") return mcpCaps.http === true;
-      if ("type" in s && s.type === "sse") return mcpCaps.sse === true;
-      return true;
-    });
-  }
   // ────────────────────────────────────────────────────────────────────
   // Wire layer
   // ────────────────────────────────────────────────────────────────────
@@ -2091,21 +2047,9 @@ var ACPSession = class _ACPSession {
       });
     });
   }
-  /**
-   * Send a JSON-RPC 2.0 success response to an agent-initiated request.
-   *
-   * Per JSON-RPC 2.0 (and the official ACP SDK's message router) a Response
-   * object MUST carry `jsonrpc: "2.0"` and MUST NOT carry a `method` field —
-   * the SDK classifies any object with a `method` key as a Request and drops
-   * it as a response, so an agent's `fs/*`, `terminal/*`, or
-   * `session/request_permission` callback would hang forever. The legacy
-   * `ACPMessage` type predates v1 (requires `method`, lacks `jsonrpc`), so we
-   * build the correct wire object and cast at the boundary.
-   */
   sendResult(id, result) {
     return this.transport.send({ jsonrpc: "2.0", id, result });
   }
-  /** Send a JSON-RPC 2.0 error response (no `method` field, per spec). */
   sendErrorResponse(id, code, message) {
     return this.transport.send({
       jsonrpc: "2.0",
@@ -2201,9 +2145,7 @@ var ACPSession = class _ACPSession {
     } catch {
     }
   }
-  /** Live progress handler installed for the duration of a `prompt()` turn. */
   progressHandler = null;
-  // Per-prompt scratch state
   scratch = createSessionScratch();
   resetScratch() {
     this.scratch = createSessionScratch();