@slock-ai/computer 0.0.20 → 0.0.22

package/dist/index.js

@@ -30483,7 +30483,13 @@ async function readLocalOwners(installRoot) {
     let raw;
     try {
       raw = await readFile3(ownerPath, "utf8");
-    } catch {
+    } catch (err) {
+      if (err?.code === "ENOENT") {
+        const fromDir = name.slice(MACHINE_DIR_PREFIX.length);
+        if (FINGERPRINT_HEX_RE.test(fromDir)) {
+          owners.push({ apiKeyFingerprint: fromDir, localPath: join(machinesDir, name) });
+        }
+      }
       continue;
     }
     let parsed;
@@ -30964,6 +30970,22 @@ async function appendAdoptionLog(slockHome, line) {
 // src/service.ts
 init_esm_shims();
 import { spawn as spawn2 } from "child_process";
+
+// src/version.ts
+init_esm_shims();
+import { createRequire } from "module";
+function readComputerVersion(moduleUrl = import.meta.url) {
+  try {
+    const require2 = createRequire(moduleUrl);
+    const pkg = require2("../package.json");
+    return typeof pkg.version === "string" && pkg.version.length > 0 ? pkg.version : "0.0.0-dev";
+  } catch {
+    return "0.0.0-dev";
+  }
+}
+var COMPUTER_VERSION = readComputerVersion();
+
+// src/service.ts
 import { mkdir as mkdir8, readFile as readFile7, writeFile as writeFile7, open, rename as rename2 } from "fs/promises";
 import { dirname as dirname8, join as joinPath } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -31774,7 +31796,41 @@ var defaultCoreFactory = async (creds) => {
     }
     throw err;
   }
-  return new coreMod.DaemonCore({ serverUrl: creds.serverUrl, apiKey: creds.apiKey, localTrace: true });
+  process.env.SLOCK_COMPUTER_VERSION = COMPUTER_VERSION;
+  return new coreMod.DaemonCore({
+    serverUrl: creds.serverUrl,
+    apiKey: creds.apiKey,
+    localTrace: true,
+    // Managed-Computer remote control (server → WS → runner). This runner
+    // is the service's in-process `__run` child, so:
+    //   restart → SIGTERM ourselves → runResident's shutdown does
+    //     core.stop() + exit 0 → classifyRunnerExit = graceful → the
+    //     service supervisor respawns this runner (effective restart).
+    //   upgrade → launch `slock-computer upgrade` out-of-band (detached)
+    //     so the §12 drain+swap+restart runs outside this event loop.
+    onComputerControl: (action) => {
+      if (action === "restart") {
+        process.kill(process.pid, "SIGTERM");
+        return;
+      }
+      try {
+        const selfEntry = process.argv[1] ?? "";
+        const child = spawn2(process.execPath, [...process.execArgv, selfEntry, "upgrade"], {
+          detached: true,
+          stdio: "ignore",
+          windowsHide: true,
+          // Attribute this upgrade to the web surface in upgrade.log — the
+          // `upgrade` command reads SLOCK_UPGRADE_TRIGGER and defaults to
+          // "cli" when unset.
+          env: { ...process.env, SLOCK_UPGRADE_TRIGGER: "web" }
+        });
+        child.on("error", () => {
+        });
+        child.unref();
+      } catch {
+      }
+    }
+  });
 };
 function classifyRunnerExit(code, signal) {
   if (code === EX_CONFIG_EXIT_CODE) return "config-error";
@@ -32390,6 +32446,7 @@ async function runSetup(opts, deps = {}) {
       "Non-interactive setup requires --yes after you have confirmed the login/attach/start actions. Run `slock-computer login`, `slock-computer attach`, and `slock-computer start` separately for fully explicit automation."
     );
   }
