humanish 0.83.0 → 0.83.2

package/dist/cua-actor-lab.js

@@ -46,6 +46,7 @@ import { appendSandboxReceipt } from "./sandbox-receipts.js";
 import { assertScreenshotEvidence } from "./image-evidence.js";
 import { buildObserverData } from "./observer-data.js";
 import { corepackCommandFor, needsNodeRuntime, nodeBootstrapCommand } from "./subject-runtime.js";
+import { TERMINAL_NODE_BOOTSTRAP_COMMAND } from "./terminal-node-bootstrap.js";
 import { chromeCdpProbeCommand, parseChromeCdpProbeOutput } from "./chrome-cdp-probe.js";
 import { personaToDirectives, renderPersonaPromptSection } from "./persona.js";
 import { labPersonaIds, resolveCommittedPersonas } from "./persona-resolve.js";
@@ -1164,16 +1165,45 @@ async function fitBrowserWindowWithinDesktop(desktop, windowId, resolution, requ
     await run('xdotool windowmove "$win" 0 0');
     await desktop.wait(250).catch(() => undefined);
     const moved = await measureBrowserWindowWithXdotool(desktop, windowId, requestTimeoutMs).catch(() => undefined);
-    // A failed move cannot be repaired by resizing a window whose origin is offscreen.
-    if (moved === undefined || moved.x < 0 || moved.y < 0)
+    if (moved === undefined)
         return moved;
+    let resized = moved;
     const width = resolution[0] - moved.x;
     const height = resolution[1] - moved.y;
-    if (width <= 0 || height <= 0)
-        return moved;
-    await run(`xdotool windowsize "$win" ${width} ${height}`);
-    await desktop.wait(250).catch(() => undefined);
-    return measureBrowserWindowWithXdotool(desktop, windowId, requestTimeoutMs).catch(() => undefined);
+    // Resizing alone cannot fix an offscreen client origin. The window manager
+    // can also center a minimum-width client at a negative x on a narrow screen.
+    if (moved.x >= 0 && moved.y >= 0 && width > 0 && height > 0) {
+        await run(`xdotool windowsize "$win" ${width} ${height}`);
+        await desktop.wait(250).catch(() => undefined);
+        const measured = await measureBrowserWindowWithXdotool(desktop, windowId, requestTimeoutMs).catch(() => undefined);
+        if (measured === undefined)
+            return measured;
+        resized = measured;
+    }
+    if (resized === undefined || isBrowserWindowContained(resized, resolution))
+        return resized;
+    // Chrome's minimum client width can equal the whole desktop. Window-manager
+    // borders then make a decorated window impossible to contain, even after a
+    // successful move/resize. Request fullscreen once and prove the physical result.
+    // xprop/xdotool ship with the desktop template; wmctrl is not required.
+    // Check state first so the fullscreen shortcut cannot toggle an existing state off.
+    await run([
+        'state=$(xprop -id "$win" _NET_WM_STATE)',
+        'case "$state" in',
+        '  *_NET_WM_STATE_FULLSCREEN*) ;;',
+        '  *) xdotool windowactivate --sync "$win"; xdotool key --clearmodifiers F11 ;;',
+        'esac'
+    ].join("\n"));
+    // The fullscreen animation may report its new origin before its final width.
+    // Give the window manager a bounded settling window, keeping missing reads unverified.
+    for (let attempt = 0; attempt < 4; attempt += 1) {
+        await desktop.wait(250).catch(() => undefined);
+        const measured = await measureBrowserWindowWithXdotool(desktop, windowId, requestTimeoutMs).catch(() => undefined);
+        if (measured === undefined || isBrowserWindowContained(measured, resolution))
+            return measured;
+        resized = measured;
+    }
+    return resized;
 }
 /** Shared hosted-browser geometry capture used by per-lane and sequential shared-world routes. */
 export async function captureDesktopBrowserGeometry(args) {
@@ -1266,23 +1296,22 @@ function shellSingleQuote(value) {
     return `'${value.replace(/'/g, "'\\''")}'`;
 }
 /**
- * Put a CLI on the desktop before the participant arrives (#495).
+ * Prepare a CLI study's runtime and, only when declared, its product (#495, #515).
  *
  * The install runs UNKEYED and before the session starts, for the same reason the clone route
  * provisions its subject first: what is being studied begins when the participant looks at the
- * screen, and making them fight an install first would be a study of the install.
+ * screen. Omitting install deliberately studies product installation; Node/npm remain a
+ * harness prerequisite so the participant can follow the product's public npm instructions.
  */
 async function provisionDesktopCli(desktop, args) {
     const install = args.install;
-    if (install === undefined)
-        return;
     const now = () => Date.now();
-    if (needsNodeRuntime([install])) {
+    if (install === undefined || needsNodeRuntime([install])) {
         const startedAt = now();
-        emitPhaseStarted(args.onPhase, now, "runtime", "providing the Node runtime the install needs");
+        emitPhaseStarted(args.onPhase, now, "runtime", "providing Node/npm for the desktop CLI study");
         const bootstrap = await runDetachedStep(desktop, {
             name: "desktop-cli-runtime-node",
-            command: nodeBootstrapCommand(),
+            command: TERMINAL_NODE_BOOTSTRAP_COMMAND,
             cwd: "/home/user",
             timeoutMs: INSTALL_TIMEOUT_MS,
             requestTimeoutMs: args.requestTimeoutMs
@@ -1294,6 +1323,8 @@ async function provisionDesktopCli(desktop, args) {
             throw new Error(`desktop-cli runtime bootstrap failed for "${args.product}"`);
         }
     }
+    if (install === undefined)
+        return;
     const startedAt = now();
     emitPhaseStarted(args.onPhase, now, "install", `installing ${args.product} on the desktop`);
     const result = await runDetachedStep(desktop, {
@@ -1831,9 +1862,8 @@ export async function runCuaLane(spec, deps) {
                 };
             }
             if (desktopCliRoute) {
-                // Put the product on the desktop before the participant sees it. UNKEYED, like every other
-                // provisioning step: the participant's world is prepared by the harness, and what is being
-                // studied starts at the moment they look at the screen.
+                // Prepare the runtime and any declared product install, UNKEYED. With install omitted,
+                // the participant discovers and installs the product from its public surfaces.
                 await provisionDesktopCli(desktop, {
                     product: config.subject.product?.name ?? "",
                     ...(config.subject.product?.install === undefined ? {} : { install: config.subject.product.install }),