myagent-ai 1.23.31 → 1.23.33

package/core/tool_dispatcher.py

@@ -182,7 +182,7 @@ class ToolDispatcher:
         )
         result = exec_result.to_dict()
 
-        output = result.get("output", "")
+        output = result.get("stdout", "") or result.get("output", "")
         import re as _re
 
         # [v1.23.0] 检测 __SEND_FILE__ 标记 — CLI send-file 命令输出此标记
@@ -225,7 +225,8 @@ class ToolDispatcher:
                 if not media_result.get("success"):
                     result["output"] += f"\n[音频播放失败: {media_result.get('error', '')}]"
         if video_markers:
-            clean_output = result.get("output", "")
+            # [v1.23.32] 修复: result 可能没有 output key（来自 to_dict 的 stdout）
+            clean_output = result.get("output", "") or clean_output
             clean_output = _re.sub(r'__EMBED_VIDEO__.+?__END__\n?', '', clean_output).strip()
             result["output"] = clean_output
             for media_url, media_title in video_markers:
@@ -261,6 +262,10 @@ class ToolDispatcher:
                 except Exception:
                     pass
 
+        # [v1.23.32] 确保 result 始终有 output 字段（to_dict 返回 stdout，V2 循环依赖 output）
+        if "output" not in result:
+            result["output"] = clean_output
+
         return result
 
     async def _exec_recall_memory(self, params: Dict, task_id: str) -> Dict:
@@ -484,22 +489,14 @@ class ToolDispatcher:
             fpath = _P(media_file).expanduser().resolve()
             if not fpath.exists():
                 return {"success": False, "error": f"文件不存在: {media_file}"}
-            from skills.file_send import FileSendSkill
-            fskill = FileSendSkill()
+            # [v1.23.32] 使用统一入口 _exec_file_send（正确的 MIME + v2_file 推送 + sent_files 持久化）
             desc = f"{'音频' if media_type == 'audio' else '视频'}播放: {fpath.name}"
-            fresult = await fskill.execute(str(fpath), desc, stream_callback=stream_callback)
+            fresult = await self._exec_file_send(
+                {"file_path": str(fpath), "description": desc},
+                task_id, stream_callback, sent_files,
+            )
             if fresult.get("success"):
-                fresult["_media_type"] = media_type
-                result = {"success": True, "output": f"已发送{media_type}文件: {fpath.name}", "data": fresult}
-                if sent_files is not None and fresult.get("file_id"):
-                    sent_files.append({
-                        "id": fresult["file_id"],
-                        "name": fresult.get("name", ""),
-                        "type": fresult.get("type", ""),
-                        "size": fresult.get("size", 0),
-                        "_media_type": media_type,
-                    })
-                return result
+                return {"success": True, "output": f"已发送{media_type}文件: {fpath.name}", "data": fresult.get("data", {})}
             else:
                 return {"success": False, "error": fresult.get("error", "文件发送失败")}
         else:

package/package.json

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

package/skills/file_send.py

@@ -105,6 +105,9 @@ class FileSendSkill:
                 ".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",
+                ".webm": "video/webm", ".ogg": "audio/ogg", ".flac": "audio/flac",
+                ".zip": "application/zip", ".tar.gz": "application/gzip",
             }
             mime = mime_map.get(fpath.suffix.lower(), "application/octet-stream")
             size = stored_path.stat().st_size