myagent-ai 1.3.2 → 1.3.4

package/core/version.py

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

package/install/install.ps1

@@ -9,7 +9,7 @@ param(
 
 $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
-$PKG_VERSION = "1.3.2"
+$PKG_VERSION = "1.3.4"
 
 # Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {
@@ -57,13 +57,13 @@ function Check-Python {
     }
     # 尝试在常见安装路径查找
     $commonPaths = @(
+        "$env:LOCALAPPDATA\Programs\Python\Python314\python.exe",
+        "$env:LOCALAPPDATA\Programs\Python\Python313\python.exe",
         "$env:LOCALAPPDATA\Programs\Python\Python312\python.exe",
-        "$env:LOCALAPPDATA\Programs\Python\Python311\python.exe",
-        "$env:LOCALAPPDATA\Programs\Python\Python310\python.exe",
-        "C:\Python312\python.exe",
-        "C:\Python311\python.exe",
-        "C:\Program Files\Python312\python.exe",
-        "C:\Program Files\Python311\python.exe"
+        "C:\Python314\python.exe",
+        "C:\Python313\python.exe",
+        "C:\Program Files\Python314\python.exe",
+        "C:\Program Files\Python313\python.exe"
     )
     foreach ($pyPath in $commonPaths) {
         if (Test-Path $pyPath) {
@@ -79,14 +79,14 @@ function Check-Python {
 }
 
 function Install-Python {
-    Write-Host "[*] Installing Python 3.12 ..." -ForegroundColor Yellow
+    Write-Host "[*] Installing Python 3.14 ..." -ForegroundColor Yellow
     $installAttempted = $false
 
     # Try winget first
     try {
         $null = (winget --version 2>$null)
         Write-Host "  Using winget ..." -ForegroundColor Gray
-        winget install Python.Python.3.12 --accept-package-agreements --accept-source-agreements
+        winget install Python.Python.3.14 --accept-package-agreements --accept-source-agreements
         $installAttempted = $true
         # 等待安装完成后刷新 PATH（重试多次）
         for ($i = 1; $i -le 5; $i++) {
@@ -96,9 +96,9 @@ function Install-Python {
         # winget 已完成安装，即使 Check-Python 失败也不再重复安装
         Refresh-Path
         $pyPaths = @(
-            "$env:LOCALAPPDATA\Programs\Python\Python312\python.exe",
-            "C:\Python312\python.exe",
-            "C:\Program Files\Python312\python.exe"
+            "$env:LOCALAPPDATA\Programs\Python\Python314\python.exe",
+            "C:\Python314\python.exe",
+            "C:\Program Files\Python314\python.exe"
         )
         foreach ($pyPath in $pyPaths) {
             if (Test-Path $pyPath) {
@@ -121,11 +121,11 @@ function Install-Python {
     # 仅在 winget 未尝试时才从 python.org 下载（避免双重安装）
     if (-not $installAttempted) {
         # Fallback: download from python.org
-        $pyUrl = "https://www.python.org/ftp/python/3.12.8/python-3.12.8-amd64.exe"
+        $pyUrl = "https://www.python.org/ftp/python/3.14.0/python-3.14.0-amd64.exe"
         $pyExe = Join-Path $env:TEMP "python-installer.exe"
 
         try {
-            Write-Host "  Downloading Python 3.12.8 ..." -ForegroundColor Gray
+            Write-Host "  Downloading Python 3.14.0 ..." -ForegroundColor Gray
             Invoke-WebRequest -Uri $pyUrl -OutFile $pyExe -UseBasicParsing
 
             Write-Host "  Installing (Add to PATH) ..." -ForegroundColor Gray

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.3.2"
+PKG_VERSION="1.3.4"
 
 for arg in "$@"; do
   case "$arg" in
@@ -82,7 +82,7 @@ check_python() {
 
   # 按优先级尝试多个 Python 命令（包括版本号后缀的）
   local py_cmd=""
-  for cmd in python3 python3.12 python3.11 python3.10 python; do
+  for cmd in python3 python3.14 python3.13 python3.12 python; do
     if command -v "$cmd" &>/dev/null; then
       py_cmd="$cmd"
       break
@@ -115,7 +115,7 @@ get_python_cmd() {
     return 0
   fi
   hash -r 2>/dev/null || true
-  for cmd in python3 python3.12 python3.11 python3.10 python; do
+  for cmd in python3 python3.14 python3.13 python3.12 python; do
     if command -v "$cmd" &>/dev/null; then
       _PYTHON_CMD="$cmd"
       echo "$cmd"
@@ -127,30 +127,30 @@ get_python_cmd() {
 }
 
 install_python() {
-  step "Installing Python 3.12 ..."
+  step "Installing Python 3.14 ..."
   local installed=false
 
   if [ "$OS" = "macos" ]; then
     if command -v brew &>/dev/null; then
       info "Using Homebrew ..."
-      brew install python@3.12 && installed=true
+      brew install python@3.14 && installed=true
       # brew 安装后更新 PATH 并刷新缓存
-      export PATH="$(brew --prefix python@3.12)/bin:$PATH"
+      export PATH="$(brew --prefix python@3.14)/bin:$PATH"
       hash -r
       # 等待文件系统同步（某些情况下 brew 完成后二进制文件不会立即可见）
       sleep 1
       if check_python; then return 0; fi
       # brew 已安装但 python3 软链接可能不存在，尝试手动查找
       local brew_py
-      brew_py="$(brew --prefix python@3.12)/bin/python3"
+      brew_py="$(brew --prefix python@3.14)/bin/python3"
       if [ -x "$brew_py" ]; then
         _PYTHON_CMD="$brew_py"
         success "Python found at $brew_py"
         return 0
       fi
       # 尝试查找版本化的 python 二进制
-      for ver in 3.12 3.11 3.10; do
-        brew_py="$(brew --prefix python@3.12)/bin/python${ver}"
+      for ver in 3.14 3.13 3.12; do
+        brew_py="$(brew --prefix python@3.14)/bin/python${ver}"
         if [ -x "$brew_py" ]; then
           _PYTHON_CMD="$brew_py"
           success "Python found at $brew_py"
@@ -160,20 +160,20 @@ install_python() {
       # brew 已成功安装，即使 check_python 失败也不再重复安装
       if $installed; then
         warn "Python 已通过 Homebrew 安装，但 python3 命令暂不可用"
-        info "请重启终端或运行: export PATH=\"$(brew --prefix python@3.12)/bin:\$PATH\""
-        info "或直接使用: $(brew --prefix python@3.12)/bin/python3"
+        info "请重启终端或运行: export PATH=\"$(brew --prefix python@3.14)/bin:\$PATH\""
+        info "或直接使用: $(brew --prefix python@3.14)/bin/python3"
         # 将 brew python 路径设为 _PYTHON_CMD 供后续使用
-        _PYTHON_CMD="$(brew --prefix python@3.12)/bin/python3"
+        _PYTHON_CMD="$(brew --prefix python@3.14)/bin/python3"
         return 0
       fi
     fi
     # 仅在 brew 未安装时才从 python.org 下载
     if ! $installed; then
-      info "Downloading Python 3.12 ..."
-      curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.12.8/python-3.12.8-macos11.pkg"
+      info "Downloading Python 3.14 ..."
+      curl -fsSL -o /tmp/python.pkg "https://www.python.org/ftp/python/3.14.0/python-3.14.0-macos11.pkg"
       sudo installer -pkg /tmp/python.pkg -target /
       rm -f /tmp/python.pkg
-      export PATH="/Library/Frameworks/Python.framework/Versions/3.12/bin:$PATH"
+      export PATH="/Library/Frameworks/Python.framework/Versions/3.14/bin:$PATH"
       hash -r
       if check_python; then return 0; fi
     fi
@@ -184,12 +184,12 @@ install_python() {
     if command -v apt-get &>/dev/null; then
       info "Using apt ..."
       sudo apt-get update -qq
-      sudo apt-get install -y python3.12 python3.12-venv python3-pip 2>/dev/null || \
+      sudo apt-get install -y python3.14 python3.14-venv python3-pip 2>/dev/null || \
       sudo apt-get install -y python3 python3-venv python3-pip
       hash -r
       if check_python; then return 0; fi
       # apt 已安装但可能需要版本化命令
-      for ver in 3.12 3.11 3.10; do
+      for ver in 3.14 3.13 3.12; do
         if command -v "python${ver}" &>/dev/null; then
           _PYTHON_CMD="python${ver}"
           success "Python found as python${ver}"
@@ -200,7 +200,7 @@ install_python() {
     fi
     if command -v dnf &>/dev/null; then
       info "Using dnf ..."
-      sudo dnf install -y python3.12 2>/dev/null || sudo dnf install -y python3
+      sudo dnf install -y python3.14 2>/dev/null || sudo dnf install -y python3
       hash -r
       if check_python; then return 0; fi
       return 1

package/package.json

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

package/requirements.txt

@@ -4,76 +4,54 @@
 # ============================================================
 # 核心依赖 (必需)
 # ============================================================
-openai>=1.12.0                  # OpenAI GPT 系列 + 兼容API
-aiohttp>=3.9.0                  # 异步 HTTP (聊天平台接入 + Web服务器)
-requests>=2.31.0                # HTTP 请求 (LLM备用、更新检查)
-
-# ============================================================
-# Web 管理后台
-# ============================================================
-# Web 服务器使用 aiohttp，无额外依赖
-# aiohttp 已在核心依赖中
-
-# ============================================================
-# 记忆系统
-# ============================================================
-# SQLite3 为 Python 内置模块，无需额外安装
-
-# ============================================================
-# 执行引擎
-# ============================================================
-# subprocess, tempfile 为 Python 内置模块
+openai>=1.12.0
+aiohttp>=3.9.0
+requests>=2.31.0
 
 # ============================================================
 # 技能系统 - 搜索
 # ============================================================
-duckduckgo-search>=6.0.0        # 网络搜索 (无需 API Key)
-beautifulsoup4>=4.12.0          # HTML 解析
-lxml>=5.0.0                     # HTML/XML 高性能解析
-psutil>=5.9.0                   # 系统信息
+duckduckgo-search>=6.0.0
+beautifulsoup4>=4.12.0
+lxml>=5.0.0
+psutil>=5.9.0
 
 # ============================================================
 # 技能系统 - 浏览器自动化 (Playwright)
 # ============================================================
-playwright>=1.41.0              # 浏览器自动化 (内置技能)
+playwright>=1.41.0
 
 # ============================================================
 # 技能系统 - 桌面 GUI 自动化
 # ============================================================
-pynput>=1.7.6                   # 鼠标/键盘控制 (跨平台, ~500KB)
-pygetwindow>=0.0.9              # 窗口管理 (Windows + macOS)
-mss>=9.0.0                      # 屏幕截图 (跨平台, ~1MB)
+pynput>=1.7.6
+pygetwindow>=0.0.9
+mss>=9.0.0
 
 # ============================================================
 # 系统托盘 (默认启用)
 # ============================================================
-pystray>=0.19.5                 # 系统托盘图标
-Pillow>=10.0.0                  # 图标生成
+pystray>=0.19.5
+Pillow>=10.0.0
 
 # ============================================================
 # 聊天平台 (按需使用，默认安装)
 # ============================================================
-python-telegram-bot>=21.0       # Telegram Bot
-discord.py>=2.3.0               # Discord Bot
-# 飞书/QQ/微信 通过 aiohttp 实现，无需额外安装
+python-telegram-bot>=21.0
+discord.py>=2.3.0
 
 # ============================================================
 # 语音合成 (默认启用)
 # ============================================================
-edge-tts>=6.1.0                 # 微软 Edge TTS (免费, 中英文)
+edge-tts>=6.1.0
 
 # ============================================================
 # Anthropic Claude (可选)
 # ============================================================
-anthropic>=0.18.0               # Claude 系列
+anthropic>=0.18.0
 
 # ============================================================
 # Agent 间通信 (可选)
 # ============================================================
-cryptography>=41.0.0            # Ed25519, X25519, AES-256-GCM
-websockets>=12.0                # 异步 WebSocket (远程通信)
-
-# ============================================================
-# 打包 (可选, 仅开发用)
-# ============================================================
-# pyinstaller>=6.0.0            # 打包为 exe/app (按需安装)
+cryptography>=41.0.0
+websockets>=12.0

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.3.2")
+__version__ = _version_vars.get("BASE_VERSION", "1.3.4")
 
 setup(
     name="myagent",

package/start.js

@@ -62,8 +62,8 @@ function resolvePackageDir() {
 // ── 查找 Python ────────────────────────────────────────────
 function findPython() {
   const candidates = IS_WIN
-    ? ["python", "python3", "python3.12", "python3.11", "python3.10"]
-    : ["python3", "python3.12", "python3.11", "python3.10", "python"];
+    ? ["python", "python3", "python3.14", "python3.13", "python3.12", "python3.11"]
+    : ["python3", "python3.14", "python3.13", "python3.12", "python"];
 
   for (const cmd of candidates) {
     try {
@@ -96,16 +96,16 @@ function findPythonOnWindows() {
   const programFilesX86 = process.env["ProgramFiles(x86)"] || "";
 
   const searchPaths = [
+    path.join(localAppData, "Programs", "Python", "Python314", "python.exe"),
+    path.join(localAppData, "Programs", "Python", "Python313", "python.exe"),
     path.join(localAppData, "Programs", "Python", "Python312", "python.exe"),
-    path.join(localAppData, "Programs", "Python", "Python311", "python.exe"),
-    path.join(localAppData, "Programs", "Python", "Python310", "python.exe"),
+    path.join(programFiles, "Python314", "python.exe"),
+    path.join(programFiles, "Python313", "python.exe"),
     path.join(programFiles, "Python312", "python.exe"),
-    path.join(programFiles, "Python311", "python.exe"),
-    path.join(programFiles, "Python310", "python.exe"),
-    path.join(programFilesX86, "Python312", "python.exe"),
-    path.join(programFilesX86, "Python311", "python.exe"),
-    "C:\\Python312\\python.exe",
-    "C:\\Python311\\python.exe",
+    path.join(programFilesX86, "Python314", "python.exe"),
+    path.join(programFilesX86, "Python313", "python.exe"),
+    "C:\\Python314\\python.exe",
+    "C:\\Python313\\python.exe",
   ];
 
   for (const pyPath of searchPaths) {
@@ -151,6 +151,50 @@ function buildArgs(userArgs) {
   }
 }
 
+// ── Windows: pip 安装依赖（带升级和 fallback） ──────────────
+// 核心依赖包名列表（直接安装，不依赖 requirements.txt 解析）
+const CORE_PACKAGES = [
+  "openai>=1.12.0",
+  "aiohttp>=3.9.0",
+  "requests>=2.31.0",
+  "duckduckgo-search>=6.0.0",
+  "beautifulsoup4>=4.12.0",
+  "lxml>=5.0.0",
+  "psutil>=5.9.0",
+];
+
+function pipInstall(pythonCmd, packages, cwd) {
+  const args = ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", ...packages];
+  return execFileSync(pythonCmd, args, {
+    encoding: "utf8",
+    stdio: "inherit",
+    timeout: 180000,
+    cwd,
+  });
+}
+
+function pipInstallReqFile(pythonCmd, reqFile, cwd) {
+  return execFileSync(pythonCmd, ["-m", "pip", "install", "-r", reqFile, "--disable-pip-version-check"], {
+    encoding: "utf8",
+    stdio: "inherit",
+    timeout: 300000,
+    cwd,
+  });
+}
+
+function upgradePip(pythonCmd) {
+  try {
+    console.log("  \x1b[90m[i]\x1b[0m 升级 pip...");
+    execFileSync(pythonCmd, ["-m", "pip", "install", "--upgrade", "pip", "--quiet"], {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 120000,
+    });
+  } catch (_) {
+    // 升级失败不阻断，继续尝试安装
+  }
+}
+
 // ── Windows 快速依赖检查 ───────────────────────────────────
 function checkDepsWin(pkgDir) {
   const required = ["openai", "aiohttp", "requests"];
@@ -174,28 +218,46 @@ function checkDepsWin(pkgDir) {
         ["-c", `import ${mod}`],
         { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000, cwd: pkgDir }
       );
-      console.log(`\x1b[32m[✓]\x1b[0m ${mod}`);
+      console.log(`  \x1b[32m[✓]\x1b[0m ${mod}`);
     } catch (_) {
-      console.log(`\x1b[33m[!]\x1b[0m ${mod} 未安装`);
+      console.log(`  \x1b[33m[!]\x1b[0m ${mod}`);
       missing.push(mod);
     }
   }
 
   if (missing.length > 0) {
+    console.log(`\x1b[33m[!]\x1b[0m 正在安装 ${missing.length} 个缺失依赖...`);
     const reqFile = path.join(pkgDir, "requirements.txt");
+
+    // 策略1: 先升级 pip（旧版 pip 无法解析 requirements.txt）
+    upgradePip(pythonCmd);
+
+    // 策略2: 尝试 pip install -r requirements.txt
+    let installed = false;
     if (fs.existsSync(reqFile)) {
-      console.log(`\x1b[33m[!]\x1b[0m 正在安装 ${missing.length} 个缺失依赖...`);
       try {
-        execFileSync(pythonCmd, ["-m", "pip", "install", "-r", reqFile], {
-          encoding: "utf8",
-          stdio: "inherit",
-          timeout: 180000,
-          cwd: pkgDir,
-        });
-        console.log(`\x1b[32m[✓]\x1b[0m 依赖安装完成`);
+        pipInstallReqFile(pythonCmd, reqFile, pkgDir);
+        console.log(`  \x1b[32m[✓]\x1b[0m 依赖安装完成`);
+        installed = true;
       } catch (_) {
-        console.error(`\x1b[33m[!]\x1b[0m 部分依赖安装失败，请手动运行:`);
-        console.error(`  ${pythonCmd} -m pip install -r "${reqFile}"`);
+        // requirements.txt 安装失败，进入 fallback
+        console.log(`  \x1b[33m[!]\x1b[0m requirements.txt 安装失败，尝试直接安装核心依赖...`);
+      }
+    }
+
+    // 策略3: 直接按包名安装核心依赖（不依赖 requirements.txt 解析）
+    if (!installed) {
+      try {
+        pipInstall(pythonCmd, CORE_PACKAGES, pkgDir);
+        console.log(`  \x1b[32m[✓]\x1b[0m 核心依赖安装完成`);
+        console.log(`  \x1b[90m[i]\x1b[0m 其他依赖将在 MyAgent 启动时自动安装`);
+      } catch (_) {
+        console.error(`  \x1b[31m[✗]\x1b[0m 依赖安装失败，请手动运行:`);
+        console.error(`    ${pythonCmd} -m pip install -r "${reqFile}"`);
+        console.error(`  或逐个安装:`);
+        for (const pkg of CORE_PACKAGES) {
+          console.error(`    ${pythonCmd} -m pip install ${pkg}`);
+        }
       }
     }
   }