@opentiny/next-sdk 0.1.6 → 0.1.7

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'
@@ -39,6 +39,8 @@ export class AgentModelProvider {
   /** 内部报错时，抛出错误事件 */
   onError: ((msg: string, err?: any) => void) | undefined
 
+  messages: any[] = []
+
   constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption) {
     // 1、保存 mcpServer
     this.mcpServers = mcpServers || []
@@ -75,9 +77,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 +100,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 +115,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)
+        }
       })
     )
   }
@@ -181,7 +188,7 @@ export class AgentModelProvider {
 
   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')
@@ -192,20 +199,33 @@ export class AgentModelProvider {
       this.onUpdatedTools?.()
     }
 
-    return chatMethod({
+    const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(model),
       stopWhen: stepCountIs(maxSteps),
       ...options,
       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)
+
+    ;(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

@@ -30,6 +30,7 @@ export declare class AgentModelProvider {
     onUpdatedTools: (() => void) | undefined;
     /** 内部报错时，抛出错误事件 */
     onError: ((msg: string, err?: any) => void) | undefined;
+    messages: any[];
     constructor({ llmConfig, mcpServers, llm }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 Null */
     private _createOneClient;
@@ -48,12 +49,15 @@ export declare class AgentModelProvider {
     tempMergeTools(extraTool?: {}): Record<string, any>;
     _chat(chatMethod: ChatMethodFn, { model, maxSteps, ...options }: Parameters<typeof generateText>[0] & {
         maxSteps?: number;
+        message?: string;
     }): Promise<any>;
     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

@@ -44,6 +44,7 @@ export class AgentModelProvider {
         this.ignoreToolnames = [];
         /** 在 chat 之前，自动更新 所有的tools */
         this.autoUpdateTools = true;
+        this.messages = [];
         // 1、保存 mcpServer
         this.mcpServers = mcpServers || [];
         // 2、保存 llm
@@ -83,7 +84,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 +110,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 +123,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.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) { }
             })));
         });
     }
@@ -188,7 +194,7 @@ 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');
@@ -197,9 +203,18 @@ export class AgentModelProvider {
                 yield this._createMpcTools();
                 (_b = this.onUpdatedTools) === null || _b === void 0 ? void 0 : _b.call(this);
             }
-            return chatMethod(Object.assign(Object.assign({ 
+            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

@@ -42811,6 +42811,7 @@ class AgentModelProvider {
     this.mcpTools = [];
     this.ignoreToolnames = [];
     this.autoUpdateTools = true;
+    this.messages = [];
     this.mcpServers = mcpServers || [];
     if (llm) {
       this.llm = llm;
@@ -42841,7 +42842,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 +42865,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 +42878,12 @@ class AgentModelProvider {
     await Promise.all(
       this.mcpClients.map(async (client) => {
         try {
-          client.close();
+          await 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);
         }
       })
     );
@@ -42932,7 +42937,7 @@ 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");
     }
@@ -42940,13 +42945,22 @@ class AgentModelProvider {
       await this._createMpcTools();
       (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
     }
-    return chatMethod({
+    const chatOptions = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       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);
+    (_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);

package/dist/index.es.js

@@ -31735,7 +31735,7 @@ const E3 = {
 };
 class oD {
   constructor({ llmConfig: e, mcpServers: r, llm: a }) {
-    if (this.mcpServers = [], this.mcpClients = [], this.mcpTools = [], this.ignoreToolnames = [], this.autoUpdateTools = !0, this.mcpServers = r || [], a)
+    if (this.mcpServers = [], this.mcpClients = [], this.mcpTools = [], this.ignoreToolnames = [], this.autoUpdateTools = !0, this.messages = [], this.mcpServers = r || [], a)
       this.llm = a;
     else if (e) {
       let n;
@@ -31752,7 +31752,7 @@ class oD {
       let r;
       return "type" in e && e.type.toLocaleLowerCase() === "streamablehttp" ? r = new $a(new URL(e.url)) : r = e, await jM({ transport: r });
     } catch (r) {
-      return this.onError && this.onError("Failed to create MCP client", r), console.error("Failed to create MCP client", e, r), null;
+      return this.onError && this.onError((r == null ? void 0 : r.message) || "Failed to create MCP client", r), console.error("Failed to create MCP client", e, r), null;
     }
   }
   /** 创建 ai-sdk的 mcpClient, 失败则保存为null */
@@ -31769,7 +31769,7 @@ class oD {
         try {
           return e ? await ((r = e == null ? void 0 : e.tools) == null ? void 0 : r.call(e)) : null;
         } catch (a) {
-          return this.onError && this.onError("Failed to query tools", a), console.error("Failed to query tools", a), null;
+          return this.onError && this.onError((a == null ? void 0 : a.message) || "Failed to query tools", a), console.error("Failed to query tools", a), null;
         }
       })
     );
@@ -31779,8 +31779,9 @@ class oD {
     await Promise.all(
       this.mcpClients.map(async (e) => {
         try {
-          e.close();
-        } catch {
+          await e.close();
+        } catch (r) {
+          this.onError && this.onError((r == null ? void 0 : r.message) || "Failed to close client", r), console.error("Failed to close client", r);
         }
       })
     );
@@ -31823,16 +31824,22 @@ class oD {
     }), r;
   }
   async _chat(e, { model: r, maxSteps: a = 5, ...n }) {
-    var s;
+    var i, l;
     if (!this.llm)
       throw new Error("LLM is not initialized");
-    return this.autoUpdateTools && (await this._createMpcTools(), (s = this.onUpdatedTools) == null || s.call(this)), e({
+    this.autoUpdateTools && (await this._createMpcTools(), (i = this.onUpdatedTools) == null || i.call(this));
+    const s = {
       // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
       model: this.llm(r),
       stopWhen: Gd(a),
       ...n,
       tools: this.tempMergeTools(n.tools)
-    });
+    };
+    n.message && !n.messages && (this.messages.push({ role: "user", content: n.message }), s.messages = [...this.messages]);
+    const o = e(s);
+    return (l = o == null ? void 0 : o.response) == null || l.then((c) => {
+      this.messages.push(...c.messages);
+    }), o;
   }
   async chat(e) {
     return this._chat(U4, e);

package/dist/index.umd.dev.js

@@ -43205,6 +43205,7 @@ ${user}:`]
       this.mcpTools = [];
       this.ignoreToolnames = [];
       this.autoUpdateTools = true;
+      this.messages = [];
       this.mcpServers = mcpServers || [];
       if (llm) {
         this.llm = llm;
@@ -43235,7 +43236,7 @@ ${user}:`]
         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;
@@ -43258,7 +43259,7 @@ ${user}:`]
             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;
@@ -43271,8 +43272,12 @@ ${user}:`]
       await Promise.all(
         this.mcpClients.map(async (client) => {
           try {
-            client.close();
+            await 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);
           }
         })
       );
@@ -43326,7 +43331,7 @@ ${user}:`]
       return toolsResult;
     }
     async _chat(chatMethod, { model, maxSteps = 5, ...options }) {
-      var _a16;
+      var _a16, _b8;
       if (!this.llm) {
         throw new Error("LLM is not initialized");
       }
@@ -43334,13 +43339,22 @@ ${user}:`]
         await this._createMpcTools();
         (_a16 = this.onUpdatedTools) == null ? void 0 : _a16.call(this);
       }
-      return chatMethod({
+      const chatOptions = {
         // @ts-ignore  ProviderV2 是所有llm的父类， 在每一个具体的llm 类都有一个选择model的函数用法
         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);
+      (_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);