myagent-ai 1.23.29 → 1.23.31

package/agents/main_agent.py

@@ -158,6 +158,12 @@ class MainAgent(BaseAgent):
   <tool><toolname>command</toolname><parms>{"command": "myagent-ai search xxx && myagent-ai read-url https://..."}</parms><timeout>30</timeout></tool>
   <tool><toolname>command</toolname><parms>{"command": "myagent-ai sysinfo && myagent-ai ps --filter python"}</parms><timeout>15</timeout></tool>
 
+**file_send**（向用户发送文件，文件会以卡片形式显示在聊天中）:
+  <tool><toolname>file_send</toolname><parms>{"file_path": "文件的绝对路径", "description": "文件描述（可选）"}</parms><timeout>30</timeout></tool>
+  - 当你需要把生成的文件（PDF、Excel、图片、脚本等）发送给用户时，直接使用此工具
+  - 当你需要发送一个已存在的文件时，直接使用此工具
+  - 不要把文件路径当成文本展示给用户，而是用 file_send 工具发送文件卡片
+
 **web_control**（网页控制器，在聊天中打开可操作的浏览器面板）:
   <tool><toolname>web_control</toolname><parms>{"action": "open", "url": "https://example.com"}</parms><timeout>30</timeout></tool>
   - 打开: {"action": "open", "url": "URL"}
@@ -275,8 +281,15 @@ class MainAgent(BaseAgent):
 
         logger.info(f"[{task_id}] 开始处理用户请求: {context.user_message[:100]}")
 
+        # [v1.23.30] 读取外部注入的 Agent 专属提示词（群聊、多Agent 场景使用）
+        # _try_model_chain_inner 通过此属性注入 group_context 等自定义提示词
+        _override_prompt = getattr(self, '_agent_override_prompt', None)
+
         try:
-            return await self.process_v2(context)
+            return await self.process_v2(
+                context,
+                agent_override_prompt=_override_prompt,
+            )
         finally:
             # 移除活跃上下文
             self.active_contexts.pop(context.session_id, None)

package/core/tool_dispatcher.py

@@ -197,23 +197,13 @@ class ToolDispatcher:
                 try:
                     p = _P(send_path)
                     if p.exists():
-                        from skills.file_send import FileSendSkill
-                        fskill = FileSendSkill()
-                        fresult = await fskill.execute(
-                            str(p), send_desc or f"文件: {p.name}",
-                            stream_callback=stream_callback,
+                        # [v1.23.29] 直接通过 _exec_file_send 发送（统一入口，确保 v2_file 推送）
+                        file_result = await self._exec_file_send(
+                            {"file_path": send_path, "description": send_desc},
+                            task_id, stream_callback, sent_files,
                         )
-                        if fresult.get("success"):
-                            logger.info(f"[{task_id}] CLI 自动发送文件: {p.name}")
-                            if sent_files is not None and fresult.get("file_id"):
-                                sent_files.append({
-                                    "id": fresult["file_id"],
-                                    "name": fresult.get("name", ""),
-                                    "size": fresult.get("size", 0),
-                                    "url": fresult.get("url", ""),
-                                })
-                        else:
-                            result["output"] += f"\n[文件发送失败: {fresult.get('error', '')}]"
+                        if not file_result.get("success"):
+                            result["output"] += f"\n[文件发送失败: {file_result.get('error', '')}]"
                 except Exception as e:
                     logger.warning(f"[{task_id}] CLI 文件发送异常: {e}")
                     result["output"] += f"\n[文件发送异常: {e}]"
@@ -303,7 +293,7 @@ class ToolDispatcher:
         stream_callback: Optional[Callable] = None,
         sent_files: Optional[List[Dict]] = None,
     ) -> Dict:
-        """发送文件给用户"""
+        """发送文件给用户 — 后端推送 v2_file SSE 事件 + 持久化到聊天记录"""
         try:
             from skills.file_send import FileSendSkill
             fskill = FileSendSkill()
@@ -313,20 +303,71 @@ class ToolDispatcher:
                 logger.warning(f"[{task_id}] file_send: 缺少 file_path 参数")
                 return {"success": False, "error": "缺少 file_path 参数，请提供要发送的文件路径"}
             logger.info(f"[{task_id}] file_send: 发送文件 {fpath}")
