@slock-ai/computer 0.0.3 → 0.0.4

package/dist/index.js

@@ -121,15 +121,18 @@ var ComputerAttachClient = class {
         resumed: body.resumed === true
       };
     }
-    const code = body && typeof body.code === "string" ? body.code : `http_${res.status}`;
-    if (res.status === 401 && code === "legacy_key_invalid") {
-      return { status: "legacy_key_invalid" };
+    const code = body && typeof body.code === "string" ? body.code : void 0;
+    if (res.status === 401) {
+      if (code === "legacy_key_invalid") return { status: "legacy_key_invalid" };
+      if (code === "auth_required") return { status: "auth_required" };
+      return { status: "unexpected_response", httpStatus: res.status, ...code ? { code } : {} };
     }
     if (res.status === 409 && code === "legacy_machine_key_migrated") {
       return { status: "legacy_machine_key_migrated" };
     }
     if (res.status === 403) return { status: "not_authorized" };
     if (res.status === 404) return { status: "disabled" };
+    if (!code) return { status: "unexpected_response", httpStatus: res.status };
     return { status: "error", code };
   }
   /**
@@ -688,6 +691,43 @@ async function stopLegacyDaemonByOwnerFile(ownerFile) {
   }
   return { attempted: true, pid, outcome: "timed_out" };
 }
+async function readLegacyOwnerEvidence(ownerFile) {
+  let raw;
+  try {
+    raw = await readFile3(ownerFile, "utf8");
+  } catch {
+    return { ownerFile, reason: "owner_file_absent" };
+  }
+  let owner;
+  try {
+    owner = JSON.parse(raw);
+  } catch {
+    return { ownerFile, reason: "owner_json_unparseable" };
+  }
+  const pid = typeof owner.pid === "number" ? owner.pid : void 0;
+  return {
+    ownerFile,
+    pid,
+    alive: typeof pid === "number" ? isProcessAlive(pid) : void 0,
+    startedAt: typeof owner.startedAt === "string" ? owner.startedAt : void 0,
+    serverUrl: typeof owner.serverUrl === "string" ? owner.serverUrl : void 0,
+    reason: typeof pid === "number" ? void 0 : "owner_json_missing_pid"
+  };
+}
+function formatLegacyOwnerEvidence(slockHome, evidence) {
+  const fields = [
+    `SLOCK_HOME=${slockHome}`,
+    `owner=${evidence.ownerFile}`
+  ];
+  if (typeof evidence.pid === "number") {
+    fields.push(`pid=${evidence.pid}`);
+    if (typeof evidence.alive === "boolean") fields.push(`alive=${evidence.alive}`);
+  }
+  if (evidence.startedAt) fields.push(`startedAt=${evidence.startedAt}`);
+  if (evidence.serverUrl) fields.push(`serverUrl=${evidence.serverUrl}`);
+  if (evidence.reason) fields.push(`ownerStatus=${evidence.reason}`);
+  return fields.join(" ");
+}
 async function runAdoptLegacy(inputs) {
   const slockHome = resolveSlockHome();
   const sessionFile = userSessionPath(slockHome);
@@ -718,6 +758,7 @@ async function runAdoptLegacy(inputs) {
   const client = new ComputerAttachClient(baseUrl, session.accessToken);
   const adoptStartedAt = /* @__PURE__ */ new Date();
   const legacyOwnerFile = legacyLockOwnerPath(slockHome, legacy.rawKey);
+  const ownerEvidence = await readLegacyOwnerEvidence(legacyOwnerFile);
   const result = await client.adoptLegacy(legacy.rawKey, inputs.name);
   legacy.rawKey = void 0;
   if (result.status === "disabled") {
@@ -743,7 +784,7 @@ async function runAdoptLegacy(inputs) {
     });
     fail(
       "LEGACY_KEY_INVALID",
-      "Server rejected the legacy api key (unknown / wrong server / malformed). Verify the key and --server-url."
+      `Server rejected the legacy api key (unknown / wrong server / malformed). Local legacy owner evidence for this key: ${formatLegacyOwnerEvidence(slockHome, ownerEvidence)}. Verify the key came from this SLOCK_HOME and server, or use a fresh isolated SLOCK_HOME for a clean Computer setup.`
     );
   }
   if (result.status === "legacy_machine_key_migrated") {
@@ -756,7 +797,20 @@ async function runAdoptLegacy(inputs) {
     });
     fail(
       "LEGACY_MACHINE_KEY_MIGRATED",
-      "This machine has already been adopted; the legacy key is no longer accepted. Use `slock-computer attach` to add another Computer attachment."
+      `This machine has already been adopted; the legacy key is no longer accepted. Local legacy owner evidence for this key: ${formatLegacyOwnerEvidence(slockHome, ownerEvidence)}. Use \`slock-computer attach\` to add another Computer attachment, or use a fresh isolated SLOCK_HOME for a clean setup.`
+    );
+  }
+  if (result.status === "auth_required") {
+    await appendAdoptionLog(slockHome, {
+      mode: legacy.mode,
+      redactedPrefix: legacy.redactedPrefix,
+      startedAt: adoptStartedAt,
+      outcome: "failed",
+      failureReason: "auth_required"
+    });
+    fail(
+      "ADOPT_AUTH_REQUIRED",
+      `Your Computer user session was rejected by the server before legacy adoption. Local legacy owner evidence for this key: ${formatLegacyOwnerEvidence(slockHome, ownerEvidence)}. Re-run \`slock-computer login\` for this server (use the same \`--server-url\` if not on production), then retry the adopt command. No local Computer state was written.`
     );
   }
   if (result.status === "not_authorized") {
@@ -772,6 +826,20 @@ async function runAdoptLegacy(inputs) {
       "Not authorized to adopt this machine on this server. Check that you are a current member."
     );
   }
+  if (result.status === "unexpected_response") {
+    await appendAdoptionLog(slockHome, {
+      mode: legacy.mode,
+      redactedPrefix: legacy.redactedPrefix,
+      startedAt: adoptStartedAt,
+      outcome: "failed",
+      failureReason: result.code ? `unexpected_response_${result.code}` : "unexpected_response_missing_code"
+    });
+    const responseDetail = result.code ? `status ${result.httpStatus}, code ${result.code}` : `status ${result.httpStatus}, missing error code`;
+    fail(
+      "ADOPT_UNEXPECTED_RESPONSE",
+      `Server returned an unexpected legacy adoption response (${responseDetail}). Local legacy owner evidence for this key: ${formatLegacyOwnerEvidence(slockHome, ownerEvidence)}. Please report this with the command, server URL, and SLOCK_HOME; no local Computer state was written.`
+    );
+  }
   if (result.status === "error") {
     await appendAdoptionLog(slockHome, {
       mode: legacy.mode,
@@ -780,7 +848,10 @@ async function runAdoptLegacy(inputs) {
       outcome: "failed",
       failureReason: result.code
     });
-    fail("ADOPT_FAILED", `Adoption failed (${result.code}).`);
+    fail(
+      "ADOPT_FAILED",
+      `Adoption failed at server exchange (${result.code}). Local legacy owner evidence for this key: ${formatLegacyOwnerEvidence(slockHome, ownerEvidence)}. Confirm the user session is valid, the legacy key belongs to this server/SLOCK_HOME, and the server URL is correct. No local Computer state was written.`
+    );
   }
   info(result.resumed ? "Adopted (resumed prior attachment); running preflight\u2026" : "Adopted; running preflight\u2026");
   const pre = await client.preflight(result.apiKey);

package/package.json

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