myagent-ai 1.15.67 → 1.15.73

package/README.md

@@ -124,17 +124,13 @@ curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install
 
 ### 快速升级
 
-> 已安装过 MyAgent 的环境下，重新安装最新版：
+> 已安装过 MyAgent 的环境下，一行命令更新到最新版：
 
 ```bash
-npm install -g myagent-ai@latest
-myagent-ai reinstall
+myagent-ai update
 ```
 
-或使用脚本重新安装：
-```bash
-curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash
-```
+该命令会自动完成：npm 升级全局包 → 重建虚拟环境 → 重装所有依赖。
 
 ---
 
@@ -190,6 +186,9 @@ export MYAGENT_ANTHROPIC_API_KEY="sk-ant-..."
 ### 2. 运行
 
 ```bash
+# 更新到最新版（推荐）
+myagent-ai update
+
 # Web 管理后台（推荐）
 myagent-ai web
 
@@ -201,6 +200,15 @@ myagent-ai tray
 
 # API 服务模式
 myagent-ai server
+
+# 安装/更新依赖
+myagent-ai install
+
+# 重装依赖（删除 venv 重建）
+myagent-ai reinstall
+
+# 卸载
+myagent-ai uninstall
 ```
 
 > 首次运行会自动安装所有依赖，后续启动秒开。

package/agents/main_agent.py

@@ -202,6 +202,50 @@ class MainAgent(BaseAgent):
             except Exception as e:
                 logger.debug(f"V2 SSE 事件发送失败 ({event_type}): {e}")
 
+    def _try_extract_partial_response(self, llm_raw: str) -> str:
+        """[v1.15.73] 从不完整的 LLM 输出中提取部分回复内容。
+
+        当 <output> 块被截断（缺少 </output>）时，尝试：
+        1. 提取 <response>...</response> 中已闭合的内容
+        2. 提取 <output> 后到截断点之间的纯文本
+        3. 去除 XML 标签后的残余文本
+        """
+        if not llm_raw:
+            return ""
+
+        import re
+
+        # 策略1: 尝试提取已闭合的 <response> 内容
+        response_match = re.search(
+            r"<response[^>]*>(.*?)</response>",
+            llm_raw,
+            re.DOTALL | re.IGNORECASE,
+        )
+        if response_match:
+            text = response_match.group(1).strip()
+            if text:
+                return text
+
+        # 策略2: 提取 <output> 标签后的内容（可能包含未闭合的 <response>）
+        output_match = re.search(r"<output[^>]*>", llm_raw, re.IGNORECASE)
+        if output_match:
+            after_output = llm_raw[output_match.end():].strip()
+            if after_output:
+                # 去除所有 XML 标签，保留纯文本
+                cleaned = re.sub(r"<[^>]+>", "", after_output).strip()
+                # 去除 reasoning/assistant 前缀
+                cleaned = re.sub(r"^(reasoning|assistant)\s*", "", cleaned, flags=re.IGNORECASE).strip()
+                if cleaned and len(cleaned) > 5:
+                    return cleaned
+
+        # 策略3: 提取去除 XML 标签后的整体文本
+        cleaned = re.sub(r"<[^>]+>", "", llm_raw).strip()
+        cleaned = re.sub(r"^(reasoning|assistant)\s*", "", cleaned, flags=re.IGNORECASE).strip()
+        if cleaned and len(cleaned) > 10:
+            return cleaned
+
+        return ""
+
     async def _merge_duplicate_memory(
         self,
         old_memory,
@@ -460,6 +504,8 @@ class MainAgent(BaseAgent):
         get_knowledge_content = ""
         # 追踪流式推送的 reasoning 文本（用于构建有意义的最终回复）
         _v2_reasoning_collected: List[str] = []
+        # [v1.15.73] 追踪上一轮保存到 memory 的位置，避免重复保存
+        _last_saved_len: int = 0
         # XML 解析失败时的 LLM 修正重试计数
         _xml_correction_retries: int = 0
 
@@ -694,6 +740,14 @@ class MainAgent(BaseAgent):
                 )
                 if _xml_correction_retries < 1:
                     _xml_correction_retries += 1
