myagent-ai 1.16.5 → 1.16.7

package/core/update_manager.py

@@ -628,9 +628,14 @@ class UpdateManager:
         # 验证更新是否成功 — npm 安装后需从 npm 全局目录读取新版本
         # 因为当前进程的 PROJECT_ROOT 指向旧版本，get_version() 会读到旧版本号
         new_version = self._read_installed_version() or get_version()
-        if new_version == record.from_version and record.to_version != "latest":
-            # 版本没变，更新可能未生效
-            logger.warning(f"更新后版本仍为 {new_version}，可能与预期不符")
+        if new_version == record.from_version:
+            # [v1.16.7] 修复：旧条件 `record.to_version != "latest"` 永远为 False
+            # 因为 record.to_version 初始值就是 "latest"，导致版本未变化时不会报警
+            logger.warning(
+                f"更新后版本仍为 {new_version}，更新可能未生效！"
+                f"(npm路径={is_npm_install})"
+            )
+            # 不直接抛异常，让重启继续尝试（重启后 start.js 会重新检测版本和依赖）
 
         # Step 3: 保存更新完成标记（用于重启后验证）
         record.status = "restarting"
@@ -658,8 +663,22 @@ class UpdateManager:
             import shutil
             node_cmd = shutil.which("node")
             new_start_js = self._find_npm_start_js()
-            start_js = new_start_js if new_start_js else PROJECT_ROOT / "start.js"
-            if start_js.exists():
+
+            if new_start_js:
+                start_js = new_start_js
+            elif (PROJECT_ROOT / "start.js").exists():
+                # [v1.16.7] 只有当 PROJECT_ROOT 下的 start.js 版本确实更新了才使用
+                # 如果版本未变，说明 npm install 没有更新 PROJECT_ROOT
+                logger.warning(
+                    f"未在 npm 全局目录找到新版 start.js，"
+                    f"回退使用 PROJECT_ROOT: {PROJECT_ROOT / 'start.js'}"
+                )
+                start_js = PROJECT_ROOT / "start.js"
+            else:
+                logger.error(f"未找到任何 start.js 文件！")
+                start_js = None
+
+            if start_js and start_js.exists():
                 if node_cmd:
                     # 提取原始参数 (去掉 main.py，还原 start.js 的参数格式)
                     original_args = []
@@ -772,23 +791,86 @@ class UpdateManager:
         npm install -g 安装的新版本在 npm root -g/myagent-ai/ 下，
         但当前进程的 PROJECT_ROOT 可能指向旧的 npx 缓存目录。
         重启时必须用新版本的 start.js，否则等于没更新。
