npm - conductor-remote - Versions diffs - 1.46.2 → 1.46.3 - Mend

conductor-remote 1.46.2 → 1.46.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/README.md +34 -11
package/bin/cli.js +7 -7
package/dist/assets/{index-Cox9xTfw.js → index-DeCCNN08.js} +23 -23
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/scripts/nosleep.js +14 -13
package/dist-node/scripts/service.js +60 -20
package/dist-node/src/config.js +34 -0
package/dist-node/src/nosleep-helper.js +27 -4
package/dist-node/src/nosleep.js +33 -12
package/dist-node/src/server.js +1 -1
package/package.json +3 -2

package/dist/index.html CHANGED Viewed

@@ -13,7 +13,7 @@
 		<title>Conductor Remote</title>
 		<!-- Runs before the module bundle so it can catch a stale shell that fails to boot. -->
 		<script src="/self-heal.js"></script>
-		<script type="module" crossorigin src="/assets/index-Cox9xTfw.js"></script>
+		<script type="module" crossorigin src="/assets/index-DeCCNN08.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-DGZkOBT-.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

package/dist/sw.js CHANGED Viewed

	@@ -1 +1 @@
1	- if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[o])return;let l={};const c=e=>i(e,o),t={module:{uri:o},exports:l,require:c};s[o]=Promise.all(n.map(e=>t[e]\|\|c(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"~~039e5ab1adab0c250569cb906306c5a8~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~DGZkOBT-.css~~",revision:null},{url:"assets/index-~~Cox9xTfw.js~~",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});
1	+ if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[o])return;let l={};const t=e=>i(e,o),c={module:{uri:o},exports:l,require:t};s[o]=Promise.all(n.map(e=>c[e]\|\|t(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"7981a45fcfdd796b99d3615870365723"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-DeCCNN08.js",revision:null},{url:"assets/index-DGZkOBT-.css",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});

package/dist-node/scripts/nosleep.js CHANGED Viewed

@@ -1,5 +1,5 @@
 // `conductor-remote nosleep [duration | setup | status]` — keep this Mac fully
-// awake, including with the lid closed, so the relay stays reachable and
+// awake and block its automatic screen lock, so the relay stays reachable and
 // AppleScript sends can reach Conductor while you're away from the desk.
 //
 // The lever is `pmset -a disablesleep 1` (root): unlike a `caffeinate` idle
@@ -11,14 +11,13 @@
 // root shell whose EXIT trap restores the captured values, so Ctrl-C, a timeout, or
 // a crash can't leave the Mac unable to sleep.
 //
-// Caveat: awake is necessary but not sufficient for AppleScript *delivery*. A
-// locked screen blocks `activate` outright (#85/#87), so a lid-closed Mac serves
-// reads and notifications while every send parks in `src/parked.ts` until the
-// next unlock — that is the designed path, not a failure. Whether a closed lid
-// with no display *also* leaves the window server undrivable is untested here,
-// and untestable while the lock wall stands in front of it. Strip-clean
+// The helper also owns a process-scoped `caffeinate -d` assertion by default.
+// ScreenSaverDaemon checks that assertion before starting the idle screen saver
+// that locks the session. An explicit lock or lid close can still lock macOS;
+// those sends park in `src/parked.ts` until the next unlock. Strip-clean
 // (plain-node type-stripping), stdlib-only — see CLAUDE.md.
 import { spawn } from 'node:child_process';
+import { installedServiceEnvironment, preventScreenLockEnabled } from "../src/config.js";
 import { HELPER_PATH, helperFile, helperReady, installedHelper, NOSLEEP_BODY } from "../src/nosleep-helper.js";
 import { setup, status } from "./nosleep-setup.js";
 /** Parse `90m` / `2h` / `30s` / bare seconds into seconds; null = run until Ctrl-C. */
@@ -53,24 +52,26 @@ async function main() {
         return;
     }
     const seconds = parseDuration(arg);
+    const configuredMode = process.env.PREVENT_SCREEN_LOCK ?? installedServiceEnvironment().PREVENT_SCREEN_LOCK;
+    const preventScreenLock = preventScreenLockEnabled(configuredMode);
     // The shared body reads its window from an argument (0 = until killed) rather than
     // having one interpolated in, because the installed helper is a fixed file the
     // sudoers rule names — see nosleep-helper.ts. `label` is only echoed back, and the
     // script re-validates it, so the two paths print the same confirmation.
-    const args = [String(seconds ?? 0), arg ?? ''];
+    const args = [String(seconds ?? 0), arg ?? '', preventScreenLock ? '1' : '0'];
     console.info('conductor-remote nosleep — keeping this Mac awake (incl. lid-closed system sleep).');
     console.info(seconds !== null ? `Duration: ${arg} — Ctrl-C to stop early.` : 'Runs until you press Ctrl-C.');
-    // Be honest about the half this doesn't buy: awake is not drivable. A locked screen
-    // blocks every UI write (#85/#87), so a lid-closed Mac serves reads and notifications
-    // while sends park until the next unlock — by design, not by failure.
-    console.info('Note: sleep only — lid-closed *sending* still parks until you unlock.');
+    console.info(preventScreenLock
+        ? 'Automatic screen lock: blocked for this window.'
+        : 'Automatic screen lock: allowed by config (prevent-screen-lock=off).');
     // Prefer the root-owned helper `nosleep setup` installs: same script, no prompt, and
     // it is the only path a TTY-less caller (the LaunchAgent, and so the phone) can take.
     // Fall back to piping the body through `sudo sh -c`, which is the un-installed
     // experience and asks for a password.
     const viaHelper = await helperReady();
     if (viaHelper && installedHelper() !== helperFile()) {
-        console.warn(`⚠ ${HELPER_PATH} is from an older version — re-run \`nosleep setup\` to refresh it.`);
+        console.error(`✗ ${HELPER_PATH} is out of date — run \`conductor-remote nosleep setup\`, then try again.`);
+        process.exit(1);
     }
     if (!viaHelper) {
         console.info('Tip: `conductor-remote nosleep setup` installs this once so it stops asking.');

package/dist-node/scripts/service.js CHANGED Viewed

@@ -12,6 +12,7 @@ import { execFileSync, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { installedServiceEnvironment, serviceEnvironmentWithSetting } from "../src/config.js";
 import { packageRoot } from "../src/pkg-root.js";
 import { driftWarningLines, exposeStorePath, magicDnsName, normalizeExposeMode, relayPort, tailscaleBin, writeUrlHost } from "../src/tailscale.js";
 import { qrLines } from "./qr.js";
@@ -33,6 +34,7 @@ const FLAG_ENV = {
     '--hostname': 'RELAY_HOSTNAME',
     '--token': 'RELAY_TOKEN',
     '--write-strategy': 'WRITE_STRATEGY',
+    '--prevent-screen-lock': 'PREVENT_SCREEN_LOCK',
     '--auto-update': 'AUTO_UPDATE',
     '--auto-update-interval': 'AUTO_UPDATE_INTERVAL_MINUTES',
     '--funnel-watchdog': 'FUNNEL_WATCHDOG',
@@ -57,6 +59,10 @@ function applyFlags(argv) {
             console.error(`flag ${name} needs a value (e.g. ${name} <value>)`);
             process.exit(1);
         }
+        if (name === '--prevent-screen-lock' && value !== 'on' && value !== 'off') {
+            console.error(`flag ${name} must be on or off`);
+            process.exit(1);
+        }
         process.env[envKey] = value;
     }
 }
@@ -143,6 +149,8 @@ function buildPlist() {
         envEntries.push(['EXPOSE', process.env.EXPOSE]);
     if (process.env.WRITE_STRATEGY)
         envEntries.push(['WRITE_STRATEGY', process.env.WRITE_STRATEGY]);
+    if (process.env.PREVENT_SCREEN_LOCK)
+        envEntries.push(['PREVENT_SCREEN_LOCK', process.env.PREVENT_SCREEN_LOCK]);
     if (process.env.RELAY_HOST)
         envEntries.push(['RELAY_HOST', process.env.RELAY_HOST]);
     if (process.env.RELAY_PORT)
@@ -436,6 +444,14 @@ function install() {
     fs.mkdirSync(logDir, { recursive: true });
     fs.writeFileSync(plistPath, buildPlist());
     reloadAgent();
+    const changedSetting = process.env.CONDUCTOR_REMOTE_CONFIG_SET;
+    if (changedSetting) {
+        if (changedSetting === 'expose' || changedSetting === 'port' || changedSetting === 'hostname')
+            ensureTailscale();
+        console.info(`✓ set ${changedSetting}; the relay restarted with the new value.`);
+        console.info('  Check it with: conductor-remote config');
+        return;
+    }
     console.info(`✓ installed LaunchAgent ${LABEL}`);
     console.info(`  plist: ${plistPath}`);
     console.info(`  logs:  ${logDir}/relay.log`);
@@ -469,18 +485,9 @@ function restart() {
  * believes something else — which is exactly the bug that made EXPOSE a plist entry.
  */
 function readPlistEnv() {
-    try {
-        const out = execFileSync('plutil', ['-convert', 'json', '-o', '-', plistPath], {
-            encoding: 'utf8',
-            stdio: 'pipe'
-        });
-        const env = JSON.parse(out)?.EnvironmentVariables;
-        return env && typeof env === 'object' ? env : {};
-    }
-    catch {
-        return {};
-    }
+    return installedServiceEnvironment();
 }
+const CONFIG_KEYS = new Map(Object.entries(FLAG_ENV).map(([flag, env]) => [flag.slice(2), env]));
 const HOME = os.homedir();
 const tilde = (p) => (p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p);
 const KNOBS = [
@@ -503,6 +510,7 @@ const KNOBS = [
     { name: 'port', env: 'RELAY_PORT', fallback: () => '8787' },
     { name: 'host', env: 'RELAY_HOST', fallback: () => '127.0.0.1' },
     { name: 'write-strategy', env: 'WRITE_STRATEGY', fallback: () => 'applescript' },
+    { name: 'prevent-screen-lock', env: 'PREVENT_SCREEN_LOCK', fallback: () => 'on' },
     { name: 'auto-update', env: 'AUTO_UPDATE', fallback: () => 'auto' },
     { name: 'auto-update-interval', env: 'AUTO_UPDATE_INTERVAL_MINUTES', fallback: () => '5 (minutes)' },
     {
@@ -524,15 +532,47 @@ const KNOBS = [
         fallback: () => tilde(path.join(HOME, 'conductor', 'workspaces'))
     }
 ];
-/**
- * What is this daemon actually configured with, and where did each value come from.
- *
- * Read-only on purpose. Every knob is written by `service install`, and a second write path for the
- * same state is how the plist and the `expose` file came to disagree in the first place. What was
- * missing was the ability to *see* the disagreement, so that is what this adds — including a live
- * cross-check of the Tailscale posture against the configured one.
- */
+/** Set one daemon knob while preserving every other value already baked into the plist. */
+function setConfig(args) {
+    const [name, value, ...extra] = args;
+    const envKey = name ? CONFIG_KEYS.get(name) : undefined;
+    if (!name || value === undefined || extra.length > 0) {
+        console.error('usage: conductor-remote config set <setting> <value>');
+        process.exit(1);
+    }
+    if (!envKey) {
+        console.error(`config set: unknown setting "${name}"\n  known: ${[...CONFIG_KEYS.keys()].join(', ')}`);
+        process.exit(1);
+    }
+    if (name === 'prevent-screen-lock' && value !== 'on' && value !== 'off') {
+        console.error('config set: prevent-screen-lock must be on or off');
+        process.exit(1);
+    }
+    if (!fs.existsSync(plistPath)) {
+        console.error('config set: the service is not installed. Run `conductor-remote service install` first.');
+        process.exit(1);
+    }
+    // Re-run install in a fresh process so module-level values such as RELAY_PORT see
+    // the new environment. Start from the plist, which protects unrelated settings
+    // from ambient shell variables and from being reset to defaults.
+    const childEnv = serviceEnvironmentWithSetting(process.env, readPlistEnv(), CONFIG_KEYS.values(), envKey, value);
+    childEnv.CONDUCTOR_REMOTE_CONFIG_SET = name;
+    const cli = path.join(projectDir, 'bin', 'cli.js');
+    const result = spawnSync(process.execPath, [cli, 'service', 'install'], { env: childEnv, stdio: 'inherit' });
+    if (result.error)
+        console.error(`config set: could not restart the service (${result.error.message})`);
+    process.exit(result.status ?? 1);
+}
+/** What the daemon is configured with, where values came from, and an optional setter. */
 function config() {
+    if (process.argv[3] === 'set') {
+        setConfig(process.argv.slice(4));
+        return;
+    }
+    if (process.argv[3] !== undefined) {
+        console.error('usage: conductor-remote config [set <setting> <value>]');
+        process.exit(1);
+    }
     if (!fs.existsSync(plistPath)) {
         console.info(`plist:  (not installed)\n\nRun \`conductor-remote service install\` first.`);
         return;
@@ -574,7 +614,7 @@ function config() {
         console.info(`  ${r.name.padEnd(width)}  ${r.value.padEnd(valueWidth)}  ${r.source}`);
     }
     console.info('\n  (values come from the daemon\u2019s own plist environment, not this shell\u2019s)');
-    console.info('  change one with: conductor-remote service install --<setting> <value>');
+    console.info('  change one with: conductor-remote config set <setting> <value>');
     // The cross-check worth having. A posture the relay believes and a Tailscale that is doing something
     // else is invisible in every other command, and it is self-healing in the wrong direction: the funnel
     // watchdog only runs for `public`, so a relay that thinks it is public will re-register Funnel.

package/dist-node/src/config.js CHANGED Viewed

@@ -1,9 +1,14 @@
+import { execFileSync } from 'node:child_process';
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { packageRoot } from "./pkg-root.js";
 const home = os.homedir();
+/** The CLI and daemon share one on/off setting. Only `off` opts out. */
+export function preventScreenLockEnabled(raw = process.env.PREVENT_SCREEN_LOCK) {
+    return raw?.trim().toLowerCase() !== 'off';
+}
 /**
  * The relay's own state directory — its token, its Funnel posture, its undelivered
  * first prompts. Never Conductor's: everything about Conductor is read from the DB.
@@ -11,6 +16,34 @@ const home = os.homedir();
 export function stateDir() {
     return path.join(home, 'Library', 'Application Support', 'conductor-remote');
 }
+/** The runtime configuration baked into the installed LaunchAgent, or an empty object. */
+export function installedServiceEnvironment() {
+    const plist = path.join(home, 'Library', 'LaunchAgents', 'no.adluna.conductor-remote.plist');
+    try {
+        const out = execFileSync('plutil', ['-convert', 'json', '-o', '-', plist], {
+            encoding: 'utf8',
+            stdio: 'pipe'
+        });
+        const env = JSON.parse(out)?.EnvironmentVariables;
+        return env && typeof env === 'object' ? env : {};
+    }
+    catch {
+        return {};
+    }
+}
+/** Build the environment for a one-setting service update without changing its other knobs. */
+export function serviceEnvironmentWithSetting(ambient, installed, configKeys, key, value) {
+    const next = { ...ambient };
+    const known = new Set(configKeys);
+    for (const configKey of known)
+        delete next[configKey];
+    for (const [installedKey, installedValue] of Object.entries(installed)) {
+        if (known.has(installedKey))
+            next[installedKey] = installedValue;
+    }
+    next[key] = value;
+    return next;
+}
 /** Where a generated token is persisted so a phone's saved URL stays valid across relay restarts. */
 function tokenStorePath() {
     return path.join(stateDir(), 'token');
@@ -62,6 +95,7 @@ export function loadConfig() {
         host,
         token: resolveToken(),
         writeStrategy,
+        preventScreenLock: preventScreenLockEnabled(),
         publicDir: resolvePublicDir()
     };
 }

package/dist-node/src/nosleep-helper.js CHANGED Viewed

@@ -20,8 +20,8 @@ const execFileP = promisify(execFile);
 /** Absolute path of the root-owned helper. Must sit in a directory only root can write. */
 export const HELPER_PATH = '/usr/local/libexec/conductor-remote-nosleep';
 /**
- * Where the armed window records itself: `<pid> <expiry-epoch> <start-token>` (expiry
- * 0 = until killed). Written by root, mode 0644, because the relay has to *read* it on
+ * Where the armed window records itself: `<pid> <expiry-epoch> <start-token> <prevent-lock>`
+ * (expiry 0 = until killed). Written by root, mode 0644, because the relay has to *read* it on
  * every status poll and a sudo round-trip per poll would be absurd. It is the lock as
  * well as the record — see the one-owner note on NOSLEEP_BODY.
  *
@@ -31,7 +31,8 @@ export const HELPER_PATH = '/usr/local/libexec/conductor-remote-nosleep';
  * as root — so `kill -0` succeeds against whatever inherited the number, and `--stop`
  * would then SIGTERM an unrelated root process. Readers that only want the pid and the
  * expiry (`src/nosleep.ts` ▸ readPidfile) can ignore it; a two-field file from an older
- * version still parses, and skips the check.
+ * version still parses, and skips the check. The fourth field records whether this
+ * window also holds the display assertion that blocks the automatic screen lock.
  */
 export const PIDFILE_PATH = '/var/run/conductor-remote-nosleep.pid';
 /**
@@ -40,10 +41,13 @@ export const PIDFILE_PATH = '/var/run/conductor-remote-nosleep.pid';
  * file that reads fine and never takes effect.
  */
 export const SUDOERS_PATH = '/etc/sudoers.d/conductor-remote';
+/** Fixed absolute path because this body runs through a passwordless root helper. */
+export const CAFFEINATE_PATH = '/usr/bin/caffeinate';
 /**
  * `$1` = seconds to stay awake, 0 = until killed, or one of `--check` / `--stop`.
  * `$2` = optional display label ("90m") echoed back in the confirmation, validated to
  * the same charset the CLI accepts so nothing arbitrary reaches the terminal.
+ * `$3` = 1 to block the automatic screen lock for the window, 0 to allow it.
  *
  * Restore is on the EXIT trap only; INT/TERM/HUP just `exit`, so a signal can't run
  * the restore twice. The captured values are read *before* anything changes and put
@@ -107,8 +111,10 @@ export const NOSLEEP_BODY = [
     'fi',
     'secs=$arg',
     'label=${2:-}',
+    'preventlock=${3:-1}',
     "case \"$secs\" in '' | *[!0-9]*) echo 'nosleep: seconds must be digits (0 = until killed)' >&2; exit 64 ;; esac",
     'case "$label" in *[!0-9smh]*) label=\'\' ;; esac',
+    'case "$preventlock" in 0 | 1) ;; *) echo \'nosleep: prevent-screen-lock must be 0 or 1\' >&2; exit 64 ;; esac',
     '',
     '# Take over from any incumbent BEFORE capturing, or we would capture its flipped',
     '# values and restore those — the one way this leaves a Mac unable to sleep.',
@@ -132,8 +138,10 @@ export const NOSLEEP_BODY = [
     "ds=$(pmset -g | awk '/SleepDisabled/{print $2;exit}')",
     '',
     "sleeper=''",
+    "displaykeeper=''",
     'cleanup() {',
     '\tif [ -n "$sleeper" ]; then kill "$sleeper" 2>/dev/null || true; fi',
+    '\tif [ -n "$displaykeeper" ]; then kill "$displaykeeper" 2>/dev/null || true; wait "$displaykeeper" 2>/dev/null || true; fi',
     '\tpmset -b standby "${sb:-1}" powernap "${pn:-1}"',
     '\tpmset -a disablesleep "${ds:-0}"',
     // Only clear the record if it is still ours: a successor that already took over
@@ -148,10 +156,20 @@ export const NOSLEEP_BODY = [
     'pmset -b standby 0 powernap 0',
     'pmset -a disablesleep 1',
     '',
+    '# ScreenSaverDaemon consults PreventUserIdleDisplaySleep before starting the idle',
+    '# screen saver that locks the session. The assertion is process-scoped, so macOS',
+    '# drops it even if the helper is killed before its EXIT trap can run.',
+    'if [ "$preventlock" = 1 ]; then',
+    `\t${CAFFEINATE_PATH} -d -w "$$" &`,
+    '\tdisplaykeeper=$!',
+    '\tsleep 0.1',
+    '\tif ! kill -0 "$displaykeeper" 2>/dev/null; then echo "nosleep: could not block the automatic screen lock" >&2; exit 69; fi',
+    'fi',
+    '',
     'until=0',
     'if [ "$secs" -gt 0 ]; then until=$(( $(date +%s) + secs )); fi',
     // 0644 so the relay can poll the state without a sudo round-trip per tick.
-    'printf \'%s %s %s\\n\' "$$" "$until" "$(procStart $$)" > "$pidfile" && chmod 644 "$pidfile"',
+    'printf \'%s %s %s %s\\n\' "$$" "$until" "$(procStart $$)" "$preventlock" > "$pidfile" && chmod 644 "$pidfile"',
     '',
     '# A long window is ambiguous without the weekday: "until 15:45" reads as today.',
     'clock() {',
@@ -171,6 +189,11 @@ export const NOSLEEP_BODY = [
     '\techo "✓ Sleep disabled at $(date \'+%H:%M\') (incl. lid closed) — until you press Ctrl-C."',
     '\tsleep 2147483647 &',
     'fi',
+    'if [ "$preventlock" = 1 ]; then',
+    '\techo "⚠ Automatic screen lock is disabled for this window. Anyone with physical access can use this Mac."',
+    'else',
+    '\techo "Automatic screen lock remains enabled (prevent-screen-lock=off)."',
+    'fi',
     'sleeper=$!',
     'wait "$sleeper"'
 ].join('\n');

package/dist-node/src/nosleep.js CHANGED Viewed

@@ -29,13 +29,17 @@
  *    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;
@@ -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));
     }

package/dist-node/src/server.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.46.2",
+	"version": "1.46.3",
 	"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",