myagent-ai 1.23.25 → 1.23.26

package/core/tool_dispatcher.py

@@ -76,7 +76,9 @@ class ToolDispatcher:
         if stream_callback is None:
             return
         import asyncio
-        event = {"type": event_type, **data}
+        # [v1.23.25] 用 "data" 键包裹 payload，与 file_send.py 的格式一致
+        # 前端 flow_engine.js 通过 evt.data 访问 payload
+        event = {"type": event_type, "data": data}
         try:
             if asyncio.iscoroutinefunction(stream_callback):
                 await stream_callback(event)
@@ -117,8 +119,13 @@ class ToolDispatcher:
         # ── [v1.23.0] 已迁移为内部服务/CLI 子命令的工具 ──
         elif tool_name == "recall_memory":
             return {"success": False, "error": "'recall_memory' 已迁移，请通过 <recall> 标签或 CLI 调用: command {\"command\": \"myagent-ai memory --keyword xxx\"}"}
+
+        # ── [v1.23.25] 恢复 playaudio/playvideo/file_send 直接工具调用 ──
+        # 原因: CLI 迁移后 LLM 不稳定地使用 command 包裹，导致工具经常失败
         elif tool_name in ("playaudio", "playvideo"):
-            return {"success": False, "error": f"'{tool_name}' 已迁移为 CLI 命令，请使用: command {{\"command\": \"myagent-ai {tool_name} --url URL --title 标题\"}}"}
+            return await self._exec_media(tool_name, params, task_id, stream_callback, sent_files)
+        elif tool_name == "file_send":
+            return await self._exec_file_send(params, task_id, stream_callback, sent_files)
 
         # ── [v1.23.0] 已迁移为 CLI 子命令的工具 — 提示使用 command 调用 ──
         elif tool_name in ("image_ocr", "ocr"):
@@ -127,8 +134,6 @@ class ToolDispatcher:
             return {"success": False, "error": f"'{tool_name}' 已迁移为 CLI 命令，请使用: command {{\"command\": \"myagent-ai analyze-image <image_path>\"}}"}
         elif tool_name in ("audio_transcribe", "transcribe"):
             return {"success": False, "error": f"'{tool_name}' 已迁移为 CLI 命令，请使用: command {{\"command\": \"myagent-ai transcribe <audio_path>\"}}"}
-        elif tool_name == "file_send":
-            return {"success": False, "error": "'file_send' 已迁移为 CLI 命令，请使用: command {\"command\": \"myagent-ai send-file <path>\"}"}
 
         # ── 兜底: SkillRegistry ──
         if self.skills:

package/package.json

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

package/web/api_server.py

