replicas-computer 0.3.29 → 0.3.30

package/dist/index.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
 // src/client.ts
-import { createConnection as createConnection3 } from "net";
+import { createConnection as createConnection4 } from "net";
 
 // src/daemon.ts
 import { spawnSync as spawnSync5 } from "child_process";
 import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync6, rmSync as rmSync5 } from "fs";
-import { createConnection as createConnection2, createServer as createServer2 } from "net";
+import { createConnection as createConnection3, createServer as createServer2 } from "net";
 import { dirname as dirname5 } from "path";
 
 // src/commands/desktop.ts
@@ -21,6 +21,8 @@ function isRecord(value) {
 
 // ../shared/src/engine/environment.ts
 var DESKTOP_STREAM_PORT = 6080;
+var DESKTOP_COMPUTER_SOCKET = "/tmp/replicas-desktop-computer.sock";
+var DESKTOP_COMPUTER_VIEW_PORT = 6091;
 var DEVICES_DIR = ".ssh/replicas-devices";
 var DEVICE_SCREEN_FILE_SUFFIX = ".screen.json";
 function parseDeviceScreenState(value) {
@@ -1137,9 +1139,9 @@ async function openChromeSession(webSocketDebuggerUrl) {
   const fail2 = (error) => {
     if (closed) return;
     closed = true;
-    for (const request of pending.values()) {
-      clearTimeout(request.timeout);
-      request.reject(error);
+    for (const request2 of pending.values()) {
+      clearTimeout(request2.timeout);
+      request2.reject(error);
     }
     pending.clear();
     socket.close();
@@ -1156,12 +1158,12 @@ async function openChromeSession(webSocketDebuggerUrl) {
     if (!isRecord(message)) return;
     if (typeof message.method === "string" && isRecord(message.params)) listeners.get(message.method)?.(message.params);
     if (typeof message.id !== "number") return;
-    const request = pending.get(message.id);
-    if (!request) return;
-    clearTimeout(request.timeout);
+    const request2 = pending.get(message.id);
+    if (!request2) return;
+    clearTimeout(request2.timeout);
     pending.delete(message.id);
     const detail = isRecord(message.error) && typeof message.error.message === "string" ? message.error.message : void 0;
-    request.resolve(message.error ? { error: { message: detail } } : { result: isRecord(message.result) ? message.result : {} });
+    request2.resolve(message.error ? { error: { message: detail } } : { result: isRecord(message.result) ? message.result : {} });
   });
   socket.addEventListener("error", () => fail2(new Error("Chrome DevTools WebSocket failed")));
   socket.addEventListener("close", () => fail2(new Error("Chrome DevTools WebSocket closed unexpectedly")));
@@ -3007,10 +3009,68 @@ async function computerDragCommand(fx, fy, tx, ty) {
   console.log(`dragged (${fromX},${fromY}) -> (${toX},${toY})`);
 }
 
-// src/commands/screen.ts
+// src/commands/mac.ts
 import { spawn as spawn3 } from "child_process";
-import { closeSync, existsSync as existsSync5, mkdirSync as mkdirSync5, openSync, readdirSync as readdirSync2, readFileSync as readFileSync5, rmSync as rmSync4, symlinkSync, writeFileSync as writeFileSync5 } from "fs";
-import { createConnection, createServer } from "net";
+import { randomUUID } from "crypto";
+import { writeFileSync as writeFileSync5 } from "fs";
+import { createConnection } from "net";
+var REQUEST_TIMEOUT_MS = 12e4;
+function request(payload) {
+  return new Promise((resolve5, reject) => {
+    const socket = createConnection(DESKTOP_COMPUTER_SOCKET);
+    let reply = "";
+    const disconnected = () => reject(new Error("No Mac is connected. Open this workspace in the Replicas desktop app on the Mac, with computer use turned on."));
+    socket.once("error", disconnected);
+    socket.once("close", disconnected);
+    socket.setTimeout(REQUEST_TIMEOUT_MS, () => {
+      socket.destroy();
+      reject(new Error(`The Mac's driver didn't answer within ${REQUEST_TIMEOUT_MS / 1e3} seconds.`));
+    });
+    socket.on("data", (chunk) => {
+      reply += chunk.toString("utf8");
+      const end = reply.indexOf("\n");
+      if (end === -1) return;
+      socket.destroy();
+      try {
+        resolve5(JSON.parse(reply.slice(0, end)));
+      } catch (error) {
+        reject(error);
+      }
+    });
+    socket.write(`${JSON.stringify(payload)}
+`);
+  });
+}
+async function showView() {
+  const origin = `http://127.0.0.1:${DESKTOP_COMPUTER_VIEW_PORT}/`;
+  if ((await getChromePages().catch(() => [])).some((page) => page.url?.startsWith(origin))) return;
+  ensureServicesRunning();
+  spawn3(CHROME_WRAPPER, ["--new-window", "--start-maximized", `--app=${origin}`], { env: withDisplay(), detached: true, stdio: "ignore" }).unref();
+}
+async function computerMacCommand(tool, json, options) {
+  let args;
+  try {
+    args = JSON.parse(json ?? "{}");
+  } catch {
+    fail(`Arguments must be a JSON object, got: ${json}`);
+  }
+  if (!isRecord(args)) fail(`Arguments must be a JSON object, got: ${json}`);
+  const session = options.session ?? `replicas-${randomUUID()}`;
+  const reply = await request({ method: "call", name: tool, args: { ...args, session }, session_id: session, client_kind: "cli", observation_origin: "direct" }).catch((error) => fail(error instanceof Error ? error.message : String(error)));
+  if (!options.session) await request({ method: "session_end", session_id: session, client_kind: "cli" }).catch(() => void 0);
+  await showView().catch(() => void 0);
+  if (!isRecord(reply) || reply.ok !== true || !isRecord(reply.result)) fail(`The Mac's driver refused: ${JSON.stringify(isRecord(reply) ? reply.error ?? reply : reply)}`);
+  const { content, structuredContent } = reply.result;
+  const blocks = Array.isArray(content) ? content.filter(isRecord) : [];
+  const image = blocks.find((block) => block.type === "image" && typeof block.data === "string");
+  if (image && options.screenshot) writeFileSync5(options.screenshot, Buffer.from(String(image.data), "base64"));
+  console.log(structuredContent === void 0 ? blocks.filter((block) => block.type === "text").map((block) => block.text).join("\n") : JSON.stringify(structuredContent, null, 2));
+}
+
+// src/commands/screen.ts
+import { spawn as spawn4 } from "child_process";
+import { closeSync, existsSync as existsSync5, mkdirSync as mkdirSync5, openSync, readdirSync as readdirSync2, readFileSync as readFileSync5, rmSync as rmSync4, symlinkSync, writeFileSync as writeFileSync6 } from "fs";
+import { createConnection as createConnection2, createServer } from "net";
 import { homedir } from "os";
 import { join } from "path";
 import { setTimeout as sleep2 } from "timers/promises";
@@ -3026,7 +3086,7 @@ function ownsProcess(session, pid) {
 }
 function isListening(port2) {
   return new Promise((resolve5) => {
-    const socket = createConnection({ host: "127.0.0.1", port: port2 });
+    const socket = createConnection2({ host: "127.0.0.1", port: port2 });
     const done = (listening) => {
       socket.destroy();
       resolve5(listening);
@@ -3050,7 +3110,7 @@ async function freePorts(count) {
 }
 function spawnLogged(bin, args, log) {
   const fd = openSync(log, "a");
-  const child = spawn3(bin, args, { detached: true, stdio: ["ignore", fd, fd] });
+  const child = spawn4(bin, args, { detached: true, stdio: ["ignore", fd, fd] });
   closeSync(fd);
   child.unref();
   let exited = false;
@@ -3069,7 +3129,7 @@ async function waitForPort(port2, child) {
 }
 function readBanner(port2) {
   return new Promise((resolve5) => {
-    const socket = createConnection({ host: "127.0.0.1", port: port2 });
+    const socket = createConnection2({ host: "127.0.0.1", port: port2 });
     let banner = "";
     const done = () => {
       socket.destroy();
@@ -3138,7 +3198,7 @@ async function openSession(device, dir, previous) {
   pids.push(bridge.pid);
   if (!await waitForPort(webPort, bridge)) abort(`Could not start the screen viewer: ${readFileSync5(bridgeLog, "utf8").trim() || "timed out"}`);
   const session = { webPort, tunnelPort, pids };
-  writeFileSync5(join(dir, "session.json"), JSON.stringify(session));
+  writeFileSync6(join(dir, "session.json"), JSON.stringify(session));
   return session;
 }
 async function computerScreenCommand(device, options) {
@@ -3168,7 +3228,7 @@ async function showScreen(device, session) {
   const findPage = async () => (await getChromePages().catch(() => [])).find((page2) => page2.webSocketDebuggerUrl && page2.url?.startsWith(origin));
   let page = await findPage();
   if (!page) {
-    spawn3(CHROME_WRAPPER, ["--new-window", `--app=${origin}?device=${device}&requestFps=0`], { env: withDisplay(), detached: true, stdio: "ignore" }).unref();
+    spawn4(CHROME_WRAPPER, ["--new-window", `--app=${origin}?device=${device}&requestFps=0`], { env: withDisplay(), detached: true, stdio: "ignore" }).unref();
     const deadline2 = Date.now() + CONNECT_TIMEOUT_MS;
     while (!page && Date.now() < deadline2) {
       await sleep2(250);
@@ -3263,7 +3323,7 @@ async function computerStatusCommand() {
 }
 
 // src/version.ts
-var COMPUTER_USE_VERSION = "0.3.29";
+var COMPUTER_USE_VERSION = "0.3.30";
 var COMPUTER_USE_PROTOCOL_VERSION = 1;
 
 // src/program.ts
@@ -3301,6 +3361,7 @@ function createProgram() {
   program.command("scroll <direction>").description("Scroll the desktop").option("--amount <n>", "Wheel ticks").option("--x <x>", "Pointer x").option("--y <y>", "Pointer y").action((direction, options) => computerScrollCommand(direction, options));
   program.command("drag <fromX> <fromY> <toX> <toY>").description("Drag between desktop coordinates").action((fromX, fromY, toX, toY) => computerDragCommand(fromX, fromY, toX, toY));
   program.command("launch <app> [args...]").description("Launch an application on the desktop").action((app, args) => computerLaunchCommand(app, args));
+  program.command("mac <tool> [json]", { hidden: true }).description("Call a Cua Driver tool on the user's Mac, in the background, through the Replicas desktop app").option("--screenshot <path>", "Write the screenshot in the reply to this PNG").option("--session <name>", "Keep element tokens across calls under this session name").action((tool, json, options) => computerMacCommand(tool, json, options));
   program.command("screen <device>", { hidden: true }).description("Show a device's screen in a window on this desktop, where the other commands drive it").option("--close", "Close the window and its connection").action((device, options) => computerScreenCommand(device, options));
   const record = program.command("record").description("Record the workspace display");
   record.command("start <path>").description("Start a recording").option("--fps <n>", "Frame rate. Default 60.").action((path, options) => computerRecordStartCommand(path, options));
@@ -3355,7 +3416,7 @@ function writeResult(socket, result) {
 async function hasSocketListener() {
   if (!existsSync6(COMPUTER_USE_SOCKET_PATH)) return false;
   return await new Promise((resolve5) => {
-    const socket = createConnection2(COMPUTER_USE_SOCKET_PATH);
+    const socket = createConnection3(COMPUTER_USE_SOCKET_PATH);
     socket.setTimeout(500, () => socket.destroy());
     socket.once("connect", () => {
       socket.destroy();
@@ -3398,18 +3459,18 @@ async function runComputerDaemon() {
       if (rejected) return;
       socket.setTimeout(0);
       queue = queue.then(async () => {
-        let request;
+        let request2;
         try {
-          request = JSON.parse(input);
+          request2 = JSON.parse(input);
         } catch {
           writeResult(socket, { exitCode: 2, stdout: "", stderr: "Invalid computer-use request JSON\n" });
           return;
         }
-        if (!isDaemonRequest(request)) {
+        if (!isDaemonRequest(request2)) {
           writeResult(socket, { exitCode: 2, stdout: "", stderr: "Invalid or incompatible computer-use request\n" });
           return;
         }
-        writeResult(socket, await runDirectCommand(request.argv, request.cwd));
+        writeResult(socket, await runDirectCommand(request2.argv, request2.cwd));
       }).catch((error) => {
         writeResult(socket, { exitCode: 1, stdout: "", stderr: `${error instanceof Error ? error.message : String(error)}
 ` });
@@ -3454,7 +3515,7 @@ var ComputerDaemonUnavailableError = class extends Error {
 };
 function sendComputerRequest(argv) {
   return new Promise((resolve5, reject) => {
-    const socket = createConnection3(COMPUTER_USE_SOCKET_PATH);
+    const socket = createConnection4(COMPUTER_USE_SOCKET_PATH);
     let response = "";
     let settled = false;
     const finish = (error, result) => {
@@ -3505,7 +3566,7 @@ async function runComputerClient(argv) {
 }
 
 // src/media-server.ts
-import { spawn as spawn6 } from "child_process";
+import { spawn as spawn7 } from "child_process";
 import { createHash as createHash3 } from "crypto";
 import { createReadStream, existsSync as existsSync8, readdirSync as readdirSync3, readFileSync as readFileSync8, statSync as statSync2 } from "fs";
 import { createServer as createServer3 } from "http";
@@ -3515,7 +3576,7 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 import WebSocket2, { WebSocketServer } from "ws";
 
 // src/encoder.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 import { createSocket } from "dgram";
 import { createInterface } from "readline";
 
@@ -3750,7 +3811,7 @@ function superviseEncoder(options) {
     const warmupFrames = active ? options.warmupFrames ?? 0 : 0;
     const command = options.command?.() ?? "ffmpeg";
     const args = options.args(socket.address().port, warmupFrames);
-    const child = spawn4(command, args, { env: options.env, stdio: [options.controllable?.(command) ? "pipe" : "ignore", options.onOutput ? "pipe" : "ignore", "pipe"] });
+    const child = spawn5(command, args, { env: options.env, stdio: [options.controllable?.(command) ? "pipe" : "ignore", options.onOutput ? "pipe" : "ignore", "pipe"] });
     child.stdin?.on("error", () => {
     });
     child.stderr?.on("data", (chunk) => process.stderr.write(`[desktop-stream] ${chunk}`));
@@ -3932,7 +3993,11 @@ function readReplicasRuntimeEnv(readEnv, [namespacedKey, legacyKey]) {
   return readEnv(namespacedKey) ?? readEnv(legacyKey);
 }
 function parsePosixEnvFile(content) {
+  return parsePosixEnv(content).values;
+}
+function parsePosixEnv(content) {
   const result = {};
+  const unsetKeys = [];
   let pos = 0;
   while (pos < content.length) {
     let lineStart;
@@ -3945,6 +4010,9 @@ function parsePosixEnvFile(content) {
     }
     if (!content.startsWith("export ", lineStart)) {
       const nl2 = content.indexOf("\n", lineStart);
+      if (content.startsWith("unset ", lineStart)) {
+        unsetKeys.push(content.slice(lineStart + "unset ".length, nl2 === -1 ? void 0 : nl2).trim());
+      }
       if (nl2 === -1) break;
       pos = nl2 + 1;
       continue;
@@ -3983,7 +4051,7 @@ function parsePosixEnvFile(content) {
     const nl = content.indexOf("\n", cursor);
     pos = nl === -1 ? content.length : nl + 1;
   }
-  return result;
+  return { values: result, unsetKeys };
 }
 
 // src/ice-servers.ts
@@ -4674,7 +4742,7 @@ function superviseVideoEncoder(options) {
 }
 
 // src/input-bridge.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 var scrollPixelsPerStep = 80;
 var namedKeys = {
   AltLeft: "Alt_L",
@@ -4855,7 +4923,7 @@ var InputBridge = class {
   }
   write(command) {
     if (!this.process || this.process.exitCode !== null || this.process.stdin.destroyed) {
-      const child = spawn5("xte", [], {
+      const child = spawn6("xte", [], {
         env: { ...process.env, DISPLAY: this.display },
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -4956,7 +5024,7 @@ function drainDesktopTheme() {
     if (applied) appliedTheme = theme;
     drainDesktopTheme();
   };
-  const child = spawn6("bash", [SERVICES_SCRIPT, "--theme", theme], { detached: true, stdio: "ignore" });
+  const child = spawn7("bash", [SERVICES_SCRIPT, "--theme", theme], { detached: true, stdio: "ignore" });
   child.unref();
   child.once("exit", (code) => finish(code === 0));
   child.once("error", () => finish(false));
@@ -5263,8 +5331,8 @@ async function runMediaServer() {
     for (const viewer of viewers.values()) viewer.rtc?.setBudget(budgetBps());
     syncEncoder();
   };
-  const resetLadder = (request) => {
-    rung = request.transport === "webrtc" && request.adaptive ? webrtcStartupRung : 0;
+  const resetLadder = (request2) => {
+    rung = request2.transport === "webrtc" && request2.adaptive ? webrtcStartupRung : 0;
     cleanTransportSeconds = 0;
     descents = [];
     failedRung = -1;
@@ -5692,8 +5760,8 @@ async function runMediaServer() {
     audioSampleRate: 48e3,
     audioChannels: 2
   };
-  const httpServer = createServer3((request, response) => {
-    const url = new URL(request.url || "/", "http://localhost");
+  const httpServer = createServer3((request2, response) => {
+    const url = new URL(request2.url || "/", "http://localhost");
     if (url.pathname === "/health" || url.pathname === "/telemetry") {
       const all = [...viewers.values()];
       const memory = process.memoryUsage();
@@ -5746,7 +5814,7 @@ async function runMediaServer() {
       return;
     }
     if (url.pathname === "/snapshot") {
-      const capture = spawn6("ffmpeg", [
+      const capture = spawn7("ffmpeg", [
         "-hide_banner",
         "-loglevel",
         "error",
@@ -5803,20 +5871,20 @@ async function runMediaServer() {
     createReadStream(path).pipe(response);
   });
   const webSocketServer = new WebSocketServer({ noServer: true, maxPayload: 64 * 1024 });
-  httpServer.on("upgrade", (request, socket, head) => {
-    const url = new URL(request.url || "/", "http://localhost");
+  httpServer.on("upgrade", (request2, socket, head) => {
+    const url = new URL(request2.url || "/", "http://localhost");
     if (url.pathname !== "/stream") {
       socket.destroy();
       return;
     }
     const streamRequest = parseStreamRequest(url.searchParams, defaultRequest);
-    void (webrtc && streamRequest.transport === "webrtc" ? currentIceServers() : Promise.resolve(void 0)).then((ice) => webSocketServer.handleUpgrade(request, socket, head, (client) => webSocketServer.emit("connection", client, streamRequest, url.searchParams.get("standby") === "1", ice)));
+    void (webrtc && streamRequest.transport === "webrtc" ? currentIceServers() : Promise.resolve(void 0)).then((ice) => webSocketServer.handleUpgrade(request2, socket, head, (client) => webSocketServer.emit("connection", client, streamRequest, url.searchParams.get("standby") === "1", ice)));
   });
-  webSocketServer.on("connection", (socket, request, standby, ice) => {
+  webSocketServer.on("connection", (socket, request2, standby, ice) => {
     const viewer = {
       socket,
       input: new InputBridge(display, width, height),
-      request,
+      request: request2,
       standby,
       fallback: false,
       waitingForKeyframe: true,
@@ -5834,23 +5902,23 @@ async function runMediaServer() {
       rttFloorMs: 0,
       rttSamples: []
     };
-    if (viewers.size === 0) resetLadder(request);
-    if (request.profile !== activeProfile || request.adaptive !== adaptive) {
-      record("viewer request", `${request.profile} profile, ${request.adaptive ? "adaptive" : "pinned"} quality`);
-      activeProfile = request.profile;
-      adaptive = request.adaptive;
+    if (viewers.size === 0) resetLadder(request2);
+    if (request2.profile !== activeProfile || request2.adaptive !== adaptive) {
+      record("viewer request", `${request2.profile} profile, ${request2.adaptive ? "adaptive" : "pinned"} quality`);
+      activeProfile = request2.profile;
+      adaptive = request2.adaptive;
       if (!adaptive) rung = 0;
     }
     viewers.set(socket, viewer);
-    record("viewer connected", `${request.transport} requested${standby ? " in standby" : ""}, ${viewers.size} connected`);
+    record("viewer connected", `${request2.transport} requested${standby ? " in standby" : ""}, ${viewers.size} connected`);
     const reply = (message) => {
       if (socket.readyState === WebSocket2.OPEN) socket.send(JSON.stringify(message));
     };
     const fallbackProfile = profile() === "high444" ? "main" : profile();
-    const configMessage = { ...config, videoCodec: H264_PROFILES[fallbackProfile].codec, iceServers: ice?.browser, request };
+    const configMessage = { ...config, videoCodec: H264_PROFILES[fallbackProfile].codec, iceServers: ice?.browser, request: request2 };
     reply(configMessage);
     if (ice) openWebRtc(viewer, reply, ice.native);
-    if (!viewer.rtc) enterFallback(viewer, request.transport === "webrtc" ? "webrtc unavailable" : "websocket requested");
+    if (!viewer.rtc) enterFallback(viewer, request2.transport === "webrtc" ? "webrtc unavailable" : "websocket requested");
     ensureEncoders();
     socket.on("message", (raw, binary) => {
       if (binary) return;
@@ -5908,7 +5976,7 @@ async function runMediaServer() {
 
 // src/setup.ts
 import { spawnSync as spawnSync6 } from "child_process";
-import { accessSync, chmodSync as chmodSync2, constants, cpSync, existsSync as existsSync9, mkdirSync as mkdirSync7, readdirSync as readdirSync4, writeFileSync as writeFileSync6 } from "fs";
+import { accessSync, chmodSync as chmodSync2, constants, cpSync, existsSync as existsSync9, mkdirSync as mkdirSync7, readdirSync as readdirSync4, writeFileSync as writeFileSync7 } from "fs";
 import { dirname as dirname8, resolve as resolve4 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var dependencies = [
@@ -6053,13 +6121,13 @@ async function setupComputer(options = {}) {
   chmodSync2("/usr/local/bin/replicas-start-desktop-services", 493);
   chmodSync2("/usr/local/bin/replicas-chrome", 493);
   chmodSync2("/usr/local/bin/replicas-terminal", 493);
-  writeFileSync6("/etc/systemd/system/replicas-computer.service", serviceUnit, { mode: 420 });
+  writeFileSync7("/etc/systemd/system/replicas-computer.service", serviceUnit, { mode: 420 });
   if (existsSync9("/run/systemd/system")) {
     const reload = spawnSync6("systemctl", ["daemon-reload"], { stdio: "pipe" });
     if (reload.status !== 0) throw new Error(`Failed to reload systemd: ${reload.stderr?.toString().trim() || `exit ${reload.status}`}`);
   }
   mkdirSync7("/usr/local/share/replicas-computer", { recursive: true });
-  writeFileSync6("/usr/local/share/replicas-computer/install.json", `${JSON.stringify({
+  writeFileSync7("/usr/local/share/replicas-computer/install.json", `${JSON.stringify({
     version: COMPUTER_USE_VERSION,
     protocolVersion: COMPUTER_USE_PROTOCOL_VERSION,
     dependencies: found

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-computer",
-  "version": "0.3.29",
+  "version": "0.3.30",
   "description": "Replicas workspace computer-use runtime",
   "type": "module",
   "main": "dist/index.js",