@opentiny/next-sdk 0.1.1 → 0.1.2

package/WebMcpServer.ts

@@ -88,6 +88,10 @@ export class WebMcpServer {
     this.server.server.onerror = (error: Error) => {
       this.onerror?.(error)
     }
+
+    this.server.server.setRequestHandler(SetLevelRequestSchema, async () => {
+      return {}
+    })
   }
 
   /**

package/agent/AgentModelProvider.ts

@@ -53,7 +53,7 @@ export class AgentModelProvider {
 
     // 每次会话需要获取最新的工具列表，因为工具是会发生变化的
     await this.initClients()
-    const tools = await getMcpTools(this.mcpClients)
+    const tools = await getMcpTools(this.mcpClients, options)
 
     return generateText({
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
@@ -75,7 +75,7 @@ export class AgentModelProvider {
 
     // 每次会话需要获取最新的工具列表，因为工具是会发生变化的
     await this.initClients()
-    const tools = await getMcpTools(this.mcpClients)
+    const tools = await getMcpTools(this.mcpClients, options)
 
     return streamText({
       // @ts-ignore 同上

package/agent/utils/index.ts

@@ -1,10 +1,8 @@
-import {
-  experimental_createMCPClient as createMCPClient,
-  ToolSet,
-  experimental_MCPClientConfig as MCPClientConfig
-} from 'ai'
+import { experimental_createMCPClient as createMCPClient, experimental_MCPClientConfig as MCPClientConfig } from 'ai'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import { McpServerConfig, MCPClient } from '../type'
+import { dynamicTool, jsonSchema, Tool, ToolCallOptions, ToolSet } from 'ai'
+import { WebMcpClient } from '../../WebMcpClient'
 
 /** 创建 McpClients, 其中 mcpServers 允许为配置为 McpServerConfig, 或者任意的 MCPTransport
  * 参考: https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#initializing-an-mcp-client
@@ -37,8 +35,45 @@ export const getMcpClients = async (mcpServers: McpServerConfig[]) => {
 }
 
 /** 合并所有的Mcp Tools */
-export const getMcpTools = async (mcpClients: MCPClient[]): Promise<ToolSet> => {
+export const getMcpTools = async (mcpClients: MCPClient[], options: Record<string, any>): Promise<ToolSet> => {
   const tools = await Promise.all(mcpClients.map((client) => client?.tools?.()))
+  const toolsResult = tools.reduce((acc, curr) => ({ ...acc, ...curr }), {})
+  const toolsOptions = options?.tools ?? {}
 
-  return tools.reduce((acc, curr) => ({ ...acc, ...curr }), {})
+  return {
+    ...toolsResult,
+    ...toolsOptions
+  }
+}
+
+/**
+ * Returns a set of AI SDK tools from the MCP server
+ * @returns A record of tool names to their implementations
+ */
+export const getAISDKTools = async (client: WebMcpClient): Promise<ToolSet> => {
+  const tools: Record<string, Tool> = {}
+
+  try {
+    const listToolsResult = await client.listTools()
+
+    for (const { name, description, inputSchema } of listToolsResult.tools) {
+      const execute = async (args: any, options: ToolCallOptions): Promise<any> => {
+        return client.callTool({ name, arguments: args }, { signal: options?.abortSignal })
+      }
+
+      tools[name] = dynamicTool({
+        description,
+        inputSchema: jsonSchema({
+          ...inputSchema,
+          properties: (inputSchema.properties as Record<string, any>) ?? {},
+          additionalProperties: false
+        }),
+        execute
+      })
+    }
+
+    return tools
+  } catch (error) {
+    throw error
+  }
 }

package/dist/WebMcpServer.js

@@ -41,6 +41,9 @@ export class WebMcpServer {
             var _a;
             (_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error);
         };
+        this.server.server.setRequestHandler(SetLevelRequestSchema, () => __awaiter(this, void 0, void 0, function* () {
+            return {};
+        }));
     }
     /**
      * Connects the server to a transport via the specified option.

package/dist/agent/AgentModelProvider.js

@@ -64,7 +64,7 @@ export class AgentModelProvider {
             }
             // 每次会话需要获取最新的工具列表，因为工具是会发生变化的
             yield this.initClients();
-            const tools = yield getMcpTools(this.mcpClients);
+            const tools = yield getMcpTools(this.mcpClients, options);
             return generateText(Object.assign({ 
                 // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
                 model: this.llm(model), tools: tools, stopWhen: stepCountIs(maxSteps) }, options));
@@ -78,7 +78,7 @@ export class AgentModelProvider {
             }
             // 每次会话需要获取最新的工具列表，因为工具是会发生变化的
             yield this.initClients();
-            const tools = yield getMcpTools(this.mcpClients);
+            const tools = yield getMcpTools(this.mcpClients, options);
             return streamText(Object.assign({ 
                 // @ts-ignore 同上
                 model: this.llm(model), tools: tools, stopWhen: stepCountIs(maxSteps) }, options));

package/dist/agent/utils/index.d.ts

@@ -1,8 +1,14 @@
-import { ToolSet } from 'ai';
 import { McpServerConfig, MCPClient } from '../type';
+import { ToolSet } from 'ai';
+import { WebMcpClient } from '../../WebMcpClient';
 /** 创建 McpClients, 其中 mcpServers 允许为配置为 McpServerConfig, 或者任意的 MCPTransport
  * 参考: https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#initializing-an-mcp-client
  */
 export declare const getMcpClients: (mcpServers: McpServerConfig[]) => Promise<(MCPClient | never[])[]>;
 /** 合并所有的Mcp Tools */
