@opentiny/next-sdk 0.1.6 → 0.1.8

package/agent/AgentModelProvider.ts

@@ -1,4 +1,4 @@
-import { streamText, stepCountIs, generateText } from 'ai'
+import { streamText, stepCountIs, generateText, StreamTextResult } from 'ai'
 import { experimental_createMCPClient as createMCPClient, experimental_MCPClientConfig as MCPClientConfig } from 'ai'
 import type { ToolSet } from 'ai'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
@@ -31,14 +31,14 @@ 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) {
     // 1、保存 mcpServer
     this.mcpServers = mcpServers || []
@@ -75,9 +75,9 @@ export class AgentModelProvider {
       }
 
       return await createMCPClient({ transport: transport as MCPClientConfig['transport'] })
-    } catch (error) {
+    } catch (error: unknown) {
       if (this.onError) {
-        this.onError(`Failed to create MCP client`, error)
+        this.onError((error as Error)?.message || `Failed to create MCP client`, error)
       }
       console.error(`Failed to create MCP client`, serverConfig, error)
       return null
@@ -98,9 +98,9 @@ export class AgentModelProvider {
       this.mcpClients.map(async (client) => {
         try {
           return client ? await client?.tools?.() : null
-        } catch (error) {
+        } catch (error: unknown) {
           if (this.onError) {
-            this.onError(`Failed to query tools`, error)
+            this.onError((error as Error)?.message || `Failed to query tools`, error)
           }
           console.error(`Failed to query tools`, error)
           return null
@@ -113,8 +113,13 @@ export class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          client.close()
-        } catch (error) {}
+          await client?.close()
+        } catch (error: unknown) {
+          if (this.onError) {
+            this.onError((error as Error)?.message || `Failed to close client`, error)
+          }
+          console.error(`Failed to close client`, error)
+        }
       })
     )
   }
@@ -169,7 +174,7 @@ export class AgentModelProvider {
   }
 
   /** 创建临时允许调用的tools集合 */
