myagent-ai 1.26.1 → 1.26.2

package/package.json

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

package/skills/registry.py

@@ -33,11 +33,11 @@ logger = get_logger("myagent.skills")
 BUILTIN_TOOLS: List[Dict[str, Any]] = [
     {
         "name": "command",
-        "description": "执行 Shell 命令 — 所有操作（文件、搜索、文档生成、系统管理等）均通过此工具完成。LLM 通过 myagent-ai CLI 子命令调用各项能力。",
+        "description": "执行 Shell 命令 — 所有操作均通过此工具完成。Shell 原生命令（ls/cat/grep/ps/df/uname/python3/pip/npm/git 等）直接执行，不要加 myagent-ai 前缀。只有 myagent 专有命令（docx-create/search/ocr 等）才需要 myagent-ai 前缀。",
         "category": "platform",
         "handler": "ToolDispatcher._exec_command",
         "parameters": [
-            {"name": "command", "type": "string", "description": "Shell 命令（如 myagent-ai search xxx, python3 script.py 等）", "required": True},
+            {"name": "command", "type": "string", "description": "Shell 命令（如 ls -la, grep -r pattern dir, myagent-ai search xxx, python3 script.py 等）", "required": True},
         ],
     },
     {
@@ -134,18 +134,7 @@ CLI_COMMANDS: List[Dict[str, Any]] = [
     {"name": "fetch-url", "category": "search", "cli": "myagent-ai fetch-url <url> [-m METHOD] [-H 'K:V'] [-d DATA]",
      "description": "获取 URL 原始内容 (API 调用)"},
     # ── 文件操作 ──
-    {"name": "read", "category": "file", "cli": "myagent-ai read <path> [--offset N] [--limit N]",
-     "description": "读取文件内容"},
-    {"name": "write", "category": "file", "cli": "myagent-ai write <path> -c 'content' [--append]",
-     "description": "写入文件（自动触发文件发送）"},
-    {"name": "ls", "category": "file", "cli": "myagent-ai ls <dir> [-p '*.py'] [-r] [--max N]",
-     "description": "列出目录内容"},
-    {"name": "rm", "category": "file", "cli": "myagent-ai rm <path> [-r]",
-     "description": "删除文件或目录"},
-    {"name": "grep", "category": "file", "cli": "myagent-ai grep <query> <dir> [-p '*.py']",
-     "description": "搜索文件内容"},
-    {"name": "mv", "category": "file", "cli": "myagent-ai mv <source> <dest>",
-     "description": "移动/重命名文件"},
+    # [v1.26.1] read/write/ls/rm/grep/mv 为原生命令，直接用 cat/tee/ls/rm/grep/mv，不再包装
     {"name": "send-file", "category": "file", "cli": "myagent-ai send-file <path> [description]",
      "description": "发送文件给用户"},
     # ── 文档生成 ──
@@ -168,12 +157,7 @@ CLI_COMMANDS: List[Dict[str, Any]] = [
     {"name": "pdf-read", "category": "document", "cli": "myagent-ai pdf-read <path> [--start N] [--end N]",
      "description": "读取 PDF 文件内容"},
     # ── 系统 ──
-    {"name": "sysinfo", "category": "system", "cli": "myagent-ai sysinfo",
-     "description": "获取系统信息（OS/内存/磁盘/CPU）", "aliases": ["system-info"]},
-    {"name": "ps", "category": "system", "cli": "myagent-ai ps [--filter name] [--limit N]",
-     "description": "列出系统进程", "aliases": ["process-list"]},
-    {"name": "env", "category": "system", "cli": "myagent-ai env [KEY]",
-     "description": "获取环境变量"},
+    # [v1.26.1] sysinfo/ps/env 为原生命令，直接用 uname/ps/env/free/df 等，不再包装
     {"name": "pathinfo", "category": "system", "cli": "myagent-ai pathinfo <path>",
      "description": "获取路径详细信息"},
     # ── 浏览器 ──

package/start.js

@@ -19,7 +19,7 @@
  */
 "use strict";
 
-const { spawn, execSync, execFileSync } = require("child_process");
+const { spawn, spawnSync, execSync, execFileSync } = require("child_process");
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -854,7 +854,20 @@ function main() {
     return;
   }
 
-  // 默认: 直接启动
+  // [v1.26.1] 未知命令 → 透传 shell 执行（避免 myagent-ai ls -la 被误传给 main.py）
+  // 仅当无参数或以 -- 开头时才启动 myagent 服务
+  if (cmd && !cmd.startsWith("-")) {
+    const cmdStr = args.join(" ");
+    const result = spawnSync(
+      process.platform === "win32" ? "cmd.exe" : "bash",
+      [process.platform === "win32" ? "/c" : "-c", cmdStr],
+      { stdio: "inherit", env: process.env },
+    );
+    process.exit(result.status || 0);
+    return;
+  }
+
+  // 无参数 / --web / --tray / --server / --debug 等 → 启动 myagent 服务
   cmdRun(pkgDir, args);
 }