+                    # [v1.15.73] 在重试前，尝试从不完整的 llm_raw 中提取已有内容
+                    # 防止 reasoning 模型因 max_tokens 截断导致内容完全丢失
+                    _partial_text = self._try_extract_partial_response(llm_raw)
+                    if _partial_text:
+                        logger.info(f"[{task_id}] 从不完整XML中提取到部分回复: {_partial_text[:100]}")
+                        _v2_reasoning_collected.append(_partial_text)
+                        _emitted_reasoning_this_iter = True
+                        await self._emit_v2_event("v2_reasoning", {"content": _partial_text}, stream_callback)
                     correction_prompt = (
                         "你的输出缺少 </output> 闭合标签，XML块不完整，"
                         "解析器不会处理不完整的块。\n"
@@ -716,12 +770,29 @@ class MainAgent(BaseAgent):
                 else:
                     # 已重试过，强制终止并提示用户
                     logger.warning(f"[{task_id}] XML块仍不完整且已重试，终止循环")
-                    context.working_memory["final_response"] = "模型输出格式异常，请重新尝试。"
-                    await self._emit_v2_event(
-                        "v2_reasoning",
-                        {"content": "模型输出格式异常，已自动终止。"},
-                        stream_callback,
-                    )
+                    # [v1.15.73] 保存已积累的内容，避免空回复
+                    if _v2_reasoning_collected:
+                        _fallback_save = "\n".join(_v2_reasoning_collected)
+                        if _fallback_save.strip():
+                            context.working_memory["final_response"] = _fallback_save
+                            if self.memory:
+                                self.memory.add_session(
+                                    session_id=context.session_id,
+                                    role="assistant",
+                                    content=_fallback_save,
+                                )
+                            await self._emit_v2_event(
+                                "v2_reasoning",
+                                {"content": _fallback_save},
+                                stream_callback,
+                            )
+                    else:
+                        context.working_memory["final_response"] = "模型输出格式异常，请重新尝试。"
+                        await self._emit_v2_event(
+                            "v2_reasoning",
+                            {"content": "模型输出格式异常，已自动终止。"},
+                            stream_callback,
+                        )
                     break
             elif not parsed.output_block_complete and parsed.parse_success:
                 # 块不完整但已提取到有效内容，记录日志但正常继续
@@ -1285,15 +1356,17 @@ class MainAgent(BaseAgent):
             # 回调前，保存当前轮次的 LLM 输出到会话记忆
             # 这样每轮工具调用都有对应的 assistant 消息记录
             if self.memory:
-                _round_items = _v2_reasoning_collected[_reasoning_len_before_round:]
-                if _round_items:
-                    _round_output = "\n".join(_round_items)
+                # [v1.15.73] 只保存自上次保存以来的新增内容，避免重复
+                _new_items = _v2_reasoning_collected[_last_saved_len:]
+                if _new_items:
+                    _round_output = "\n".join(_new_items)
                     if _round_output.strip():
                         self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=_round_output,
                         )
+                        _last_saved_len = len(_v2_reasoning_collected)
 
         # 循环正常结束（max_iter 耗尽）时兜底保存
         else:

package/core/utils.py

@@ -15,8 +15,8 @@ T = TypeVar("T")
 
 
 def timestamp() -> str:
-    """返回 ISO 8601 格式时间戳"""
-    return datetime.now(timezone.utc).isoformat()
+    """返回 ISO 8601 格式时间戳（本地时间）"""
+    return datetime.now().isoformat()
 
 
 def timestamp_ms() -> int:

package/install/install.sh

@@ -216,6 +216,15 @@ fi
 echo ""
 echo -e "  ${BOLD}${SUCCESS}安装完成！${NC}"
 echo ""
+echo -e "  常用命令:"
+echo -e "    ${ACCENT}myagent-ai web${NC}       启动 Web 界面 (默认)"
+echo -e "    ${ACCENT}myagent-ai cli${NC}       命令行模式"
+echo -e "    ${ACCENT}myagent-ai tray${NC}      系统托盘模式"
+echo -e "    ${ACCENT}myagent-ai server${NC}    后台服务模式"
+echo -e "    ${ACCENT}myagent-ai update${NC}    更新到最新版"
+echo -e "    ${ACCENT}myagent-ai reinstall${NC} 重装依赖"
+echo -e "    ${ACCENT}myagent-ai uninstall${NC} 卸载"
+echo ""
 
 # 启动 Web 模式
 myagent_cmd="$(find_myagent_cmd)"

package/package.json

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

package/start.js

@@ -384,6 +384,49 @@ function cmdReinstall(pkgDir) {
   console.log("");
 }
 
