@cabane/companion 0.6.174 → 0.6.175

package/dist/cli.js

@@ -12117,11 +12117,60 @@ init_config();
 init_bundled_binaries();
 init_cabane_command();
 init_config();
+import { homedir as homedir6 } from "os";
+import { join as join7 } from "path";
+
+// src/device-state.ts
+var HARNESS_STATE_LABEL = {
+  checking: "checking",
+  connected: "connected",
+  needs_sign_in: "needs sign-in",
+  limited: "limited",
+  problem: "problem",
+  off: "off",
+  gone: "gone"
+};
+
+// src/harness-state.ts
+init_config();
+function harnessEntry(runtime, state) {
+  switch (state.state) {
+    case "usable":
+      return {
+        runtime,
+        state: "connected",
+        reason: state.via,
+        version: state.version,
+        ...state.url ? { url: state.url } : {}
+      };
+    case "signed_out":
+      return { runtime, state: "needs_sign_in", reason: "signed_out", version: state.version };
+    case "not_running":
+      return { runtime, state: "problem", reason: "not_running", url: state.url };
+    case "off":
+      return { runtime, state: "off" };
+    case "problem":
+      return { runtime, state: "problem", reason: checkReason(state.check) };
+  }
+}
+function harnessEntriesFromDetection(detection) {
+  return HARNESS_RUNTIMES.map((runtime) => harnessEntry(runtime, detection[runtime]));
+}
+function checkReason(check) {
+  switch (check.status) {
+    case "bundle_missing":
+      return check.bundled;
+    case "check_failed":
+      return `check_failed:${check.reason}`;
+    default:
+      return check.status;
+  }
+}
+
+// src/harness-copy.ts
 init_install_kind();
 init_install_record();
 init_term();
-import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
   codex: "Codex",
@@ -12176,23 +12225,23 @@ function agentRows(detection, opts = {}) {
   });
 }
 function agentRowText(runtime, state, opts = {}) {
-  const connected = opts.connected ?? true ? " \u2014 connected" : "";
+  const word = HARNESS_STATE_LABEL[harnessEntry(runtime, state).state];
   switch (state.state) {
     case "usable": {
       const version = state.version ? ` (${state.version})` : "";
-      if (state.via === "api_key") return `API key configured${version}${connected}`;
-      if (state.via === "container") return `connected \u2014 turns run in Docker`;
-      if (state.via === "serve") return `running at ${state.url ?? ""}${connected}`;
-      return `signed in${version}${connected}`;
+      if (state.via === "api_key") return `${word} \u2014 API key configured${version}`;
+      if (state.via === "container") return `${word} \u2014 turns run in Docker`;
+      if (state.via === "serve") return `${word} \u2014 running at ${state.url ?? ""}`;
+      return `${word} \u2014 signed in${version}`;
     }
     case "signed_out":
-      return opts.signInHint && runtime !== "opencode" ? `not signed in \u2014 run  ${loginCommand(runtime)}` : "not signed in";
+      return opts.signInHint && runtime !== "opencode" ? `${word} \u2014 run  ${loginCommand(runtime)}` : word;
     case "not_running":
-      return "not running";
+      return `${word} \u2014 not running`;
     case "off":
-      return "turned off in config";
+      return `${word} \u2014 turned off in config`;
     case "problem":
-      return runtime === "opencode" ? "not running" : unusableReason(runtime, state.check) ?? "not signed in";
+      return runtime === "opencode" ? `${word} \u2014 not running` : `${word} \u2014 ${unusableReason(runtime, state.check) ?? "could not be checked"}`;
   }
 }
 var AGENT_CHOICES = [
@@ -12281,7 +12330,7 @@ function nothingUsableLines(detection) {
       if (reason) lines2.push(reason);
     }
   }
-  lines2.push(`Cabane can run while you sign in to a coding tool.`);
+  lines2.push(`Cabane can run while you sign in to a harness.`);
   return lines2;
 }
 function indent(line) {
@@ -13460,7 +13509,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("runtime_incomplete:"))
     return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
   if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "The agent is unavailable on this device. Enable it here or choose another connector in Cabane.";
