replicas-cli 0.2.349 → 0.2.350

package/dist/index.mjs

@@ -9601,7 +9601,7 @@ var HOOK_EXEC_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
 var REPLICAS_CONFIG_FILENAMES = ["replicas.json", "replicas.yaml", "replicas.yml"];
 
 // ../shared/src/cli-version.ts
-var CLI_VERSION = "0.2.349";
+var CLI_VERSION = "0.2.350";
 
 // ../shared/src/version.ts
 function compareVersions(v1, v2) {
@@ -14796,21 +14796,23 @@ async function learningsDeleteCommand(id) {
 // src/commands/computer/index.ts
 import { spawn as spawn4, spawnSync as spawnSync3 } from "child_process";
 import { createHash as createHash2 } from "crypto";
-import { closeSync, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync2, openSync, readFileSync as readFileSync2, readSync, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname2 } from "path";
+import { closeSync, copyFileSync as copyFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync3, openSync, readFileSync as readFileSync3, readSync, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname3 } from "path";
 import chalk21 from "chalk";
 
 // src/commands/computer/desktop.ts
 import { spawnSync } from "child_process";
-import { existsSync } from "fs";
-import { isAbsolute, resolve } from "path";
+import { existsSync, mkdirSync, readFileSync } from "fs";
+import { dirname, isAbsolute, resolve } from "path";
 var STATE_DIR = process.env.REPLICAS_DESKTOP_STATE_DIR || "/tmp/replicas-computer";
 var DEFAULT_DISPLAY = process.env.REPLICAS_DESKTOP_DISPLAY || ":99";
 var NOVNC_PORT = process.env.REPLICAS_DESKTOP_NOVNC_PORT ? parseInt(process.env.REPLICAS_DESKTOP_NOVNC_PORT, 10) : DESKTOP_NOVNC_PORT;
 var SERVICES_SCRIPT = "/usr/local/bin/replicas-start-desktop-services";
+var INPUT_LOCK_FILE = process.env.REPLICAS_DESKTOP_INPUT_LOCK_FILE || `${STATE_DIR}/input.lock`;
 var CHROME_WRAPPER = "/usr/local/bin/replicas-chrome";
 var INFO_WAIT_TIMEOUT_MS = 1e4;
 var INFO_WAIT_INTERVAL_MS = 500;
+var lastDesktopHealthAt = 0;
 var CHROME_DEBUG_PORT = (() => {
   const value = process.env.REPLICAS_DESKTOP_CHROME_DEBUG_PORT;
   if (!value) return 9222;
@@ -14823,16 +14825,49 @@ var CHROME_DEBUG_PORT = (() => {
 function fail(msg) {
   throw new Error(msg);
 }
+function getDesktopBridgeStatus() {
+  const r = spawnSync("bash", [SERVICES_SCRIPT, "--status-json"], { stdio: "pipe" });
+  if (r.status !== 0) return null;
+  try {
+    return JSON.parse(r.stdout.toString());
+  } catch {
+    return null;
+  }
+}
+function desktopStackHealthy() {
+  const pids = {};
+  for (const name of ["openbox", "tint2", "x11vnc", "novnc"]) {
+    try {
+      const pid = Number.parseInt(readFileSync(`${STATE_DIR}/${name}.pid`, "utf8").trim(), 10);
+      if (!Number.isFinite(pid)) return false;
+      process.kill(pid, 0);
+      pids[name] = pid;
+    } catch {
+      return false;
+    }
+  }
+  if (spawnSync("xdpyinfo", [], { env: withDisplay(), stdio: "ignore" }).status !== 0) return false;
+  const wm = spawnSync("xprop", ["-root", "_NET_SUPPORTING_WM_CHECK"], { env: withDisplay(), stdio: "pipe" });
+  if (wm.status !== 0 || !wm.stdout?.toString().includes("window id")) return false;
+  const bridge = getDesktopBridgeStatus();
+  return !!bridge?.x11vnc.listenerPids?.includes(pids.x11vnc) && !!bridge.websockify.listenerPids?.includes(pids.novnc);
+}
 function ensureServicesRunning() {
   if (!existsSync(SERVICES_SCRIPT)) {
     fail(
       `Desktop services script missing at ${SERVICES_SCRIPT}. The workspace image is out of date \u2014 Xvfb / openbox / x11vnc / websockify must be installed and \`replicas-start-desktop-services\` baked in.`
     );
   }
+  if (Date.now() - lastDesktopHealthAt < 1e3) return;
+  if (desktopStackHealthy()) {
+    lastDesktopHealthAt = Date.now();
+    return;
+  }
   const r = spawnSync("bash", [SERVICES_SCRIPT], { stdio: "pipe" });
   if (r.status !== 0) {
     fail(`Failed to start desktop services: ${r.stderr?.toString() || "unknown error"}`);
   }
+  lastDesktopHealthAt = Date.now();
 }
 function withDisplay(env = process.env) {
   return { ...env, DISPLAY: DEFAULT_DISPLAY };
@@ -14845,6 +14880,17 @@ function runDisplayCmd(bin, args) {
   }
   return r.stdout?.toString() ?? "";
 }
+function runDesktopInputCmd(args) {
+  mkdirSync(dirname(INPUT_LOCK_FILE), { recursive: true });
+  return runDisplayCmd("flock", [
+    "--exclusive",
+    "--wait",
+    process.env.REPLICAS_DESKTOP_INPUT_LOCK_WAIT_SECONDS || "60",
+    INPUT_LOCK_FILE,
+    "xdotool",
+    ...args
+  ]);
+}
 function tryDisplayCmd(bin, args) {
   ensureServicesRunning();
   const r = spawnSync(bin, args, { env: withDisplay(), stdio: "pipe" });
@@ -14910,8 +14956,8 @@ var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 
 // src/commands/computer/recording.ts
 import { spawn as spawn3 } from "child_process";
-import { appendFileSync, existsSync as existsSync2, mkdirSync, readFileSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
-import { dirname } from "path";
+import { appendFileSync, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname2 } from "path";
 
 // src/commands/computer/recording/render.ts
 import { spawnSync as spawnSync2 } from "child_process";
@@ -15393,7 +15439,7 @@ var RECORD_DIMENSIONS_FILE = `${STATE_DIR}/recording-dimensions.json`;
 var RECORD_ACTIONS_FILE = `${STATE_DIR}/recording-actions.jsonl`;
 function recordingStartedAt() {
   if (!existsSync2(RECORD_STARTED_AT_FILE)) return null;
-  const startedAt = Number.parseInt(readFileSync(RECORD_STARTED_AT_FILE, "utf8").trim(), 10);
+  const startedAt = Number.parseInt(readFileSync2(RECORD_STARTED_AT_FILE, "utf8").trim(), 10);
   return Number.isFinite(startedAt) ? startedAt : null;
 }
 function logRecordingAction(action) {
@@ -15406,7 +15452,7 @@ function logRecordingAction(action) {
 function readRecordingDimensions() {
   if (!existsSync2(RECORD_DIMENSIONS_FILE)) return configuredDesktopDimensions();
   try {
-    const dimensions = JSON.parse(readFileSync(RECORD_DIMENSIONS_FILE, "utf8"));
+    const dimensions = JSON.parse(readFileSync2(RECORD_DIMENSIONS_FILE, "utf8"));
     const width = dimensions?.width;
     const height = dimensions?.height;
     if (typeof width === "number" && Number.isFinite(width) && width > 0 && typeof height === "number" && Number.isFinite(height) && height > 0) {
@@ -15424,7 +15470,7 @@ function isOptionalNumber(value) {
 }
 function readRecordingActions() {
   if (!existsSync2(RECORD_ACTIONS_FILE)) return [];
-  return readFileSync(RECORD_ACTIONS_FILE, "utf8").split("\n").filter(Boolean).flatMap((line) => {
+  return readFileSync2(RECORD_ACTIONS_FILE, "utf8").split("\n").filter(Boolean).flatMap((line) => {
     try {
       const value = JSON.parse(line);
       if (typeof value !== "object" || value === null) return [];
@@ -15446,7 +15492,7 @@ function readRecordingActions() {
 async function computerRecordStartCommand(path6, options) {
   ensureServicesRunning();
   if (existsSync2(RECORD_PID_FILE)) {
-    const pid = parseInt(readFileSync(RECORD_PID_FILE, "utf8").trim(), 10);
+    const pid = parseInt(readFileSync2(RECORD_PID_FILE, "utf8").trim(), 10);
     if (Number.isFinite(pid)) {
       let alive = false;
       try {
@@ -15458,10 +15504,10 @@ async function computerRecordStartCommand(path6, options) {
     }
   }
   const target = resolvePath(path6);
-  mkdirSync(dirname(target), { recursive: true });
+  mkdirSync2(dirname2(target), { recursive: true });
   const fps = options.fps ? parseCoord(options.fps, "--fps") : 60;
   const { width, height } = configuredDesktopDimensions();
-  mkdirSync(STATE_DIR, { recursive: true });
+  mkdirSync2(STATE_DIR, { recursive: true });
   const rawTarget = `${target}.raw-${Date.now()}.mp4`;
   rmSync2(RECORD_ACTIONS_FILE, { force: true });
   const child = spawn3("ffmpeg", [
@@ -15506,7 +15552,7 @@ async function computerRecordStartCommand(path6, options) {
 async function computerRecordStopCommand() {
   if (!existsSync2(RECORD_PID_FILE) && !existsSync2(RECORD_PATH_FILE)) fail("no recording in progress");
   if (existsSync2(RECORD_PID_FILE)) {
-    const pid = parseInt(readFileSync(RECORD_PID_FILE, "utf8").trim(), 10);
+    const pid = parseInt(readFileSync2(RECORD_PID_FILE, "utf8").trim(), 10);
     if (!Number.isFinite(pid)) fail("invalid recording pidfile");
     try {
       process.kill(pid, "SIGINT");
@@ -15523,9 +15569,9 @@ async function computerRecordStopCommand() {
     rmSync2(RECORD_PID_FILE, { force: true });
   }
   if (existsSync2(RECORD_PATH_FILE)) {
-    const target = readFileSync(RECORD_PATH_FILE, "utf8").trim();
-    const rawPath = existsSync2(RECORD_RAW_PATH_FILE) ? readFileSync(RECORD_RAW_PATH_FILE, "utf8").trim() : target;
-    const fps = existsSync2(RECORD_FPS_FILE) ? parseInt(readFileSync(RECORD_FPS_FILE, "utf8").trim(), 10) : 60;
+    const target = readFileSync2(RECORD_PATH_FILE, "utf8").trim();
+    const rawPath = existsSync2(RECORD_RAW_PATH_FILE) ? readFileSync2(RECORD_RAW_PATH_FILE, "utf8").trim() : target;
+    const fps = existsSync2(RECORD_FPS_FILE) ? parseInt(readFileSync2(RECORD_FPS_FILE, "utf8").trim(), 10) : 60;
     const size = readRecordingDimensions();
     const actions = readRecordingActions();
     if (rawPath !== target) {
@@ -15543,15 +15589,6 @@ async function computerRecordStopCommand() {
 }
 
 // src/commands/computer/index.ts
-function desktopBridgeStatus() {
-  const r = spawnSync3("bash", [SERVICES_SCRIPT, "--status-json"], { stdio: "pipe" });
-  if (r.status !== 0) return null;
-  try {
-    return JSON.parse(r.stdout.toString());
-  } catch {
-    return null;
-  }
-}
 function bridgeStatus(details, includeBacklog = false, rootsOnly = false) {
   const pids = rootsOnly ? details.rootPids ?? [] : details.listenerPids ?? [];
   const listenerCount = rootsOnly ? details.rootListeners ?? pids.length : details.listeners ?? pids.length;
@@ -15591,7 +15628,7 @@ async function computerInfoCommand() {
 }
 async function computerStatusCommand() {
   ensureServicesRunning();
-  const bridge = desktopBridgeStatus();
+  const bridge = getDesktopBridgeStatus();
   const procs = ["Xvfb", "openbox", "tint2", "x11vnc", "websockify"];
   for (const p of procs) {
     const r = spawnSync3("pgrep", ["-af", p], { stdio: "pipe" });
@@ -15631,7 +15668,7 @@ function loadBrandSvg(canvasW, canvasH) {
       `Brand wallpaper SVG missing at ${path6}. The workspace image is out of date \u2014 \`desktop/brand-wallpaper.svg\` must be installed at $REPLICAS_DESKTOP_TEMPLATES.`
     );
   }
-  return readFileSync2(path6, "utf8").replace(/(<svg[^>]*\s)width="\d+"/, `$1width="${canvasW}"`).replace(/(<svg[^>]*\s)height="\d+"/, `$1height="${canvasH}"`);
+  return readFileSync3(path6, "utf8").replace(/(<svg[^>]*\s)width="\d+"/, `$1width="${canvasW}"`).replace(/(<svg[^>]*\s)height="\d+"/, `$1height="${canvasH}"`);
 }
 var BRAND_PAD_FRACTION = 0.06;
 var SCREENSHOT_CORNER_FRACTION = 0.022;
@@ -15694,7 +15731,7 @@ function overlayGrid(rawPath, target, width, height, gridSize, gridPath) {
 }
 async function computerScreenshotCommand(path6, options = {}) {
   const target = resolvePath(path6);
-  mkdirSync2(dirname2(target), { recursive: true });
+  mkdirSync3(dirname3(target), { recursive: true });
   const stamp = `${process.pid}-${Date.now()}`;
   const rawPath = `/tmp/replicas-screenshot-${stamp}.raw.png`;
   const svgPath = `/tmp/replicas-screenshot-${stamp}.brand.svg`;
@@ -15773,7 +15810,7 @@ async function computerScreenshotCommand(path6, options = {}) {
   console.log(target);
 }
 function hashFile(path6) {
-  return createHash2("sha256").update(readFileSync2(path6)).digest("hex");
+  return createHash2("sha256").update(readFileSync3(path6)).digest("hex");
 }
 async function captureStableRawScreenshot(target, options) {
   const start = Date.now();
@@ -15824,7 +15861,7 @@ function recordingMousePosition() {
 }
 async function computerObserveCommand(path6, options = {}) {
   const target = resolvePath(path6);
-  mkdirSync2(dirname2(target), { recursive: true });
+  mkdirSync3(dirname3(target), { recursive: true });
   const timeoutMs = options.timeout ? parseCoord(options.timeout, "--timeout") : 3e3;
   const stableMs = options.stableMs ? parseCoord(options.stableMs, "--stable-ms") : 600;
   const pollMs = options.pollMs ? parseCoord(options.pollMs, "--poll-ms") : 200;
@@ -15835,6 +15872,7 @@ async function computerObserveCommand(path6, options = {}) {
   const rawPath = `/tmp/replicas-observe-${stamp}.raw.png`;
   const gridPath = `/tmp/replicas-observe-${stamp}.grid.svg`;
   try {
+    ensureServicesRunning();
     const capture = await captureStableRawScreenshot(rawPath, { timeoutMs, stableMs, pollMs });
     const gridSize = options.raw ? null : parseGridSize(options.grid ?? true);
     if (gridSize === null) {
@@ -16340,7 +16378,7 @@ async function computerClickCommand(xStr, yStr, options) {
       args.push("keyup", mod);
     }
   }
-  runDisplayCmd("xdotool", args);
+  runDesktopInputCmd(args);
   logRecordingAction({ type: "click", x, y });
   console.log(`clicked ${button === "1" ? "left" : button === "2" ? "middle" : button === "3" ? "right" : `button ${button}`} at (${x},${y})${options.double ? " x2" : ""}`);
 }
@@ -16348,19 +16386,19 @@ async function computerMoveCommand(xStr, yStr) {
   const dimensions = getDisplayDimensions();
   const x = parseScreenCoord(xStr, "x", dimensions.width);
   const y = parseScreenCoord(yStr, "y", dimensions.height);
-  runDisplayCmd("xdotool", ["mousemove", "--sync", String(x), String(y)]);
+  runDesktopInputCmd(["mousemove", "--sync", String(x), String(y)]);
   logRecordingAction({ type: "move", x, y });
   console.log(`moved to (${x},${y})`);
 }
 async function computerTypeCommand(text, options) {
   const delay = options.delay ? parseCoord(options.delay, "--delay") : 12;
-  runDisplayCmd("xdotool", ["type", "--delay", String(delay), "--", text]);
+  runDesktopInputCmd(["type", "--delay", String(delay), "--", text]);
   const position = recordingMousePosition();
   logRecordingAction({ type: "type", ...position ?? {} });
   console.log(`typed ${text.length} char${text.length === 1 ? "" : "s"}`);
 }
 async function computerKeyCommand(combo) {
-  runDisplayCmd("xdotool", ["key", "--", combo]);
+  runDesktopInputCmd(["key", "--", combo]);
   const position = recordingMousePosition();
   logRecordingAction({ type: "key", ...position ?? {} });
   console.log(`pressed ${combo}`);
@@ -16387,7 +16425,7 @@ async function computerScrollCommand(direction, options) {
     );
   }
   args.push("click", "--repeat", String(amount), "--delay", "30", button);
-  runDisplayCmd("xdotool", args);
+  runDesktopInputCmd(args);
   const position = hoverPosition ?? recordingMousePosition();
   logRecordingAction({ type: "scroll", ...position ?? {} });
   console.log(`scrolled ${dir} x${amount}`);
@@ -16414,7 +16452,7 @@ async function computerDragCommand(fx, fy, tx, ty) {
     args.push("mousemove", "--sync", String(x), String(y), "sleep", "0.018");
   }
   args.push("mouseup", "1");
-  runDisplayCmd("xdotool", args);
+  runDesktopInputCmd(args);
   logRecordingAction({ type: "drag", x: fromX, y: fromY, toX, toY });
   console.log(`dragged (${fromX},${fromY}) -> (${toX},${toY})`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-cli",
-  "version": "0.2.349",
+  "version": "0.2.350",
   "description": "CLI for managing Replicas workspaces - SSH into cloud dev environments with automatic port forwarding",
   "main": "dist/index.mjs",
   "bin": {