-export declare const getMcpTools: (mcpClients: MCPClient[]) => Promise<ToolSet>;
+export declare const getMcpTools: (mcpClients: MCPClient[], options: Record<string, any>) => Promise<ToolSet>;
+/**
+ * Returns a set of AI SDK tools from the MCP server
+ * @returns A record of tool names to their implementations
+ */
+export declare const getAISDKTools: (client: WebMcpClient) => Promise<ToolSet>;

package/dist/agent/utils/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { experimental_createMCPClient as createMCPClient } from 'ai';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { dynamicTool, jsonSchema } from 'ai';
 /** 创建 McpClients, 其中 mcpServers 允许为配置为 McpServerConfig, 或者任意的 MCPTransport
  * 参考: https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#initializing-an-mcp-client
  */
@@ -37,7 +38,35 @@ export const getMcpClients = (mcpServers) => __awaiter(void 0, void 0, void 0, f
     return allMcpClients;
 });
 /** 合并所有的Mcp Tools */
-export const getMcpTools = (mcpClients) => __awaiter(void 0, void 0, void 0, function* () {
+export const getMcpTools = (mcpClients, options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const tools = yield Promise.all(mcpClients.map((client) => { var _a; return (_a = client === null || client === void 0 ? void 0 : client.tools) === null || _a === void 0 ? void 0 : _a.call(client); }));
-    return tools.reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
+    const toolsResult = tools.reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
+    const toolsOptions = (_a = options === null || options === void 0 ? void 0 : options.tools) !== null && _a !== void 0 ? _a : {};
+    return Object.assign(Object.assign({}, toolsResult), toolsOptions);
+});
+/**
+ * Returns a set of AI SDK tools from the MCP server
+ * @returns A record of tool names to their implementations
+ */
+export const getAISDKTools = (client) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const tools = {};
+    try {
+        const listToolsResult = yield client.listTools();
+        for (const { name, description, inputSchema } of listToolsResult.tools) {
+            const execute = (args, options) => __awaiter(void 0, void 0, void 0, function* () {
+                return client.callTool({ name, arguments: args }, { signal: options === null || options === void 0 ? void 0 : options.abortSignal });
+            });
+            tools[name] = dynamicTool({
+                description,
+                inputSchema: jsonSchema(Object.assign(Object.assign({}, inputSchema), { properties: (_a = inputSchema.properties) !== null && _a !== void 0 ? _a : {}, additionalProperties: false })),
+                execute
+            });
+        }
+        return tools;
+    }
+    catch (error) {
+        throw error;
+    }
 });