myagent-ai 1.20.8 → 1.20.10

package/config.py

@@ -155,6 +155,7 @@ class AppConfig:
     data_dir: str = ""                 # 数据目录，默认 ~/.myagent/
     language: str = "zh-CN"
     timezone: str = "Asia/Shanghai"     # 时区，用于生成时间戳和提示词中的当前时间
+    public_url: str = ""               # [v1.20.8] 公开访问 URL（用于生成文件下载链接），如 http://your-server.com:8767
 
 
 # ==============================================================================

package/core/context_builder.py

@@ -238,12 +238,29 @@ class ContextBuilder:
             f"描述: {safe_desc}",
         ]
 
+        # [v1.20.8] 注入工作目录信息，让 Agent 知道文件应保存到哪里
+        work_dir = self._get_workspace_dir()
+        if work_dir:
+            parts.append(f"工作目录: {_xml_escape(str(work_dir))}")
+            parts.append(f"文件保存说明: 通过 file_write 或代码生成的文件请保存到工作目录下的 userfiles 子目录。发送文件给用户请使用 file_send 工具。")
+
         if agent_override_prompt:
             parts.append(f"附加指令: {_xml_escape(agent_override_prompt)}")
 
         parts.append("</whomi>")
         return "\n".join(parts)
 
+    def _get_workspace_dir(self) -> Optional[str]:
+        """[v1.20.8] 获取工作目录路径（~/.myagent/data/workspace）"""
+        try:
+            from config import ConfigManager
+            cm = ConfigManager()
+            wd = cm.data_dir / "workspace"
+            wd.mkdir(parents=True, exist_ok=True)
+            return str(wd)
+        except Exception:
+            return None
+
     def _build_memory(self, query: str, session_id: str, recall: str = "", memory_context_prompt: str = "") -> str:
         """
         构建 <automemory> 和 <recall_memory> 段落 —— 双层记忆检索结果。

package/core/deps_checker.py

@@ -126,6 +126,17 @@ DEPENDENCIES: List[DepInfo] = [
     # ── 远程桌面 (VNC) [v1.17.0] ──
     # VNC 依赖通过 apt 安装 (xvfb, x11vnc)，websockify 通过 pip 安装
     # 实际检测和安装在 VNCManager.ensure_dependencies() 中完成
+
+    # ── 系统工具 [v1.20.9] ──
+    # ffmpeg: SenseVoice 音频解码必需 (WAV→16kHz转换)
+]
+
+# [v1.20.9] 系统级工具依赖列表（非 Python 包，需通过系统包管理器安装）
+SYSTEM_TOOLS = [
+    {"name": "ffmpeg", "note": "FFmpeg 多媒体处理工具 (SenseVoice STT 必需, 用于音频格式转换)",
+     "install": {"linux": "sudo apt install ffmpeg", "macos": "brew install ffmpeg"}},
+    {"name": "convert", "note": "ImageMagick 图像处理工具 (VNC 截图备用)",
+     "install": {"linux": "sudo apt install imagemagick", "macos": "brew install imagemagick"}},
 ]
 
 

package/core/vnc_manager.py

@@ -335,15 +335,23 @@ class VNCManager:
         """查找 noVNC web 文件目录
         
         搜索顺序:
-          1. /usr/share/novnc (apt 安装)
-          2. /usr/local/share/novnc
-          3. pip 安装的 websockify 自带 novnc
+          1. 项目内置 noVNC (data/novnc/)
+          2. /usr/share/novnc (apt 安装)
+          3. /usr/local/share/novnc
+          4. pip 安装的 websockify 自带 novnc
         """
-        search_paths = [
+        search_paths = []
+
+        # [v1.20.9] 优先搜索项目内置 noVNC
+        _builtin_novnc = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'data', 'novnc')
+        if os.path.isdir(_builtin_novnc):
+            search_paths.append(_builtin_novnc)
+
+        search_paths.extend([
             "/usr/share/novnc",
             "/usr/local/share/novnc",
             "/opt/novnc",
-        ]
+        ])
 
         # 也搜索 pip 安装路径
         try:
@@ -362,12 +370,16 @@ class VNCManager:
 
         for path in search_paths:
             if os.path.isdir(path):
-                # 检查是否有 vnc.html
+                # 检查是否有 vnc.html（完整 noVNC 安装）
                 for sub in ["", "/vnc_lite", "/vnc"]:
                     html = os.path.join(path + sub, "vnc.html")
                     vnc_lite = os.path.join(path + sub, "vnc_lite.html")
                     if os.path.isfile(html) or os.path.isfile(vnc_lite):
                         return path + sub if sub else path
+                # [v1.20.9] 检查是否有 lib/rfb.js（内置精简 noVNC）
+                rfb_js = os.path.join(path, "lib", "rfb.js")
+                if os.path.isfile(rfb_js):
+                    return path
 
         return None
 

package/core/web_control.py

@@ -415,12 +415,30 @@ class WebControlManager:
         """
         向客户端下发命令并等待结果。
         Agent 工具调用线程阻塞在此, 直到客户端返回结果或超时。
