@cabane/companion 0.6.159 → 0.6.160

package/dist/launch.js

@@ -6,23 +6,13 @@ import { pathToFileURL } from "url";
 // src/cabane-command.ts
 import { accessSync, constants, realpathSync as realpathSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { delimiter, join as join2, sep as sep2 } from "path";
+import { basename, delimiter, dirname as dirname2, join as join2, sep as sep2 } from "path";
 
-// src/bundled-binaries.ts
-import { realpathSync, statSync } from "fs";
-import { createRequire } from "module";
+// src/install-kind.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
-var CODEX_CLI = "@openai/codex";
-var CODEX_PACKAGE_BY_TRIPLE = {
-  "x86_64-unknown-linux-musl": `${CODEX_CLI}-linux-x64`,
-  "aarch64-unknown-linux-musl": `${CODEX_CLI}-linux-arm64`,
-  "x86_64-apple-darwin": `${CODEX_CLI}-darwin-x64`,
-  "aarch64-apple-darwin": `${CODEX_CLI}-darwin-arm64`,
-  "x86_64-pc-windows-msvc": `${CODEX_CLI}-win32-x64`,
-  "aarch64-pc-windows-msvc": `${CODEX_CLI}-win32-arm64`
-};
 
 // src/cli-entry.ts
 import { existsSync } from "fs";
@@ -33,6 +23,9 @@ import { createInterface } from "readline";
 import { homedir as homedir2 } from "os";
 import pc from "picocolors";
 
+// src/cabane-command.ts
+var VERSIONS_SEGMENT = `${sep2}.cabane${sep2}versions${sep2}`;
+
 // src/config.ts
 import {
   chmodSync,
@@ -44,7 +37,7 @@ import {
   existsSync as existsSync2
 } from "fs";
 import { homedir as homedir4, userInfo } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname3, join as join3 } from "path";
 import { z as z2 } from "zod";
 
 // src/pairing.ts
@@ -287,13 +280,13 @@ import {
   rmSync as rmSync2,
   symlinkSync
 } from "fs";
-import { dirname as dirname3, join as join4 } from "path";
+import { dirname as dirname4, join as join4 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function currentLink() {
   return join4(cabaneDir(), "current");
 }
 function ownPackageRoot(moduleUrl = import.meta.url) {
-  return dirname3(dirname3(fileURLToPath3(moduleUrl)));
+  return dirname4(dirname4(fileURLToPath3(moduleUrl)));
 }
 function packageVersion(root) {
   try {
@@ -313,7 +306,7 @@ function currentRoot() {
 }
 function pointCurrentAt(root) {
   const link = currentLink();
-  mkdirSync2(dirname3(link), { recursive: true });
+  mkdirSync2(dirname4(link), { recursive: true });
   const fresh = `${link}.${process.pid}.${Date.now()}`;
   symlinkSync(root, fresh);
   try {

package/dist/pairing-config.js

@@ -1,23 +1,13 @@
 // src/cabane-command.ts
 import { accessSync, constants, realpathSync as realpathSync2 } from "fs";
 import { homedir as homedir3 } from "os";
-import { delimiter, join as join2, sep as sep2 } from "path";
+import { basename, delimiter, dirname as dirname2, join as join2, sep as sep2 } from "path";
 
-// src/bundled-binaries.ts
-import { realpathSync, statSync } from "fs";
-import { createRequire } from "module";
+// src/install-kind.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
-var CODEX_CLI = "@openai/codex";
-var CODEX_PACKAGE_BY_TRIPLE = {
-  "x86_64-unknown-linux-musl": `${CODEX_CLI}-linux-x64`,
-  "aarch64-unknown-linux-musl": `${CODEX_CLI}-linux-arm64`,
-  "x86_64-apple-darwin": `${CODEX_CLI}-darwin-x64`,
-  "aarch64-apple-darwin": `${CODEX_CLI}-darwin-arm64`,
-  "x86_64-pc-windows-msvc": `${CODEX_CLI}-win32-x64`,
-  "aarch64-pc-windows-msvc": `${CODEX_CLI}-win32-arm64`
-};
 function companionInstall(execPath = process.execPath, home = homedir()) {
   const real = (path) => {
     try {
@@ -55,15 +45,27 @@ function tildePath(path, home = homedir2()) {
 }
 
 // src/cabane-command.ts
+var INVOKED_COMMAND_ENV = "CABANE_INVOKED_COMMAND";
+var VERSIONS_SEGMENT = `${sep2}.cabane${sep2}versions${sep2}`;
 function installedCommandPath(deps = {}) {
   const install = deps.install ?? companionInstall();
   const home = deps.home ?? homedir3();
   if (install === "script") return join2(home, ".cabane", "bin", "cabane");
   const entry = deps.cliEntry ?? companionCliEntry();
+  const own = npmBinFor(entry);
+  if (own) return own;
+  if (!entry.includes(VERSIONS_SEGMENT)) return null;
+  const isExecutable = deps.isExecutable ?? executable;
+  const invoked = "invoked" in deps ? deps.invoked : process.env[INVOKED_COMMAND_ENV];
+  if (invoked && isExecutable(invoked)) return invoked;
+  const besideNode = join2(dirname2(dirname2(deps.execPath ?? process.execPath)), "bin", "cabane");
+  return isExecutable(besideNode) ? besideNode : null;
+}
+function npmBinFor(path) {
   const marker = `${sep2}lib${sep2}node_modules${sep2}@cabane${sep2}companion${sep2}`;
-  const at = entry.indexOf(marker);
+  const at = path.indexOf(marker);
   if (at < 0) return null;
-  return join2(entry.slice(0, at), "bin", "cabane");
+  return join2(path.slice(0, at), "bin", "cabane");
 }
 function cabaneCommand(deps = {}) {
   const own = installedCommandPath(deps);
@@ -114,7 +116,7 @@ import {
   existsSync as existsSync2
 } from "fs";
 import { homedir as homedir4, userInfo } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname3, join as join3 } from "path";
 import { z as z2 } from "zod";
 
 // src/errors.ts
@@ -488,7 +490,7 @@ function loadConfigTolerant() {
 }
 function saveConfig(cfg) {
   const path = configPath();
-  mkdirSync(dirname2(path), { recursive: true });
+  mkdirSync(dirname3(path), { recursive: true });
   try {
     chmodSync(cabaneDir(), 448);
   } catch {

package/dist/postinstall.js

@@ -1,14 +1,134 @@
 // src/bundled-binaries.ts
-import { realpathSync, statSync } from "fs";
+import { realpathSync as realpathSync3, statSync } from "fs";
 import { createRequire } from "module";
+import { dirname as dirname3, join as join3 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
+
+// src/cabane-command.ts
+import { accessSync, constants, realpathSync as realpathSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { basename, delimiter, dirname as dirname2, join as join2, sep as sep2 } from "path";
+
+// src/install-kind.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
+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 repairRoute(packageRoot = ownRoot(), install = companionInstall()) {
+  let root = packageRoot;
+  try {
+    root = realpathSync(packageRoot);
+  } catch {
+  }
+  return root.includes(`${sep}.cabane${sep}versions${sep}`) ? "managed" : install;
+}
+function ownRoot() {
+  return dirname(dirname(fileURLToPath(import.meta.url)));
+}
+
+// src/cli-entry.ts
+import { existsSync } from "fs";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var RELATIVE_CANDIDATES = ["./cli.js", "../dist/cli.js", "../cli.js"];
+function companionCliEntry(deps = {}) {
+  const exists = deps.exists ?? existsSync;
+  const candidates = deps.candidates ?? RELATIVE_CANDIDATES.map((rel) => fileURLToPath2(new URL(rel, import.meta.url)));
+  for (const candidate of candidates) {
+    if (exists(candidate)) return candidate;
+  }
+  const argv1 = "argv1" in deps ? deps.argv1 : process.argv[1];
+  if (argv1 && exists(argv1)) return argv1;
+  return candidates[0] ?? "";
+}
+
+// src/term.ts
+import { createInterface } from "readline";
+import { homedir as homedir2 } from "os";
+import pc from "picocolors";
+function tildePath(path, home = homedir2()) {
+  if (home && path.startsWith(home + "/")) return `~${path.slice(home.length)}`;
+  return path;
+}
+
+// src/cabane-command.ts
+var INVOKED_COMMAND_ENV = "CABANE_INVOKED_COMMAND";
+var VERSIONS_SEGMENT = `${sep2}.cabane${sep2}versions${sep2}`;
+function installedCommandPath(deps = {}) {
+  const install = deps.install ?? companionInstall();
+  const home = deps.home ?? homedir3();
+  if (install === "script") return join2(home, ".cabane", "bin", "cabane");
+  const entry = deps.cliEntry ?? companionCliEntry();
+  const own = npmBinFor(entry);
+  if (own) return own;
+  if (!entry.includes(VERSIONS_SEGMENT)) return null;
+  const isExecutable = deps.isExecutable ?? executable;
+  const invoked = "invoked" in deps ? deps.invoked : process.env[INVOKED_COMMAND_ENV];
+  if (invoked && isExecutable(invoked)) return invoked;
+  const besideNode = join2(dirname2(dirname2(deps.execPath ?? process.execPath)), "bin", "cabane");
+  return isExecutable(besideNode) ? besideNode : null;
+}
+function npmBinFor(path) {
+  const marker = `${sep2}lib${sep2}node_modules${sep2}@cabane${sep2}companion${sep2}`;
+  const at = path.indexOf(marker);
+  if (at < 0) return null;
+  return join2(path.slice(0, at), "bin", "cabane");
+}
+function cabaneCommand(deps = {}) {
+  const own = installedCommandPath(deps);
+  if (!own) return "cabane";
+  const realpath = deps.realpath ?? safeRealpath;
+  const isExecutable = deps.isExecutable ?? executable;
+  const ownReal = realpath(own);
+  if (!ownReal) return "cabane";
+  const onPath = firstOnPath("cabane", "path" in deps ? deps.path : process.env.PATH, isExecutable);
+  if (onPath && realpath(onPath) === ownReal) return "cabane";
+  return tildePath(own, deps.home);
+}
+function cabane(rest, deps) {
+  return `${cabaneCommand(deps)} ${rest}`;
+}
+function firstOnPath(name, path, isExecutable = executable) {
+  for (const dir of (path ?? "").split(delimiter)) {
+    if (!dir) continue;
+    const candidate = join2(dir, name);
+    if (isExecutable(candidate)) return candidate;
+  }
+  return null;
+}
+function executable(path) {
+  try {
+    accessSync(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function safeRealpath(path) {
+  try {
+    return realpathSync2(path);
+  } catch {
+    return null;
+  }
+}
+
+// src/bundled-binaries.ts
 function nodeResolveSelf(specifier) {
-  const here = fileURLToPath(import.meta.url);
+  const here = fileURLToPath3(import.meta.url);
   if (typeof import.meta.resolve === "function") {
     try {
-      return fileURLToPath(import.meta.resolve(specifier));
+      return fileURLToPath3(import.meta.resolve(specifier));
     } catch {
     }
   }
@@ -19,17 +139,17 @@ function nodeResolveSelf(specifier) {
   return walkNodeModules(specifier, here);
 }
 function walkNodeModules(pkg, fromPath) {
-  let dir = dirname(fromPath);
+  let dir = dirname3(fromPath);
   for (; ; ) {
-    const manifest = join(dir, "node_modules", pkg, "package.json");
+    const manifest = join3(dir, "node_modules", pkg, "package.json");
     if (nodeIsFile(manifest)) {
       try {
-        return realpathSync(manifest);
+        return realpathSync3(manifest);
       } catch {
         return manifest;
       }
     }
-    const parent = dirname(dir);
+    const parent = dirname3(dir);
     if (parent === dir) return null;
     dir = parent;
   }
@@ -91,7 +211,7 @@ function resolveClaude(env) {
     const manifest = env.resolve(`${pkg}/package.json`, sdkEntry);
     if (!manifest) continue;
     sawPackage ??= pkg;
-    const exe = join(dirname(manifest), env.platform === "win32" ? "claude.exe" : "claude");
+    const exe = join3(dirname3(manifest), env.platform === "win32" ? "claude.exe" : "claude");
     if (env.isFile(exe)) {
       return { ...base, packageName: pkg, status: "present", path: exe };
     }
@@ -142,13 +262,13 @@ function resolveCodex(env) {
   if (!cliManifest) return { ...base, status: "platform_package_missing", path: null };
   const platformManifest = env.resolve(`${pkg}/package.json`, cliManifest);
   if (!platformManifest) return { ...base, status: "platform_package_missing", path: null };
-  const packageRoot = join(dirname(platformManifest), "vendor", triple);
+  const packageRoot = join3(dirname3(platformManifest), "vendor", triple);
   const exeName = env.platform === "win32" ? "codex.exe" : "codex";
-  const current = join(packageRoot, "bin", exeName);
-  if (env.isFile(current) && env.isFile(join(packageRoot, "codex-package.json"))) {
+  const current = join3(packageRoot, "bin", exeName);
+  if (env.isFile(current) && env.isFile(join3(packageRoot, "codex-package.json"))) {
     return { ...base, status: "present", path: current };
   }
-  const legacy = join(packageRoot, "codex", exeName);
+  const legacy = join3(packageRoot, "codex", exeName);
   if (env.isFile(legacy)) return { ...base, status: "present", path: legacy };
   return { ...base, status: "executable_missing", path: null };
 }
@@ -179,24 +299,17 @@ var HARNESS_LABEL = {
 function missingNoun(status) {
   return status === "executable_missing" ? "executable" : "platform package";
 }
-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 repairCommands(route = repairRoute(), spell = cabane) {
+  if (route === "managed") return [spell("stop"), spell("update")];
+  if (route === "script") return [spell("stop"), INSTALL_SCRIPT_COMMAND];
+  return ["npm i -g @cabane/companion --include=optional"];
 }
-function repairAction(install = companionInstall()) {
-  return `Reinstall with \`${repairCommands(install)[0]}\`.`;
+function repairAction(route = repairRoute(), spell = cabane) {
+  const [first, ...rest] = repairCommands(route, spell);
+  if (rest.length === 0) return `Reinstall with \`${first}\`.`;
+  return `Run \`${first}\`, then \`${rest.join("`, then `")}\`. ${STOP_WARNING}`;
 }
+var STOP_WARNING = "Stopping ends any turn in progress.";
 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()}`;
 }