-            fresult = await fskill.execute(fpath, fdesc, stream_callback=stream_callback)
-            if not fresult.get("success"):
-                logger.warning(f"[{task_id}] file_send: 发送失败 - {fresult.get('error', '')}")
-            else:
-                logger.info(f"[{task_id}] file_send: 发送成功 {fresult.get('file_id', '')} → {fresult.get('name', '')}")
-            result = {"success": True, "output": json.dumps(fresult, ensure_ascii=False, indent=2), "data": fresult}
-            if sent_files is not None and fresult.get("success") and fresult.get("file_id"):
+            
+            # [v1.23.29] 先复制文件（不依赖 file_send.execute 的 SSE 发送）
+            from pathlib import Path as _P
+            import shutil, uuid as _uuid, time as _time
+            fpath_resolved = _P(fpath.strip().strip("'\"")).expanduser()
+            if not fpath_resolved.exists():
+                return {"success": False, "error": f"文件不存在: {fpath}"}
+            if not fpath_resolved.is_file():
+                return {"success": False, "error": f"不是文件: {fpath}"}
+
+            file_id = str(_uuid.uuid4())[:12]
+            date_dir = fskill.UPLOADS_DIR / _time.strftime("%Y-%m")
+            date_dir.mkdir(parents=True, exist_ok=True)
+            stored_name = f"{file_id}_{fpath_resolved.name}"
+            stored_path = date_dir / stored_name
+            shutil.copy2(str(fpath_resolved), str(stored_path))
+
+            mime_map = {
+                ".pdf": "application/pdf", ".png": "image/png", ".jpg": "image/jpeg",
+                ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp",
+                ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+                ".txt": "text/plain", ".csv": "text/csv", ".md": "text/markdown",
+                ".json": "application/json", ".html": "text/html",
+                ".mp3": "audio/mpeg", ".mp4": "video/mp4", ".wav": "audio/wav",
+                ".zip": "application/zip", ".tar.gz": "application/gzip",
+            }
+            mime = mime_map.get(fpath_resolved.suffix.lower(), "application/octet-stream")
+            size = stored_path.stat().st_size
+
+            file_data = {
+                "id": file_id,
+                "file_id": file_id,
+                "name": fpath_resolved.name,
+                "type": mime,
+                "size": size,
+                "description": fdesc or f"文件: {fpath_resolved.name}",
+                "url": f"/api/file/{file_id}?name={fpath_resolved.name}",
+                "download_url": f"/api/file/{file_id}/download?name={fpath_resolved.name}",
+            }
+
+            # [v1.23.29] 关键：通过 _emit_sse 后端推送 v2_file 事件到前端
+            # 这是文件卡片显示的核心机制 — 不依赖 file_send.execute 内部的 SSE 发送
+            await self._emit_sse("v2_file", file_data, stream_callback)
+            logger.info(f"[{task_id}] file_send: v2_file 已推送 → {file_id} ({fpath_resolved.name})")
+
+            # 持久化到 sent_files（写入聊天记录数据库）
+            if sent_files is not None:
                 sent_files.append({
-                    "id": fresult["file_id"],
-                    "name": fresult.get("name", ""),
-                    "type": fresult.get("type", ""),
-                    "size": fresult.get("size", 0),
+                    "id": file_id,
+                    "file_id": file_id,
+                    "name": fpath_resolved.name,
+                    "type": mime,
+                    "size": size,
+                    "description": fdesc or f"文件: {fpath_resolved.name}",
+                    "url": file_data["url"],
+                    "download_url": file_data["download_url"],
                 })
-            return result
+
+            return {
+                "success": True,
+                "output": f"文件已发送: {fpath_resolved.name} (ID: {file_id}, 大小: {size} bytes)",
+                "data": file_data,
+            }
         except Exception as e:
             logger.error(f"[{task_id}] file_send: 异常 - {e}", exc_info=True)
             return {"success": False, "error": f"文件发送失败: {e}"}

package/package.json

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

package/web/ui/chat/flow_engine.js

