@cabane/companion 0.6.163 → 0.6.165

package/dist/cli.js

@@ -12437,7 +12437,9 @@ function clearRuntimeStateIfOurs(instanceId) {
   }
   rmSync3(path, { force: true });
 }
-function readLiveRuntimeState() {
+function readLiveRuntimeState({
+  sweep = true
+} = {}) {
   const path = runtimePath();
   if (!existsSync5(path)) return null;
   let parsed;
@@ -12450,7 +12452,7 @@ function readLiveRuntimeState() {
   try {
     process.kill(parsed.pid, 0);
   } catch {
-    clearRuntimeState();
+    if (sweep) clearRuntimeState();
     return null;
   }
   return parsed;
@@ -15401,6 +15403,12 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
+  // Ask again for the credential of an agent assigned to this device, when the saved copy is
+  // gone. The previous credential stops working; any agent not assigned here is a 404, and a
+  // second ask inside a minute a 429.
+  reissueAgentCredential(agentId) {
+    return this.request("POST", `/api/companion/agents/${encodeURIComponent(agentId)}/credential`);
+  }
   getRuns(cursor) {
     const query = new URLSearchParams({ limit: "100", order: "asc" });
     if (cursor) query.set("cursor", cursor);
@@ -17606,6 +17614,7 @@ var CompanionSupervisor = class {
         for (const it of items) {
           if (it.credential) setCredential(device.id, it.agentId, it.credential);
         }
+        items = await this.restoreMissingCredentials(device.id, items);
         const byWorkspace = /* @__PURE__ */ new Map();
         for (const it of items) {
           const list = byWorkspace.get(it.workspaceId) ?? [];
@@ -17638,6 +17647,42 @@ var CompanionSupervisor = class {
       this.inFlightRefresh = null;
     }
   }
+  // An assigned agent whose saved credential is gone (the file wiped or edited, a crash between
+  // delivery and write) gets it back here, before reconciling. A runner still holding it in
+  // memory writes it back; otherwise Cabane is asked for a new one, which revokes the old. The
+  // result rides the item as a fresh delivery, so reconcile builds the runner on it. A refused
+  // ask leaves the item as it was, and reconcile reports the agent can't run.
+  async restoreMissingCredentials(deviceId, items) {
+    const restored = [];
+    for (const it of items) {
+      if (it.credential || getCredential(deviceId, it.agentId)) {
+        restored.push(it);
+        continue;
+      }
+      const held = this.workspaces.get(it.workspaceId)?.agents.get(it.agentId)?.credential;
+      if (held) {
+        setCredential(deviceId, it.agentId, held);
+        restored.push(it);
+        continue;
+      }
+      try {
+        const { credential } = await this.deviceApi.reissueAgentCredential(it.agentId);
+        setCredential(deviceId, it.agentId, credential);
+        this.log.info(
+          { agentId: it.agentId, agentName: it.agentDisplayName },
+          `Restored ${it.agentDisplayName}'s sign-in to Cabane: it was missing on this device.`
+        );
+        restored.push({ ...it, credential });
+      } catch (err) {
+        this.log.warn(
+          { agentId: it.agentId, agentName: it.agentDisplayName, ...apiErrorLogFields(err) },
+          `Couldn't restore ${it.agentDisplayName}'s sign-in to Cabane.`
+        );
+        restored.push(it);
+      }
+    }
+    return restored;
+  }
   // ---- reconciliation ----
   reconcileWorkspace(deviceId, workspaceId, list) {
     const first = list[0];
@@ -19060,11 +19105,13 @@ var LABEL_WIDTH2 = 13;
 function row2(label, value) {
   return `  ${label.padEnd(LABEL_WIDTH2)}${value}`;
 }
-async function status() {
+async function status(deps = {}) {
   const out = (line) => void process.stdout.write(`${line}
 `);
+  const running = await liveState();
+  const strays = strayStatusLines(running, deps.strays);
   out(`  ${versionLine()}`);
-  for (const line of otherInstallLines(await liveState())) out(line);
+  for (const line of otherInstallLines(running)) out(line);
   let cfg = null;
   try {
     cfg = loadConfig();
@@ -19073,11 +19120,11 @@ async function status() {
   }
   if (!cfg || !cfg.deviceToken) {
     out(`  Not paired yet. Run  ${cabane("setup")}  to set up this device.`);
+    for (const line of strays) out(line);
     process.exitCode = 1;
     return;
   }
   out(row2("Paired with", `${cfg.baseUrl}${cfg.deviceLabel ? ` as ${cfg.deviceLabel}` : ""}`));
-  const running = await liveState();
   let detection = null;
   if (running) {
     const mode = running.daemon ? "in the background" : "in a terminal";
@@ -19087,6 +19134,7 @@ async function status() {
   } else {
     out(row2("Running", `no \u2014 start it with  ${cabane("start")}`));
   }
+  for (const line of strays) out(line);
   const service2 = await serviceState();
   for (const line of serviceRows(service2)) out(line);
   for (const line of updateRows(readUpdateState(), cfg.update?.auto, {
@@ -19158,11 +19206,8 @@ function otherInstall(install, own) {
   return real(found) === ownAlias ? null : dirname15(found);
 }
 async function liveState() {
-  const running = readLiveRuntimeState();
-  if (running && await verifyRuntime(running) === "stale") {
-    clearRuntimeState();
-    return null;
-  }
+  const running = readLiveRuntimeState({ sweep: false });
+  if (running && await verifyRuntime(running) === "stale") return null;
   return running;
 }
 async function runningDetection(running) {
@@ -19178,6 +19223,11 @@ async function runningDetection(running) {
     return null;
   }
 }
+function strayStatusLines(running, find = findStrayCompanions) {
+  const strays = find(running ? [running.pid] : []);
+  if (strays.length === 0) return [];
+  return strayCompanionLines(strays, cabane("status")).map((line) => `  ${line}`);
+}
 async function agentLines2(cfg, running) {
   const detection = running ?? await detectHarnesses(cfg);
   return agentRows(detection, { connected: false }).map((agent) => row2(agent.label, agent.text));

package/dist/runtime.js

@@ -1678,7 +1678,9 @@ function clearRuntimeStateIfOurs(instanceId) {
   }
   rmSync3(path, { force: true });
 }
-function readLiveRuntimeState() {
+function readLiveRuntimeState({
+  sweep = true
+} = {}) {
   const path = runtimePath();
   if (!existsSync6(path)) return null;
   let parsed;
@@ -1691,7 +1693,7 @@ function readLiveRuntimeState() {
   try {
     process.kill(parsed.pid, 0);
   } catch {
-    clearRuntimeState();
+    if (sweep) clearRuntimeState();
     return null;
   }
   return parsed;
@@ -2494,6 +2496,12 @@ var DeviceApi = class {
   getAssignments() {
     return this.request("GET", "/api/companion/assignments");
   }
+  // Ask again for the credential of an agent assigned to this device, when the saved copy is
+  // gone. The previous credential stops working; any agent not assigned here is a 404, and a
+  // second ask inside a minute a 429.
+  reissueAgentCredential(agentId) {
+    return this.request("POST", `/api/companion/agents/${encodeURIComponent(agentId)}/credential`);
+  }
   getRuns(cursor) {
     const query = new URLSearchParams({ limit: "100", order: "asc" });
     if (cursor) query.set("cursor", cursor);
@@ -14172,6 +14180,7 @@ var CompanionSupervisor = class {
         for (const it of items) {
           if (it.credential) setCredential(device.id, it.agentId, it.credential);
         }
+        items = await this.restoreMissingCredentials(device.id, items);
         const byWorkspace = /* @__PURE__ */ new Map();
         for (const it of items) {
           const list = byWorkspace.get(it.workspaceId) ?? [];
@@ -14204,6 +14213,42 @@ var CompanionSupervisor = class {
       this.inFlightRefresh = null;
     }
   }
+  // An assigned agent whose saved credential is gone (the file wiped or edited, a crash between
+  // delivery and write) gets it back here, before reconciling. A runner still holding it in
+  // memory writes it back; otherwise Cabane is asked for a new one, which revokes the old. The
+  // result rides the item as a fresh delivery, so reconcile builds the runner on it. A refused
+  // ask leaves the item as it was, and reconcile reports the agent can't run.
+  async restoreMissingCredentials(deviceId, items) {
+    const restored = [];
+    for (const it of items) {
+      if (it.credential || getCredential(deviceId, it.agentId)) {
+        restored.push(it);
+        continue;
+      }
+      const held = this.workspaces.get(it.workspaceId)?.agents.get(it.agentId)?.credential;
+      if (held) {
+        setCredential(deviceId, it.agentId, held);
+        restored.push(it);
+        continue;
+      }
+      try {
+        const { credential } = await this.deviceApi.reissueAgentCredential(it.agentId);
+        setCredential(deviceId, it.agentId, credential);
+        this.log.info(
+          { agentId: it.agentId, agentName: it.agentDisplayName },
+          `Restored ${it.agentDisplayName}'s sign-in to Cabane: it was missing on this device.`
+        );
+        restored.push({ ...it, credential });
+      } catch (err) {
+        this.log.warn(
+          { agentId: it.agentId, agentName: it.agentDisplayName, ...apiErrorLogFields(err) },
+          `Couldn't restore ${it.agentDisplayName}'s sign-in to Cabane.`
+        );
+        restored.push(it);
+      }
+    }
+    return restored;
+  }
   // ---- reconciliation ----
   reconcileWorkspace(deviceId, workspaceId, list) {
     const first = list[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.163",
+  "version": "0.6.165",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",