myagent-ai 1.2.0 → 1.2.2

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

package/main.py

@@ -586,7 +586,7 @@ class MyAgentApp:
 # 系统托盘
 # ==============================================================================
 
-def create_tray_icon(app: MyAgentApp, web_port: int = 8765):
+def create_tray_icon(app: MyAgentApp, web_port: int = 8767):
     """
     创建系统托盘图标。
 
@@ -838,7 +838,7 @@ def create_tray_icon(app: MyAgentApp, web_port: int = 8765):
     return tray_icon
 
 
-def run_with_tray(app: MyAgentApp, web_port: int = 8765):
+def run_with_tray(app: MyAgentApp, web_port: int = 8767):
     """在系统托盘中运行 MyAgent"""
     tray = create_tray_icon(app, web_port)
     if tray is None:
@@ -979,9 +979,9 @@ def main():
 
     parser = argparse.ArgumentParser(description="MyAgent - 本地桌面端执行型AI助手")
     parser.add_argument("--tray", action="store_true", help="以系统托盘模式运行")
-    parser.add_argument("--web", type=int, nargs="?", const=8765, default=None,
-                        help="启动管理后台 Web UI (可选端口，默认8765)")
-    parser.add_argument("--port", type=int, default=8765, help="Web UI 端口")
+    parser.add_argument("--web", type=int, nargs="?", const=8767, default=None,
+                        help="启动管理后台 Web UI (可选端口，默认8767)")
+    parser.add_argument("--port", type=int, default=8767, help="Web UI 端口")
     parser.add_argument("--autostart", action="store_true", help="设置开机自启")
     parser.add_argument("--no-autostart", action="store_true", help="取消开机自启")
     parser.add_argument("--config", type=str, help="指定配置文件路径")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {
@@ -11,7 +11,7 @@
     "start:web": "python main.py --web",
     "start:tray": "python main.py --tray",
     "start:server": "python main.py --server",
-    "install:deps": "pip install -r requirements.txt",
+    "install:deps": "pip install -r requirements.txt --break-system-packages 2>/dev/null || pip install -r requirements.txt",
     "test": "python -m pytest tests/"
   },
   "keywords": [
@@ -50,6 +50,7 @@
     "requirements.txt",
     "start.sh",
     "install/",
+    "docs/",
     "core/",
     "memory/",
     "executor/",

package/start.sh

@@ -1,9 +1,42 @@
 #!/bin/bash
 # MyAgent Unix/macOS 启动脚本
 # 用法: ./start.sh [cli|web|tray|server|setup]
+# 支持 npm 全局安装后从任意目录运行
 
 set -euo pipefail
 
+# ── 解析脚本真实路径（兼容 symlink） ─────────
+# npm 全局安装时 start.sh 会被 symlink 到 /usr/local/bin/myagent-ai
+# 需要解析 symlink 找到实际的包目录
+resolve_script_dir() {
+    local src="${BASH_SOURCE[0]}"
+    # 循环解析所有 symlink
+    while [ -L "$src" ]; do
+        local dir="$(cd -P "$(dirname "$src")" && pwd)"
+        src="$(readlink "$src")"
+        # 如果是相对路径，拼接上目录
+        [[ "$src" != /* ]] && src="$dir/$src"
+    done
+    cd -P "$(dirname "$src")" && pwd
+}
+
+SCRIPT_DIR="$(resolve_script_dir)"
+PROJECT_DIR="$SCRIPT_DIR"
+
+# 如果 main.py 不在脚本目录（npm link 等场景），向上查找
+if [ ! -f "$PROJECT_DIR/main.py" ]; then
+    # 尝试 npm global prefix 方式
+    NPM_PKG_DIR="$(npm root -g 2>/dev/null)/myagent-ai"
+    if [ -f "$NPM_PKG_DIR/main.py" ]; then
+        PROJECT_DIR="$NPM_PKG_DIR"
+    else
+        echo -e "\033[31m[✗]\033[0m 错误: 找不到 main.py"
+        echo "  脚本目录: $SCRIPT_DIR"
+        echo "  请确保从正确位置运行，或重新安装: npm install -g myagent-ai"
+        exit 1
+    fi
+fi
+
 BOLD='\033[1m'
 ACCENT='\033[36m'
 INFO='\033[90m'
@@ -38,6 +71,8 @@ if [ -z "$PY" ]; then
     echo "  macOS:  brew install python@3.12"
     echo "  Linux:  sudo apt install python3.12 python3-pip"
     echo "  Windows: https://www.python.org/downloads/"
+    echo ""
+    echo "  一键安装: curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash"
     exit 1
 fi
 
@@ -55,6 +90,29 @@ check_python_version() {
 }
 check_python_version
 
+# ── pip install (处理 PEP668) ──────────────────────
+pip_install() {
+    local req_file="$1"
+    $PY -m pip install -r "$req_file" --break-system-packages 2>/dev/null || \
+    $PY -m pip install -r "$req_file" 2>/dev/null || \
+    {
+        warn "pip install 失败 (可能受 PEP668 限制)"
+        info "尝试使用 venv 安装..."
+        local venv_dir="$HOME/.myagent/venv"
+        $PY -m venv "$venv_dir" 2>/dev/null
+        if [ -f "$venv_dir/bin/pip" ]; then
+            "$venv_dir/bin/pip" install -r "$req_file"
+            success "已安装到虚拟环境 $venv_dir"
+            info "启动时请使用: $venv_dir/bin/python main.py --web"
+            return 0
+        fi
+        err "所有安装方式均失败"
+        info "请手动安装: pip3 install -r $req_file --break-system-packages"
+        info "或使用虚拟环境: python3 -m venv venv && source venv/bin/activate && pip install -r $req_file"
+        return 1
+    }
+}
+
 # ── 检查核心依赖 ─────────────────────────────────
 check_deps() {
     local missing=0
@@ -82,18 +140,14 @@ check_deps() {
         echo ""
         warn "部分核心依赖缺失，正在自动安装..."
         local req_file=""
-        # 优先查找同目录 requirements.txt
-        if [ -f "$(dirname "$0")/requirements.txt" ]; then
-            req_file="$(dirname "$0")/requirements.txt"
+        # 优先查找项目目录 requirements.txt
+        if [ -f "$PROJECT_DIR/requirements.txt" ]; then
+            req_file="$PROJECT_DIR/requirements.txt"
         elif [ -f "requirements.txt" ]; then
             req_file="requirements.txt"
         fi
         if [ -n "$req_file" ]; then
-            pip3 install -r "$req_file" --break-system-packages 2>/dev/null || \
-            pip3 install -r "$req_file" 2>/dev/null || \
-            pip install -r "$req_file" --break-system-packages 2>/dev/null || \
-            pip install -r "$req_file" 2>/dev/null || \
-            warn "自动安装失败，请手动运行: pip3 install -r requirements.txt"
+            pip_install "$req_file" || warn "依赖安装失败，请手动处理"
         else
             warn "未找到 requirements.txt，请手动安装依赖"
         fi
@@ -134,6 +188,9 @@ if [ -z "$MODE" ]; then
     esac
 fi
 
+# 切换到项目目录（确保 main.py 的相对路径正确）
+cd "$PROJECT_DIR"
+
 case "$MODE" in
     cli)
         check_deps

package/web/api_server.py

@@ -92,14 +92,14 @@ class ApiServer:
 
     def _setup_routes(self):
         r = self.app.router
+        # ── 系统状态 ──
         r.add_get("/api/status", self.handle_status)
         r.add_post("/api/shutdown", self.handle_shutdown)
+        # ── Agent 列表/创建 ──
         r.add_get("/api/agents", self.handle_list_agents)
         r.add_get("/api/agents/tree", self.handle_agents_tree)
         r.add_post("/api/agents", self.handle_create_agent)
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}", self.handle_get_agent)
-        r.add_put("/api/agents/{name:[a-zA-Z0-9_/-]+}", self.handle_update_agent)
-        r.add_delete("/api/agents/{name:.+}", self.handle_delete_agent)
+        # ── Agent 子资源路由（必须在通用 {name} 路由之前注册） ──
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/soul", self.handle_get_soul)
         r.add_put("/api/agents/{name:[a-zA-Z0-9_/-]+}/soul", self.handle_set_soul)
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/identity", self.handle_get_identity)
@@ -109,6 +109,15 @@ class ApiServer:
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/sessions", self.handle_agent_sessions)
         r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/children", self.handle_list_children)
         r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/children", self.handle_create_child)
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/bindings", self.handle_agent_bindings)
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_list_agent_knowledge)
+        r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge/upload", self.handle_upload_agent_knowledge)
+        r.add_delete("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_delete_agent_knowledge)
+        # ── Agent 通用 CRUD（放在子资源之后，name 不含斜杠避免吞掉子路由） ──
+        r.add_get("/api/agents/{name:[a-zA-Z0-9_\\-]+}", self.handle_get_agent)
+        r.add_put("/api/agents/{name:[a-zA-Z0-9_\\-]+}", self.handle_update_agent)
+        r.add_delete("/api/agents/{name:.+}", self.handle_delete_agent)
+        # ── 平台管理 ──
         r.add_get("/api/platforms", self.handle_list_platforms)
         r.add_post("/api/platforms", self.handle_add_platform)
         r.add_get("/api/platforms/{name}", self.handle_get_platform)
@@ -122,8 +131,7 @@ class ApiServer:
         r.add_post("/api/models", self.handle_add_model)
         r.add_put("/api/models/{model_id}", self.handle_update_model)
         r.add_delete("/api/models/{model_id}", self.handle_delete_model)
-        # ── Agent 绑定查询 ──
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/bindings", self.handle_agent_bindings)
+        # ── 会话管理 ──
         r.add_get("/api/sessions", self.handle_list_sessions)
         r.add_get("/api/sessions/{sid}/messages", self.handle_get_messages)
         r.add_delete("/api/sessions/{sid}", self.handle_clear_session)
@@ -165,10 +173,6 @@ class ApiServer:
         r.add_get("/api/organization/knowledge/file", self.handle_read_org_knowledge)
         r.add_post("/api/organization/knowledge/upload", self.handle_upload_org_knowledge)
         r.add_delete("/api/organization/knowledge", self.handle_delete_org_knowledge)
-        # ── Agent 知识库 ──
-        r.add_get("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_list_agent_knowledge)
-        r.add_post("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge/upload", self.handle_upload_agent_knowledge)
-        r.add_delete("/api/agents/{name:[a-zA-Z0-9_/-]+}/knowledge", self.handle_delete_agent_knowledge)
         # ── 知识库 RAG 搜索 ──
         r.add_post("/api/knowledge/search", self.handle_knowledge_search)
         # ── 配置管理 (热重载/导入/导出) ──
@@ -1044,7 +1048,7 @@ class ApiServer:
         return web.json_response({"ok": True})
 
     async def handle_get_soul(self, request):
-        path = request.match_info["name"]
+        path = request.match_info.get("name", "")
         p = self._agent_dir(path) / "soul.md"
         if not p.parent.exists() or not (p.parent / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
@@ -2804,7 +2808,7 @@ class ApiServer:
         ok = mgr.clear_messages(gid)
         return web.json_response({"ok": ok})
 
-    async def start(self, port: int = 8765):
+    async def start(self, port: int = 8767):
         # 加载禁用技能列表
         self._load_disabled_skills()