+function cmdUpdate(pkgDir) {
+  console.log("");
+  console.log("  \x1b[36mMyAgent 更新到最新版\x1b[0m");
+  console.log("");
+
+  // 1. npm 升级全局包
+  console.log("  正在通过 npm 更新 myagent-ai ...");
+  try {
+    execFileSync("npm", ["install", "-g", PKG_NAME, "--prefer-online"], {
+      encoding: "utf8", stdio: "inherit", timeout: 120000,
+    });
+  } catch (e) {
+    console.error("\x1b[31mnpm 更新失败，请尝试手动运行: npm install -g myagent-ai@latest\x1b[0m");
+    process.exit(1);
+  }
+  console.log("  \x1b[32m✓\x1b[0m npm 包已更新");
+
+  // 2. 重新定位 pkgDir（npm 更新后路径可能变化）
+  const newPkgDir = resolvePackageDir();
+  if (!fs.existsSync(path.join(newPkgDir, "main.py"))) {
+    console.error("\x1b[31m更新后找不到 main.py，请重新安装: npm install -g myagent-ai@latest\x1b[0m");
+    process.exit(1);
+  }
+
+  // 3. 删除旧 venv 并重建
+  const venvDir = getVenvDir();
+  if (fs.existsSync(venvDir)) {
+    console.log("  删除旧虚拟环境...");
+    fs.rmSync(venvDir, { recursive: true, force: true });
+  }
+  const venvPython = ensureVenv();
+  installAllDeps(venvPython, newPkgDir);
+
+  let ver = "";
+  try { ver = JSON.parse(fs.readFileSync(path.join(newPkgDir, "package.json"), "utf8")).version || ""; } catch (_) {}
+  markDepsInstalled(ver);
+
+  console.log("");
+  console.log(`  \x1b[32m✓ 更新完成${ver ? " → v" + ver : ""}\x1b[0m`);
+  console.log("  运行 \x1b[36mmyagent-ai web\x1b[0m 启动");
+  console.log("");
+}
+
 function cmdUninstall() {
   const venvDir = getVenvDir();
   const dataDir = getDataDir();
@@ -520,6 +563,7 @@ function main() {
   }
 
   if (cmd === "uninstall") { cmdUninstall(); return; }
+  if (cmd === "update")    { cmdUpdate(pkgDir); return; }
   if (cmd === "reinstall") { cmdReinstall(pkgDir); return; }
   if (cmd === "install")   { cmdInstall(pkgDir); return; }
 

package/web/api_server.py

@@ -2255,6 +2255,8 @@ class ApiServer:
                         conn.execute("DELETE FROM memories WHERE session_id = ?", (sid,))
                         conn.execute("DELETE FROM session_names WHERE session_id = ?", (sid,))
                         logger.info(f"  清理会话记忆: {sid}")
+                        # 清理该会话的后端运行状态
+                        self._cleanup_session_state(sid)
                     conn.commit()
                     logger.info(f"  已清理 Agent '{path}' 的 {len(rows)} 个会话记忆")
                 except Exception as e:
@@ -2697,10 +2699,51 @@ class ApiServer:
         entries = [e for e in entries if (e.key or "") not in self._HIDDEN_KEYS]
         return web.json_response([{"role": e.role, "content": e.content, "time": e.created_at, "key": e.key or ""} for e in entries])
 
+    def _cleanup_session_state(self, sid: str):
+        """删除会话时清理所有关联的后端状态"""
+        cleaned = []
+        # 1. 运行中的会话
+        if sid in self._running_sessions:
+            self._running_sessions[sid]["running"] = False
+            self._running_sessions[sid]["done"] = True
+            del self._running_sessions[sid]
+            cleaned.append("running_session")
+        # 2. 消息队列
+        if sid in self._msg_queues:
+            del self._msg_queues[sid]
+            cleaned.append("msg_queue")
+        # 3. 任务列表
+        if sid in self._task_list_store:
+            del self._task_list_store[sid]
+            cleaned.append("task_list")
+        # 4. 执行进度
+        if sid in self._exec_progress:
+            del self._exec_progress[sid]
+            cleaned.append("exec_progress")
+        # 5. Agent 活跃上下文
+        if self.core.main_agent and sid in self.core.main_agent.active_contexts:
+            self.core.main_agent.active_contexts.pop(sid, None)
+            cleaned.append("active_context")
+        # 6. 自动知识库文件
+        try:
+            cfg = self.core.config_mgr.config
+            kb_dir = getattr(cfg, 'knowledge_base_dir', '') or ''
+            if kb_dir:
+                safe_session = sid.replace("-", "").replace("/", "_")[:12]
+                kb_file = Path(kb_dir) / "auto_knowledge" / f"{safe_session}.md"
+                if kb_file.exists():
+                    kb_file.unlink()
+                    cleaned.append("knowledge")
+        except Exception:
+            pass
+        if cleaned:
+            logger.info(f"会话 {sid} 后端状态已清理: {', '.join(cleaned)}")
+
     async def handle_delete_session(self, request):
-        """DELETE /api/sessions/{sid} - 彻底删除会话（所有记忆）"""
+        """DELETE /api/sessions/{sid} - 彻底删除会话（记忆 + 后端状态）"""
         sid = request.match_info["sid"]
         logger.info(f"删除会话: {sid}")
+        self._cleanup_session_state(sid)
         if self.core.memory:
             count = self.core.memory.delete_session(sid)
             logger.info(f"会话 {sid} 已删除，共清除 {count} 条记忆")
@@ -2712,6 +2755,7 @@ class ApiServer:
         if not sid:
             return web.json_response({"ok": False, "error": "missing sid"}, status=400)
         logger.info(f"删除会话: {sid}")
+        self._cleanup_session_state(sid)
         if self.core.memory:
             count = self.core.memory.delete_session(sid)
             logger.info(f"会话 {sid} 已删除，共清除 {count} 条记忆")