myagent-ai 1.27.7 → 1.28.0

package/agents/main_agent.py

@@ -728,6 +728,10 @@ class MainAgent(BaseAgent):
         # XML 解析失败时的 LLM 修正重试计数
         _xml_correction_retries: int = 0
 
+        # [v1.28] 优先使用调用方传入的 agent_db_id（来自 _stream_process_message）
+        # 确保 V2 路径保存会话记忆时使用正确的 agent_id（与 session 列表查询一致）
+        _effective_agent_id = context.metadata.get("agent_db_id", self.agent_id)
+
         # [v1.26.9] 统一历史对话处理算法 - 确保流式和非流式输出使用相同的逻辑
         conversation_history = self._build_conversation_history(context, task_id)
 
@@ -745,7 +749,7 @@ class MainAgent(BaseAgent):
                 _attachment_meta["images"] = context.metadata["user_image_files"]
             if context.metadata.get("user_file_files"):
                 _attachment_meta["files"] = context.metadata["user_file_files"]
-            self.memory.add_session(agent_id=self.agent_id, 
+            self.memory.add_session(agent_id=_effective_agent_id, 
                 session_id=context.session_id,
                 role="user",
                 content=context.user_message,
@@ -869,7 +873,7 @@ class MainAgent(BaseAgent):
                 for _msg in messages:
                     _input_parts.append(f"=== {_msg.role.upper()} ===\n{_msg.get_text_content()}")
                 _llm_input_text = "\n\n".join(_input_parts)
-                self.memory.add_session(agent_id=self.agent_id, 
+                self.memory.add_session(agent_id=_effective_agent_id, 
                     session_id=context.session_id,
                     role="system",
                     content=_llm_input_text,
@@ -896,7 +900,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = _censor_msg
                     await self._emit_v2_event("v2_reasoning", {"content": _censor_msg}, stream_callback)
                     if self.memory:
-                        self.memory.add_session(agent_id=self.agent_id, 
+                        self.memory.add_session(agent_id=_effective_agent_id, 
                             session_id=context.session_id,
                             role="assistant",
                             content=_censor_msg,
@@ -926,7 +930,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = _vision_skip_msg
                     await self._emit_v2_event("v2_reasoning", {"content": _vision_skip_msg}, stream_callback)
                     if self.memory:
-                        self.memory.add_session(agent_id=self.agent_id, 
+                        self.memory.add_session(agent_id=_effective_agent_id, 
                             session_id=context.session_id,
                             role="assistant",
                             content=_vision_skip_msg,
@@ -938,7 +942,7 @@ class MainAgent(BaseAgent):
                 context.working_memory["final_response"] = error_msg
                 await self._emit_v2_event("v2_reasoning", {"content": error_msg}, stream_callback)
                 if self.memory:
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="assistant",
                         content=error_msg,
@@ -950,7 +954,7 @@ class MainAgent(BaseAgent):
 
             # 保存 LLM 原始输出到会话记忆（用于回溯和审计，key=llm_output 不出现在对话历史中）
             if self.memory:
-                self.memory.add_session(agent_id=self.agent_id, 
+                self.memory.add_session(agent_id=_effective_agent_id, 
                     session_id=context.session_id,
                     role="assistant",
                     content=llm_raw,
@@ -959,7 +963,7 @@ class MainAgent(BaseAgent):
                 )
                 # 保存推理模型的思考过程（key=reasoning 供前端刷新后展示）
                 if response.reasoning and response.reasoning.strip():
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="assistant",
                         content=response.reasoning.strip(),
@@ -1049,7 +1053,7 @@ class MainAgent(BaseAgent):
                                     stream_callback,
                                 )
                                 if self.memory:
-                                    self.memory.add_session(agent_id=self.agent_id, 
+                                    self.memory.add_session(agent_id=_effective_agent_id, 
                                         session_id=context.session_id,
                                         role="assistant",
                                         content=_msg,
@@ -1115,7 +1119,7 @@ class MainAgent(BaseAgent):
                         "v2_reasoning", {"content": final_text}, stream_callback
                     )
                     if self.memory:
-                        self.memory.add_session(agent_id=self.agent_id, 
+                        self.memory.add_session(agent_id=_effective_agent_id, 
                             session_id=context.session_id,
                             role="assistant",
                             content=final_text,
@@ -1223,7 +1227,7 @@ class MainAgent(BaseAgent):
                                     f"(相似度>=0.80, 旧记忆ID={_session_dup.id})"
                                 )
                             else:
-                                self.memory.add_session(agent_id=self.agent_id, 
+                                self.memory.add_session(agent_id=_effective_agent_id, 
                                     session_id=context.session_id,
                                     key="conversation_insight",
                                     content=parsed.remember,
@@ -1303,7 +1307,7 @@ class MainAgent(BaseAgent):
                     stream_callback,
                 )
                 if self.memory:
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="assistant",
                         content=parsed.ask_user,
@@ -1314,29 +1318,32 @@ class MainAgent(BaseAgent):
             if not parsed.tools_to_call:
                 logger.info(f"[{task_id}] 无工具调用，任务完成")
                 if _v2_reasoning_collected:
-                    # [v1.24] 拆开每条消息独立发送，不再合并
-                    for _msg in _v2_reasoning_collected:
+                    # [v1.28] Step 5.5 已将所有 reasoning 文本 emit 给前端
+                    # 此处仅保存尚未持久化到 memory 的内容，不再重复 emit
+                    _new_items = _v2_reasoning_collected[_last_saved_len:]
+                    for _msg in _new_items:
                         if _msg.strip():
-                            await self._emit_v2_event("v2_reasoning", {"content": _msg}, stream_callback)
                             if self.memory:
-                                self.memory.add_session(agent_id=self.agent_id, 
+                                self.memory.add_session(agent_id=_effective_agent_id,
                                     session_id=context.session_id,
                                     role="assistant",
                                     content=_msg,
                                 )
-                    final_text = _v2_reasoning_collected[-1] if _v2_reasoning_collected else "已完成所有操作。"
+                    _last_saved_len = len(_v2_reasoning_collected)
+                    # reasoning 的最后一条作为最终文本（已在 Step 5.5 发送给前端）
+                    final_text = _v2_reasoning_collected[-1]
                 else:
                     before, after = extract_surrounding_text(llm_raw)
                     final_text = (before + "\n" + after).strip() if (before.strip() or after.strip()) else "已完成所有操作。"
                     context.working_memory["final_response"] = final_text
                     if not _emitted_reasoning_this_iter:
                         await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
-                    if self.memory:
-                        self.memory.add_session(agent_id=self.agent_id, 
-                            session_id=context.session_id,
-                            role="assistant",
-                            content=final_text,
-                        )
+                        if self.memory:
+                            self.memory.add_session(agent_id=_effective_agent_id,
+                                session_id=context.session_id,
+                                role="assistant",
+                                content=final_text,
+                            )
                 break
 
             # Step 11: 有工具调用 — 顺序执行所有工具
@@ -1561,7 +1568,7 @@ class MainAgent(BaseAgent):
                 if self.memory:
                     # 构建工具调用记录，包含 beforecalltext 作为标题
                     tool_call_title = before_call if before_call else f"调用工具: {tool_name}"
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="assistant",
                         content=f"{tool_call_title}\n调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
@@ -1570,7 +1577,7 @@ class MainAgent(BaseAgent):
                     )
                     # [v1.15.52] 保存完整的工具执行原始结果（不截断，原汁原味）
                     _raw_result_str = json.dumps(tool_result, ensure_ascii=False, indent=2) if tool_result else str(tool_result)
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="tool",
                         content=f"[{tool_name}] {_status}\n{truncate_str(output_str, 10000)}",
@@ -1578,7 +1585,7 @@ class MainAgent(BaseAgent):
                         importance=0.4,
                     )
                     # 额外保存原始完整 JSON（用于 Raw 查看器完整回溯）
-                    self.memory.add_session(agent_id=self.agent_id, 
+                    self.memory.add_session(agent_id=_effective_agent_id, 
                         session_id=context.session_id,
                         role="tool",
                         content=f"[{tool_name}] 原始结果 ({_status})\n{truncate_str(_raw_result_str, 45000)}",
@@ -1624,7 +1631,7 @@ class MainAgent(BaseAgent):
                 _new_items = _v2_reasoning_collected[_last_saved_len:]
                 for _msg in _new_items:
                     if _msg.strip():
-                        self.memory.add_session(agent_id=self.agent_id, 
+                        self.memory.add_session(agent_id=_effective_agent_id, 
                             session_id=context.session_id,
                             role="assistant",
                             content=_msg,
@@ -1664,7 +1671,7 @@ class MainAgent(BaseAgent):
                 # [v1.24] 拆开每条消息独立保存，不再合并
                 for _msg in _v2_reasoning_collected:
                     if _msg.strip():
-                        self.memory.add_session(agent_id=self.agent_id, 
+                        self.memory.add_session(agent_id=_effective_agent_id, 
                             session_id=context.session_id,
                             role="assistant",
                             content=_msg,
@@ -1674,7 +1681,7 @@ class MainAgent(BaseAgent):
         if _sent_files and self.memory:
             import json as _json_files
             try:
-                self.memory.add_session(agent_id=self.agent_id, 
+                self.memory.add_session(agent_id=_effective_agent_id, 
                     session_id=context.session_id,
                     role="assistant",
                     content="",  # 空内容，仅用于承载文件元数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.27.7",
+  "version": "1.28.0",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -5810,6 +5810,10 @@ window.addEventListener('beforeunload', function() {{
         context.metadata["chat_mode"] = chat_mode
         context.metadata["user_voice_text"] = voice_text  # 语音输入原始文本（用于 usersays_correct）
 
+        # [v1.28] 传入正确的 agent_db_id，确保 V2 路径保存会话时使用正确的 agent_id
+        if agent_path and self.core.memory:
+            context.metadata["agent_db_id"] = self.core.memory.get_agent_id(agent_path)
+
         # [v1.16.12→17] 处理用户图片附件 — 保存到磁盘 + data URI 传给 LLM Vision API
         if user_images:
             _processed_images = []
@@ -6055,7 +6059,8 @@ window.addEventListener('beforeunload', function() {{
                 recent = agent.memory.get_conversation(session_id, limit=3)
                 _has_assistant = any(e.role == "assistant" for e in recent)
                 if not _has_assistant and final_response and final_response.strip():
-                    agent.memory.add_session(agent_id=agent_id, 
+                    _fallback_agent_id = context.metadata.get("agent_db_id", 0)
+                    agent.memory.add_session(agent_id=_fallback_agent_id,
                         session_id=session_id, role="assistant", content=final_response,
                     )
 

package/web/ui/admin/admin-agents.js

@@ -416,7 +416,7 @@ async function loadAgentSessions(){
 }
 
 async function viewSessionMsgs(sid){
-  const msgs=await api(`/api/sessions/${encodeURIComponent(sid)}/messages?limit=100`);
+  const msgs=await api(`/api/session/messages?sid=${encodeURIComponent(sid)}&limit=100`);
   if(!Array.isArray(msgs)){$('sessionsContent').innerHTML='<div class="empty">加载失败</div>';return;}
   let html='<h4 style="margin-bottom:12px">会话消息 <span class="badge badge-blue">'+msgs.length+' 条</span></h4>';
   html+='<div style="max-height:500px;overflow-y:auto">';

package/web/ui/admin/admin-sessions.js

@@ -36,7 +36,7 @@ async function viewSession(sid){
 async function _loadSessionMessages(){
   const sid=window._viewSessionSid;if(!sid)return;
   const offset=window._viewSessionOffset||0;
-  const msgs=await api(`/api/sessions/${encodeURIComponent(sid)}/messages?limit=100&offset=${offset}`);
+  const msgs=await api(`/api/session/messages?sid=${encodeURIComponent(sid)}&limit=100&offset=${offset}`);
   if(!Array.isArray(msgs)){showToast('加载失败','danger');return}
   const hasMore=msgs.length>=100;
   let html='<h3 style="margin-bottom:12px">会话: '+escHtml(sid)+' <span class="badge badge-blue">'+msgs.length+' 条</span></h3>';
@@ -232,7 +232,7 @@ function _buildTimeNav(msgs){
   }
   nav.innerHTML=navHtml;
 }
-async function clearSession(sid){await api(`/api/sessions/${encodeURIComponent(sid)}`,{method:'DELETE'});renderSessions()}
+async function clearSession(sid){await api(`/api/session?sid=${encodeURIComponent(sid)}`,{method:'DELETE'});renderSessions()}
 // 切入会话: 打开聊天页面并自动加载指定会话
 // [v1.27.2] 使用 aid（数字 agent ID）+ s（编码 session ID），不再暴露明文 agent 名字
 function enterSession(sid,agentDbId){

package/web/ui/chat/chat_main.js

@@ -4986,7 +4986,7 @@ const SETUP_PROVIDERS = {
     desc: '免费，步跃/MiniMax/智谱等模型',
     base_url: 'https://api-inference.modelscope.cn/v1',
     model: 'stepfun-ai/Step-3.5-Flash',
-    key_required: false, key_label: 'API Key（可选，不填使用免费额度）'
+    key_required: false, key_label: 'API Key'
   },
   openai: {
     icon: '🌐', name: 'OpenAI / ChatGPT',
@@ -5161,7 +5161,7 @@ function renderSetupStep() {
          </div>`
       : `<div class="form-group">
            <label>${p.key_label}</label>
-           <input type="password" id="setupApiKey" placeholder="留空即可" autocomplete="off">
+           <input type="password" id="setupApiKey" placeholder="" autocomplete="off">
            <div class="form-hint">选填，某些模型需要</div>
          </div>`;
 

package/web/ui/chat/flow_engine.js

@@ -2893,7 +2893,7 @@ const StreamingRecovery = {
     
     loadSessionMessages: async function(sessionId, recovery = null) {
         try {
-            const response = await fetch(`/api/sessions/${sessionId}/messages`);
+            const response = await fetch(`/api/session/messages?sid=${encodeURIComponent(sessionId)}&limit=500`);
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}`);
             }