@mcp-ts/sdk 1.0.0 → 1.1.0

package/dist/adapters/agui-adapter.mjs

@@ -1,4 +1,50 @@
 // src/adapters/agui-adapter.ts
+var PYDANTIC_FORBIDDEN_PROPS = [
+  // JSON Schema meta-properties
+  "$schema",
+  "$id",
+  "$comment",
+  "$defs",
+  "definitions",
+  // Extended properties used by some MCP servers (e.g., Apify)
+  "prefill",
+  "examples",
+  "enumTitles",
+  "enumDescriptions",
+  // Other common extensions
+  "deprecated",
+  "readOnly",
+  "writeOnly",
+  "contentMediaType",
+  "contentEncoding"
+];
+function cleanSchema(schema) {
+  if (!schema) {
+    return { type: "object", properties: {} };
+  }
+  const cleaned = { ...schema };
+  for (const prop of PYDANTIC_FORBIDDEN_PROPS) {
+    delete cleaned[prop];
+  }
+  if (cleaned.properties && typeof cleaned.properties === "object") {
+    const cleanedProps = {};
+    for (const [key, value] of Object.entries(cleaned.properties)) {
+      if (typeof value === "object" && value !== null) {
+        cleanedProps[key] = cleanSchema(value);
+      } else {
+        cleanedProps[key] = value;
+      }
+    }
+    cleaned.properties = cleanedProps;
+  }
+  if (cleaned.items && typeof cleaned.items === "object") {
+    cleaned.items = cleanSchema(cleaned.items);
+  }
+  if (cleaned.additionalProperties && typeof cleaned.additionalProperties === "object") {
+    cleaned.additionalProperties = cleanSchema(cleaned.additionalProperties);
+  }
+  return cleaned;
+}
 var AguiAdapter = class {
   constructor(client, options = {}) {
     this.client = client;
@@ -6,102 +52,81 @@ var AguiAdapter = class {
   }
   /**
    * Get tools with handlers for MCP tool execution.
-   *
-   * Each tool includes a handler function that:
-   * 1. Calls the MCP tool via the client
-   * 2. Extracts text content from the result
-   * 3. Returns the result as a string or JSON
-   *
-   * @returns Array of AguiTool objects
    */
   async getTools() {
-    const isMultiSession = typeof this.client.getClients === "function";
-    if (isMultiSession) {
+    if (this.isMultiSession()) {
       const clients = this.client.getClients();
       const allTools = [];
       for (const client of clients) {
-        const tools = await this.transformTools(client);
-        allTools.push(...tools);
+        allTools.push(...await this.transformTools(client));
       }
       return allTools;
     }
     return this.transformTools(this.client);
   }
-  async transformTools(client) {
-    if (!client.isConnected()) {
-      return [];
-    }
-    const result = await client.listTools();
-    const prefix = this.options.prefix ?? client.getServerId() ?? "mcp";
-    const tools = [];
-    for (const tool of result.tools) {
-      const toolName = `${prefix}_${tool.name}`;
-      tools.push({
-        name: toolName,
-        description: tool.description || `Execute ${tool.name}`,
-        parameters: tool.inputSchema || { type: "object", properties: {} },
-        handler: async (args) => {
-          console.log(`[AguiAdapter] Executing MCP tool: ${tool.name}`, args);
-          const result2 = await client.callTool(tool.name, args);
-          if (result2.content && Array.isArray(result2.content)) {
-            const textContent = result2.content.filter((c) => c.type === "text").map((c) => c.text).join("\n");
-            return textContent || result2;
-          }
-          return result2;
-        }
-      });
-    }
-    return tools;
-  }
-  /**
-   * Get tools as a function (for dynamic loading).
-   *
-   * @returns Function that returns a Promise of tools
-   */
-  getToolsFunction() {
-    return async () => this.getTools();
-  }
   /**
    * Get tool definitions in JSON Schema format for passing to remote agents.
-   *
-   * This format is compatible with:
-   * - OpenAI's function calling API
-   * - AG-UI input.tools format
-   * - Most LLM tool/function calling implementations
-   *
-   * @returns Array of AguiToolDefinition objects
    */
   async getToolDefinitions() {
-    const isMultiSession = typeof this.client.getClients === "function";
-    if (isMultiSession) {
+    if (this.isMultiSession()) {
       const clients = this.client.getClients();
       const allTools = [];
       for (const client of clients) {
-        const tools = await this.transformToolDefinitions(client);
-        allTools.push(...tools);
+        allTools.push(...await this.transformToolDefinitions(client));
       }
       return allTools;
     }
     return this.transformToolDefinitions(this.client);
   }
+  /**
+   * Get tools as a function (for dynamic loading).
+   */
+  getToolsFunction() {
+    return () => this.getTools();
+  }
+  isMultiSession() {
+    return typeof this.client.getClients === "function";
+  }
+  async transformTools(client) {
+    if (!client.isConnected()) return [];
+    const result = await client.listTools();
+    const serverId = typeof client.getServerId === "function" ? client.getServerId() : void 0;
+    const normalizedPrefix = (this.options.prefix ?? serverId ?? "mcp").replace(/-/g, "");
+    const prefix = `tool_${normalizedPrefix}`;
+    return result.tools.map((tool) => {
+      const mcpTool = tool;
+      const mcpToolName = tool.name;
+      return {
+        name: `${prefix}_${tool.name}`,
+        description: tool.description || `Execute ${tool.name}`,
+        parameters: cleanSchema(tool.inputSchema),
+        _meta: { ...mcpTool._meta, sessionId: client.getSessionId?.() },
+        handler: async (args) => {
+          console.log(`[AguiAdapter] Executing MCP tool: ${mcpToolName}`, args);
+          const callResult = await client.callTool(mcpToolName, args ?? {});
+          return callResult;
+        }
+      };
+    });
+  }
   async transformToolDefinitions(client) {
-    if (!client.isConnected()) {
-      return [];
-    }
+    if (!client.isConnected()) return [];
     const result = await client.listTools();
-    const prefix = this.options.prefix ?? client.getServerId() ?? "mcp";
-    const tools = [];
-    for (const tool of result.tools) {
-      tools.push({
+    const serverId = typeof client.getServerId === "function" ? client.getServerId() : void 0;
+    const normalizedPrefix = (this.options.prefix ?? serverId ?? "mcp").replace(/-/g, "");
+    const prefix = `tool_${normalizedPrefix}`;
+    return result.tools.map((tool) => {
+      const mcpTool = tool;
+      return {
         name: `${prefix}_${tool.name}`,
         description: tool.description || `Execute ${tool.name}`,
-        parameters: tool.inputSchema || { type: "object", properties: {} }
-      });
-    }
-    return tools;
+        parameters: cleanSchema(tool.inputSchema),
+        _meta: { ...mcpTool._meta, sessionId: client.getSessionId?.() }
+      };
+    });
   }
 };
 
-export { AguiAdapter };
+export { AguiAdapter, cleanSchema };
 //# sourceMappingURL=agui-adapter.mjs.map
 //# sourceMappingURL=agui-adapter.mjs.map

package/dist/adapters/agui-adapter.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adapters/agui-adapter.ts"],"names":["result"],"mappings":"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","file":"agui-adapter.mjs","sourcesContent":["/**\r\n * MCP Adapter for AG-UI Integration\r\n *\r\n * This adapter transforms MCP tools into formats compatible with AG-UI agents.\r\n * It provides tools with handlers for server-side execution and tool definitions\r\n * in JSON Schema format for passing to remote agents.\r\n *\r\n * @example\r\n * ```typescript\r\n * import { MultiSessionClient } from '@mcp-ts/sdk/server';\r\n * import { AguiAdapter } from '@mcp-ts/sdk/adapters/mcp-adapter';\r\n * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';\r\n * import { HttpAgent } from '@ag-ui/client';\r\n *\r\n * // Create MCP client\r\n * const mcpClient = new MultiSessionClient('user_123');\r\n * await mcpClient.connect();\r\n *\r\n * // Create adapter and get tools\r\n * const adapter = new AguiAdapter(mcpClient);\r\n * const tools = await adapter.getTools();\r\n *\r\n * // Use with AG-UI middleware\r\n * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });\r\n * agent.use(createMcpMiddleware(mcpClient, { tools }));\r\n * ```\r\n */\r\n\r\nimport { MCPClient } from '../server/mcp/oauth-client.js';\r\nimport { MultiSessionClient } from '../server/mcp/multi-session-client.js';\r\n\r\n/**\r\n * Configuration options for AguiAdapter\r\n */\r\nexport interface AguiAdapterOptions {\r\n    /**\r\n     * Prefix for tool names to avoid collision with other tools.\r\n     * @default serverId or 'mcp'\r\n     */\r\n    prefix?: string;\r\n}\r\n\r\n/**\r\n * AG-UI Tool with handler for server-side execution.\r\n *\r\n * Tools contain:\r\n * - `name`: Unique identifier (prefixed with server ID)\r\n * - `description`: Human-readable description for the LLM\r\n * - `parameters`: JSON Schema defining the input format\r\n * - `handler`: Function that executes the tool via MCP client\r\n */\r\nexport interface AguiTool {\r\n    /** Unique tool name (e.g., \"server-abc_get_weather\") */\r\n    name: string;\r\n    /** Human-readable description for the LLM */\r\n    description: string;\r\n    /** JSON Schema format parameters */\r\n    parameters?: Record<string, any>;\r\n    /** Handler function that executes the MCP tool */\r\n    handler?: (args: any) => any | Promise<any>;\r\n}\r\n\r\n/**\r\n * Tool definition format for passing to remote agents (without handler).\r\n * Compatible with OpenAI's function calling API.\r\n */\r\nexport interface AguiToolDefinition {\r\n    /** Tool name (e.g., \"server-abc_get_weather\") */\r\n    name: string;\r\n    /** Human-readable description */\r\n    description: string;\r\n    /** JSON Schema format parameters */\r\n    parameters: Record<string, any>;\r\n}\r\n\r\n/**\r\n * Adapter that transforms MCP tools into AG-UI compatible formats.\r\n *\r\n * This adapter provides two main outputs:\r\n * - `getTools()`: Returns tools with handlers for server-side execution\r\n * - `getToolDefinitions()`: Returns tool definitions in JSON Schema format for remote agents\r\n */\r\nexport class AguiAdapter {\r\n    constructor(\r\n        private client: MCPClient | MultiSessionClient,\r\n        private options: AguiAdapterOptions = {}\r\n    ) { }\r\n\r\n    /**\r\n     * Get tools with handlers for MCP tool execution.\r\n     *\r\n     * Each tool includes a handler function that:\r\n     * 1. Calls the MCP tool via the client\r\n     * 2. Extracts text content from the result\r\n     * 3. Returns the result as a string or JSON\r\n     *\r\n     * @returns Array of AguiTool objects\r\n     */\r\n    async getTools(): Promise<AguiTool[]> {\r\n        const isMultiSession = typeof (this.client as any).getClients === 'function';\r\n\r\n        if (isMultiSession) {\r\n            const clients = (this.client as MultiSessionClient).getClients();\r\n            const allTools: AguiTool[] = [];\r\n\r\n            for (const client of clients) {\r\n                const tools = await this.transformTools(client);\r\n                allTools.push(...tools);\r\n            }\r\n\r\n            return allTools;\r\n        }\r\n\r\n        return this.transformTools(this.client as MCPClient);\r\n    }\r\n\r\n    private async transformTools(client: MCPClient): Promise<AguiTool[]> {\r\n        if (!client.isConnected()) {\r\n            return [];\r\n        }\r\n\r\n        const result = await client.listTools();\r\n        const prefix = this.options.prefix ?? client.getServerId() ?? 'mcp';\r\n        const tools: AguiTool[] = [];\r\n\r\n        for (const tool of result.tools) {\r\n            const toolName = `${prefix}_${tool.name}`;\r\n\r\n            tools.push({\r\n                name: toolName,\r\n                description: tool.description || `Execute ${tool.name}`,\r\n                parameters: tool.inputSchema || { type: 'object', properties: {} },\r\n                handler: async (args: any) => {\r\n                    console.log(`[AguiAdapter] Executing MCP tool: ${tool.name}`, args);\r\n                    const result = await client.callTool(tool.name, args);\r\n\r\n                    // Extract text content from result\r\n                    if (result.content && Array.isArray(result.content)) {\r\n                        const textContent = result.content\r\n                            .filter((c: any) => c.type === 'text')\r\n                            .map((c: any) => c.text)\r\n                            .join('\\n');\r\n                        return textContent || result;\r\n                    }\r\n\r\n                    return result;\r\n                }\r\n            });\r\n        }\r\n\r\n        return tools;\r\n    }\r\n\r\n    /**\r\n     * Get tools as a function (for dynamic loading).\r\n     *\r\n     * @returns Function that returns a Promise of tools\r\n     */\r\n    getToolsFunction(): () => Promise<AguiTool[]> {\r\n        return async () => this.getTools();\r\n    }\r\n\r\n    /**\r\n     * Get tool definitions in JSON Schema format for passing to remote agents.\r\n     *\r\n     * This format is compatible with:\r\n     * - OpenAI's function calling API\r\n     * - AG-UI input.tools format\r\n     * - Most LLM tool/function calling implementations\r\n     *\r\n     * @returns Array of AguiToolDefinition objects\r\n     */\r\n    async getToolDefinitions(): Promise<AguiToolDefinition[]> {\r\n        const isMultiSession = typeof (this.client as any).getClients === 'function';\r\n\r\n        if (isMultiSession) {\r\n            const clients = (this.client as MultiSessionClient).getClients();\r\n            const allTools: AguiToolDefinition[] = [];\r\n\r\n            for (const client of clients) {\r\n                const tools = await this.transformToolDefinitions(client);\r\n                allTools.push(...tools);\r\n            }\r\n\r\n            return allTools;\r\n        }\r\n\r\n        return this.transformToolDefinitions(this.client as MCPClient);\r\n    }\r\n\r\n    private async transformToolDefinitions(client: MCPClient): Promise<AguiToolDefinition[]> {\r\n        if (!client.isConnected()) {\r\n            return [];\r\n        }\r\n\r\n        const result = await client.listTools();\r\n        const prefix = this.options.prefix ?? client.getServerId() ?? 'mcp';\r\n        const tools: AguiToolDefinition[] = [];\r\n\r\n        for (const tool of result.tools) {\r\n            tools.push({\r\n                name: `${prefix}_${tool.name}`,\r\n                description: tool.description || `Execute ${tool.name}`,\r\n                parameters: tool.inputSchema || { type: 'object', properties: {} },\r\n            });\r\n        }\r\n\r\n        return tools;\r\n    }\r\n}\r\n"]}
+{"version":3,"sources":["../../src/adapters/agui-adapter.ts"],"names":[],"mappings":"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","file":"agui-adapter.mjs","sourcesContent":["/**\r\n * MCP Adapter for AG-UI Integration\r\n *\r\n * This adapter transforms MCP tools into formats compatible with AG-UI agents.\r\n * It provides tools with handlers for server-side execution and tool definitions\r\n * in JSON Schema format for passing to remote agents.\r\n *\r\n * @example\r\n * ```typescript\r\n * import { MultiSessionClient } from '@mcp-ts/sdk/server';\r\n * import { AguiAdapter } from '@mcp-ts/sdk/adapters/agui-adapter';\r\n * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';\r\n * import { HttpAgent } from '@ag-ui/client';\r\n *\r\n * // Create MCP client\r\n * const mcpClient = new MultiSessionClient('user_123');\r\n * await mcpClient.connect();\r\n *\r\n * // Create adapter and get tools\r\n * const adapter = new AguiAdapter(mcpClient);\r\n * const tools = await adapter.getTools();\r\n *\r\n * // Use with AG-UI middleware\r\n * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });\r\n * agent.use(createMcpMiddleware({ tools }));\r\n * ```\r\n */\r\n\r\nimport { MCPClient } from '../server/mcp/oauth-client.js';\r\nimport { MultiSessionClient } from '../server/mcp/multi-session-client.js';\r\n\r\n/**\r\n * Extended JSON Schema properties that Pydantic's strict validation rejects.\r\n * These are valid JSON Schema extensions but not part of the core spec.\r\n */\r\nconst PYDANTIC_FORBIDDEN_PROPS = [\r\n    // JSON Schema meta-properties\r\n    '$schema', '$id', '$comment', '$defs', 'definitions',\r\n    // Extended properties used by some MCP servers (e.g., Apify)\r\n    'prefill', 'examples', 'enumTitles', 'enumDescriptions',\r\n    // Other common extensions\r\n    'deprecated', 'readOnly', 'writeOnly', 'contentMediaType', 'contentEncoding',\r\n];\r\n\r\n/**\r\n * Cleans a JSON Schema by removing meta-properties that cause issues with\r\n * strict Pydantic validation (e.g., Google ADK, LangGraph).\r\n *\r\n * @param schema - The JSON Schema to clean\r\n * @returns Cleaned schema without forbidden properties\r\n */\r\nexport function cleanSchema(schema: Record<string, any> | undefined): Record<string, any> {\r\n    if (!schema) {\r\n        return { type: 'object', properties: {} };\r\n    }\r\n\r\n    const cleaned = { ...schema };\r\n\r\n    // Remove all forbidden properties\r\n    for (const prop of PYDANTIC_FORBIDDEN_PROPS) {\r\n        delete cleaned[prop];\r\n    }\r\n\r\n    // Recursively clean nested properties\r\n    if (cleaned.properties && typeof cleaned.properties === 'object') {\r\n        const cleanedProps: Record<string, any> = {};\r\n        for (const [key, value] of Object.entries(cleaned.properties)) {\r\n            if (typeof value === 'object' && value !== null) {\r\n                cleanedProps[key] = cleanSchema(value as Record<string, any>);\r\n            } else {\r\n                cleanedProps[key] = value;\r\n            }\r\n        }\r\n        cleaned.properties = cleanedProps;\r\n    }\r\n\r\n    // Clean items if it's an array schema\r\n    if (cleaned.items && typeof cleaned.items === 'object') {\r\n        cleaned.items = cleanSchema(cleaned.items);\r\n    }\r\n\r\n    // Clean additionalProperties if it's an object schema\r\n    if (cleaned.additionalProperties && typeof cleaned.additionalProperties === 'object') {\r\n        cleaned.additionalProperties = cleanSchema(cleaned.additionalProperties);\r\n    }\r\n\r\n    return cleaned;\r\n}\r\n\r\n/**\r\n * Configuration options for AguiAdapter\r\n */\r\nexport interface AguiAdapterOptions {\r\n    /**\r\n     * Prefix for tool names to avoid collision with other tools.\r\n     * @default serverId or 'mcp'\r\n     */\r\n    prefix?: string;\r\n}\r\n\r\n/**\r\n * AG-UI Tool with handler for server-side execution.\r\n */\r\nexport interface AguiTool {\r\n    name: string;\r\n    description: string;\r\n    parameters?: Record<string, any>;\r\n    _meta?: Record<string, any>; // Add _meta to AguiTool\r\n    handler?: (args: any) => any | Promise<any>;\r\n}\r\n\r\n/**\r\n * Tool definition format for passing to remote agents (without handler).\r\n */\r\nexport interface AguiToolDefinition {\r\n    name: string;\r\n    description: string;\r\n    parameters: Record<string, any>;\r\n    _meta?: Record<string, any>; // Add _meta to AguiToolDefinition\r\n}\r\n\r\n/**\r\n * Adapter that transforms MCP tools into AG-UI compatible formats.\r\n */\r\nexport class AguiAdapter {\r\n    constructor(\r\n        private client: MCPClient | MultiSessionClient,\r\n        private options: AguiAdapterOptions = {}\r\n    ) { }\r\n\r\n    /**\r\n     * Get tools with handlers for MCP tool execution.\r\n     */\r\n    async getTools(): Promise<AguiTool[]> {\r\n        if (this.isMultiSession()) {\r\n            const clients = (this.client as MultiSessionClient).getClients();\r\n            const allTools: AguiTool[] = [];\r\n            for (const client of clients) {\r\n                allTools.push(...await this.transformTools(client));\r\n            }\r\n            return allTools;\r\n        }\r\n        return this.transformTools(this.client as MCPClient);\r\n    }\r\n\r\n    /**\r\n     * Get tool definitions in JSON Schema format for passing to remote agents.\r\n     */\r\n    async getToolDefinitions(): Promise<AguiToolDefinition[]> {\r\n        if (this.isMultiSession()) {\r\n            const clients = (this.client as MultiSessionClient).getClients();\r\n            const allTools: AguiToolDefinition[] = [];\r\n            for (const client of clients) {\r\n                allTools.push(...await this.transformToolDefinitions(client));\r\n            }\r\n            return allTools;\r\n        }\r\n        return this.transformToolDefinitions(this.client as MCPClient);\r\n    }\r\n\r\n    /**\r\n     * Get tools as a function (for dynamic loading).\r\n     */\r\n    getToolsFunction(): () => Promise<AguiTool[]> {\r\n        return () => this.getTools();\r\n    }\r\n\r\n    private isMultiSession(): boolean {\r\n        return typeof (this.client as any).getClients === 'function';\r\n    }\r\n\r\n    private async transformTools(client: MCPClient): Promise<AguiTool[]> {\r\n        if (!client.isConnected()) return [];\r\n\r\n        const result = await client.listTools();\r\n        const serverId = (typeof (client as any).getServerId === 'function'\r\n            ? (client as any).getServerId()\r\n            : undefined) as string | undefined;\r\n        const normalizedPrefix = (this.options.prefix ?? serverId ?? 'mcp').replace(/-/g, '');\r\n        const prefix = `tool_${normalizedPrefix}`;\r\n\r\n        return result.tools.map(tool => {\r\n            // Type assertion to access _meta if it exists on the tool object (it comes from MCP SDK)\r\n            const mcpTool = tool as any;\r\n            const mcpToolName = tool.name;\r\n            return {\r\n                name: `${prefix}_${tool.name}`,\r\n                description: tool.description || `Execute ${tool.name}`,\r\n                parameters: cleanSchema(tool.inputSchema),\r\n                _meta: { ...mcpTool._meta, sessionId: (client as any).getSessionId?.() },\r\n                handler: async (args: any) => {\r\n                    console.log(`[AguiAdapter] Executing MCP tool: ${mcpToolName}`, args);\r\n\r\n                    // IMPORTANT: call the actual MCP tool. (Previously this mistakenly returned the listTools() result.)\r\n                    const callResult = await (client as any).callTool(mcpToolName, args ?? {});\r\n\r\n                    // Return the raw result object so middleware can inspect `_meta` (e.g. for UI triggers).\r\n                    return callResult;\r\n                }\r\n            }\r\n        });\r\n    }\r\n\r\n    private async transformToolDefinitions(client: MCPClient): Promise<AguiToolDefinition[]> {\r\n        if (!client.isConnected()) return [];\r\n\r\n        const result = await client.listTools();\r\n        const serverId = (typeof (client as any).getServerId === 'function'\r\n            ? (client as any).getServerId()\r\n            : undefined) as string | undefined;\r\n        const normalizedPrefix = (this.options.prefix ?? serverId ?? 'mcp').replace(/-/g, '');\r\n        const prefix = `tool_${normalizedPrefix}`;\r\n\r\n        return result.tools.map(tool => {\r\n            const mcpTool = tool as any;\r\n            return {\r\n                name: `${prefix}_${tool.name}`,\r\n                description: tool.description || `Execute ${tool.name}`,\r\n                parameters: cleanSchema(tool.inputSchema),\r\n                _meta: { ...mcpTool._meta, sessionId: (client as any).getSessionId?.() },\r\n            };\r\n        });\r\n    }\r\n}\r\n"]}

package/dist/adapters/agui-middleware.d.mts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
 import { Middleware, RunAgentInput, AbstractAgent, BaseEvent } from '@ag-ui/client';
-export { AbstractAgent, BaseEvent, EventType, Middleware, RunAgentInput, ToolCallEndEvent } from '@ag-ui/client';
-import { M as MCPClient, a as MultiSessionClient } from '../multi-session-client-DMF3ED2O.mjs';
+export { AbstractAgent, BaseEvent, EventType, Middleware, RunAgentInput, Tool, ToolCallEndEvent } from '@ag-ui/client';
 import { AguiTool } from './agui-adapter.mjs';
-import '../events-BP6WyRNh.mjs';
+import '../multi-session-client-CxogNckF.mjs';
+import '../events-BgeztGYZ.mjs';
 import '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/shared/auth.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
@@ -11,161 +11,59 @@ import '@modelcontextprotocol/sdk/client/auth.js';
 /**
  * AG-UI Middleware for MCP Tool Execution
  *
- * This middleware intercepts tool calls from remote agents (e.g., LangGraph, AutoGen)
- * and executes MCP tools server-side, returning results back to the agent.
+ * This middleware intercepts tool calls from remote agents and executes
+ * MCP tools server-side, returning results back to the agent.
  *
- * ## How It Works
- *
- * 1. **Tool Injection**: When a run starts, the middleware injects MCP tool definitions
- *    into `input.tools` so the remote agent knows about available MCP tools.
- *
- * 2. **Event Interception**: The middleware subscribes to the agent's event stream and
- *    tracks tool calls using AG-UI events:
- *    - `TOOL_CALL_START`: Records tool name and ID
- *    - `TOOL_CALL_ARGS`: Accumulates streamed arguments
- *    - `TOOL_CALL_END`: Marks tool call as complete
- *    - `RUN_FINISHED`: Triggers execution of pending MCP tools
- *
- * 3. **Server-Side Execution**: When `RUN_FINISHED` arrives with pending MCP tool calls,
- *    the middleware:
- *    - Executes each MCP tool via the MCP client
- *    - Emits `TOOL_CALL_RESULT` events with the results
- *    - Adds results to `input.messages` for context
- *    - Emits `RUN_FINISHED` to close the current run
- *    - Triggers a new run so the agent can process tool results
- *
- * 4. **Recursive Processing**: If the new run makes more MCP tool calls, the cycle
- *    repeats until the agent completes without pending MCP calls.
- *
- * ## Tool Identification
- *
- * MCP tools are identified by a configurable prefix (default: `server-`).
- * Tools not matching this prefix are passed through without interception.
- *
- * @requires @ag-ui/client - This middleware requires @ag-ui/client as a peer dependency
+ * @requires @ag-ui/client - Peer dependency for AG-UI types
  * @requires rxjs - Uses RxJS Observables for event streaming
- *
- * @example
- * ```typescript
- * import { HttpAgent } from '@ag-ui/client';
- * import { McpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
- * import { AguiAdapter } from '@mcp-ts/sdk/adapters/agui-adapter';
- *
- * // Create MCP client and adapter
- * const mcpClient = new MultiSessionClient('user_123');
- * await mcpClient.connect();
- *
- * const adapter = new AguiAdapter(mcpClient);
- * const actions = await adapter.getActions();
- *
- * // Create middleware with pre-loaded actions
- * const middleware = new McpMiddleware({
- *   client: mcpClient,
- *   actions,
- *   toolPrefix: 'server-',
- * });
- *
- * // Use with HttpAgent
- * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(middleware);
- * ```
  */
 
+/** New event type for MCP UI triggers */
+declare const MCP_APP_UI_EVENT = "mcp-apps-ui";
 /**
- * Tool definition format for AG-UI input.tools
+ * MCP Apps UI trigger event.
+ *
+ * IMPORTANT: This must be emitted as an AG-UI CustomEvent so subscribers
+ * (e.g. CopilotKit `onCustomEvent`) can receive it.
  */
-interface AgUiTool {
-    name: string;
-    description: string;
-    parameters?: Record<string, any>;
+interface McpAppUiEventPayload {
+    toolCallId: string;
+    resourceUri: string;
+    sessionId?: string;
+    toolName: string;
+    result?: any;
 }
 /**
  * Configuration for McpMiddleware
  */
 interface McpMiddlewareConfig {
-    /**
-     * MCP client or MultiSessionClient for executing tools
-     */
-    client: MCPClient | MultiSessionClient;
-    /**
-     * Prefix used to identify MCP tool names.
-     * Tools starting with this prefix will be executed server-side.
-     * @default 'server-'
-     */
-    toolPrefix?: string;
-    /**
-     * Pre-loaded tools with handlers for execution.
-     * If not provided, tools will be loaded from the MCP client on first use.
-     */
-    tools?: AguiTool[];
+    /** Pre-loaded tools with handlers (required) */
+    tools: AguiTool[];
 }
 /**
  * AG-UI Middleware that executes MCP tools server-side.
- *
- * This middleware intercepts tool calls for MCP tools (identified by prefix),
- * executes them via the MCP client, and returns results to the agent.
- *
- * @see {@link createMcpMiddleware} for a simpler factory function
  */
 declare class McpMiddleware extends Middleware {
-    private client;
-    private toolPrefix;
-    private actions;
     private tools;
-    private actionsLoaded;
+    private toolSchemas;
     constructor(config: McpMiddlewareConfig);
-    /**
-     * Convert actions to AG-UI tool format
-     */
-    private actionsToTools;
-    /**
-     * Check if a tool name is an MCP tool (matches the configured prefix)
-     */
     private isMcpTool;
-    /**
-     * Load actions from the MCP client if not already loaded
-     */
-    private ensureActionsLoaded;
-    /**
-     * Execute an MCP tool and return the result as a string
-     */
+    private parseArgs;
     private executeTool;
-    /**
-     * Generate a unique message ID for tool results
-     */
-    private generateMessageId;
-    /**
-     * Run the middleware, intercepting and executing MCP tool calls
-     */
+    private generateId;
+    private ensureIds;
+    /** Process tool call events and update state */
+    private handleToolCallEvent;
+    /** Execute pending MCP tools and return results */
+    private executeTools;
+    private emitToolResults;
     run(input: RunAgentInput, next: AbstractAgent): Observable<BaseEvent>;
-    private triggerNewRun;
-    private handlePendingCalls;
 }
 /**
  * Factory function to create MCP middleware.
- *
- * This is a convenience wrapper around McpMiddleware that returns a function
- * compatible with the AG-UI middleware pattern.
- *
- * @param client - MCP client or MultiSessionClient
- * @param options - Configuration options
- * @returns Middleware function
- *
- * @example
- * ```typescript
- * import { HttpAgent } from '@ag-ui/client';
- * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
- *
- * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(createMcpMiddleware(multiSessionClient, {
- *   toolPrefix: 'server-',
- *   actions: mcpActions,
- * }));
- * ```
  */
-declare function createMcpMiddleware(client: MCPClient | MultiSessionClient, options?: {
-    toolPrefix?: string;
-    tools?: AguiTool[];
+declare function createMcpMiddleware(options: {
+    tools: AguiTool[];
 }): (input: RunAgentInput, next: AbstractAgent) => Observable<BaseEvent>;
 
-export { type AgUiTool, McpMiddleware, type McpMiddlewareConfig, McpMiddleware as McpToolExecutorMiddleware, createMcpMiddleware, createMcpMiddleware as createMcpToolMiddleware };
+export { MCP_APP_UI_EVENT, type McpAppUiEventPayload, McpMiddleware, type McpMiddlewareConfig, McpMiddleware as McpToolExecutorMiddleware, createMcpMiddleware, createMcpMiddleware as createMcpToolMiddleware };

package/dist/adapters/agui-middleware.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
 import { Middleware, RunAgentInput, AbstractAgent, BaseEvent } from '@ag-ui/client';
-export { AbstractAgent, BaseEvent, EventType, Middleware, RunAgentInput, ToolCallEndEvent } from '@ag-ui/client';
-import { M as MCPClient, a as MultiSessionClient } from '../multi-session-client-BOFgPypS.js';
+export { AbstractAgent, BaseEvent, EventType, Middleware, RunAgentInput, Tool, ToolCallEndEvent } from '@ag-ui/client';
 import { AguiTool } from './agui-adapter.js';
-import '../events-BP6WyRNh.js';
+import '../multi-session-client-cox_WXUj.js';
+import '../events-BgeztGYZ.js';
 import '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/shared/auth.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
@@ -11,161 +11,59 @@ import '@modelcontextprotocol/sdk/client/auth.js';
 /**
  * AG-UI Middleware for MCP Tool Execution
  *
- * This middleware intercepts tool calls from remote agents (e.g., LangGraph, AutoGen)
- * and executes MCP tools server-side, returning results back to the agent.
+ * This middleware intercepts tool calls from remote agents and executes
+ * MCP tools server-side, returning results back to the agent.
  *
- * ## How It Works
- *
- * 1. **Tool Injection**: When a run starts, the middleware injects MCP tool definitions
- *    into `input.tools` so the remote agent knows about available MCP tools.
- *
- * 2. **Event Interception**: The middleware subscribes to the agent's event stream and
- *    tracks tool calls using AG-UI events:
- *    - `TOOL_CALL_START`: Records tool name and ID
- *    - `TOOL_CALL_ARGS`: Accumulates streamed arguments
- *    - `TOOL_CALL_END`: Marks tool call as complete
- *    - `RUN_FINISHED`: Triggers execution of pending MCP tools
- *
- * 3. **Server-Side Execution**: When `RUN_FINISHED` arrives with pending MCP tool calls,
- *    the middleware:
- *    - Executes each MCP tool via the MCP client
- *    - Emits `TOOL_CALL_RESULT` events with the results
- *    - Adds results to `input.messages` for context
- *    - Emits `RUN_FINISHED` to close the current run
- *    - Triggers a new run so the agent can process tool results
- *
- * 4. **Recursive Processing**: If the new run makes more MCP tool calls, the cycle
- *    repeats until the agent completes without pending MCP calls.
- *
- * ## Tool Identification
- *
- * MCP tools are identified by a configurable prefix (default: `server-`).
- * Tools not matching this prefix are passed through without interception.
- *
- * @requires @ag-ui/client - This middleware requires @ag-ui/client as a peer dependency
+ * @requires @ag-ui/client - Peer dependency for AG-UI types
  * @requires rxjs - Uses RxJS Observables for event streaming
- *
- * @example
- * ```typescript
- * import { HttpAgent } from '@ag-ui/client';
- * import { McpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
- * import { AguiAdapter } from '@mcp-ts/sdk/adapters/agui-adapter';
- *
- * // Create MCP client and adapter
- * const mcpClient = new MultiSessionClient('user_123');
- * await mcpClient.connect();
- *
- * const adapter = new AguiAdapter(mcpClient);
- * const actions = await adapter.getActions();
- *
- * // Create middleware with pre-loaded actions
- * const middleware = new McpMiddleware({
- *   client: mcpClient,
- *   actions,
- *   toolPrefix: 'server-',
- * });
- *
- * // Use with HttpAgent
- * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(middleware);
- * ```
  */
 
+/** New event type for MCP UI triggers */
+declare const MCP_APP_UI_EVENT = "mcp-apps-ui";
 /**
- * Tool definition format for AG-UI input.tools
+ * MCP Apps UI trigger event.
+ *
+ * IMPORTANT: This must be emitted as an AG-UI CustomEvent so subscribers
+ * (e.g. CopilotKit `onCustomEvent`) can receive it.
  */
-interface AgUiTool {
-    name: string;
-    description: string;
-    parameters?: Record<string, any>;
+interface McpAppUiEventPayload {
+    toolCallId: string;
+    resourceUri: string;
+    sessionId?: string;
+    toolName: string;
+    result?: any;
 }
 /**
  * Configuration for McpMiddleware
  */
 interface McpMiddlewareConfig {
-    /**
-     * MCP client or MultiSessionClient for executing tools
-     */
-    client: MCPClient | MultiSessionClient;
-    /**
-     * Prefix used to identify MCP tool names.
-     * Tools starting with this prefix will be executed server-side.
-     * @default 'server-'
-     */
-    toolPrefix?: string;
-    /**
-     * Pre-loaded tools with handlers for execution.
-     * If not provided, tools will be loaded from the MCP client on first use.
-     */
-    tools?: AguiTool[];
+    /** Pre-loaded tools with handlers (required) */
+    tools: AguiTool[];
 }
 /**
  * AG-UI Middleware that executes MCP tools server-side.
- *
- * This middleware intercepts tool calls for MCP tools (identified by prefix),
- * executes them via the MCP client, and returns results to the agent.
- *
- * @see {@link createMcpMiddleware} for a simpler factory function
  */
 declare class McpMiddleware extends Middleware {
-    private client;
-    private toolPrefix;
-    private actions;
     private tools;
-    private actionsLoaded;
+    private toolSchemas;
     constructor(config: McpMiddlewareConfig);
-    /**
-     * Convert actions to AG-UI tool format
-     */
-    private actionsToTools;
-    /**
-     * Check if a tool name is an MCP tool (matches the configured prefix)
-     */
     private isMcpTool;
-    /**
-     * Load actions from the MCP client if not already loaded
-     */
-    private ensureActionsLoaded;
-    /**
-     * Execute an MCP tool and return the result as a string
-     */
+    private parseArgs;
     private executeTool;
-    /**
-     * Generate a unique message ID for tool results
-     */
-    private generateMessageId;
-    /**
-     * Run the middleware, intercepting and executing MCP tool calls
-     */
+    private generateId;
+    private ensureIds;
+    /** Process tool call events and update state */
+    private handleToolCallEvent;
+    /** Execute pending MCP tools and return results */
+    private executeTools;
+    private emitToolResults;
     run(input: RunAgentInput, next: AbstractAgent): Observable<BaseEvent>;
-    private triggerNewRun;
-    private handlePendingCalls;
 }
 /**
  * Factory function to create MCP middleware.
- *
- * This is a convenience wrapper around McpMiddleware that returns a function
- * compatible with the AG-UI middleware pattern.
- *
- * @param client - MCP client or MultiSessionClient
- * @param options - Configuration options
- * @returns Middleware function
- *
- * @example
- * ```typescript
- * import { HttpAgent } from '@ag-ui/client';
- * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
- *
- * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(createMcpMiddleware(multiSessionClient, {
- *   toolPrefix: 'server-',
- *   actions: mcpActions,
- * }));
- * ```
  */
-declare function createMcpMiddleware(client: MCPClient | MultiSessionClient, options?: {
-    toolPrefix?: string;
-    tools?: AguiTool[];
+declare function createMcpMiddleware(options: {
+    tools: AguiTool[];
 }): (input: RunAgentInput, next: AbstractAgent) => Observable<BaseEvent>;
 
-export { type AgUiTool, McpMiddleware, type McpMiddlewareConfig, McpMiddleware as McpToolExecutorMiddleware, createMcpMiddleware, createMcpMiddleware as createMcpToolMiddleware };
+export { MCP_APP_UI_EVENT, type McpAppUiEventPayload, McpMiddleware, type McpMiddlewareConfig, McpMiddleware as McpToolExecutorMiddleware, createMcpMiddleware, createMcpMiddleware as createMcpToolMiddleware };