@thinkwell/acp 0.1.0

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

@@ -0,0 +1 @@
+{"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.d.ts

@@ -0,0 +1,56 @@
+import type { JsonSchema, McpContext, McpServerConfig, McpToolDefinition, RegisteredTool, ToolHandler } from "./types.js";
+/**
+ * Fluent builder for creating MCP servers with registered tools
+ */
+export declare class McpServerBuilder {
+    private _name;
+    private _instructions;
+    private _tools;
+    constructor(name: string);
+    /**
+     * Set instructions for the MCP server
+     */
+    instructions(text: string): this;
+    /**
+     * Register a tool with input/output JSON schemas
+     */
+    tool<I, O>(name: string, description: string, inputSchema: JsonSchema, outputSchema: JsonSchema, handler: ToolHandler<I, O>): this;
+    /**
+     * Build the MCP server
+     */
+    build(): McpServer;
+}
+/**
+ * MCP server that handles tool calls via MCP-over-ACP
+ */
+export declare class McpServer {
+    readonly id: string;
+    readonly name: string;
+    private readonly _instructions;
+    private readonly _tools;
+    constructor(name: string, instructions: string | undefined, tools: Map<string, RegisteredTool>);
+    /**
+     * Get the acp: URL for this server
+     */
+    get acpUrl(): string;
+    /**
+     * Get MCP server config for session requests
+     */
+    toSessionConfig(): McpServerConfig;
+    /**
+     * Get the list of tool definitions for tools/list
+     */
+    getToolDefinitions(): McpToolDefinition[];
+    /**
+     * Handle an MCP method call or notification
+     */
+    handleMethod(method: string, params: unknown, context: McpContext): Promise<unknown>;
+    private handleInitialize;
+    private handleToolsList;
+    private handleToolsCall;
+}
+/**
+ * Create a new MCP server builder
+ */
+export declare function mcpServer(name: string): McpServerBuilder;
+//# sourceMappingURL=mcp-server.d.ts.map

package/dist/mcp-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,iBAAiB,EAIjB,cAAc,EACd,WAAW,EACZ,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,MAAM,CAA0C;gBAE5C,IAAI,EAAE,MAAM;IAIxB;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKhC;;OAEG;IACH,IAAI,CAAC,CAAC,EAAE,CAAC,EACP,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,UAAU,EACvB,YAAY,EAAE,UAAU,EACxB,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GACzB,IAAI;IAWP;;OAEG;IACH,KAAK,IAAI,SAAS;CAOnB;AAED;;GAEG;AACH,qBAAa,SAAS;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8B;gBAGnD,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;IAQpC;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;OAEG;IACH,eAAe,IAAI,eAAe;IAQlC;;OAEG;IACH,kBAAkB,IAAI,iBAAiB,EAAE;IAQzC;;OAEG;IACG,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC;IAgBnB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,eAAe;YAMT,eAAe;CA2B9B;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAExD"}

package/dist/mcp-server.js

@@ -0,0 +1,148 @@
+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));
+    }
+}
+/**
+ * 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();
+            case "notifications/initialized":
+                // Client notification after initialize - no response needed
+                return undefined;
+            default:
+                throw new Error(`Unknown MCP method: ${method}`);
+        }
+    }
+    handleInitialize() {
+        // Use protocol version 2025-03-26 to match rmcp's behavior
+        // Always include instructions to help Claude Code understand how to use tools
+        const instructions = this._instructions ?? "You have access to tools. Call return_result when done.";
+        return {
+            protocolVersion: "2025-03-26",
+            serverInfo: {
+                name: this.name,
+                version: "0.1.0",
+            },
+            capabilities: {
+                tools: {},
+            },
+            instructions,
+        };
+    }
+    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: 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,
+            };
+        }
+    }
+}
+/**
+ * Create a new MCP server builder
+ */
+export function mcpServer(name) {
+    return new McpServerBuilder(name);
+}
+//# sourceMappingURL=mcp-server.js.map

package/dist/mcp-server.js.map

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

package/dist/session.d.ts

