conductor-remote 1.46.2 → 1.47.0

package/dist-node/src/nosleep.js

@@ -29,16 +29,20 @@
  *    re-`setup` — gated on ioreg's AppleClamshellState: an open lid, or a desktop Mac
  *    that has none, keeps the restore-only behaviour, because forcing sleep on a Mac
  *    someone may be sitting at is worse than the bug.
+ *  - **The same window blocks the idle screen lock by default.** The root helper owns
+ *    a `PreventUserIdleDisplaySleep` assertion through `caffeinate -d`; macOS drops it
+ *    with the process even if the EXIT trap never runs. The pidfile records that mode
+ *    so the phone can warn accurately, and the persisted setting can opt out.
  *
  * Stdlib only, strip-clean — see CLAUDE.md.
  */
 import { execFile, spawn } from 'node:child_process';
 import fs from 'node:fs';
 import { promisify } from 'node:util';
-import { HELPER_PATH, helperReady, PIDFILE_PATH } from "./nosleep-helper.js";
+import { HELPER_PATH, helperFile, helperReady, installedHelper, PIDFILE_PATH } from "./nosleep-helper.js";
 const execFileP = promisify(execFile);
 /** Longest window the API will arm. A phone tap should never be able to disable sleep forever. */
-export const MAX_SECONDS = 12 * 3600;
+export const MAX_SECONDS = 16 * 3600;
 /**
  * Whether `pid` exists. EPERM is the interesting case: the armed helper runs as root, so
  * signalling it from here is refused, and that refusal is itself proof it is alive.
@@ -52,7 +56,7 @@ function alive(pid) {
         return err.code === 'EPERM';
     }
 }
-/** Parse `<pid> <expiry-epoch-seconds>`; expiry 0 means "until stopped". */
+/** Parse `<pid> <expiry-epoch-seconds> <start-token> <prevent-lock>`; expiry 0 means "until stopped". */
 function readPidfile() {
     let raw;
     try {
@@ -61,12 +65,17 @@ function readPidfile() {
     catch {
         return null;
     }
-    const [pidRaw, untilRaw] = raw.trim().split(/\s+/);
+    const [pidRaw, untilRaw, , preventLockRaw] = raw.trim().split(/\s+/);
     const pid = Number(pidRaw);
     if (!Number.isInteger(pid) || pid <= 0)
         return null;
     const untilSec = Number(untilRaw);
-    return { pid, until: Number.isFinite(untilSec) && untilSec > 0 ? untilSec * 1000 : null };
+    return {
+        pid,
+        until: Number.isFinite(untilSec) && untilSec > 0 ? untilSec * 1000 : null,
+        // Three-field records came from the old helper, which held no display assertion.
+        preventsScreenLock: preventLockRaw === '1'
+    };
 }
 /**
  * Armed-ness on its own: a local file read plus a signal probe, no subprocess at all.
@@ -82,7 +91,13 @@ function armedRecord() {
     return rec && alive(rec.pid) ? rec : null;
 }
 function armedState(rec) {
-    return { available: true, armed: true, until: rec.until, pid: rec.pid };
+    return {
+        available: true,
+        armed: true,
+        until: rec.until,
+        pid: rec.pid,
+        preventsScreenLock: rec.preventsScreenLock
+    };
 }
 /**
  * Current state. `helperReady()` shells out to sudo, so it is only consulted when nothing
@@ -92,7 +107,9 @@ export async function nosleepState() {
     const rec = armedRecord();
     if (rec)
         return armedState(rec);
-    return { available: await helperReady(), armed: false, until: null, pid: null };
+    const ready = await helperReady();
+    const current = installedHelper() === helperFile();
+    return { available: ready && current, armed: false, until: null, pid: null, preventsScreenLock: false };
 }
 /**
  * Whether the lid is physically shut. `null` means the probe couldn't say — a desktop Mac
@@ -150,8 +167,8 @@ function sleepSoon(why) {
 function unavailable() {
     return {
         ok: false,
-        error: 'Passwordless nosleep isn’t installed. Run `conductor-remote nosleep setup` on the Mac.',
-        state: { available: false, armed: false, until: null, pid: null }
+        error: 'Passwordless nosleep is missing or out of date. Run `conductor-remote nosleep setup` on the Mac.',
+        state: { available: false, armed: false, until: null, pid: null, preventsScreenLock: false }
     };
 }
 /**
@@ -159,8 +176,8 @@ function unavailable() {
  * rather than stacking — the helper enforces that, and it has to, since two owners would
  * restore each other's flipped values and leave sleep disabled for good.
  */
-export async function armNoSleep(seconds) {
-    if (!(await helperReady()))
+export async function armNoSleep(seconds, preventScreenLock = true) {
+    if (!(await helperReady()) || installedHelper() !== helperFile())
         return unavailable();
     // Floor of 1, not 0. The helper reads 0 as "until killed", so anything under a second
     // truncates straight past MAX_SECONDS into a window nothing ever closes — which is the
@@ -168,7 +185,7 @@ export async function armNoSleep(seconds) {
     const secs = Math.min(MAX_SECONDS, Math.max(1, Math.trunc(seconds)));
     // Detached, own session, no stdio: it has to survive this relay's own restarts,
     // which autoupdate performs routinely and without warning.
-    const child = spawn('sudo', ['-n', HELPER_PATH, String(secs), ''], {
+    const child = spawn('sudo', ['-n', HELPER_PATH, String(secs), '', preventScreenLock ? '1' : '0'], {
         detached: true,
         stdio: 'ignore'
     });
@@ -214,7 +231,11 @@ export async function disarmNoSleep() {
                 sleepSoon('the keep-awake window was ended from the phone');
             else
                 console.info('nosleep: window ended with the lid open (or unreadable) — sleep re-enabled, not forced');
-            return { ok: true, willSleep, state: { available: true, armed: false, until: null, pid: null } };
+            return {
+                ok: true,
+                willSleep,
+                state: { available: true, armed: false, until: null, pid: null, preventsScreenLock: false }
+            };
         }
         await new Promise(r => setTimeout(r, 200));
     }
@@ -257,7 +278,7 @@ function rescanExpiry() {
         expiryKey = null;
         void windowExpired(fireAt);
     }, Math.max(0, fireAt - Date.now()));
-    // A 12h timer must not hold the process open, and it survives nothing anyway — a
+    // A 16h timer must not hold the process open, and it survives nothing anyway — a
     // restarted relay rebuilds it from the pidfile in watchNoSleepExpiry's first rescan.
     expiryTimer.unref();
 }

package/dist-node/src/server.js

@@ -671,7 +671,7 @@ const server = http.createServer(async (req, res) => {
                 // truncates to 0 — an unbounded window from a request that looked bounded.
                 if (!Number.isInteger(seconds) || seconds < 1)
                     return json(req, res, 400, { error: 'need a whole number of seconds >= 1' });
-                const result = await armNoSleep(seconds);
+                const result = await armNoSleep(seconds, cfg.preventScreenLock);
                 return json(req, res, result.ok ? 200 : result.state.available ? 502 : 409, result);
             }
             // DELETE /api/nosleep — let it sleep again now, rather than at the window's end

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.46.2",
+	"version": "1.47.0",
 	"type": "module",
 	"packageManager": "yarn@4.15.0",
 	"description": "Phone control panel for local Conductor agents. Reads ride SQLite + git; prompts ride Conductor's own dispatch path.",
@@ -50,12 +50,13 @@
 		"typecheck": "tsc -p tsconfig.json",
 		"lint": "biome check .",
 		"fix": "biome check . --fix",
-		"verify": "yarn typecheck && yarn lint && yarn check:imports && yarn check:routes && yarn check:attachments && yarn check:applescript && yarn check:model-labels && yarn check:nosleep && yarn check:uilock && yarn check:firstprompt && yarn check:sendonce && yarn check:notify",
+		"verify": "yarn typecheck && yarn lint && yarn check:imports && yarn check:routes && yarn check:attachments && yarn check:applescript && yarn check:config && yarn check:model-labels && yarn check:nosleep && yarn check:uilock && yarn check:firstprompt && yarn check:sendonce && yarn check:notify",
 		"release": "semantic-release",
 		"prepack": "yarn build && yarn build:node",
 		"postinstall": "husky || true",
 		"check:attachments": "node scripts/check-attachments.ts",
 		"check:applescript": "node scripts/check-applescript.ts",
+		"check:config": "node scripts/check-config.ts",
 		"check:firstprompt": "node scripts/check-firstprompt.ts",
 		"check:model-labels": "node scripts/check-model-labels.ts",
 		"check:sendonce": "node scripts/check-sendonce.ts",