@cabane/companion 0.6.153 → 0.6.155

package/dist/cli.js

@@ -585,7 +585,8 @@ var init_config = __esm({
 // src/bundled-binaries.ts
 import { realpathSync, statSync } from "fs";
 import { createRequire } from "module";
-import { dirname as dirname2, join as join3 } from "path";
+import { homedir as homedir2 } from "os";
+import { dirname as dirname2, join as join3, sep } from "path";
 import { fileURLToPath } from "url";
 function nodeResolveSelf(specifier) {
   const here = fileURLToPath(import.meta.url);
@@ -741,25 +742,36 @@ function resolveBundledBinary(runtime, env = defaultResolveEnv()) {
 function missingNoun(status2) {
   return status2 === "executable_missing" ? "executable" : "platform package";
 }
-function repairCommands() {
-  return ["npm i -g @cabane/companion --include=optional"];
+function companionInstall(execPath = process.execPath, home = homedir2()) {
+  const real = (path) => {
+    try {
+      return realpathSync(path);
+    } catch {
+      return path;
+    }
+  };
+  const scriptNode = join3(real(home), ".cabane", "node") + sep;
+  return real(execPath).startsWith(scriptNode) ? "script" : "npm";
+}
+function repairCommands(install = companionInstall()) {
+  return install === "script" ? [INSTALL_SCRIPT_COMMAND] : ["npm i -g @cabane/companion --include=optional"];
 }
-function repairAction() {
-  return `Reinstall with \`${repairCommands()[0]}\`.`;
+function repairAction(install = companionInstall()) {
+  return `Reinstall with \`${repairCommands(install)[0]}\`.`;
 }
 function startupWarning(r) {
   const label = HARNESS_LABEL[r.runtime];
   return `${label} is ${HARNESS_INTENT_WORD[r.runtime]}, but its installation is incomplete (${missingNoun(r.status)} is missing). It cannot run turns until repaired. ${repairAction()} Then restart the companion.`;
 }
-function harnessIssueNote(runtime, status2) {
+function harnessIssueNote(runtime, status2, install = companionInstall()) {
   const intent = HARNESS_INTENT_WORD[runtime];
   const capitalized = `${intent[0].toUpperCase()}${intent.slice(1)}`;
-  return `${capitalized}, but @cabane/companion's bundled ${HARNESS_LABEL[runtime]} ${missingNoun(status2)} is missing. ${repairAction()} Then restart the companion.`;
+  return `${capitalized}, but @cabane/companion's bundled ${HARNESS_LABEL[runtime]} ${missingNoun(status2)} is missing. ${repairAction(install)} Then restart the companion.`;
 }
 function turnIncompleteCopy(runtime) {
   return `**This device's ${HARNESS_LABEL[runtime]} runtime is incomplete.** ${repairAction()} Restart it, then try again.`;
 }
-var CLAUDE_SDK, CODEX_SDK, CODEX_CLI, CODEX_PACKAGE_BY_TRIPLE, HARNESS_LABEL, HARNESS_INTENT_WORD;
+var CLAUDE_SDK, CODEX_SDK, CODEX_CLI, CODEX_PACKAGE_BY_TRIPLE, HARNESS_LABEL, HARNESS_INTENT_WORD, INSTALL_SCRIPT_COMMAND;
 var init_bundled_binaries = __esm({
   "src/bundled-binaries.ts"() {
     "use strict";
@@ -782,12 +794,13 @@ var init_bundled_binaries = __esm({
       "claude-code": "connected",
       codex: "enabled"
     };
+    INSTALL_SCRIPT_COMMAND = "curl -fsSL https://cabane.ai/install.sh | bash";
   }
 });
 
 // src/term.ts
 import { createInterface } from "readline";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import pc from "picocolors";
 function isInteractive() {
   return Boolean(process.stdin.isTTY && process.stdout.isTTY);
@@ -800,7 +813,7 @@ function blank() {
   process.stdout.write("\n");
 }
 function tildePath(path) {
-  const home = homedir2();
+  const home = homedir3();
   if (home && path.startsWith(home + "/")) return `~${path.slice(home.length)}`;
   return path;
 }
@@ -2543,8 +2556,8 @@ var init_policy = __esm({
 // packages/agent-runtime/src/claude-code/model.ts
 function parseClaudeCodeModel(model) {
   if (!model) return null;
-  const sep3 = model.indexOf("/");
-  const bare = sep3 === -1 || model.slice(0, sep3) !== "anthropic" ? model : model.slice(sep3 + 1);
+  const sep4 = model.indexOf("/");
+  const bare = sep4 === -1 || model.slice(0, sep4) !== "anthropic" ? model : model.slice(sep4 + 1);
   return bare === CLAUDE_CODE_DEFAULT_MODEL_BARE ? null : model;
 }
 var CLAUDE_CODE_DEFAULT_MODEL_BARE;
@@ -4097,9 +4110,9 @@ var init_policy2 = __esm({
 
 // packages/agent-runtime/src/opencode/model.ts
 function parseOpencodeModel(model) {
-  const sep3 = model.indexOf("/");
-  if (sep3 === -1) return { providerID: "", modelID: model };
-  return { providerID: model.slice(0, sep3), modelID: model.slice(sep3 + 1) };
+  const sep4 = model.indexOf("/");
+  if (sep4 === -1) return { providerID: "", modelID: model };
+  return { providerID: model.slice(0, sep4), modelID: model.slice(sep4 + 1) };
 }
 var init_model2 = __esm({
   "packages/agent-runtime/src/opencode/model.ts"() {
@@ -4400,10 +4413,10 @@ async function* parseSseStream(body, sessionId, signal) {
       const { value, done } = await reader.read();
       if (done) return;
       buf += decoder.decode(value, { stream: true });
-      let sep3;
-      while ((sep3 = buf.indexOf("\n\n")) !== -1) {
-        const frame = buf.slice(0, sep3);
-        buf = buf.slice(sep3 + 2);
+      let sep4;
+      while ((sep4 = buf.indexOf("\n\n")) !== -1) {
+        const frame = buf.slice(0, sep4);
+        buf = buf.slice(sep4 + 2);
         const data = frame.split("\n").filter((l) => l.startsWith("data:")).map((l) => l.slice(5).trim()).join("");
         if (!data) continue;
         let ev;
@@ -5414,8 +5427,8 @@ var init_policy3 = __esm({
 
 // packages/agent-runtime/src/codex/model.ts
 function parseCodexModel(model) {
-  const sep3 = model.indexOf("/");
-  const bare = sep3 === -1 || model.slice(0, sep3) !== "openai" ? model : model.slice(sep3 + 1);
+  const sep4 = model.indexOf("/");
+  const bare = sep4 === -1 || model.slice(0, sep4) !== "openai" ? model : model.slice(sep4 + 1);
   return CODEX_DEFAULT_MODEL_BARES.has(bare) ? null : bare;
 }
 var CODEX_DEFAULT_MODEL_BARES;
@@ -10232,6 +10245,23 @@ var init_dispatcher = __esm({
         }
         return true;
       }
+      // Abort every run in flight in THIS process, whatever its conversation. For
+      // an agent taken off this device: nothing it is still running here is
+      // legitimate, and a cancel frame that arrives after it is dropped from the
+      // roster finds no dispatcher to reach. True if any was aborted.
+      cancelAll() {
+        let aborted = false;
+        for (const pair2 of this.aborts.values()) {
+          for (const ac of [...pair2.values()]) {
+            try {
+              ac.abort();
+              aborted = true;
+            } catch {
+            }
+          }
+        }
+        return aborted;
+      }
     };
   }
 });
@@ -10493,8 +10523,8 @@ import {
 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { isIP } from "net";
-import { homedir as homedir3, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
-import { dirname as dirname8, join as join19, sep as sep2 } from "path";
+import { homedir as homedir4, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
+import { dirname as dirname8, join as join19, sep as sep3 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { SandboxManager } from "@anthropic-ai/sandbox-runtime";
 function accountHome() {
@@ -10620,13 +10650,13 @@ function companionStoreWatch(log) {
   return new CompanionStoreWatch({
     log,
     roots: () => {
-      const home = homedir3();
+      const home = homedir4();
       return storeWalkRoots([.../* @__PURE__ */ new Set([home, accountHome() ?? home])], cabaneDir());
     }
   });
 }
 function isAtOrUnder(path, dir2) {
-  return path === dir2 || path.startsWith(dir2 + sep2);
+  return path === dir2 || path.startsWith(dir2 + sep3);
 }
 function expandHome(path, home) {
   if (path === "~") return home;
@@ -10765,7 +10795,7 @@ async function prepareHarnessSandbox(input) {
       baseUrl: input.baseUrl,
       resolved: await resolvedAddresses(input.baseUrl),
       ownAddresses: ownAddresses(),
-      home: homedir3(),
+      home: homedir4(),
       accountHome: accountHome(),
       tmp: tmpdir4(),
       cabaneDir: cabaneDir(),
@@ -11797,7 +11827,7 @@ function runtimeIssuesFor(gates) {
   for (const name of ["claude-code", "codex"]) {
     const gate = name === "codex" ? gates.codex : gates.claudeCode;
     if (!gate.intended || gate.bundled === "present") continue;
-    issues.push({ name, reason: gate.bundled });
+    issues.push({ name, reason: gate.bundled, install: gates.install });
   }
   return issues;
 }
@@ -13994,7 +14024,7 @@ function publishStaged(from, to, move = atomicMove) {
 // src/providers/runner-base.ts
 import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync12, realpathSync as realpathSync2 } from "fs";
-import { dirname as dirname7, join as join17, sep } from "path";
+import { dirname as dirname7, join as join17, sep as sep2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var COMPANION_MOUNT = "/opt/cabane/companion";
 var BASE_DOCKERFILE = `FROM node:22-slim
@@ -14049,7 +14079,7 @@ function ownInstall(moduleFile = fileURLToPath3(import.meta.url)) {
   const sdk = join17(dir2, "node_modules", "@anthropic-ai", "claude-agent-sdk");
   if (!existsSync12(sdk)) return null;
   const root = realpathSync2(dir2);
-  return realpathSync2(sdk).startsWith(root + sep) ? root : null;
+  return realpathSync2(sdk).startsWith(root + sep2) ? root : null;
 }
 function companionSource(input) {
   if (input.configured) {
@@ -15738,6 +15768,12 @@ var CompanionSupervisor = class {
   removeAgent(wr, agentId) {
     const runner = wr.agents.get(agentId);
     if (!runner) return;
+    if (runner.dispatcher.cancelAll()) {
+      this.log.info(
+        { workspaceId: wr.workspaceId, agentId },
+        `Stopped ${runner.displayName}'s running turns (no longer on this device)`
+      );
+    }
     runner.cancelDrain();
     wr.agents.delete(agentId);
     this.hub.removeAgent(wr.workspaceId, agentId);
@@ -15778,7 +15814,8 @@ var CompanionSupervisor = class {
         intended: isClaudeCodeConnected(this.config),
         bundled: this.bundledStatus("claude-code")
       },
-      codex: { intended: isCodexEnabled(this.config), bundled: this.bundledStatus("codex") }
+      codex: { intended: isCodexEnabled(this.config), bundled: this.bundledStatus("codex") },
+      install: companionInstall()
     });
   }
   // A missing binary is reported ONCE, and again only when the answer CHANGES,

package/dist/postinstall.js

@@ -1,7 +1,8 @@
 // src/bundled-binaries.ts
 import { realpathSync, statSync } from "fs";
 import { createRequire } from "module";
-import { dirname, join } from "path";
+import { homedir } from "os";
+import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
 function nodeResolveSelf(specifier) {
   const here = fileURLToPath(import.meta.url);
@@ -178,11 +179,23 @@ var HARNESS_LABEL = {
 function missingNoun(status) {
   return status === "executable_missing" ? "executable" : "platform package";
 }
-function repairCommands() {
-  return ["npm i -g @cabane/companion --include=optional"];
+var INSTALL_SCRIPT_COMMAND = "curl -fsSL https://cabane.ai/install.sh | bash";
+function companionInstall(execPath = process.execPath, home = homedir()) {
+  const real = (path) => {
+    try {
+      return realpathSync(path);
+    } catch {
+      return path;
+    }
+  };
+  const scriptNode = join(real(home), ".cabane", "node") + sep;
+  return real(execPath).startsWith(scriptNode) ? "script" : "npm";
+}
+function repairCommands(install = companionInstall()) {
+  return install === "script" ? [INSTALL_SCRIPT_COMMAND] : ["npm i -g @cabane/companion --include=optional"];
 }
-function repairAction() {
-  return `Reinstall with \`${repairCommands()[0]}\`.`;
+function repairAction(install = companionInstall()) {
+  return `Reinstall with \`${repairCommands(install)[0]}\`.`;
 }
 function installWarning(r) {
   return `warning: @cabane/companion is incomplete: its bundled ${HARNESS_LABEL[r.runtime]} ${missingNoun(r.status)} for ${r.platform}-${r.arch} is missing. ${repairAction()}`;

package/dist/runtime.js

@@ -602,7 +602,8 @@ async function safe(fn) {
 // src/bundled-binaries.ts
 import { realpathSync, statSync } from "fs";
 import { createRequire } from "module";
-import { dirname as dirname2, join as join2 } from "path";
+import { homedir as homedir2 } from "os";
+import { dirname as dirname2, join as join2, sep } from "path";
 import { fileURLToPath } from "url";
 function nodeResolveSelf(specifier) {
   const here = fileURLToPath(import.meta.url);
@@ -777,20 +778,32 @@ var HARNESS_INTENT_WORD = {
 function missingNoun(status) {
   return status === "executable_missing" ? "executable" : "platform package";
 }
-function repairCommands() {
-  return ["npm i -g @cabane/companion --include=optional"];
+var INSTALL_SCRIPT_COMMAND = "curl -fsSL https://cabane.ai/install.sh | bash";
+function companionInstall(execPath = process.execPath, home = homedir2()) {
+  const real = (path) => {
+    try {
+      return realpathSync(path);
+    } catch {
+      return path;
+    }
+  };
+  const scriptNode = join2(real(home), ".cabane", "node") + sep;
+  return real(execPath).startsWith(scriptNode) ? "script" : "npm";
+}
+function repairCommands(install = companionInstall()) {
+  return install === "script" ? [INSTALL_SCRIPT_COMMAND] : ["npm i -g @cabane/companion --include=optional"];
 }
-function repairAction() {
-  return `Reinstall with \`${repairCommands()[0]}\`.`;
+function repairAction(install = companionInstall()) {
+  return `Reinstall with \`${repairCommands(install)[0]}\`.`;
 }
 function startupWarning(r) {
   const label = HARNESS_LABEL[r.runtime];
   return `${label} is ${HARNESS_INTENT_WORD[r.runtime]}, but its installation is incomplete (${missingNoun(r.status)} is missing). It cannot run turns until repaired. ${repairAction()} Then restart the companion.`;
 }
-function harnessIssueNote(runtime, status) {
+function harnessIssueNote(runtime, status, install = companionInstall()) {
   const intent = HARNESS_INTENT_WORD[runtime];
   const capitalized = `${intent[0].toUpperCase()}${intent.slice(1)}`;
-  return `${capitalized}, but @cabane/companion's bundled ${HARNESS_LABEL[runtime]} ${missingNoun(status)} is missing. ${repairAction()} Then restart the companion.`;
+  return `${capitalized}, but @cabane/companion's bundled ${HARNESS_LABEL[runtime]} ${missingNoun(status)} is missing. ${repairAction(install)} Then restart the companion.`;
 }
 function turnIncompleteCopy(runtime) {
   return `**This device's ${HARNESS_LABEL[runtime]} runtime is incomplete.** ${repairAction()} Restart it, then try again.`;
@@ -819,7 +832,7 @@ function runtimeIssuesFor(gates) {
   for (const name of ["claude-code", "codex"]) {
     const gate = name === "codex" ? gates.codex : gates.claudeCode;
     if (!gate.intended || gate.bundled === "present") continue;
-    issues.push({ name, reason: gate.bundled });
+    issues.push({ name, reason: gate.bundled, install: gates.install });
   }
   return issues;
 }
@@ -3951,8 +3964,8 @@ function readThinking(runtimeOptions) {
 var CLAUDE_CODE_DEFAULT_MODEL_BARE = "default";
 function parseClaudeCodeModel(model) {
   if (!model) return null;
-  const sep3 = model.indexOf("/");
-  const bare = sep3 === -1 || model.slice(0, sep3) !== "anthropic" ? model : model.slice(sep3 + 1);
+  const sep4 = model.indexOf("/");
+  const bare = sep4 === -1 || model.slice(0, sep4) !== "anthropic" ? model : model.slice(sep4 + 1);
   return bare === CLAUDE_CODE_DEFAULT_MODEL_BARE ? null : model;
 }
 
@@ -5407,9 +5420,9 @@ function readOpencodeDialect(runtimeOptions) {
 
 // packages/agent-runtime/src/opencode/model.ts
 function parseOpencodeModel(model) {
-  const sep3 = model.indexOf("/");
-  if (sep3 === -1) return { providerID: "", modelID: model };
-  return { providerID: model.slice(0, sep3), modelID: model.slice(sep3 + 1) };
+  const sep4 = model.indexOf("/");
+  if (sep4 === -1) return { providerID: "", modelID: model };
+  return { providerID: model.slice(0, sep4), modelID: model.slice(sep4 + 1) };
 }
 
 // packages/agent-runtime/src/opencode/run-spec.ts
@@ -5697,10 +5710,10 @@ async function* parseSseStream(body, sessionId, signal) {
       const { value, done } = await reader.read();
       if (done) return;
       buf += decoder.decode(value, { stream: true });
-      let sep3;
-      while ((sep3 = buf.indexOf("\n\n")) !== -1) {
-        const frame = buf.slice(0, sep3);
-        buf = buf.slice(sep3 + 2);
+      let sep4;
+      while ((sep4 = buf.indexOf("\n\n")) !== -1) {
+        const frame = buf.slice(0, sep4);
+        buf = buf.slice(sep4 + 2);
         const data = frame.split("\n").filter((l) => l.startsWith("data:")).map((l) => l.slice(5).trim()).join("");
         if (!data) continue;
         let ev;
@@ -6640,8 +6653,8 @@ function readCodexDialect(runtimeOptions) {
 // packages/agent-runtime/src/codex/model.ts
 var CODEX_DEFAULT_MODEL_BARES = /* @__PURE__ */ new Set(["default"]);
 function parseCodexModel(model) {
-  const sep3 = model.indexOf("/");
-  const bare = sep3 === -1 || model.slice(0, sep3) !== "openai" ? model : model.slice(sep3 + 1);
+  const sep4 = model.indexOf("/");
+  const bare = sep4 === -1 || model.slice(0, sep4) !== "openai" ? model : model.slice(sep4 + 1);
   return CODEX_DEFAULT_MODEL_BARES.has(bare) ? null : bare;
 }
 
@@ -9158,10 +9171,10 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
 
 // src/term.ts
 import { createInterface as createInterface2 } from "readline";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import pc from "picocolors";
 function tildePath(path) {
-  const home = homedir2();
+  const home = homedir3();
   if (home && path.startsWith(home + "/")) return `~${path.slice(home.length)}`;
   return path;
 }
@@ -11196,6 +11209,23 @@ var Dispatcher = class {
     }
     return true;
   }
+  // Abort every run in flight in THIS process, whatever its conversation. For
+  // an agent taken off this device: nothing it is still running here is
+  // legitimate, and a cancel frame that arrives after it is dropped from the
+  // roster finds no dispatcher to reach. True if any was aborted.
+  cancelAll() {
+    let aborted = false;
+    for (const pair of this.aborts.values()) {
+      for (const ac of [...pair.values()]) {
+        try {
+          ac.abort();
+          aborted = true;
+        } catch {
+        }
+      }
+    }
+    return aborted;
+  }
 };
 
 // src/providers/local-process.ts
@@ -11570,7 +11600,7 @@ function publishStaged(from, to, move = atomicMove) {
 // src/providers/runner-base.ts
 import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync12, realpathSync as realpathSync2 } from "fs";
-import { dirname as dirname7, join as join17, sep } from "path";
+import { dirname as dirname7, join as join17, sep as sep2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var COMPANION_MOUNT = "/opt/cabane/companion";
 var BASE_DOCKERFILE = `FROM node:22-slim
@@ -11625,7 +11655,7 @@ function ownInstall(moduleFile = fileURLToPath3(import.meta.url)) {
   const sdk = join17(dir2, "node_modules", "@anthropic-ai", "claude-agent-sdk");
   if (!existsSync12(sdk)) return null;
   const root = realpathSync2(dir2);
-  return realpathSync2(sdk).startsWith(root + sep) ? root : null;
+  return realpathSync2(sdk).startsWith(root + sep2) ? root : null;
 }
 function companionSource(input) {
   if (input.configured) {
@@ -12659,8 +12689,8 @@ import {
 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { isIP } from "net";
-import { homedir as homedir3, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
-import { dirname as dirname8, join as join19, sep as sep2 } from "path";
+import { homedir as homedir4, networkInterfaces, tmpdir as tmpdir4, userInfo as userInfo2 } from "os";
+import { dirname as dirname8, join as join19, sep as sep3 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { SandboxManager } from "@anthropic-ai/sandbox-runtime";
 function accountHome() {
@@ -12757,13 +12787,13 @@ function companionStoreWatch(log) {
   return new CompanionStoreWatch({
     log,
     roots: () => {
-      const home = homedir3();
+      const home = homedir4();
       return storeWalkRoots([.../* @__PURE__ */ new Set([home, accountHome() ?? home])], cabaneDir());
     }
   });
 }
 function isAtOrUnder(path, dir2) {
-  return path === dir2 || path.startsWith(dir2 + sep2);
+  return path === dir2 || path.startsWith(dir2 + sep3);
 }
 function osSandboxUsable(log) {
   if (!SandboxManager.isSupportedPlatform()) {
@@ -13612,6 +13642,12 @@ var CompanionSupervisor = class {
   removeAgent(wr, agentId) {
     const runner = wr.agents.get(agentId);
     if (!runner) return;
+    if (runner.dispatcher.cancelAll()) {
+      this.log.info(
+        { workspaceId: wr.workspaceId, agentId },
+        `Stopped ${runner.displayName}'s running turns (no longer on this device)`
+      );
+    }
     runner.cancelDrain();
     wr.agents.delete(agentId);
     this.hub.removeAgent(wr.workspaceId, agentId);
@@ -13652,7 +13688,8 @@ var CompanionSupervisor = class {
         intended: isClaudeCodeConnected(this.config),
         bundled: this.bundledStatus("claude-code")
       },
-      codex: { intended: isCodexEnabled(this.config), bundled: this.bundledStatus("codex") }
+      codex: { intended: isCodexEnabled(this.config), bundled: this.bundledStatus("codex") },
+      install: companionInstall()
     });
   }
   // A missing binary is reported ONCE, and again only when the answer CHANGES,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.153",
+  "version": "0.6.155",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding 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",