myagent-ai 1.3.1 → 1.3.3

package/core/version.py

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

package/install/install.ps1

@@ -9,7 +9,7 @@ param(
 
 $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
-$PKG_VERSION = "1.3.1"
+$PKG_VERSION = "1.3.3"
 
 # Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {

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.1"
+PKG_VERSION="1.3.3"
 
 for arg in "$@"; do
   case "$arg" in

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "myagent-ai",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
-    "myagent-ai": "start.sh"
+    "myagent-ai": "start.js"
   },
   "scripts": {
     "start": "python main.py",
@@ -48,6 +48,7 @@
     "config.py",
     "setup.py",
     "requirements.txt",
+    "start.js",
     "start.sh",
     "install/",
     "docs/",

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

package/start.js

@@ -0,0 +1,361 @@
+#!/usr/bin/env node
+/**
+ * start.js - 跨平台入口脚本 (Windows/macOS/Linux)
+ * ================================================
+ * npm bin 入口，自动检测平台:
+ *   - Windows: 直接调用 python main.py [args]（不依赖 bash）
+ *   - macOS/Linux: 委托给 start.sh [args]（保留完整的环境检测逻辑）
+ *
+ * 用法:
+ *   myagent-ai          # 交互式选择运行模式
+ *   myagent-ai web      # Web 管理后台
+ *   myagent-ai cli      # CLI 模式
+ *   myagent-ai tray     # 系统托盘模式
+ *   myagent-ai server   # API 服务模式
+ *   myagent-ai setup    # 配置向导
+ */
+"use strict";
+
+const { spawn, execSync, execFileSync } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+// ── 常量 ──────────────────────────────────────────────────
+const IS_WIN = process.platform === "win32";
+
+// 解析包目录（兼容 symlink / npm link / 全局安装）
+function resolvePackageDir() {
+  // 1. 当前文件所在目录
+  let dir = __dirname;
+
+  // 2. 如果 main.py 不在这里，尝试 npm global prefix
+  if (!fs.existsSync(path.join(dir, "main.py"))) {
+    try {
+      const npmRoot = execSync("npm root -g", {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "pipe"],
+      }).trim();
+      const candidate = path.join(npmRoot, "myagent-ai");
+      if (fs.existsSync(path.join(candidate, "main.py"))) {
+        dir = candidate;
+      }
+    } catch (_) {
+      // ignore
+    }
+  }
+
+  // 3. 向上查找
+  if (!fs.existsSync(path.join(dir, "main.py"))) {
+    let up = dir;
+    for (let i = 0; i < 5; i++) {
+      up = path.dirname(up);
+      if (fs.existsSync(path.join(up, "main.py"))) {
+        dir = up;
+        break;
+      }
+    }
+  }
+
+  return dir;
+}
+
+// ── 查找 Python ────────────────────────────────────────────
+function findPython() {
+  const candidates = IS_WIN
+    ? ["python", "python3", "python3.12", "python3.11", "python3.10"]
+    : ["python3", "python3.12", "python3.11", "python3.10", "python"];
+
+  for (const cmd of candidates) {
+    try {
+      const result = execFileSync(
+        IS_WIN ? `${cmd}.exe` : cmd,
+        ["--version"],
+        { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 }
+      );
+      // 解析版本号
+      const match = result.match(/Python (\d+)\.(\d+)/);
+      if (match) {
+        const major = parseInt(match[1], 10);
+        const minor = parseInt(match[2], 10);
+        if (major >= 3 && minor >= 10) {
+          return cmd;
+        }
+      }
+    } catch (_) {
+      // 继续尝试下一个
+    }
+  }
+
+  return null;
+}
+
+// ── Windows: 常见 Python 安装路径 ──────────────────────────
+function findPythonOnWindows() {
+  const localAppData = process.env.LOCALAPPDATA || "";
+  const programFiles = process.env.ProgramFiles || "";
+  const programFilesX86 = process.env["ProgramFiles(x86)"] || "";
+
+  const searchPaths = [
+    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, "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",
+  ];
+
+  for (const pyPath of searchPaths) {
+    if (fs.existsSync(pyPath)) {
+      try {
+        const result = execFileSync(pyPath, ["--version"], {
+          encoding: "utf8",
+          stdio: ["pipe", "pipe", "pipe"],
+          timeout: 5000,
+        });
+        if (result.includes("Python")) {
+          return pyPath;
+        }
+      } catch (_) {
+        // continue
+      }
+    }
+  }
+
+  return null;
+}
+
+// ── 构建 Python 参数 ───────────────────────────────────────
+function buildArgs(userArgs) {
+  const mode = userArgs[0] || "";
+  switch (mode) {
+    case "cli":
+      return ["main.py"];
+    case "web":
+      return ["main.py", "--web"];
+    case "tray":
+      return ["main.py", "--tray"];
+    case "server":
+      return ["main.py", "--server"];
+    case "setup":
+      return ["main.py", "--setup"];
+    case "":
+      // 无参数：不传任何 flag，让 Python 程序进入交互式选择
+      return ["main.py"];
+    default:
+      // 透传未知参数
+      return ["main.py", ...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"];
+  let pythonCmd = findPython() || findPythonOnWindows();
+
+  if (!pythonCmd) {
+    console.error("\x1b[31m[✗]\x1b[0m 未找到 Python 3.10+");
+    console.error("  请先安装 Python: https://www.python.org/downloads/");
+    console.error("  安装时请勾选 'Add Python to PATH'");
+    console.error("");
+    console.error("  或一键安装: powershell -c \"irm https://raw.githubusercontent.com/ctz168/myagent/main/install/install.ps1 | iex\"");
+    process.exit(1);
+  }
+
+  // 检查核心依赖
+  let missing = [];
+  for (const mod of required) {
+    try {
+      execFileSync(
+        pythonCmd,
+        ["-c", `import ${mod}`],
+        { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000, cwd: pkgDir }
+      );
+      console.log(`  \x1b[32m[✓]\x1b[0m ${mod}`);
+    } catch (_) {
+      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)) {
+      try {
+        pipInstallReqFile(pythonCmd, reqFile, pkgDir);
+        console.log(`  \x1b[32m[✓]\x1b[0m 依赖安装完成`);
+        installed = true;
+      } catch (_) {
+        // 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}`);
+        }
+      }
+    }
+  }
+
+  return pythonCmd;
+}
+
+// ── 主入口 ─────────────────────────────────────────────────
+function main() {
+  const userArgs = process.argv.slice(2);
+  const pkgDir = resolvePackageDir();
+
+  if (!fs.existsSync(path.join(pkgDir, "main.py"))) {
+    console.error("\x1b[31m[✗]\x1b[0m 错误: 找不到 main.py");
+    console.error(`  搜索路径: ${pkgDir}`);
+    console.error('  请重新安装: npm install -g myagent-ai');
+    process.exit(1);
+  }
+
+  // 打印 Banner
+  console.log("");
+  console.log("  \x1b[1m\x1b[36mMyAgent\x1b[0m - 本地桌面端执行型 AI 助手");
+  console.log("");
+
+  if (IS_WIN) {
+    // ── Windows 路径 ──
+    const pythonCmd = checkDepsWin(pkgDir);
+
+    // 首次运行检测
+    const homeDir = process.env.USERPROFILE || process.env.HOME || "";
+    const configFile = path.join(homeDir, ".myagent", "config.json");
+    if (!fs.existsSync(configFile)) {
+      console.log("");
+      console.log("  \x1b[90m[i]\x1b[0m 检测到首次运行，MyAgent 将在启动后引导你完成配置。");
+      console.log("  1. 配置 LLM API Key（支持 OpenAI/Anthropic/ModelScope 等）");
+      console.log("  2. 选择默认运行模式");
+      console.log("");
+    }
+
+    // 构建 Python 参数
+    const mode = userArgs[0] || "";
+    const pyArgs = buildArgs(userArgs);
+
+    if (mode) {
+      const modeNames = {
+        web: "Web 管理后台 (http://localhost:8767)",
+        cli: "CLI 交互模式",
+        tray: "系统托盘模式",
+        server: "API 服务模式",
+        setup: "配置向导",
+      };
+      console.log(`\x1b[36m启动 ${modeNames[mode] || mode}...\x1b[0m`);
+    } else {
+      console.log(`\x1b[36m启动...\x1b[0m`);
+    }
+
+    // 使用 spawn 以交互模式运行 Python
+    const child = spawn(pythonCmd, pyArgs, {
+      cwd: pkgDir,
+      stdio: "inherit",
+      env: { ...process.env },
+    });
+
+    child.on("error", (err) => {
+      console.error(`\x1b[31m[✗]\x1b[0m 启动失败: ${err.message}`);
+      process.exit(1);
+    });
+
+    child.on("exit", (code) => {
+      process.exit(code || 0);
+    });
+  } else {
+    // ── macOS / Linux 路径：委托给 start.sh ──
+    const bashPath = process.env.SHELL || "/bin/bash";
+    const shell = path.basename(bashPath);
+    const shellArgs = shell === "bash" ? [] : ["-l"]; // zsh 需要 -l 加载 profile
+
+    const startSh = path.join(pkgDir, "start.sh");
+    if (!fs.existsSync(startSh)) {
+      console.error("\x1b[31m[✗]\x1b[0m 找不到 start.sh");
+      process.exit(1);
+    }
+
+    const child = spawn(bashPath, [...shellArgs, startSh, ...userArgs], {
+      cwd: pkgDir,
+      stdio: "inherit",
+      env: { ...process.env },
+    });
+
+    child.on("error", (err) => {
+      console.error(`\x1b[31m[✗]\x1b[0m 启动失败: ${err.message}`);
+      process.exit(1);
+    });
+
+    child.on("exit", (code) => {
+      process.exit(code || 0);
+    });
+  }
+}
+
+main();