myagent-ai 1.4.3 → 1.5.2

package/core/update_manager.py

@@ -220,10 +220,11 @@ class UpdateManager:
         current = get_version()
 
         try:
-            # 尝试多种方式检查更新
-            latest = await self._check_github_tags()
-            if not latest:
+            # 尝试多种方式检查更新（npm 安装优先用 npm registry）
+            if (PROJECT_ROOT / "package.json").exists():
                 latest = await self._check_npm_registry()
+            if not latest:
+                latest = await self._check_github_tags()
             if not latest:
                 latest = await self._check_pypi()
             if not latest:
@@ -320,25 +321,46 @@ class UpdateManager:
             pkg_name = pkg_data.get("name", "")
             if not pkg_name:
                 return ""
+        except Exception as e:
+            logger.debug(f"读取 package.json 失败: {e}")
+            return ""
 
-            # 使用 curl 检查 npm registry
+        # 直接请求 npm registry HTTP API（不依赖 npm 命令行）
+        try:
+            import urllib.request
+            url = f"https://registry.npmjs.org/{pkg_name}/latest"
+            logger.debug(f"检查 npm registry: {url}")
             loop = asyncio.get_running_loop()
-            result = await loop.run_in_executor(
+            data = await loop.run_in_executor(
                 None,
-                lambda: subprocess.run(
-                    ["npm", "view", pkg_name, "version", "--json"],
-                    capture_output=True, text=True, timeout=10,
-                    cwd=PROJECT_ROOT,
-                )
+                lambda: urllib.request.urlopen(url, timeout=10).read(),
             )
-            version = result.stdout.strip().strip('"').strip("'")
+            info = json.loads(data)
+            version = info.get("version", "")
             if version and version[0].isdigit():
+                logger.debug(f"npm registry 最新版本: {version}")
                 return version
 
-        except (subprocess.TimeoutExpired, FileNotFoundError):
-            pass
         except Exception as e:
-            logger.debug(f"npm registry 检查失败: {e}")
+            logger.debug(f"npm registry HTTP 检查失败: {e}")
+
+        # 回退: 尝试用 npm 命令行检查 (可能 urllib 失败但 npm 命令可用)
+        try:
+            loop = asyncio.get_running_loop()
+            result = await loop.run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    ["npm", "view", pkg_name, "version", "--registry",
+                     "https://registry.npmjs.org/"],
+                    capture_output=True, text=True, timeout=15,
+                )
+            )
+            ver = result.stdout.strip()
+            if ver and ver[0].isdigit():
+                logger.debug(f"npm view 最新版本: {ver}")
+                return ver
+        except Exception as e2:
+            logger.debug(f"npm view 回退检查也失败: {e2}")
 
         return ""
 
@@ -562,45 +584,70 @@ class UpdateManager:
 
     async def _do_full_update(self, record: UpdateRecord):
         """
-        全量更新: git pull + 依赖更新 + 优雅重启。
+        全量更新: npm update -g (npm 安装) 或 git pull + pip install (源码安装) + 优雅重启。
         使用 os.execv 替换当前进程，保持 PID 不变。
         """
         self._status = UpdateStatus.UPDATING
         logger.info("开始全量更新...")
 
-        # Step 1: 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: {pull_output[:500]}")
+        is_npm_install = (PROJECT_ROOT / "package.json").exists()
 
