@thinkwell/acp 0.1.0

package/dist/connection.d.ts

@@ -0,0 +1,71 @@
+import { type ChildProcess } from "node:child_process";
+import { ClientSideConnection, type SessionNotification, type PromptResponse } from "@agentclientprotocol/sdk";
+import { McpOverAcpHandler } from "./mcp-over-acp-handler.js";
+import type { ActiveSession } from "./session.js";
+import type { McpServerConfig } from "./types.js";
+/**
+ * Session creation options
+ */
+export interface SessionOptions {
+    cwd?: string;
+    systemPrompt?: string;
+    mcpServers?: McpServerConfig[];
+}
+/**
+ * Connection to the SACP conductor via the ACP SDK.
+ *
+ * This class wraps the official @agentclientprotocol/sdk's ClientSideConnection
+ * and adds SACP-specific functionality (MCP-over-ACP handling).
+ */
+export declare class SacpConnection {
+    private readonly _process;
+    private readonly _connection;
+    private readonly _mcpHandler;
+    private readonly _sessionHandlers;
+    private _initialized;
+    constructor(process: ChildProcess, connection: ClientSideConnection, mcpHandler: McpOverAcpHandler);
+    /**
+     * Get the MCP handler for registering servers
+     */
+    get mcpHandler(): McpOverAcpHandler;
+    /**
+     * Initialize the connection (negotiate protocol version and capabilities)
+     */
+    initialize(): Promise<void>;
+    /**
+     * Create a new session
+     */
+    createSession(options: SessionOptions): Promise<string>;
+    /**
+     * Send a prompt to an existing session
+     */
+    sendPrompt(sessionId: string, content: string): Promise<PromptResponse>;
+    /**
+     * Set the handler for session updates
+     */
+    setSessionHandler(sessionId: string, handler: ActiveSession): void;
+    /**
+     * Remove the handler for session updates
+     */
+    removeSessionHandler(sessionId: string): void;
+    /**
+     * Handle a session update notification from the agent
+     */
+    handleSessionUpdate(notification: SessionNotification): void;
+    private _convertNotification;
+    /**
+     * Close the connection
+     */
+    close(): void;
+}
+/**
+ * Connect to a conductor process
+ */
+export declare function connect(command: string[]): Promise<SacpConnection>;
+/**
+ * Create a session builder for this connection
+ */
+export declare function session(connection: SacpConnection): SessionBuilder;
+import { SessionBuilder } from "./session.js";
+export { SessionBuilder };
+//# sourceMappingURL=connection.d.ts.map

package/dist/connection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EACL,oBAAoB,EAIpB,KAAK,mBAAmB,EAKxB,KAAK,cAAc,EAEpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;CAChC;AAED;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IACnD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyC;IAC1E,OAAO,CAAC,YAAY,CAAkB;gBAGpC,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,oBAAoB,EAChC,UAAU,EAAE,iBAAiB;IAO/B;;OAEG;IACH,IAAI,UAAU,IAAI,iBAAiB,CAElC;IAED;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB7D;;OAEG;IACG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAS7E;;OAEG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAIlE;;OAEG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAI7C;;OAEG;IACH,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,GAAG,IAAI;IAe5D,OAAO,CAAC,oBAAoB;IAmC5B;;OAEG;IACH,KAAK,IAAI,IAAI;CAGd;AA2GD;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CA+CxE;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,UAAU,EAAE,cAAc,GAAG,cAAc,CAElE;AAGD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/connection.js

