myagent-ai 1.16.17 → 1.16.19

package/Dockerfile

@@ -1,14 +1,38 @@
 # MyAgent - 本地桌面端执行型 AI 助手
 # Docker 构建文件 (主要用于服务器部署)
-FROM python:3.11-slim
+FROM python:3.13-slim
 
 WORKDIR /app
 
 # 安装系统依赖
+# [v1.16.18] 包含 poppler-utils (PDF提取)、Chrome 共享库 (浏览器自动化)
 RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-pip \
+    poppler-utils \
+    # Chrome/Chromium 运行所需的共享库
+    libnss3 \
+    libatk1.0-0 \
+    libatk-bridge2.0-0 \
+    libcups2 \
+    libdrm2 \
+    libxkbcommon0 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxfixes3 \
+    libxrandr2 \
+    libgbm1 \
+    libpango-1.0-0 \
+    libcairo2 \
+    libasound2 \
+    libatspi2.0-0 \
+    # Node.js (浏览器自动化 MCP 需要)
+    nodejs \
+    npm \
     && rm -rf /var/lib/apt/lists/*
 
+# 安装 Puppeteer 的 Chrome (自包含，容器环境最可靠)
+RUN npx -y puppeteer browsers install chrome@stable || true
+
 # 安装 Python 依赖
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt

package/agents/main_agent.py

@@ -73,6 +73,7 @@ class MainAgent(BaseAgent):
 - **执行代码**: 用 `code` 工具（language: python/javascript/shell）
 - **执行命令**: 用 `command` 或 `command_run` 工具
 - **文件操作**: 用 `file_read` / `file_write` / `file_list` 等文件工具
+- **发送文件给用户**: 用 `file_send` 工具（参数: file_path=文件路径, description=说明），当你生成或处理了文件需要返回给用户时使用
 - **主动召回记忆**: 用 `recall_memory` 工具（参数: keyword=关键字, time_point=可选时间点如"2025-01", limit=数量默认5），根据关键字和时间搜索历史记忆
 """
 
@@ -552,11 +553,18 @@ class MainAgent(BaseAgent):
 
         # 保存用户消息到会话记忆
         if self.memory:
+            # [v1.16.17] 附加附件元数据到用户消息
+            _attachment_meta = {}
+            if context.metadata.get("user_image_files"):
+                _attachment_meta["images"] = context.metadata["user_image_files"]
+            if context.metadata.get("user_file_files"):
+                _attachment_meta["files"] = context.metadata["user_file_files"]
             self.memory.add_session(
                 session_id=context.session_id,
                 role="user",
                 content=context.user_message,
                 key="user_input",
+                metadata=_attachment_meta if _attachment_meta else None,
             )
 
         # 加载相关记忆 (recall from previous round or initial load)
@@ -1561,6 +1569,20 @@ class MainAgent(BaseAgent):
                     result = {"success": False, "error": f"记忆召回失败: {re_err}"}
                     logger.warning(f"[{task_id}] recall_memory 工具异常: {re_err}")
 
+            elif tool_name == "file_send":
+                # [v1.16.17→18] 文件发送工具 — 让 Agent 向用户发送文件
+                try:
+                    from skills.file_send import FileSendSkill
+                    _fskill = FileSendSkill()
+                    _fpath = params.get("file_path", "")
+                    _fdesc = params.get("description", "")
+                    # [v1.16.18] 使用当前作用域的 stream_callback（而非 context._stream_callback）
+                    _fresult = await _fskill.execute(_fpath, _fdesc, stream_callback=stream_callback)
+                    result = {"success": True, "output": json.dumps(_fresult, ensure_ascii=False, indent=2), "data": _fresult}
+                except Exception as _fse:
+                    result = {"success": False, "error": f"文件发送失败: {_fse}"}
+                    logger.warning(f"[{task_id}] file_send 工具异常: {_fse}")
+
             elif self.skills:
                 exec_result = await self.skills.execute(tool_name, **params)
                 if exec_result is None:

package/core/deps_checker.py

@@ -13,7 +13,8 @@ core/deps_checker.py - 自动依赖检测与安装
 依赖映射:
   核心功能: openai, aiohttp, requests
   搜索技能: bs4
-  系统技能: psutil
+  PDF 处理: PyPDF2
+  系统技能: psutil, chardet
   托盘功能: pystray, PIL
   语音合成: edge_tts
   浏览器自动化: chrome-devtools-mcp (Node.js, Chrome DevTools Protocol)
@@ -64,6 +65,24 @@ DEPENDENCIES: List[DepInfo] = [
     # ── 搜索技能 ──
     DepInfo("bs4", "beautifulsoup4", "4.12.0", "search", "all"),
 
+    # ── PDF 处理 ──
+    DepInfo("PyPDF2", "PyPDF2", "3.0.0", "pdf", "all",
+            note="纯 Python PDF 文本提取（pdftotext 失败时的备用方案）"),
+
+    # ── 文档处理 (Excel/Word/PPT) ──
+    DepInfo("openpyxl", "openpyxl", "3.1.0", "doc", "all",
+            note="Excel (.xlsx) 文件读取"),
+    DepInfo("docx", "python-docx", "1.1.0", "doc", "all",
+            note="Word (.docx) 文件读取"),
+    DepInfo("pptx", "python-pptx", "0.6.21", "doc", "all",
+            note="PowerPoint (.pptx) 文件读取"),
+    DepInfo("xlrd", "xlrd", "2.0.0", "doc", "all",
+            note="旧版 Excel (.xls) 文件读取"),
+
+    # ── 文件编码检测 ──
+    DepInfo("chardet", "chardet", "5.0.0", "system", "all",
+            note="文件编码自动检测"),
+
     # ── 系统技能 ──
     DepInfo("psutil", "psutil", "5.9.0", "system", "all"),
 
@@ -404,6 +423,8 @@ def ensure_skill_deps(skill_category: str) -> bool:
         "tts": {"tts"},
         "stt": {"stt"},
         "tray": {"tray"},
+        "pdf": {"pdf"},
+        "doc": {"doc"},
     }
 
     cats = category_map.get(skill_category, {skill_category})

package/data/uploads/2026-04/32c9e9d3-8cf_test.pdf.pdf

@@ -0,0 +1 @@
+%PDF-1.4 test content

package/executor/engine.py

@@ -231,11 +231,16 @@ class ExecutionEngine:
 
         # 沙盒模式: 检查 Docker 可用性
         self._docker_available = False
+        self._docker_warned = False  # [v1.16.19] 标记是否已警告过 Docker 不可用
         if self.execution_mode == "sandbox":
             self._docker_available = self._check_docker()
             if not self._docker_available:
-                logger.warning("沙盒模式: Docker 不可用，将回退到本机执行")
-                self.execution_mode = "local"
+                # [v1.16.19] Docker 不可用时，使用轻量级进程沙盒（而非回退到本机模式）
+                # 轻量级沙盒: 临时工作目录 + subprocess 隔离，无全局锁，支持多 agent 并发
+                logger.info("沙盒模式: Docker 不可用，使用轻量级进程沙盒（临时工作目录隔离）")
+                self._docker_warned = True
+                # 不再修改 self.execution_mode，保持 "sandbox"
+                # 轻量级沙盒仍然标记为 sandbox 模式，不走全局执行锁
 
         # ── 启动时缓存: 检测平台 & Shell ────────────────────────────────────
         self._platform = detect_platform()
@@ -525,13 +530,17 @@ class ExecutionEngine:
         self._execution_count += 1
         exec_id = f"exec_{self._execution_count}"
 
-        mode_label = "本地" if self.execution_mode == "local" else "沙盒(Docker)"
+        mode_label = "本地" if self.execution_mode == "local" else ("沙盒" if self._docker_available else "沙盒")
         logger.info(f"[{exec_id}] 开始执行 ({language}, mode={mode_label}, timeout={exec_timeout}s)")
         logger.debug(f"[{exec_id}] 代码:\n{code[:500]}")
 
         # 根据执行模式选择执行方式
-        if self.execution_mode == "sandbox" and self._docker_available:
-            result = await self._execute_sandbox(language, code, exec_timeout, work_dir, env, exec_id)
+        if self.execution_mode == "sandbox":
+            if self._docker_available:
+                result = await self._execute_sandbox(language, code, exec_timeout, work_dir, env, exec_id)
+            else:
+                # [v1.16.19] Docker 不可用时，使用轻量级进程沙盒
+                result = await self._execute_lightweight_sandbox(language, code, exec_timeout, work_dir, env, exec_id)
         elif language == "python":
             result = await self._execute_python(code, exec_timeout, work_dir, env, exec_id)
         else:
@@ -539,7 +548,11 @@ class ExecutionEngine:
 
         result.language = language
         result.code = code
-        result.metadata = metadata
+        # [v1.16.19] 合并 metadata，不覆盖执行模式等内部字段
+        if result.metadata:
+            result.metadata.update(metadata)
+        else:
+            result.metadata = metadata
 
         if result.success:
             logger.info(f"[{exec_id}] 执行成功 (耗时: {result.execution_time:.2f}s)")
@@ -823,6 +836,65 @@ class ExecutionEngine:
                 execution_time=elapsed,
             )
 
+    # ======================================================================
+    # [v1.16.19] 轻量级进程沙盒（Docker 不可用时的替代方案）
+    # ======================================================================
+    # 设计目标:
+    #   - 使用 agent 自身的固定工作目录（不是临时目录）
+    #   - 不使用全局执行锁，多 agent 可并发
+    #   - 与本机模式的唯一区别：不走全局锁，允许多 agent 同时执行
+    #   - 有 Docker 时用 Docker 容器提供真正隔离，无 Docker 时直接在
+    #     agent 工作目录执行（各 agent 有自己的工作目录，天然隔离）
+    # ======================================================================
+
+    async def _execute_lightweight_sandbox(
+        self,
+        language: str,
+        code: str,
+        timeout: int,
+        work_dir: str,
+        env: Optional[Dict[str, str]],
+        exec_id: str,
+    ) -> ExecResult:
+        """直接在 agent 工作目录中执行代码（轻量级沙盒，无需 Docker）。
+
+        与本机模式的区别:
+        - 不使用全局执行锁，多 agent 可并发执行
+        - 每个 agent 使用自己的固定工作目录，天然隔离
+        - 执行方式与本机模式完全相同（subprocess）
+        """
+        start_time = asyncio.get_event_loop().time()
+
+        try:
+            # 直接在 agent 工作目录中执行（不创建临时目录）
+            if language == "python":
+                result = await self._execute_python(code, timeout, work_dir, env, exec_id)
+            elif language in ("powershell",):
+                result = ExecResult(
+                    success=False,
+                    error="PowerShell 不支持沙盒模式",
+                    execution_time=asyncio.get_event_loop().time() - start_time,
+                    metadata={"mode": "sandbox"},
+                )
+            else:
+                result = await self._execute_shell(language, code, timeout, work_dir, env, exec_id)
+
+            # 标记为沙盒模式
+            if result.metadata is None:
+                result.metadata = {}
+            result.metadata["mode"] = "sandbox"
+
+            return result
+
+        except Exception as e:
+            elapsed = asyncio.get_event_loop().time() - start_time
+            return ExecResult(
+                success=False,
+                error=f"沙盒执行异常: {e}",
+                execution_time=elapsed,
+                metadata={"mode": "sandbox"},
+            )
+
     # ======================================================================
     # 沙盒执行 (Docker 容器)
     # ======================================================================
@@ -902,13 +974,12 @@ class ExecutionEngine:
                     metadata={"mode": "sandbox"},
                 )
         except FileNotFoundError:
-            # Docker 不存在，回退到本地执行
-            logger.warning(f"[{exec_id}] Docker 不可用，回退到本地执行")
-            self.execution_mode = "local"
-            if language == "python":
-                return await self._execute_python(code, timeout, work_dir, env, exec_id)
-            else:
-                return await self._execute_shell(language, code, timeout, work_dir, env, exec_id)
+            # Docker 不存在，回退到轻量级沙盒
+            if not self._docker_warned:
+                logger.info(f"[{exec_id}] Docker 不可用，使用轻量级沙盒")
+                self._docker_warned = True
+            self._docker_available = False
+            return await self._execute_lightweight_sandbox(language, code, timeout, work_dir, env, exec_id)
         except Exception as e:
             elapsed = asyncio.get_event_loop().time() - start_time
             return ExecResult(
@@ -923,19 +994,27 @@ class ExecutionEngine:
         if mode not in ("local", "sandbox"):
             return False
         if mode == "sandbox":
-            if not self._check_docker():
-                logger.warning("沙盒模式: Docker 不可用")
-                return False
-            self._docker_available = True
+            self._docker_available = self._check_docker()
+            if not self._docker_available:
+                # [v1.16.19] Docker 不可用时，使用轻量级进程沙盒
+                # 不再回退到本机模式，保持 sandbox 避免全局锁
+                if not self._docker_warned:
+                    logger.info("沙盒模式: Docker 不可用，使用轻量级进程沙盒（临时工作目录隔离，无全局锁）")
+                    self._docker_warned = True
+                # 不 return False，允许切换到 sandbox
+            else:
+                self._docker_available = True
         self.execution_mode = mode
-        logger.info(f"执行模式已切换: {mode}")
+        logger.info(f"执行模式已切换: {mode}" + (" (Docker)" if mode == "sandbox" and self._docker_available else " (轻量级进程沙盒)" if mode == "sandbox" else ""))
         return True
 
     def get_execution_info(self) -> Dict[str, Any]:
         """获取当前执行模式信息。"""
+        sandbox_type = "docker" if self._docker_available else ("lightweight" if self.execution_mode == "sandbox" else None)
         return {
             "mode": self.execution_mode,
             "docker_available": self._docker_available,
+            "sandbox_type": sandbox_type,  # [v1.16.19] "docker" | "lightweight" | None
             "sandbox_image": self.sandbox_image,
             "sandbox_network": self.sandbox_network,
             "sandbox_memory": self.sandbox_memory,

package/install/install.sh

@@ -171,6 +171,27 @@ install_node() {
   exit 1
 }
 
+# ── Linux 系统依赖 ──────────────────────────────────────────
+install_linux_system_deps() {
+  if [ "$OS" != "linux" ] || ! command -v apt-get &>/dev/null; then return; fi
+  step "Installing system dependencies (poppler-utils, Chrome libs) ..."
+  sudo apt-get update -qq 2>/dev/null || true
+  # poppler-utils: PDF 文本提取 (pdftotext)
+  # Chrome/Chromium 共享库: 浏览器自动化必需
+  sudo apt-get install -y --no-install-recommends \
+    poppler-utils \
+    libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 \
+    libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 \
+    libgbm1 libpango-1.0-0 libcairo2 libasound2 libatspi2.0-0 \
+    2>/dev/null || true
+  # 尝试安装 Chromium (如果尚未安装)
+  if ! command -v google-chrome &>/dev/null && ! command -v chromium &>/dev/null && ! command -v chromium-browser &>/dev/null; then
+    sudo apt-get install -y --no-install-recommends chromium-browser 2>/dev/null || \
+    sudo apt-get install -y --no-install-recommends chromium 2>/dev/null || true
+  fi
+  success "系统依赖安装完成"
+}
+
 # ── 找到 myagent-ai 命令路径 ──────────────────────────────
 find_myagent_cmd() {
   if command -v myagent-ai &>/dev/null; then
@@ -192,6 +213,7 @@ find_myagent_cmd() {
 if ! $NO_DEPS; then
   check_python || install_python
   check_node   || install_node
+  install_linux_system_deps
 fi
 
 step "Installing $PKG_NAME via npm ..."

package/package.json

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

package/requirements.txt

@@ -14,6 +14,19 @@ requests>=2.31.0
 beautifulsoup4>=4.12.0
 psutil>=5.9.0
 
+# ============================================================
+# 技能系统 - 文档处理 (PDF/Excel/Word/PPT)
+# ============================================================
+# PyPDF2: 纯 Python PDF 文本提取（无需系统依赖，保证开箱即用）
+# 系统有 poppler-utils 时优先使用 pdftotext（更快更准），无时自动 fallback
+PyPDF2>=3.0.0
+# openpyxl: Excel (.xlsx) 文件读取（上传 Excel 自动提取内容）
+openpyxl>=3.1.0
+# python-docx: Word (.docx) 文件读取
+python-docx>=1.1.0
+# python-pptx: PowerPoint (.pptx) 文件读取
+python-pptx>=0.6.21
+
 # ============================================================
 # 技能系统 - 浏览器自动化 (ChromeDev MCP)
 # ============================================================
@@ -48,6 +61,14 @@ discord.py>=2.3.0
 # ============================================================
 edge-tts>=6.1.0
 
+# ============================================================
+# 系统工具增强 (预装，避免运行时缺失)
+# ============================================================
+# chardet: 文件编码检测（上传文件时自动识别编码）
+chardet>=5.0.0
+# xlrd: 旧版 Excel (.xls) 文件读取
+xlrd>=2.0.0
+
 # ============================================================
 # 语音识别 (本地 STT，默认启用)
 # ============================================================