+        
+        [v1.20.9] 修复: 如果面板尚未打开（刚执行了 open 但客户端还没加载完成），
+        会等待最多 15 秒让面板打开，而不是立即报错。
         """
         session = self.get_session(session_id)
         if not session:
             return {"success": False, "error": f"Session {session_id} not found or expired"}
+        
+        # [v1.20.9] 等待面板打开（最多 15 秒）
         if not session.is_panel_open:
-            return {"success": False, "error": "Panel is not open. Use 'open' action first."}
+            logger.info(f"[WebControl] 等待面板打开 (session: {session_id}, action: {action})")
+            waited = 0
+            while waited < 15:
+                await asyncio.sleep(1)
+                waited += 1
+                if session.is_panel_open:
+                    logger.info(f"[WebControl] 面板已打开 (等待了 {waited}s)")
+                    break
+                # 检查会话是否已关闭
+                if session._closed:
+                    return {"success": False, "error": "Session closed while waiting for panel"}
+            
+            if not session.is_panel_open:
+                return {"success": False, "error": "Panel is not open. Use 'open' action first. (waited 15s)"}
 
         cmd_id = uuid.uuid4().hex[:10]
         command = {

package/data/novnc/lib/base64.js

@@ -0,0 +1,100 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var Log = _interopRequireWildcard(require("./util/logging.js"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools/jint/sunspider/string-base64.js
+var _default = exports["default"] = {
+  /* Convert data (an array of integers) to a Base64 string. */
+  toBase64Table: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split(''),
+  base64Pad: '=',
+  encode: function encode(data) {
+    "use strict";
+
+    var result = '';
+    var length = data.length;
+    var lengthpad = length % 3;
+    // Convert every three bytes to 4 ascii characters.
+
+    for (var i = 0; i < length - 2; i += 3) {
+      result += this.toBase64Table[data[i] >> 2];
+      result += this.toBase64Table[((data[i] & 0x03) << 4) + (data[i + 1] >> 4)];
+      result += this.toBase64Table[((data[i + 1] & 0x0f) << 2) + (data[i + 2] >> 6)];
+      result += this.toBase64Table[data[i + 2] & 0x3f];
+    }
+
+    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
+    var j = length - lengthpad;
+    if (lengthpad === 2) {
+      result += this.toBase64Table[data[j] >> 2];
+      result += this.toBase64Table[((data[j] & 0x03) << 4) + (data[j + 1] >> 4)];
+      result += this.toBase64Table[(data[j + 1] & 0x0f) << 2];
+      result += this.toBase64Table[64];
+    } else if (lengthpad === 1) {
+      result += this.toBase64Table[data[j] >> 2];
+      result += this.toBase64Table[(data[j] & 0x03) << 4];
+      result += this.toBase64Table[64];
+      result += this.toBase64Table[64];
+    }
+    return result;
+  },
+  /* Convert Base64 data to a string */
+  /* eslint-disable comma-spacing */
+  toBinaryTable: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1],
+  /* eslint-enable comma-spacing */decode: function decode(data) {
+    var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var dataLength = data.indexOf('=') - offset;
+    if (dataLength < 0) {
+      dataLength = data.length - offset;
+    }
+
+    /* Every four characters is 3 resulting numbers */
+    var resultLength = (dataLength >> 2) * 3 + Math.floor(dataLength % 4 / 1.5);
+    var result = new Array(resultLength);
+
+    // Convert one by one.
+
+    var leftbits = 0; // number of bits decoded, but yet to be appended
+    var leftdata = 0; // bits decoded, but yet to be appended
+    for (var idx = 0, i = offset; i < data.length; i++) {
+      var c = this.toBinaryTable[data.charCodeAt(i) & 0x7f];
+      var padding = data.charAt(i) === this.base64Pad;
+      // Skip illegal characters and whitespace
+      if (c === -1) {
+        Log.Error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
+        continue;
+      }
+
+      // Collect data into leftdata, update bitcount
+      leftdata = leftdata << 6 | c;
+      leftbits += 6;
+
+      // If we have 8 or more bits, append 8 bits to the result
+      if (leftbits >= 8) {
+        leftbits -= 8;
+        // Append if not padding.
+        if (!padding) {
+          result[idx++] = leftdata >> leftbits & 0xff;
+        }
+        leftdata &= (1 << leftbits) - 1;
+      }
+    }
+
+    // If there are any bits left, the base64 string was corrupted
+    if (leftbits) {
+      var err = new Error('Corrupted base64 string');
+      err.name = 'Base64-Error';
+      throw err;
+    }
+    return result;
+  }
+};
+/* End of Base64 namespace */