@multi-agent-protocol/sdk 0.0.3 → 0.0.5

package/dist/testing.js

@@ -1,4 +1,5 @@
 import { ulid } from 'ulid';
+import { EventEmitter } from 'events';
 
 // src/jsonrpc/index.ts
 function isRequest(message) {
@@ -61,6 +62,7 @@ var EVENT_TYPES = {
   PARTICIPANT_DISCONNECTED: "participant_disconnected",
   // Message events
   MESSAGE_SENT: "message_sent",
+  MESSAGE_DELIVERED: "message_delivered",
   // Scope events
   SCOPE_CREATED: "scope_created",
   SCOPE_MEMBER_JOINED: "scope_member_joined",
@@ -1396,6 +1398,11 @@ var TestServer = class {
       if (participant) {
         this.deliverMessage(recipientId, message);
         delivered.push(recipientId);
+        this.emitEvent({
+          type: EVENT_TYPES.MESSAGE_DELIVERED,
+          source: senderAgentId ?? senderId,
+          data: { messageId, message, correlationId: params.meta?.correlationId }
+        });
       }
     }
     this.emitEvent({
@@ -1756,6 +1763,9 @@ var TestServer = class {
     if (typeof address === "string") {
       return [this.#findParticipantForAgent(address) ?? address];
     }
+    if ("participant" in address && address.participant) {
+      return this.#participants.has(address.participant) ? [address.participant] : [];
+    }
     if ("agent" in address && !("system" in address)) {
       const participantId = this.#findParticipantForAgent(address.agent);
       return participantId ? [participantId] : [];
@@ -2032,6 +2042,211 @@ var TestServer = class {
   }
 };
 
+// src/stream/index.ts
+function websocketStream(ws) {
+  const messageQueue = [];
+  let messageResolver = null;
+  let closed = false;
+  let closeError = null;
+  ws.addEventListener("message", (event) => {
+    try {
+      const message = JSON.parse(event.data);
+      if (messageResolver) {
+        messageResolver({ value: message, done: false });
+        messageResolver = null;
+      } else {
+        messageQueue.push(message);
+      }
+    } catch {
+      console.error("MAP: Failed to parse WebSocket message:", event.data);
+    }
+  });
+  ws.addEventListener("close", () => {
+    closed = true;
+    if (messageResolver) {
+      messageResolver({ value: void 0, done: true });
+      messageResolver = null;
+    }
+  });
+  ws.addEventListener("error", () => {
+    closeError = new Error("WebSocket error");
+    closed = true;
+    if (messageResolver) {
+      messageResolver({ value: void 0, done: true });
+      messageResolver = null;
+    }
+  });
+  const readable = new ReadableStream({
+    async pull(controller) {
+      if (messageQueue.length > 0) {
+        controller.enqueue(messageQueue.shift());
+        return;
+      }
+      if (closed) {
+        if (closeError) {
+          controller.error(closeError);
+        } else {
+          controller.close();
+        }
+        return;
+      }
+      await new Promise((resolve) => {
+        messageResolver = resolve;
+      }).then((result) => {
+        if (result.done) {
+          controller.close();
+        } else {
+          controller.enqueue(result.value);
+        }
+      });
+    }
+  });
+  const writable = new WritableStream({
+    async write(message) {
+      if (ws.readyState === WebSocket.CONNECTING) {
+        await new Promise((resolve, reject) => {
+          const onOpen = () => {
+            ws.removeEventListener("error", onError);
+            resolve();
+          };
+          const onError = () => {
+            ws.removeEventListener("open", onOpen);
+            reject(new Error("WebSocket failed to connect"));
+          };
+          ws.addEventListener("open", onOpen, { once: true });
+          ws.addEventListener("error", onError, { once: true });
+        });
+      }
+      if (ws.readyState !== WebSocket.OPEN) {
+        throw new Error("WebSocket is not open");
+      }
+      ws.send(JSON.stringify(message));
+    },
+    close() {
+      ws.close();
+    },
+    abort() {
+      ws.close();
+    }
+  });
+  return { readable, writable };
+}
+function waitForOpen(ws, timeoutMs = 1e4) {
+  return new Promise((resolve, reject) => {
+    if (ws.readyState === WebSocket.OPEN) {
+      resolve();
+      return;
+    }
+    const timeout = setTimeout(() => {
+      ws.close();
+      reject(new Error(`WebSocket connection timeout after ${timeoutMs}ms`));
+    }, timeoutMs);
+    const onOpen = () => {
+      clearTimeout(timeout);
+      ws.removeEventListener("error", onError);
+      resolve();
+    };
+    const onError = () => {
+      clearTimeout(timeout);
+      ws.removeEventListener("open", onOpen);
+      reject(new Error("WebSocket connection failed"));
+    };
+    ws.addEventListener("open", onOpen, { once: true });
+    ws.addEventListener("error", onError, { once: true });
+  });
+}
+function createStreamPair() {
+  const clientToServer = [];
+  const serverToClient = [];
+  let clientToServerResolver = null;
+  let serverToClientResolver = null;
+  let clientToServerClosed = false;
+  let serverToClientClosed = false;
+  function createReadable(queue, _getResolver, setResolver, isClosed) {
+    return new ReadableStream({
+      async pull(controller) {
+        if (queue.length > 0) {
+          controller.enqueue(queue.shift());
+          return;
+        }
+        if (isClosed()) {
+          controller.close();
+          return;
+        }
+        const message = await new Promise((resolve) => {
+          setResolver((msg) => {
+            setResolver(null);
+            resolve(msg);
+          });
+        });
+        if (message === null) {
+          controller.close();
+        } else {
+          controller.enqueue(message);
+        }
+      }
+    });
+  }
+  function createWritable(queue, getResolver, setClosed) {
+    return new WritableStream({
+      write(message) {
+        const resolver = getResolver();
+        if (resolver) {
+          resolver(message);
+        } else {
+          queue.push(message);
+        }
+      },
+      close() {
+        setClosed();
+        const resolver = getResolver();
+        if (resolver) {
+          resolver(null);
+        }
+      }
+    });
+  }
+  const clientStream = {
+    // Client writes to server
+    writable: createWritable(
+      clientToServer,
+      () => clientToServerResolver,
+      () => {
+        clientToServerClosed = true;
+      }
+    ),
+    // Client reads from server
+    readable: createReadable(
+      serverToClient,
+      () => serverToClientResolver,
+      (r) => {
+        serverToClientResolver = r;
+      },
+      () => serverToClientClosed
+    )
+  };
+  const serverStream = {
+    // Server writes to client
+    writable: createWritable(
+      serverToClient,
+      () => serverToClientResolver,
+      () => {
+        serverToClientClosed = true;
+      }
+    ),
+    // Server reads from client
+    readable: createReadable(
+      clientToServer,
+      () => clientToServerResolver,
+      (r) => {
+        clientToServerResolver = r;
+      },
+      () => clientToServerClosed
+    )
+  };
+  return [clientStream, serverStream];
+}
+
 // src/subscription/index.ts
 var Subscription = class {
   id;
@@ -2347,92 +2562,732 @@ function createSubscription(id, unsubscribe, options, sendAck) {
   return new Subscription(id, unsubscribe, options, sendAck);
 }
 
-// src/connection/client.ts
-var ClientConnection = class {
-  #connection;
-  #subscriptions = /* @__PURE__ */ new Map();
-  #subscriptionStates = /* @__PURE__ */ new Map();
-  #reconnectionHandlers = /* @__PURE__ */ new Set();
+// src/acp/types.ts
+var ACPError = class _ACPError extends Error {
+  code;
+  data;
+  constructor(code, message, data) {
+    super(message);
+    this.name = "ACPError";
+    this.code = code;
+    this.data = data;
+  }
+  /**
+   * Create an ACPError from an error response.
+   */
+  static fromResponse(error) {
+    return new _ACPError(error.code, error.message, error.data);
+  }
+  /**
+   * Convert to JSON-RPC error object.
+   */
+  toErrorObject() {
+    return {
+      code: this.code,
+      message: this.message,
+      ...this.data !== void 0 && { data: this.data }
+    };
+  }
+};
+var ACP_METHODS = {
+  // Lifecycle
+  INITIALIZE: "initialize",
+  AUTHENTICATE: "authenticate",
+  // Session management
+  SESSION_NEW: "session/new",
+  SESSION_LOAD: "session/load",
+  SESSION_SET_MODE: "session/set_mode",
+  // Prompt
+  SESSION_PROMPT: "session/prompt",
+  SESSION_CANCEL: "session/cancel",
+  // Notifications
+  SESSION_UPDATE: "session/update",
+  // Agent→Client requests
+  REQUEST_PERMISSION: "request_permission",
+  FS_READ_TEXT_FILE: "fs/read_text_file",
+  FS_WRITE_TEXT_FILE: "fs/write_text_file",
+  TERMINAL_CREATE: "terminal/create",
+  TERMINAL_OUTPUT: "terminal/output",
+  TERMINAL_RELEASE: "terminal/release",
+  TERMINAL_WAIT_FOR_EXIT: "terminal/wait_for_exit",
+  TERMINAL_KILL: "terminal/kill"
+};
+function isACPEnvelope(payload) {
+  if (typeof payload !== "object" || payload === null) {
+    return false;
+  }
+  const envelope = payload;
+  if (typeof envelope.acp !== "object" || envelope.acp === null || typeof envelope.acpContext !== "object" || envelope.acpContext === null) {
+    return false;
+  }
+  const acpContext = envelope.acpContext;
+  return typeof acpContext.streamId === "string";
+}
+
+// src/acp/stream.ts
+var ACPStreamConnection = class extends EventEmitter {
+  #mapClient;
   #options;
+  #streamId;
+  #pendingRequests = /* @__PURE__ */ new Map();
+  #subscription = null;
   #sessionId = null;
-  #serverCapabilities = null;
-  #connected = false;
-  #lastConnectOptions;
+  #initialized = false;
+  #capabilities = null;
+  #closed = false;
+  #lastEventId = null;
   #isReconnecting = false;
-  constructor(stream, options = {}) {
-    this.#connection = new BaseConnection(stream, options);
+  #unsubscribeReconnection = null;
+  /**
+   * Create a new ACP stream connection.
+   *
+   * @param mapClient - The underlying MAP client connection
+   * @param options - Stream configuration options
+   */
+  constructor(mapClient, options) {
+    super();
+    this.#mapClient = mapClient;
     this.#options = options;
-    this.#connection.setNotificationHandler(this.#handleNotification.bind(this));
-    if (options.reconnection?.enabled && options.createStream) {
-      this.#connection.onStateChange((newState) => {
-        if (newState === "closed" && this.#connected && !this.#isReconnecting) {
-          void this.#handleDisconnect();
-        }
-      });
-    }
+    this.#streamId = `acp-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    this.#unsubscribeReconnection = mapClient.onReconnection((event) => {
+      void this.#handleReconnectionEvent(event);
+    });
   }
   // ===========================================================================
-  // Connection Lifecycle
+  // Public Properties
+  // ===========================================================================
+  /** Unique identifier for this ACP stream */
+  get streamId() {
+    return this.#streamId;
+  }
+  /** Target agent this stream connects to */
+  get targetAgent() {
+    return this.#options.targetAgent;
+  }
+  /** Current ACP session ID (null until newSession called) */
+  get sessionId() {
+    return this.#sessionId;
+  }
+  /** Whether initialize() has been called */
+  get initialized() {
+    return this.#initialized;
+  }
+  /** Agent capabilities from initialize response */
+  get capabilities() {
+    return this.#capabilities;
+  }
+  /** Whether the stream is closed */
+  get isClosed() {
+    return this.#closed;
+  }
+  /** Last processed event ID (for reconnection support) */
+  get lastEventId() {
+    return this.#lastEventId;
+  }
+  /** Whether the stream is currently reconnecting */
+  get isReconnecting() {
+    return this.#isReconnecting;
+  }
+  // ===========================================================================
+  // Reconnection Handling
   // ===========================================================================
   /**
-   * Connect to the MAP system
+   * Handle MAP reconnection events.
    */
-  async connect(options) {
-    const params = {
-      protocolVersion: PROTOCOL_VERSION,
-      participantType: "client",
-      name: this.#options.name,
-      capabilities: this.#options.capabilities,
-      sessionId: options?.sessionId,
-      auth: options?.auth
-    };
-    const result = await this.#connection.sendRequest(CORE_METHODS.CONNECT, params);
-    this.#sessionId = result.sessionId;
-    this.#serverCapabilities = result.capabilities;
-    this.#connected = true;
-    this.#connection._transitionTo("connected");
-    this.#lastConnectOptions = options;
-    return result;
+  async #handleReconnectionEvent(event) {
+    if (this.#closed) return;
+    switch (event.type) {
+      case "disconnected":
+        this.#isReconnecting = true;
+        this.emit("reconnecting");
+        for (const [id, pending] of this.#pendingRequests) {
+          clearTimeout(pending.timeout);
+          pending.reject(new Error("Connection lost during ACP request"));
+          this.#pendingRequests.delete(id);
+        }
+        break;
+      case "reconnected":
+        await this.#handleReconnected();
+        break;
+      case "reconnectFailed":
+        this.#isReconnecting = false;
+        this.emit("error", event.error ?? new Error("MAP reconnection failed"));
+        break;
+    }
   }
   /**
-   * Disconnect from the MAP system
+   * Handle successful MAP reconnection.
    */
-  async disconnect(reason) {
-    if (!this.#connected) return;
+  async #handleReconnected() {
+    this.#subscription = null;
     try {
-      await this.#connection.sendRequest(
-        CORE_METHODS.DISCONNECT,
-        reason ? { reason } : void 0
-      );
-    } finally {
-      for (const subscription of this.#subscriptions.values()) {
-        subscription._close();
+      await this.#setupSubscription();
+      if (this.#sessionId) {
+        const sessionValid = await this.#verifySessionValid();
+        if (!sessionValid) {
+          const lostSessionId = this.#sessionId;
+          this.#sessionId = null;
+          this.emit("sessionLost", {
+            sessionId: lostSessionId,
+            reason: "Session no longer valid after reconnection"
+          });
+        }
       }
-      this.#subscriptions.clear();
-      await this.#connection.close();
-      this.#connected = false;
+      this.#isReconnecting = false;
+      this.emit("reconnected");
+    } catch (error) {
+      this.#isReconnecting = false;
+      this.emit("error", error instanceof Error ? error : new Error(String(error)));
     }
   }
   /**
-   * Whether the client is connected
-   */
-  get isConnected() {
-    return this.#connected && !this.#connection.isClosed;
-  }
-  /**
-   * Current session ID
+   * Verify that the current ACP session is still valid.
+   *
+   * Since ACP doesn't have a dedicated status check method, we attempt
+   * a lightweight operation (cancel with no effect) to verify the session.
    */
-  get sessionId() {
-    return this.#sessionId;
+  async #verifySessionValid() {
+    if (!this.#sessionId) return false;
+    try {
+      await this.#sendNotification(ACP_METHODS.SESSION_CANCEL, {
+        sessionId: this.#sessionId,
+        reason: "session_verification"
+      });
+      return true;
+    } catch {
+      return false;
+    }
   }
+  // ===========================================================================
+  // Internal Methods
+  // ===========================================================================
   /**
-   * Server capabilities
+   * Set up the subscription for receiving messages from the target agent.
    */
-  get serverCapabilities() {
-    return this.#serverCapabilities;
+  async #setupSubscription() {
+    if (this.#subscription) return;
+    this.#subscription = await this.#mapClient.subscribe({
+      fromAgents: [this.#options.targetAgent]
+    });
+    void this.#processEvents();
   }
   /**
-   * AbortSignal that triggers when the connection closes
+   * Process incoming events from the subscription.
+   */
+  async #processEvents() {
+    if (!this.#subscription) return;
+    try {
+      for await (const event of this.#subscription) {
+        if (this.#closed) break;
+        if (event.id) {
+          this.#lastEventId = event.id;
+        }
+        if (event.type === "message_delivered" && event.data) {
+          const message = event.data.message;
+          if (message?.payload) {
+            await this.#handleIncomingMessage(message);
+          }
+        }
+      }
+    } catch (error) {
+      if (!this.#closed) {
+        this.emit("error", error);
+      }
+    }
+  }
+  /**
+   * Handle an incoming message from the target agent.
+   */
+  async #handleIncomingMessage(message) {
+    const payload = message.payload;
+    if (!isACPEnvelope(payload)) return;
+    const envelope = payload;
+    const { acp, acpContext } = envelope;
+    if (acpContext.streamId !== this.#streamId) return;
+    if (acp.id !== void 0 && !acp.method) {
+      const requestId = String(acp.id);
+      const pending = this.#pendingRequests.get(requestId);
+      if (pending) {
+        clearTimeout(pending.timeout);
+        this.#pendingRequests.delete(requestId);
+        if (acp.error) {
+          pending.reject(ACPError.fromResponse(acp.error));
+        } else {
+          pending.resolve(acp.result);
+        }
+      }
+      return;
+    }
+    if (acp.method && acp.id === void 0) {
+      await this.#handleNotification(acp.method, acp.params, acpContext);
+      return;
+    }
+    if (acp.method && acp.id !== void 0) {
+      await this.#handleAgentRequest(acp.id, acp.method, acp.params, acpContext, message);
+    }
+  }
+  /**
+   * Handle an ACP notification from the agent.
+   */
+  async #handleNotification(method, params, _acpContext) {
+    if (method === ACP_METHODS.SESSION_UPDATE) {
+      await this.#options.client.sessionUpdate(params);
+    }
+  }
+  /**
+   * Handle an agent→client request.
+   */
+  async #handleAgentRequest(requestId, method, params, _ctx, originalMessage) {
+    let result;
+    let error;
+    try {
+      switch (method) {
+        case ACP_METHODS.REQUEST_PERMISSION:
+          result = await this.#options.client.requestPermission(
+            params
+          );
+          break;
+        case ACP_METHODS.FS_READ_TEXT_FILE:
+          if (!this.#options.client.readTextFile) {
+            throw new ACPError(-32601, "Method not supported: fs/read_text_file");
+          }
+          result = await this.#options.client.readTextFile(
+            params
+          );
+          break;
+        case ACP_METHODS.FS_WRITE_TEXT_FILE:
+          if (!this.#options.client.writeTextFile) {
+            throw new ACPError(-32601, "Method not supported: fs/write_text_file");
+          }
+          result = await this.#options.client.writeTextFile(
+            params
+          );
+          break;
+        case ACP_METHODS.TERMINAL_CREATE:
+          if (!this.#options.client.createTerminal) {
+            throw new ACPError(-32601, "Method not supported: terminal/create");
+          }
+          result = await this.#options.client.createTerminal(
+            params
+          );
+          break;
+        case ACP_METHODS.TERMINAL_OUTPUT:
+          if (!this.#options.client.terminalOutput) {
+            throw new ACPError(-32601, "Method not supported: terminal/output");
+          }
+          result = await this.#options.client.terminalOutput(
+            params
+          );
+          break;
+        case ACP_METHODS.TERMINAL_RELEASE:
+          if (!this.#options.client.releaseTerminal) {
+            throw new ACPError(-32601, "Method not supported: terminal/release");
+          }
+          result = await this.#options.client.releaseTerminal(
+            params
+          );
+          break;
+        case ACP_METHODS.TERMINAL_WAIT_FOR_EXIT:
+          if (!this.#options.client.waitForTerminalExit) {
+            throw new ACPError(-32601, "Method not supported: terminal/wait_for_exit");
+          }
+          result = await this.#options.client.waitForTerminalExit(
+            params
+          );
+          break;
+        case ACP_METHODS.TERMINAL_KILL:
+          if (!this.#options.client.killTerminal) {
+            throw new ACPError(-32601, "Method not supported: terminal/kill");
+          }
+          result = await this.#options.client.killTerminal(
+            params
+          );
+          break;
+        default:
+          throw new ACPError(-32601, `Unknown method: ${method}`);
+      }
+    } catch (e) {
+      if (e instanceof ACPError) {
+        error = e;
+      } else {
+        error = new ACPError(-32603, e.message);
+      }
+    }
+    const responseEnvelope = {
+      acp: {
+        jsonrpc: "2.0",
+        id: requestId,
+        ...error ? { error: error.toErrorObject() } : { result }
+      },
+      acpContext: {
+        streamId: this.#streamId,
+        sessionId: this.#sessionId,
+        direction: "client-to-agent"
+      }
+    };
+    await this.#mapClient.send(
+      { agent: this.#options.targetAgent },
+      responseEnvelope,
+      {
+        protocol: "acp",
+        correlationId: originalMessage.id
+      }
+    );
+  }
+  /**
+   * Send an ACP request and wait for response.
+   */
+  async #sendRequest(method, params) {
+    if (this.#closed) {
+      throw new Error("ACP stream is closed");
+    }
+    await this.#setupSubscription();
+    if (this.#closed) {
+      throw new Error("ACP stream closed");
+    }
+    const correlationId = `${this.#streamId}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    const timeout = this.#options.timeout ?? 3e4;
+    const envelope = {
+      acp: {
+        jsonrpc: "2.0",
+        id: correlationId,
+        method,
+        ...params !== void 0 && { params }
+      },
+      acpContext: {
+        streamId: this.#streamId,
+        sessionId: this.#sessionId,
+        direction: "client-to-agent"
+      }
+    };
+    const resultPromise = new Promise((resolve, reject) => {
+      const timeoutHandle = setTimeout(() => {
+        this.#pendingRequests.delete(correlationId);
+        reject(new Error(`ACP request timed out after ${timeout}ms: ${method}`));
+      }, timeout);
+      this.#pendingRequests.set(correlationId, {
+        resolve,
+        reject,
+        timeout: timeoutHandle,
+        method
+      });
+    });
+    try {
+      await this.#mapClient.send({ agent: this.#options.targetAgent }, envelope, {
+        protocol: "acp",
+        correlationId
+      });
+    } catch (err) {
+      const pending = this.#pendingRequests.get(correlationId);
+      if (pending) {
+        clearTimeout(pending.timeout);
+        this.#pendingRequests.delete(correlationId);
+      }
+      throw err;
+    }
+    if (this.#closed && !this.#pendingRequests.has(correlationId)) {
+      throw new Error("ACP stream closed");
+    }
+    return resultPromise;
+  }
+  /**
+   * Send an ACP notification (no response expected).
+   */
+  async #sendNotification(method, params) {
+    if (this.#closed) {
+      throw new Error("ACP stream is closed");
+    }
+    await this.#setupSubscription();
+    const envelope = {
+      acp: {
+        jsonrpc: "2.0",
+        method,
+        ...params !== void 0 && { params }
+      },
+      acpContext: {
+        streamId: this.#streamId,
+        sessionId: this.#sessionId,
+        direction: "client-to-agent"
+      }
+    };
+    await this.#mapClient.send({ agent: this.#options.targetAgent }, envelope, {
+      protocol: "acp"
+    });
+  }
+  // ===========================================================================
+  // ACP Lifecycle Methods
+  // ===========================================================================
+  /**
+   * Initialize the ACP connection with the target agent.
+   */
+  async initialize(params) {
+    if (this.#initialized) {
+      throw new Error("ACP stream already initialized");
+    }
+    const result = await this.#sendRequest(
+      ACP_METHODS.INITIALIZE,
+      params
+    );
+    this.#initialized = true;
+    this.#capabilities = result.agentCapabilities ?? null;
+    return result;
+  }
+  /**
+   * Authenticate with the agent.
+   */
+  async authenticate(params) {
+    if (!this.#initialized) {
+      throw new Error("Must call initialize() before authenticate()");
+    }
+    return this.#sendRequest(
+      ACP_METHODS.AUTHENTICATE,
+      params
+    );
+  }
+  // ===========================================================================
+  // ACP Session Methods
+  // ===========================================================================
+  /**
+   * Create a new ACP session.
+   */
+  async newSession(params) {
+    if (!this.#initialized) {
+      throw new Error("Must call initialize() before newSession()");
+    }
+    const result = await this.#sendRequest(
+      ACP_METHODS.SESSION_NEW,
+      params
+    );
+    this.#sessionId = result.sessionId;
+    return result;
+  }
+  /**
+   * Load an existing ACP session.
+   */
+  async loadSession(params) {
+    if (!this.#initialized) {
+      throw new Error("Must call initialize() before loadSession()");
+    }
+    const result = await this.#sendRequest(
+      ACP_METHODS.SESSION_LOAD,
+      params
+    );
+    this.#sessionId = params.sessionId;
+    return result;
+  }
+  /**
+   * Set the session mode.
+   */
+  async setSessionMode(params) {
+    return this.#sendRequest(
+      ACP_METHODS.SESSION_SET_MODE,
+      params
+    );
+  }
+  // ===========================================================================
+  // ACP Prompt Methods
+  // ===========================================================================
+  /**
+   * Send a prompt to the agent.
+   * Updates are received via the sessionUpdate handler.
+   */
+  async prompt(params) {
+    if (!this.#sessionId) {
+      throw new Error("Must call newSession() or loadSession() before prompt()");
+    }
+    return this.#sendRequest(
+      ACP_METHODS.SESSION_PROMPT,
+      params
+    );
+  }
+  /**
+   * Cancel ongoing operations for the current session.
+   */
+  async cancel(params) {
+    if (!this.#sessionId) {
+      throw new Error("No active session to cancel");
+    }
+    await this.#sendNotification(ACP_METHODS.SESSION_CANCEL, {
+      sessionId: this.#sessionId,
+      ...params
+    });
+  }
+  // ===========================================================================
+  // Lifecycle
+  // ===========================================================================
+  /**
+   * Close this ACP stream and clean up resources.
+   */
+  async close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    if (this.#unsubscribeReconnection) {
+      this.#unsubscribeReconnection();
+      this.#unsubscribeReconnection = null;
+    }
+    for (const [id, pending] of this.#pendingRequests) {
+      clearTimeout(pending.timeout);
+      pending.reject(new Error("ACP stream closed"));
+      this.#pendingRequests.delete(id);
+    }
+    if (this.#subscription) {
+      await this.#subscription.unsubscribe();
+      this.#subscription = null;
+    }
+    this.emit("close");
+  }
+};
+
+// src/connection/client.ts
+var ClientConnection = class _ClientConnection {
+  #connection;
+  #subscriptions = /* @__PURE__ */ new Map();
+  #subscriptionStates = /* @__PURE__ */ new Map();
+  #reconnectionHandlers = /* @__PURE__ */ new Set();
+  #acpStreams = /* @__PURE__ */ new Map();
+  #options;
+  #sessionId = null;
+  #serverCapabilities = null;
+  #connected = false;
+  #lastConnectOptions;
+  #isReconnecting = false;
+  constructor(stream, options = {}) {
+    this.#connection = new BaseConnection(stream, options);
+    this.#options = options;
+    this.#connection.setNotificationHandler(this.#handleNotification.bind(this));
+    if (options.reconnection?.enabled && options.createStream) {
+      this.#connection.onStateChange((newState) => {
+        if (newState === "closed" && this.#connected && !this.#isReconnecting) {
+          void this.#handleDisconnect();
+        }
+      });
+    }
+  }
+  // ===========================================================================
+  // Static Factory Methods
+  // ===========================================================================
+  /**
+   * Connect to a MAP server via WebSocket URL.
+   *
+   * Handles:
+   * - WebSocket creation and connection
+   * - Stream wrapping
+   * - Auto-configuration of createStream for reconnection
+   * - Initial MAP protocol connect handshake
+   *
+   * @param url - WebSocket URL (ws:// or wss://)
+   * @param options - Connection options
+   * @returns Connected ClientConnection instance
+   *
+   * @example
+   * ```typescript
+   * const client = await ClientConnection.connect('ws://localhost:8080', {
+   *   name: 'MyClient',
+   *   reconnection: true
+   * });
+   *
+   * // Already connected, ready to use
+   * const agents = await client.listAgents();
+   * ```
+   */
+  static async connect(url, options) {
+    const parsedUrl = new URL(url);
+    if (!["ws:", "wss:"].includes(parsedUrl.protocol)) {
+      throw new Error(
+        `Unsupported protocol: ${parsedUrl.protocol}. Use ws: or wss:`
+      );
+    }
+    const timeout = options?.connectTimeout ?? 1e4;
+    const ws = new WebSocket(url);
+    await waitForOpen(ws, timeout);
+    const stream = websocketStream(ws);
+    const createStream = async () => {
+      const newWs = new WebSocket(url);
+      await waitForOpen(newWs, timeout);
+      return websocketStream(newWs);
+    };
+    const reconnection = options?.reconnection === true ? { enabled: true } : typeof options?.reconnection === "object" ? options.reconnection : void 0;
+    const client = new _ClientConnection(stream, {
+      name: options?.name,
+      capabilities: options?.capabilities,
+      createStream,
+      reconnection
+    });
+    await client.connect({ auth: options?.auth });
+    return client;
+  }
+  // ===========================================================================
+  // Connection Lifecycle
+  // ===========================================================================
+  /**
+   * Connect to the MAP system
+   */
+  async connect(options) {
+    const params = {
+      protocolVersion: PROTOCOL_VERSION,
+      participantType: "client",
+      name: this.#options.name,
+      capabilities: this.#options.capabilities,
+      sessionId: options?.sessionId,
+      resumeToken: options?.resumeToken,
+      auth: options?.auth
+    };
+    const result = await this.#connection.sendRequest(CORE_METHODS.CONNECT, params);
+    this.#sessionId = result.sessionId;
+    this.#serverCapabilities = result.capabilities;
+    this.#connected = true;
+    this.#connection._transitionTo("connected");
+    this.#lastConnectOptions = options;
+    return result;
+  }
+  /**
+   * Disconnect from the MAP system
+   * @param reason - Optional reason for disconnecting
+   * @returns Resume token that can be used to resume this session later
+   */
+  async disconnect(reason) {
+    if (!this.#connected) return void 0;
+    let resumeToken;
+    try {
+      const result = await this.#connection.sendRequest(
+        CORE_METHODS.DISCONNECT,
+        reason ? { reason } : void 0
+      );
+      resumeToken = result.resumeToken;
+    } finally {
+      for (const stream of this.#acpStreams.values()) {
+        await stream.close();
+      }
+      this.#acpStreams.clear();
+      for (const subscription of this.#subscriptions.values()) {
+        subscription._close();
+      }
+      this.#subscriptions.clear();
+      await this.#connection.close();
+      this.#connected = false;
+    }
+    return resumeToken;
+  }
+  /**
+   * Whether the client is connected
+   */
+  get isConnected() {
+    return this.#connected && !this.#connection.isClosed;
+  }
+  /**
+   * Current session ID
+   */
+  get sessionId() {
+    return this.#sessionId;
+  }
+  /**
+   * Server capabilities
+   */
+  get serverCapabilities() {
+    return this.#serverCapabilities;
+  }
+  /**
+   * AbortSignal that triggers when the connection closes
    */
   get signal() {
     return this.#connection.signal;
@@ -2585,6 +3440,65 @@ var ClientConnection = class {
     }
   }
   // ===========================================================================
+  // ACP Streams
+  // ===========================================================================
+  /**
+   * Create a virtual ACP stream connection to an agent.
+   *
+   * This allows clients to interact with ACP-compatible agents using the
+   * familiar ACP interface while routing all messages through MAP.
+   *
+   * @param options - Stream configuration options
+   * @returns ACPStreamConnection instance ready for initialize()
+   *
+   * @example
+   * ```typescript
+   * const acp = client.createACPStream({
+   *   targetAgent: 'coding-agent-1',
+   *   client: {
+   *     requestPermission: async (req) => ({
+   *       outcome: { outcome: 'selected', optionId: 'allow' }
+   *     }),
+   *     sessionUpdate: async (update) => {
+   *       console.log('Agent update:', update);
+   *     }
+   *   }
+   * });
+   *
+   * await acp.initialize({
+   *   protocolVersion: 20241007,
+   *   clientInfo: { name: 'IDE', version: '1.0' }
+   * });
+   * const { sessionId } = await acp.newSession({ cwd: '/project', mcpServers: [] });
+   * const result = await acp.prompt({
+   *   sessionId,
+   *   prompt: [{ type: 'text', text: 'Hello' }]
+   * });
+   *
+   * await acp.close();
+   * ```
+   */
+  createACPStream(options) {
+    const stream = new ACPStreamConnection(this, options);
+    this.#acpStreams.set(stream.streamId, stream);
+    stream.on("close", () => {
+      this.#acpStreams.delete(stream.streamId);
+    });
+    return stream;
+  }
+  /**
+   * Get an active ACP stream by ID.
+   */
+  getACPStream(streamId) {
+    return this.#acpStreams.get(streamId);
+  }
+  /**
+   * Get all active ACP streams.
+   */
+  get acpStreams() {
+    return this.#acpStreams;
+  }
+  // ===========================================================================
   // Subscriptions
   // ===========================================================================
   /**
@@ -2946,99 +3860,6 @@ var ClientConnection = class {
   }
 };
 
-// src/stream/index.ts
-function createStreamPair() {
-  const clientToServer = [];
-  const serverToClient = [];
-  let clientToServerResolver = null;
-  let serverToClientResolver = null;
-  let clientToServerClosed = false;
-  let serverToClientClosed = false;
-  function createReadable(queue, _getResolver, setResolver, isClosed) {
-    return new ReadableStream({
-      async pull(controller) {
-        if (queue.length > 0) {
-          controller.enqueue(queue.shift());
-          return;
-        }
-        if (isClosed()) {
-          controller.close();
-          return;
-        }
-        const message = await new Promise((resolve) => {
-          setResolver((msg) => {
-            setResolver(null);
-            resolve(msg);
-          });
-        });
-        if (message === null) {
-          controller.close();
-        } else {
-          controller.enqueue(message);
-        }
-      }
-    });
-  }
-  function createWritable(queue, getResolver, setClosed) {
-    return new WritableStream({
-      write(message) {
-        const resolver = getResolver();
-        if (resolver) {
-          resolver(message);
-        } else {
-          queue.push(message);
-        }
-      },
-      close() {
-        setClosed();
-        const resolver = getResolver();
-        if (resolver) {
-          resolver(null);
-        }
-      }
-    });
-  }
-  const clientStream = {
-    // Client writes to server
-    writable: createWritable(
-      clientToServer,
-      () => clientToServerResolver,
-      () => {
-        clientToServerClosed = true;
-      }
-    ),
-    // Client reads from server
-    readable: createReadable(
-      serverToClient,
-      () => serverToClientResolver,
-      (r) => {
-        serverToClientResolver = r;
-      },
-      () => serverToClientClosed
-    )
-  };
-  const serverStream = {
-    // Server writes to client
-    writable: createWritable(
-      serverToClient,
-      () => serverToClientResolver,
-      () => {
-        serverToClientClosed = true;
-      }
-    ),
-    // Server reads from client
-    readable: createReadable(
-      clientToServer,
-      () => clientToServerResolver,
-      (r) => {
-        clientToServerResolver = r;
-      },
-      () => clientToServerClosed
-    )
-  };
-  return [clientStream, serverStream];
-}
-
 // src/testing/client.ts
 var TestClient = class _TestClient {
   #connection;
@@ -3231,7 +4052,7 @@ var TestClient = class _TestClient {
 };
 
 // src/connection/agent.ts
-var AgentConnection = class {
+var AgentConnection = class _AgentConnection {
   #connection;
   #subscriptions = /* @__PURE__ */ new Map();
   #options;
@@ -3258,6 +4079,66 @@ var AgentConnection = class {
     }
   }
   // ===========================================================================
+  // Static Factory Methods
+  // ===========================================================================
+  /**
+   * Connect and register an agent via WebSocket URL.
+   *
+   * Handles:
+   * - WebSocket creation and connection
+   * - Stream wrapping
+   * - Auto-configuration of createStream for reconnection
+   * - Initial MAP protocol connect handshake
+   * - Agent registration
+   *
+   * @param url - WebSocket URL (ws:// or wss://)
+   * @param options - Connection and agent options
+   * @returns Connected and registered AgentConnection instance
+   *
+   * @example
+   * ```typescript
+   * const agent = await AgentConnection.connect('ws://localhost:8080', {
+   *   name: 'Worker',
+   *   role: 'processor',
+   *   reconnection: true
+   * });
+   *
+   * // Already registered, ready to work
+   * agent.onMessage(handleMessage);
+   * await agent.busy();
+   * ```
+   */
+  static async connect(url, options) {
+    const parsedUrl = new URL(url);
+    if (!["ws:", "wss:"].includes(parsedUrl.protocol)) {
+      throw new Error(
+        `Unsupported protocol: ${parsedUrl.protocol}. Use ws: or wss:`
+      );
+    }
+    const timeout = options?.connectTimeout ?? 1e4;
+    const ws = new WebSocket(url);
+    await waitForOpen(ws, timeout);
+    const stream = websocketStream(ws);
+    const createStream = async () => {
+      const newWs = new WebSocket(url);
+      await waitForOpen(newWs, timeout);
+      return websocketStream(newWs);
+    };
+    const reconnection = options?.reconnection === true ? { enabled: true } : typeof options?.reconnection === "object" ? options.reconnection : void 0;
+    const agent = new _AgentConnection(stream, {
+      name: options?.name,
+      role: options?.role,
+      capabilities: options?.capabilities,
+      visibility: options?.visibility,
+      parent: options?.parent,
+      scopes: options?.scopes,
+      createStream,
+      reconnection
+    });
+    await agent.connect({ auth: options?.auth });
+    return agent;
+  }
+  // ===========================================================================
   // Connection Lifecycle
   // ===========================================================================
   /**
@@ -3270,6 +4151,7 @@ var AgentConnection = class {
       participantId: options?.agentId,
       name: this.#options.name,
       capabilities: this.#options.capabilities,
+      resumeToken: options?.resumeToken,
       auth: options?.auth
     };
     const connectResult = await this.#connection.sendRequest(CORE_METHODS.CONNECT, connectParams);
@@ -3294,9 +4176,12 @@ var AgentConnection = class {
   }
   /**
    * Disconnect from the MAP system
+   * @param reason - Optional reason for disconnecting
+   * @returns Resume token that can be used to resume this session later
    */
   async disconnect(reason) {
-    if (!this.#connected) return;
+    if (!this.#connected) return void 0;
+    let resumeToken;
     try {
       if (this.#agentId) {
         await this.#connection.sendRequest(LIFECYCLE_METHODS.AGENTS_UNREGISTER, {
@@ -3304,10 +4189,11 @@ var AgentConnection = class {
           reason
         });
       }
-      await this.#connection.sendRequest(
+      const result = await this.#connection.sendRequest(
         CORE_METHODS.DISCONNECT,
         reason ? { reason } : void 0
       );
+      resumeToken = result.resumeToken;
     } finally {
       for (const subscription of this.#subscriptions.values()) {
         subscription._close();
@@ -3316,6 +4202,7 @@ var AgentConnection = class {
       await this.#connection.close();
       this.#connected = false;
     }
+    return resumeToken;
   }
   /**
    * Whether the agent is connected