+    return "The harness is off on this device. Enable it here, or choose another harness or device in Cabane.";
   if (reason?.startsWith("model_unavailable:"))
     return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
   if (reason?.startsWith("prepare_failed:"))
@@ -13839,7 +13888,6 @@ init_install_kind();
 init_src();
 var ConnectorHealthStore = class {
   byRuntime = /* @__PURE__ */ new Map();
-  sources = /* @__PURE__ */ new Map();
   // Record a settled turn's outcome for `runtime`. A success heals to `ok`; a
   // classified failure sets `limited`(+reset) / `auth_expired` with the reason as
   // `last_error`; anything else (a user Stop, a timeout, an unclassified error)
@@ -13848,7 +13896,6 @@ var ConnectorHealthStore = class {
   recordSettle(runtime, outcome) {
     if (outcome.ok) {
       this.byRuntime.set(runtime, { quotaState: "ok", limitedUntil: null, lastError: null });
-      this.sources.set(runtime, "turn");
       return;
     }
     const failure = decodeFailureReason(outcome.errorReason);
@@ -13860,26 +13907,6 @@ var ConnectorHealthStore = class {
       limitedUntil: quota.limitedUntil,
       lastError: outcome.errorReason ?? null
     });
-    this.sources.set(runtime, "turn");
-  }
-  // Record what the companion's own sign-in check found for a connected
-  // runtime at `start` or `connect`, so the heartbeat carries "sign-in needed"
-  // before any turn fails. Signed out seeds `auth_expired` unless a turn has
-  // already spoken; usable clears only a seed of our own.
-  recordLocalCheck(runtime, usable) {
-    const source = this.sources.get(runtime);
-    if (!usable) {
-      if (source === "turn" && this.byRuntime.get(runtime)?.quotaState !== "ok") return;
-      this.byRuntime.set(runtime, {
-        quotaState: "auth_expired",
-        limitedUntil: null,
-        lastError: encodeFailureReason({ kind: "auth_expired" })
-      });
-      this.sources.set(runtime, "local");
-      return;
-    }
-    if (source !== "local") return;
-    this.byRuntime.set(runtime, { quotaState: "ok", limitedUntil: null, lastError: null });
   }
   // The store's current opinion for one runtime, or undefined when it has
   // no observation. Read by the dispatcher at idle-timeout fire: an idle reap
@@ -16364,6 +16391,9 @@ var CompanionSupervisor = class {
         // Omitted until the first observed failure or heal, so the server's
         // status-less manifest synthesis still runs for a fresh companion.
         ...connectorReports.length > 0 ? { connectors: connectorReports } : {},
+        // The complete harness inventory in the machine's words, once detection
+        // has run; omitted before it, which the server reads as "nothing yet".
+        ...this.detection ? { harnesses: harnessEntriesFromDetection(this.detection) } : {},
         ...opencodeModels !== null ? { models: opencodeModels } : {},
         ...this.updater ? { update: this.updater.report() } : {}
       });
@@ -17316,7 +17346,6 @@ var CompanionSupervisor = class {
         ...this.probeOpencode ? { probeOpencode: this.probeOpencode } : {}
       });
       this.detection = detection;