-        # Step 2: pip install
-        self._status = UpdateStatus.DOWNLOADING
-        loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(
-            None,
-            lambda: subprocess.run(
-                [sys.executable, "-m", "pip", "install", "-e", ".",
-                 "--quiet"],
-                capture_output=True, text=True, timeout=120,
+        if is_npm_install:
+            # npm 安装: npm install -g myagent-ai
+            self._status = UpdateStatus.DOWNLOADING
+            loop = asyncio.get_running_loop()
+            result = await loop.run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    ["npm", "install", "-g", "myagent-ai"],
+                    capture_output=True, text=True, timeout=180,
+                )
+            )
+            npm_output = result.stdout + result.stderr
+            record.details["update_output"] = npm_output[:2000]
+            logger.info(f"npm update: {npm_output[:500]}")
+
+            if result.returncode != 0:
+                # npm 返回非零码可能是权限问题或网络问题
+                error_msg = npm_output[-500:] if npm_output else "未知错误"
+                # 尝试判断是否真的失败了（npm 有时返回非零但实际安装成功）
+                if "ERR!" in error_msg or "error" in error_msg.lower():
+                    logger.warning(f"npm install 可能失败: {error_msg}")
+                    # 不直接抛异常，让重启后 start.js 的依赖检查来兜底
+                else:
+                    logger.warning(f"npm install 有警告但不影响: {error_msg}")
+        else:
+            # 源码安装: git pull + pip install
+            result = subprocess.run(
+                ["git", "pull"],
+                capture_output=True, text=True, timeout=30,
                 cwd=PROJECT_ROOT,
             )
-        )
-        pip_output = result.stdout + result.stderr
-        record.details.update(pull_output=pull_output[:500], pip_output=pip_output[:1000])
+            pull_output = result.stdout + result.stderr
+            logger.info(f"git pull: {pull_output[:500]}")
 
-        if result.returncode != 0:
-            logger.warning(f"pip install 有警告: {pip_output[-300:]}")
+            self._status = UpdateStatus.DOWNLOADING
+            loop = asyncio.get_running_loop()
+            result = await loop.run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    [sys.executable, "-m", "pip", "install", "-e", ".",
+                     "--quiet"],
+                    capture_output=True, text=True, timeout=120,
+                    cwd=PROJECT_ROOT,
+                )
+            )
+            pip_output = result.stdout + result.stderr
+            record.details["update_output"] = pip_output[:1000]
+            if result.returncode != 0:
+                logger.warning(f"pip install 有警告: {pip_output[-300:]}")
 
         # Step 3: 保存更新完成标记（用于重启后验证）
         record.status = "restarting"
         self._save_record(record)
         logger.info("全量更新完成，准备优雅重启...")
 
-        # Step 4: 优雅重启 - os.execv 替换当前进程
+        # Step 4: 优雅重启
         self._status = UpdateStatus.RESTARTING
         await asyncio.sleep(0.5)  # 给日志一点时间写入
 
@@ -610,8 +657,45 @@ class UpdateManager:
         env["MYAGENT_UPDATED_FROM"] = record.from_version
         env["MYAGENT_UPDATED_TO"] = record.to_version
 
-        # 使用 os.execv 替换当前进程（PID 不变，systemd 友好）
-        os.execv(sys.executable, [sys.executable] + sys.argv)
+        if is_npm_install:
+            # npm 安装: 通过 start.js (Node.js) 重启，确保 venv 和依赖正确处理
+            # start.js 会自动创建/更新 venv 并安装依赖
+            start_js = PROJECT_ROOT / "start.js"
+            if start_js.exists():
+                import shutil
+                node_cmd = shutil.which("node")
+                if node_cmd:
+                    # 提取原始参数 (去掉 main.py，还原 start.js 的参数格式)
+                    original_args = []
+                    skip_next = False
+                    for arg in sys.argv[1:]:
+                        if skip_next:
+                            skip_next = False
+                            continue
+                        if arg == "--web":
+                            original_args.append("web")
+                        elif arg == "--tray":
+                            original_args.append("tray")
+                        elif arg == "--cli":
+                            original_args.append("cli")
+                        elif arg == "--server":
+                            original_args.append("server")
+                        elif arg == "--setup":
+                            original_args.append("setup")
+                        elif arg.startswith("--port="):
+                            original_args.append(arg.replace("--port=", ""))
+                        elif arg.startswith("--"):
+                            skip_next = True  # 跳过 --arg value 形式的参数
+                    logger.info(f"通过 start.js 重启: node {start_js} {' '.join(original_args)}")
+                    os.execv(node_cmd, [node_cmd, str(start_js)] + original_args)
+                else:
+                    logger.warning("未找到 node 命令，回退到直接 Python 重启")
+
+        # 回退: 直接用 Python 重启（源码安装或 node 不可用）
+        # 使用绝对路径避免 cwd 变化导致找不到 main.py
+        abs_main = str((PROJECT_ROOT / "main.py").resolve())
+        logger.info(f"通过 Python 直接重启: {sys.executable} {abs_main}")
+        os.execv(sys.executable, [sys.executable, abs_main] + sys.argv[1:])
 
     async def _do_config_update(self, record: UpdateRecord):
         """仅配置热重载（利用现有 ConfigManager.reload()）"""

