@cabane/companion 0.6.232 → 0.6.234

package/dist/cli.js

@@ -1010,6 +1010,317 @@ var init_bundled_binaries = __esm({
   }
 });
 
+// src/device-state.ts
+var DEVICE_STATES, DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS, HARNESS_STATES, DEVICE_HEALTH_STATES, DEVICE_STATE_LABEL, DEVICE_HEALTH_LABEL, HARNESS_STATE_LABEL;
+var init_device_state = __esm({
+  "src/device-state.ts"() {
+    "use strict";
+    DEVICE_STATES = ["waiting", "online", "offline", "deactivated"];
+    DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS = 9e4;
+    HARNESS_STATES = [
+      "checking",
+      "connected",
+      "needs_sign_in",
+      "limited",
+      "problem",
+      "off",
+      "gone"
+    ];
+    DEVICE_HEALTH_STATES = ["checking", "ready", "degraded"];
+    DEVICE_STATE_LABEL = {
+      waiting: "Waiting for its first check-in",
+      online: "Online",
+      offline: "Offline",
+      deactivated: "Deactivated"
+    };
+    DEVICE_HEALTH_LABEL = {
+      checking: "Checking harnesses\u2026",
+      ready: "Ready",
+      degraded: "Needs attention"
+    };
+    HARNESS_STATE_LABEL = {
+      checking: "checking",
+      connected: "connected",
+      needs_sign_in: "needs sign-in",
+      limited: "limited",
+      problem: "problem",
+      off: "disabled",
+      gone: "gone"
+    };
+  }
+});
+
+// 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;
+  }
+}
+var init_harness_state = __esm({
+  "src/harness-state.ts"() {
+    "use strict";
+    init_config();
+    init_device_state();
+  }
+});
+
+// src/harness-copy.ts
+import { homedir as homedir6 } from "os";
+import { join as join7, win32 } from "path";
+function harnessLabel(runtime) {
+  const known = HARNESS_RUNTIMES.find((candidate) => candidate === runtime);
+  return known ? HARNESS_LABELS[known] : "The harness";
+}
+function ctx(c = {}) {
+  const path = "path" in c ? c.path : process.env.PATH;
+  const home = c.home ?? homedir6();
+  return {
+    path,
+    home,
+    install: c.install ?? companionInstall(),
+    profile: "profile" in c ? c.profile ?? null : profileFile({ home }),
+    reload: "reload" in c ? c.reload ?? null : reloadLine(),
+    hasNpm: c.hasNpm ?? firstOnPath("npm", path) !== null,
+    windows: (c.platform ?? process.platform) === "win32"
+  };
+}
+function loginCommand(runtime) {
+  return runtime === "codex" ? "codex login" : "claude auth login";
+}
+function failureText(runtime, reason) {
+  const label = HARNESS_LABELS[runtime];
+  switch (reason) {
+    case "timeout":
+      return `Couldn't check whether ${label} is signed in: the check didn't answer in time. Try again.`;
+    case "spawn":
+      return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
+    case "config":
+      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join7(homedir6(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
+    case "unreadable":
+      return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
+  }
+}
+function bundleMissingText(runtime) {
+  const label = HARNESS_LABELS[runtime];
+  return `This Cabane install is missing its bundled ${label}. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
+}
+function unusableReason(runtime, check) {
+  if (check.status === "bundle_missing") return bundleMissingText(runtime);
+  if (check.status === "check_failed") return failureText(runtime, check.reason);
+  return null;
+}
+function agentRows(detection, opts = {}) {
+  return HARNESS_RUNTIMES.map((runtime) => {
+    const state = detection[runtime];
+    return {
+      runtime,
+      label: HARNESS_LABELS[runtime],
+      text: agentRowText(runtime, state, opts),
+      usable: state.state === "usable"
+    };
+  });
+}
+function agentRowText(runtime, state, opts = {}) {
+  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 `${word} \u2014 API key configured${version}`;
+      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" ? `${word} \u2014 run  ${loginCommand(runtime)}` : word;
+    case "not_running":
+      return `${word} \u2014 not running`;
+    case "off":
+      return `${word} \u2014 disabled in config`;
+    case "problem":
+      return runtime === "opencode" ? `${word} \u2014 not running` : `${word} \u2014 ${unusableReason(runtime, state.check) ?? "could not be checked"}`;
+  }
+}
+function agentNote(runtime, c = {}) {
+  const k = ctx(c);
+  if (k.windows) return windowsAgentNote(runtime, k);
+  if (runtime === "claude-code") {
+    const commands = ["curl -fsSL https://claude.ai/install.sh | bash"];
+    const localBin = join7(k.home, ".local", "bin");
+    const needsPath = !dirOnPath(localBin, k.path);
+    const profile = k.profile ? tildePath(k.profile, k.home) : null;
+    let sourced = null;
+    if (needsPath) {
+      if (profile) {
+        commands.push(`echo 'export PATH="$HOME/.local/bin:$PATH"' >> ${profile}`);
+        sourced = `source ${profile}`;
+        commands.push(sourced);
+      } else {
+        commands.push('export PATH="$HOME/.local/bin:$PATH"');
+      }
+    }
+    if (k.reload && k.reload !== sourced) commands.push(k.reload);
+    commands.push("claude auth login");
+    return {
+      title: "Set up Claude Code",
+      lines: [
+        "Run these lines here. The last one opens your browser",
+        "to sign in with your Claude account.",
+        "",
+        ...commands.map(indent),
+        "",
+        SETUP_AGAIN
+      ]
+    };
+  }
+  if (runtime === "codex") {
+    const own = k.hasNpm || k.install !== "script";
+    const on = own ? "" : 'PATH="$HOME/.cabane/node/bin:$PATH" ';
+    const commands = [
+      `${on}npm i -g @openai/codex`,
+      ...k.reload ? [k.reload] : [],
+      `${on}codex login`
+    ];
+    return {
+      title: "Set up Codex",
+      lines: [
+        "Run these lines here. The last one opens your browser",
+        "to sign in with your ChatGPT account.",
+        "",
+        ...commands.map(indent),
+        "",
+        SETUP_AGAIN
+      ]
+    };
+  }
+  const here = [...k.reload ? [k.reload] : [], "curl -fsSL https://opencode.ai/install | bash"];
+  return {
+    title: "Set up OpenCode",
+    lines: [
+      `Run the ${here.length > 1 ? "first two lines" : "first line"} here. Then open a second terminal`,
+      "window, run the last line there, and leave that window open.",
+      "",
+      ...here.map(indent),
+      indent("opencode serve --port 4096"),
+      "",
+      `Then  ${cabane("status")}  shows it signed in; nothing else to run.`
+    ]
+  };
+}
+function windowsAgentNote(runtime, k) {
+  if (runtime === "claude-code") {
+    const commands = ["irm https://claude.ai/install.ps1 | iex"];
+    if (!windowsDirOnPath(win32.join(k.home, ".local", "bin"), k.path)) {
+      commands.push(
+        `$bin = "$env:USERPROFILE\\.local\\bin"`,
+        `$p = [Environment]::GetEnvironmentVariable('PATH', 'User')`,
+        `[Environment]::SetEnvironmentVariable('PATH', "$p;$bin", 'User')`,
+        `$env:PATH += ";$bin"`
+      );
+    }
+    commands.push("claude auth login");
+    return {
+      title: "Set up Claude Code",
+      lines: [
+        "Run these lines in PowerShell. The last one opens your browser",
+        "to sign in with your Claude account.",
+        "",
+        ...commands.map(indent),
+        "",
+        SETUP_AGAIN
+      ]
+    };
+  }
+  if (runtime === "codex") {
+    return {
+      title: "Set up Codex",
+      lines: [
+        "Run these lines here. The last one opens your browser",
+        "to sign in with your ChatGPT account.",
+        "",
+        indent("npm i -g @openai/codex"),
+        indent("codex login"),
+        "",
+        SETUP_AGAIN
+      ]
+    };
+  }
+  return {
+    title: "Set up OpenCode",
+    lines: [
+      "Run the first line here. Then open a second terminal",
+      "window, run the last line there, and leave that window open.",
+      "",
+      indent("npm i -g opencode-ai"),
+      indent("opencode serve --port 4096"),
+      "",
+      `Then  ${cabane("status")}  shows it signed in; nothing else to run.`
+    ]
+  };
+}
+function windowsDirOnPath(dir2, path) {
+  const norm = (entry) => entry.replace(/[\\/]+$/, "").toLowerCase();
+  return (path ?? "").split(";").some((entry) => norm(entry) === norm(dir2));
+}
+function indent(line) {
+  return `  ${line}`;
+}
+function spaced(sentence) {
+  return sentence ? ` ${sentence}` : "";
+}
+var HARNESS_LABELS, AGENT_CHOICES, CHOOSE_AGENT, SETUP_AGAIN;
+var init_harness_copy = __esm({
+  "src/harness-copy.ts"() {
+    "use strict";
+    init_bundled_binaries();
+    init_cabane_command();
+    init_config();
+    init_device_state();
+    init_harness_state();
+    init_install_kind();
+    init_install_record();
+    init_term();
+    HARNESS_LABELS = {
+      "claude-code": "Claude Code",
+      codex: "Codex",
+      opencode: "OpenCode"
+    };
+    AGENT_CHOICES = [
+      { value: "claude-code", label: "Claude Code", hint: "a Claude Pro or Max plan" },
+      { value: "codex", label: "Codex", hint: "a ChatGPT plan" },
+      { value: "opencode", label: "OpenCode" }
+    ];
+    CHOOSE_AGENT = "Cabane needs one of them. Which will you set up?";
+    SETUP_AGAIN = `Then  ${cabane("status")}  shows it signed in; nothing else to run.`;
+  }
+});
+
 // src/harness-versions.ts
 function parseVersionToken(raw) {
   if (!raw) return null;
@@ -7204,9 +7515,12 @@ var init_turn_runtime_integrity = __esm({
 // src/turn-execution.ts
 import { createHash as createHash2, randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync11, mkdirSync as mkdirSync9 } from "fs";
-function harnessUnavailableNotice(deviceId, deviceLabel) {
+function harnessUnavailableNotice(runtime, agentUsername, deviceId, deviceLabel) {
   const name = deviceId && deviceLabel !== void 0 ? ` ([${deviceLabel.replace(/([\\[\]])/g, "\\$1")}](/settings/devices/${encodeURIComponent(deviceId)}))` : "";
-  return "**This harness isn't available on the companion.** Check the harness on the device" + name + ", or choose another harness in the agent's settings. Then reply to try again.";
+  const agent = `\\@${agentUsername}`;
+  return `${harnessLabel(runtime)} isn't connected on ${agent}'s device${name}, so they can't reply. Run \`cabane setup\` in a terminal, or choose a different harness in ${agent}'s settings.
+
+Reply to try again.`;
 }
 function resolveIdleTimeoutMs(override) {
   return override ?? DEFAULT_AGENT_IDLE_TIMEOUT_MS;
@@ -7273,6 +7587,7 @@ var init_turn_execution = __esm({
     init_turn_containment();
     init_turn_committer();
     init_turn_runtime_integrity();
+    init_harness_copy();
     PREPARING_TOOL_NAME = "preparing";
     NO_TURN_TOKEN_REASON = "no_turn_token: the server issued no turn credential for this turn";
     UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
@@ -7900,7 +8215,10 @@ var init_turn_execution = __esm({
       async selectAdapter() {
         const { payload, workspaceId, turnId, turnLog } = this;
         await guardBundledBinary(this.integrityContext(), (r, e) => this.concluded(r, e), this.outcome);
-        const onWarn = (msg, meta) => turnLog.debug(meta ?? {}, msg);
+        const onWarn = (msg, meta) => turnLog.warn(
+          { ...meta, ...typeof meta?.thrown === "string" ? { err: meta.thrown } : {} },
+          msg
+        );
         const adapters = [];
         if (this.opts.claudeCodeAvailable?.() ?? true) {
           this.containment = createTurnContainment(this.turnId, {
@@ -7969,7 +8287,12 @@ var init_turn_execution = __esm({
           );
           try {
             await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
-              body: harnessUnavailableNotice(this.opts.deviceId, this.opts.deviceLabel),
+              body: harnessUnavailableNotice(
+                err.runtime,
+                this.opts.agentUsername,
+                this.opts.deviceId,
+                this.opts.deviceLabel
+              ),
               kind: "runtime_notice",
               turnId,
               parentMessageId: payload.messageId,
@@ -9168,295 +9491,7 @@ init_errors();
 
 // src/harness-status.ts
 init_config();
-
-// src/harness-copy.ts
-init_bundled_binaries();
-init_cabane_command();
-init_config();
-import { homedir as homedir6 } from "os";
-import { join as join7, win32 } from "path";
-
-// src/device-state.ts
-var DEVICE_STATES = ["waiting", "online", "offline", "deactivated"];
-var DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS = 9e4;
-var HARNESS_STATES = [
-  "checking",
-  "connected",
-  "needs_sign_in",
-  "limited",
-  "problem",
-  "off",
-  "gone"
-];
-var DEVICE_HEALTH_STATES = ["checking", "ready", "degraded"];
-var DEVICE_STATE_LABEL = {
-  waiting: "Waiting for its first check-in",
-  online: "Online",
-  offline: "Offline",
-  deactivated: "Deactivated"
-};
-var DEVICE_HEALTH_LABEL = {
-  checking: "Checking harnesses\u2026",
-  ready: "Ready",
-  degraded: "Needs attention"
-};
-var HARNESS_STATE_LABEL = {
-  checking: "checking",
-  connected: "connected",
-  needs_sign_in: "needs sign-in",
-  limited: "limited",
-  problem: "problem",
-  off: "disabled",
-  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();
-var HARNESS_LABELS = {
-  "claude-code": "Claude Code",
-  codex: "Codex",
-  opencode: "OpenCode"
-};
-function ctx(c = {}) {
-  const path = "path" in c ? c.path : process.env.PATH;
-  const home = c.home ?? homedir6();
-  return {
-    path,
-    home,
-    install: c.install ?? companionInstall(),
-    profile: "profile" in c ? c.profile ?? null : profileFile({ home }),
-    reload: "reload" in c ? c.reload ?? null : reloadLine(),
-    hasNpm: c.hasNpm ?? firstOnPath("npm", path) !== null,
-    windows: (c.platform ?? process.platform) === "win32"
-  };
-}
-function loginCommand(runtime) {
-  return runtime === "codex" ? "codex login" : "claude auth login";
-}
-function failureText(runtime, reason) {
-  const label = HARNESS_LABELS[runtime];
-  switch (reason) {
-    case "timeout":
-      return `Couldn't check whether ${label} is signed in: the check didn't answer in time. Try again.`;
-    case "spawn":
-      return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
-    case "config":
-      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join7(homedir6(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
-    case "unreadable":
-      return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
-  }
-}
-function bundleMissingText(runtime) {
-  const label = HARNESS_LABELS[runtime];
-  return `This Cabane install is missing its bundled ${label}. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
-}
-function unusableReason(runtime, check) {
-  if (check.status === "bundle_missing") return bundleMissingText(runtime);
-  if (check.status === "check_failed") return failureText(runtime, check.reason);
-  return null;
-}
-function agentRows(detection, opts = {}) {
-  return HARNESS_RUNTIMES.map((runtime) => {
-    const state = detection[runtime];
-    return {
-      runtime,
-      label: HARNESS_LABELS[runtime],
-      text: agentRowText(runtime, state, opts),
-      usable: state.state === "usable"
-    };
-  });
-}
-function agentRowText(runtime, state, opts = {}) {
-  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 `${word} \u2014 API key configured${version}`;
-      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" ? `${word} \u2014 run  ${loginCommand(runtime)}` : word;
-    case "not_running":
-      return `${word} \u2014 not running`;
-    case "off":
-      return `${word} \u2014 disabled in config`;
-    case "problem":
-      return runtime === "opencode" ? `${word} \u2014 not running` : `${word} \u2014 ${unusableReason(runtime, state.check) ?? "could not be checked"}`;
-  }
-}
-var AGENT_CHOICES = [
-  { value: "claude-code", label: "Claude Code", hint: "a Claude Pro or Max plan" },
-  { value: "codex", label: "Codex", hint: "a ChatGPT plan" },
-  { value: "opencode", label: "OpenCode" }
-];
-var CHOOSE_AGENT = "Cabane needs one of them. Which will you set up?";
-var SETUP_AGAIN = `Then  ${cabane("status")}  shows it signed in; nothing else to run.`;
-function agentNote(runtime, c = {}) {
-  const k = ctx(c);
-  if (k.windows) return windowsAgentNote(runtime, k);
-  if (runtime === "claude-code") {
-    const commands = ["curl -fsSL https://claude.ai/install.sh | bash"];
-    const localBin = join7(k.home, ".local", "bin");
-    const needsPath = !dirOnPath(localBin, k.path);
-    const profile = k.profile ? tildePath(k.profile, k.home) : null;
-    let sourced = null;
-    if (needsPath) {
-      if (profile) {
-        commands.push(`echo 'export PATH="$HOME/.local/bin:$PATH"' >> ${profile}`);
-        sourced = `source ${profile}`;
-        commands.push(sourced);
-      } else {
-        commands.push('export PATH="$HOME/.local/bin:$PATH"');
-      }
-    }
-    if (k.reload && k.reload !== sourced) commands.push(k.reload);
-    commands.push("claude auth login");
-    return {
-      title: "Set up Claude Code",
-      lines: [
-        "Run these lines here. The last one opens your browser",
-        "to sign in with your Claude account.",
-        "",
-        ...commands.map(indent),
-        "",
-        SETUP_AGAIN
-      ]
-    };
-  }
-  if (runtime === "codex") {
-    const own = k.hasNpm || k.install !== "script";
-    const on = own ? "" : 'PATH="$HOME/.cabane/node/bin:$PATH" ';
-    const commands = [
-      `${on}npm i -g @openai/codex`,
-      ...k.reload ? [k.reload] : [],
-      `${on}codex login`
-    ];
-    return {
-      title: "Set up Codex",
-      lines: [
-        "Run these lines here. The last one opens your browser",
-        "to sign in with your ChatGPT account.",
-        "",
-        ...commands.map(indent),
-        "",
-        SETUP_AGAIN
-      ]
-    };
-  }
-  const here = [...k.reload ? [k.reload] : [], "curl -fsSL https://opencode.ai/install | bash"];
-  return {
-    title: "Set up OpenCode",
-    lines: [
-      `Run the ${here.length > 1 ? "first two lines" : "first line"} here. Then open a second terminal`,
-      "window, run the last line there, and leave that window open.",
-      "",
-      ...here.map(indent),
-      indent("opencode serve --port 4096"),
-      "",
-      `Then  ${cabane("status")}  shows it signed in; nothing else to run.`
-    ]
-  };
-}
-function windowsAgentNote(runtime, k) {
-  if (runtime === "claude-code") {
-    const commands = ["irm https://claude.ai/install.ps1 | iex"];
-    if (!windowsDirOnPath(win32.join(k.home, ".local", "bin"), k.path)) {
-      commands.push(
-        `$bin = "$env:USERPROFILE\\.local\\bin"`,
-        `$p = [Environment]::GetEnvironmentVariable('PATH', 'User')`,
-        `[Environment]::SetEnvironmentVariable('PATH', "$p;$bin", 'User')`,
-        `$env:PATH += ";$bin"`
-      );
-    }
-    commands.push("claude auth login");
-    return {
-      title: "Set up Claude Code",
-      lines: [
-        "Run these lines in PowerShell. The last one opens your browser",
-        "to sign in with your Claude account.",
-        "",
-        ...commands.map(indent),
-        "",
-        SETUP_AGAIN
-      ]
-    };
-  }
-  if (runtime === "codex") {
-    return {
-      title: "Set up Codex",
-      lines: [
-        "Run these lines here. The last one opens your browser",
-        "to sign in with your ChatGPT account.",
-        "",
-        indent("npm i -g @openai/codex"),
-        indent("codex login"),
-        "",
-        SETUP_AGAIN
-      ]
-    };
-  }
-  return {
-    title: "Set up OpenCode",
-    lines: [
-      "Run the first line here. Then open a second terminal",
-      "window, run the last line there, and leave that window open.",
-      "",
-      indent("npm i -g opencode-ai"),
-      indent("opencode serve --port 4096"),
-      "",
-      `Then  ${cabane("status")}  shows it signed in; nothing else to run.`
-    ]
-  };
-}
-function windowsDirOnPath(dir2, path) {
-  const norm = (entry) => entry.replace(/[\\/]+$/, "").toLowerCase();
-  return (path ?? "").split(";").some((entry) => norm(entry) === norm(dir2));
-}
-function indent(line) {
-  return `  ${line}`;
-}
-function spaced(sentence) {
-  return sentence ? ` ${sentence}` : "";
-}
+init_harness_copy();
 
 // src/harness-detect.ts
 init_config();
@@ -9734,6 +9769,7 @@ async function liveCompanionState() {
 // src/commands/setup.ts
 init_cabane_command();
 init_config();
+init_harness_copy();
 
 // src/logger.ts
 init_config();
@@ -10028,6 +10064,8 @@ async function awaitEnrollment(baseUrl, code, opts = {}) {
 
 // src/terminal-copy.ts
 init_cabane_command();
+init_device_state();
+init_harness_copy();
 var UNPAIRED = `This device isn't paired yet. Run  ${cabane("setup")}  on it.`;
 var lease = DEFAULT_DEVICE_OFFLINE_THRESHOLD_MS;
 function age(at, now) {
@@ -10547,6 +10585,7 @@ var CompanionStateHub = class {
 init_errors();
 
 // src/heartbeat-status.ts
+init_device_state();
 import { z as z3 } from "zod";
 var acknowledgedDeviceSchema = z3.object({
   state: z3.enum(DEVICE_STATES),
@@ -10571,72 +10610,90 @@ import { hostname as hostname2 } from "os";
 // src/log-copy.ts
 init_failure();
 init_bundled_binaries();
-var RESTART = "then `cabane stop` and `cabane start` to restart the companion";
+init_harness_copy();
+var RESTART = "`cabane stop` and `cabane start`";
 function turnFailureCopy(reason, runtime) {
   const failure = decodeFailureReason(reason);
+  const harness = harnessLabel(runtime);
   if (failure?.kind === "auth_expired") {
     if (runtime === "claude-code")
-      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Then reply in Cabane to try again.`;
+      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Reply in Cabane to try again.`;
     if (runtime === "codex")
-      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Then reply in Cabane to try again.`;
-    return `The agent is signed out on this device. Sign in to their harness, ${RESTART}. Then reply in Cabane to try again.`;
+      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Reply in Cabane to try again.`;
+    return `${harness} is signed out on this device. Sign in to ${runtime === "opencode" ? "OpenCode" : "it"}, then run ${RESTART}. Reply in Cabane to try again.`;
   }
   if (failure?.kind === "usage_capped")
-    return failure.resetsAt ? `The usage limit is reached; it resets around ${new Date(failure.resetsAt).toLocaleTimeString()}. Reply in Cabane after it resets.` : "The usage limit is reached. Try again later in Cabane.";
+    return failure.resetsAt ? `The usage limit is reached and resets around ${new Date(failure.resetsAt).toLocaleTimeString([], { timeStyle: "short" })}. Reply in Cabane after reset to try again.` : "The usage limit is reached. Reply in Cabane later to try again.";
   if (failure?.kind === "rate_limited")
     return "The provider is limiting requests. Reply in Cabane to try again.";
   if (failure?.kind === "server_error")
     return "The provider had a temporary error. Reply in Cabane to try again.";
-  if (reason?.startsWith("missing_secret:"))
-    return `A required secret is missing: ${humanText(reason.slice(15))}. Add it to ~/.cabane/secrets.json, then reply in Cabane to try again.`;
-  if (reason?.startsWith("runtime_incomplete:"))
-    return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
-  if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "This harness isn't available on the companion. Check the harness on this device, or choose another harness in the agent's settings in Cabane. Then reply in Cabane to try again.";
+  if (reason?.startsWith("missing_secret:")) {
+    const tokens = humanText(reason.slice(15)).split(",").map((name) => name.trim()).filter(Boolean);
+    const more = tokens.reduce(
+      (n, token) => /^\+\d+$/.test(token) ? n + Number(token.slice(1)) : n,
+      0
+    );
+    const names = tokens.filter((token) => !/^\+\d+$/.test(token)).map((name) => `\`${name}\``);
+    const count = names.length + more;
+    const needs = names.length === 0 ? count > 1 ? `${count} secrets` : "a secret" : `${count > 1 ? "secrets" : "a secret"} called ${more > 0 ? `${names.join(", ")} and ${more} more` : names.length > 1 ? `${names.slice(0, -1).join(", ")} and ${names.at(-1)}` : names[0]}`;
+    return `The agent's tools need ${needs}, which this device doesn't have. Add ${count > 1 ? "them" : "it"} to the secrets file, \`~/.cabane/secrets.json\`. Reply in Cabane to try again.`;
+  }
+  if (reason?.startsWith("runtime_incomplete:")) {
+    const commands = repairCommands(void 0, (rest) => `cabane ${rest}`);
+    const stopsFirst = commands.length > 1;
+    if (!stopsFirst) commands.push("cabane stop");
+    commands.push("cabane start");
+    const list = commands.map((command) => `\`${command}\``);
+    return `${harnessLabel(runtime ?? reason.slice("runtime_incomplete:".length))}'s installation on this device is incomplete. Run ${list.slice(0, -1).join(", ")} and ${list.at(-1)}. ${stopsFirst ? `${STOP_WARNING} ` : ""}Reply in Cabane to try again.`;
+  }
+  const unavailable = /^(codex|opencode)_unavailable:/.exec(reason ?? "")?.[1] ?? (reason?.startsWith("runtime_unavailable:") ? reason.slice("runtime_unavailable:".length).trim() : void 0);
+  if (unavailable !== void 0)
+    return `${harnessLabel(runtime ?? unavailable)} isn't connected on this device. Run \`cabane setup\`, or choose a different harness in the agent's settings in Cabane. Reply in Cabane to try again.`;
   if (reason?.startsWith("model_unavailable:"))
-    return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
+    return "The agent's model isn't available to the harness on this device. Choose a different model in the agent's settings in Cabane. Reply in Cabane to try again.";
   if (reason?.startsWith("prepare_failed:"))
-    return `Could not prepare the working environment (${humanText(reason.slice(15))}). Check the prepare command in ~/.cabane/config.json.`;
+    return `This device couldn't get a folder ready for the agent's turn. It reported: "${humanText(reason.slice(15))}". Check the agent's prepare command in \`~/.cabane/config.json\`. Reply in Cabane to try again.`;
   if (reason?.startsWith("fetch_failed:"))
-    return `Could not load the conversation (${humanText(reason.slice(13))}). Reply in Cabane to try again.`;
+    return `This device couldn't load the conversation (${humanText(reason.slice(13))}), so the turn didn't run. Reply in Cabane to try again.`;
   if (reason === "timeout_idle")
-    return "The agent stopped responding. Reply in Cabane to try again.";
+    return "The agent went quiet for too long, so the turn was stopped. Reply in Cabane to try again.";
   if (reason === "timeout_total")
-    return "The turn ran longer than expected and was stopped. Reply in Cabane to continue.";
+    return "The turn ran too long and was stopped. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_turns")
     return "The agent reached their step limit. Reply in Cabane to continue.";
-  if (reason === "no_result" || reason === "empty_result" || reason === "empty_result_unverified")
-    return "The agent finished without a response. Reply in Cabane to try again.";
+  if (reason === "empty_result" || reason === "empty_result_unverified")
+    return `${harness} finished the turn without a reply. Reply in Cabane to try again.`;
   if (reason === "session_start_failed")
-    return "The agent could not start a session. Restart the companion, then reply in Cabane to try again.";
-  if (reason === "no_terminal")
-    return "The agent stopped before confirming the turn was complete. Reply in Cabane to continue.";
+    return `${harness} closed before the turn could start, so the turn didn't run. Reply in Cabane to try again.`;
+  if (reason === "no_terminal" || reason === "no_result")
+    return `${harness} stopped before the turn finished. Reply in Cabane to try again.`;
   if (reason === "lease_unconfirmed")
-    return "Could not confirm with Cabane that the turn could start. Check this device\u2019s connection, then reply in Cabane to try again.";
+    return "Before a turn starts, this device checks with Cabane that it should run it. That check didn't go through, so nothing ran. Check this device's connection. Reply in Cabane to try again.";
   if (reason === "workspace_tools_missing")
-    return "The Cabane workspace tools did not load. Reply in Cabane to try again.";
+    return "The agent's Cabane workspace tools didn't load, so they couldn't reply. Reply in Cabane to try again.";
   if (reason?.startsWith("seq_floor_unavailable:"))
-    return "The interrupted turn could not safely continue. Reply in Cabane to continue.";
+    return "The turn was interrupted, and it couldn't safely pick back up where it left off. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_budget_usd")
-    return "The agent reached their spending limit. Check their budget settings before trying again in Cabane.";
+    return "The agent reached their spending limit. Check their budget settings. Reply in Cabane to try again.";
   if (reason === "result_error:error_max_structured_output_retries")
-    return "The agent could not produce the requested response format. Check the requested format, then reply in Cabane to try again.";
+    return "The agent couldn't produce the response format they were asked for. Check that format. Reply in Cabane to try again.";
   if (reason?.startsWith("result_error:"))
-    return "The agent stopped with an error while running. Check their transcript, then reply in Cabane to try again.";
+    return `${harness} ended the turn with an error. Check the agent's transcript. Reply in Cabane to try again.`;
   if (reason === "setup_failed")
-    return "The turn could not be set up. Check the agent setup on this device, then reply in Cabane to try again.";
+    return "The companion couldn't set up this turn, so it didn't run. Check the agent's setup on this device. Reply in Cabane to try again.";
   if (reason === "unexpected_role")
-    return "The message could not start an agent response. Send a new message in Cabane to try again.";
+    return "That message couldn't start a turn for the agent. Send a new message in Cabane.";
   if (reason === "lease_lost" || reason?.startsWith("lease_refused:"))
-    return "The turn could not keep its connection to Cabane. Reply in Cabane to try again.";
+    return "The turn lost its connection to Cabane. Reply in Cabane to try again.";
   const detail = humanText(reason?.replace(/^error:/, "") ?? "").slice(0, 400);
   if (/\b(EACCES|EPERM)\b|permission denied/i.test(detail)) {
     const readable = detail.replace(/\b(EACCES|EPERM)\b/g, "permission denied");
-    return `The agent was denied access: ${readable}. Check access permissions for the reported file or command, then reply in Cabane to try again.`;
+    return `The agent was denied access: ${readable}. Check the permissions on that file or command. Reply in Cabane to try again.`;
   }
   if (detail)
-    return `The agent reported: ${detail}. Check the agent setup on this device, then reply in Cabane to try again.`;
-  return "The agent could not finish this turn. Reply in Cabane to try again.";
+    return `The agent reported an error: ${detail}. Check the agent's setup on this device. Reply in Cabane to try again.`;
+  return "The agent couldn't finish this turn. Reply in Cabane to try again.";
 }
 
 // src/supervisor.ts
@@ -11823,6 +11880,7 @@ function runtimeIssuesFor(gates) {
 }
 
 // src/supervisor.ts
+init_harness_state();
 init_harness_versions();
 init_harness_usable();
 
@@ -13664,7 +13722,7 @@ var CompanionSupervisor = class {
         attempt,
         cap: MAX_RESUME_ATTEMPTS
       },
-      "An interrupted turn couldn't finish after several attempts. Reply in Cabane to try again."
+      "The turn was interrupted, and it couldn't pick back up after several attempts. Reply in Cabane to continue."
     );
     try {
       await agent.api.setActiveRun(workspaceId, payload.conversationId, payload.agentId, {
@@ -15419,6 +15477,7 @@ import { readdirSync as readdirSync4, realpathSync as realpathSync6, existsSync
 import { homedir as homedir10 } from "os";
 import { dirname as dirname12, join as join28 } from "path";
 init_config();
+init_harness_copy();
 init_secrets();
 init_term();
 init_transcript_writer();

package/dist/runtime.js

@@ -1500,73 +1500,166 @@ var NEGATED_CAP = /not (your|a) usage limit/g;
 var RATE_PATTERNS = [/rate[_ ]?limit/, /\b429\b/, /too many requests/];
 var BARE_LIMIT = /\blimit (reached|exceeded)\b/;
 
+// src/harness-copy.ts
+import { homedir as homedir6 } from "os";
+import { join as join9, win32 } from "path";
+
+// 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-copy.ts
+var HARNESS_LABELS = {
+  "claude-code": "Claude Code",
+  codex: "Codex",
+  opencode: "OpenCode"
+};
+function harnessLabel(runtime) {
+  const known = HARNESS_RUNTIMES.find((candidate) => candidate === runtime);
+  return known ? HARNESS_LABELS[known] : "The harness";
+}
+function failureText(runtime, reason) {
+  const label = HARNESS_LABELS[runtime];
+  switch (reason) {
+    case "timeout":
+      return `Couldn't check whether ${label} is signed in: the check didn't answer in time. Try again.`;
+    case "spawn":
+      return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
+    case "config":
+      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join9(homedir6(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
+    case "unreadable":
+      return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
+  }
+}
+function bundleMissingText(runtime) {
+  const label = HARNESS_LABELS[runtime];
+  return `This Cabane install is missing its bundled ${label}. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
+}
+function unusableReason(runtime, check) {
+  if (check.status === "bundle_missing") return bundleMissingText(runtime);
+  if (check.status === "check_failed") return failureText(runtime, check.reason);
+  return null;
+}
+var SETUP_AGAIN = `Then  ${cabane("status")}  shows it signed in; nothing else to run.`;
+function spaced(sentence) {
+  return sentence ? ` ${sentence}` : "";
+}
+
 // src/log-copy.ts
-var RESTART = "then `cabane stop` and `cabane start` to restart the companion";
+var RESTART = "`cabane stop` and `cabane start`";
 function turnFailureCopy(reason, runtime) {
   const failure = decodeFailureReason(reason);
+  const harness = harnessLabel(runtime);
   if (failure?.kind === "auth_expired") {
     if (runtime === "claude-code")
-      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Then reply in Cabane to try again.`;
+      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Reply in Cabane to try again.`;
     if (runtime === "codex")
-      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Then reply in Cabane to try again.`;
-    return `The agent is signed out on this device. Sign in to their harness, ${RESTART}. Then reply in Cabane to try again.`;
+      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Reply in Cabane to try again.`;
+    return `${harness} is signed out on this device. Sign in to ${runtime === "opencode" ? "OpenCode" : "it"}, then run ${RESTART}. Reply in Cabane to try again.`;
   }
   if (failure?.kind === "usage_capped")
-    return failure.resetsAt ? `The usage limit is reached; it resets around ${new Date(failure.resetsAt).toLocaleTimeString()}. Reply in Cabane after it resets.` : "The usage limit is reached. Try again later in Cabane.";
+    return failure.resetsAt ? `The usage limit is reached and resets around ${new Date(failure.resetsAt).toLocaleTimeString([], { timeStyle: "short" })}. Reply in Cabane after reset to try again.` : "The usage limit is reached. Reply in Cabane later to try again.";
   if (failure?.kind === "rate_limited")
     return "The provider is limiting requests. Reply in Cabane to try again.";
   if (failure?.kind === "server_error")
     return "The provider had a temporary error. Reply in Cabane to try again.";
-  if (reason?.startsWith("missing_secret:"))
-    return `A required secret is missing: ${humanText(reason.slice(15))}. Add it to ~/.cabane/secrets.json, then reply in Cabane to try again.`;
-  if (reason?.startsWith("runtime_incomplete:"))
-    return `The agent installation is incomplete. ${repairAction()} Then restart the companion.`;
-  if (/^(runtime|codex|opencode)_unavailable:/.test(reason ?? ""))
-    return "This harness isn't available on the companion. Check the harness on this device, or choose another harness in the agent's settings in Cabane. Then reply in Cabane to try again.";
+  if (reason?.startsWith("missing_secret:")) {
+    const tokens = humanText(reason.slice(15)).split(",").map((name) => name.trim()).filter(Boolean);
+    const more = tokens.reduce(
+      (n, token) => /^\+\d+$/.test(token) ? n + Number(token.slice(1)) : n,
+      0
+    );
+    const names = tokens.filter((token) => !/^\+\d+$/.test(token)).map((name) => `\`${name}\``);
+    const count = names.length + more;
+    const needs = names.length === 0 ? count > 1 ? `${count} secrets` : "a secret" : `${count > 1 ? "secrets" : "a secret"} called ${more > 0 ? `${names.join(", ")} and ${more} more` : names.length > 1 ? `${names.slice(0, -1).join(", ")} and ${names.at(-1)}` : names[0]}`;
+    return `The agent's tools need ${needs}, which this device doesn't have. Add ${count > 1 ? "them" : "it"} to the secrets file, \`~/.cabane/secrets.json\`. Reply in Cabane to try again.`;
+  }
+  if (reason?.startsWith("runtime_incomplete:")) {
+    const commands = repairCommands(void 0, (rest) => `cabane ${rest}`);
+    const stopsFirst = commands.length > 1;
+    if (!stopsFirst) commands.push("cabane stop");
+    commands.push("cabane start");
+    const list = commands.map((command) => `\`${command}\``);
+    return `${harnessLabel(runtime ?? reason.slice("runtime_incomplete:".length))}'s installation on this device is incomplete. Run ${list.slice(0, -1).join(", ")} and ${list.at(-1)}. ${stopsFirst ? `${STOP_WARNING} ` : ""}Reply in Cabane to try again.`;
+  }
+  const unavailable = /^(codex|opencode)_unavailable:/.exec(reason ?? "")?.[1] ?? (reason?.startsWith("runtime_unavailable:") ? reason.slice("runtime_unavailable:".length).trim() : void 0);
+  if (unavailable !== void 0)
+    return `${harnessLabel(runtime ?? unavailable)} isn't connected on this device. Run \`cabane setup\`, or choose a different harness in the agent's settings in Cabane. Reply in Cabane to try again.`;
   if (reason?.startsWith("model_unavailable:"))
-    return "The selected model is unavailable. Choose a different model in the agent settings in Cabane.";
+    return "The agent's model isn't available to the harness on this device. Choose a different model in the agent's settings in Cabane. Reply in Cabane to try again.";
   if (reason?.startsWith("prepare_failed:"))
-    return `Could not prepare the working environment (${humanText(reason.slice(15))}). Check the prepare command in ~/.cabane/config.json.`;
+    return `This device couldn't get a folder ready for the agent's turn. It reported: "${humanText(reason.slice(15))}". Check the agent's prepare command in \`~/.cabane/config.json\`. Reply in Cabane to try again.`;
   if (reason?.startsWith("fetch_failed:"))
-    return `Could not load the conversation (${humanText(reason.slice(13))}). Reply in Cabane to try again.`;
+    return `This device couldn't load the conversation (${humanText(reason.slice(13))}), so the turn didn't run. Reply in Cabane to try again.`;
   if (reason === "timeout_idle")
-    return "The agent stopped responding. Reply in Cabane to try again.";
+    return "The agent went quiet for too long, so the turn was stopped. Reply in Cabane to try again.";
   if (reason === "timeout_total")
-    return "The turn ran longer than expected and was stopped. Reply in Cabane to continue.";
+    return "The turn ran too long and was stopped. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_turns")
     return "The agent reached their step limit. Reply in Cabane to continue.";
-  if (reason === "no_result" || reason === "empty_result" || reason === "empty_result_unverified")
-    return "The agent finished without a response. Reply in Cabane to try again.";
+  if (reason === "empty_result" || reason === "empty_result_unverified")
+    return `${harness} finished the turn without a reply. Reply in Cabane to try again.`;
   if (reason === "session_start_failed")
-    return "The agent could not start a session. Restart the companion, then reply in Cabane to try again.";
-  if (reason === "no_terminal")
-    return "The agent stopped before confirming the turn was complete. Reply in Cabane to continue.";
+    return `${harness} closed before the turn could start, so the turn didn't run. Reply in Cabane to try again.`;
+  if (reason === "no_terminal" || reason === "no_result")
+    return `${harness} stopped before the turn finished. Reply in Cabane to try again.`;
   if (reason === "lease_unconfirmed")
-    return "Could not confirm with Cabane that the turn could start. Check this device\u2019s connection, then reply in Cabane to try again.";
+    return "Before a turn starts, this device checks with Cabane that it should run it. That check didn't go through, so nothing ran. Check this device's connection. Reply in Cabane to try again.";
   if (reason === "workspace_tools_missing")
-    return "The Cabane workspace tools did not load. Reply in Cabane to try again.";
+    return "The agent's Cabane workspace tools didn't load, so they couldn't reply. Reply in Cabane to try again.";
   if (reason?.startsWith("seq_floor_unavailable:"))
-    return "The interrupted turn could not safely continue. Reply in Cabane to continue.";
+    return "The turn was interrupted, and it couldn't safely pick back up where it left off. Reply in Cabane to continue.";
   if (reason === "result_error:error_max_budget_usd")
-    return "The agent reached their spending limit. Check their budget settings before trying again in Cabane.";
+    return "The agent reached their spending limit. Check their budget settings. Reply in Cabane to try again.";
   if (reason === "result_error:error_max_structured_output_retries")
-    return "The agent could not produce the requested response format. Check the requested format, then reply in Cabane to try again.";
+    return "The agent couldn't produce the response format they were asked for. Check that format. Reply in Cabane to try again.";
   if (reason?.startsWith("result_error:"))
-    return "The agent stopped with an error while running. Check their transcript, then reply in Cabane to try again.";
+    return `${harness} ended the turn with an error. Check the agent's transcript. Reply in Cabane to try again.`;
   if (reason === "setup_failed")
-    return "The turn could not be set up. Check the agent setup on this device, then reply in Cabane to try again.";
+    return "The companion couldn't set up this turn, so it didn't run. Check the agent's setup on this device. Reply in Cabane to try again.";
   if (reason === "unexpected_role")
-    return "The message could not start an agent response. Send a new message in Cabane to try again.";
+    return "That message couldn't start a turn for the agent. Send a new message in Cabane.";
   if (reason === "lease_lost" || reason?.startsWith("lease_refused:"))
-    return "The turn could not keep its connection to Cabane. Reply in Cabane to try again.";
+    return "The turn lost its connection to Cabane. Reply in Cabane to try again.";
   const detail = humanText(reason?.replace(/^error:/, "") ?? "").slice(0, 400);
   if (/\b(EACCES|EPERM)\b|permission denied/i.test(detail)) {
     const readable = detail.replace(/\b(EACCES|EPERM)\b/g, "permission denied");
-    return `The agent was denied access: ${readable}. Check access permissions for the reported file or command, then reply in Cabane to try again.`;
+    return `The agent was denied access: ${readable}. Check the permissions on that file or command. Reply in Cabane to try again.`;
   }
   if (detail)
-    return `The agent reported: ${detail}. Check the agent setup on this device, then reply in Cabane to try again.`;
-  return "The agent could not finish this turn. Reply in Cabane to try again.";
+    return `The agent reported an error: ${detail}. Check the agent's setup on this device. Reply in Cabane to try again.`;
+  return "The agent couldn't finish this turn. Reply in Cabane to try again.";
 }
 
 // src/api-error-shape.ts
@@ -2304,17 +2397,17 @@ import {
   rmSync as rmSync4,
   writeFileSync as writeFileSync3
 } from "fs";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { z as z5 } from "zod";
 var credentialMapSchema = z5.record(z5.string(), z5.string());
 function credentialsDir() {
-  return join9(cabaneDir(), "credentials");
+  return join10(cabaneDir(), "credentials");
 }
 function legacyPath() {
-  return join9(cabaneDir(), "credentials.json");
+  return join10(cabaneDir(), "credentials.json");
 }
 function devicePath(deviceId) {
-  return join9(credentialsDir(), `${deviceId.replace(/[^A-Za-z0-9_-]/g, "_")}.json`);
+  return join10(credentialsDir(), `${deviceId.replace(/[^A-Za-z0-9_-]/g, "_")}.json`);
 }
 function read(path) {
   if (!existsSync6(path)) return null;
@@ -2383,13 +2476,13 @@ function pruneCredentials(deviceId, keepAgentIds) {
 
 // src/dispatch-dedupe.ts
 import { mkdirSync as mkdirSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync4, renameSync as renameSync4, existsSync as existsSync7 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 var MAX_IDS = 256;
 function dir(log) {
-  return join10(cabaneDir(), log);
+  return join11(cabaneDir(), log);
 }
 function pathFor(log, workspaceId) {
-  return join10(dir(log), encodeURIComponent(workspaceId));
+  return join11(dir(log), encodeURIComponent(workspaceId));
 }
 function readIds(log, workspaceId) {
   const path = pathFor(log, workspaceId);
@@ -2426,10 +2519,10 @@ function markCompleted(workspaceId, eventId) {
 }
 var MAX_RESUME_ATTEMPTS = 3;
 function resumeDir() {
-  return join10(cabaneDir(), "resume-attempts");
+  return join11(cabaneDir(), "resume-attempts");
 }
 function resumePathFor(workspaceId) {
-  return join10(resumeDir(), encodeURIComponent(workspaceId));
+  return join11(resumeDir(), encodeURIComponent(workspaceId));
 }
 function readResumeCounts(workspaceId) {
   const out = /* @__PURE__ */ new Map();
@@ -2465,10 +2558,10 @@ function bumpResumeAttempt(workspaceId, eventId) {
   return next;
 }
 function turnDir() {
-  return join10(cabaneDir(), "turns");
+  return join11(cabaneDir(), "turns");
 }
 function turnPathFor(workspaceId) {
-  return join10(turnDir(), encodeURIComponent(workspaceId));
+  return join11(turnDir(), encodeURIComponent(workspaceId));
 }
 var TURN_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function readTurnIds(workspaceId) {
@@ -6053,7 +6146,7 @@ import { existsSync as existsSync11, mkdirSync as mkdirSync9 } from "fs";
 
 // src/grants.ts
 import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { z as z14 } from "zod";
 var VARIABLE_NAME_RE = /^[A-Z_][A-Z0-9_]*$/;
 function allowedGrantVariable(name) {
@@ -6063,7 +6156,7 @@ function environmentSafe(value) {
   return !value.includes("\0");
 }
 function grantsPath() {
-  return join11(cabaneDir(), "grants.json");
+  return join12(cabaneDir(), "grants.json");
 }
 var grantsFileSchema = z14.record(z14.string(), z14.record(z14.string(), z14.string()));
 function readGrants(keys, report) {
@@ -6112,7 +6205,7 @@ function loadGrantsFile(report) {
 
 // src/work-dir.ts
 import { statSync as statSync3 } from "fs";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 
 // src/turn-control-tools.ts
 import { randomUUID as randomUUID3 } from "crypto";
@@ -6130,33 +6223,33 @@ var CANCEL_WAKE_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${CANCEL_WAKE_T
 
 // src/codex-config.ts
 import { readFile } from "fs/promises";
-import { homedir as homedir6 } from "os";
-import { join as join13 } from "path";
+import { homedir as homedir7 } from "os";
+import { join as join14 } from "path";
 import { parse as parse2 } from "smol-toml";
 
 // src/codex-images.ts
 import { mkdtemp, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 // src/codex-compactions.ts
 import { createReadStream } from "fs";
 import { readdir } from "fs/promises";
-import { homedir as homedir7 } from "os";
-import { join as join15 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join16 } from "path";
 import { createInterface as createInterface2 } from "readline";
 
 // src/prepared.ts
 import { mkdirSync as mkdirSync7, readFileSync as readFileSync8, rmSync as rmSync5, writeFileSync as writeFileSync5, existsSync as existsSync9 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 
 // src/secrets.ts
 import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { z as z16 } from "zod";
 var PLACEHOLDER_RE = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
 function secretsPath() {
-  return join17(cabaneDir(), "secrets.json");
+  return join18(cabaneDir(), "secrets.json");
 }
 var secretStoreSchema = z16.record(z16.string(), z16.string());
 function loadSecretValues() {
@@ -6346,9 +6439,9 @@ function runBounded(path, args, env) {
 
 // src/transcript-writer.ts
 import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync6 } from "fs";
-import { basename as basename3, dirname as dirname6, join as join18 } from "path";
+import { basename as basename3, dirname as dirname6, join as join19 } from "path";
 function transcriptsDir() {
-  return join18(cabaneDir(), "transcripts");
+  return join19(cabaneDir(), "transcripts");
 }
 
 // src/turn-execution.ts
@@ -6673,76 +6766,6 @@ 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-copy.ts
-import { homedir as homedir8 } from "os";
-import { join as join19, win32 } from "path";
-var HARNESS_LABELS = {
-  "claude-code": "Claude Code",
-  codex: "Codex",
-  opencode: "OpenCode"
-};
-function failureText(runtime, reason) {
-  const label = HARNESS_LABELS[runtime];
-  switch (reason) {
-    case "timeout":
-      return `Couldn't check whether ${label} is signed in: the check didn't answer in time. Try again.`;
-    case "spawn":
-      return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
-    case "config":
-      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join19(homedir8(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
-    case "unreadable":
-      return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
-  }
-}
-function bundleMissingText(runtime) {
-  const label = HARNESS_LABELS[runtime];
-  return `This Cabane install is missing its bundled ${label}. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
-}
-function unusableReason(runtime, check) {
-  if (check.status === "bundle_missing") return bundleMissingText(runtime);
-  if (check.status === "check_failed") return failureText(runtime, check.reason);
-  return null;
-}
-var SETUP_AGAIN = `Then  ${cabane("status")}  shows it signed in; nothing else to run.`;
-function spaced(sentence) {
-  return sentence ? ` ${sentence}` : "";
-}
-
 // src/harness-detect.ts
 var DEFAULT_OPENCODE_SERVER_URL = "http://127.0.0.1:4096";
 var DEFAULT_OPENCODE_PROBE_MS = 1e3;
@@ -8893,7 +8916,7 @@ var CompanionSupervisor = class {
         attempt,
         cap: MAX_RESUME_ATTEMPTS
       },
-      "An interrupted turn couldn't finish after several attempts. Reply in Cabane to try again."
+      "The turn was interrupted, and it couldn't pick back up after several attempts. Reply in Cabane to continue."
     );
     try {
       await agent.api.setActiveRun(workspaceId, payload.conversationId, payload.agentId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.232",
+  "version": "0.6.234",
   "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",
@@ -38,9 +38,9 @@
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.316",
+    "@anthropic-ai/claude-agent-sdk": "0.3.319",
     "@clack/prompts": "1.8.1",
-    "@openai/codex-sdk": "0.166.0",
+    "@openai/codex-sdk": "0.167.0",
     "commander": "12.1.0",
     "eventsource-parser": "3.0.8",
     "graphql": "16.11.0",