@@ -0,0 +1,112 @@
+import type { McpServer } from "./mcp-server.js";
+import type { McpOverAcpHandler } from "./mcp-over-acp-handler.js";
+import type { SacpConnection } from "./connection.js";
+/**
+ * Session message from the agent
+ */
+export type SessionUpdate = {
+    type: "text";
+    content: string;
+} | {
+    type: "tool_use";
+    id: string;
+    name: string;
+    input: unknown;
+} | {
+    type: "stop";
+    reason: string;
+};
+/**
+ * Prompt message to send to the agent
+ */
+export interface PromptMessage {
+    role: "user" | "assistant";
+    content: string;
+}
+/**
+ * Active session with an agent
+ */
+export declare class ActiveSession {
+    readonly sessionId: string;
+    private readonly _connection;
+    private readonly _mcpHandler;
+    private _pendingUpdates;
+    private _updateResolvers;
+    private _closed;
+    constructor(sessionId: string, connection: SacpConnection, mcpHandler: McpOverAcpHandler);
+    /**
+     * Send a prompt to the agent
+     */
+    sendPrompt(content: string): Promise<void>;
+    /**
+     * Push an update received from the agent
+     */
+    pushUpdate(update: SessionUpdate): void;
+    /**
+     * Read the next update from the agent
+     */
+    readUpdate(): Promise<SessionUpdate>;
+    /**
+     * Read all updates until completion, returning concatenated text
+     */
+    readToString(): Promise<string>;
+    /**
+     * Mark the session as closed
+     */
+    close(): void;
+}
+/**
+ * Options for waiting for MCP readiness
+ */
+export interface McpReadyOptions {
+    /**
+     * Whether to wait for the agent to call tools/list before proceeding.
+     * Default: true when MCP servers are attached
+     */
+    enabled?: boolean;
+    /**
+     * Maximum time to wait for tools discovery in milliseconds.
+     * Default: 2000ms
+     */
+    timeout?: number;
+}
+/**
+ * Builder for creating ACP sessions with MCP servers
+ */
+export declare class SessionBuilder {
+    private readonly _connection;
+    private readonly _mcpHandler;
+    private _mcpServers;
+    private _cwd;
+    private _systemPrompt;
+    private _mcpReadyOptions;
+    constructor(connection: SacpConnection, mcpHandler: McpOverAcpHandler);
+    /**
+     * Attach an MCP server to this session
+     */
+    withMcpServer(server: McpServer): this;
+    /**
+     * Set the working directory for the session
+     */
+    cwd(path: string): this;
+    /**
+     * Set the system prompt for the session
+     */
+    systemPrompt(prompt: string): this;
+    /**
+     * Configure waiting for MCP tools discovery.
+     *
+     * By default, when MCP servers are attached, the session will wait for
+     * the agent to call tools/list before invoking the callback. This prevents
+     * a race condition where the prompt is sent before the agent knows about
+     * available tools.
+     *
+     * @param options - Options for MCP readiness waiting
+     */
+    waitForMcpReady(options?: McpReadyOptions): this;
+    /**
+     * Start the session and run a callback
+     */
+    run<T>(callback: (session: ActiveSession) => Promise<T>): Promise<T>;
+}
+//# sourceMappingURL=session.d.ts.map

package/dist/session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,qBAAa,aAAa;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,gBAAgB,CAA8C;IACtE,OAAO,CAAC,OAAO,CAAkB;gBAG/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,iBAAiB;IAQ/B;;OAEG;IACG,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD;;OAEG;IACH,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IASvC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAc1C;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAiBrC;;OAEG;IACH,KAAK,IAAI,IAAI;CAQd;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,WAAW,CAAmB;IACtC,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,gBAAgB,CAAuB;gBAEnC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB;IAKrE;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAMtC;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKlC;;;;;;;;;OASG;IACH,eAAe,CAAC,OAAO,GAAE,eAAoB,GAAG,IAAI;IAKpD;;OAEG;IACG,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAqC3E"}

package/dist/session.js