+
+        [v1.16.7] 增加多种查找方式：npm root -g / npm bin -g / which，
+        确保找到新版本的 start.js，避免 fallback 到旧代码。
         """
+        candidates = []
+
+        # 方法1: npm root -g / myagent-ai / start.js
         try:
             result = subprocess.run(
                 ["npm", "root", "-g"],
                 capture_output=True, text=True, timeout=5,
             )
             npm_root = result.stdout.strip()
-            if not npm_root:
-                return None
-            start_js = Path(npm_root) / "myagent-ai" / "start.js"
-            if start_js.exists():
-                logger.info(f"找到 npm 全局目录的新版 start.js: {start_js}")
-                return start_js
-            else:
-                logger.debug(f"npm 全局目录中未找到 start.js: {start_js}")
-        except Exception as e:
-            logger.debug(f"查找 npm 全局 start.js 失败: {e}")
+            if npm_root:
+                candidates.append(Path(npm_root) / "myagent-ai" / "start.js")
+        except Exception:
+            pass
+
+        # 方法2: npm bin -g / myagent-ai (symlink)
+        try:
+            result = subprocess.run(
+                ["npm", "bin", "-g"],
+                capture_output=True, text=True, timeout=5,
+            )
+            npm_bin = result.stdout.strip()
+            if npm_bin:
+                candidates.append(Path(npm_bin) / "myagent-ai")
+        except Exception:
+            pass
+
+        # 方法3: which myagent-ai (全局命令路径，通常是 symlink)
+        try:
+            result = subprocess.run(
+                ["which", "myagent-ai"],
+                capture_output=True, text=True, timeout=5,
+            )
+            which_path = result.stdout.strip()
+            if which_path:
+                # which 返回的可能是 symlink，需要 resolve
+                candidates.append(Path(which_path).resolve())
+        except Exception:
+            pass
+
+        # 方法4: 直接读取 npm list -g 输出
+        try:
+            result = subprocess.run(
+                ["npm", "list", "-g", "myagent-ai", "--json"],
+                capture_output=True, text=True, timeout=10,
+            )
+            if result.returncode == 0:
+                import json as _json
+                data = _json.loads(result.stdout)
+                resolved = data.get("dependencies", {}).get("myagent-ai", {}).get("resolved", "")
+                if resolved:
+                    candidates.append(Path(resolved) / "start.js")
+        except Exception:
+            pass
+
+        # 按优先级尝试
+        for candidate in candidates:
+            try:
+                if candidate.exists():
+                    # 读取该 start.js 对应的 package.json 版本
+                    pkg_dir = candidate.parent
+                    pkg_json = pkg_dir / "package.json"
+                    if pkg_json.exists():
+                        data = json.loads(pkg_json.read_text(encoding="utf-8"))
+                        ver = data.get("version", "")
+                        logger.info(f"找到 npm start.js: {candidate} (v{ver})")
+                        return candidate
+                    else:
+                        logger.info(f"找到 npm start.js: {candidate} (无 package.json)")
+                        return candidate
+            except Exception:
+                continue
+
+        logger.warning(
+            f"未找到 npm 全局安装的新版 start.js "
+            f"(已尝试 {len(candidates)} 个候选路径)"
+        )
         return None
 
     def _get_npm_registry(self) -> str:
@@ -863,7 +945,11 @@ class UpdateManager:
             raise RuntimeError(f"npm install -g {pkg_name} 所有源均失败:\n{last_error}")
 
     async def _source_update(self, record: UpdateRecord):
-        """执行源码安装更新 (git pull + pip install)"""
+        """执行源码安装更新 (git pull + pip install)
+        
+        [v1.16.7] 当 git pull 因本地修改失败时，自动 stash → pull → pop，
+        避免因未提交的修改导致更新永远失败。
+        """
         # git pull
         result = subprocess.run(
             ["git", "pull"],
@@ -873,6 +959,60 @@ class UpdateManager:
         pull_output = result.stdout + result.stderr
         logger.info(f"git pull: {pull_output[:500]}")
 
+        # [v1.16.7] git pull 失败时，尝试 stash 本地修改后重新 pull
+        if result.returncode != 0:
+            logger.warning("git pull 失败，尝试 stash 本地修改后重新拉取...")
+            # Stash 所有本地修改（包括未跟踪文件）
+            stash_result = subprocess.run(
+                ["git", "stash", "push", "-u", "-m", "auto-update-stash"],
+                capture_output=True, text=True, timeout=10,
+                cwd=PROJECT_ROOT,
+            )
+            if stash_result.returncode == 0:
+                logger.info(f"已 stash 本地修改: {stash_result.stdout.strip()}")
+                # 重新尝试 git pull
+                result = subprocess.run(
+                    ["git", "pull"],
+                    capture_output=True, text=True, timeout=30,
+                    cwd=PROJECT_ROOT,
+                )
+                pull_output = result.stdout + result.stderr
+                logger.info(f"git pull (stash后): {pull_output[:500]}")
+
+                if result.returncode == 0:
+                    # pull 成功，尝试恢复 stash（可能冲突，静默丢弃）
+                    pop_result = subprocess.run(
+                        ["git", "stash", "pop"],
+                        capture_output=True, text=True, timeout=10,
+                        cwd=PROJECT_ROOT,
+                    )
+                    if pop_result.returncode != 0:
+                        logger.warning(
+                            f"恢复 stash 失败（本地修改与新代码冲突），已丢弃: "
+                            f"{pop_result.stderr[:200]}"
+                        )
+                        subprocess.run(
+                            ["git", "stash", "drop"],
+                            capture_output=True, text=True, timeout=5,
+                            cwd=PROJECT_ROOT,
+                        )
+                else:
+                    # pull 仍然失败，恢复 stash
+                    logger.error(f"stash 后 git pull 仍然失败: {pull_output[:300]}")
+                    subprocess.run(
+                        ["git", "stash", "pop"],
+                        capture_output=True, text=True, timeout=10,
+                        cwd=PROJECT_ROOT,
+                    )
+                    raise RuntimeError(
+                        f"git pull 失败（即使 stash 后）: {pull_output[-300:]}"
+                    )
+            else:
+                raise RuntimeError(
+                    f"git pull 失败且无法 stash: "
+                    f"pull={pull_output[-200:]}, stash={stash_result.stderr[-200:]}"
+                )
+
         # pip install
         self._status = UpdateStatus.DOWNLOADING
         loop = asyncio.get_running_loop()

package/memory/manager.py

@@ -536,7 +536,7 @@ class MemoryManager:
 
         where = " AND ".join(conditions)
         # 取最近的记忆候选进行比对
-        sql = f"SELECT id, content, summary, created_at FROM memories WHERE {where} ORDER BY created_at DESC LIMIT 50"
+        sql = f"SELECT * FROM memories WHERE {where} ORDER BY created_at DESC LIMIT 50"
         rows = conn.execute(sql, params).fetchall()
 
         if not rows:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.16.5",
+  "version": "1.16.7",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
@@ -43,4 +43,4 @@
     "python": ">=3.10",
     "node": ">=18"
   }
-}
+}

package/skills/chromedev_mcp.py

@@ -125,13 +125,26 @@ class MCPClient:
             args.append("--slim")
 
         # [v1.16.4] 自动检测可用的浏览器，通过 --executablePath 传递给 MCP
+        # [v1.16.7] 找不到时自动尝试安装 Chromium
         browser_path = self._detect_browser()
         env = {**os.environ, "NO_COLOR": "1"}
         if browser_path:
             args.extend(["--executablePath", browser_path])
             logger.info(f"使用浏览器: {browser_path}")
         else:
-            logger.warning("未找到 Chrome/Chromium 浏览器，尝试使用默认路径")
+            # [v1.16.7] 自动安装 Chromium
+            installed = self._try_install_chromium()
+            if installed:
+                browser_path = self._detect_browser()
+                if browser_path:
+                    args.extend(["--executablePath", browser_path])
+                    logger.info(f"已自动安装 Chromium: {browser_path}")
+            if not browser_path:
+                logger.error(
+                    "未找到 Chrome/Chromium 浏览器且自动安装失败。"
+                    "请手动安装: apt install -y chromium-browser "
+                    "或 apt install -y chromium"
+                )
 
         # 容器/Termux 环境需要 --no-sandbox
         args.extend(["--chromeArg", "--no-sandbox", "--chromeArg", "--disable-setuid-sandbox"])
@@ -177,6 +190,7 @@ class MCPClient:
           1. 环境变量 CHROME_PATH / BROWSER_PATH
           2. PATH 中的常见浏览器命令
           3. Linux 常见安装路径
+          4. Puppeteer 缓存目录
         """
         # 1. 环境变量
         for env_key in ("CHROME_PATH", "BROWSER_PATH"):
