@opentiny/next-sdk 0.1.8 → 0.1.10

package/dist/remoter/createRemoter.js

@@ -226,7 +226,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);
     }
     // 实现复制到剪贴板功能
     copyToClipboard(text) {

package/dist/webagent.dev.js

@@ -24640,12 +24640,12 @@ ${user}:`]
   };
   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) {
@@ -24663,7 +24663,7 @@ ${user}:`]
         throw new Error("Either llmConfig or llm must be provided");
       }
     }
-    /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
+    /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
     async _createOneClient(serverConfig) {
       try {
         let transport;
@@ -24672,7 +24672,9 @@ ${user}:`]
         } else {
           transport = serverConfig;
         }
-        return await createMCPClient({ transport });
+        const client = await createMCPClient({ transport });
+        client["__transport__"] = transport;
+        return client;
       } catch (error) {
         if (this.onError) {
           this.onError((error == null ? void 0 : error.message) || `Failed to create MCP client`, error);
@@ -24681,15 +24683,25 @@ ${user}:`]
         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 (error) {
+      }
+    }
+    /** 创建所有 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) => {
@@ -24711,7 +24723,7 @@ ${user}:`]
       await Promise.all(
         this.mcpClients.map(async (client) => {
           try {
-            await (client == null ? void 0 : client.close());
+            await this._closeOneClient(client);
           } catch (error) {
             if (this.onError) {
               this.onError((error == null ? void 0 : error.message) || `Failed to close client`, error);
@@ -24721,35 +24733,44 @@ ${user}:`]
         })
       );
     }
+    /** 创建所有的 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 (error) {
       }
       const delTool = this.mcpTools[index];
@@ -24770,12 +24791,11 @@ ${user}:`]
       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),
@@ -24788,7 +24808,7 @@ ${user}:`]
         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;
@@ -26995,7 +27015,7 @@ ${user}:`]
       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) {

package/dist/webagent.es.dev.js

@@ -24246,12 +24246,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) {
@@ -24269,7 +24269,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;
@@ -24278,7 +24278,9 @@ class AgentModelProvider {
       } else {
         transport = serverConfig;
       }
-      return await createMCPClient({ transport });
+      const client = await createMCPClient({ transport });
+      client["__transport__"] = transport;
+      return client;
     } catch (error) {
       if (this.onError) {
         this.onError((error == null ? void 0 : error.message) || `Failed to create MCP client`, error);
@@ -24287,15 +24289,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 (error) {
+    }
+  }
+  /** 创建所有 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) => {
@@ -24317,7 +24329,7 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          await (client == null ? void 0 : client.close());
+          await this._closeOneClient(client);
         } catch (error) {
           if (this.onError) {
             this.onError((error == null ? void 0 : error.message) || `Failed to close client`, error);
@@ -24327,35 +24339,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 (error) {
     }
     const delTool = this.mcpTools[index];
@@ -24376,12 +24397,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),
@@ -24394,7 +24414,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;
@@ -26601,7 +26621,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) {