@slock-ai/computer 0.0.15 → 0.0.16

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;
@@ -22,7 +22,7 @@ interface ComputerStatusReport {
     userId: string | null;
     loginServerUrl: string | null;
     userSessionError: string | null;
-    supervisor: DaemonState & {
+    service: DaemonState & {
         logPath: string;
     };
     servers: ServerStatusRow[];
@@ -45,13 +45,13 @@ interface RunnerListItem {
  *               budget near breach, see §1/§2)
  *   crashed   — observed exit / fatal signal
  *   stopped   — intentional stop (operator-driven via `runners stop` or
- *               supervisor shutdown)
+ *               service shutdown)
  */
 declare const RUNNER_STATE_VALUES: readonly ["starting", "running", "degraded", "crashed", "stopped"];
 type RunnerState = (typeof RUNNER_STATE_VALUES)[number];
 declare function isRunnerState(value: unknown): value is RunnerState;
 /**
- * Service (supervisor) lifecycle states (§3.2). Mirrors runner shape but
+ * Service (service) lifecycle states (§3.2). Mirrors runner shape but
  * narrower — the service is a singleton per install root.
  *
  *   starting  — pidfile written, socket not yet listening
@@ -465,7 +465,7 @@ declare function readServiceStatus(installRoot: string): Promise<ServiceStatusRe
  * Read a single attached server's daemon state row plus the runners
  * currently running on it. Throws `StateReaderError("NOT_ATTACHED")` if
  * `serverId` is not in the attached set, or `"INVALID_ATTACHMENT"` if
- * the attachment.json under that id is unreadable.
+ * the runner.state.json under that id is unreadable.
  */
 declare function readRunnerStatus(installRoot: string, serverId: string): Promise<RunnerStatusResult>;
 /**

package/dist/lib/index.js

@@ -126,22 +126,38 @@ function serverDir(slockHome, serverId) {
   return path.join(serversDir(slockHome), assertValidServerId(serverId));
 }
 function serverAttachmentPath(slockHome, serverId) {
-  return path.join(serverDir(slockHome, serverId), "attachment.json");
+  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 supervisorPidPath(slockHome) {
+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 supervisorLogPath(slockHome) {
-  return path.join(computerDir(slockHome), "supervisor.log");
+function servicePidReadFallback(slockHome) {
+  return [
+    servicePidPath(slockHome),
+    legacyServicePidPath(slockHome),
+    legacySupervisorPidPath(slockHome)
+  ];
+}
+function serviceLogPath(slockHome) {
+  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";
@@ -283,20 +338,20 @@ async function buildStatusReport(installRoot) {
   const sessionRead = await readUserSession(userSessionPath(installRoot));
   const session = sessionRead.session;
   const attachments = await listServerAttachments(installRoot);
-  const supervisor = {
-    ...await pidStatus(supervisorPidPath(installRoot)),
-    logPath: supervisorLogPath(installRoot)
+  const service = {
+    ...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)
     });
@@ -308,7 +363,7 @@ async function buildStatusReport(installRoot) {
     userId: session ? str(session.userId) : null,
     loginServerUrl: session ? str(session.serverUrl) : null,
     userSessionError: sessionRead.state === "invalid" ? sessionRead.error : null,
-    supervisor,
+    service,
     servers
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/computer",
-  "version": "0.0.15",
+  "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": {
@@ -44,6 +44,7 @@
     "build": "pnpm run build:deps && tsup",
     "test": "node --import tsx --test --test-force-exit 'src/**/*.test.ts'",
     "typecheck": "tsc --noEmit",
-    "lint:boundaries": "node scripts/check-boundaries.mjs"
+    "lint:boundaries": "node scripts/check-boundaries.mjs",
+    "lint:naming": "node scripts/check-naming.mjs"
   }
 }