+  opts = { ...opts, serverSlug: normalizeServerSlug(opts.serverSlug) };
   const label = formatServerSlugDisplay(opts.serverSlug);
   info(`Setting up Slock Computer for ${label}\u2026`);
   if (!await hasValidUserSession(slockHome)) {
@@ -33243,7 +33300,7 @@ import { createHash as createHash3 } from "crypto";
 init_esm_shims();
 import { readFile as readFile13 } from "fs/promises";
 import { spawn as spawn3 } from "child_process";
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { join as join5 } from "path";
 import { pathToFileURL } from "url";
 var DAEMON_PACKAGE_NAME = "@slock-ai/daemon";
@@ -33412,7 +33469,7 @@ async function defaultReadInstalledDaemonVersion(currentBinaryDir) {
   let searchPaths;
   try {
     const anchor = pathToFileURL(join5(currentBinaryDir, "package.json"));
-    const req = createRequire(anchor);
+    const req = createRequire2(anchor);
     searchPaths = req.resolve.paths(DAEMON_PACKAGE_NAME);
   } catch {
     return null;
@@ -34232,6 +34289,9 @@ async function locateStagedTarball(stagedPath) {
 init_esm_shims();
 import { chmod as chmod5, mkdir as mkdir14, open as open2 } from "fs/promises";
 var FILE_MODE = 384;
+function resolveUpgradeTrigger(raw) {
+  return raw === "web" || raw === "tray" ? raw : "cli";
+}
 var UPGRADE_ERROR_CODES = [
   "UPGRADE_DEPS_CHANGED",
   "UPGRADE_NETWORK_FAILED",
@@ -34878,20 +34938,6 @@ async function defaultCurrentVersionLocal() {
   );
 }
 
-// src/version.ts
-init_esm_shims();
-import { createRequire as createRequire2 } from "module";
-function readComputerVersion(moduleUrl = import.meta.url) {
-  try {
-    const require2 = createRequire2(moduleUrl);
-    const pkg = require2("../package.json");
-    return typeof pkg.version === "string" && pkg.version.length > 0 ? pkg.version : "0.0.0-dev";
-  } catch {
-    return "0.0.0-dev";
-  }
-}
-var COMPUTER_VERSION = readComputerVersion();
-
 // src/index.ts
 function withCliExit(fn) {
   return async (...args) => {
@@ -35019,6 +35065,7 @@ program2.command("upgrade").description(
         drain = opts.drain;
       }
       const slockHome = resolveSlockHome();
+      const trigger = resolveUpgradeTrigger(process.env.SLOCK_UPGRADE_TRIGGER);
       try {
         await withMutationLock(
           () => runUpgradeCli(slockHome, {
@@ -35026,7 +35073,8 @@ program2.command("upgrade").description(
             channel: opts.channel,
             targetVersion: opts.targetVersion,
             drain,
-            force: opts.force
+            force: opts.force,
+            trigger
           })
         );
       } catch (err) {
@@ -35038,7 +35086,7 @@ program2.command("upgrade").description(
               fromBundle: { computerVersion: currentVersion },
               toBundle: { computerVersion: currentVersion },
               channel: channel2,
-              trigger: "cli",
+              trigger,
               outcome: "err",
               errorCode: "UPGRADE_ALREADY_RUNNING"
             }).catch(() => {

package/dist/lib/index.js

@@ -56,7 +56,13 @@ async function readLocalOwners(installRoot) {
     let raw;
     try {
       raw = await readFile(ownerPath, "utf8");
-    } catch {
+    } catch (err) {
+      if (err?.code === "ENOENT") {
+        const fromDir = name.slice(MACHINE_DIR_PREFIX.length);
+        if (FINGERPRINT_HEX_RE.test(fromDir)) {
+          owners.push({ apiKeyFingerprint: fromDir, localPath: join(machinesDir, name) });
+        }
+      }
       continue;
     }
     let parsed;
@@ -422,6 +428,21 @@ import { setTimeout as delay } from "timers/promises";
 
 // src/service.ts
 import { spawn as spawn2 } from "child_process";
+
+// src/version.ts
+import { createRequire } from "module";
+function readComputerVersion(moduleUrl = import.meta.url) {
+  try {
+    const require2 = createRequire(moduleUrl);
+    const pkg = require2("../package.json");
+    return typeof pkg.version === "string" && pkg.version.length > 0 ? pkg.version : "0.0.0-dev";
+  } catch {
+    return "0.0.0-dev";
+  }
+}
+var COMPUTER_VERSION = readComputerVersion();
+
+// src/service.ts
 import { mkdir as mkdir8, readFile as readFile7, writeFile as writeFile7, open, rename as rename2 } from "fs/promises";
 import { dirname as dirname7, join as joinPath } from "path";
 import { fileURLToPath } from "url";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/computer",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Slock Computer — standalone human/local-machine control-plane CLI (login + attach). Distinct from the agent-facing @slock-ai/cli.",
   "type": "module",
   "bin": {