@slock-ai/computer 0.0.16-alpha.0 → 0.0.16

package/dist/index.js

@@ -29879,11 +29879,11 @@ function serverDir(slockHome, serverId) {
 function serverAttachmentPath(slockHome, serverId) {
   return path2.join(serverDir(slockHome, serverId), "runner.state.json");
 }
-function serverDaemonPidPath(slockHome, serverId) {
-  return path2.join(serverDir(slockHome, serverId), "daemon.pid");
+function serverRunnerPidPath(slockHome, serverId) {
+  return path2.join(serverDir(slockHome, serverId), "server-runner.pid");
 }
-function serverDaemonLogPath(slockHome, serverId) {
-  return path2.join(serverDir(slockHome, serverId), "daemon.log");
+function serverRunnerLogPath(slockHome, serverId) {
+  return path2.join(serverDir(slockHome, serverId), "server-runner.log");
 }
 function serverManagedFlagPath(slockHome, serverId) {
   return path2.join(serverDir(slockHome, serverId), "managed.flag");
@@ -29891,17 +29891,30 @@ function serverManagedFlagPath(slockHome, serverId) {
 function serverHealthPath(slockHome, serverId) {
   return path2.join(serverDir(slockHome, serverId), "health.json");
 }
+function serviceRunDir(slockHome) {
+  return path2.join(computerDir(slockHome), "run");
+}
 function serviceStatePath(slockHome) {
-  return path2.join(computerDir(slockHome), "service.state.json");
+  return path2.join(serviceRunDir(slockHome), "service.state.json");
 }
 function servicePidPath(slockHome) {
+  return path2.join(serviceRunDir(slockHome), "service.pid");
+}
+function legacyServicePidPath(slockHome) {
   return path2.join(computerDir(slockHome), "service.pid");
 }
 function legacySupervisorPidPath(slockHome) {
   return path2.join(computerDir(slockHome), "supervisor.pid");
 }
+function servicePidReadFallback(slockHome) {
+  return [
+    servicePidPath(slockHome),
+    legacyServicePidPath(slockHome),
+    legacySupervisorPidPath(slockHome)
+  ];
+}
 function serviceLogPath(slockHome) {
-  return path2.join(computerDir(slockHome), "service.log");
+  return path2.join(serviceRunDir(slockHome), "service.log");
 }
 function serviceVersionPath(slockHome) {
   return path2.join(computerDir(slockHome), "service-version.json");
@@ -30877,7 +30890,7 @@ async function cleanupAllStalePidfiles(slockHome) {
   }
   const attached = await listAttachedServerIds(slockHome);
   for (const sid of attached) {
-    const p = serverDaemonPidPath(slockHome, sid);
+    const p = serverRunnerPidPath(slockHome, sid);
     if (await cleanupStalePidfile(p)) cleaned.push(p);
   }
   return cleaned;
@@ -30925,7 +30938,7 @@ async function cleanupOrphanProcesses(slockHome, psSpawn) {
   const supPid = await readPidfileAt(servicePidPath(slockHome));
   if (supPid !== null) knownPids.add(supPid);
   for (const sid of managed) {
-    const pid = await readPidfileAt(serverDaemonPidPath(slockHome, sid));
+    const pid = await readPidfileAt(serverRunnerPidPath(slockHome, sid));
     if (pid !== null) knownPids.add(pid);
   }
   if (supPid === null) return signaled;
@@ -31168,6 +31181,50 @@ async function emitRunnerStateTransition(slockHome, serverId, fromState, toState
 
 // src/services/start.ts
 init_esm_shims();
+
+// src/internal/service-pid-fallback.ts
+init_esm_shims();
+async function findLiveServicePid(slockHome, deps = {}) {
+  const readPidfile = deps.readPidfile ?? readPidfileAt;
+  const isAlive = deps.isProcessAlive ?? isProcessAlive2;
+  const clearStale = deps.clearPidfile ?? clearPidfileAt;
+  return walkFallback(slockHome, readPidfile, isAlive, clearStale);
+}
+async function findLiveServicePidReadOnly(slockHome, deps = {}) {
+  const readPidfile = deps.readPidfile ?? readPidfileAt;
+  const isAlive = deps.isProcessAlive ?? isProcessAlive2;
+  return walkFallback(slockHome, readPidfile, isAlive, async () => void 0);
+}
+async function walkFallback(slockHome, readPidfile, isAlive, clearStale) {
+  const candidates = servicePidReadFallback(slockHome);
+  let firstStalePidfile = null;
+  let firstStalePid = null;
+  for (const candidate of candidates) {
+    const candidatePid = await readPidfile(candidate);
+    if (candidatePid === null) continue;
+    if (isAlive(candidatePid)) {
+      return {
+        pid: candidatePid,
+        pidfilePath: candidate,
+        firstStalePidfile,
+        firstStalePid
+      };
+    }
+    await clearStale(candidate);
+    if (firstStalePidfile === null) {
+      firstStalePidfile = candidate;
+      firstStalePid = candidatePid;
+    }
+  }
+  return {
+    pid: null,
+    pidfilePath: candidates[0],
+    firstStalePidfile,
+    firstStalePid
+  };
+}
+
+// src/services/start.ts
 var START_ENSURE_TIMEOUT_MS = 15e3;
 var START_ENSURE_POLL_INTERVAL_MS = 100;
 function emit4(opts, event) {
@@ -31189,7 +31246,7 @@ async function waitForManagedDaemonPids(slockHome, serverIds, opts) {
   while (ready.size < serverIds.length) {
     for (const serverId of serverIds) {
       if (ready.has(serverId)) continue;
-      const pid = await readPidfile(serverDaemonPidPath(slockHome, serverId));
+      const pid = await readPidfile(serverRunnerPidPath(slockHome, serverId));
       if (pid && isAlive(pid)) ready.set(serverId, pid);
     }
     if (ready.size === serverIds.length) return ready;
@@ -31201,8 +31258,8 @@ async function waitForManagedDaemonPids(slockHome, serverIds, opts) {
 }
 function buildTimeoutMessage(slockHome, serverIds, ready, input) {
   const missing = serverIds.filter((id) => !ready.has(id));
-  const target = input.serverId && missing.length === 1 ? `${input.serverLabel ?? input.serverId}` : `${missing.length} daemon(s): ${missing.join(", ")}`;
-  return `Timed out waiting for ${target} to start. Run \`slock-computer status\` and inspect ${serviceLogPath(slockHome)} plus per-server daemon logs under ~/.slock/computer/servers/<serverId>/daemon.log.`;
+  const target = input.serverId && missing.length === 1 ? `${input.serverLabel ?? input.serverId}` : `${missing.length} server runner(s): ${missing.join(", ")}`;
+  return `Timed out waiting for ${target} to start. Run \`slock-computer status\` and inspect ${serviceLogPath(slockHome)} plus per-server server-runner logs under ~/.slock/computer/servers/<serverId>/server-runner.log.`;
 }
 async function start(input, options = {}) {
   options.signal?.throwIfAborted?.();
@@ -31230,8 +31287,11 @@ async function start(input, options = {}) {
   for (const id of managedTargets) {
     await setServerManaged(slockHome, id);
   }
-  const existing = await readPidfileAt(servicePidPath(slockHome));
-  if (existing && isProcessAlive2(existing)) {
+  const { pid: existing } = await findLiveServicePid(slockHome, {
+    readPidfile: options.readPidfile,
+    isProcessAlive: options.isProcessAlive
+  });
+  if (existing !== null) {
     emit4(options, {
       type: "already_running",
       servicePid: existing,
@@ -31327,7 +31387,7 @@ async function pollReadyOnce(slockHome, serverIds, opts) {
   const isAlive = opts.isProcessAlive ?? isProcessAlive2;
   const ready = /* @__PURE__ */ new Map();
   for (const serverId of serverIds) {
-    const pid = await readPidfile(serverDaemonPidPath(slockHome, serverId));
+    const pid = await readPidfile(serverRunnerPidPath(slockHome, serverId));
     if (pid && isAlive(pid)) ready.set(serverId, pid);
   }
   return ready;
@@ -31357,26 +31417,23 @@ async function stop(input = {}, options = {}) {
   const sleep2 = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const pollIntervalMs = options.pollIntervalMs ?? STOP_POLL_INTERVAL_MS;
   const timeoutMs = options.timeoutMs ?? STOP_TIMEOUT_MS;
-  let pidfilePath = servicePidPath(slockHome);
-  let pid = await readPidfile(pidfilePath);
-  if (pid === null) {
-    const legacyPidfilePath = legacySupervisorPidPath(slockHome);
-    const legacyPid = await readPidfile(legacyPidfilePath);
-    if (legacyPid !== null) {
-      pidfilePath = legacyPidfilePath;
-      pid = legacyPid;
-    }
-  }
+  const { pid, pidfilePath, firstStalePidfile, firstStalePid } = await findLiveServicePid(slockHome, {
+    readPidfile,
+    isProcessAlive: isAlive
+  });
   emit5(options, { type: "stopping", pid });
   if (pid === null) {
+    if (firstStalePidfile !== null && firstStalePid !== null) {
+      emit5(options, { type: "stale_pidfile_cleared", pid: firstStalePid });
+      return {
+        status: "stale_pidfile_cleared",
+        pid: firstStalePid,
+        pidfilePath: firstStalePidfile
+      };
+    }
     emit5(options, { type: "not_running" });
     return { status: "not_running", pid: null, pidfilePath };
   }
-  if (!isAlive(pid)) {
-    await clearPidfileAt(pidfilePath);
-    emit5(options, { type: "stale_pidfile_cleared", pid });
-    return { status: "stale_pidfile_cleared", pid, pidfilePath };
-  }
   options.signal?.throwIfAborted?.();
   try {
     killer(pid);
@@ -31504,8 +31561,8 @@ async function detach(input, options = {}) {
   await clearServerManaged(slockHome, serverId);
   const subtree = [
     serverAttachmentPath(slockHome, serverId),
-    serverDaemonPidPath(slockHome, serverId),
-    serverDaemonLogPath(slockHome, serverId)
+    serverRunnerPidPath(slockHome, serverId),
+    serverRunnerLogPath(slockHome, serverId)
   ];
   for (const p of subtree) await clearPidfileAt(p);
   emit6(options, { type: "subtree_cleared", serverId, serverLabel });
@@ -31526,7 +31583,7 @@ function buildResidentSpawn(mode, serverId, selfEntry = process.argv[1] ?? "", e
 }
 var PARENT_LOCK_HELD_ENV_VAR = "SLOCK_COMPUTER_PARENT_MUTATION_LOCK_HELD";
 async function spawnDetachedService(slockHome) {
-  await mkdir8(computerDir(slockHome), { recursive: true });
+  await mkdir8(serviceRunDir(slockHome), { recursive: true });
   const supLogFd = await open(serviceLogPath(slockHome), "a");
   const { command, args } = buildResidentSpawn("__service", null);
   const child = spawn2(command, args, {
@@ -31703,14 +31760,14 @@ async function readServiceVersionEvidence(slockHome) {
 }
 async function runService() {
   const slockHome = resolveSlockHome();
-  await mkdir8(computerDir(slockHome), { recursive: true });
+  await mkdir8(serviceRunDir(slockHome), { recursive: true });
   await runServiceStartupRecovery(slockHome);
   await writePidfileAt(servicePidPath(slockHome), process.pid);
   await writeServiceVersionEvidence(slockHome);
   const children = /* @__PURE__ */ new Map();
   const { [PARENT_LOCK_HELD_ENV_VAR]: _parentLockMarker, ...childEnv } = process.env;
   const spawnChild = async (serverId) => {
-    const logPath = serverDaemonLogPath(slockHome, serverId);
+    const logPath = serverRunnerLogPath(slockHome, serverId);
     await mkdir8(dirname8(logPath), { recursive: true });
     const logFd = await open(logPath, "a");
     const { command, args } = buildResidentSpawn("__run", serverId);
@@ -31723,11 +31780,11 @@ async function runService() {
     if (!child.pid) return;
     const handle = { serverId, child, stopping: false };
     children.set(serverId, handle);
-    await writePidfileAt(serverDaemonPidPath(slockHome, serverId), child.pid);
+    await writePidfileAt(serverRunnerPidPath(slockHome, serverId), child.pid);
     child.on("exit", (code, signal) => {
       void (async () => {
         children.delete(serverId);
-        await clearPidfileAt(serverDaemonPidPath(slockHome, serverId));
+        await clearPidfileAt(serverRunnerPidPath(slockHome, serverId));
         if (handle.stopping) return;
         const classification = classifyRunnerExit(code, signal);
         if (classification === "config-error") {
@@ -31736,7 +31793,7 @@ async function runService() {
           } catch {
           }
           process.stderr.write(
-            `Service: server ${serverId} child exited with EX_CONFIG (${EX_CONFIG_EXIT_CODE}); marked degraded, NOT auto-restarting. See ${serverDaemonLogPath(slockHome, serverId)} for the actionable error.
+            `Service: server ${serverId} child exited with EX_CONFIG (${EX_CONFIG_EXIT_CODE}); marked degraded, NOT auto-restarting. See ${serverRunnerLogPath(slockHome, serverId)} for the actionable error.
 `
           );
           return;
@@ -31847,7 +31904,7 @@ async function runStart(opts = {}, deps = {}) {
     info(
       `Managing ${sb.managedCount} of ${sb.attachedCount} attached server(s). Logs: ${sb.logPath}`
     );
-    info(`Per-server daemon logs: ~/.slock/computer/servers/<serverId>/daemon.log`);
+    info(`Per-server server-runner logs: ~/.slock/computer/servers/<serverId>/server-runner.log`);
     info(`Check state with \`slock-computer status\`.`);
   }
 }
@@ -32208,6 +32265,10 @@ async function pidStatus(pidfile) {
   const pid = await readPidfileAt(pidfile);
   return pid !== null && isProcessAlive2(pid) ? { running: true, pid } : { running: false };
 }
+async function serviceState(slockHome) {
+  const { pid } = await findLiveServicePidReadOnly(slockHome);
+  return pid !== null ? { running: true, pid } : { running: false };
+}
 async function deriveHealth(slockHome, serverId, daemon) {
   if (!daemon.running) return "offline";
   if (await isDegraded(slockHome, serverId)) return "degraded";
@@ -32218,19 +32279,19 @@ async function buildStatusReport(installRoot) {
   const session = sessionRead.session;
   const attachments = await listServerAttachments(installRoot);
   const service = {
-    ...await pidStatus(servicePidPath(installRoot)),
+    ...await serviceState(installRoot),
     logPath: serviceLogPath(installRoot)
   };
   const servers = [];
   for (const a of attachments) {
-    const daemon = await pidStatus(serverDaemonPidPath(installRoot, a.serverId));
+    const daemon = await pidStatus(serverRunnerPidPath(installRoot, a.serverId));
     servers.push({
       serverId: a.serverId,
       serverSlug: a.serverSlug ?? null,
       serverMachineId: a.serverMachineId,
       serverUrl: a.serverUrl,
       attachedAt: a.attachedAt ?? null,
-      daemonLogPath: serverDaemonLogPath(installRoot, a.serverId),
+      serverRunnerLogPath: serverRunnerLogPath(installRoot, a.serverId),
       daemon,
       health: await deriveHealth(installRoot, a.serverId, daemon)
     });
@@ -32277,7 +32338,7 @@ async function runStatus(opts) {
       info(
         `  ${pad(formatServerSlugDisplay(s.serverSlug), 24)}${pad(s.health, 12)}${pad(dcol, 24)}${pad(s.serverMachineId, 38)}${s.serverUrl}`
       );
-      info(`    Daemon log: ${s.daemonLogPath}`);
+      info(`    Server runner log: ${s.serverRunnerLogPath}`);
     }
     if (report.servers.some((s) => s.health === "degraded")) {
       info("");
@@ -32618,14 +32679,14 @@ import { readFile as readFile10 } from "fs/promises";
 var DEFAULT_LINES = 200;
 async function runLogs(opts) {
   const home = resolveSlockHome();
-  const file = opts.service ? serviceLogPath(home) : serverDaemonLogPath(home, await resolveTargetServerId({ server: opts.server }));
+  const file = opts.service ? serviceLogPath(home) : serverRunnerLogPath(home, await resolveTargetServerId({ server: opts.server }));
   let content;
   try {
     content = await readFile10(file, "utf8");
   } catch {
     fail(
       "NO_DAEMON_LOG",
-      opts.service ? `No service log at ${file}. Start the service first (\`slock-computer start\`).` : `No daemon log at ${file}. Start its daemon first (\`slock-computer start\`).`
+      opts.service ? `No service log at ${file}. Start the service first (\`slock-computer start\`).` : `No server runner log at ${file}. Start its server runner first (\`slock-computer start\`).`
     );
   }
   const n = Number.isInteger(opts.lines) && opts.lines > 0 ? opts.lines : DEFAULT_LINES;
@@ -33537,13 +33598,8 @@ async function restartPhase(slockHome, deps = {}) {
   return { ok: false, reason: "health_check_timeout" };
 }
 async function defaultReadServicePid(slockHome) {
-  try {
-    const raw = (await readFile14(servicePidPath(slockHome), "utf8")).trim();
-    const pid = Number.parseInt(raw, 10);
-    return Number.isInteger(pid) && pid > 0 ? pid : null;
-  } catch {
-    return null;
-  }
+  const { pid } = await findLiveServicePid(slockHome);
+  return pid;
 }
 async function defaultKillService(pid) {
   try {
@@ -33861,7 +33917,7 @@ async function rollingDaemonHealthCheck(slockHome, deps = {}) {
 }
 async function defaultReadDaemonPid(slockHome, serverId) {
   try {
-    const raw = (await readFile14(serverDaemonPidPath(slockHome, serverId), "utf8")).trim();
+    const raw = (await readFile14(serverRunnerPidPath(slockHome, serverId), "utf8")).trim();
     const pid = Number.parseInt(raw, 10);
     return Number.isInteger(pid) && pid > 0 ? pid : null;
   } catch {
@@ -34067,6 +34123,8 @@ async function runUpgradeCli(slockHome, opts, deps = {}) {
   if (drainMode !== void 0 && drainMode !== "drain") {
     info(`Drain mode: ${drainMode}${drainMode === "force" ? " (in-flight turns will be dropped)" : ""}.`);
   }
+  const readBundledFn = deps.readBundledDaemonVersion ?? readBundledDaemonVersion;
+  const fromBundledDaemonVersion = await readBundledFn(currentBinaryDir);
   const runUpgradeFn = deps.runUpgradeFn ?? runUpgrade;
   const spawnFreshService = deps.spawnFreshService ?? defaultSpawnFreshService;
   const outcome = await runUpgradeFn(slockHome, {
@@ -34084,17 +34142,18 @@ async function runUpgradeCli(slockHome, opts, deps = {}) {
       spawnFreshService: () => spawnFreshService(slockHome)
     }
   });
-  const readBundledFn = deps.readBundledDaemonVersion ?? readBundledDaemonVersion;
-  const bundledDaemonVersion = await readBundledFn(currentBinaryDir);
-  const bundle = (version) => bundledDaemonVersion !== null ? { computerVersion: version, bundledDaemonVersion } : { computerVersion: version };
+  const toBundledDaemonVersion = await readBundledFn(currentBinaryDir);
+  const bundle = (version, bundledDaemonVersion) => bundledDaemonVersion !== null ? { computerVersion: version, bundledDaemonVersion } : { computerVersion: version };
+  const fromBundle = bundle(fromVersion, fromBundledDaemonVersion);
+  const toBundle = bundle(targetVersion, toBundledDaemonVersion);
   const logTrigger = opts.trigger ?? "cli";
   if (outcome.ok) {
     info(
       `Upgrade ${fromVersion} \u2192 ${targetVersion} succeeded (health-OK in ${outcome.restart?.healthAfterMs ?? 0}ms).`
     );
     await appendUpgradeLogEntry(slockHome, {
-      fromBundle: bundle(fromVersion),
-      toBundle: bundle(targetVersion),
+      fromBundle,
+      toBundle,
       channel: channel2,
       trigger: logTrigger,
       outcome: "ok"
@@ -34114,8 +34173,8 @@ async function runUpgradeCli(slockHome, opts, deps = {}) {
       `Upgrade ${fromVersion} \u2192 ${targetVersion} succeeded; cleanup phase reported a non-fatal issue: ${outcome.reason ?? "unknown"}. Active layout + service are healthy.`
     );
     await appendUpgradeLogEntry(slockHome, {
-      fromBundle: bundle(fromVersion),
-      toBundle: bundle(targetVersion),
+      fromBundle,
+      toBundle,
       channel: channel2,
       trigger: logTrigger,
       outcome: "ok"
@@ -34125,8 +34184,8 @@ async function runUpgradeCli(slockHome, opts, deps = {}) {
   }
   const code = mapFailurePhaseToCode(outcome);
   await appendUpgradeLogEntry(slockHome, {
-    fromBundle: bundle(fromVersion),
-    toBundle: bundle(targetVersion),
+    fromBundle,
+    toBundle,
     channel: channel2,
     trigger: logTrigger,
     outcome: "err",
@@ -34499,10 +34558,10 @@ async function runUpgradeInstallSmoke(slockHome, opts, deps = {}) {
   const activeVersion = await readServiceVersionEvidence(slockHome);
   return { outcome, activeVersion };
 }
-async function runUpgradeInstallSmokeCli(slockHome, opts, writer = (s) => process.stdout.write(s)) {
+async function runUpgradeInstallSmokeCli(slockHome, opts, writer = (s) => process.stdout.write(s), deps = {}) {
   let report;
   try {
-    report = await runUpgradeInstallSmoke(slockHome, opts);
+    report = await runUpgradeInstallSmoke(slockHome, opts, deps);
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     writer(
@@ -34589,10 +34648,10 @@ program2.command("setup").argument("<serverSlug>", "target Slock server slug (ca
 program2.command("detach").argument("<serverSlug>", "server slug to detach from this Computer (canonical form `/myserver`)").description("Remove ONE server's local attachment; never touches user-session or other servers.").action(withCliExit(async (serverSlug) => {
   await withMutationLock(async () => runDetach(await resolveTargetServerId({ server: serverSlug }), serverSlug));
 }));
-program2.command("status").description("Show this Computer's aggregate state (login + service + per-server daemons).").option("--json", "emit the machine-readable report").action(withCliExit(async (opts) => {
+program2.command("status").description("Show this Computer's aggregate state (login + service + per-server server-runners).").option("--json", "emit the machine-readable report").action(withCliExit(async (opts) => {
   await runStatus({ json: opts.json });
 }));
-program2.command("start").argument("[serverSlug]", "optional: verify this server is attached and ensure its daemon is reconciled (default: ensure all attached)").description("Start/ensure the Computer service (manages all per-server daemons).").option("--foreground", "stay in this terminal instead of detaching").action(withCliExit(async (serverSlug, opts) => {
+program2.command("start").argument("[serverSlug]", "optional: verify this server is attached and ensure its server-runner is reconciled (default: ensure all attached)").description("Start/ensure the Computer service (manages all per-server server-runners).").option("--foreground", "stay in this terminal instead of detaching").action(withCliExit(async (serverSlug, opts) => {
   await withMutationLock(
     async () => runStart({
       foreground: opts.foreground,
@@ -34601,7 +34660,7 @@ program2.command("start").argument("[serverSlug]", "optional: verify this server
     })
   );
 }));
-program2.command("stop").description("Stop the Computer service (and all managed per-server daemons).").action(withCliExit(async () => {
+program2.command("stop").description("Stop the Computer service (and all managed per-server server-runners).").action(withCliExit(async () => {
   await withMutationLock(() => runStop());
 }));
 program2.command("doctor").argument("[serverSlug]", "optional: scope detail (recent crashes) to one server").description("Diagnose login + per-server attachments + per-server preflight (no secrets).").option("--json", "emit the machine-readable report").option("--cleanup", "after diagnosis, run the local residue cleanup pass").option("--fix", "alias for --cleanup (same behavior)").option("--reset-health", "clear <serverSlug>'s crash history so service resumes auto-restart").action(
@@ -34631,7 +34690,7 @@ program2.command("reset").description("Clear a degraded state and resume the ser
     );
   })
 );
-program2.command("logs").description("Tail one server's daemon log (or the service log); secrets redacted.").option("--lines <n>", "trailing lines to show (default 200)", (v) => Number.parseInt(v, 10)).option("--server <slug>", "select target server slug (required when \u22652 attached)").option("--service", "tail the global service log instead of a per-server daemon log").action(withCliExit(async (opts) => {
+program2.command("logs").description("Tail one server's server-runner log (or the service log); secrets redacted.").option("--lines <n>", "trailing lines to show (default 200)", (v) => Number.parseInt(v, 10)).option("--server <slug>", "select target server slug (required when \u22652 attached)").option("--service", "tail the global service log instead of a per-server server-runner log").action(withCliExit(async (opts) => {
   await runLogs({ lines: opts.lines, server: opts.server ?? null, service: !!opts.service });
 }));
 var runners = program2.command("runners").description("Computer runner control plane (per-server scoped; \xA712 whitelist server-side).");

package/dist/lib/index.d.ts

@@ -11,7 +11,7 @@ interface ServerStatusRow {
     serverMachineId: string;
     serverUrl: string;
     attachedAt: string | null;
-    daemonLogPath: string;
+    serverRunnerLogPath: string;
     daemon: DaemonState;
     /** v6 §11 health enum surfaced in `status` table (PR-H §3.3). */
     health: ServerHealth;

package/dist/lib/index.js

@@ -128,20 +128,36 @@ function serverDir(slockHome, serverId) {
 function serverAttachmentPath(slockHome, serverId) {
   return path.join(serverDir(slockHome, serverId), "runner.state.json");
 }
-function serverDaemonPidPath(slockHome, serverId) {
-  return path.join(serverDir(slockHome, serverId), "daemon.pid");
+function serverRunnerPidPath(slockHome, serverId) {
+  return path.join(serverDir(slockHome, serverId), "server-runner.pid");
 }
-function serverDaemonLogPath(slockHome, serverId) {
-  return path.join(serverDir(slockHome, serverId), "daemon.log");
+function serverRunnerLogPath(slockHome, serverId) {
+  return path.join(serverDir(slockHome, serverId), "server-runner.log");
 }
 function serverHealthPath(slockHome, serverId) {
   return path.join(serverDir(slockHome, serverId), "health.json");
 }
+function serviceRunDir(slockHome) {
+  return path.join(computerDir(slockHome), "run");
+}
 function servicePidPath(slockHome) {
+  return path.join(serviceRunDir(slockHome), "service.pid");
+}
+function legacyServicePidPath(slockHome) {
   return path.join(computerDir(slockHome), "service.pid");
 }
+function legacySupervisorPidPath(slockHome) {
+  return path.join(computerDir(slockHome), "supervisor.pid");
+}
+function servicePidReadFallback(slockHome) {
+  return [
+    servicePidPath(slockHome),
+    legacyServicePidPath(slockHome),
+    legacySupervisorPidPath(slockHome)
+  ];
+}
 function serviceLogPath(slockHome) {
-  return path.join(computerDir(slockHome), "service.log");
+  return path.join(serviceRunDir(slockHome), "service.log");
 }
 
 // src/serverState.ts
@@ -220,6 +236,41 @@ function isProcessAlive(pid) {
   }
 }
 
+// src/internal/service-pid-fallback.ts
+async function findLiveServicePidReadOnly(slockHome, deps = {}) {
+  const readPidfile = deps.readPidfile ?? readPidfileAt;
+  const isAlive = deps.isProcessAlive ?? isProcessAlive;
+  return walkFallback(slockHome, readPidfile, isAlive, async () => void 0);
+}
+async function walkFallback(slockHome, readPidfile, isAlive, clearStale) {
+  const candidates = servicePidReadFallback(slockHome);
+  let firstStalePidfile = null;
+  let firstStalePid = null;
+  for (const candidate of candidates) {
+    const candidatePid = await readPidfile(candidate);
+    if (candidatePid === null) continue;
+    if (isAlive(candidatePid)) {
+      return {
+        pid: candidatePid,
+        pidfilePath: candidate,
+        firstStalePidfile,
+        firstStalePid
+      };
+    }
+    await clearStale(candidate);
+    if (firstStalePidfile === null) {
+      firstStalePidfile = candidate;
+      firstStalePid = candidatePid;
+    }
+  }
+  return {
+    pid: null,
+    pidfilePath: candidates[0],
+    firstStalePidfile,
+    firstStalePid
+  };
+}
+
 // src/health.ts
 import { readFile as readFile4, writeFile as writeFile3, unlink as unlink3, mkdir as mkdir3, appendFile } from "fs/promises";
 import { dirname as dirname3 } from "path";
@@ -274,6 +325,10 @@ async function pidStatus(pidfile) {
   const pid = await readPidfileAt(pidfile);
   return pid !== null && isProcessAlive(pid) ? { running: true, pid } : { running: false };
 }
+async function serviceState(slockHome) {
+  const { pid } = await findLiveServicePidReadOnly(slockHome);
+  return pid !== null ? { running: true, pid } : { running: false };
+}
 async function deriveHealth(slockHome, serverId, daemon) {
   if (!daemon.running) return "offline";
   if (await isDegraded(slockHome, serverId)) return "degraded";
@@ -284,19 +339,19 @@ async function buildStatusReport(installRoot) {
   const session = sessionRead.session;
   const attachments = await listServerAttachments(installRoot);
   const service = {
-    ...await pidStatus(servicePidPath(installRoot)),
+    ...await serviceState(installRoot),
     logPath: serviceLogPath(installRoot)
   };
   const servers = [];
   for (const a of attachments) {
-    const daemon = await pidStatus(serverDaemonPidPath(installRoot, a.serverId));
+    const daemon = await pidStatus(serverRunnerPidPath(installRoot, a.serverId));
     servers.push({
       serverId: a.serverId,
       serverSlug: a.serverSlug ?? null,
       serverMachineId: a.serverMachineId,
       serverUrl: a.serverUrl,
       attachedAt: a.attachedAt ?? null,
-      daemonLogPath: serverDaemonLogPath(installRoot, a.serverId),
+      serverRunnerLogPath: serverRunnerLogPath(installRoot, a.serverId),
       daemon,
       health: await deriveHealth(installRoot, a.serverId, daemon)
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/computer",
-  "version": "0.0.16-alpha.0",
+  "version": "0.0.16",
   "description": "Slock Computer — standalone human/local-machine control-plane CLI (login + attach). Distinct from the agent-facing @slock-ai/cli.",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
     "commander": "^12.1.0",
     "proper-lockfile": "^4.1.2",
     "undici": "^7.24.7",
-    "@slock-ai/daemon": "0.55.2-alpha.0"
+    "@slock-ai/daemon": "0.55.1"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",