@@ -211,8 +225,61 @@ class MCPClient:
             if os.path.isfile(p) and os.access(p, os.X_OK):
                 return p
 
+        # 4. [v1.16.7] Puppeteer 缓存目录（npx puppeteer install 安装的 Chromium）
+        home = os.path.expanduser("~")
+        puppeteer_cache_dirs = [
+            os.path.join(home, ".cache", "puppeteer", "chrome"),
+            os.path.join(home, ".cache", "puppeteer"),
+        ]
+        for cache_dir in puppeteer_cache_dirs:
+            if os.path.isdir(cache_dir):
+                # 查找 chrome / chromium 可执行文件
+                for root, dirs, files in os.walk(cache_dir):
+                    for fname in files:
+                        if fname in ("chrome", "chromium"):
+                            full = os.path.join(root, fname)
+                            if os.access(full, os.X_OK):
+                                return full
+
         return None
 
+    @staticmethod
+    def _try_install_chromium() -> bool:
+        """[v1.16.7] 尝试自动安装 Chromium。
+
+        依次尝试: apt install chromium-browser → apt install chromium
+        需要当前用户有 sudo 权限（容器环境通常有 root 权限）。
+        """
+        import stat
+
+        # 检查是否有 apt
+        if not shutil.which("apt"):
+            logger.debug("apt 不可用，跳过自动安装 Chromium")
+            return False
+
+        # 尝试不同的包名
+        packages = ["chromium-browser", "chromium"]
+        for pkg in packages:
+            try:
+                logger.info(f"正在自动安装 {pkg}...")
+                result = subprocess.run(
+                    ["apt", "install", "-y", pkg],
+                    capture_output=True, text=True, timeout=120,
+                )
+                if result.returncode == 0:
+                    logger.info(f"成功安装 {pkg}")
+                    return True
+                else:
+                    logger.warning(
+                        f"安装 {pkg} 失败: {result.stderr[-300:] if result.stderr else result.stdout[-300:]}"
+                    )
+            except subprocess.TimeoutExpired:
+                logger.warning(f"安装 {pkg} 超时")
+            except Exception as e:
+                logger.warning(f"安装 {pkg} 异常: {e}")
+
+        return False
+
     def _read_stdout(self):
         """持续读取 MCP Server 的 stdout"""
         if not self._process or not self._process.stdout:
