@opentiny/next-sdk 0.1.7 → 0.1.9

package/agent/AgentModelProvider.ts

@@ -31,14 +31,12 @@ export class AgentModelProvider {
   /**  需要实时过滤掉的tools name*/
   ignoreToolnames: string[] = []
 
-  /** 在 chat 之前，自动更新 所有的tools */
-  autoUpdateTools = true
-
   /** chat 时，自动更新 所有的tools 后的事件 */
   onUpdatedTools: (() => void) | undefined
   /** 内部报错时，抛出错误事件 */
   onError: ((msg: string, err?: any) => void) | undefined
 
+  /** 缓存 ai-sdk response 中的 多轮会话 */
   messages: any[] = []
 
   constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption) {
@@ -76,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)
@@ -85,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 项
@@ -115,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)
@@ -150,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)
 
     // 移除
@@ -160,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
@@ -176,7 +183,7 @@ export class AgentModelProvider {
   }
 
   /** 创建临时允许调用的tools集合 */
-  tempMergeTools(extraTool = {}) {
+  private _tempMergeTools(extraTool = {}) {
     const toolsResult = this.mcpTools.reduce((acc, curr) => ({ ...acc, ...curr }), {})
     Object.assign(toolsResult, extraTool)
 
@@ -186,7 +193,7 @@ export class AgentModelProvider {
     return toolsResult
   }
 
-  async _chat(
+  private async _chat(
     chatMethod: ChatMethodFn,
     { model, maxSteps = 5, ...options }: Parameters<typeof generateText>[0] & { maxSteps?: number; message?: string }
   ): Promise<any> {
@@ -194,17 +201,16 @@ export class AgentModelProvider {
       throw new Error('LLM is not initialized')
     }
 
-    if (this.autoUpdateTools) {
-      await this._createMpcTools()
-      this.onUpdatedTools?.()
-    }
+    await this.initClientsAndTools()
+
+    this.onUpdatedTools?.()
 
     const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
-      tools: this.tempMergeTools(options.tools) as ToolSet
+      tools: this._tempMergeTools(options.tools) as ToolSet
     }
 
     if (options.message && !options.messages) {
@@ -214,6 +220,7 @@ export class AgentModelProvider {
 
     const result = chatMethod(chatOptions)
 
+    // 缓存 ai-sdk的多轮对话的消息
     ;(result as StreamTextResult<ToolSet, unknown>)?.response?.then((res: any) => {
       this.messages.push(...res.messages)
     })

package/dist/agent/AgentModelProvider.d.ts

@@ -8,7 +8,6 @@ export declare const AIProviderFactories: {
     openai: typeof createOpenAI;
     deepseek: typeof createDeepSeek;
 };
-type ChatMethodFn = typeof streamText | typeof generateText;
 /** 一个通用的ai-sdk的agent封装
  * @summary 内部自动管理了 llm, mcpServer, ai-sdk的clients 和 tools
  * @returns 暴露了 chat, chatStream方法
@@ -24,16 +23,17 @@ export declare class AgentModelProvider {
     mcpTools: Array<Record<string, any>>;
     /**  需要实时过滤掉的tools name*/
     ignoreToolnames: string[];
-    /** 在 chat 之前，自动更新 所有的tools */
-    autoUpdateTools: boolean;
     /** chat 时，自动更新 所有的tools 后的事件 */
     onUpdatedTools: (() => void) | undefined;
     /** 内部报错时，抛出错误事件 */
     onError: ((msg: string, err?: any) => void) | undefined;
+    /** 缓存 ai-sdk response 中的 多轮会话 */
     messages: any[];
     constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
     private _createOneClient;
+    /** 关闭一个client */
+    private _closeOneClient;
     /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
     private _createMpcClients;
     /** 创建所有 mcpClients 的 tools, 失败则保存为null */
@@ -44,13 +44,10 @@ 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集合 */
-    tempMergeTools(extraTool?: {}): Record<string, any>;
-    _chat(chatMethod: ChatMethodFn, { model, maxSteps, ...options }: Parameters<typeof generateText>[0] & {
-        maxSteps?: number;
-        message?: string;
-    }): Promise<any>;
+    private _tempMergeTools;
+    private _chat;
     chat(options: Parameters<typeof generateText>[0] & {
         maxSteps?: number;
         message?: string;
@@ -60,4 +57,3 @@ export declare class AgentModelProvider {
         message?: string;
     }): Promise<any>;
 }
-export {};

package/dist/agent/AgentModelProvider.js

@@ -42,8 +42,7 @@ export class AgentModelProvider {
         this.mcpTools = [];
         /**  需要实时过滤掉的tools name*/
         this.ignoreToolnames = [];
-        /** 在 chat 之前，自动更新 所有的tools */
-        this.autoUpdateTools = true;
+        /** 缓存 ai-sdk response 中的 多轮会话 */
         this.messages = [];
         // 1、保存 mcpServer
         this.mcpServers = mcpServers || [];
@@ -80,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) {
@@ -91,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* () {
@@ -123,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.close();
+                    yield this._closeOneClient(client);
                 }
                 catch (error) {
                     if (this.onError) {
@@ -163,28 +174,30 @@ 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 = {}) {
+    _tempMergeTools(extraTool = {}) {
         const toolsResult = this.mcpTools.reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
         Object.assign(toolsResult, extraTool);
         this.ignoreToolnames.forEach((name) => {
@@ -199,13 +212,11 @@ export class AgentModelProvider {
             if (!this.llm) {
                 throw new Error('LLM is not initialized');
             }
-            if (this.autoUpdateTools) {
-                yield this._createMpcTools();
-                (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
-            }
+            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) });
+                model: this.llm(model), stopWhen: stepCountIs(maxSteps) }, options), { tools: this._tempMergeTools(options.tools) });
             if (options.message && !options.messages) {
                 this.messages.push({ role: 'user', content: options.message });
                 chatOptions.messages = [...this.messages];

package/dist/index.es.dev.js

@@ -24885,6 +24885,8 @@ class QrCode {
     img.src = await this.toDataURL();
   }
 }
+const DEFAULT_REMOTE_URL = "https://agent.opentiny.design/tiny-robot";
+const DEFAULT_QR_CODE_URL = "https://ai.opentiny.design/next-remoter";
 const getDefaultMenuItems = (options) => {
   return [
     {
@@ -24933,8 +24935,8 @@ const getDefaultMenuItems = (options) => {
     {
       action: "remote-url",
       show: true,
-      text: `${options.qrCodeUrl}`,
-      tip: options.qrCodeUrl,
+      text: `${options.remoteUrl}`,
+      tip: options.remoteUrl,
       showCopyIcon: true,
       icon: `<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
@@ -24950,8 +24952,9 @@ class FloatingBlock {
       throw new Error("sessionId is required");
     }
     this.options = {
-      qrCodeUrl: options.qrCodeUrl || "https://ai.opentiny.design/next-remoter",
-      ...options
+      ...options,
+      qrCodeUrl: options.qrCodeUrl || DEFAULT_QR_CODE_URL,
+      remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL
     };
     this.menuItems = this.mergeMenuItems(options.menuItems);
     this.init();
@@ -24995,7 +24998,7 @@ class FloatingBlock {
     this.floatingBlock.className = "tiny-remoter-floating-block";
     this.floatingBlock.innerHTML = `
       <div class="tiny-remoter-floating-block__icon">
-        <img style="display: block; width: 56px;" src="https://ai.opentiny.design/next-remoter/svgs/logo-next-no-bg-left.svg" alt="icon" />
+        <img style="display: block; width: 56px;" src="${DEFAULT_QR_CODE_URL}/svgs/logo-next-no-bg-left.svg" alt="icon" />
       </div>
     `;
     document.body.appendChild(this.floatingBlock);
@@ -25095,7 +25098,7 @@ class FloatingBlock {
     this.copyToClipboard(this.options.sessionId.slice(-6));
   }
   copyRemoteURL() {
-    this.copyToClipboard((this.options.qrCodeUrl || "") + this.sessionPrefix + this.options.sessionId);
+    this.copyToClipboard(this.options.remoteUrl + this.sessionPrefix + this.options.sessionId);
   }
   // 实现复制到剪贴板功能
   async copyToClipboard(text2) {
@@ -42810,7 +42813,6 @@ class AgentModelProvider {
     this.mcpClients = [];
     this.mcpTools = [];
     this.ignoreToolnames = [];
-    this.autoUpdateTools = true;
     this.messages = [];
     this.mcpServers = mcpServers || [];
     if (llm) {
@@ -42839,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);
@@ -42848,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(
@@ -42878,7 +42889,7 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          await client.close();
+          await this._closeOneClient(client);
         } catch (error2) {
           if (this.onError) {
             this.onError((error2 == null ? void 0 : error2.message) || `Failed to close client`, error2);
@@ -42910,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];
@@ -42928,7 +42939,7 @@ class AgentModelProvider {
     }
   }
   /** 创建临时允许调用的tools集合 */
-  tempMergeTools(extraTool = {}) {
+  _tempMergeTools(extraTool = {}) {
     const toolsResult = this.mcpTools.reduce((acc, curr) => ({ ...acc, ...curr }), {});
     Object.assign(toolsResult, extraTool);
     this.ignoreToolnames.forEach((name16) => {
@@ -42941,16 +42952,14 @@ class AgentModelProvider {
     if (!this.llm) {
       throw new Error("LLM is not initialized");
     }
-    if (this.autoUpdateTools) {
-      await this._createMpcTools();
-      (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
-    }
+    await this.initClientsAndTools();
+    (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
     const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
-      tools: this.tempMergeTools(options.tools)
+      tools: this._tempMergeTools(options.tools)
     };
     if (options.message && !options.messages) {
       this.messages.push({ role: "user", content: options.message });