@opentiny/next-sdk 0.1.8 → 0.1.9

package/agent/AgentModelProvider.ts

@@ -74,7 +74,10 @@ export class AgentModelProvider {
         transport = serverConfig as MCPClientConfig['transport']
       }
 
-      return await createMCPClient({ transport: transport as MCPClientConfig['transport'] })
+      const client = await createMCPClient({ transport: transport as MCPClientConfig['transport'] })
+      //@ts-ignore
+      client['__transport__'] = transport
+      return client
     } catch (error: unknown) {
       if (this.onError) {
         this.onError((error as Error)?.message || `Failed to create MCP client`, error)
@@ -83,6 +86,12 @@ export class AgentModelProvider {
       return null
     }
   }
+  /** 关闭一个client */
+  private async _closeOneClient(client: any) {
+    await client['__transport__']?.terminateSession?.()
+    await client['__transport__']?.close?.()
+    await client?.close?.()
+  }
   /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
   private async _createMpcClients() {
     // 使用 Promise.all 并行处理所有 mcpServer 项
@@ -113,7 +122,7 @@ export class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          await client?.close()
+          await this._closeOneClient(client)
         } catch (error: unknown) {
           if (this.onError) {
             this.onError((error as Error)?.message || `Failed to close client`, error)
@@ -148,7 +157,7 @@ export class AgentModelProvider {
     return false
   }
   /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-  removeMcpServer(mcpServer: McpServerConfig) {
+  async removeMcpServer(mcpServer: McpServerConfig) {
     const index = this.mcpServers.findIndex((server) => server === mcpServer)
 
     // 移除
@@ -158,7 +167,7 @@ export class AgentModelProvider {
     const delClient = this.mcpClients[index]
     this.mcpClients.splice(index, 1)
     try {
-      delClient?.close()
+      await this._closeOneClient(delClient)
     } catch (error) {}
 
     // 移除 tools

package/dist/agent/AgentModelProvider.d.ts

@@ -32,6 +32,8 @@ export declare class AgentModelProvider {
     constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
     private _createOneClient;
+    /** 关闭一个client */
+    private _closeOneClient;
     /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
     private _createMpcClients;
     /** 创建所有 mcpClients 的 tools, 失败则保存为null */
@@ -42,7 +44,7 @@ export declare class AgentModelProvider {
     updateMcpServers(mcpServers: McpServerConfig[]): Promise<void>;
     insertMcpServer(mcpServer: McpServerConfig): Promise<boolean>;
     /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-    removeMcpServer(mcpServer: McpServerConfig): void;
+    removeMcpServer(mcpServer: McpServerConfig): Promise<void>;
     /** 创建临时允许调用的tools集合 */
     private _tempMergeTools;
     private _chat;

package/dist/agent/AgentModelProvider.js

@@ -79,7 +79,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,6 +93,15 @@ export class AgentModelProvider {
             }
         });
     }
+    /** 关闭一个client */
+    _closeOneClient(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            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));
+        });
+    }
     /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
     _createMpcClients() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -122,7 +134,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) {
@@ -162,25 +174,27 @@ export class AgentModelProvider {
     }
     /** 通过引用，删除一个 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);
-            });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            const index = this.mcpServers.findIndex((server) => server === mcpServer);
+            // 移除
+            this.mcpServers.splice(index, 1);
+            // 移除
+            const delClient = this.mcpClients[index];
+            this.mcpClients.splice(index, 1);
+            try {
+                yield this._closeOneClient(delClient);
+            }
+            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);
+                });
+            }
+        });
     }
     /** 创建临时允许调用的tools集合 */
     _tempMergeTools(extraTool = {}) {

package/dist/index.es.dev.js

@@ -25098,7 +25098,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) {
@@ -42841,7 +42841,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,6 +42852,13 @@ class AgentModelProvider {
       return null;
     }
   }
+  /** 关闭一个client */
+  async _closeOneClient(client) {
+    var _a16, _b8, _c, _d, _e;
+    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));
+  }
   /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
   async _createMpcClients() {
     this.mcpClients = await Promise.all(
@@ -42880,7 +42889,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);
@@ -42912,13 +42921,13 @@ class AgentModelProvider {
     return false;
   }
   /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
-  removeMcpServer(mcpServer) {
+  async 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 ? void 0 : delClient.close();
+      await this._closeOneClient(delClient);
     } catch (error2) {
     }
     const delTool = this.mcpTools[index];