@elizaos/plugin-computeruse 2.0.3-beta.5 → 2.0.3-beta.7

package/dist/platform/windows-list.d.ts

@@ -9,6 +9,7 @@ import type { ScreenRegion, ScreenSize, WindowInfo } from "../types.js";
 export declare function findWindowsByQuery(query: string, windows?: WindowInfo[]): WindowInfo[];
 export declare function resolveWindowMatch(queryOrId: string, windows?: WindowInfo[]): WindowInfo | null;
 export declare function listWindows(): WindowInfo[];
+export declare function parseDarwinWindowOutput(output: string): WindowInfo[];
 /**
  * The currently-focused / frontmost window (#9170 M12 — cua
  * `get_current_window_id`). Best-effort per-OS query; returns `null` when no

package/dist/platform/windows-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"windows-list.d.ts","sourceRoot":"","sources":["../../src/platform/windows-list.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA0BxE,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,UAAU,EAAkB,GACpC,UAAU,EAAE,CAUd;AAoBD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,UAAU,EAAkB,GACpC,UAAU,GAAG,IAAI,CAEnB;AAmDD,wBAAgB,WAAW,IAAI,UAAU,EAAE,CAa1C;AA4FD;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,UAAU,GAAG,IAAI,CAuDnD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAapC;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAiF/D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqClD;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAEtD;AAoFD,wBAAgB,cAAc,CAAC,WAAW,SAAS,GAAG;IACpD,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAuDA;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,CAAC,CAAC,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,MAAM,GACT;IACD,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CASA;AAID,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CA0BrD;AAID,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CA8BrD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqCpD;AAID,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAuBlD;AAED,eAAO,MAAM,YAAY,oBAAc,CAAC;AACxC,eAAO,MAAM,YAAY,oBAAc,CAAC;AACxC,eAAO,MAAM,gBAAgB,qBAAe,CAAC;AAC7C,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,WAAW,mBAAa,CAAC;AACtC,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,cAAc,sBAAgB,CAAC;AAC5C,eAAO,MAAM,YAAY,oBAAc,CAAC;AAIxC;;;;;;;;GAQG;AACH,eAAO,MAAM,mCAAmC,QAEmC,CAAC;AAEpF,wBAAgB,aAAa,IAAI,UAAU,CA+H1C"}
+{"version":3,"file":"windows-list.d.ts","sourceRoot":"","sources":["../../src/platform/windows-list.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA0BxE,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,UAAU,EAAkB,GACpC,UAAU,EAAE,CAUd;AAoBD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,UAAU,EAAkB,GACpC,UAAU,GAAG,IAAI,CAEnB;AA+DD,wBAAgB,WAAW,IAAI,UAAU,EAAE,CAa1C;AAoCD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAOpE;AAgHD;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,UAAU,GAAG,IAAI,CA0DnD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,CAQnE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAapC;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAiF/D;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqClD;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAEtD;AAoFD,wBAAgB,cAAc,CAAC,WAAW,SAAS,GAAG;IACpD,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAuDA;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,CAAC,CAAC,EAAE,MAAM,EACV,CAAC,CAAC,EAAE,MAAM,GACT;IACD,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CASA;AAID,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CA0BrD;AAID,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CA8BrD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqCpD;AAID,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAuBlD;AAED,eAAO,MAAM,YAAY,oBAAc,CAAC;AACxC,eAAO,MAAM,YAAY,oBAAc,CAAC;AACxC,eAAO,MAAM,gBAAgB,qBAAe,CAAC;AAC7C,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,WAAW,mBAAa,CAAC;AACtC,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,eAAe,uBAAiB,CAAC;AAC9C,eAAO,MAAM,cAAc,sBAAgB,CAAC;AAC5C,eAAO,MAAM,YAAY,oBAAc,CAAC;AAIxC;;;;;;;;GAQG;AACH,eAAO,MAAM,mCAAmC,QAEmC,CAAC;AAEpF,wBAAgB,aAAa,IAAI,UAAU,CA+H1C"}

package/dist/register-routes.js

@@ -8006,7 +8006,7 @@ var init_terminal = __esm(() => {
 });
 
 // src/platform/windows-list.ts
-import { execSync as execSync5 } from "node:child_process";
+import { execFileSync as execFileSync7, execSync as execSync5 } from "node:child_process";
 function escapeAppleScriptString(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 }
@@ -8051,36 +8051,41 @@ function runDarwinWindowScript(target, body) {
   const termList = terms.length > 0 ? `{${terms.map((term) => `"${escapeAppleScriptString(term)}"`).join(", ")}}` : "{}";
   const script = `
       tell application "System Events"
+        set matchedProc to missing value
         repeat with proc in (every process whose visible is true)
           try
             set procName to name of proc
-            set matched to false
             repeat with term in ${termList}
               if procName contains term then
-                set matched to true
+                set matchedProc to contents of proc
                 exit repeat
               end if
             end repeat
-            if not matched then
+          end try
+          if matchedProc is not missing value then exit repeat
+        end repeat
+        if matchedProc is missing value then
+          repeat with proc in (every process whose visible is true)
+            try
               repeat with w in (every window of proc)
-                set winName to name of w
                 repeat with term in ${termList}
-                  if winName contains term then
-                    set matched to true
+                  if (name of w) contains term then
+                    set matchedProc to contents of proc
                     exit repeat
                   end if
                 end repeat
-                if matched then exit repeat
+                if matchedProc is not missing value then exit repeat
               end repeat
-            end if
-            if matched then
-              ${body}
-              exit repeat
-            end if
-          end try
-        end repeat
+            end try
+            if matchedProc is not missing value then exit repeat
+          end repeat
+        end if
+        if matchedProc is not missing value then
+          set proc to matchedProc
+          ${body}
+        end if
       end tell`;
-  return runCommand("osascript", ["-e", script], 5000);
+  return runCommand("osascript", ["-e", script], 15000);
 }
 function listWindows() {
   const os4 = currentPlatform();
@@ -8095,37 +8100,66 @@ function listWindows() {
   }
   return [];
 }
-function listWindowsDarwin() {
+function parseDarwinWindowEntry(entry) {
+  const [app, title] = entry.split("|||");
+  const appName = app?.trim() ?? "";
+  const winTitle = title?.trim() ?? "";
+  if (!appName && !winTitle)
+    return null;
+  return {
+    app: appName || "unknown",
+    title: winTitle,
+    id: winTitle || appName
+  };
+}
+function parseDarwinWindowOutput(output) {
+  return output.split("<<WIN>>").map((entry) => entry.trim()).filter(Boolean).map(parseDarwinWindowEntry).filter((win) => win !== null);
+}
+function listWindowsDarwinViaSwift() {
+  if (!commandExists("swift"))
+    return null;
+  try {
+    const output = execFileSync7("swift", ["-"], {
+      input: DARWIN_WINDOW_LIST_SWIFT,
+      encoding: "utf-8",
+      timeout: 15000,
+      stdio: ["pipe", "pipe", "ignore"]
+    });
+    return parseDarwinWindowOutput(output);
+  } catch {
+    return null;
+  }
+}
+function listWindowsDarwinViaSystemEvents() {
   try {
     const script = `
       tell application "System Events"
-        set windowList to {}
+        set outText to ""
         repeat with proc in (every process whose visible is true)
           try
+            set procName to name of proc
             repeat with w in (every window of proc)
-              set end of windowList to (name of proc) & "|||" & (name of w) & "|||" & (id of w as text)
+              try
+                set outText to outText & procName & "|||" & (name of w) & "<<WIN>>"
+              end try
             end repeat
           end try
         end repeat
-        return windowList as text
+        return outText
       end tell`;
     const output = execSync5(`osascript -e '${script}'`, {
       encoding: "utf-8",
-      timeout: 1e4,
+      timeout: 20000,
       stdio: ["ignore", "pipe", "ignore"]
     });
-    return output.split(", ").filter(Boolean).map((entry) => {
-      const parts = entry.split("|||");
-      return {
-        app: parts[0] ?? "unknown",
-        title: parts[1] ?? "unknown",
-        id: parts[2] ?? "0"
-      };
-    });
+    return parseDarwinWindowOutput(output);
   } catch {
     return [];
   }
 }
+function listWindowsDarwin() {
+  return listWindowsDarwinViaSwift() ?? listWindowsDarwinViaSystemEvents();
+}
 function listWindowsLinux() {
   try {
     if (commandExists("wmctrl")) {
@@ -8175,10 +8209,10 @@ function getActiveWindow() {
           set proc to first process whose frontmost is true
           set procName to name of proc
           try
-            set w to window 1 of proc
-            return procName & "|||" & (name of w) & "|||" & (id of w as text)
+            set winName to name of window 1 of proc
+            return procName & "|||" & winName & "|||" & winName
           on error
-            return procName & "|||" & "" & "|||" & "0"
+            return procName & "|||" & "" & "|||" & procName
           end try
         end tell`;
       const out = execSync5(`osascript -e '${script}'`, {
@@ -8617,14 +8651,25 @@ function getScreenSize() {
   }
   return { width: 1920, height: 1080 };
 }
-var WINDOWS_PRIMARY_SCREEN_SIZE_COMMAND;
+var DARWIN_WINDOW_LIST_SWIFT = `import CoreGraphics
+import Foundation
+let opts: CGWindowListOption = [.optionOnScreenOnly, .excludeDesktopElements]
+guard let list = CGWindowListCopyWindowInfo(opts, kCGNullWindowID) as? [[String: Any]] else { exit(0) }
+var out: [String] = []
+for w in list {
+  if ((w[kCGWindowLayer as String] as? Int) ?? -1) != 0 { continue }
+  let owner = (w[kCGWindowOwnerName as String] as? String) ?? ""
+  let name = (w[kCGWindowName as String] as? String) ?? ""
+  out.append(owner + "|||" + name)
+}
+print(out.joined(separator: "<<WIN>>"))`, WINDOWS_PRIMARY_SCREEN_SIZE_COMMAND;
 var init_windows_list = __esm(() => {
   init_helpers();
   WINDOWS_PRIMARY_SCREEN_SIZE_COMMAND = 'powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; ' + '[System.Windows.Forms.Screen]::PrimaryScreen.Bounds | ConvertTo-Json -Compress"';
 });
 
 // src/scene/a11y-provider.ts
-import { execFileSync as execFileSync7 } from "node:child_process";
+import { execFileSync as execFileSync8 } from "node:child_process";
 
 class NullAccessibilityProvider {
   name = "null";
@@ -8707,7 +8752,7 @@ except Exception as e:
     print("[]")
 `;
     try {
-      const text = execFileSync7("python3", ["-c", py], {
+      const text = execFileSync8("python3", ["-c", py], {
         timeout: 4000,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -8736,7 +8781,7 @@ except Exception as e:
   }
   tryHyprland() {
     try {
-      const text = execFileSync7("hyprctl", ["clients", "-j"], {
+      const text = execFileSync8("hyprctl", ["clients", "-j"], {
         timeout: 3000,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -8748,7 +8793,7 @@ except Exception as e:
   }
   trySway() {
     try {
-      const text = execFileSync7("swaymsg", ["-t", "get_tree"], {
+      const text = execFileSync8("swaymsg", ["-t", "get_tree"], {
         timeout: 3000,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -8882,7 +8927,7 @@ class DarwinAccessibilityProvider {
         }
         JSON.stringify(out);
       `;
-      const text = execFileSync7("osascript", ["-l", "JavaScript", "-e", script], {
+      const text = execFileSync8("osascript", ["-l", "JavaScript", "-e", script], {
         timeout: 8000,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -8941,7 +8986,7 @@ while ($child -and $count -lt 50) {
 $out | ConvertTo-Json -Depth 4 -Compress
 `;
     try {
-      const text = execFileSync7("powershell", ["-NoProfile", "-Command", ps], {
+      const text = execFileSync8("powershell", ["-NoProfile", "-Command", ps], {
         timeout: 1e4,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -8975,7 +9020,7 @@ var init_a11y_provider = __esm(() => {
 });
 
 // src/platform/process-list.ts
-import { execFileSync as execFileSync8, execSync as execSync6 } from "node:child_process";
+import { execFileSync as execFileSync9, execSync as execSync6 } from "node:child_process";
 import { readdirSync, readFileSync as readFileSync4 } from "node:fs";
 function listProcesses() {
   const os4 = currentPlatform();
@@ -9015,7 +9060,7 @@ function listLinux() {
 }
 function listDarwin() {
   try {
-    const text = execFileSync8("ps", ["-axco", "pid=,comm="], {
+    const text = execFileSync9("ps", ["-axco", "pid=,comm="], {
       timeout: 4000,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
@@ -9023,7 +9068,7 @@ function listDarwin() {
     return parsePsOutput(text);
   } catch {
     try {
-      const text = execFileSync8("ps", ["-axo", "pid=,comm="], {
+      const text = execFileSync9("ps", ["-axo", "pid=,comm="], {
         timeout: 4000,
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
@@ -9087,7 +9132,7 @@ var init_process_list = __esm(() => {
 });
 
 // src/scene/apps.ts
-import { execFileSync as execFileSync9 } from "node:child_process";
+import { execFileSync as execFileSync10 } from "node:child_process";
 function enumerateApps(deps = {}) {
   const processFn = deps.processes ?? listProcesses;
   const windowsFn = deps.windows ?? listWindows;
@@ -9181,7 +9226,7 @@ function joinAppsAndWindows(procs, windows, platform3) {
 function linuxPidMapFromWmctrl() {
   const out = new Map;
   try {
-    const text = execFileSync9("wmctrl", ["-l", "-p"], {
+    const text = execFileSync10("wmctrl", ["-l", "-p"], {
       timeout: 3000,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
@@ -11940,7 +11985,7 @@ var init_computer_use_routes = __esm(() => {
 });
 
 // src/routes/sandbox-routes.ts
-import { execFileSync as execFileSync10, execSync as execSync7 } from "node:child_process";
+import { execFileSync as execFileSync11, execSync as execSync7 } from "node:child_process";
 import { readFileSync as readFileSync5, unlinkSync as unlinkSync5, writeFileSync as writeFileSync2 } from "node:fs";
 import { platform as platform3, tmpdir as tmpdir6 } from "node:os";
 import { join as join6 } from "node:path";
@@ -12549,7 +12594,7 @@ function resolveAudioFormat(input) {
   return { format: normalized };
 }
 function runCommand2(command, args, timeout) {
-  execFileSync10(command, args, {
+  execFileSync11(command, args, {
     timeout,
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -13115,7 +13160,7 @@ var init_sandbox_routes = __esm(() => {
 });
 
 // src/services/desktop-control.ts
-import { execFileSync as execFileSync11 } from "node:child_process";
+import { execFileSync as execFileSync12 } from "node:child_process";
 import { readFileSync as readFileSync6, unlinkSync as unlinkSync6 } from "node:fs";
 import { platform as platform4, tmpdir as tmpdir7 } from "node:os";
 import { join as join7 } from "node:path";
@@ -13132,7 +13177,7 @@ function isHeadfulGuiAvailable() {
 function commandExists3(command) {
   try {
     const which = platform4() === "win32" ? "where" : "which";
-    execFileSync11(which, [command], {
+    execFileSync12(which, [command], {
       stdio: "ignore",
       timeout: 3000
     });
@@ -13190,7 +13235,7 @@ function captureDesktopScreenshot(region) {
         "$graphics.Dispose()",
         "$bitmap.Dispose()"
       ].join("; ");
-      execFileSync11("powershell", ["-Command", psCommand], {
+      execFileSync12("powershell", ["-Command", psCommand], {
         timeout: 15000,
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -13226,7 +13271,7 @@ function listDesktopWindows() {
         end tell`;
     let output;
     try {
-      output = execFileSync11("osascript", ["-e", script], {
+      output = execFileSync12("osascript", ["-e", script], {
         encoding: "utf-8",
         timeout: 5000,
         stdio: ["ignore", "pipe", "ignore"]
@@ -13246,7 +13291,7 @@ function listDesktopWindows() {
   }
   if (os5 === "linux") {
     if (commandExists3("wmctrl")) {
-      const output = execFileSync11("wmctrl", ["-l"], {
+      const output = execFileSync12("wmctrl", ["-l"], {
         encoding: "utf-8",
         timeout: 5000
       });
@@ -13261,7 +13306,7 @@ function listDesktopWindows() {
       });
     }
     if (commandExists3("xdotool")) {
-      const output = execFileSync11("sh", ["-c", 'xdotool search --name "" getwindowname 2>/dev/null'], {
+      const output = execFileSync12("sh", ["-c", 'xdotool search --name "" getwindowname 2>/dev/null'], {
         encoding: "utf-8",
         timeout: 5000
       });
@@ -13274,7 +13319,7 @@ function listDesktopWindows() {
     }
   }
   if (os5 === "win32") {
-    const output = execFileSync11("powershell", [
+    const output = execFileSync12("powershell", [
       "-Command",
       "Get-Process | Where-Object {$_.MainWindowTitle} | Select-Object Id, MainWindowTitle | ConvertTo-Json"
     ], { encoding: "utf-8", timeout: 1e4 });
@@ -13615,7 +13660,7 @@ function detectWindowListCapability(os5) {
   return { available: false, tool: "unsupported platform" };
 }
 function runCommand3(command, args, timeout) {
-  execFileSync11(command, args, {
+  execFileSync12(command, args, {
     timeout,
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -13640,7 +13685,7 @@ function canCaptureMacScreen() {
 }
 function canUseMacSystemEvents() {
   try {
-    execFileSync11("osascript", ["-e", 'tell application "System Events" to count of processes'], {
+    execFileSync12("osascript", ["-e", 'tell application "System Events" to count of processes'], {
       encoding: "utf-8",
       timeout: 3000,
       stdio: ["ignore", "pipe", "ignore"]
@@ -13897,5 +13942,5 @@ registerAppRoutePluginLoader("@elizaos/plugin-computeruse", async () => {
   return computerUsePlugin2;
 });
 
-//# debugId=35042180BEEE0C9064756E2164756E21
+//# debugId=BEDF5ED402D884BE64756E2164756E21
 //# sourceMappingURL=register-routes.js.map