@@ -1033,10 +1033,14 @@ async function loadLocalNoVNC() {{
     function stripJs(p) {{ return p.endsWith('.js') ? p.slice(0, -3) : p; }}
 
     // 加载并注册单个模块
+    // [v1.23.25] modId 使用完整路径（含 lib/ 前缀）保证 Babel 相对路径解析正确，
+    // fetchPath 剥离 lib/ 前缀用于 URL 请求（basePath 已含 /vnc/lib/）
     async function loadModule(filePath) {{
-        const modId = stripJs(filePath);
+        const modId = stripJs(filePath);  // e.g. "lib/deflator" or "vendor/pako/lib/zlib/zstream"
         if (_modules[modId]) return _modules[modId]; // 已加载
-        const resp = await fetch(basePath + filePath);
+        // strip leading "lib/" for fetch URL since basePath is already "/vnc/lib/"
+        const fetchPath = filePath.startsWith('lib/') ? filePath.slice(4) : filePath;
+        const resp = await fetch(basePath + fetchPath);
         if (!resp.ok) throw new Error('Failed to fetch ' + filePath + ': ' + resp.status);
         const code = await resp.text();
         const modExports = {{}};
@@ -1054,6 +1058,10 @@ async function loadLocalNoVNC() {{
     }}
 
     // 按依赖顺序加载所有 noVNC 模块
+    // [v1.23.25] 模块 ID 必须保留完整目录路径（lib/ 前缀），
+    // 因为 Babel 编译的 require() 使用相对于原始 lib/ 目录的相对路径。
+    // 例如 deflator.js 中 require("../lib/vendor/pako/...") 需要模块 ID 为 "lib/deflator"
+    // 才能正确解析为 "vendor/pako/..." 而非 "lib/vendor/pako/..."。
     const depFiles = [
         // pako vendor (zlib 依赖)
         'vendor/pako/lib/utils/common.js',
@@ -1067,53 +1075,53 @@ async function loadLocalNoVNC() {{
         'vendor/pako/lib/zlib/deflate.js',
         'vendor/pako/lib/zlib/gzheader.js',
         'vendor/pako/lib/zlib/zstream.js',
-        // noVNC core
-        'util/logging.js',
-        'util/events.js',
-        'util/eventtarget.js',
-        'util/strings.js',
-        'util/browser.js',
-        'util/int.js',
-        'util/element.js',
-        'util/cursor.js',
-        'base64.js',
-        'websock.js',
-        'display.js',
-        'inflator.js',
-        'deflator.js',
-        'decoders/copyrect.js',
-        'decoders/raw.js',
-        'decoders/rre.js',
-        'decoders/hextile.js',
-        'decoders/tight.js',
-        'decoders/tightpng.js',
-        'decoders/zrle.js',
-        'decoders/jpeg.js',
-        'encodings.js',
-        'input/keysymdef.js',
-        'input/keysym.js',
-        'input/xtscancodes.js',
-        'input/vkeys.js',
-        'input/fixedkeys.js',
-        'input/domkeytable.js',
-        'input/util.js',
-        'input/keyboard.js',
-        'input/gesturehandler.js',
+        // noVNC core — 使用 lib/ 前缀保持目录结构
+        'lib/util/logging.js',
+        'lib/util/events.js',
+        'lib/util/eventtarget.js',
+        'lib/util/strings.js',
+        'lib/util/browser.js',
+        'lib/util/int.js',
+        'lib/util/element.js',
+        'lib/util/cursor.js',
+        'lib/base64.js',
+        'lib/websock.js',
+        'lib/display.js',
+        'lib/inflator.js',
+        'lib/deflator.js',
+        'lib/decoders/copyrect.js',
+        'lib/decoders/raw.js',
+        'lib/decoders/rre.js',
+        'lib/decoders/hextile.js',
+        'lib/decoders/tight.js',
+        'lib/decoders/tightpng.js',
+        'lib/decoders/zrle.js',
+        'lib/decoders/jpeg.js',
+        'lib/encodings.js',
+        'lib/input/keysymdef.js',
+        'lib/input/keysym.js',
+        'lib/input/xtscancodes.js',
+        'lib/input/vkeys.js',
+        'lib/input/fixedkeys.js',
+        'lib/input/domkeytable.js',
+        'lib/input/util.js',
+        'lib/input/keyboard.js',
+        'lib/input/gesturehandler.js',
         // crypto (rfb.js → ra2.js → crypto/)
-        'crypto/bigint.js',
-        'crypto/dh.js',
-        'crypto/md5.js',
-        'crypto/des.js',
-        'crypto/aes.js',
-        'crypto/rsa.js',
-        'crypto/crypto.js',
-        'ra2.js',
+        'lib/crypto/bigint.js',
+        'lib/crypto/dh.js',
+        'lib/crypto/md5.js',
+        'lib/crypto/des.js',
+        'lib/crypto/aes.js',
+        'lib/crypto/rsa.js',
+        'lib/crypto/crypto.js',
+        'lib/ra2.js',
     ];
     for (const file of depFiles) {{
         await loadModule(file);
     }}
     // 最后加载 rfb.js
-    const rfbExports = await loadModule('rfb.js');
+    const rfbExports = await loadModule('lib/rfb.js');
     return rfbExports.default || rfbExports;
 }}
 </script>