@@ -0,0 +1,165 @@
+/**
+ * Active session with an agent
+ */
+export class ActiveSession {
+    sessionId;
+    _connection;
+    _mcpHandler;
+    _pendingUpdates = [];
+    _updateResolvers = [];
+    _closed = false;
+    constructor(sessionId, connection, mcpHandler) {
+        this.sessionId = sessionId;
+        this._connection = connection;
+        this._mcpHandler = mcpHandler;
+        this._mcpHandler.setSessionId(sessionId);
+    }
+    /**
+     * Send a prompt to the agent
+     */
+    async sendPrompt(content) {
+        const response = await this._connection.sendPrompt(this.sessionId, content);
+        // Push a stop update when the prompt completes
+        if (response.stopReason) {
+            this.pushUpdate({ type: "stop", reason: response.stopReason });
+        }
+    }
+    /**
+     * Push an update received from the agent
+     */
+    pushUpdate(update) {
+        if (this._updateResolvers.length > 0) {
+            const resolver = this._updateResolvers.shift();
+            resolver(update);
+        }
+        else {
+            this._pendingUpdates.push(update);
+        }
+    }
+    /**
+     * Read the next update from the agent
+     */
+    async readUpdate() {
+        if (this._pendingUpdates.length > 0) {
+            return this._pendingUpdates.shift();
+        }
+        if (this._closed) {
+            return { type: "stop", reason: "session_closed" };
+        }
+        return new Promise((resolve) => {
+            this._updateResolvers.push(resolve);
+        });
+    }
+    /**
+     * Read all updates until completion, returning concatenated text
+     */
+    async readToString() {
+        const parts = [];
+        while (true) {
+            const update = await this.readUpdate();
+            if (update.type === "text") {
+                parts.push(update.content);
+            }
+            else if (update.type === "stop") {
+                break;
+            }
+            // tool_use updates are handled by the connection layer
+        }
+        return parts.join("");
+    }
+    /**
+     * Mark the session as closed
+     */
+    close() {
+        this._closed = true;
+        // Resolve any pending readers
+        for (const resolver of this._updateResolvers) {
+            resolver({ type: "stop", reason: "session_closed" });
+        }
+        this._updateResolvers = [];
+    }
+}
+/**
+ * Builder for creating ACP sessions with MCP servers
+ */
+export class SessionBuilder {
+    _connection;
+    _mcpHandler;
+    _mcpServers = [];
+    _cwd;
+    _systemPrompt;
+    _mcpReadyOptions = {};
+    constructor(connection, mcpHandler) {
+        this._connection = connection;
+        this._mcpHandler = mcpHandler;
+    }
+    /**
+     * Attach an MCP server to this session
+     */
+    withMcpServer(server) {
+        this._mcpServers.push(server);
+        this._mcpHandler.register(server);
+        return this;
+    }
+    /**
+     * Set the working directory for the session
+     */
+    cwd(path) {
+        this._cwd = path;
+        return this;
+    }
+    /**
+     * Set the system prompt for the session
+     */
+    systemPrompt(prompt) {
+        this._systemPrompt = prompt;
+        return this;
+    }
+    /**
+     * Configure waiting for MCP tools discovery.
+     *
+     * By default, when MCP servers are attached, the session will wait for
+     * the agent to call tools/list before invoking the callback. This prevents
+     * a race condition where the prompt is sent before the agent knows about
+     * available tools.
+     *
+     * @param options - Options for MCP readiness waiting
+     */
+    waitForMcpReady(options = {}) {
+        this._mcpReadyOptions = options;
+        return this;
+    }
+    /**
+     * Start the session and run a callback
+     */
+    async run(callback) {
+        // Create the session
+        const sessionId = await this._connection.createSession({
+            cwd: this._cwd,
+            systemPrompt: this._systemPrompt,
+            mcpServers: this._mcpServers.map((s) => s.toSessionConfig()),
+        });
+        const session = new ActiveSession(sessionId, this._connection, this._mcpHandler);
+        // Set up the message pump for this session
+        this._connection.setSessionHandler(sessionId, session);
+        try {
+            // Wait for MCP tools discovery if we have MCP servers attached
+            const shouldWait = this._mcpServers.length > 0 &&
+                (this._mcpReadyOptions.enabled !== false);
+            if (shouldWait) {
+                const timeout = this._mcpReadyOptions.timeout ?? 2000;
+                await this._mcpHandler.waitForToolsDiscovery(sessionId, timeout);
+            }
+            return await callback(session);
+        }
+        finally {
+            session.close();
+            this._connection.removeSessionHandler(sessionId);
+            // Unregister MCP servers
+            for (const server of this._mcpServers) {
+                this._mcpHandler.unregister(server);
+            }
+        }
+    }
+}
+//# sourceMappingURL=session.js.map

package/dist/session.js.map

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