myagent-ai 1.23.46 → 1.23.48

package/package.json

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

package/scripts/cli.py

@@ -153,6 +153,75 @@ async def _run():
         sys.exit(1)
 
 
+def _filter_unknown_args(args, allowed_prefixes=None):
+    """[v1.23.46] 通用参数过滤器 — 去掉不认识的系统命令参数。
+
+    LLM 经常把系统命令的参数（如 ls -la, grep -n）传给 myagent-ai 子命令。
+    此函数只保留: 位置参数（不以 - 开头） + allowed_prefixes 匹配的选项。
+
+    Args:
+        args: 原始参数列表
+        allowed_prefixes: 允许的选项前缀集合（如 {"-p", "--pattern", "-r", "--max"}）
+    Returns:
+        过滤后的参数列表
+    """
+    if allowed_prefixes is None:
+        allowed_prefixes = set()
+
+    # 常见系统命令参数（标志，不带值）
+    _sys_flags = {
+        "-l", "-a", "-h", "-L", "-d", "-F", "-f", "-i", "-s", "-R",
+        "-S", "-t", "-r", "-u", "-c", "-1", "-m", "-x", "-o", "-g",
+        "-G", "-A", "-n", "-w", "-p", "-q", "-v", "-e", "-E", "-z",
+        "-b", "-B", "-T", "-H", "-I", "-k", "-N", "-W",
+        # GNU long options
+        "--color", "--group-directories-first", "--hide", "--indicator-style",
+        "--quoting-style", "--show-control-chars", "--sort", "--time",
+        "--time-style", "--format", "--human-readable", "-lh", "-la", "-al",
+        "-lr", "-lt", "-ls", "-ld", "-li", "-shal", "-lah",
+    }
+    # 带值的系统参数
+    _sys_opts = {
+        "--sort", "--time", "--time-style", "--format", "--hide",
+        "--indicator-style", "--quoting-style", "--context", "--width",
+        "--tabs", "--block-size",
+    }
+
+    filtered = []
+    skip_next = False
+    for arg in args:
+        if skip_next:
+            skip_next = False
+            continue
+
+        # 以 - 开头的是选项参数
+        if arg.startswith("-"):
+            # 检查是否在允许列表中
+            matched = any(arg.startswith(prefix) for prefix in allowed_prefixes)
+            if matched:
+                filtered.append(arg)
+                # 如果参数不含 =，且不是标志模式，可能需要跳过下一个
+                if "=" not in arg and arg not in allowed_prefixes:
+                    # 检查是否有对应的 long option 带 =
+                    pass
+                continue
+
+            # 不在允许列表中，检查是否是系统参数
+            stripped = arg.lstrip("-").rstrip("=")
+            if arg in _sys_flags or stripped in _sys_flags:
+                continue  # 标志，跳过
+            if arg in _sys_opts or stripped in _sys_opts:
+                skip_next = True  # 带值选项，跳过下一个
+                continue
+            # 未知选项，跳过
+            continue
+        else:
+            # 位置参数，保留
+            filtered.append(arg)
+
+    return filtered if filtered else args
+
+
 # =============================================================================
 # 感知命令
 # =============================================================================
@@ -308,6 +377,8 @@ async def cmd_write(args):
 async def cmd_ls(args):
     """列出目录内容"""
     import argparse
+    # [v1.23.46] 过滤系统 ls 参数（-l, -a, -la 等）
+    args = _filter_unknown_args(args, allowed_prefixes={"-p", "--pattern", "-r", "--recursive", "--max"})
     p = argparse.ArgumentParser(prog="myagent-ai ls", description="列出目录内容")
     p.add_argument("path", help="目录路径")
     p.add_argument("-p", "--pattern", default="*", help="文件匹配模式 (如 *.py)")
@@ -340,47 +411,15 @@ async def cmd_rm(args):
 async def cmd_grep(args):
     """搜索文件内容"""
     import argparse