package/core/version.py

@@ -11,7 +11,7 @@ import subprocess
 from pathlib import Path
 
 # ── 基线版本（与 setup.py / package.json 保持一致） ──
-BASE_VERSION = "1.4.3"
+BASE_VERSION = "1.5.0"
 
 
 def _version_from_git() -> str:

package/install/install.ps1

@@ -9,7 +9,7 @@ param(
 
 $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
-$PKG_VERSION = "1.4.3"
+$PKG_VERSION = "1.5.2"
 
 # Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {
@@ -248,21 +248,59 @@ function Install-PythonDeps {
     Write-Host "[i] venv will be used automatically on startup" -ForegroundColor Gray
 }
 
-# ── Post-install guide ──────────────────────────────
+# ── Post-install: 直接启动 ──────────────────────────
 function Show-Guide {
     Write-Host ""
-    Write-Host "  Installation complete!" -ForegroundColor Green
+    Write-Host "  安装完成！正在启动 MyAgent..." -ForegroundColor Green
     Write-Host ""
-    Write-Host "  Quick start:" -ForegroundColor White
-    Write-Host "    myagent-ai          # Interactive mode selection" -ForegroundColor Cyan
-    Write-Host "    myagent-ai web      # Web dashboard (recommended)" -ForegroundColor Cyan
-    Write-Host "    myagent-ai cli      # CLI mode" -ForegroundColor Cyan
-    Write-Host ""
-    Write-Host "  First run:" -ForegroundColor White
-    Write-Host "    1. Configure LLM API Key (OpenAI / Anthropic / ModelScope / Ollama)" -ForegroundColor Gray
-    Write-Host "    2. Open http://localhost:8767" -ForegroundColor Gray
-    Write-Host ""
-    Write-Host "  Docs: https://github.com/ctz168/myagent" -ForegroundColor Gray
+
+    # 刷新 PATH（刚安装的 npm 全局命令可能在新的 PATH 中）
+    Refresh-Path
+
+    # npm 全局命令实际是 .cmd 文件，必须通过 cmd /c 执行
+    $npmBinDir = ""
+    try {
+        $npmBinDir = (npm bin -g 2>$null).Trim()
+    } catch {}
+
+    $cmdPath = ""
+    if ($npmBinDir -and (Test-Path "$npmBinDir\myagent-ai.cmd")) {
+        $cmdPath = "$npmBinDir\myagent-ai.cmd"
+    }
+
+    if ($cmdPath) {
+        Write-Host "  [i] 启动路径: $cmdPath" -ForegroundColor Gray
+        Start-Process cmd -ArgumentList "/c", "`"$cmdPath`" web" -WindowStyle Minimized
+    } else {
+        Write-Host "  [i] 回退到 PATH 搜索..." -ForegroundColor Gray
+        Start-Process cmd -ArgumentList "/c", "myagent-ai web" -WindowStyle Minimized
+    }
+    Write-Host "  [OK] MyAgent 已在后台启动" -ForegroundColor Green
+
+    # 由安装脚本自身轮询服务并打开浏览器（比 start.js 更可靠）
+    Write-Host "  [i] 等待服务启动..." -ForegroundColor Gray
+    $url = "http://127.0.0.1:8767"
+    $maxWait = 120  # 最多等 120 秒
+    $waited = 0
+    while ($waited -lt $maxWait) {
+        Start-Sleep -Seconds 2
+        $waited += 2
+        try {
+            $null = Invoke-WebRequest -Uri "$url/api/status" -UseBasicParsing -TimeoutSec 3 -ErrorAction Stop
+            Write-Host "  [OK] 服务已就绪，正在打开浏览器..." -ForegroundColor Green
+            Start-Process $url
+            Write-Host "  [i] 如果没有自动打开，请访问: $url" -ForegroundColor Cyan
+            Write-Host ""
+            return
+        } catch {
+            # 服务还没启动，继续等待
+            if ($waited % 10 -eq 0) {
+                Write-Host "  [i] 等待中... ($waited 秒)" -ForegroundColor Gray
+            }
+        }
+    }
+    Write-Host "  [!] 等待超时" -ForegroundColor Yellow
+    Write-Host "  [i] 服务可能仍在启动中，请稍等片刻后访问: $url" -ForegroundColor Cyan
     Write-Host ""
 }
 

package/install/install.sh

@@ -21,7 +21,7 @@ NO_DEPS=false
 DRY_RUN=false
 SCRIPT_URL="https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh"
 PKG_NAME="myagent-ai"
-PKG_VERSION="1.4.3"
+PKG_VERSION="1.5.2"
 
 for arg in "$@"; do
   case "$arg" in
@@ -382,23 +382,59 @@ install_python_deps() {
   info "启动时自动使用 venv，无需手动激活"
 }
 
-# ── 首次配置引导 ───────────────────────────────────
+# ── 安装完成：直接启动 ───────────────────────────────
 post_install() {
   echo ""
-  echo -e "  ${BOLD}${SUCCESS}安装完成！${NC}"
+  echo -e "  ${BOLD}${SUCCESS}安装完成！正在启动 MyAgent...${NC}"
   echo ""
-  echo "  快速开始："
-  echo -e "    ${ACCENT}myagent-ai${NC}         # 交互式选择运行模式"
-  echo -e "    ${ACCENT}myagent-ai web${NC}     # 直接启动 Web 管理后台 (推荐)"
-  echo -e "    ${ACCENT}myagent-ai cli${NC}     # CLI 交互模式"
-  echo -e "    ${ACCENT}myagent-ai tray${NC}    # 系统托盘模式"
-  echo ""
-  echo "  首次运行需要配置："
-  echo "    1. LLM API Key (支持 OpenAI / Anthropic / ModelScope / Ollama 等)"
-  echo "    2. 访问 http://localhost:8767 进入 Web 管理界面"
-  echo ""
-  echo "  文档: https://github.com/ctz168/myagent#readme"
-  echo "  问题: https://github.com/ctz168/myagent/issues"
+
+  # 直接启动 Web 模式，浏览器会自动打开配置向导
+  # 使用 nohup 在后台运行，不阻塞终端
+  if command -v myagent-ai &>/dev/null; then
+    nohup myagent-ai web > /dev/null 2>&1 &
+    echo -e "  ${SUCCESS}[✓]${NC} MyAgent 已在后台启动"
+  else
+    # myagent-ai 不在 PATH 中，尝试通过 npm 全局目录启动
+    local npm_bin
+    npm_bin="$(npm bin -g 2>/dev/null)/myagent-ai"
+    if [ -x "$npm_bin" ]; then
+      nohup "$npm_bin" web > /dev/null 2>&1 &
+      echo -e "  ${SUCCESS}[✓]${NC} MyAgent 已在后台启动"
+    else
+      echo -e "  ${WARN}[!]${NC} 启动命令未找到，请重新打开终端后运行:"
+      echo -e "    ${ACCENT}myagent-ai web${NC}"
+      echo ""
+      return
+    fi
+  fi
+
+  # 由安装脚本自身轮询服务并打开浏览器（比 start.js 更可靠）
+  local url="http://127.0.0.1:8767"
+  local max_wait=120
+  local waited=0
+
+  echo -e "  ${INFO}[i]${NC} 等待服务启动..."
+  while [ $waited -lt $max_wait ]; do
+    sleep 2
+    waited=$((waited + 2))
+    if curl -sf "$url/api/status" > /dev/null 2>&1; then
+      echo -e "  ${SUCCESS}[✓]${NC} 服务已就绪，正在打开浏览器..."
+      # 跨平台打开浏览器
+      if [ "$OS" = "macos" ]; then
+        open "$url" 2>/dev/null || true
+      elif [ "$OS" = "linux" ]; then
+        xdg-open "$url" 2>/dev/null || sensible-browser "$url" 2>/dev/null || true
+      fi
+      echo -e "  ${INFO}[i]${NC} 如果没有自动打开，请访问: ${ACCENT}$url${NC}"
+      echo ""
+      return
+    fi
+    if [ $((waited % 10)) -eq 0 ]; then
+      echo -e "  ${INFO}[i]${NC} 等待中... ($waited 秒)"
+    fi
+  done
+  echo -e "  ${WARN}[!]${NC} 等待超时"
+  echo -e "  ${INFO}[i]${NC} 服务可能仍在启动中，请稍等片刻后访问: ${ACCENT}$url${NC}"
   echo ""
 }
 

package/main.py

@@ -1043,11 +1043,12 @@ def _first_run_setup(config_mgr: ConfigManager):
     print("    1. OpenAI / 兼容 API (推荐)")
     print("    2. Anthropic (Claude)")
     print("    3. Ollama (本地模型，无需 API Key)")
+    print("    4. 自定义 / Custom (任意 OpenAI 兼容接口)")
     print()
 
     while True:
         try:
-            choice = input("  请选择 [1/2/3]: ").strip()
+            choice = input("  请选择 [1/2/3/4]: ").strip()
         except (EOFError, KeyboardInterrupt):
             print("\n\n  已取消配置。可通过 myagent-ai setup 重新配置。")
             sys.exit(0)
@@ -1061,8 +1062,11 @@ def _first_run_setup(config_mgr: ConfigManager):
         elif choice == "3":
             _setup_ollama(config_mgr)
             break
+        elif choice == "4":
+            _setup_custom(config_mgr)
+            break
         else:
-            print("  无效选择，请输入 1/2/3")
+            print("  无效选择，请输入 1/2/3/4")
 
     # 保存配置
     config_mgr.save()
@@ -1252,6 +1256,96 @@ def _setup_ollama(config_mgr: ConfigManager):
         print(f"  (已保存配置，启动后可在 Web 界面修改)")
 
 
+def _setup_custom(config_mgr: ConfigManager):
+    """配置自定义 / Custom 模型 (OpenAI 兼容接口)"""
+    print()
+    print("  -- 自定义 / Custom 模型配置 --")
+    print()
+    print("  支持任意 OpenAI API 兼容接口，包括:")
+    print("    - 中转站 / 代理 API")
+    print("    - 自部署的 vLLM / LocalAI")
+    print("    - 企业内部 AI 网关")
+    print()
+
+    try:
+        name = input("  模型显示名称 (如: 我的 GPT 镜像): ").strip()
+    except (EOFError, KeyboardInterrupt):
+        sys.exit(0)
+
+    while True:
+        try:
+            base_url = input("  Base URL (如 https://your-api.com/v1): ").strip().rstrip("/")
+        except (EOFError, KeyboardInterrupt):
+            sys.exit(0)
+        if base_url:
+            break
+        print("  Base URL 不能为空!")
+
+    while True:
+        try:
+            model = input("  模型名称 (如 gpt-4o / deepseek-chat): ").strip()
+        except (EOFError, KeyboardInterrupt):
+            sys.exit(0)
+        if model:
+            break
+        print("  模型名称不能为空!")
+
+    try:
+        api_key = input("  API Key (选填，直接回车跳过): ").strip()
+    except (EOFError, KeyboardInterrupt):
+        api_key = ""
+
+    # 写入配置
+    config_mgr.config.llm.provider = "custom"
+    config_mgr.config.llm.api_key = api_key
+    config_mgr.config.llm.base_url = base_url
+    config_mgr.config.llm.model = model
+
+    # 同时添加到模型库
+    model_id = f"custom-{model.replace('/', '-').lower()}"
+    from config import ModelEntry
+    entry = ModelEntry(
+        id=model_id,
+        name=name or f"Custom - {model}",
+        provider="custom",
+        model=model,
+        base_url=base_url,
+        api_key=api_key,
+        max_tokens=4096,
+        temperature=0.1,
+        enabled=True,
+    )
+    # 避免重复
+    existing_ids = [m.id for m in config_mgr.config.models_library]
+    if model_id not in existing_ids:
+        config_mgr.config.models_library.append(entry)
+
+    print()
+    print("  正在验证连接...")
+    try:
+        import requests
+        headers = {}
+        if api_key:
+            headers["Authorization"] = f"Bearer {api_key}"
+        test_body = {
+            "model": model,
+            "messages": [{"role": "user", "content": "hi"}],
+            "max_tokens": 5,
+        }
+        resp = requests.post(
+            f"{base_url}/chat/completions",
+            headers=headers, json=test_body, timeout=15,
+        )
+        if resp.status_code == 200:
+            print("  连接成功!")
+        else:
+            print(f"  连接失败 (HTTP {resp.status_code})，请检查 Base URL 和模型名称")
+            print(f"  (已保存配置，启动后可在 Web 界面修改)")
+    except Exception as e:
+        print(f"  连接测试失败: {e}")
+        print(f"  (已保存配置，启动后可在 Web 界面修改)")
+
+
 # ==============================================================================
 # 主函数
 # ==============================================================================
@@ -1296,12 +1390,15 @@ def main():
     # ══════════════════════════════════════════════════════════
     # 首次运行: 引导配置 LLM API Key
     # ══════════════════════════════════════════════════════════
-    _first_run_setup(config_mgr)
+    web_port = args.web if args.web else args.port if args.tray else None
+    if not web_port:
+        # 仅 CLI 模式才用命令行配置向导
+        # Web 模式下由 chat.html 的 Web 向导处理 (检测 /api/setup/status)
+        _first_run_setup(config_mgr)
 
     # 创建应用
     app = MyAgentApp()
     app._restart_requested = False
-    web_port = args.web if args.web else args.port if args.tray else None
 
     # 信号处理 — 仅设置标志, 不在信号处理器中调用 asyncio
     def signal_handler(sig, frame):
@@ -1329,6 +1426,14 @@ def main():
             await api_server.start(port=web_port)
             app.logger.info(f"管理后台: http://127.0.0.1:{web_port}/ui/")
 
+            # 非 tray 模式（纯 web 模式）自动打开浏览器
+            if not args.tray:
+                import webbrowser
+                try:
+                    webbrowser.open(f"http://127.0.0.1:{web_port}/ui/chat.html")
+                except Exception:
+                    pass
+
         # 系统托盘 (默认开启管理后台)
         if args.tray or web_port:
             try:

package/package.json

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

package/setup.py

@@ -9,7 +9,7 @@ from pathlib import Path
 _version_path = Path(__file__).parent / "core" / "version.py"
 _version_vars = {}
 exec(_version_path.read_text(), _version_vars)
-__version__ = _version_vars.get("BASE_VERSION", "1.4.3")
+__version__ = _version_vars.get("BASE_VERSION", "1.5.2")
 
 setup(
     name="myagent",