@cabane/companion 0.6.2 → 0.6.4

package/README.md

@@ -52,7 +52,7 @@ On your machine, start the short-code pairing flow:
 
 ```sh
 cabane-companion pair
-# Enter this code at https://cabane.ai/settings/companions
+# Enter this code at https://app.cabane.ai/settings/companions
 #
 #     ABCD-EFGH
 #

package/dist/cli.js

@@ -900,7 +900,7 @@ async function postJson(baseUrl, path3, body) {
   if (res.status >= 400) {
     if (res.status === 404 && path3.endsWith("/code")) {
       throw new CompanionError(
-        `this cabane server (${baseUrl}) doesn't support device-flow pairing yet. Update the server to a version that supports \`cabane-companion pair\`.`
+        `no device-flow pairing endpoint at ${baseUrl}. Either that server predates \`cabane-companion pair\`, or it isn't a Cabane API origin \u2014 the hosted app is https://app.cabane.ai (pass \`--server <url>\` for your own instance).`
       );
     }
     const msg = parsed && typeof parsed === "object" && "error" in parsed ? String(parsed.error) : `${res.status}`;
@@ -959,7 +959,7 @@ async function runDeviceFlow(baseUrl, print, opts = {}) {
 }
 
 // src/pairing-config.ts
-var DEFAULT_BASE_URL = "https://cabane.ai";
+var DEFAULT_BASE_URL = "https://app.cabane.ai";
 function resolvePairBaseUrl(server) {
   const raw = (server ?? process.env.CABANE_BASE_URL ?? DEFAULT_BASE_URL).trim();
   if (!isAllowedBaseUrl(raw)) {
@@ -7331,7 +7331,10 @@ ${reason}`,
       ...this.opts.local.claudeCode ? { claudeCode: this.opts.local.claudeCode } : {}
     });
     const onWarn = (msg, meta) => turnLog.warn(meta ?? {}, msg);
-    const adapters = [createClaudeCodeAdapter({ queryFn: this.opts.queryFn, onWarn })];
+    const adapters = [];
+    if (this.opts.claudeCodeAvailable?.() ?? true) {
+      adapters.push(createClaudeCodeAdapter({ queryFn: this.opts.queryFn, onWarn }));
+    }
     if (this.opts.opencodeServerUrl) {
       adapters.push(createOpencodeAdapter({ serverUrl: this.opts.opencodeServerUrl, onWarn }));
     }
@@ -8384,7 +8387,7 @@ var CompanionSupervisor = class {
           // until the first re-probe lands. Same exit-0 `claude --version` signal
           // either way, so the manifest's claude-code advertising is unchanged in
           // meaning — just refreshed on the beat instead of frozen at boot.
-          claudeCode: this.harnessSignals?.claudeOnPath ?? this.claudeCode,
+          claudeCode: this.claudeCodePresent(),
           opencode: !!this.config.opencode?.serverUrl,
           // CT481: advertise codex when the operator enabled it (config-gated,
           // like opencode — the CLI's presence is the operator's responsibility;
@@ -8607,6 +8610,13 @@ var CompanionSupervisor = class {
       "companion: stopped agent (unassigned)"
     );
   }
+  // CT833: is Claude Code on this machine right now? The ONE signal both the
+  // heartbeat manifest and the dispatcher's adapter registry read, so what the
+  // device advertises and what it can actually select can't disagree. Live (the
+  // per-beat re-probe), falling back to the boot probe until the first one lands.
+  claudeCodePresent() {
+    return this.harnessSignals?.claudeOnPath ?? this.claudeCode;
+  }
   buildDispatcher(ctx) {
     if (this.dispatcherFactory) return this.dispatcherFactory(ctx);
     return new Dispatcher({
@@ -8624,6 +8634,10 @@ var CompanionSupervisor = class {
       }),
       runConfig: ctx.runConfig,
       log: this.log,
+      // CT833: register the claude-code adapter only when `claude` is actually on
+      // this machine — read per turn (not captured here), so a harness installed
+      // after boot works on the next turn exactly as it appears on the next beat.
+      claudeCodeAvailable: () => this.claudeCodePresent(),
       // CT270: the opencode server URL (operator-configured), when this device
       // offers the opencode runtime. Threaded so an opencode turn selects the
       // opencode adapter; unset leaves the device claude-code-only.
@@ -9801,7 +9815,7 @@ program.name("cabane-companion").description(
 ).version(COMPANION_VERSION);
 program.command("pair").description(
   "pair this device with cabane \u2014 shows a short code you confirm in Settings \u2192 Devices."
-).allowExcessArguments(false).option("--server <url>", "the cabane instance to pair with (default https://cabane.ai)").action(async (opts) => {
+).allowExcessArguments(false).option("--server <url>", "the cabane instance to pair with (default https://app.cabane.ai)").action(async (opts) => {
   await pair({
     ...opts.server !== void 0 ? { server: opts.server } : {}
   });

package/dist/pairing-config.js

@@ -292,7 +292,7 @@ async function postJson(baseUrl, path, body) {
   if (res.status >= 400) {
     if (res.status === 404 && path.endsWith("/code")) {
       throw new CompanionError(
-        `this cabane server (${baseUrl}) doesn't support device-flow pairing yet. Update the server to a version that supports \`cabane-companion pair\`.`
+        `no device-flow pairing endpoint at ${baseUrl}. Either that server predates \`cabane-companion pair\`, or it isn't a Cabane API origin \u2014 the hosted app is https://app.cabane.ai (pass \`--server <url>\` for your own instance).`
       );
     }
     const msg = parsed && typeof parsed === "object" && "error" in parsed ? String(parsed.error) : `${res.status}`;
