@opentiny/next-sdk 0.1.8 → 0.1.10

package/dist/agent/AgentModelProvider.js

@@ -27,26 +27,24 @@ export const AIProviderFactories = {
     ['openai']: createOpenAI,
     ['deepseek']: createDeepSeek
 };
-/** 一个通用的ai-sdk的agent封装
+/** 一个通用的ai-sdk的Agent封装
  * @summary 内部自动管理了 llm, mcpServer, ai-sdk的clients 和 tools
  * @returns 暴露了 chat, chatStream方法
  */
 export class AgentModelProvider {
     constructor({ llmConfig, mcpServers, llm }) {
-        /**  mcpServers 允许为配置为 McpServerConfig, 或者任意的 MCPTransport
+        /**  当前mcpServers对象集合。键为服务器名称，值为 McpServerConfig 或任意的 MCPTransport
          * 参考: https://ai-sdk.dev/docs/ai-sdk-core/tools-and-tool-calling#initializing-an-mcp-client */
-        this.mcpServers = [];
-        /**  ai-sdk的 mcpClient */
+        this.mcpServers = {};
+        /** 当前ai-sdk的 mcpClient 数组 */
         this.mcpClients = [];
-        /** 所有的tools */
+        /** 当前 mcpClients 所对应的tools */
         this.mcpTools = [];
-        /**  需要实时过滤掉的tools name*/
+        /** 需要实时过滤掉的tools name*/
         this.ignoreToolnames = [];
-        /** 缓存 ai-sdk response 中的 多轮会话 */
+        /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
         this.messages = [];
-        // 1、保存 mcpServer
-        this.mcpServers = mcpServers || [];
-        // 2、保存 llm
+        this.mcpServers = mcpServers || {};
         if (llm) {
             this.llm = llm;
         }
@@ -67,7 +65,7 @@ export class AgentModelProvider {
             throw new Error('Either llmConfig or llm must be provided');
         }
     }
-    /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
+    /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
     _createOneClient(serverConfig) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -79,7 +77,10 @@ export class AgentModelProvider {
                 else {
                     transport = serverConfig;
                 }
-                return yield createMCPClient({ transport: transport });
+                const client = yield createMCPClient({ transport: transport });
+                //@ts-ignore
+                client['__transport__'] = transport;
+                return client;
             }
             catch (error) {
                 if (this.onError) {
@@ -90,16 +91,28 @@ export class AgentModelProvider {
             }
         });
     }
