@cabane/companion 0.6.34 → 0.6.35

package/dist/cli.js

@@ -1010,7 +1010,7 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
   try {
     if (runtime === "opencode") {
       const url = cfg.opencode?.serverUrl;
-      if (!url) return "failed";
+      if (!url) return "absent";
       return await probeOpencode(url) !== null ? "ok" : "failed";
     }
     const { auth, presence } = runtime === "codex" ? {
@@ -1020,11 +1020,13 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
       auth: ["claude", ["auth", "status"]],
       presence: ["claude", ["--version"]]
     };
+    const presenceRun = await run(presence[0], [...presence[1]]);
+    if (presenceRun.error === "spawn") return "absent";
+    if (presenceRun.code !== 0) return "unverified";
     const authRun = await run(auth[0], [...auth[1]]);
     if (authRun.code === 0) return "ok";
     if (looksUnsupported(authRun.output)) {
-      const presenceRun = await run(presence[0], [...presence[1]]);
-      return presenceRun.code === 0 ? "unverified" : "failed";
+      return "unverified";
     }
     return "failed";
   } catch {
@@ -1032,6 +1034,7 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
   }
 }
 function connectedLine(runtime, verdict) {
+  if (verdict === "absent") throw new Error("an absent harness cannot be connected");
   const label = HARNESS_LABELS[runtime];
   if (verdict !== "failed") return `${label} connected.`;
   return `${label} connected \u2014 ${FAILED_SUFFIX[runtime]}`;
@@ -1041,6 +1044,14 @@ var FAILED_SUFFIX = {
   codex: "it doesn\u2019t look signed in yet. Run `codex login` once, then it\u2019s ready.",
   opencode: "its server isn\u2019t answering. Start `opencode serve`, then it\u2019s ready."
 };
+function absentLine(runtime) {
+  if (runtime === "opencode") {
+    return "No opencode server is configured \u2014 run `opencode serve` and connect with `--url`.";
+  }
+  const label = HARNESS_LABELS[runtime];
+  const login = runtime === "codex" ? "`codex login`" : "`claude`";
+  return `${label} isn\u2019t installed on this machine \u2014 install it and sign in (${login}), then run this again.`;
+}
 function looksUnsupported(output) {
   return /unrecognized|unknown (sub)?command|unexpected argument|invalid (sub)?command|no such (sub)?command|usage:|did you mean/i.test(
     output
@@ -1049,17 +1060,17 @@ function looksUnsupported(output) {
 function runBounded(command, args) {
   return new Promise((resolve) => {
     let settled = false;
-    const done = (code, output) => {
+    const done = (result) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve({ code, output });
+      resolve(result);
     };
     let child;
     try {
       child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     } catch {
-      resolve({ code: null, output: "" });
+      resolve({ code: null, output: "", error: "spawn" });
       return;
     }
     let out = "";
@@ -1070,11 +1081,11 @@ function runBounded(command, args) {
     child.stderr?.on("data", capture);
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      done(null, out);
+      done({ code: null, output: out, error: "timeout" });
     }, CHECK_TIMEOUT_MS);
     timer.unref?.();
-    child.once("error", () => done(null, out));
-    child.once("exit", (code) => done(code, out));
+    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
+    child.once("exit", (code) => done({ code, output: out }));
   });
 }
 
@@ -1271,11 +1282,23 @@ async function connect2(raw, opts = {}) {
   }
   const live = await liveSocket();
   if (live) {
-    const result = await controlRequest(live, {
-      cmd: "connect",
-      runtime,
-      ...opts.serverUrl ? { serverUrl: opts.serverUrl } : {}
-    });
+    let result;
+    try {
+      result = await controlRequest(
+        live,
+        {
+          cmd: "connect",
+          runtime,
+          ...opts.serverUrl ? { serverUrl: opts.serverUrl } : {}
+        },
+        1e4
+      );
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err);
+      throw new CompanionError(
+        `Couldn\u2019t reach the running companion \u2014 ${detail}; try again, or \`cabane-companion stop\` and \`start\`.`
+      );
+    }
     if (!result.ok) throw new CompanionError(result.message);
     write(INDENT + tick(result.message));
     return;
@@ -1307,8 +1330,9 @@ async function connect2(raw, opts = {}) {
     }
     next = { ...cfg, opencode: { serverUrl } };
   }
-  saveConfig(next);
   const verdict = await shakeOutHarness(runtime, next);
+  if (verdict === "absent") throw new CompanionError(absentLine(runtime));
+  saveConfig(next);
   write(INDENT + tick(connectedLine(runtime, verdict)));
   write(`${INDENT}Not running yet \u2014 start it with: cabane-companion start`);
 }
@@ -1692,21 +1716,39 @@ function consoleMessageFormat(log, messageKey) {
   return short ? `${short} ${msg}` : msg;
 }
 var cached = null;
-function getLogger() {
-  if (cached) return cached;
+var consoleLogging = true;
+function setConsoleLogging(enabled) {
+  consoleLogging = enabled;
+}
+function createLogger(destinations = {}) {
   const path = companionLogPath();
-  mkdirSync5(dirname3(path), { recursive: true });
+  if (!destinations.file) mkdirSync5(dirname3(path), { recursive: true });
   const streams = [];
   if (process.env.CABANE_COMPANION_DAEMON !== "1") {
     const consoleStream = pretty({
       colorize: true,
       ignore: CONSOLE_IGNORE,
-      messageFormat: (log, messageKey) => consoleMessageFormat(log, messageKey)
+      messageFormat: (log, messageKey) => consoleMessageFormat(log, messageKey),
+      ...destinations.console ? { destination: destinations.console } : {}
+    });
+    streams.push({
+      level: "info",
+      stream: {
+        write(chunk) {
+          if (consoleLogging) consoleStream.write(chunk);
+        }
+      }
     });
-    streams.push({ level: "info", stream: consoleStream });
   }
-  streams.push({ level: "debug", stream: createWriteStream(path, { flags: "a" }) });
-  cached = pino({ level: "debug" }, pino.multistream(streams));
+  streams.push({
+    level: "debug",
+    stream: destinations.file ?? createWriteStream(path, { flags: "a" })
+  });
+  return pino({ level: "debug" }, pino.multistream(streams));
+}
+function getLogger() {
+  if (cached) return cached;
+  cached = createLogger();
   return cached;
 }
 
@@ -10201,11 +10243,13 @@ async function createCompanionRuntime(opts = {}) {
   });
   await supervisor.start();
   const connectHarness = async (runtime, serverUrl) => {
+    const candidate = runtime === "opencode" ? { ...supervisor.currentConfig(), opencode: { serverUrl: serverUrl ?? "" } } : supervisor.currentConfig();
+    const verdict = await shakeOutHarness(runtime, candidate);
+    if (verdict === "absent") return { ok: false, error: absentLine(runtime) };
     const result = await supervisor.enableHarness(
       runtime === "opencode" ? { runtime: "opencode", serverUrl: serverUrl ?? "" } : { runtime }
     );
     if (!result.ok) return { ok: false, error: result.error };
-    const verdict = await shakeOutHarness(runtime, supervisor.currentConfig());
     return { ok: true, message: connectedLine(runtime, verdict) };
   };
   const control = await startControlServer({
@@ -10430,6 +10474,15 @@ var DEPLOY_GRACE_MS = 6.5 * 60 * 60 * 1e3;
 var MAX_CODES = 3;
 async function start(opts = {}) {
   const interactive = isInteractive();
+  if (!interactive) return startScript(opts, false);
+  setConsoleLogging(false);
+  try {
+    await startScript(opts, true);
+  } finally {
+    setConsoleLogging(true);
+  }
+}
+async function startScript(opts, interactive) {
   const running = await liveCompanion();
   if (running) {
     reportAlreadyRunning(running.pid);
@@ -10439,7 +10492,9 @@ async function start(opts = {}) {
   let paired = null;
   if (!isDevicePaired()) {
     paired = await pairHere(opts, interactive);
-    if (!paired) return;
+    if (!paired) {
+      return;
+    }
     const { note } = writePairedConfig(paired);
     if (note) getLogger().warn({ note }, "companion: salvaged an older config on pairing");
   }
@@ -10470,6 +10525,7 @@ async function start(opts = {}) {
     write(`    Stop:  Ctrl-C                       Logs:  ${tildePath(companionLogPath())}`);
     blank();
     write(`${INDENT}Listening for messages\u2026`);
+    setConsoleLogging(true);
   } else {
     if (!offered.printedSomething) blank();
     write(
@@ -11242,7 +11298,12 @@ program.parseAsync(process.argv).catch((err) => {
     process.exitCode = 130;
     return;
   }
-  process.stderr.write(`${err instanceof Error ? err.stack ?? err.message : String(err)}
+  setConsoleLogging(false);
+  try {
+    getLogger().error({ err }, "companion: command failed");
+  } catch {
+  }
+  process.stderr.write(`${err instanceof Error ? err.message : String(err)}
 `);
   process.exitCode = 1;
 });

package/dist/runtime.js

@@ -461,21 +461,36 @@ function consoleMessageFormat(log, messageKey) {
   return short ? `${short} ${msg}` : msg;
 }
 var cached = null;
-function getLogger() {
-  if (cached) return cached;
+var consoleLogging = true;
+function createLogger(destinations = {}) {
   const path = companionLogPath();
-  mkdirSync2(dirname2(path), { recursive: true });
+  if (!destinations.file) mkdirSync2(dirname2(path), { recursive: true });
   const streams = [];
   if (process.env.CABANE_COMPANION_DAEMON !== "1") {
     const consoleStream = pretty({
       colorize: true,
       ignore: CONSOLE_IGNORE,
-      messageFormat: (log, messageKey) => consoleMessageFormat(log, messageKey)
+      messageFormat: (log, messageKey) => consoleMessageFormat(log, messageKey),
+      ...destinations.console ? { destination: destinations.console } : {}
+    });
+    streams.push({
+      level: "info",
+      stream: {
+        write(chunk) {
+          if (consoleLogging) consoleStream.write(chunk);
+        }
+      }
     });
-    streams.push({ level: "info", stream: consoleStream });
   }
-  streams.push({ level: "debug", stream: createWriteStream(path, { flags: "a" }) });
-  cached = pino({ level: "debug" }, pino.multistream(streams));
+  streams.push({
+    level: "debug",
+    stream: destinations.file ?? createWriteStream(path, { flags: "a" })
+  });
+  return pino({ level: "debug" }, pino.multistream(streams));
+}
+function getLogger() {
+  if (cached) return cached;
+  cached = createLogger();
   return cached;
 }
 
@@ -1465,7 +1480,7 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
   try {
     if (runtime === "opencode") {
       const url = cfg.opencode?.serverUrl;
-      if (!url) return "failed";
+      if (!url) return "absent";
       return await probeOpencode(url) !== null ? "ok" : "failed";
     }
     const { auth, presence } = runtime === "codex" ? {
@@ -1475,11 +1490,13 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
       auth: ["claude", ["auth", "status"]],
       presence: ["claude", ["--version"]]
     };
+    const presenceRun = await run(presence[0], [...presence[1]]);
+    if (presenceRun.error === "spawn") return "absent";
+    if (presenceRun.code !== 0) return "unverified";
     const authRun = await run(auth[0], [...auth[1]]);
     if (authRun.code === 0) return "ok";
     if (looksUnsupported(authRun.output)) {
-      const presenceRun = await run(presence[0], [...presence[1]]);
-      return presenceRun.code === 0 ? "unverified" : "failed";
+      return "unverified";
     }
     return "failed";
   } catch {
@@ -1487,6 +1504,7 @@ async function shakeOutHarness(runtime, cfg, deps = {}) {
   }
 }
 function connectedLine(runtime, verdict) {
+  if (verdict === "absent") throw new Error("an absent harness cannot be connected");
   const label = HARNESS_LABELS[runtime];
   if (verdict !== "failed") return `${label} connected.`;
   return `${label} connected \u2014 ${FAILED_SUFFIX[runtime]}`;
@@ -1496,6 +1514,14 @@ var FAILED_SUFFIX = {
   codex: "it doesn\u2019t look signed in yet. Run `codex login` once, then it\u2019s ready.",
   opencode: "its server isn\u2019t answering. Start `opencode serve`, then it\u2019s ready."
 };
+function absentLine(runtime) {
+  if (runtime === "opencode") {
+    return "No opencode server is configured \u2014 run `opencode serve` and connect with `--url`.";
+  }
+  const label = HARNESS_LABELS[runtime];
+  const login = runtime === "codex" ? "`codex login`" : "`claude`";
+  return `${label} isn\u2019t installed on this machine \u2014 install it and sign in (${login}), then run this again.`;
+}
 function looksUnsupported(output) {
   return /unrecognized|unknown (sub)?command|unexpected argument|invalid (sub)?command|no such (sub)?command|usage:|did you mean/i.test(
     output
@@ -1504,17 +1530,17 @@ function looksUnsupported(output) {
 function runBounded(command, args) {
   return new Promise((resolve) => {
     let settled = false;
-    const done = (code, output) => {
+    const done = (result) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve({ code, output });
+      resolve(result);
     };
     let child;
     try {
       child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     } catch {
-      resolve({ code: null, output: "" });
+      resolve({ code: null, output: "", error: "spawn" });
       return;
     }
     let out = "";
@@ -1525,11 +1551,11 @@ function runBounded(command, args) {
     child.stderr?.on("data", capture);
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      done(null, out);
+      done({ code: null, output: out, error: "timeout" });
     }, CHECK_TIMEOUT_MS);
     timer.unref?.();
-    child.once("error", () => done(null, out));
-    child.once("exit", (code) => done(code, out));
+    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
+    child.once("exit", (code) => done({ code, output: out }));
   });
 }
 
@@ -9268,11 +9294,13 @@ async function createCompanionRuntime(opts = {}) {
   });
   await supervisor.start();
   const connectHarness = async (runtime, serverUrl) => {
+    const candidate = runtime === "opencode" ? { ...supervisor.currentConfig(), opencode: { serverUrl: serverUrl ?? "" } } : supervisor.currentConfig();
+    const verdict = await shakeOutHarness(runtime, candidate);
+    if (verdict === "absent") return { ok: false, error: absentLine(runtime) };
     const result = await supervisor.enableHarness(
       runtime === "opencode" ? { runtime: "opencode", serverUrl: serverUrl ?? "" } : { runtime }
     );
     if (!result.ok) return { ok: false, error: result.error };
-    const verdict = await shakeOutHarness(runtime, supervisor.currentConfig());
     return { ok: true, message: connectedLine(runtime, verdict) };
   };
   const control = await startControlServer({

package/package.json

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