-      this.seedSignInHealth(previous, detection);
       this.logBundledTransitions();
       this.harnessVersions = {
         claudeCode: detectedVersion(detection["claude-code"]),
@@ -17374,23 +17403,6 @@ var CompanionSupervisor = class {
     const bare = advertisedRuntimes(this.detection).filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
     return [...health, ...bare];
   }
-  // Seed connector health from what detection saw of a sign-in, so Cabane says
-  // "sign-in needed" before a turn fails. Only a LAPSE seeds it — an agent that
-  // was usable at an earlier look and is signed out now — because a device
-  // that never signed in to Codex has nothing to report about Codex. Usable
-  // again clears a seed of our own.
-  seedSignInHealth(previous, detection) {
-    for (const runtime of ["claude-code", "codex"]) {
-      const now = detection[runtime];
-      if (now.state === "usable") {
-        if (now.via !== "container") this.connectorHealth.recordLocalCheck(runtime, true);
-        continue;
-      }
-      if (now.state === "signed_out" && previous?.[runtime].state === "usable") {
-        this.connectorHealth.recordLocalCheck(runtime, false);
-      }
-    }
-  }
   // Beat NOW and wait for it to land. `start` calls this before asking the
   // person anything, so the browser's connect step already shows what this
   // machine has rather than sitting blank while the terminal waits on an answer.
@@ -18363,7 +18375,7 @@ async function startScript(opts, interactive) {
   }
   if (!isDevicePaired()) {
     refuse([
-      `This device isn't set up yet. Run  ${cabane("setup")}  to set up a coding tool and pair it.`
+      `This device isn't set up yet. Run  ${cabane("setup")}  to sign in to a harness and pair it.`
     ]);
     return;
   }
@@ -18814,7 +18826,7 @@ async function setupScript(opts, deps) {
   const detection = await detect(cfg, running, deps);
   ui.intro("Cabane setup");
   const usable = anyUsable(detection);
-  ui.step(["Coding tools on this device", ...agentLines(detection, { signInHint: !usable })]);
+  ui.step(["Harnesses on this device", ...agentLines(detection, { signInHint: !usable })]);
   if (!usable && hasProblem(detection)) {
     ui.cancel(`Fix the above, then run  ${cabane("setup")}  again.`);
     process.exitCode = 1;
@@ -19214,7 +19226,7 @@ function strayStatusLines(running, find = findStrayCompanions) {
 }
 async function agentLines2(cfg, running) {
   const detection = running ?? await detectHarnesses(cfg);
-  return agentRows(detection, { connected: false }).map((agent) => row2(agent.label, agent.text));
+  return agentRows(detection).map((agent) => row2(agent.label, agent.text));
 }
 function sandboxStatusLines(cfg) {
   const rows = agentSandboxRows(cfg);

package/dist/runtime.js

@@ -1860,7 +1860,7 @@ function turnFailureCopy(reason, runtime) {
   if (reason?.startsWith("runtime_incomplete:"))
     return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
   if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "The agent is unavailable on this device. Enable it here or choose another connector in Cabane.";
+    return "The harness is off on this device. Enable it here, or choose another harness or device in Cabane.";
   if (reason?.startsWith("model_unavailable:"))
     return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
   if (reason?.startsWith("prepare_failed:"))
@@ -7761,7 +7761,6 @@ import { createSdkMcpServer, tool } from "@anthropic-ai/claude-agent-sdk";
 // src/connector-health.ts
 var ConnectorHealthStore = class {
   byRuntime = /* @__PURE__ */ new Map();
-  sources = /* @__PURE__ */ new Map();
   // Record a settled turn's outcome for `runtime`. A success heals to `ok`; a
   // classified failure sets `limited`(+reset) / `auth_expired` with the reason as
   // `last_error`; anything else (a user Stop, a timeout, an unclassified error)
@@ -7770,7 +7769,6 @@ var ConnectorHealthStore = class {
   recordSettle(runtime, outcome) {
     if (outcome.ok) {
       this.byRuntime.set(runtime, { quotaState: "ok", limitedUntil: null, lastError: null });
-      this.sources.set(runtime, "turn");
       return;
     }
     const failure = decodeFailureReason(outcome.errorReason);
@@ -7782,26 +7780,6 @@ var ConnectorHealthStore = class {
       limitedUntil: quota.limitedUntil,
       lastError: outcome.errorReason ?? null
     });
-    this.sources.set(runtime, "turn");
-  }
-  // Record what the companion's own sign-in check found for a connected
-  // runtime at `start` or `connect`, so the heartbeat carries "sign-in needed"
-  // before any turn fails. Signed out seeds `auth_expired` unless a turn has
-  // already spoken; usable clears only a seed of our own.
-  recordLocalCheck(runtime, usable) {
-    const source = this.sources.get(runtime);
-    if (!usable) {
-      if (source === "turn" && this.byRuntime.get(runtime)?.quotaState !== "ok") return;
-      this.byRuntime.set(runtime, {
-        quotaState: "auth_expired",
-        limitedUntil: null,
-        lastError: encodeFailureReason({ kind: "auth_expired" })
-      });
-      this.sources.set(runtime, "local");
-      return;
-    }
-    if (source !== "local") return;
-    this.byRuntime.set(runtime, { quotaState: "ok", limitedUntil: null, lastError: null });
   }
   // The store's current opinion for one runtime, or undefined when it has
   // no observation. Read by the dispatcher at idle-timeout fire: an idle reap
@@ -12767,6 +12745,41 @@ function runtimeIssuesFor(gates) {
   return issues;
 }
 
+// src/harness-state.ts
+function harnessEntry(runtime, state) {
+  switch (state.state) {
+    case "usable":
+      return {
+        runtime,
+        state: "connected",
+        reason: state.via,
+        version: state.version,
+        ...state.url ? { url: state.url } : {}
+      };
+    case "signed_out":
+      return { runtime, state: "needs_sign_in", reason: "signed_out", version: state.version };
+    case "not_running":
+      return { runtime, state: "problem", reason: "not_running", url: state.url };
+    case "off":
+      return { runtime, state: "off" };
+    case "problem":
+      return { runtime, state: "problem", reason: checkReason(state.check) };
+  }
+}
+function harnessEntriesFromDetection(detection) {
+  return HARNESS_RUNTIMES.map((runtime) => harnessEntry(runtime, detection[runtime]));
+}
+function checkReason(check) {
+  switch (check.status) {
+    case "bundle_missing":
+      return check.bundled;
+    case "check_failed":
+      return `check_failed:${check.reason}`;
+    default:
+      return check.status;
+  }
+}
+
 // src/harness-versions.ts
 var EMPTY = { claudeCode: null, opencode: null, codex: null };
 function parseVersionToken(raw) {
@@ -14301,6 +14314,9 @@ var CompanionSupervisor = class {
         // Omitted until the first observed failure or heal, so the server's
         // status-less manifest synthesis still runs for a fresh companion.
         ...connectorReports.length > 0 ? { connectors: connectorReports } : {},
+        // The complete harness inventory in the machine's words, once detection
+        // has run; omitted before it, which the server reads as "nothing yet".
+        ...this.detection ? { harnesses: harnessEntriesFromDetection(this.detection) } : {},
         ...opencodeModels !== null ? { models: opencodeModels } : {},
         ...this.updater ? { update: this.updater.report() } : {}
       });
@@ -15253,7 +15269,6 @@ var CompanionSupervisor = class {
         ...this.probeOpencode ? { probeOpencode: this.probeOpencode } : {}
       });
       this.detection = detection;
-      this.seedSignInHealth(previous, detection);
       this.logBundledTransitions();
       this.harnessVersions = {
         claudeCode: detectedVersion(detection["claude-code"]),
@@ -15311,23 +15326,6 @@ var CompanionSupervisor = class {
     const bare = advertisedRuntimes(this.detection).filter((runtime) => !named.has(runtime)).map((runtime) => ({ runtime }));
     return [...health, ...bare];
   }
-  // Seed connector health from what detection saw of a sign-in, so Cabane says
-  // "sign-in needed" before a turn fails. Only a LAPSE seeds it — an agent that
-  // was usable at an earlier look and is signed out now — because a device
-  // that never signed in to Codex has nothing to report about Codex. Usable
-  // again clears a seed of our own.
-  seedSignInHealth(previous, detection) {
-    for (const runtime of ["claude-code", "codex"]) {
-      const now = detection[runtime];
-      if (now.state === "usable") {
-        if (now.via !== "container") this.connectorHealth.recordLocalCheck(runtime, true);
-        continue;
-      }
-      if (now.state === "signed_out" && previous?.[runtime].state === "usable") {
-        this.connectorHealth.recordLocalCheck(runtime, false);
-      }
-    }
-  }
   // Beat NOW and wait for it to land. `start` calls this before asking the
   // person anything, so the browser's connect step already shows what this
   // machine has rather than sitting blank while the terminal waits on an answer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.174",
+  "version": "0.6.175",
   "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",