-    # [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
-        if a in _unsupported_flags:
-            # 标志参数，不跳过下一个
-            continue
-        if a in _unsupported_opts:
-            # 带参数选项，跳过下一个
-            _skip_next = True
-            continue
-        # 处理组合标志如 -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
-        _filtered.append(a)
-    if not _filtered:
-        _filtered = args  # fallback
-
+    # [v1.23.46] 使用通用过滤器，过滤系统 grep 参数（-n, -i, -r 等）
+    args = _filter_unknown_args(args, allowed_prefixes={"-p", "--pattern", "--max", "--depth"})
     p = argparse.ArgumentParser(prog="myagent-ai grep", description="在目录中搜索文件内容")
     p.add_argument("query", help="搜索关键词")
     p.add_argument("path", help="搜索目录路径")
     p.add_argument("-p", "--pattern", default="*", help="文件匹配模式 (如 *.py)")
     p.add_argument("--max", type=int, default=50, help="最大结果数 (默认50)")
     p.add_argument("--depth", type=int, default=10, help="最大递归深度 (默认10)")
-    a = p.parse_args(_filtered)
+    a = p.parse_args(args)
 
     from skills.file_skill import FileSearchSkill
     skill = FileSearchSkill()

package/web/api_server.py

@@ -312,8 +312,6 @@ class ApiServer:
 
     def _setup_routes(self):
         r = self.app.router
-        print("DEBUG _setup_routes 被调用", flush=True)
-        print(f"DEBUG self.handle_test_llm = {self.handle_test_llm}", flush=True)
         # ── 系统状态 ──
         r.add_get("/api/status", self.handle_status)
         r.add_post("/api/shutdown", self.handle_shutdown)
@@ -8096,28 +8094,7 @@ window.addEventListener('beforeunload', function() {{
         except Exception:
             pass
 
-        # 恢复被中断的任务：自动重新投递群聊任务
-        try:
-            tp = self._get_task_persistence()
-            interrupted = tp.get_all_tasks(status_filter=("running",))
-            if interrupted:
-                logger.warning(f"检测到 {len(interrupted)} 个上次未完成的任务，正在自动恢复...")
-                for task in interrupted:
-                    try:
-                        await self._retry_interrupted_task(tp, task)
-                    except Exception as e:
-                        logger.error(f"自动恢复任务失败 ({task.get('task_id', '')}): {e}")
-                        # 恢复失败则标记为 failed
-                        tp.update_task_status(
-                            task.get("task_id", ""), "failed",
-                            metadata={"interrupted": True, "interrupt_reason": "自动恢复失败"},
-                            last_message=task.get("description", ""),
-                        )
-            # 清理超过 7 天的旧已完成任务
-            tp.cleanup_old_tasks(days=7)
-        except Exception as e:
-            logger.warning(f"任务持久化恢复检查失败（非关键）: {e}")
-
+        # [v1.23.47] 先启动 Web 服务器，再恢复中断任务（避免任务恢复阻塞 Web 启动）
         self._runner = web.AppRunner(self.app)
         await self._runner.setup()
         site = web.TCPSite(self._runner, host, port)
@@ -8133,6 +8110,30 @@ window.addEventListener('beforeunload', function() {{
             raise
         logger.info(f"管理后台: http://{host}:{port}/ui/")
 
+        # [v1.23.47] 恢复被中断的任务：后台异步执行，不阻塞 Web 服务器
+        async def _background_task_recovery():
+            try:
+                tp = self._get_task_persistence()
+                interrupted = tp.get_all_tasks(status_filter=("running",))
+                if interrupted:
+                    logger.warning(f"检测到 {len(interrupted)} 个上次未完成的任务，正在后台恢复...")
+                    for task in interrupted:
+                        try:
+                            await self._retry_interrupted_task(tp, task)
+                        except Exception as e:
+                            logger.error(f"自动恢复任务失败 ({task.get('task_id', '')}): {e}")
+                            tp.update_task_status(
+                                task.get("task_id", ""), "failed",
+                                metadata={"interrupted": True, "interrupt_reason": "自动恢复失败"},
+                                last_message=task.get("description", ""),
+                            )
+                # 清理超过 7 天的旧已完成任务
+                tp.cleanup_old_tasks(days=7)
+            except Exception as e:
+                logger.warning(f"任务持久化恢复检查失败（非关键）: {e}")
+
+        asyncio.create_task(_background_task_recovery())
+
     async def stop(self):
         if self._runner: await self._runner.cleanup()