@opentiny/next-sdk 0.2.1 → 0.2.3

package/agent/AgentModelProvider.ts

@@ -44,12 +44,18 @@ export class AgentModelProvider {
   onUpdatedTools: (() => void) | undefined
   /** Agent 内部报错时，抛出的错误事件 */
   onError: ((msg: string, err?: any) => void) | undefined
-  /** MCP Client 断开连接时的回调 */
-  onClientDisconnected?: (serverName: string, reason?: string) => void
   /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
-  messages: any[] = []
+  responseMessages: any[] = []
   /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用） */
   useReActMode: boolean = false
+  /** 流结束后，返回token细节的事件 */
+  onUsage?: (usage: {
+    cachedInputTokens: number
+    inputTokens: number
+    reasoningTokens: number
+    outputTokens: number
+    totalTokens: number
+  }) => void
 
   constructor({ llmConfig, mcpServers }: IAgentModelProviderOption) {
     if (!llmConfig) {
@@ -362,7 +368,7 @@ export class AgentModelProvider {
     } else if (options.messages) {
       currentMessages = [...options.messages]
     } else {
-      currentMessages = [...this.messages]
+      currentMessages = [...this.responseMessages]
     }
 
     // 确保 model 是字符串类型（ReAct 模式下 model 应该是模型名称字符串）
@@ -436,7 +442,7 @@ export class AgentModelProvider {
   }
 
   /**
-   * 构建用于模型调用的消息列表（magentic-ui 风格）
+   * 构建用于模型调用的消息列表
    * 策略：保留所有文本消息，仅限制图片数量（类似 magentic-ui 的 maybe_remove_old_screenshots）
    *
    * @param systemMessage 系统提示词
@@ -502,17 +508,16 @@ export class AgentModelProvider {
     const allUserMessages = systemMessage ? messages.slice(1) : messages
 
     let stepCount = 0
-    // 配置：最多保留的图片数量（默认3张，类似 magentic-ui）
+    // 配置：最多保留的图片数量
     const maxImages = (options as any).maxImages ?? 3
 
     while (stepCount < maxSteps) {
       stepCount++
 
-      // 构建用于模型调用的消息列表（magentic-ui 风格：保留所有文本，限制图片）
+      // 构建用于模型调用的消息列表
       const messagesForModel = this._buildMessagesForModel(systemMessage, allUserMessages, maxImages)
 
       // 调用 LLM（ReAct 模式下不传递 tools，因为工具调用通过提示词实现）
-      // 参考 magentic-ui：保留所有文本历史（上下文完整），仅限制图片数量（优化 token）
       const { tools: _, ...restOptions } = options
       const result = await generateText({
         // @ts-ignore ProviderV2 是所有llm的父类，在每一个具体的llm类都有一个选择model的函数用法
@@ -532,7 +537,7 @@ export class AgentModelProvider {
 
       if (!action) {
         // 没有工具调用，返回最终结果
-        this.messages = fullMessageHistory
+        this.responseMessages = fullMessageHistory
         return {
           text: assistantMessage,
           response: { messages: fullMessageHistory }
@@ -556,7 +561,7 @@ export class AgentModelProvider {
     }
 
     // 达到最大步数，返回最后一条消息
-    this.messages = fullMessageHistory
+    this.responseMessages = fullMessageHistory
     const lastMessage = fullMessageHistory[fullMessageHistory.length - 2]?.content || ''
     return {
       text: lastMessage,
@@ -591,14 +596,14 @@ export class AgentModelProvider {
 
         let stepCount = 0
         let accumulatedText = ''
-        // 配置：最多保留的图片数量（默认3张，类似 magentic-ui）
+        // 配置：最多保留的图片数量
         const maxImages = (options as any).maxImages ?? 3
 
         try {
           while (stepCount < maxSteps) {
             stepCount++
 
-            // 构建用于模型调用的消息列表（magentic-ui 风格：保留所有文本，限制图片）
+            // 构建用于模型调用的消息列表
             const messagesForModel = self._buildMessagesForModel(systemMessage, allUserMessages, maxImages)
 
             // 移除 tools 选项，ReAct 模式下不传递 tools
@@ -646,7 +651,7 @@ export class AgentModelProvider {
               // 没有工具调用，结束流
               controller.enqueue({ type: 'text-end' })
               controller.close()
-              self.messages = fullMessageHistory
+              self.responseMessages = fullMessageHistory
               // 触发 onFinish 回调
               streamCompleteResolver({ messages: fullMessageHistory })
               return
@@ -657,7 +662,7 @@ export class AgentModelProvider {
               // 视为对话结束
               controller.enqueue({ type: 'text-end' })
               controller.close()
-              self.messages = fullMessageHistory
+              self.responseMessages = fullMessageHistory
               streamCompleteResolver({ messages: fullMessageHistory })
               return
             }
@@ -753,7 +758,7 @@ export class AgentModelProvider {
           // 达到最大步数
           controller.enqueue({ type: 'text-end' })
           controller.close()
-          self.messages = fullMessageHistory
+          self.responseMessages = fullMessageHistory
           // 触发 onFinish 回调
           streamCompleteResolver({ messages: fullMessageHistory })
         } catch (error: any) {
@@ -795,16 +800,39 @@ export class AgentModelProvider {
       tools: this._tempMergeTools(options.tools) as ToolSet
     }
 
+    // 保存最后一条 user 消息，用于后续缓存
+    let lastUserMessage: any = null
+
     if (options.message && !options.messages) {
-      this.messages.push({ role: 'user', content: options.message })
-      chatOptions.messages = [...this.messages]
+      // 使用 options.message 创建 user 消息
+      lastUserMessage = { role: 'user', content: options.message }
+      this.responseMessages.push(lastUserMessage)
+      chatOptions.messages = [...this.responseMessages]
+    } else if (options.messages && options.messages.length > 0) {
+      // 从 options.messages 中获取最后一条 user 消息
+      const lastMessage = options.messages[options.messages.length - 1]
+      if (lastMessage.role === 'user') {
+        lastUserMessage = lastMessage
+      }
     }
 
     const result = chatMethod(chatOptions)
 
-    // 缓存 ai-sdk的多轮对话的消息
+    // 缓存 ai-sdk 的多轮对话的消息
     ;(result as StreamTextResult<ToolSet, unknown>)?.response?.then((res: any) => {
-      this.messages.push(...res.messages)
+      // 检查 res.messages 的第一条消息是否是 user 消息
+      // 如果不是，且有 lastUserMessage，则先添加 lastUserMessage
+      const firstMessage = res.messages?.[0]
+      if (lastUserMessage && firstMessage?.role !== 'user') {
+        this.responseMessages.push(lastUserMessage)
+      }
+      // 然后添加 AI 返回的消息
+      this.responseMessages.push(...res.messages)
+    })
+
+    // 读取使用量
+    result?.usage?.then((usage: any) => {
+      this.onUsage?.(usage)
     })
 
     return result

package/dist/agent/AgentModelProvider.d.ts

@@ -28,12 +28,18 @@ export declare class AgentModelProvider {
     onUpdatedTools: (() => void) | undefined;
     /** Agent 内部报错时，抛出的错误事件 */
     onError: ((msg: string, err?: any) => void) | undefined;
-    /** MCP Client 断开连接时的回调 */
-    onClientDisconnected?: (serverName: string, reason?: string) => void;
     /** 缓存 ai-sdk response 中的 多轮会话的上下文 */
-    messages: any[];
+    responseMessages: any[];
     /** 是否使用 ReAct 模式（通过提示词而非 function calling 进行工具调用） */
     useReActMode: boolean;
+    /** 流结束后，返回token细节的事件 */
+    onUsage?: (usage: {
+        cachedInputTokens: number;
+        inputTokens: number;
+        reasoningTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+    }) => void;
     constructor({ llmConfig, mcpServers }: IAgentModelProviderOption);
     /** 创建一个 ai-sdk的 mcpClient, 创建失败则返回 null */
     private _createOneClient;
@@ -76,7 +82,7 @@ export declare class AgentModelProvider {
      */
     private _removeImageFromMessage;
     /**
-     * 构建用于模型调用的消息列表（magentic-ui 风格）
+     * 构建用于模型调用的消息列表
      * 策略：保留所有文本消息，仅限制图片数量（类似 magentic-ui 的 maybe_remove_old_screenshots）
      *
      * @param systemMessage 系统提示词

package/dist/index.es.dev.js

@@ -19171,7 +19171,9 @@ class Client extends Protocol {
           }
           return taskValidationResult.data;
         }
-        const validationResult = safeParse(CreateMessageResultSchema, result);
+        const hasTools = params.tools || params.toolChoice;
+        const resultSchema = hasTools ? CreateMessageResultWithToolsSchema : CreateMessageResultSchema;
+        const validationResult = safeParse(resultSchema, result);
         if (!validationResult.success) {
           const errorMessage = validationResult.error instanceof Error ? validationResult.error.message : String(validationResult.error);
           throw new McpError(ErrorCode.InvalidParams, `Invalid sampling result: ${errorMessage}`);
@@ -26969,6 +26971,7 @@ const qrCode = "data:image/svg+xml,%3csvg%20viewBox='0%200%2040%2040'%20xmlns='h
 const iconCopy = "data:image/svg+xml,%3csvg%20viewBox='0%200%2012%2012'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='12.000000'%20height='12.000000'%20fill='none'%3e%3cdefs%3e%3cfilter%20id='pixso_custom_mask_type_luminance'%3e%3cfeColorMatrix%20type='matrix'%20values='1%200%200%200%200%200%201%200%200%200%200%200%201%200%200%200%200%200%201%200%20'%20/%3e%3c/filter%3e%3c/defs%3e%3cmask%20id='mask_0'%20width='11.999876'%20height='11.999876'%20x='0.000000'%20y='0.000000'%20maskUnits='userSpaceOnUse'%3e%3cg%20filter='url(%23pixso_custom_mask_type_luminance)'%3e%3cg%20id='mask401_19830'%3e%3cpath%20id='蒙版'%20d='M0%200L11.9999%200L11.9999%2011.9999L0%2011.9999L0%200ZM2.69992%201.34999L8.09977%201.34999C9.5082%201.34999%2010.6498%202.49167%2010.6498%203.89998L10.6498%209.2999C10.6498%2010.7082%209.5082%2011.8499%208.09977%2011.8499L2.69992%2011.8499C1.29149%2011.8499%200.149901%2010.7082%200.149901%209.2999L0.149901%203.89998C0.149901%202.49167%201.29149%201.34999%202.69992%201.34999Z'%20fill='rgb(196,196,196)'%20fill-rule='evenodd'%20/%3e%3c/g%3e%3c/g%3e%3c/mask%3e%3crect%20id='ic_public_copy'%20width='12.000000'%20height='12.000000'%20x='0.000000'%20y='0.000000'%20/%3e%3crect%20id='ic_public_copy-复制/base/ic_public_copy'%20width='11.999876'%20height='11.999876'%20x='0.000000'%20y='0.000000'%20fill='rgb(255,255,255)'%20fill-opacity='0'%20/%3e%3cpath%20id='path1'%20d='M0.000134537%205.99497C0.000134537%205.05748%20-0.00236544%204.11999%200.000134537%203.1825C-0.00236544%202.72751%200.055134%202.27501%200.165133%201.83752C0.41263%200.907526%201.01762%200.355032%201.94761%200.140034C2.41261%200.040035%202.8901%20-0.00746449%203.3651%203.54269e-05C5.16258%203.54269e-05%206.96006%203.54269e-05%208.76004%203.54269e-05C9.21254%20-0.00246455%209.66503%200.0475349%2010.1075%200.155034C11.065%200.387531%2011.64%200.995025%2011.8575%201.95002C11.9575%202.40001%2012.005%202.86001%2011.9975%203.3225C11.9975%205.13998%2011.9975%206.95746%2011.9975%208.77244C12%209.22244%2011.95%209.67243%2011.845%2010.1099C11.61%2011.0674%2011%2011.6374%2010.0475%2011.8574C9.58003%2011.9574%209.10504%2012.0049%208.62754%2011.9974C6.83756%2011.9974%205.04758%2011.9974%203.2576%2011.9974C2.80011%2012.0024%202.34511%2011.9499%201.90011%2011.8449C0.937625%2011.6124%200.360131%2011.0024%200.142633%2010.0424C0.0301342%209.55494%200.000134537%209.06744%200.000134537%208.57495C0.000134537%207.71495%200.000134537%206.85496%200.000134537%205.99497Z'%20fill='rgb(255,255,255)'%20fill-opacity='0'%20fill-rule='evenodd'%20/%3e%3ccircle%20id='path2'%20cx='5.99993801'%20cy='5.99993801'%20r='5.99993801'%20fill='rgb(255,255,255)'%20fill-opacity='0'%20/%3e%3cg%20id='mask'%20mask='url(%23mask_0)'%3e%3cg%20id='组合%208'%3e%3cpath%20id='path'%20d='M11.1%203.89993L11.1%206.8999C11.1%208.55488%209.75502%209.89737%208.10004%209.89737L5.10007%209.89737C3.44258%209.89737%202.1001%208.55488%202.1001%206.8999L2.1001%203.89993C2.1001%202.24245%203.44258%200.897461%205.10007%200.897461L8.10004%200.897461C9.75502%200.897461%2011.1%202.24245%2011.1%203.89993Z'%20fill-rule='nonzero'%20stroke='rgb(25,25,25)'%20stroke-linejoin='round'%20stroke-width='0.749992251'%20/%3e%3c/g%3e%3c/g%3e%3cpath%20id='path4'%20d='M2.10008%202.39746L8.10002%202.39746C8.92751%202.39746%209.6%203.06995%209.6%203.89995L9.6%209.89738C9.6%2010.7274%208.92751%2011.3999%208.10002%2011.3999L2.10008%2011.3999C1.27009%2011.3999%200.600098%2010.7274%200.600098%209.89738L0.600098%203.89995C0.600098%203.06995%201.27009%202.39746%202.10008%202.39746Z'%20fill='rgb(255,255,255)'%20fill-opacity='0'%20fill-rule='evenodd'%20/%3e%3cpath%20id='path4'%20d='M9.6%203.89995L9.6%209.89738C9.6%2010.7274%208.92751%2011.3999%208.10002%2011.3999L2.10008%2011.3999C1.27009%2011.3999%200.600098%2010.7274%200.600098%209.89738L0.600098%203.89995C0.600098%203.06995%201.27009%202.39746%202.10008%202.39746L8.10002%202.39746C8.92751%202.39746%209.6%203.06995%209.6%203.89995Z'%20fill-rule='nonzero'%20stroke='rgb(25,25,25)'%20stroke-linejoin='round'%20stroke-width='0.749992251'%20/%3e%3c/svg%3e";
 const DEFAULT_REMOTE_URL = "https://agent.opentiny.design/tiny-robot";
 const DEFAULT_QR_CODE_URL = "https://ai.opentiny.design/next-remoter";
+const DEFAULT_LOGO_URL = "https://ai.opentiny.design/next-remoter/svgs/logo-next-no-bg-left.svg";
 const getDefaultMenuItems = (options) => {
   return [
     {
@@ -27009,6 +27012,7 @@ const getDefaultMenuItems = (options) => {
 class FloatingBlock {
   constructor(options) {
     this.isExpanded = false;
+    this.closingTimer = 0;
     this.getImageUrl = (asset) => {
       if (!asset) return;
       const img = new Image();
@@ -27016,15 +27020,13 @@ class FloatingBlock {
       return img;
     };
     this.renderItem = () => {
-      this.menuItems.filter((item) => item.show !== false).map(
-        (item) => {
-          const wrapper = document.getElementById(`tiny-remoter-icon-item-${item.action}`);
-          if (!wrapper) return;
-          wrapper.innerHTML = "";
-          const img = this.getImageUrl(item.icon);
-          if (img) wrapper.appendChild(img);
-        }
-      );
+      this.menuItems.filter((item) => item.show !== false).map((item) => {
+        const wrapper = document.getElementById(`tiny-remoter-icon-item-${item.action}`);
+        if (!wrapper) return;
+        wrapper.innerHTML = "";
+        const img = this.getImageUrl(item.icon);
+        if (img) wrapper.appendChild(img);
+      });
     };
     this.readyTips = (el) => {
       const element = document.getElementById(el);
@@ -27043,9 +27045,14 @@ class FloatingBlock {
     this.options = {
       ...options,
       qrCodeUrl: options.qrCodeUrl || DEFAULT_QR_CODE_URL,
-      remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL
+      remoteUrl: options.remoteUrl || DEFAULT_REMOTE_URL,
+      logoUrl: options.logoUrl || DEFAULT_LOGO_URL
     };
-    this.menuItems = this.mergeMenuItems(options.menuItems);
+    if (options.menuItems && options.menuItems.length === 0) {
+      this.menuItems = [];
+    } else {
+      this.menuItems = this.mergeMenuItems(options.menuItems);
+    }
     this.init();
   }
   // 计算 sessionPrefix 属性
@@ -27086,7 +27093,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="${DEFAULT_QR_CODE_URL}/svgs/logo-next-no-bg-left.svg" alt="icon" />
+        <img style="display: block; width: 56px;" src="${this.options.logoUrl}" alt="icon" />
       </div>
     `;
     document.body.appendChild(this.floatingBlock);
@@ -27124,7 +27131,26 @@ class FloatingBlock {
   }
   bindEvents() {
     this.floatingBlock.addEventListener("click", () => {
-      this.toggleDropdown();
+      this.showAIChat();
+    });
+    this.floatingBlock.addEventListener("mouseenter", () => {
+      this.openDropdown();
+      if (this.closingTimer) {
+        window.clearTimeout(this.closingTimer);
+        this.closingTimer = 0;
+      }
+    });
+    this.floatingBlock.addEventListener("mouseleave", () => {
+      this.shouldCloseDropdown();
+    });
+    this.dropdownMenu.addEventListener("mouseenter", (e) => {
+      if (this.closingTimer) {
+        window.clearTimeout(this.closingTimer);
+        this.closingTimer = 0;
+      }
+    });
+    this.dropdownMenu.addEventListener("mouseleave", (e) => {
+      this.shouldCloseDropdown();
     });
     this.dropdownMenu.addEventListener("click", (e) => {
       const target = e.target;
@@ -27155,18 +27181,20 @@ class FloatingBlock {
       }
     });
   }
-  toggleDropdown() {
-    if (this.isExpanded) {
-      this.closeDropdown();
-    } else {
-      this.openDropdown();
-    }
-  }
   openDropdown() {
+    if (!this.menuItems || this.menuItems && this.menuItems.length === 0) {
+      return;
+    }
     this.isExpanded = true;
     this.floatingBlock.classList.add("expanded");
     this.dropdownMenu.classList.add("show");
   }
+  shouldCloseDropdown() {
+    this.closingTimer = window.setTimeout(() => {
+      this.closeDropdown();
+    }, 300);
+  }
+  /** 真正的立即关闭 */
   closeDropdown() {
     this.isExpanded = false;
     this.floatingBlock.classList.remove("expanded");
@@ -46144,7 +46172,7 @@ class AgentModelProvider {
     this.mcpClients = {};
     this.mcpTools = {};
     this.ignoreToolnames = [];
-    this.messages = [];
+    this.responseMessages = [];
     this.useReActMode = false;
     if (!llmConfig) {
       throw new Error("llmConfig is required to initialize AgentModelProvider");
@@ -46386,7 +46414,7 @@ ${toolsPrompt}`;
     } else if (options.messages) {
       currentMessages = [...options.messages];
     } else {
-      currentMessages = [...this.messages];
+      currentMessages = [...this.responseMessages];
     }
     const modelName = typeof model === "string" ? model : model?.modelId || "default-model";
     const systemPrompt = this._generateReActSystemPrompt(allTools, modelName, options.system);
@@ -46433,7 +46461,7 @@ ${toolsPrompt}`;
     };
   }
   /**
-   * 构建用于模型调用的消息列表（magentic-ui 风格）
+   * 构建用于模型调用的消息列表
    * 策略：保留所有文本消息，仅限制图片数量（类似 magentic-ui 的 maybe_remove_old_screenshots）
    *
    * @param systemMessage 系统提示词
@@ -46491,7 +46519,7 @@ ${toolsPrompt}`;
       fullMessageHistory.push(assistantMsg);
       const action = parseReActAction(assistantMessage, tools);
       if (!action) {
-        this.messages = fullMessageHistory;
+        this.responseMessages = fullMessageHistory;
         return {
           text: assistantMessage,
           response: { messages: fullMessageHistory }
@@ -46509,7 +46537,7 @@ ${resultString}
       allUserMessages.push(observationMessage);
       fullMessageHistory.push(observationMessage);
     }
-    this.messages = fullMessageHistory;
+    this.responseMessages = fullMessageHistory;
     const lastMessage = fullMessageHistory[fullMessageHistory.length - 2]?.content || "";
     return {
       text: lastMessage,
@@ -46569,14 +46597,14 @@ ${resultString}
             if (!action) {
               controller.enqueue({ type: "text-end" });
               controller.close();
-              self2.messages = fullMessageHistory;
+              self2.responseMessages = fullMessageHistory;
               streamCompleteResolver({ messages: fullMessageHistory });
               return;
             }
             if (action.toolName === "computer" && action.arguments?.action === "terminate") {
               controller.enqueue({ type: "text-end" });
               controller.close();
-              self2.messages = fullMessageHistory;
+              self2.responseMessages = fullMessageHistory;
               streamCompleteResolver({ messages: fullMessageHistory });
               return;
             }
@@ -46638,7 +46666,7 @@ ${observationText}
           }
           controller.enqueue({ type: "text-end" });
           controller.close();
-          self2.messages = fullMessageHistory;
+          self2.responseMessages = fullMessageHistory;
           streamCompleteResolver({ messages: fullMessageHistory });
         } catch (error) {
           controller.error(error);
@@ -46666,13 +46694,27 @@ ${observationText}
       ...options,
       tools: this._tempMergeTools(options.tools)
     };
+    let lastUserMessage = null;
     if (options.message && !options.messages) {
-      this.messages.push({ role: "user", content: options.message });
-      chatOptions.messages = [...this.messages];
+      lastUserMessage = { role: "user", content: options.message };
+      this.responseMessages.push(lastUserMessage);
+      chatOptions.messages = [...this.responseMessages];
+    } else if (options.messages && options.messages.length > 0) {
+      const lastMessage = options.messages[options.messages.length - 1];
+      if (lastMessage.role === "user") {
+        lastUserMessage = lastMessage;
+      }
     }
     const result = chatMethod(chatOptions);
     result?.response?.then((res) => {
-      this.messages.push(...res.messages);
+      const firstMessage = res.messages?.[0];
+      if (lastUserMessage && firstMessage?.role !== "user") {
+        this.responseMessages.push(lastUserMessage);
+      }
+      this.responseMessages.push(...res.messages);
+    });
+    result?.usage?.then((usage) => {
+      this.onUsage?.(usage);
     });
     return result;
   }