test-wuying-agentbay-sdk 0.15.0-beta.20260113141358 → 0.15.0-beta.20260114142100

package/dist/index.cjs

@@ -9702,6 +9702,15 @@ var _BaseTaskAgent = class _BaseTaskAgent {
     }
     return baseName;
   }
+  getServerName() {
+    if (this.toolPrefix === "flux") {
+      return "flux";
+    }
+    if (this.toolPrefix === "browser_use") {
+      return "wuying_browseruse";
+    }
+    return "wuying_mobile_agent";
+  }
   /**
    * Execute a specific task described in human language.
    */
@@ -9710,7 +9719,9 @@ var _BaseTaskAgent = class _BaseTaskAgent {
       const args = { task };
       const result = await this.session.callMcpTool(
         this.getToolName("execute"),
-        args
+        args,
+        false,
+        this.getServerName()
       );
       if (!result.success) {
         return {
@@ -9880,7 +9891,9 @@ var _BaseTaskAgent = class _BaseTaskAgent {
       const args = { task_id: taskId };
       const result = await this.session.callMcpTool(
         this.getToolName("get_status"),
-        args
+        args,
+        false,
+        this.getServerName()
       );
       if (!result.success) {
         return {
@@ -9937,7 +9950,9 @@ var _BaseTaskAgent = class _BaseTaskAgent {
       const args = { task_id: taskId };
       const result = await this.session.callMcpTool(
         this.getToolName("terminate"),
-        args
+        args,
+        false,
+        this.getServerName()
       );
       let content;
       try {
@@ -11080,7 +11095,7 @@ var _BrowserAgent = class _BrowserAgent {
     return [null, 0];
   }
   async _callMcpTool(toolName, args) {
-    return this.session.callMcpTool(toolName, args);
+    return this.session.callMcpTool(toolName, args, false, "pageuse-mcp-server");
   }
   _delay(ms) {
     return new Promise((res) => setTimeout(res, ms));
@@ -12425,7 +12440,12 @@ var _Code = class _Code {
         language: canonicalLanguage,
         timeout_s: timeoutS
       };
-      const response = await this.session.callMcpTool("run_code", args);
+      const response = await this.session.callMcpTool(
+        "run_code",
+        args,
+        false,
+        "wuying_codespace"
+      );
       let codeResult;
       if (response.success) {
         codeResult = this.parseBackendResponse(response.data);
@@ -12589,7 +12609,12 @@ var _Command = class _Command {
       if (envs !== void 0) {
         args.envs = envs;
       }
-      const result = await this.session.callMcpTool("shell", args);
+      const result = await this.session.callMcpTool(
+        "shell",
+        args,
+        false,
+        "wuying_shell"
+      );
       if (result.success) {
         try {
           let dataJson;
@@ -12780,6 +12805,87 @@ var _Computer = class _Computer {
   constructor(session) {
     this.session = session;
   }
+  static normalizeImageFormat(format, defaultValue) {
+    const f = String(format || "").trim().toLowerCase();
+    if (!f) {
+      return defaultValue;
+    }
+    if (f === "jpg") {
+      return "jpeg";
+    }
+    return f;
+  }
+  static validateBase64String(base64String) {
+    const s = String(base64String || "");
+    if (!s) {
+      throw new Error("Empty base64 string");
+    }
+    if (s.length % 4 !== 0) {
+      throw new Error("Invalid base64 string length");
+    }
+    const base64WithoutPadding = s.replace(/=+$/, "");
+    if (!/^[A-Za-z0-9+/]+$/.test(base64WithoutPadding)) {
+      throw new Error("Invalid base64 string format");
+    }
+    const paddingMatch = s.match(/=+$/);
+    if (paddingMatch && paddingMatch[0].length > 2) {
+      throw new Error("Invalid base64 padding format");
+    }
+  }
+  static decodeScreenshotJsonToBytesStrict(jsonText, expectedFormat) {
+    const s = String(jsonText || "").trim();
+    if (!s) {
+      throw new Error("Empty image data");
+    }
+    if (!s.startsWith("{")) {
+      throw new Error("Screenshot tool returned non-JSON data");
+    }
+    let obj;
+    try {
+      obj = JSON.parse(s);
+    } catch (e) {
+      throw new Error(`Invalid screenshot JSON: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
+      throw new Error("Invalid screenshot JSON: expected object");
+    }
+    const b64 = obj.data;
+    if (typeof b64 !== "string" || !b64.trim()) {
+      throw new Error("Screenshot JSON missing base64 field");
+    }
+    _Computer.validateBase64String(b64);
+    let bytes;
+    if (typeof Buffer !== "undefined") {
+      bytes = new Uint8Array(Buffer.from(b64, "base64"));
+    } else {
+      const binary = atob(b64);
+      const out = new Uint8Array(binary.length);
+      for (let i = 0; i < binary.length; i++) {
+        out[i] = binary.charCodeAt(i);
+      }
+      bytes = out;
+    }
+    const fmt = _Computer.normalizeImageFormat(expectedFormat, "png");
+    if (fmt === "png") {
+      const pngMagic = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]);
+      for (let i = 0; i < pngMagic.length; i++) {
+        if (bytes[i] !== pngMagic[i]) {
+          throw new Error("Screenshot data does not match expected format 'png'");
+        }
+      }
+      return bytes;
+    }
+    if (fmt === "jpeg") {
+      const jpgMagic = new Uint8Array([255, 216, 255]);
+      for (let i = 0; i < jpgMagic.length; i++) {
+        if (bytes[i] !== jpgMagic[i]) {
+          throw new Error("Screenshot data does not match expected format 'jpeg'");
+        }
+      }
+      return bytes;
+    }
+    throw new Error(`Unsupported format: ${JSON.stringify(expectedFormat)}`);
+  }
   /**
    * Click mouse at specified coordinates.
    *
@@ -12807,7 +12913,7 @@ var _Computer = class _Computer {
     }
     const args = { x, y, button: buttonStr };
     try {
-      const result = await this.session.callMcpTool("click_mouse", args);
+      const result = await this.session.callMcpTool("click_mouse", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -12845,7 +12951,7 @@ var _Computer = class _Computer {
   async moveMouse(x, y) {
     const args = { x, y };
     try {
-      const result = await this.session.callMcpTool("move_mouse", args);
+      const result = await this.session.callMcpTool("move_mouse", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -12890,7 +12996,7 @@ var _Computer = class _Computer {
     }
     const args = { from_x: fromX, from_y: fromY, to_x: toX, to_y: toY, button: buttonStr };
     try {
-      const result = await this.session.callMcpTool("drag_mouse", args);
+      const result = await this.session.callMcpTool("drag_mouse", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -12933,7 +13039,7 @@ var _Computer = class _Computer {
     }
     const args = { x, y, direction: directionStr, amount };
     try {
-      const result = await this.session.callMcpTool("scroll", args);
+      const result = await this.session.callMcpTool("scroll", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -12968,7 +13074,7 @@ var _Computer = class _Computer {
   async inputText(text) {
     const args = { text };
     try {
-      const result = await this.session.callMcpTool("input_text", args);
+      const result = await this.session.callMcpTool("input_text", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -13005,7 +13111,7 @@ var _Computer = class _Computer {
   async pressKeys(keys, hold = false) {
     const args = { keys, hold };
     try {
-      const result = await this.session.callMcpTool("press_keys", args);
+      const result = await this.session.callMcpTool("press_keys", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -13041,7 +13147,7 @@ var _Computer = class _Computer {
   async releaseKeys(keys) {
     const args = { keys };
     try {
-      const result = await this.session.callMcpTool("release_keys", args);
+      const result = await this.session.callMcpTool("release_keys", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -13075,7 +13181,7 @@ var _Computer = class _Computer {
    */
   async getCursorPosition() {
     try {
-      const result = await this.session.callMcpTool("get_cursor_position", {});
+      const result = await this.session.callMcpTool("get_cursor_position", {}, false, "wuying_ui");
       if (!result.success) {
         return {
           success: false,
@@ -13141,7 +13247,7 @@ var _Computer = class _Computer {
    */
   async getScreenSize() {
     try {
-      const result = await this.session.callMcpTool("get_screen_size", {});
+      const result = await this.session.callMcpTool("get_screen_size", {}, false, "wuying_ui");
       if (!result.success) {
         return {
           success: false,
@@ -13212,7 +13318,7 @@ var _Computer = class _Computer {
    */
   async screenshot() {
     try {
-      const result = await this.session.callMcpTool("system_screenshot", {});
+      const result = await this.session.callMcpTool("system_screenshot", {}, false, "mcp-server");
       if (!result.success) {
         return {
           success: false,
@@ -13245,6 +13351,55 @@ var _Computer = class _Computer {
       };
     }
   }
+  /**
+   * Capture the current screen and return raw image bytes (beta).
+   *
+   * This API uses the MCP tool `screenshot` (wuying_capture) and expects the backend to return
+   * a JSON string with top-level field `data` containing base64.
+   *
+   * @param format - Output image format ("png", "jpeg", or "jpg"). Default is "png"
+   */
+  async betaTakeScreenshot(format = "png") {
+    const fmt = _Computer.normalizeImageFormat(format, "png");
+    if (fmt !== "png" && fmt !== "jpeg") {
+      return {
+        success: false,
+        requestId: "",
+        errorMessage: `Unsupported format: ${JSON.stringify(format)}. Supported values: "png", "jpeg".`,
+        data: new Uint8Array(),
+        format: fmt
+      };
+    }
+    try {
+      const result = await this.session.callMcpTool("screenshot", { format: fmt }, false, "wuying_capture");
+      const requestId = result.requestId || "";
+      if (!result.success) {
+        return {
+          success: false,
+          requestId,
+          errorMessage: result.errorMessage || "Failed to take screenshot",
+          data: new Uint8Array(),
+          format: fmt
+        };
+      }
+      const bytes = _Computer.decodeScreenshotJsonToBytesStrict(String(result.data || ""), fmt);
+      return {
+        success: true,
+        requestId,
+        errorMessage: "",
+        data: bytes,
+        format: fmt
+      };
+    } catch (error) {
+      return {
+        success: false,
+        requestId: "",
+        errorMessage: `Failed to take screenshot: ${error instanceof Error ? error.message : String(error)}`,
+        data: new Uint8Array(),
+        format: fmt
+      };
+    }
+  }
   /**
    * Lists all root windows.
    *
@@ -13265,7 +13420,7 @@ var _Computer = class _Computer {
   async listRootWindows(timeoutMs = 3e3) {
     try {
       const args = { timeout_ms: timeoutMs };
-      const response = await this.session.callMcpTool("list_root_windows", args);
+      const response = await this.session.callMcpTool("list_root_windows", args, false, "wuying_ui");
       if (!response.success) {
         return {
           requestId: response.requestId,
@@ -13310,7 +13465,7 @@ var _Computer = class _Computer {
   async getActiveWindow() {
     try {
       const args = {};
-      const response = await this.session.callMcpTool("get_active_window", args);
+      const response = await this.session.callMcpTool("get_active_window", args, false, "wuying_ui");
       if (!response.success) {
         return {
           requestId: response.requestId,
@@ -13355,7 +13510,7 @@ var _Computer = class _Computer {
   async activateWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("activate_window", args);
+      const response = await this.session.callMcpTool("activate_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13390,7 +13545,7 @@ var _Computer = class _Computer {
   async closeWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("close_window", args);
+      const response = await this.session.callMcpTool("close_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13425,7 +13580,7 @@ var _Computer = class _Computer {
   async maximizeWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("maximize_window", args);
+      const response = await this.session.callMcpTool("maximize_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13460,7 +13615,7 @@ var _Computer = class _Computer {
   async minimizeWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("minimize_window", args);
+      const response = await this.session.callMcpTool("minimize_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13496,7 +13651,7 @@ var _Computer = class _Computer {
   async restoreWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("restore_window", args);
+      const response = await this.session.callMcpTool("restore_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13533,7 +13688,7 @@ var _Computer = class _Computer {
   async resizeWindow(windowId, width, height) {
     try {
       const args = { window_id: windowId, width, height };
-      const response = await this.session.callMcpTool("resize_window", args);
+      const response = await this.session.callMcpTool("resize_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13568,7 +13723,7 @@ var _Computer = class _Computer {
   async fullscreenWindow(windowId) {
     try {
       const args = { window_id: windowId };
-      const response = await this.session.callMcpTool("fullscreen_window", args);
+      const response = await this.session.callMcpTool("fullscreen_window", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13602,7 +13757,7 @@ var _Computer = class _Computer {
   async focusMode(on) {
     try {
       const args = { on };
-      const response = await this.session.callMcpTool("focus_mode", args);
+      const response = await this.session.callMcpTool("focus_mode", args, false, "wuying_ui");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13643,7 +13798,7 @@ var _Computer = class _Computer {
         desktop,
         ignore_system_apps: ignoreSystemApps
       };
-      const response = await this.session.callMcpTool("get_installed_apps", args);
+      const response = await this.session.callMcpTool("get_installed_apps", args, false, "wuying_app");
       if (!response.success) {
         return {
           requestId: response.requestId,
@@ -13692,7 +13847,7 @@ var _Computer = class _Computer {
       const args = { start_cmd: startCmd };
       if (workDirectory) args.work_directory = workDirectory;
       if (activity) args.activity = activity;
-      const response = await this.session.callMcpTool("start_app", args);
+      const response = await this.session.callMcpTool("start_app", args, false, "wuying_app");
       if (!response.success) {
         return {
           requestId: response.requestId,
@@ -13737,7 +13892,7 @@ var _Computer = class _Computer {
   async stopAppByPName(pname) {
     try {
       const args = { pname };
-      const response = await this.session.callMcpTool("stop_app_by_pname", args);
+      const response = await this.session.callMcpTool("stop_app_by_pname", args, false, "wuying_app");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13772,7 +13927,7 @@ var _Computer = class _Computer {
   async stopAppByPID(pid) {
     try {
       const args = { pid };
-      const response = await this.session.callMcpTool("stop_app_by_pid", args);
+      const response = await this.session.callMcpTool("stop_app_by_pid", args, false, "wuying_app");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13806,7 +13961,7 @@ var _Computer = class _Computer {
   async stopAppByCmd(cmd) {
     try {
       const args = { stop_cmd: cmd };
-      const response = await this.session.callMcpTool("stop_app_by_cmd", args);
+      const response = await this.session.callMcpTool("stop_app_by_cmd", args, false, "wuying_app");
       return {
         requestId: response.requestId,
         success: response.success,
@@ -13838,7 +13993,7 @@ var _Computer = class _Computer {
    */
   async listVisibleApps() {
     try {
-      const response = await this.session.callMcpTool("list_visible_apps", {});
+      const response = await this.session.callMcpTool("list_visible_apps", {}, false, "wuying_app");
       if (!response.success) {
         return {
           requestId: response.requestId,
@@ -14910,7 +15065,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "create_directory",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -14955,7 +15112,12 @@ var _FileSystem = class _FileSystem {
   async deleteFile(path6) {
     try {
       const args = { path: path6 };
-      const result = await this.session.callMcpTool("delete_file", args);
+      const result = await this.session.callMcpTool(
+        "delete_file",
+        args,
+        false,
+        "wuying_filesystem"
+      );
       if (!result.success) {
         return {
           requestId: result.requestId,
@@ -15049,7 +15211,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "edit_file",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15097,7 +15261,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "get_file_info",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15175,7 +15341,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "list_directory",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15228,7 +15396,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "move_file",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15275,7 +15445,9 @@ var _FileSystem = class _FileSystem {
       }
       const result = await this.session.callMcpTool(
         "read_file",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         if (formatType === "binary") {
@@ -15386,7 +15558,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "read_multiple_files",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15477,7 +15651,9 @@ var _FileSystem = class _FileSystem {
       }
       const result = await this.session.callMcpTool(
         "search_files",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15532,7 +15708,9 @@ var _FileSystem = class _FileSystem {
       };
       const result = await this.session.callMcpTool(
         "write_file",
-        args
+        args,
+        false,
+        "wuying_filesystem"
       );
       if (!result.success) {
         return {
@@ -15848,7 +16026,12 @@ var _FileSystem = class _FileSystem {
   async getFileChange(path6) {
     try {
       const args = { path: path6 };
-      const result = await this.session.callMcpTool("get_file_change", args);
+      const result = await this.session.callMcpTool(
+        "get_file_change",
+        args,
+        false,
+        "wuying_filesystem"
+      );
       if (!result.success) {
         return {
           requestId: result.requestId,
@@ -16111,41 +16294,27 @@ function normalizeImageFormat(format, defaultValue) {
   return f;
 }
 _chunkJB6CNGN4cjs.__name.call(void 0, normalizeImageFormat, "normalizeImageFormat");
-function stripDataUrlPrefix(b64) {
-  const s = String(b64 || "").trim();
-  const idx = s.indexOf("base64,");
-  if (idx >= 0) {
-    return s.slice(idx + "base64,".length).trim();
+function validateBase64String(base64String) {
+  const s = String(base64String || "");
+  if (!s) {
+    throw new Error("Empty base64 string");
   }
-  return s;
-}
-_chunkJB6CNGN4cjs.__name.call(void 0, stripDataUrlPrefix, "stripDataUrlPrefix");
-function indexOfSubarray(haystack, needle, maxSearch) {
-  if (needle.length === 0 || haystack.length < needle.length) {
-    return -1;
-  }
-  const limit = Math.min(haystack.length, Math.max(0, maxSearch));
-  for (let i = 0; i + needle.length <= limit; i++) {
-    let ok = true;
-    for (let j = 0; j < needle.length; j++) {
-      if (haystack[i + j] !== needle[j]) {
-        ok = false;
-        break;
-      }
-    }
-    if (ok) {
-      return i;
-    }
+  const base64WithoutPadding = s.replace(/=+$/, "");
+  if (!/^[A-Za-z0-9+/]+$/.test(base64WithoutPadding)) {
+    throw new Error("Invalid base64 string format");
   }
-  return -1;
-}
-_chunkJB6CNGN4cjs.__name.call(void 0, indexOfSubarray, "indexOfSubarray");
-function base64ToUint8Array(input) {
-  let s = stripDataUrlPrefix(input).replace(/[\r\n\t ]+/g, "").replace(/-/g, "+").replace(/_/g, "/");
-  const mod = s.length % 4;
-  if (mod !== 0) {
-    s += "=".repeat(4 - mod);
+  if (s.length % 4 !== 0) {
+    throw new Error("Invalid base64 string length");
+  }
+  const paddingMatch = s.match(/=+$/);
+  if (paddingMatch && paddingMatch[0].length > 2) {
+    throw new Error("Invalid base64 padding format");
   }
+}
+_chunkJB6CNGN4cjs.__name.call(void 0, validateBase64String, "validateBase64String");
+function base64ToUint8ArrayStrict(input) {
+  const s = String(input || "").trim();
+  validateBase64String(s);
   if (typeof Buffer !== "undefined") {
     return new Uint8Array(Buffer.from(s, "base64"));
   }
@@ -16156,82 +16325,55 @@ function base64ToUint8Array(input) {
   }
   return out;
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, base64ToUint8Array, "base64ToUint8Array");
-function decodeBase64Image(input, expectedFormat) {
-  const b64 = extractBase64FromMcpPayload(input);
-  const raw = base64ToUint8Array(b64);
-  let b = raw;
-  const pngIdx = indexOfSubarray(b, PNG_MAGIC, 128);
-  if (pngIdx > 0) {
-    b = b.slice(pngIdx);
-  }
-  const jpgIdx = indexOfSubarray(b, JPEG_MAGIC, 128);
-  if (jpgIdx > 0) {
-    b = b.slice(jpgIdx);
-  }
-  const fmt = indexOfSubarray(b, PNG_MAGIC, PNG_MAGIC.length) === 0 ? "png" : indexOfSubarray(b, JPEG_MAGIC, JPEG_MAGIC.length) === 0 ? "jpeg" : expectedFormat;
-  return { bytes: b, format: fmt };
+_chunkJB6CNGN4cjs.__name.call(void 0, base64ToUint8ArrayStrict, "base64ToUint8ArrayStrict");
+function startsWithMagic(bytes, magic) {
+  if (bytes.length < magic.length) {
+    return false;
+  }
+  for (let i = 0; i < magic.length; i++) {
+    if (bytes[i] !== magic[i]) {
+      return false;
+    }
+  }
+  return true;
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, decodeBase64Image, "decodeBase64Image");
-function extractBase64FromMcpPayload(input) {
-  const s = String(input || "").trim();
-  if (!(s.startsWith("{") || s.startsWith("["))) {
-    return s;
+_chunkJB6CNGN4cjs.__name.call(void 0, startsWithMagic, "startsWithMagic");
+function detectImageFormat(bytes) {
+  if (startsWithMagic(bytes, PNG_MAGIC)) {
+    return "png";
   }
-  try {
-    const obj = JSON.parse(s);
-    const b64 = extractBase64FromAny(obj);
-    return b64 || s;
-  } catch (e12) {
-    return s;
+  if (startsWithMagic(bytes, JPEG_MAGIC)) {
+    return "jpeg";
   }
+  return "";
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, extractBase64FromMcpPayload, "extractBase64FromMcpPayload");
-function extractBase64FromAny(v) {
-  if (!v) {
-    return "";
+_chunkJB6CNGN4cjs.__name.call(void 0, detectImageFormat, "detectImageFormat");
+function decodeBase64Image(input, expectedFormat) {
+  const s = String(input || "").trim();
+  if (!s) {
+    throw new Error("Empty image data");
   }
-  if (typeof v === "string") {
-    return v;
+  if (!s.startsWith("{")) {
+    throw new Error("Screenshot tool returned non-JSON data");
   }
-  if (Array.isArray(v)) {
-    return v.length > 0 ? extractBase64FromAny(v[0]) : "";
+  let obj;
+  try {
+    obj = JSON.parse(s);
+  } catch (e) {
+    throw new Error(`Invalid screenshot JSON: ${e instanceof Error ? e.message : String(e)}`);
   }
-  if (typeof v === "object") {
-    if (typeof v.data === "string" && v.data) {
-      return v.data;
-    }
-    const content = v.content;
-    if (Array.isArray(content) && content.length > 0 && typeof content[0] === "object" && content[0]) {
-      const c0 = content[0];
-      if (typeof c0.blob === "string" && c0.blob) {
-        return c0.blob;
-      }
-      if (typeof c0.data === "string" && c0.data) {
-        return c0.data;
-      }
-      if (typeof c0.text === "string" && c0.text) {
-        return c0.text;
-      }
-      if (c0.blob && typeof c0.blob === "object") {
-        if (typeof c0.blob.data === "string" && c0.blob.data) {
-          return c0.blob.data;
-        }
-      }
-      if (c0.image && typeof c0.image === "object" && typeof c0.image.data === "string" && c0.image.data) {
-        return c0.image.data;
-      }
-      if (c0.source && typeof c0.source === "object" && typeof c0.source.data === "string" && c0.source.data) {
-        return c0.source.data;
-      }
-    }
-    if (v.result) {
-      return extractBase64FromAny(v.result);
-    }
+  if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
+    throw new Error("Invalid screenshot JSON: expected object");
   }
-  return "";
+  const b64 = obj.data;
+  if (typeof b64 !== "string" || !b64.trim()) {
+    throw new Error("Screenshot JSON missing base64 field");
+  }
+  const bytes = base64ToUint8ArrayStrict(b64);
+  const detected = detectImageFormat(bytes);
+  return { bytes, format: detected || expectedFormat };
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, extractBase64FromAny, "extractBase64FromAny");
+_chunkJB6CNGN4cjs.__name.call(void 0, decodeBase64Image, "decodeBase64Image");
 var _Mobile = class _Mobile {
   constructor(session) {
     this.session = session;
@@ -16257,7 +16399,7 @@ var _Mobile = class _Mobile {
   async tap(x, y) {
     const args = { x, y };
     try {
-      const result = await this.session.callMcpTool("tap", args);
+      const result = await this.session.callMcpTool("tap", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -16297,7 +16439,7 @@ var _Mobile = class _Mobile {
   async swipe(startX, startY, endX, endY, durationMs = 300) {
     const args = { start_x: startX, start_y: startY, end_x: endX, end_y: endY, duration_ms: durationMs };
     try {
-      const result = await this.session.callMcpTool("swipe", args);
+      const result = await this.session.callMcpTool("swipe", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -16333,7 +16475,7 @@ var _Mobile = class _Mobile {
   async inputText(text) {
     const args = { text };
     try {
-      const result = await this.session.callMcpTool("input_text", args);
+      const result = await this.session.callMcpTool("input_text", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -16369,7 +16511,7 @@ var _Mobile = class _Mobile {
   async sendKey(key) {
     const args = { key };
     try {
-      const result = await this.session.callMcpTool("send_key", args);
+      const result = await this.session.callMcpTool("send_key", args, false, "wuying_ui");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -16391,7 +16533,7 @@ var _Mobile = class _Mobile {
   async getClickableUIElements(timeoutMs = 5e3) {
     const args = { timeout_ms: timeoutMs };
     try {
-      const result = await this.session.callMcpTool("get_clickable_ui_elements", args);
+      const result = await this.session.callMcpTool("get_clickable_ui_elements", args, false, "wuying_ui");
       if (!result.success) {
         return {
           success: false,
@@ -16451,7 +16593,7 @@ var _Mobile = class _Mobile {
     const formatNorm = (format || "json").trim().toLowerCase() || "json";
     const args = { timeout_ms: timeoutMs, format: formatNorm };
     try {
-      const result = await this.session.callMcpTool("get_all_ui_elements", args);
+      const result = await this.session.callMcpTool("get_all_ui_elements", args, false, "wuying_ui");
       if (!result.success) {
         return {
           success: false,
@@ -16530,7 +16672,7 @@ var _Mobile = class _Mobile {
   async getInstalledApps(startMenu = false, desktop = true, ignoreSystemApps = true) {
     const args = { start_menu: startMenu, desktop, ignore_system_apps: ignoreSystemApps };
     try {
-      const result = await this.session.callMcpTool("get_installed_apps", args);
+      const result = await this.session.callMcpTool("get_installed_apps", args, false, "wuying_app");
       if (!result.success) {
         return {
           success: false,
@@ -16594,7 +16736,7 @@ var _Mobile = class _Mobile {
   async startApp(startCmd, workDirectory = "", activity = "") {
     const args = { start_cmd: startCmd, work_directory: workDirectory, activity };
     try {
-      const result = await this.session.callMcpTool("start_app", args);
+      const result = await this.session.callMcpTool("start_app", args, false, "wuying_app");
       if (!result.success) {
         return {
           success: false,
@@ -16657,7 +16799,7 @@ var _Mobile = class _Mobile {
   async stopAppByCmd(stopCmd) {
     const args = { stop_cmd: stopCmd };
     try {
-      const result = await this.session.callMcpTool("stop_app_by_cmd", args);
+      const result = await this.session.callMcpTool("stop_app_by_cmd", args, false, "wuying_app");
       return {
         success: result.success || false,
         requestId: result.requestId || "",
@@ -16691,7 +16833,7 @@ var _Mobile = class _Mobile {
    */
   async screenshot() {
     try {
-      const result = await this.session.callMcpTool("system_screenshot", {});
+      const result = await this.session.callMcpTool("system_screenshot", {}, false, "mcp-server");
       if (!result.success) {
         return {
           success: false,
@@ -16722,7 +16864,7 @@ var _Mobile = class _Mobile {
    */
   async betaTakeScreenshot() {
     try {
-      const result = await this.session.callMcpTool("screenshot", { format: "png" });
+      const result = await this.session.callMcpTool("screenshot", { format: "png" }, false, "wuying_capture");
       const requestId = result.requestId || "";
       if (!result.success) {
         return {
@@ -16797,7 +16939,7 @@ var _Mobile = class _Mobile {
       if (quality !== void 0) {
         args.quality = quality;
       }
-      const result = await this.session.callMcpTool("long_screenshot", args);
+      const result = await this.session.callMcpTool("long_screenshot", args, false, "wuying_capture");
       const requestId = result.requestId || "";
       if (!result.success) {
         return {
@@ -17211,7 +17353,12 @@ var _Oss = class _Oss {
         endpoint: endpoint || "",
         region: region || ""
       };
-      const result = await this.session.callMcpTool("oss_env_init", args);
+      const result = await this.session.callMcpTool(
+        "oss_env_init",
+        args,
+        false,
+        "wuying_oss"
+      );
       if (result.success) {
         if (result.data) {
           const clientConfigRaw = result.data;
@@ -17283,7 +17430,12 @@ var _Oss = class _Oss {
         object,
         path: path6
       };
-      const result = await this.session.callMcpTool("oss_upload", args);
+      const result = await this.session.callMcpTool(
+        "oss_upload",
+        args,
+        false,
+        "wuying_oss"
+      );
       return {
         requestId: result.requestId,
         success: result.success,
@@ -17325,7 +17477,12 @@ var _Oss = class _Oss {
         url,
         path: path6
       };
-      const result = await this.session.callMcpTool("oss_upload_annon", args);
+      const result = await this.session.callMcpTool(
+        "oss_upload_annon",
+        args,
+        false,
+        "wuying_oss"
+      );
       return {
         requestId: result.requestId,
         success: result.success,
@@ -17370,7 +17527,12 @@ var _Oss = class _Oss {
         object,
         path: path6
       };
-      const result = await this.session.callMcpTool("oss_download", args);
+      const result = await this.session.callMcpTool(
+        "oss_download",
+        args,
+        false,
+        "wuying_oss"
+      );
       return {
         requestId: result.requestId,
         success: result.success,
@@ -17412,7 +17574,12 @@ var _Oss = class _Oss {
         url,
         path: path6
       };
-      const result = await this.session.callMcpTool("oss_download_annon", args);
+      const result = await this.session.callMcpTool(
+        "oss_download_annon",
+        args,
+        false,
+        "wuying_oss"
+      );
       return {
         requestId: result.requestId,
         success: result.success,
@@ -17448,6 +17615,7 @@ var _SessionInfoClass = class _SessionInfoClass {
 _chunkJB6CNGN4cjs.__name.call(void 0, _SessionInfoClass, "SessionInfoClass");
 var SessionInfoClass = _SessionInfoClass;
 var _Session = class _Session {
+  // MCP tools list is intentionally not stored in Session.
   /**
    * Initialize a Session object.
    *
@@ -17470,8 +17638,6 @@ var _Session = class _Session {
     this.resourceUrl = "";
     // Recording functionality
     this.enableBrowserReplay = false;
-    // MCP tools available for this session
-    this.mcpTools = [];
     this.agentBay = agentBay;
     this.sessionId = sessionId;
     this.fileSystem = new FileSystem(this);
@@ -17654,21 +17820,6 @@ var _Session = class _Session {
   getLinkUrl() {
     return this.linkUrl;
   }
-  /**
-   * Find the server that provides the given tool.
-   *
-   * @param toolName - Name of the tool to find
-   * @returns The server name that provides the tool, or empty string if not found
-   * @internal
-   */
-  findServerForTool(toolName) {
-    for (const tool of this.mcpTools) {
-      if (tool.name === toolName) {
-        return tool.server;
-      }
-    }
-    return "";
-  }
   /**
    * Delete this session.
    *
@@ -18347,7 +18498,6 @@ var _Session = class _Session {
         logError(`Error unmarshaling tools data: ${error}`);
       }
     }
-    this.mcpTools = tools;
     const keyFields = {
       image_id: imageId,
       tool_count: tools.length
@@ -18389,7 +18539,7 @@ var _Session = class _Session {
    * For press_keys tool, key names are automatically normalized to correct case format.
    * This improves case compatibility (e.g., "CTRL" -> "Ctrl", "tab" -> "Tab").
    */
-  async callMcpTool(toolName, args, autoGenSession = false) {
+  async callMcpTool(toolName, args, autoGenSession = false, serverName) {
     try {
       if (toolName === "press_keys" && args && Array.isArray(args.keys)) {
         const { normalizeKeys } = await Promise.resolve().then(() => _interopRequireWildcard(require("./key-normalizer-GGJR2Y35.cjs")));
@@ -18399,10 +18549,10 @@ var _Session = class _Session {
       }
       const argsJSON = JSON.stringify(args);
       if (this.getLinkUrl() && this.getToken()) {
-        return await this.callMcpToolLinkUrl(toolName, args);
+        return await this.callMcpToolLinkUrl(toolName, args, serverName);
       }
       if (this.isVpcEnabled()) {
-        const server = this.findServerForTool(toolName);
+        const server = serverName || "";
         if (!server) {
           return {
             success: false,
@@ -18427,6 +18577,7 @@ var _Session = class _Session {
         url.searchParams.append("token", this.getToken());
         const requestId = `vpc-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         url.searchParams.append("requestId", requestId);
+        setRequestId(requestId);
         const response = await fetch(url.toString(), {
           method: "GET",
           headers: {
@@ -18438,7 +18589,7 @@ var _Session = class _Session {
             success: false,
             data: "",
             errorMessage: `VPC request failed: ${response.statusText}`,
-            requestId: ""
+            requestId
           };
         }
         const responseData = await response.json();
@@ -18474,14 +18625,14 @@ var _Session = class _Session {
             success: true,
             data: dataStr,
             errorMessage: "",
-            requestId: ""
+            requestId
           };
         }
         return {
           success: true,
           data: textContent || JSON.stringify(actualResult),
           errorMessage: "",
-          requestId: ""
+          requestId
         };
       } else {
         const callToolRequest = new (0, _chunkQGXJA3GTcjs.CallMcpToolRequest)({
@@ -18511,6 +18662,9 @@ var _Session = class _Session {
         }
         const data = response.body.data;
         const reqId = extractRequestId(response) || "";
+        if (reqId) {
+          setRequestId(reqId);
+        }
         if (toolName === "run_code") {
           let dataStr = "";
           if (data && Array.isArray(data.content) && data.content.length > 0 && data.content[0].text) {
@@ -18565,8 +18719,8 @@ var _Session = class _Session {
       };
     }
   }
-  async callMcpToolLinkUrl(toolName, args) {
-    const server = this.findServerForTool(toolName);
+  async callMcpToolLinkUrl(toolName, args, serverName) {
+    const server = serverName || "";
     if (!server) {
       return {
         success: false,
@@ -18713,7 +18867,7 @@ var _Session = class _Session {
    * ```
    */
   async getMetrics() {
-    const toolResult = await this.callMcpTool("get_metrics", {});
+    const toolResult = await this.callMcpTool("get_metrics", {}, false, "wuying_system");
     const requestId = toolResult.requestId || "";
     if (!toolResult.success) {
       return {
@@ -19596,38 +19750,6 @@ var _AgentBay = class _AgentBay {
           logError(`Warning: Failed to apply mobile configuration: ${error}`);
         }
       }
-      const toolListStr = data.toolList;
-      if (toolListStr) {
-        try {
-          const toolsData = JSON.parse(toolListStr);
-          const tools = [];
-          if (Array.isArray(toolsData)) {
-            for (const toolData of toolsData) {
-              tools.push({
-                name: toolData["name"] || "",
-                description: toolData["description"] || "",
-                inputSchema: toolData["inputSchema"] || {},
-                server: toolData["server"] || "",
-                tool: toolData["tool"] || ""
-              });
-            }
-          }
-          session.mcpTools = tools;
-        } catch (error) {
-          logError(`Warning: Failed to parse toolList from CreateMcpSession: ${error}`);
-        }
-      }
-      if (paramsCopy.isVpc && session.mcpTools.length === 0) {
-        logDebug("VPC session detected, automatically fetching MCP tools...");
-        try {
-          const toolsResult = await session.listMcpTools();
-          logDebug(
-            `Successfully fetched ${toolsResult.tools.length} MCP tools for VPC session (RequestID: ${toolsResult.requestId})`
-          );
-        } catch (error) {
-          logError(`Warning: Failed to fetch MCP tools for VPC session: ${error}`);
-        }
-      }
       if (needsContextSync) {
         logDebug("Waiting for context synchronization to complete...");
         const maxRetries = 150;
@@ -21806,7 +21928,7 @@ var _LocalSession = class _LocalSession extends Session {
   /**
    * Call MCP tool asynchronously
    */
-  async callMcpTool(toolName, args, autoGenSession = false) {
+  async callMcpTool(toolName, args, autoGenSession = false, serverName) {
     const localAgent = this.browser.agent;
     const result = await localAgent._callMcpToolAsync(toolName, args);
     return {