@@ -351,7 +351,7 @@ async function runDeviceFlow(baseUrl, print, opts = {}) {
 }
 
 // src/pairing-config.ts
-var DEFAULT_BASE_URL = "https://cabane.ai";
+var DEFAULT_BASE_URL = "https://app.cabane.ai";
 function resolvePairBaseUrl(server) {
   const raw = (server ?? process.env.CABANE_BASE_URL ?? DEFAULT_BASE_URL).trim();
   if (!isAllowedBaseUrl(raw)) {

package/dist/runtime.js

@@ -6984,7 +6984,10 @@ ${reason}`,
       ...this.opts.local.claudeCode ? { claudeCode: this.opts.local.claudeCode } : {}
     });
     const onWarn = (msg, meta) => turnLog.warn(meta ?? {}, msg);
-    const adapters = [createClaudeCodeAdapter({ queryFn: this.opts.queryFn, onWarn })];
+    const adapters = [];
+    if (this.opts.claudeCodeAvailable?.() ?? true) {
+      adapters.push(createClaudeCodeAdapter({ queryFn: this.opts.queryFn, onWarn }));
+    }
     if (this.opts.opencodeServerUrl) {
       adapters.push(createOpencodeAdapter({ serverUrl: this.opts.opencodeServerUrl, onWarn }));
     }
@@ -8037,7 +8040,7 @@ var CompanionSupervisor = class {
           // until the first re-probe lands. Same exit-0 `claude --version` signal
           // either way, so the manifest's claude-code advertising is unchanged in
           // meaning — just refreshed on the beat instead of frozen at boot.
-          claudeCode: this.harnessSignals?.claudeOnPath ?? this.claudeCode,
+          claudeCode: this.claudeCodePresent(),
           opencode: !!this.config.opencode?.serverUrl,
           // CT481: advertise codex when the operator enabled it (config-gated,
           // like opencode — the CLI's presence is the operator's responsibility;
@@ -8260,6 +8263,13 @@ var CompanionSupervisor = class {
       "companion: stopped agent (unassigned)"
     );
   }
+  // CT833: is Claude Code on this machine right now? The ONE signal both the
+  // heartbeat manifest and the dispatcher's adapter registry read, so what the
+  // device advertises and what it can actually select can't disagree. Live (the
+  // per-beat re-probe), falling back to the boot probe until the first one lands.
+  claudeCodePresent() {
+    return this.harnessSignals?.claudeOnPath ?? this.claudeCode;
+  }
   buildDispatcher(ctx) {
     if (this.dispatcherFactory) return this.dispatcherFactory(ctx);
     return new Dispatcher({
@@ -8277,6 +8287,10 @@ var CompanionSupervisor = class {
       }),
       runConfig: ctx.runConfig,
       log: this.log,
+      // CT833: register the claude-code adapter only when `claude` is actually on
+      // this machine — read per turn (not captured here), so a harness installed
+      // after boot works on the next turn exactly as it appears on the next beat.
+      claudeCodeAvailable: () => this.claudeCodePresent(),
       // CT270: the opencode server URL (operator-configured), when this device
       // offers the opencode runtime. Threaded so an opencode turn selects the
       // opencode adapter; unset leaves the device claude-code-only.

package/package.json

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