-  tempMergeTools(extraTool = {}) {
+  private _tempMergeTools(extraTool = {}) {
     const toolsResult = this.mcpTools.reduce((acc, curr) => ({ ...acc, ...curr }), {})
     Object.assign(toolsResult, extraTool)
 
@@ -179,33 +184,46 @@ export class AgentModelProvider {
     return toolsResult
   }
 
-  async _chat(
+  private async _chat(
     chatMethod: ChatMethodFn,
-    { model, maxSteps = 5, ...options }: Parameters<typeof generateText>[0] & { maxSteps?: number }
+    { model, maxSteps = 5, ...options }: Parameters<typeof generateText>[0] & { maxSteps?: number; message?: string }
   ): Promise<any> {
     if (!this.llm) {
       throw new Error('LLM is not initialized')
     }
 
-    if (this.autoUpdateTools) {
-      await this._createMpcTools()
-      this.onUpdatedTools?.()
-    }
+    await this.initClientsAndTools()
 
-    return chatMethod({
+    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) {
+      this.messages.push({ role: 'user', content: options.message })
+      chatOptions.messages = [...this.messages]
+    }
+
+    const result = chatMethod(chatOptions)
+
+    // 缓存 ai-sdk的多轮对话的消息
+    ;(result as StreamTextResult<ToolSet, unknown>)?.response?.then((res: any) => {
+      this.messages.push(...res.messages)
     })
+
+    return result
   }
 
-  async chat(options: Parameters<typeof generateText>[0] & { maxSteps?: number }): Promise<any> {
+  async chat(options: Parameters<typeof generateText>[0] & { maxSteps?: number; message?: string }): Promise<any> {
     return this._chat(generateText, options)
   }
 
-  async chatStream(options: Parameters<typeof streamText>[0] & { maxSteps?: number }): Promise<any> {
+  async chatStream(options: Parameters<typeof streamText>[0] & { maxSteps?: number; message?: string }): Promise<any> {
     return this._chat(streamText, options as any)
   }
 }

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,12 +23,12 @@ 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;
@@ -45,15 +44,14 @@ export declare class AgentModelProvider {
     /** 通过引用，删除一个 mcpServers mcpClients  mcpTools ignoreToolnames  */
     removeMcpServer(mcpServer: McpServerConfig): void;
     /** 创建临时允许调用的tools集合 */
-    tempMergeTools(extraTool?: {}): Record<string, any>;
-    _chat(chatMethod: ChatMethodFn, { model, maxSteps, ...options }: Parameters<typeof generateText>[0] & {
-        maxSteps?: number;
-    }): Promise<any>;
+    private _tempMergeTools;
+    private _chat;
     chat(options: Parameters<typeof generateText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
     chatStream(options: Parameters<typeof streamText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
 }
-export {};

package/dist/agent/AgentModelProvider.js

@@ -42,8 +42,8 @@ export class AgentModelProvider {
         this.mcpTools = [];
         /**  需要实时过滤掉的tools name*/
         this.ignoreToolnames = [];
-        /** 在 chat 之前，自动更新 所有的tools */
-        this.autoUpdateTools = true;
+        /** 缓存 ai-sdk response 中的 多轮会话 */
+        this.messages = [];
         // 1、保存 mcpServer
         this.mcpServers = mcpServers || [];
         // 2、保存 llm
@@ -83,7 +83,7 @@ export class AgentModelProvider {
             }
             catch (error) {
                 if (this.onError) {
-                    this.onError(`Failed to create MCP client`, error);
+                    this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to create MCP client`, error);
                 }
                 console.error(`Failed to create MCP client`, serverConfig, error);
                 return null;
@@ -109,7 +109,7 @@ export class AgentModelProvider {
                 }
                 catch (error) {
                     if (this.onError) {
-                        this.onError(`Failed to query tools`, error);
+                        this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to query tools`, error);
                     }
                     console.error(`Failed to query tools`, error);
                     return null;
@@ -122,9 +122,14 @@ 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 {
-                    client.close();
+                    yield (client === null || client === void 0 ? void 0 : client.close());
+                }
+                catch (error) {
+                    if (this.onError) {
+                        this.onError((error === null || error === void 0 ? void 0 : error.message) || `Failed to close client`, error);
+                    }
+                    console.error(`Failed to close client`, error);
                 }
-                catch (error) { }
             })));
         });
     }
@@ -178,7 +183,7 @@ export class AgentModelProvider {
         }
     }
     /** 创建临时允许调用的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) => {
@@ -188,18 +193,25 @@ export class AgentModelProvider {
     }
     _chat(chatMethod, _a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _b;
+            var _b, _c;
             var { model, maxSteps = 5 } = _a, options = __rest(_a, ["model", "maxSteps"]);
             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);
-            }
-            return chatMethod(Object.assign(Object.assign({ 
+            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];
+            }
+            const result = chatMethod(chatOptions);
+            (_c = result === null || result === void 0 ? void 0 : result.response) === null || _c === void 0 ? void 0 : _c.then((res) => {
+                this.messages.push(...res.messages);
+            });
+            return result;
         });
     }
     chat(options) {

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 || DEFAULT_REMOTE_URL) + this.sessionPrefix + this.options.sessionId);
   }
   // 实现复制到剪贴板功能
   async copyToClipboard(text2) {
@@ -42810,7 +42813,7 @@ class AgentModelProvider {
     this.mcpClients = [];
     this.mcpTools = [];
     this.ignoreToolnames = [];
-    this.autoUpdateTools = true;
+    this.messages = [];
     this.mcpServers = mcpServers || [];
     if (llm) {
       this.llm = llm;
@@ -42841,7 +42844,7 @@ class AgentModelProvider {
       return await createMCPClient({ transport });
     } catch (error2) {
       if (this.onError) {
-        this.onError(`Failed to create MCP client`, error2);
+        this.onError((error2 == null ? void 0 : error2.message) || `Failed to create MCP client`, error2);
       }
       console.error(`Failed to create MCP client`, serverConfig, error2);
       return null;
@@ -42864,7 +42867,7 @@ class AgentModelProvider {
           return client ? await ((_a16 = client == null ? void 0 : client.tools) == null ? void 0 : _a16.call(client)) : null;
         } catch (error2) {
           if (this.onError) {
-            this.onError(`Failed to query tools`, error2);
+            this.onError((error2 == null ? void 0 : error2.message) || `Failed to query tools`, error2);
           }
           console.error(`Failed to query tools`, error2);
           return null;
@@ -42877,8 +42880,12 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          client.close();
+          await (client == null ? void 0 : client.close());
         } catch (error2) {
+          if (this.onError) {
+            this.onError((error2 == null ? void 0 : error2.message) || `Failed to close client`, error2);
+          }
+          console.error(`Failed to close client`, error2);
         }
       })
     );
@@ -42923,7 +42930,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) => {
@@ -42932,21 +42939,28 @@ class AgentModelProvider {
     return toolsResult;
   }
   async _chat(chatMethod, { model, maxSteps = 5, ...options }) {
-    var _a16;
+    var _a16, _b8;
     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);
-    }
-    return chatMethod({
+    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 });
+      chatOptions.messages = [...this.messages];
+    }
+    const result = chatMethod(chatOptions);
+    (_b8 = result == null ? void 0 : result.response) == null ? void 0 : _b8.then((res) => {
+      this.messages.push(...res.messages);
     });
+    return result;
   }
   async chat(options) {
     return this._chat(generateText, options);