@@ -521,10 +588,25 @@ class BrowserOpenSkill(Skill):
 
         try:
             client = await get_mcp_client()
+            if not client.is_running() or not client._initialized:
+                return SkillResult(
+                    success=False,
+                    error="浏览器启动失败。系统未安装 Chrome/Chromium，自动安装也未成功。"
+                          "请手动执行: apt install -y chromium-browser 或 apt install -y chromium"
+                )
 
             # 1. 导航到目标 URL
             nav_result = await client.call_tool("navigate_page", {"url": url}, timeout=30)
             if nav_result.get("error"):
+                # [v1.16.7] 检测 Chrome not found 错误，给出清晰提示
+                err_text = str(nav_result["error"])
+                if "Could not find" in err_text and "Chrome" in err_text:
+                    return SkillResult(
+                        success=False,
+                        error=f"浏览器未安装: {err_text}。"
+                              f"请执行: apt install -y chromium-browser 或 apt install -y chromium，"
+                              f"安装后重试即可。"
+                    )
                 return SkillResult(success=False, error=f"导航失败: {nav_result['error']}")
 
             # 2. 等待动态内容

package/start.js

@@ -369,15 +369,20 @@ function markDepsInstalled(version, pkgDir) {
 /**
  * [v1.16.1] 检查依赖是否已安装
  * - 无 sentinel 文件 → false（首次安装）
- * - 新格式（含 |）→ true（只要 sentinel 存在就算已安装）
+ * - 新格式（含 |）→ 比较版本号，版本相同则 true，不同则 false
  * - 旧格式（纯版本号）→ 精确匹配版本号
+ *
+ * [v1.16.7] 修复：旧逻辑只要 sentinel 含 | 就返回 true，不比较版本号，
+ * 导致更新到新版本后 isDepsInstalled 仍返回 true，新依赖不会安装。
  */
 function isDepsInstalled(pkgVersion) {
   try {
     if (!fs.existsSync(getSentinelFile())) return false;
     const sentinel = fs.readFileSync(getSentinelFile(), "utf8").trim();
     if (sentinel.includes("|")) {
-      return true;
+      // 新格式: version|deps_hash，比较版本号部分
+      const savedVersion = sentinel.split("|")[0];
+      return savedVersion === pkgVersion;
     }
     return sentinel === pkgVersion;
   } catch (_) {