-    /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
+    /** 关闭一个 mcpClient */
+    _closeOneClient(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            try {
+                yield ((_b = (_a = client['__transport__']) === null || _a === void 0 ? void 0 : _a.terminateSession) === null || _b === void 0 ? void 0 : _b.call(_a));
+                yield ((_d = (_c = client['__transport__']) === null || _c === void 0 ? void 0 : _c.close) === null || _d === void 0 ? void 0 : _d.call(_c));
+                yield ((_e = client === null || client === void 0 ? void 0 : client.close) === null || _e === void 0 ? void 0 : _e.call(client));
+            }
+            catch (error) { }
+        });
+    }
+    /** 创建所有 mcpClients */
     _createMpcClients() {
         return __awaiter(this, void 0, void 0, function* () {
             // 使用 Promise.all 并行处理所有 mcpServer 项
-            this.mcpClients = yield Promise.all(this.mcpServers.map((server) => __awaiter(this, void 0, void 0, function* () {
+            this.mcpClients = yield Promise.all(Object.values(this.mcpServers).map((server) => __awaiter(this, void 0, void 0, function* () {
                 return this._createOneClient(server);
             })));
         });
     }
-    /** 创建所有 mcpClients 的 tools, 失败则保存为null */
+    /** 查询所有 mcpClients 的 tools, 失败则保存为null */
     _createMpcTools() {
         return __awaiter(this, void 0, void 0, function* () {
             this.mcpTools = yield Promise.all(this.mcpClients.map((client) => __awaiter(this, void 0, void 0, function* () {
@@ -122,7 +135,7 @@ export class AgentModelProvider {
         return __awaiter(this, void 0, void 0, function* () {
             yield Promise.all(this.mcpClients.map((client) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield (client === null || client === void 0 ? void 0 : client.close());
+                    yield this._closeOneClient(client);
                 }
                 catch (error) {
                     if (this.onError) {
@@ -133,54 +146,63 @@ export class AgentModelProvider {
             })));
         });
     }
+    /** 创建所有的 mcpClients，并更新它们的tools */
     initClientsAndTools() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             yield this._createMpcClients();
             yield this._createMpcTools();
+            (_a = this.onUpdatedTools) === null || _a === void 0 ? void 0 : _a.call(this);
         });
     }
+    /** 全量更新所有的 mcpServers */
     updateMcpServers(mcpServers) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.closeAll();
-            this.mcpServers = mcpServers;
+            this.mcpServers = mcpServers || this.mcpServers;
             yield this.initClientsAndTools();
         });
     }
-    insertMcpServer(mcpServer) {
+    /** 插入一个新的mcpServer，如果已经存在则返回false */
+    insertMcpServer(serverName, mcpServer) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const find = this.mcpServers.find((item) => 'url' in item && 'url' in mcpServer && item.url === mcpServer.url);
-            if (!find) {
-                this.mcpServers = [...this.mcpServers, mcpServer];
-                const client = yield this._createOneClient(mcpServer);
-                this.mcpClients.push(client);
-                this.mcpTools.push((yield ((_a = client === null || client === void 0 ? void 0 : client.tools) === null || _a === void 0 ? void 0 : _a.call(client))));
-                return true;
+            var _a, _b;
+            // 检查是否已存在相同名称的服务器
+            if (this.mcpServers[serverName]) {
+                return false;
             }
-            return false;
+            this.mcpServers[serverName] = mcpServer;
+            const client = yield this._createOneClient(mcpServer);
+            this.mcpClients.push(client);
+            this.mcpTools.push((yield ((_a = client === null || client === void 0 ? void 0 : client.tools) === null || _a === void 0 ? void 0 : _a.call(client))));
+            (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
+            return true;
         });
     }
-    /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-    removeMcpServer(mcpServer) {
-        const index = this.mcpServers.findIndex((server) => server === mcpServer);
-        // 移除
-        this.mcpServers.splice(index, 1);
-        // 移除
-        const delClient = this.mcpClients[index];
-        this.mcpClients.splice(index, 1);
-        try {
-            delClient === null || delClient === void 0 ? void 0 : delClient.close();
-        }
-        catch (error) { }
-        // 移除 tools
-        const delTool = this.mcpTools[index];
-        this.mcpTools.splice(index, 1);
-        // 移除 ignoreToolnames
-        if (delTool) {
-            Object.keys(delTool).forEach((toolName) => {
-                this.ignoreToolnames = this.ignoreToolnames.filter((name) => name !== toolName);
-            });
-        }
+    /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
+    removeMcpServer(serverName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.mcpServers[serverName]) {
+                return;
+            }
+            // 找到对应的索引
+            const serverNames = Object.keys(this.mcpServers);
+            const index = serverNames.indexOf(serverName);
+            delete this.mcpServers[serverName];
+            const delClient = this.mcpClients[index];
+            this.mcpClients.splice(index, 1);
+            try {
+                yield this._closeOneClient(delClient);
+            }
+            catch (error) { }
+            const delTool = this.mcpTools[index];
+            this.mcpTools.splice(index, 1);
+            if (delTool) {
+                Object.keys(delTool).forEach((toolName) => {
+                    this.ignoreToolnames = this.ignoreToolnames.filter((name) => name !== toolName);
+                });
+            }
+        });
     }
     /** 创建临时允许调用的tools集合 */
     _tempMergeTools(extraTool = {}) {
@@ -193,13 +215,12 @@ export class AgentModelProvider {
     }
     _chat(chatMethod, _a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _b, _c;
+            var _b;
             var { model, maxSteps = 5 } = _a, options = __rest(_a, ["model", "maxSteps"]);
             if (!this.llm) {
                 throw new Error('LLM is not initialized');
             }
             yield this.initClientsAndTools();
-            (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
             const chatOptions = Object.assign(Object.assign({ 
                 // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
                 model: this.llm(model), stopWhen: stepCountIs(maxSteps) }, options), { tools: this._tempMergeTools(options.tools) });
@@ -208,7 +229,7 @@ export class AgentModelProvider {
                 chatOptions.messages = [...this.messages];
             }
             const result = chatMethod(chatOptions);
-            (_c = result === null || result === void 0 ? void 0 : result.response) === null || _c === void 0 ? void 0 : _c.then((res) => {
+            (_b = result === null || result === void 0 ? void 0 : result.response) === null || _b === void 0 ? void 0 : _b.then((res) => {
                 this.messages.push(...res.messages);
             });
             return result;

package/dist/agent/type.d.ts

@@ -27,6 +27,6 @@ export interface IAgentModelProviderOption {
     llm?: ProviderV2;
     /** 代理模型提供器的大语言配置对象, 不能与 llm 同时传入 */
     llmConfig?: IAgentModelProviderLlmConfig;
-    /** Mcp Server的配置对象的集合 */
-    mcpServers?: McpServerConfig[];
+    /** Mcp Server的配置对象的集合，键为服务器名称，值为配置对象 */
+    mcpServers?: Record<string, McpServerConfig>;
 }

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

@@ -1,8 +1,8 @@
 import { ToolSet } from 'ai';
 import { WebMcpClient } from '../../WebMcpClient';
 /**
- * 快速 从官方 mcp 或 WebMcpClient 这2种client中， 抽取成 ai-sdk 所需要的 tool的对象
+ * 快速从官方 mcp 或 WebMcpClient 这2种client中读取 tools 数组，并转换成 ai-sdk 的tool的对象格式。
  * @params client  一个已连接好的 WebMcpClient
- * @returns  ai-sdk的 tool 格式的对象。
+ * @returns ai-sdk的dynamicTool对象。
  */
 export declare const getAISDKTools: (client: WebMcpClient) => Promise<ToolSet>;

package/dist/agent/utils/getAISDKTools.js

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { dynamicTool, jsonSchema } from 'ai';
 /**
- * 快速 从官方 mcp 或 WebMcpClient 这2种client中， 抽取成 ai-sdk 所需要的 tool的对象
+ * 快速从官方 mcp 或 WebMcpClient 这2种client中读取 tools 数组，并转换成 ai-sdk 的tool的对象格式。
  * @params client  一个已连接好的 WebMcpClient
- * @returns  ai-sdk的 tool 格式的对象。
+ * @returns ai-sdk的dynamicTool对象。
  */
 export const getAISDKTools = (client) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;

package/dist/index.es.dev.js

@@ -22631,25 +22631,14 @@ class WebMcpClient {
       await this.client.connect(this.transport);
       return { transport: this.transport, sessionId: this.transport.sessionId };
     }
-    const { url, token, sessionId, authProvider, type: type2, agent, onError, onUnauthorized, onReconnect } = options;
+    const { url, token, sessionId, type: type2, agent, onError } = options;
     if (agent === true) {
-      const proxyOptions = { client: this.client, url, token, sessionId, authProvider };
-      let reconnect = false;
+      const proxyOptions = { client: this.client, url, token, sessionId };
       let response;
       const connectProxy = async () => {
         const { transport: transport2, sessionId: sessionId2 } = type2 === "sse" ? await createSseProxy(proxyOptions) : type2 === "socket" ? await createSocketProxy(proxyOptions) : await createStreamProxy(proxyOptions);
         transport2.onerror = async (error2) => {
           onError == null ? void 0 : onError(error2);
-          if (error2.message === "Unauthorized" && !reconnect) {
-            if (typeof onUnauthorized === "function") {
-              await onUnauthorized(connectProxy);
-            } else {
-              reconnect = true;
-              await connectProxy();
-              reconnect = false;
-              await (onReconnect == null ? void 0 : onReconnect());
-            }
-          }
         };
         response = { transport: transport2, sessionId: sessionId2 };
       };
@@ -22663,14 +22652,9 @@ class WebMcpClient {
       await this.client.connect(transport);
     }
     if (type2 === "sse") {
-      if (authProvider) {
-        const createTransport = () => new SSEClientTransport(endpoint, { authProvider });
-        transport = await attemptConnection(this.client, authProvider.waitForOAuthCode, createTransport);
-      } else {
-        const opts = sseOptions(token, sessionId);
-        transport = new SSEClientTransport(endpoint, opts);
-        await this.client.connect(transport);
-      }
+      const opts = sseOptions(token, sessionId);
+      transport = new SSEClientTransport(endpoint, opts);
+      await this.client.connect(transport);
     }
     if (type2 === "socket") {
       transport = new WebSocketClientTransport(new URL(`${url}?sessionId=${sessionId}&token=${token}`));
@@ -22678,14 +22662,9 @@ class WebMcpClient {
       await this.client.connect(transport);
     }
     if (typeof transport === "undefined") {
-      if (authProvider) {
-        const createTransport = () => new StreamableHTTPClientTransport(endpoint, { authProvider });
-        transport = await attemptConnection(this.client, authProvider.waitForOAuthCode, createTransport);
-      } else {
-        const opts = streamOptions(token, sessionId);
-        transport = new StreamableHTTPClientTransport(endpoint, opts);
-        await this.client.connect(transport);
-      }
+      const opts = streamOptions(token, sessionId);
+      transport = new StreamableHTTPClientTransport(endpoint, opts);
+      await this.client.connect(transport);
     }
     this.transport = transport;
     return { transport: this.transport, sessionId: this.transport.sessionId };
@@ -25098,7 +25077,7 @@ class FloatingBlock {
     this.copyToClipboard(this.options.sessionId.slice(-6));
   }
   copyRemoteURL() {
-    this.copyToClipboard((this.options.remoteUrl || DEFAULT_REMOTE_URL) + this.sessionPrefix + this.options.sessionId);
+    this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
   }
   // 实现复制到剪贴板功能
   async copyToClipboard(text2) {
@@ -42809,12 +42788,12 @@ const AIProviderFactories = {
 };
 class AgentModelProvider {
   constructor({ llmConfig, mcpServers, llm }) {
-    this.mcpServers = [];
+    this.mcpServers = {};
     this.mcpClients = [];
     this.mcpTools = [];
     this.ignoreToolnames = [];
     this.messages = [];
-    this.mcpServers = mcpServers || [];
+    this.mcpServers = mcpServers || {};
     if (llm) {
       this.llm = llm;
     } else if (llmConfig) {
@@ -42832,7 +42811,7 @@ class AgentModelProvider {
       throw new Error("Either llmConfig or llm must be provided");
     }
   }
-  /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
+  /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
   async _createOneClient(serverConfig) {
     try {
       let transport;
@@ -42841,7 +42820,9 @@ class AgentModelProvider {
       } else {
         transport = serverConfig;
       }
-      return await createMCPClient({ transport });
+      const client = await createMCPClient({ transport });
+      client["__transport__"] = transport;
+      return client;
     } catch (error2) {
       if (this.onError) {
         this.onError((error2 == null ? void 0 : error2.message) || `Failed to create MCP client`, error2);
@@ -42850,15 +42831,25 @@ class AgentModelProvider {
       return null;
     }
   }
-  /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
+  /** 关闭一个 mcpClient */
+  async _closeOneClient(client) {
+    var _a16, _b8, _c, _d, _e;
+    try {
+      await ((_b8 = (_a16 = client["__transport__"]) == null ? void 0 : _a16.terminateSession) == null ? void 0 : _b8.call(_a16));
+      await ((_d = (_c = client["__transport__"]) == null ? void 0 : _c.close) == null ? void 0 : _d.call(_c));
+      await ((_e = client == null ? void 0 : client.close) == null ? void 0 : _e.call(client));
+    } catch (error2) {
+    }
+  }
+  /** 创建所有 mcpClients */
   async _createMpcClients() {
     this.mcpClients = await Promise.all(
-      this.mcpServers.map(async (server) => {
+      Object.values(this.mcpServers).map(async (server) => {
         return this._createOneClient(server);
       })
     );
   }
-  /** 创建所有 mcpClients 的 tools, 失败则保存为null */
+  /** 查询所有 mcpClients 的 tools, 失败则保存为null */
   async _createMpcTools() {
     this.mcpTools = await Promise.all(
       this.mcpClients.map(async (client) => {
@@ -42880,7 +42871,7 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          await (client == null ? void 0 : client.close());
+          await this._closeOneClient(client);
         } catch (error2) {
           if (this.onError) {
             this.onError((error2 == null ? void 0 : error2.message) || `Failed to close client`, error2);
@@ -42890,35 +42881,44 @@ class AgentModelProvider {
       })
     );
   }
+  /** 创建所有的 mcpClients，并更新它们的tools */
   async initClientsAndTools() {
+    var _a16;
     await this._createMpcClients();
     await this._createMpcTools();
+    (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
   }
+  /** 全量更新所有的 mcpServers */
   async updateMcpServers(mcpServers) {
     await this.closeAll();
-    this.mcpServers = mcpServers;
+    this.mcpServers = mcpServers || this.mcpServers;
     await this.initClientsAndTools();
   }
-  async insertMcpServer(mcpServer) {
-    var _a16;
-    const find = this.mcpServers.find((item) => "url" in item && "url" in mcpServer && item.url === mcpServer.url);
-    if (!find) {
-      this.mcpServers = [...this.mcpServers, mcpServer];
-      const client = await this._createOneClient(mcpServer);
-      this.mcpClients.push(client);
-      this.mcpTools.push(await ((_a16 = client == null ? void 0 : client.tools) == null ? void 0 : _a16.call(client)));
-      return true;
+  /** 插入一个新的mcpServer，如果已经存在则返回false */
+  async insertMcpServer(serverName, mcpServer) {
+    var _a16, _b8;
+    if (this.mcpServers[serverName]) {
+      return false;
     }
-    return false;
+    this.mcpServers[serverName] = mcpServer;
+    const client = await this._createOneClient(mcpServer);
+    this.mcpClients.push(client);
+    this.mcpTools.push(await ((_a16 = client == null ? void 0 : client.tools) == null ? void 0 : _a16.call(client)));
+    (_b8 = this.onUpdatedTools) == null ? void 0 : _b8.call(this);
+    return true;
   }
-  /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-  removeMcpServer(mcpServer) {
-    const index = this.mcpServers.findIndex((server) => server === mcpServer);
-    this.mcpServers.splice(index, 1);
+  /** 通过服务器名称删除mcpServer： mcpServers mcpClients  mcpTools ignoreToolnames  */
+  async removeMcpServer(serverName) {
+    if (!this.mcpServers[serverName]) {
+      return;
+    }
+    const serverNames = Object.keys(this.mcpServers);
+    const index = serverNames.indexOf(serverName);
+    delete this.mcpServers[serverName];
     const delClient = this.mcpClients[index];
     this.mcpClients.splice(index, 1);
     try {
-      delClient == null ? void 0 : delClient.close();
+      await this._closeOneClient(delClient);
     } catch (error2) {
     }
     const delTool = this.mcpTools[index];
@@ -42939,12 +42939,11 @@ class AgentModelProvider {
     return toolsResult;
   }
   async _chat(chatMethod, { model, maxSteps = 5, ...options }) {
-    var _a16, _b8;
+    var _a16;
     if (!this.llm) {
       throw new Error("LLM is not initialized");
     }
     await this.initClientsAndTools();
-    (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
     const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
@@ -42957,7 +42956,7 @@ class AgentModelProvider {
       chatOptions.messages = [...this.messages];
     }
     const result = chatMethod(chatOptions);
-    (_b8 = result == null ? void 0 : result.response) == null ? void 0 : _b8.then((res) => {
+    (_a16 = result == null ? void 0 : result.response) == null ? void 0 : _a16.then((res) => {
       this.messages.push(...res.messages);
     });
     return result;