myagent-ai 1.23.41 → 1.23.43

package/executor/engine.py

@@ -268,6 +268,55 @@ class ExecutionEngine:
         except Exception:
             return True
 
+    def _check_self_run(self, code: str, work_dir: str) -> Optional[str]:
+        """[v1.23.41] 自保护检查：阻止 Agent 启动 myagent 自身进程
+
+        检测模式:
+        1. 直接运行 main.py / main.pyc（python main.py, python3 main.py, ./main.py 等）
+        2. 通过 myagent-ai start 等命令启动服务
+        3. 运行 start.sh / start.js / start.ps1 等启动脚本
+
+        只在 work_dir 是 myagent 安装目录时拦截。
+        """
+        import os
+        code_stripped = code.strip()
+
+        # 判断 work_dir 是否是 myagent 安装目录（包含 main.py + start.sh/js）
+        _is_myagent_dir = (
+            work_dir
+            and os.path.isfile(os.path.join(work_dir, "main.py"))
+            and (
+                os.path.isfile(os.path.join(work_dir, "start.sh"))
+                or os.path.isfile(os.path.join(work_dir, "start.js"))
+            )
+        )
+        if not _is_myagent_dir:
+            return None
+
+        # 模式 1: python/python3 main.py [args]
+        import re
+        if re.search(r'\b(?:python3?|\.\/)?\s*main\.py\b', code_stripped):
+            return (
+                "[自保护] 禁止启动 myagent 自身进程 (main.py)。"
+                "如果你需要测试 myagent 的功能，请使用 'myagent-ai' CLI 命令。"
+                "如果你在调试 myagent 项目代码，请直接测试具体的 Python 模块，"
+                "例如: python -c 'from agents.main_agent import MainAgent; print(MainAgent)'"
+            )
+
+        # 模式 2: myagent-ai start / start.sh / start.js
+        if re.search(r'\bmyagent-ai\s+(?:start|run|launch)\b', code_stripped):
+            return (
+                "[自保护] 禁止在 myagent 内部启动 myagent 服务。"
+                "myagent 服务已经在运行中，请勿重复启动。"
+            )
+        if re.search(r'\b(?:bash|sh|\.\/)?\s*start\.(?:sh|ps1|bat)\b', code_stripped):
+            return (
+                "[自保护] 禁止运行 myagent 启动脚本。"
+                "myagent 服务已经在运行中，请直接测试你需要的功能。"
+            )
+
+        return None
+
     # ======================================================================
     # 启动时一次性检测
     # ======================================================================
@@ -534,6 +583,17 @@ class ExecutionEngine:
                 metadata={**metadata, "mode": self.execution_mode},
             )
 
+        # [v1.23.41] 自保护检查：阻止 Agent 启动 myagent 自身进程
+        _self_check = self._check_self_run(code, work_dir)
+        if _self_check:
+            return ExecResult(
+                success=False,
+                error=_self_check,
+                language=language,
+                code=code,
+                metadata={**metadata, "mode": self.execution_mode, "self_protect": True},
+            )
+
         self._execution_count += 1
         exec_id = f"exec_{self._execution_count}"
 

package/package.json

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

package/scripts/cli.py

@@ -340,23 +340,33 @@ async def cmd_rm(args):
 async def cmd_grep(args):
     """搜索文件内容"""
     import argparse
-    # [v1.23.40] 预过滤不支持的参数，防止 Agent 把系统 grep 参数传进来
-    _unsupported = {"-n", "--line-number", "-l", "--files-with-matches",
-                    "-r", "-R", "--recursive", "-i", "--ignore-case",
-                    "-c", "--count", "-w", "--word-regexp", "-v", "--invert-match",
-                    "-e", "--regexp", "--include", "--exclude", "-E", "-F", "-P"}
+    # [v1.23.42] 预过滤不支持的参数，防止 Agent 把系统 grep 参数传进来
+    # 区分标志（无参数）和选项（带参数）
+    _unsupported_flags = {"-n", "--line-number", "-l", "--files-with-matches",
+                          "-r", "-R", "--recursive", "-i", "--ignore-case",
+                          "-c", "--count", "-w", "--word-regexp", "-v",
+                          "--invert-match", "-E", "-F", "-P", "-m"}
+    _unsupported_opts = {"-e", "--regexp", "--include", "--exclude",
+                         "--after-context", "--before-context", "--context",
+                         "-A", "-B", "-C", "--max-count", "--color"}
     _filtered = []
     _skip_next = False
     for i, a in enumerate(args):
         if _skip_next:
             _skip_next = False
             continue
-        # 处理 -nPattern 或 --name=Value 格式
-        if a in _unsupported:
+        if a in _unsupported_flags:
+            # 标志参数，不跳过下一个
+            continue
+        if a in _unsupported_opts:
+            # 带参数选项，跳过下一个
             _skip_next = True
             continue
-        if any(a.startswith(k) for k in _unsupported):
-            # 带值参数如 --max=50 这种已经在 argparse 处理了
+        # 处理组合标志如 -rn、长选项 --name=Value
+        if any(a.startswith(k) for k in _unsupported_flags):
+            # -rn 或 -ni 等组合标志，不跳过下一个
+            continue
+        if any(a.startswith(k) for k in _unsupported_opts):
             if "=" not in a:
                 _skip_next = True
             continue