@@ -811,6 +811,114 @@ function updateStreamingMessage(msgIdx) {
         }
       }
     }
+
+    // [v1.23.30] 文件卡片渲染（backward compat 路径 — 确保无 parts 时也能显示文件）
+    if (msg._files && msg._files.length > 0) {
+      var bcImageContainer = contentArea.querySelector(':scope > .msg-attachments-images');
+      var bcExistingFiles = contentArea.querySelectorAll(':scope > .msg-attachments-files');
+      var bcFileContainer = bcExistingFiles.length > 0 ? bcExistingFiles[0] : null;
+      var bcRenderedIds = (bcFileContainer ? bcFileContainer._renderedFileIds : []) || [];
+      var bcRenderedImageIds = (bcImageContainer ? bcImageContainer._renderedImageIds : []) || [];
+      for (var _bcFi = 0; _bcFi < msg._files.length; _bcFi++) {
+        var _bcF = msg._files[_bcFi];
+        var _bcFId = _bcF.id || _bcF.file_id || '';
+        if (bcRenderedIds.indexOf(_bcFId) >= 0 || bcRenderedImageIds.indexOf(_bcFId) >= 0) continue;
+        var _bcIsImg = _bcF.type && _bcF.type.indexOf('image/') === 0;
+        var _bcIsAud = _bcF.type && _bcF.type.indexOf('audio/') === 0;
+        var _bcIsVid = _bcF.type && _bcF.type.indexOf('video/') === 0;
+        if (_bcIsImg || _bcIsAud || _bcIsVid) {
+          if (!bcImageContainer) {
+            bcImageContainer = document.createElement('div');
+            bcImageContainer.className = 'msg-attachments msg-attachments-images';
+            bcImageContainer._renderedImageIds = [];
+            var bcBubble = contentArea.querySelector('.message-bubble');
+            if (bcBubble) {
+              contentArea.insertBefore(bcImageContainer, bcBubble);
+            } else {
+              contentArea.appendChild(bcImageContainer);
+            }
+          }
+          if (_bcIsImg && _bcFId) {
+            var _bcImgDiv = document.createElement('div');
+            _bcImgDiv.className = 'msg-image-wrapper agent-image';
+            _bcImgDiv.innerHTML = '<img src="/api/file/' + _bcFId + '" class="msg-image" loading="lazy" alt="' + escapeHtml(_bcF.name || 'image') + '" onclick="openFileViewer(\'' + _bcFId + '\', this.src, \'' + escapeHtml(_bcF.name) + '\')" />';
+            bcImageContainer.appendChild(_bcImgDiv);
+          } else if (_bcIsAud && _bcFId) {
+            var _bcAudDiv = document.createElement('div');
+            _bcAudDiv.className = 'msg-media-player';
+            _bcAudDiv.innerHTML = '<audio controls src="/api/file/' + _bcFId + '" style="width:100%;max-width:480px" preload="metadata"></audio><div class="msg-media-title">' + escapeHtml(_bcF.name || '音频') + '</div>';
+            bcImageContainer.appendChild(_bcAudDiv);
+          } else if (_bcIsVid && _bcFId) {
+            var _bcVidDiv = document.createElement('div');
+            _bcVidDiv.className = 'msg-media-player';
+            _bcVidDiv.innerHTML = '<video controls src="/api/file/' + _bcFId + '" style="width:100%;max-width:640px;border-radius:8px" preload="metadata"></video><div class="msg-media-title">' + escapeHtml(_bcF.name || '视频') + '</div>';
+            bcImageContainer.appendChild(_bcVidDiv);
+          }
+          bcImageContainer._renderedImageIds.push(_bcFId);
+          continue;
+        }
+        if (!bcFileContainer) {
+          bcFileContainer = document.createElement('div');
+          bcFileContainer.className = 'msg-attachments msg-attachments-files';
+          bcFileContainer._renderedFileIds = [];
+          var bcBubble2 = contentArea.querySelector('.message-bubble');
+          if (bcBubble2) {
+            bcBubble2.parentNode.insertBefore(bcFileContainer, bcBubble2.nextSibling);
+          } else {
+            contentArea.appendChild(bcFileContainer);
+          }
+        }
+        var _bcIcon = _getFileIcon(_bcF.name || _bcF.type || '');
+        var _bcSizeStr = _bcF.size ? formatFileSize(_bcF.size) : '';
+        var _bcFDiv = document.createElement('div');
+        _bcFDiv.className = 'msg-file-item agent-file';
+        _bcFDiv.title = '点击预览';
+        _bcFDiv.innerHTML = '<span class="msg-file-icon">' + _bcIcon + '</span>' +
+          '<span class="msg-file-info"><span class="msg-file-name">' + escapeHtml(_bcF.name) + '</span>' +
+          (_bcSizeStr ? '<span class="msg-file-size">' + _bcSizeStr + '</span>' : '') +
+          '</span>' +
+          '<span class="msg-file-actions">' +
+          '<a class="msg-file-download" href="/api/file/' + (_bcFId || '') + '?name=' + encodeURIComponent(_bcF.name || 'file') + '" download="' + escapeHtml(_bcF.name) + '" title="下载" onclick="event.stopPropagation()">⬇</a>' +
+          '</span>';
+        bcFileContainer.appendChild(_bcFDiv);
+        bcFileContainer._renderedFileIds.push(_bcFId);
+      }
+    }
+
+    // [v1.23.30] 在线媒体嵌入渲染（backward compat 路径）
+    if (msg._media && msg._media.length > 0) {
+      var bcExistingMedia = contentArea.querySelectorAll(':scope > .msg-attachments-media');
+      var bcMediaContainer = bcExistingMedia.length > 0 ? bcExistingMedia[0] : null;
+      if (!bcMediaContainer) {
+        bcMediaContainer = document.createElement('div');
+        bcMediaContainer.className = 'msg-attachments msg-attachments-media';
+        var bcBubble3 = contentArea.querySelector('.message-bubble');
+        if (bcBubble3) {
+          contentArea.insertBefore(bcMediaContainer, bcBubble3);
+        } else {
+          contentArea.appendChild(bcMediaContainer);
+        }
+      }
+      var bcRenderedMediaUrls = bcMediaContainer._renderedMediaUrls || [];
+      for (var _bcMi = 0; _bcMi < msg._media.length; _bcMi++) {
+        var _bcM = msg._media[_bcMi];
+        var _bcMUrl = _bcM.embed_url || _bcM.original_url || '';
+        if (!_bcMUrl || bcRenderedMediaUrls.indexOf(_bcMUrl) >= 0) continue;
+        var _bcMIsAud = _bcM.media_type === 'audio';
+        var _bcMTitle = _bcM.title || (_bcMIsAud ? '在线音乐' : '在线视频');
+        var _bcMDiv = document.createElement('div');
+        _bcMDiv.className = 'msg-media-embed' + (_bcMIsAud ? ' msg-media-audio' : ' msg-media-video');
+        if (_bcM.embed_url) {
+          _bcMDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">' + (_bcMIsAud ? '🎵' : '🎬') + '</span><span class="msg-media-label">' + escapeHtml(_bcMTitle) + '</span></div><iframe src="' + escapeHtml(_bcMUrl) + '" style="width:100%;max-width:' + (_bcMIsAud ? '480' : '640') + 'px;height:' + (_bcMIsAud ? '80' : '360') + 'px;border:none;border-radius:8px" loading="lazy" allow="autoplay;encrypted-media;picture-in-picture" allowfullscreen></iframe>';
+        } else {
+          _bcMDiv.style.cssText = 'padding:10px 14px;border-radius:8px;background:rgba(255,255,255,0.06);border:1px solid rgba(255,255,255,0.1);cursor:pointer';
+          _bcMDiv.innerHTML = '<div class="msg-media-header"><span class="msg-media-icon">' + (_bcMIsAud ? '🎵' : '🎬') + '</span><span class="msg-media-label">' + escapeHtml(_bcMTitle) + '</span></div>';
+        }
+        bcMediaContainer.appendChild(_bcMDiv);
+        bcRenderedMediaUrls.push(_bcMUrl);
+      }
+      bcMediaContainer._renderedMediaUrls = bcRenderedMediaUrls;
+    }
   }
 
   // Update streaming indicator