@thinkwell/acp 0.5.4 → 0.5.6

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

@@ -1,183 +1,139 @@
-/**
- * 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}`);
-        }
+  /** Maps acp:uuid URLs to registered MCP servers */
+  _serversByUrl = /* @__PURE__ */ new Map();
+  /** Maps connection IDs to active connections */
+  _connections = /* @__PURE__ */ new Map();
+  /** Current session ID for context */
+  _sessionId = "";
+  /** Maps session IDs to pending tools discovery promises */
+  _toolsDiscoveryBySession = /* @__PURE__ */ 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) {
+    const connectionId = params.connectionId ?? `conn-${Date.now()}-${Math.random().toString(36).slice(2)}`, url = params.acp_url ?? params.url, server = this._serversByUrl.get(url);
+    if (!server)
+      throw new Error(`No MCP server registered for URL: ${url}`);
+    this._connections.set(connectionId, {
+      connectionId,
+      server,
+      sessionId: this._sessionId
+    });
+    const tools = server.getToolDefinitions();
+    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, method = params.method, mcpParams = params.params, connection = this._connections.get(connectionId);
+    if (!connection)
+      throw new Error(`Unknown connection: ${connectionId}`);
+    method === "tools/list" && this._resolveToolsDiscovery(connection.sessionId);
+    const context = {
+      connectionId,
+      sessionId: connection.sessionId
+    };
+    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 = 2e3) {
+    const existing = this._toolsDiscoveryBySession.get(sessionId);
+    return existing ? new Promise((resolve) => {
+      const originalResolve = existing.resolve;
+      existing.resolve = () => {
+        originalResolve(), resolve();
+      };
+    }) : new Promise((resolve) => {
+      const state = {
+        resolve: () => {
+          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);
+    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.
+   */
+  isMcpRequest(method) {
+    return method.startsWith("_mcp/");
+  }
+  /**
+   * Route an MCP-over-ACP request to the appropriate handler.
+   */
+  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;
+      default:
+        throw new Error(`Unknown MCP-over-ACP method: ${method}`);
     }
+  }
 }
-//# sourceMappingURL=mcp-over-acp-handler.js.map

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

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

package/dist/mcp-server.js

@@ -1,152 +1,128 @@
 import { v4 as uuidv4 } from "uuid";
-/**
- * Fluent builder for creating MCP servers with registered tools
- */
 export class McpServerBuilder {
-    _name;
-    _instructions;
-    _tools = new Map();
-    constructor(name) {
-        this._name = name;
-    }
-    /**
-     * Set instructions for the MCP server
-     */
-    instructions(text) {
-        this._instructions = text;
-        return this;
-    }
-    /**
-     * Register a tool with input/output JSON schemas
-     */
-    tool(name, description, inputSchema, outputSchema, handler) {
-        this._tools.set(name, {
-            name,
-            description,
-            inputSchema,
-            outputSchema,
-            handler: handler,
-        });
-        return this;
-    }
-    /**
-     * Build the MCP server
-     */
-    build() {
-        return new McpServer(this._name, this._instructions, new Map(this._tools));
-    }
+  _name;
+  _instructions;
+  _tools = /* @__PURE__ */ new Map();
+  constructor(name) {
+    this._name = name;
+  }
+  /**
+   * Set instructions for the MCP server
+   */
+  instructions(text) {
+    return this._instructions = text, this;
+  }
+  /**
+   * Register a tool with input/output JSON schemas
+   */
+  tool(name, description, inputSchema, outputSchema, handler) {
+    return this._tools.set(name, {
+      name,
+      description,
+      inputSchema,
+      outputSchema,
+      handler
+    }), this;
+  }
+  /**
+   * Build the MCP server
+   */
+  build() {
+    return new McpServer(this._name, this._instructions, new Map(this._tools));
+  }
 }
-/**
- * MCP server that handles tool calls via MCP-over-ACP
- */
 export class McpServer {
-    id;
-    name;
-    _instructions;
-    _tools;
-    constructor(name, instructions, tools) {
-        this.id = uuidv4();
-        this.name = name;
-        this._instructions = instructions;
-        this._tools = tools;
-    }
-    /**
-     * Get the acp: URL for this server
-     */
-    get acpUrl() {
-        return `acp:${this.id}`;
-    }
-    /**
-     * Get MCP server config for session requests
-     */
-    toSessionConfig() {
-        return {
-            type: "http",
-            name: this.name,
-            url: this.acpUrl,
-        };
-    }
-    /**
-     * Get the list of tool definitions for tools/list
-     */
-    getToolDefinitions() {
-        return Array.from(this._tools.values()).map((tool) => ({
-            name: tool.name,
-            description: tool.description,
-            inputSchema: tool.inputSchema,
-        }));
-    }
-    /**
-     * Handle an MCP method call or notification
-     */
-    async handleMethod(method, params, context) {
-        switch (method) {
-            case "tools/list":
-                return this.handleToolsList();
-            case "tools/call":
-                return this.handleToolsCall(params, context);
-            case "initialize":
-                return this.handleInitialize(params);
-            case "notifications/initialized":
-                // Client notification after initialize - no response needed
-                return undefined;
-            default:
-                throw new Error(`Unknown MCP method: ${method}`);
-        }
-    }
-    handleInitialize(params) {
-        const instructions = this._instructions ?? "You have access to tools. Call return_result when done.";
-        // Include tools directly in initialize response - some clients expect this
-        // instead of calling tools/list separately
-        const tools = this.getToolDefinitions();
-        // Echo back the client's protocol version if provided, otherwise use a known good version
-        const clientVersion = params?.protocolVersion ?? "2024-11-05";
-        return {
-            protocolVersion: clientVersion,
-            serverInfo: {
-                name: this.name,
-                version: "0.1.0",
-            },
-            capabilities: {
-                tools: {},
-            },
-            instructions,
-            tools, // Include tools directly in initialize response
-        };
-    }
-    handleToolsList() {
-        return {
-            tools: this.getToolDefinitions(),
-        };
+  id;
+  name;
+  _instructions;
+  _tools;
+  constructor(name, instructions, tools) {
+    this.id = uuidv4(), this.name = name, this._instructions = instructions, this._tools = tools;
+  }
+  /**
+   * Get the acp: URL for this server
+   */
+  get acpUrl() {
+    return `acp:${this.id}`;
+  }
+  /**
+   * Get MCP server config for session requests
+   */
+  toSessionConfig() {
+    return {
+      type: "http",
+      name: this.name,
+      url: this.acpUrl
+    };
+  }
+  /**
+   * Get the list of tool definitions for tools/list
+   */
+  getToolDefinitions() {
+    return Array.from(this._tools.values()).map((tool) => ({
+      name: tool.name,
+      description: tool.description,
+      inputSchema: tool.inputSchema
+    }));
+  }
+  /**
+   * Handle an MCP method call or notification
+   */
+  async handleMethod(method, params, context) {
+    switch (method) {
+      case "tools/list":
+        return this.handleToolsList();
+      case "tools/call":
+        return this.handleToolsCall(params, context);
+      case "initialize":
+        return this.handleInitialize(params);
+      case "notifications/initialized":
+        return;
+      default:
+        throw new Error(`Unknown MCP method: ${method}`);
     }
-    async handleToolsCall(params, context) {
-        const tool = this._tools.get(params.name);
-        if (!tool) {
-            return {
-                content: [{ type: "text", text: `Unknown tool: ${params.name}` }],
-                isError: true,
-            };
-        }
-        try {
-            const result = await tool.handler(params.arguments, context);
-            const resultText = typeof result === "string" ? result : JSON.stringify(result);
-            return {
-                content: [{ type: "text", text: resultText }],
-            };
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            return {
-                content: [{ type: "text", text: `Tool error: ${message}` }],
-                isError: true,
-            };
-        }
+  }
+  handleInitialize(params) {
+    const instructions = this._instructions ?? "You have access to tools. Call return_result when done.", tools = this.getToolDefinitions();
+    return {
+      protocolVersion: params?.protocolVersion ?? "2024-11-05",
+      serverInfo: {
+        name: this.name,
+        version: "0.1.0"
+      },
+      capabilities: {
+        tools: {}
+      },
+      instructions,
+      tools
+      // Include tools directly in initialize response
+    };
+  }
+  handleToolsList() {
+    return {
+      tools: this.getToolDefinitions()
+    };
+  }
+  async handleToolsCall(params, context) {
+    const tool = this._tools.get(params.name);
+    if (!tool)
+      return {
+        content: [{ type: "text", text: `Unknown tool: ${params.name}` }],
+        isError: !0
+      };
+    try {
+      const result = await tool.handler(params.arguments, context);
+      return {
+        content: [{ type: "text", text: typeof result == "string" ? result : JSON.stringify(result) }]
+      };
+    } catch (error) {
+      return {
+        content: [{ type: "text", text: `Tool error: ${error instanceof Error ? error.message : String(error)}` }],
+        isError: !0
+      };
     }
+  }
 }
-/**
- * Create a new MCP server builder
- */
 export function mcpServer(name) {
-    return new McpServerBuilder(name);
+  return new McpServerBuilder(name);
 }
-//# sourceMappingURL=mcp-server.js.map