@@ -0,0 +1,263 @@
+import { spawn } from "node:child_process";
+import { ClientSideConnection, ndJsonStream, } from "@agentclientprotocol/sdk";
+import { McpOverAcpHandler } from "./mcp-over-acp-handler.js";
+/**
+ * Connection to the SACP conductor via the ACP SDK.
+ *
+ * This class wraps the official @agentclientprotocol/sdk's ClientSideConnection
+ * and adds SACP-specific functionality (MCP-over-ACP handling).
+ */
+export class SacpConnection {
+    _process;
+    _connection;
+    _mcpHandler;
+    _sessionHandlers = new Map();
+    _initialized = false;
+    constructor(process, connection, mcpHandler) {
+        this._process = process;
+        this._connection = connection;
+        this._mcpHandler = mcpHandler;
+    }
+    /**
+     * Get the MCP handler for registering servers
+     */
+    get mcpHandler() {
+        return this._mcpHandler;
+    }
+    /**
+     * Initialize the connection (negotiate protocol version and capabilities)
+     */
+    async initialize() {
+        if (this._initialized)
+            return;
+        await this._connection.initialize({
+            protocolVersion: 1,
+            clientCapabilities: {},
+        });
+        this._initialized = true;
+    }
+    /**
+     * Create a new session
+     */
+    async createSession(options) {
+        await this.initialize();
+        // Convert our McpServerConfig to the SDK's McpServer type
+        const mcpServers = (options.mcpServers ?? []).map((s) => ({
+            type: "http",
+            name: s.name,
+            url: s.url,
+            headers: [],
+        }));
+        const request = {
+            cwd: options.cwd ?? process.cwd(),
+            mcpServers,
+        };
+        const response = await this._connection.newSession(request);
+        return response.sessionId;
+    }
+    /**
+     * Send a prompt to an existing session
+     */
+    async sendPrompt(sessionId, content) {
+        const request = {
+            sessionId,
+            prompt: [{ type: "text", text: content }],
+        };
+        return this._connection.prompt(request);
+    }
+    /**
+     * Set the handler for session updates
+     */
+    setSessionHandler(sessionId, handler) {
+        this._sessionHandlers.set(sessionId, handler);
+    }
+    /**
+     * Remove the handler for session updates
+     */
+    removeSessionHandler(sessionId) {
+        this._sessionHandlers.delete(sessionId);
+    }
+    /**
+     * Handle a session update notification from the agent
+     */
+    handleSessionUpdate(notification) {
+        const { sessionId } = notification;
+        const handler = this._sessionHandlers.get(sessionId);
+        if (!handler) {
+            console.error(`No handler for session: ${sessionId}`);
+            return;
+        }
+        // Convert ACP notification to our SessionUpdate type
+        const update = this._convertNotification(notification);
+        if (update) {
+            handler.pushUpdate(update);
+        }
+    }
+    _convertNotification(notification) {
+        const { update } = notification;
+        // Use the sessionUpdate discriminator to determine type
+        switch (update.sessionUpdate) {
+            case "agent_message_chunk":
+            case "user_message_chunk":
+            case "agent_thought_chunk": {
+                const content = update.content;
+                if (content.type === "text") {
+                    return { type: "text", content: content.text };
+                }
+                break;
+            }
+            case "tool_call": {
+                return {
+                    type: "tool_use",
+                    id: update.toolCallId,
+                    name: update.title,
+                    input: update.rawInput ?? {},
+                };
+            }
+            case "plan":
+            case "tool_call_update":
+            case "available_commands_update":
+            case "current_mode_update":
+                // These are informational updates we don't need to handle
+                break;
+        }
+        return null;
+    }
+    /**
+     * Close the connection
+     */
+    close() {
+        this._process.kill();
+    }
+}
+/**
+ * Create a Client implementation that handles incoming agent requests
+ */
+function createClient(connectionHolder, mcpHandler) {
+    return {
+        // Required: Handle session updates from the agent
+        sessionUpdate(notification) {
+            if (!connectionHolder.connection) {
+                console.error("Connection not yet initialized, dropping session update");
+                return Promise.resolve();
+            }
+            connectionHolder.connection.handleSessionUpdate(notification);
+            return Promise.resolve();
+        },
+        // Required: Handle permission requests
+        requestPermission(request) {
+            // For now, auto-approve by selecting the first option
+            // In a real client, this would prompt the user
+            const firstOption = request.options[0];
+            return Promise.resolve({
+                outcome: {
+                    outcome: "selected",
+                    optionId: firstOption?.optionId ?? "approve",
+                },
+            });
+        },
+        // Extension method handler for _mcp/* requests
+        async extMethod(method, params) {
+            if (mcpHandler.isMcpRequest(method)) {
+                const result = await mcpHandler.routeRequest(method, params);
+                return result ?? {};
+            }
+            throw new Error(`Unknown extension method: ${method}`);
+        },
+        // Extension notification handler
+        async extNotification(method, params) {
+            if (mcpHandler.isMcpRequest(method)) {
+                await mcpHandler.routeRequest(method, params);
+            }
+        },
+    };
+}
+/**
+ * Convert Node.js streams to Web Streams for the ACP SDK
+ */
+function nodeToWebStreams(stdout, stdin) {
+    // Convert Node readable to Web ReadableStream
+    const readable = new ReadableStream({
+        start(controller) {
+            stdout.on("data", (chunk) => {
+                controller.enqueue(new Uint8Array(chunk));
+            });
+            stdout.on("end", () => {
+                controller.close();
+            });
+            stdout.on("error", (err) => {
+                controller.error(err);
+            });
+        },
+        cancel() {
+            stdout.destroy();
+        },
+    });
+    // Convert Node writable to Web WritableStream
+    const writable = new WritableStream({
+        write(chunk) {
+            return new Promise((resolve, reject) => {
+                stdin.write(Buffer.from(chunk), (err) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve();
+                });
+            });
+        },
+        close() {
+            return new Promise((resolve) => {
+                stdin.end(() => resolve());
+            });
+        },
+        abort(reason) {
+            stdin.destroy(reason instanceof Error ? reason : new Error(String(reason)));
+        },
+    });
+    return { readable, writable };
+}
+/**
+ * Connect to a conductor process
+ */
+export async function connect(command) {
+    if (command.length === 0) {
+        throw new Error("Conductor command cannot be empty");
+    }
+    const [cmd, ...args] = command;
+    const childProcess = spawn(cmd, args, {
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    if (!childProcess.stdout || !childProcess.stdin) {
+        throw new Error("Conductor process must have stdio");
+    }
+    // Log stderr for debugging
+    childProcess.stderr?.on("data", (data) => {
+        console.error("[conductor stderr]", data.toString());
+    });
+    // Convert Node streams to Web streams for the SDK
+    const { readable, writable } = nodeToWebStreams(childProcess.stdout, childProcess.stdin);
+    // Create the ndjson stream
+    const stream = ndJsonStream(writable, readable);
+    // Create the MCP handler
+    const mcpHandler = new McpOverAcpHandler();
+    // Use a holder object to break the circular reference.
+    // The client factory is called lazily by ClientSideConnection,
+    // so we need the holder to be populated before any messages arrive.
+    const connectionHolder = { connection: null };
+    // Create the ACP client connection
+    const clientConnection = new ClientSideConnection((_agent) => createClient(connectionHolder, mcpHandler), stream);
+    // Create our wrapper connection and store it in the holder
+    const sacpConnection = new SacpConnection(childProcess, clientConnection, mcpHandler);
+    connectionHolder.connection = sacpConnection;
+    return sacpConnection;
+}
+/**
+ * Create a session builder for this connection
+ */
+export function session(connection) {
+    return new SessionBuilder(connection, connection.mcpHandler);
+}
+// Re-export for convenience
+import { SessionBuilder } from "./session.js";
+export { SessionBuilder };
+//# sourceMappingURL=connection.js.map

package/dist/connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,9 @@
+export type { JsonSchema, SchemaProvider, McpContext, McpServerConfig, McpConnectRequest, McpConnectResponse, McpMessageRequest, McpMessageResponse, McpContent, McpError, McpDisconnectNotification, McpToolsListResult, McpToolDefinition, McpToolsCallParams, McpToolsCallResult, SessionMessage, StopReason, ToolHandler, RegisteredTool, } from "./types.js";
+export type { JsonValue, JsonObject } from "./json.js";
+export { McpServer, McpServerBuilder, mcpServer } from "./mcp-server.js";
+export { McpOverAcpHandler } from "./mcp-over-acp-handler.js";
+export { ActiveSession, SessionBuilder } from "./session.js";
+export type { SessionUpdate, PromptMessage, McpReadyOptions } from "./session.js";
+export { SacpConnection, connect } from "./connection.js";
+export type { SessionOptions } from "./connection.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,UAAU,EACV,cAAc,EACd,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACR,yBAAyB,EACzB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,UAAU,EACV,WAAW,EACX,cAAc,GACf,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC7D,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/index.js

@@ -0,0 +1,9 @@
+// MCP Server
+export { McpServer, McpServerBuilder, mcpServer } from "./mcp-server.js";
+// MCP-over-ACP Handler
+export { McpOverAcpHandler } from "./mcp-over-acp-handler.js";
+// Session
+export { ActiveSession, SessionBuilder } from "./session.js";
+// Connection
+export { SacpConnection, connect } from "./connection.js";
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAyBA,aAAa;AACb,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEzE,uBAAuB;AACvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAG7D,aAAa;AACb,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/json.d.ts

@@ -0,0 +1,13 @@
+/**
+ * JSON value types
+ */
+export type JsonValue = string | number | boolean | null | JsonValue[] | {
+    [key: string]: JsonValue;
+};
+/**
+ * JSON object type
+ */
+export type JsonObject = {
+    [key: string]: JsonValue;
+};
+//# sourceMappingURL=json.d.ts.map

package/dist/json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../src/json.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,EAAE,GACX;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEjC;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC"}

package/dist/json.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=json.js.map

package/dist/json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../src/json.ts"],"names":[],"mappings":""}

package/dist/mcp-over-acp-handler.d.ts

@@ -0,0 +1,77 @@
+import type { McpServer } from "./mcp-server.js";
+import type { McpConnectResponse } from "./types.js";
+/**
+ * Handler for MCP-over-ACP protocol messages.
+ *
+ * This class manages the lifecycle of MCP connections tunneled through ACP:
+ * - mcp/connect: Establishes a new MCP connection
+ * - mcp/message: Routes MCP requests to the appropriate server
+ * - mcp/disconnect: Tears down an MCP connection
+ *
+ * Note: The ACP SDK strips the underscore prefix from extension methods,
+ * so we receive "mcp/connect" even though the wire format is "_mcp/connect".
+ */
+export declare class McpOverAcpHandler {
+    /** Maps acp:uuid URLs to registered MCP servers */
+    private readonly _serversByUrl;
+    /** Maps connection IDs to active connections */
+    private readonly _connections;
+    /** Current session ID for context */
+    private _sessionId;
+    /** Maps session IDs to pending tools discovery promises */
+    private readonly _toolsDiscoveryBySession;
+    /**
+     * Register an MCP server to handle requests for its acp: URL
+     */
+    register(server: McpServer): void;
+    /**
+     * Unregister an MCP server
+     */
+    unregister(server: McpServer): void;
+    /**
+     * Set the current session ID for context
+     */
+    setSessionId(sessionId: string): void;
+    /**
+     * Handle an incoming mcp/connect request
+     */
+    handleConnect(params: Record<string, unknown>): McpConnectResponse;
+    /**
+     * Handle an incoming mcp/message request.
+     *
+     * IMPORTANT: The response to _mcp/message is just the raw MCP result,
+     * NOT wrapped in {connectionId, result}. The conductor expects the raw
+     * MCP response (e.g., InitializeResult, ToolsListResult) directly.
+     */
+    handleMessage(params: Record<string, unknown>): Promise<unknown>;
+    /**
+     * Wait for the agent to discover tools via tools/list.
+     *
+     * This is used to avoid a race condition where the client sends a prompt
+     * before the agent has finished MCP initialization. The promise resolves
+     * when tools/list is called or when the timeout expires.
+     *
+     * @param sessionId - The session to wait for
+     * @param timeout - Maximum time to wait in milliseconds (default: 2000ms)
+     */
+    waitForToolsDiscovery(sessionId: string, timeout?: number): Promise<void>;
+    /**
+     * Resolve the tools discovery promise for a session
+     */
+    private _resolveToolsDiscovery;
+    /**
+     * Handle an incoming mcp/disconnect notification
+     */
+    handleDisconnect(params: Record<string, unknown>): void;
+    /**
+     * Check if this is an MCP-over-ACP request.
+     * Note: The ACP SDK strips the underscore prefix, so we check for "mcp/".
+     */
+    isMcpRequest(method: string): boolean;
+    /**
+     * Route an MCP-over-ACP request to the appropriate handler.
+     * Note: Methods arrive without the underscore prefix (e.g., "mcp/connect" not "_mcp/connect").
+     */
+    routeRequest(method: string, params: Record<string, unknown>): Promise<unknown>;
+}
+//# sourceMappingURL=mcp-over-acp-handler.d.ts.map

package/dist/mcp-over-acp-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-over-acp-handler.d.ts","sourceRoot":"","sources":["../src/mcp-over-acp-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAEV,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAmBpB;;;;;;;;;;GAUG;AACH,qBAAa,iBAAiB;IAC5B,mDAAmD;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyC;IACtE,qCAAqC;IACrC,OAAO,CAAC,UAAU,CAAc;IAChC,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA+C;IAExF;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAIjC;;OAEG;IACH,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAInC;;OAEG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIrC;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,kBAAkB;IAuClE;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBtE;;;;;;;;;OASG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B/E;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKvD;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIrC;;;OAGG;IACG,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,OAAO,CAAC;CAapB"}

package/dist/mcp-over-acp-handler.js

@@ -0,0 +1,183 @@
+/**
+ * Handler for MCP-over-ACP protocol messages.
+ *
+ * This class manages the lifecycle of MCP connections tunneled through ACP:
+ * - mcp/connect: Establishes a new MCP connection
+ * - mcp/message: Routes MCP requests to the appropriate server
+ * - mcp/disconnect: Tears down an MCP connection
+ *
+ * Note: The ACP SDK strips the underscore prefix from extension methods,
+ * so we receive "mcp/connect" even though the wire format is "_mcp/connect".
+ */
+export class McpOverAcpHandler {
+    /** Maps acp:uuid URLs to registered MCP servers */
+    _serversByUrl = new Map();
+    /** Maps connection IDs to active connections */
+    _connections = new Map();
+    /** Current session ID for context */
+    _sessionId = "";
+    /** Maps session IDs to pending tools discovery promises */
+    _toolsDiscoveryBySession = new Map();
+    /**
+     * Register an MCP server to handle requests for its acp: URL
+     */
+    register(server) {
+        this._serversByUrl.set(server.acpUrl, server);
+    }
+    /**
+     * Unregister an MCP server
+     */
+    unregister(server) {
+        this._serversByUrl.delete(server.acpUrl);
+    }
+    /**
+     * Set the current session ID for context
+     */
+    setSessionId(sessionId) {
+        this._sessionId = sessionId;
+    }
+    /**
+     * Handle an incoming mcp/connect request
+     */
+    handleConnect(params) {
+        // The protocol uses "acp_url" as the parameter name
+        // Generate connectionId if not provided by conductor
+        const connectionId = params.connectionId ?? `conn-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+        const url = (params.acp_url ?? params.url);
+        const server = this._serversByUrl.get(url);
+        if (!server) {
+            throw new Error(`No MCP server registered for URL: ${url}`);
+        }
+        // Store the connection
+        this._connections.set(connectionId, {
+            connectionId,
+            server,
+            sessionId: this._sessionId,
+        });
+        // Include tool definitions in the connect response
+        // The conductor bridge may use this to provide tool info to the agent
+        const tools = server.getToolDefinitions();
+        // Return response with snake_case field names to match the Rust conductor's expectations
+        // Note: The conductor only requires connection_id, but we include extra info for potential use
+        return {
+            connection_id: connectionId,
+            connectionId, // Also include camelCase for backwards compatibility
+            serverInfo: {
+                name: server.name,
+                version: "0.1.0",
+            },
+            capabilities: {
+                tools: {},
+            },
+            // Include tools directly - the bridge may forward this to the agent
+            tools,
+        };
+    }
+    /**
+     * Handle an incoming mcp/message request.
+     *
+     * IMPORTANT: The response to _mcp/message is just the raw MCP result,
+     * NOT wrapped in {connectionId, result}. The conductor expects the raw
+     * MCP response (e.g., InitializeResult, ToolsListResult) directly.
+     */
+    async handleMessage(params) {
+        const connectionId = params.connectionId;
+        const method = params.method;
+        const mcpParams = params.params;
+        const connection = this._connections.get(connectionId);
+        if (!connection) {
+            // Return MCP-style error for unknown connection
+            throw new Error(`Unknown connection: ${connectionId}`);
+        }
+        // If this is a tools/list request, resolve any pending tools discovery promise
+        if (method === "tools/list") {
+            this._resolveToolsDiscovery(connection.sessionId);
+        }
+        const context = {
+            connectionId,
+            sessionId: connection.sessionId,
+        };
+        // Return the raw MCP result - the conductor will wrap it appropriately
+        return await connection.server.handleMethod(method, mcpParams, context);
+    }
+    /**
+     * Wait for the agent to discover tools via tools/list.
+     *
+     * This is used to avoid a race condition where the client sends a prompt
+     * before the agent has finished MCP initialization. The promise resolves
+     * when tools/list is called or when the timeout expires.
+     *
+     * @param sessionId - The session to wait for
+     * @param timeout - Maximum time to wait in milliseconds (default: 2000ms)
+     */
+    waitForToolsDiscovery(sessionId, timeout = 2000) {
+        // If there's already a pending promise for this session, return it
+        const existing = this._toolsDiscoveryBySession.get(sessionId);
+        if (existing) {
+            return new Promise((resolve) => {
+                const originalResolve = existing.resolve;
+                existing.resolve = () => {
+                    originalResolve();
+                    resolve();
+                };
+            });
+        }
+        return new Promise((resolve) => {
+            const state = {
+                resolve: () => {
+                    if (state.timeoutId) {
+                        clearTimeout(state.timeoutId);
+                    }
+                    this._toolsDiscoveryBySession.delete(sessionId);
+                    resolve();
+                },
+                timeoutId: setTimeout(() => {
+                    state.timeoutId = null;
+                    state.resolve();
+                }, timeout),
+            };
+            this._toolsDiscoveryBySession.set(sessionId, state);
+        });
+    }
+    /**
+     * Resolve the tools discovery promise for a session
+     */
+    _resolveToolsDiscovery(sessionId) {
+        const state = this._toolsDiscoveryBySession.get(sessionId);
+        if (state) {
+            state.resolve();
+        }
+    }
+    /**
+     * Handle an incoming mcp/disconnect notification
+     */
+    handleDisconnect(params) {
+        const connectionId = params.connectionId;
+        this._connections.delete(connectionId);
+    }
+    /**
+     * Check if this is an MCP-over-ACP request.
+     * Note: The ACP SDK strips the underscore prefix, so we check for "mcp/".
+     */
+    isMcpRequest(method) {
+        return method.startsWith("mcp/");
+    }
+    /**
+     * Route an MCP-over-ACP request to the appropriate handler.
+     * Note: Methods arrive without the underscore prefix (e.g., "mcp/connect" not "_mcp/connect").
+     */
+    async routeRequest(method, params) {
+        switch (method) {
+            case "mcp/connect":
+                return this.handleConnect(params);
+            case "mcp/message":
+                return this.handleMessage(params);
+            case "mcp/disconnect":
+                this.handleDisconnect(params);
+                return undefined;
+            default:
+                throw new Error(`Unknown MCP-over-ACP method: ${method}`);
+        }
+    }
+}
+//# sourceMappingURL=mcp-over-acp-handler.js.map