@mcp-ts/sdk 1.0.0 → 1.0.1

package/README.md

@@ -3,11 +3,11 @@
     <img src="docs/static/img/logo.svg" alt="mcp-ts Logo" width="80" height="80" />
   </a>
   <h1 align="center">@mcp-ts</h1>
-  <p>A Lightweight MCP (Model Context Protocol) client library with integrated persistence.</p>
+  <p>TypeScript SDK providing MCP capabilities to agents across JavaScript/cross-runtime environments.</p>
 </div>
 
 <div align="center">
-  <a href="https://github.com/zonlabs/mcp-ts/raw/main/docs/static/vid/mcp-ts.mp4">
+  <a href="https://github.com/zonlabs/mcp-ts/raw/main/docs/static/vid/langchain-agui.mp4">
     <em>Click to watch demo video</em>
   </a>
 </div>
@@ -185,7 +185,7 @@ const mcpTools = await adapter.getTools();
 
 // Create agent with middleware
 const agent = new HttpAgent({ url: "http://localhost:8000/agent" });
-agent.use(createMcpMiddleware(client, {
+agent.use(createMcpMiddleware({
   toolPrefix: 'server-',
   tools: mcpTools,
 }));

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

@@ -14,7 +14,7 @@ import '@modelcontextprotocol/sdk/client/auth.js';
  * @example
  * ```typescript
  * import { MultiSessionClient } from '@mcp-ts/sdk/server';
- * import { AguiAdapter } from '@mcp-ts/sdk/adapters/mcp-adapter';
+ * import { AguiAdapter } from '@mcp-ts/sdk/adapters/agui-adapter';
  * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
  * import { HttpAgent } from '@ag-ui/client';
  *
@@ -28,10 +28,20 @@ import '@modelcontextprotocol/sdk/client/auth.js';
  *
  * // Use with AG-UI middleware
  * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(createMcpMiddleware(mcpClient, { tools }));
+ * agent.use(createMcpMiddleware({ tools }));
  * ```
  */
 
+/**
+ * Cleans a JSON Schema by removing meta-properties that cause issues with
+ * strict Pydantic validation (e.g., Google ADK).
+ *
+ * Removes: $schema, $id, $comment, $defs, definitions
+ *
+ * @param schema - The JSON Schema to clean
+ * @returns Cleaned schema without meta-properties
+ */
+declare function cleanSchema(schema: Record<string, any> | undefined): Record<string, any>;
 /**
  * Configuration options for AguiAdapter
  */
@@ -44,41 +54,23 @@ interface AguiAdapterOptions {
 }
 /**
  * AG-UI Tool with handler for server-side execution.
- *
- * Tools contain:
- * - `name`: Unique identifier (prefixed with server ID)
- * - `description`: Human-readable description for the LLM
- * - `parameters`: JSON Schema defining the input format
- * - `handler`: Function that executes the tool via MCP client
  */
 interface AguiTool {
-    /** Unique tool name (e.g., "server-abc_get_weather") */
     name: string;
-    /** Human-readable description for the LLM */
     description: string;
-    /** JSON Schema format parameters */
     parameters?: Record<string, any>;
-    /** Handler function that executes the MCP tool */
     handler?: (args: any) => any | Promise<any>;
 }
 /**
  * Tool definition format for passing to remote agents (without handler).
- * Compatible with OpenAI's function calling API.
  */
 interface AguiToolDefinition {
-    /** Tool name (e.g., "server-abc_get_weather") */
     name: string;
-    /** Human-readable description */
     description: string;
-    /** JSON Schema format parameters */
     parameters: Record<string, any>;
 }
 /**
  * Adapter that transforms MCP tools into AG-UI compatible formats.
- *
- * This adapter provides two main outputs:
- * - `getTools()`: Returns tools with handlers for server-side execution
- * - `getToolDefinitions()`: Returns tool definitions in JSON Schema format for remote agents
  */
 declare class AguiAdapter {
     private client;
@@ -86,34 +78,19 @@ declare class AguiAdapter {
     constructor(client: MCPClient | MultiSessionClient, options?: AguiAdapterOptions);
     /**
      * 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
      */
     getTools(): Promise<AguiTool[]>;
-    private transformTools;
-    /**
-     * Get tools as a function (for dynamic loading).
-     *
-     * @returns Function that returns a Promise of tools
-     */
-    getToolsFunction(): () => Promise<AguiTool[]>;
     /**
      * 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
      */
     getToolDefinitions(): Promise<AguiToolDefinition[]>;
+    /**
+     * Get tools as a function (for dynamic loading).
+     */
+    getToolsFunction(): () => Promise<AguiTool[]>;
+    private isMultiSession;
+    private transformTools;
     private transformToolDefinitions;
 }
 
-export { AguiAdapter, type AguiAdapterOptions, type AguiTool, type AguiToolDefinition };
+export { AguiAdapter, type AguiAdapterOptions, type AguiTool, type AguiToolDefinition, cleanSchema };

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

@@ -14,7 +14,7 @@ import '@modelcontextprotocol/sdk/client/auth.js';
  * @example
  * ```typescript
  * import { MultiSessionClient } from '@mcp-ts/sdk/server';
- * import { AguiAdapter } from '@mcp-ts/sdk/adapters/mcp-adapter';
+ * import { AguiAdapter } from '@mcp-ts/sdk/adapters/agui-adapter';
  * import { createMcpMiddleware } from '@mcp-ts/sdk/adapters/agui-middleware';
  * import { HttpAgent } from '@ag-ui/client';
  *
@@ -28,10 +28,20 @@ import '@modelcontextprotocol/sdk/client/auth.js';
  *
  * // Use with AG-UI middleware
  * const agent = new HttpAgent({ url: 'http://localhost:8000/agent' });
- * agent.use(createMcpMiddleware(mcpClient, { tools }));
+ * agent.use(createMcpMiddleware({ tools }));
  * ```
  */
 
+/**
+ * Cleans a JSON Schema by removing meta-properties that cause issues with
+ * strict Pydantic validation (e.g., Google ADK).
+ *
+ * Removes: $schema, $id, $comment, $defs, definitions
+ *
+ * @param schema - The JSON Schema to clean
+ * @returns Cleaned schema without meta-properties
+ */
+declare function cleanSchema(schema: Record<string, any> | undefined): Record<string, any>;
 /**
  * Configuration options for AguiAdapter
  */
@@ -44,41 +54,23 @@ interface AguiAdapterOptions {
 }
 /**
  * AG-UI Tool with handler for server-side execution.
- *
- * Tools contain:
- * - `name`: Unique identifier (prefixed with server ID)
- * - `description`: Human-readable description for the LLM
- * - `parameters`: JSON Schema defining the input format
- * - `handler`: Function that executes the tool via MCP client
  */
 interface AguiTool {
-    /** Unique tool name (e.g., "server-abc_get_weather") */
     name: string;
-    /** Human-readable description for the LLM */
     description: string;
-    /** JSON Schema format parameters */
     parameters?: Record<string, any>;
-    /** Handler function that executes the MCP tool */
     handler?: (args: any) => any | Promise<any>;
 }
 /**
  * Tool definition format for passing to remote agents (without handler).
- * Compatible with OpenAI's function calling API.
  */
 interface AguiToolDefinition {
-    /** Tool name (e.g., "server-abc_get_weather") */
     name: string;
-    /** Human-readable description */
     description: string;
-    /** JSON Schema format parameters */
     parameters: Record<string, any>;
 }
 /**
  * Adapter that transforms MCP tools into AG-UI compatible formats.
- *
- * This adapter provides two main outputs:
- * - `getTools()`: Returns tools with handlers for server-side execution
- * - `getToolDefinitions()`: Returns tool definitions in JSON Schema format for remote agents
  */
 declare class AguiAdapter {
     private client;
@@ -86,34 +78,19 @@ declare class AguiAdapter {
     constructor(client: MCPClient | MultiSessionClient, options?: AguiAdapterOptions);
     /**
      * 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
      */
     getTools(): Promise<AguiTool[]>;
-    private transformTools;
-    /**
-     * Get tools as a function (for dynamic loading).
-     *
-     * @returns Function that returns a Promise of tools
-     */
-    getToolsFunction(): () => Promise<AguiTool[]>;
     /**
      * 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
      */
     getToolDefinitions(): Promise<AguiToolDefinition[]>;
+    /**
+     * Get tools as a function (for dynamic loading).
+     */
+    getToolsFunction(): () => Promise<AguiTool[]>;
+    private isMultiSession;
+    private transformTools;
     private transformToolDefinitions;
 }
 
-export { AguiAdapter, type AguiAdapterOptions, type AguiTool, type AguiToolDefinition };
+export { AguiAdapter, type AguiAdapterOptions, type AguiTool, type AguiToolDefinition, cleanSchema };

package/dist/adapters/agui-adapter.js

@@ -1,6 +1,35 @@
 'use strict';
 
 // src/adapters/agui-adapter.ts
+function cleanSchema(schema) {
+  if (!schema) {
+    return { type: "object", properties: {} };
+  }
+  const cleaned = { ...schema };
+  delete cleaned.$schema;
+  delete cleaned.$id;
+  delete cleaned.$comment;
+  delete cleaned.$defs;
+  delete cleaned.definitions;
+  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;
@@ -8,102 +37,73 @@ 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 prefix = this.options.prefix ?? `tool_${client.getServerId() ?? "mcp"}`;
+    return result.tools.map((tool) => ({
+      name: `${prefix}_${tool.name}`,
+      description: tool.description || `Execute ${tool.name}`,
+      parameters: cleanSchema(tool.inputSchema),
+      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;
+      }
+    }));
+  }
   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({
-        name: `${prefix}_${tool.name}`,
-        description: tool.description || `Execute ${tool.name}`,
-        parameters: tool.inputSchema || { type: "object", properties: {} }
-      });
-    }
-    return tools;
+    const prefix = this.options.prefix ?? `tool_${client.getServerId() ?? "mcp"}`;
+    return result.tools.map((tool) => ({
+      name: `${prefix}_${tool.name}`,
+      description: tool.description || `Execute ${tool.name}`,
+      parameters: cleanSchema(tool.inputSchema)
+    }));
   }
 };
 
 exports.AguiAdapter = AguiAdapter;
+exports.cleanSchema = cleanSchema;
 //# sourceMappingURL=agui-adapter.js.map
 //# sourceMappingURL=agui-adapter.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adapters/agui-adapter.ts"],"names":["result"],"mappings":"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","file":"agui-adapter.js","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":["result"],"mappings":"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","file":"agui-adapter.js","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 * Cleans a JSON Schema by removing meta-properties that cause issues with\r\n * strict Pydantic validation (e.g., Google ADK).\r\n *\r\n * Removes: $schema, $id, $comment, $defs, definitions\r\n *\r\n * @param schema - The JSON Schema to clean\r\n * @returns Cleaned schema without meta-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 JSON Schema meta-properties that cause Pydantic validation errors\r\n    delete cleaned.$schema;\r\n    delete cleaned.$id;\r\n    delete cleaned.$comment;\r\n    delete cleaned.$defs;\r\n    delete cleaned.definitions;\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    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}\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 prefix = this.options.prefix ?? `tool_${client.getServerId() ?? 'mcp'}`;\r\n\r\n        return result.tools.map(tool => ({\r\n            name: `${prefix}_${tool.name}`,\r\n            description: tool.description || `Execute ${tool.name}`,\r\n            parameters: cleanSchema(tool.inputSchema),\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                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                return result;\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 prefix = this.options.prefix ?? `tool_${client.getServerId() ?? 'mcp'}`;\r\n\r\n        return result.tools.map(tool => ({\r\n            name: `${prefix}_${tool.name}`,\r\n            description: tool.description || `Execute ${tool.name}`,\r\n            parameters: cleanSchema(tool.inputSchema),\r\n        }));\r\n    }\r\n}\r\n"]}

package/dist/adapters/agui-adapter.mjs

@@ -1,4 +1,33 @@
 // src/adapters/agui-adapter.ts
+function cleanSchema(schema) {
+  if (!schema) {
+    return { type: "object", properties: {} };
+  }
+  const cleaned = { ...schema };
+  delete cleaned.$schema;
+  delete cleaned.$id;
+  delete cleaned.$comment;
+  delete cleaned.$defs;
+  delete cleaned.definitions;
+  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 +35,72 @@ 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 prefix = this.options.prefix ?? `tool_${client.getServerId() ?? "mcp"}`;
+    return result.tools.map((tool) => ({
+      name: `${prefix}_${tool.name}`,
+      description: tool.description || `Execute ${tool.name}`,
+      parameters: cleanSchema(tool.inputSchema),
+      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;
+      }
+    }));
+  }
   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({
-        name: `${prefix}_${tool.name}`,
-        description: tool.description || `Execute ${tool.name}`,
-        parameters: tool.inputSchema || { type: "object", properties: {} }
-      });
-    }
-    return tools;
+    const prefix = this.options.prefix ?? `tool_${client.getServerId() ?? "mcp"}`;
+    return result.tools.map((tool) => ({
+      name: `${prefix}_${tool.name}`,
+      description: tool.description || `Execute ${tool.name}`,
+      parameters: cleanSchema(tool.inputSchema)
+    }));
   }
 };
 
-export { AguiAdapter };
+export { AguiAdapter, cleanSchema };
 //# sourceMappingURL=agui-adapter.mjs.map
 //# sourceMappingURL=agui-adapter.mjs.map