@cabane/companion 0.6.45 → 0.6.47

package/dist/cli.js

@@ -823,6 +823,7 @@ var HARNESS_LABELS = {
 };
 var LABELS = HARNESS_LABELS;
 var OFFER_ORDER = ["claude-code", "codex", "opencode"];
+var DEFAULT_OPENCODE_SERVER_URL = "http://127.0.0.1:4096";
 function parseHarnessRuntime(raw) {
   const key = raw.trim().toLowerCase().replace(/[\s_]+/g, "-");
   if (key === "claude-code" || key === "claudecode" || key === "claude") return "claude-code";
@@ -941,6 +942,15 @@ function deriveOpencode(signals, manifestHas) {
       enable: null
     };
   }
+  if (signals.opencodeReachable && signals.opencodeDetectedUrl) {
+    return {
+      ...base,
+      state: "detected_not_exposed",
+      version: signals.opencodeVersion,
+      detail: signals.opencodeDetectedUrl,
+      enable: "opencode"
+    };
+  }
   return {
     ...base,
     state: "not_detected",
@@ -950,17 +960,32 @@ function deriveOpencode(signals, manifestHas) {
   };
 }
 var PROBE_TIMEOUT_MS = 4e3;
+var DEFAULT_OPENCODE_PROBE_TIMEOUT_MS = 1e3;
+function probeDefaultOpencodeVersion(probeOpencode = (url) => probeOpencodeVersion(url)) {
+  return withTimeout(
+    probeOpencode(DEFAULT_OPENCODE_SERVER_URL),
+    null,
+    DEFAULT_OPENCODE_PROBE_TIMEOUT_MS
+  );
+}
+async function resolveOpencodeServerUrl(configuredServerUrl, requestedServerUrl, probeDefault = probeDefaultOpencodeVersion) {
+  const requested = requestedServerUrl?.trim();
+  if (requested) return requested;
+  if (configuredServerUrl) return configuredServerUrl;
+  return await probeDefault() !== null ? DEFAULT_OPENCODE_SERVER_URL : null;
+}
 async function probeHarnessSignals(cfg, deps = {}) {
   const probeClaudePresence = deps.probeClaudePresence ?? claudeOnPath;
   const probeClaudeVersion = deps.probeClaudeVersion ?? (() => probeCliVersion("claude"));
   const probeCodexVersion = deps.probeCodexVersion ?? (() => probeCliVersion("codex"));
   const probeOpencode = deps.probeOpencode ?? ((url) => probeOpencodeVersion(url));
-  const serverUrl = cfg.opencode?.serverUrl;
+  const configuredServerUrl = cfg.opencode?.serverUrl;
+  const opencodeProbeUrl = configuredServerUrl ?? DEFAULT_OPENCODE_SERVER_URL;
   const [claudeOnPathResult, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
     withTimeout(probeClaudePresence(), false),
     withTimeout(probeClaudeVersion(), null),
     withTimeout(probeCodexVersion(), null),
-    serverUrl ? withTimeout(probeOpencode(serverUrl), null) : Promise.resolve(null)
+    configuredServerUrl ? withTimeout(probeOpencode(opencodeProbeUrl), null) : probeDefaultOpencodeVersion(probeOpencode)
   ]);
   return {
     claudeOnPath: claudeOnPathResult,
@@ -973,13 +998,14 @@ async function probeHarnessSignals(cfg, deps = {}) {
     codexOnPath: codexVersion !== null,
     codexVersion,
     codexEnabled: isCodexEnabled(cfg),
-    opencodeConfigured: !!serverUrl,
+    opencodeConfigured: !!configuredServerUrl,
     // A version came back ⟺ the serve answered its health endpoint (CT584).
     opencodeReachable: opencodeVersion !== null,
-    opencodeVersion
+    opencodeVersion,
+    opencodeDetectedUrl: opencodeVersion !== null ? opencodeProbeUrl : null
   };
 }
-function withTimeout(promise, fallback) {
+function withTimeout(promise, fallback, timeoutMs = PROBE_TIMEOUT_MS) {
   return new Promise((resolve) => {
     let settled = false;
     const done = (v) => {
@@ -988,7 +1014,7 @@ function withTimeout(promise, fallback) {
         resolve(v);
       }
     };
-    const timer = setTimeout(() => done(fallback), PROBE_TIMEOUT_MS);
+    const timer = setTimeout(() => done(fallback), timeoutMs);
     timer.unref?.();
     promise.then(
       (v) => {
@@ -1316,13 +1342,14 @@ async function connect2(raw, opts = {}) {
   if (runtime === "claude-code") next = { ...cfg, claudeCode: { enabled: true } };
   else if (runtime === "codex") next = { ...cfg, codex: { enabled: true } };
   else {
-    const serverUrl = opts.serverUrl?.trim();
+    const requestedServerUrl = opts.serverUrl?.trim();
+    const serverUrl = await resolveOpencodeServerUrl(void 0, requestedServerUrl);
     if (!serverUrl) {
       throw new CompanionError(
         "opencode is addressed by URL \u2014 pass it: `cabane-companion connect opencode --url http://127.0.0.1:4096`."
       );
     }
-    if (await probeOpencodeVersion(serverUrl) === null) {
+    if (requestedServerUrl && await probeOpencodeVersion(serverUrl) === null) {
       throw new CompanionError(
         `Couldn\u2019t reach an opencode server at ${serverUrl}. Start \`opencode serve\` and check the URL.`
       );
@@ -9004,6 +9031,7 @@ var CompanionSupervisor = class {
   // NOT the cached beat signal — someone connecting right after installing Claude
   // Code shouldn't be refused by a snapshot up to a heartbeat old.
   probeClaudePresence;
+  probeCodexPresence;
   exitFn;
   reexecFn;
   dispatcherFactory;
@@ -9036,6 +9064,7 @@ var CompanionSupervisor = class {
     this.hub = opts.hub;
     this.claudeCode = opts.claudeCode ?? true;
     this.probeClaudePresence = opts.probeClaudePresence ?? claudeOnPath;
+    this.probeCodexPresence = opts.probeCodexPresence ?? codexOnPath;
     this.harnessVersions = opts.harnessVersions ?? emptyHarnessVersions();
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
     this.reexecFn = opts.reexec ?? defaultReexec;
@@ -9783,7 +9812,8 @@ var CompanionSupervisor = class {
   //   - claude-code (CT1082): set `claudeCode.enabled`, after checking `claude` is
   //     on PATH. This is the callable the terminal offer ("We found Claude Code.
   //     Connect it? [Y/n]") and the web pairing flow both wire to.
-  //   - codex: set `codex.enabled` (the CLI + `codex login` remain the user's).
+  //   - codex: set `codex.enabled` after checking `codex` is on PATH (the CLI +
+  //     `codex login` remain the user's).
   //   - opencode: set `opencode.serverUrl` — but ONLY after health-probing the URL,
   //     so we never advertise a serve that isn't there. An unreachable URL is a
   //     typed failure the UI shows in place, not a silent bad write.
@@ -9801,6 +9831,9 @@ var CompanionSupervisor = class {
       }
       next = { ...this.config, claudeCode: { enabled: true } };
     } else if (input.runtime === "codex") {
+      if (!await this.probeCodexPresence()) {
+        return { ok: false, error: absentLine("codex") };
+      }
       next = { ...this.config, codex: { enabled: true } };
     } else {
       const serverUrl = input.serverUrl.trim();
@@ -10050,11 +10083,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 currentConfig = supervisor.currentConfig();
+    const resolvedServerUrl = runtime === "opencode" ? await resolveOpencodeServerUrl(currentConfig.opencode?.serverUrl, serverUrl) : null;
+    const candidate = runtime === "opencode" ? { ...currentConfig, opencode: { serverUrl: resolvedServerUrl ?? "" } } : 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 }
+      runtime === "opencode" ? { runtime: "opencode", serverUrl: resolvedServerUrl ?? "" } : { runtime }
     );
     if (!result.ok) return { ok: false, error: result.error };
     return { ok: true, message: connectedLine(runtime, verdict) };
@@ -10324,17 +10359,22 @@ function reportAlreadyRunning(pid) {
   write("Connect a harness to the running companion: cabane-companion connect claude-code");
 }
 async function collectHarnessChoices(interactive) {
-  const opencodeUrl = "http://127.0.0.1:4096";
   const [claudePresent, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
     claudeOnPath().catch(() => false),
     probeCliVersion("claude").catch(() => null),
     probeCliVersion("codex").catch(() => null),
-    probeOpencodeVersion(opencodeUrl).catch(() => null)
+    probeDefaultOpencodeVersion()
   ]);
   const found = [
     ...claudePresent ? [{ runtime: "claude-code", version: claudeVersion }] : [],
     ...codexVersion ? [{ runtime: "codex", version: codexVersion }] : [],
-    ...opencodeVersion ? [{ runtime: "opencode", version: opencodeVersion, serverUrl: opencodeUrl }] : []
+    ...opencodeVersion ? [
+      {
+        runtime: "opencode",
+        version: opencodeVersion,
+        serverUrl: DEFAULT_OPENCODE_SERVER_URL
+      }
+    ] : []
   ].sort((a, b) => OFFER_ORDER.indexOf(a.runtime) - OFFER_ORDER.indexOf(b.runtime));
   if (found.length === 0) {
     write(

package/dist/runtime.js

@@ -1300,6 +1300,7 @@ var HARNESS_LABELS = {
   opencode: "OpenCode"
 };
 var LABELS = HARNESS_LABELS;
+var DEFAULT_OPENCODE_SERVER_URL = "http://127.0.0.1:4096";
 function deriveHarnessSnapshot(signals) {
   const advertised = new Set(
     buildCompanionManifest({
@@ -1411,6 +1412,15 @@ function deriveOpencode(signals, manifestHas) {
       enable: null
     };
   }
+  if (signals.opencodeReachable && signals.opencodeDetectedUrl) {
+    return {
+      ...base,
+      state: "detected_not_exposed",
+      version: signals.opencodeVersion,
+      detail: signals.opencodeDetectedUrl,
+      enable: "opencode"
+    };
+  }
   return {
     ...base,
     state: "not_detected",
@@ -1420,17 +1430,32 @@ function deriveOpencode(signals, manifestHas) {
   };
 }
 var PROBE_TIMEOUT_MS = 4e3;
+var DEFAULT_OPENCODE_PROBE_TIMEOUT_MS = 1e3;
+function probeDefaultOpencodeVersion(probeOpencode = (url) => probeOpencodeVersion(url)) {
+  return withTimeout(
+    probeOpencode(DEFAULT_OPENCODE_SERVER_URL),
+    null,
+    DEFAULT_OPENCODE_PROBE_TIMEOUT_MS
+  );
+}
+async function resolveOpencodeServerUrl(configuredServerUrl, requestedServerUrl, probeDefault = probeDefaultOpencodeVersion) {
+  const requested = requestedServerUrl?.trim();
+  if (requested) return requested;
+  if (configuredServerUrl) return configuredServerUrl;
+  return await probeDefault() !== null ? DEFAULT_OPENCODE_SERVER_URL : null;
+}
 async function probeHarnessSignals(cfg, deps = {}) {
   const probeClaudePresence = deps.probeClaudePresence ?? claudeOnPath;
   const probeClaudeVersion = deps.probeClaudeVersion ?? (() => probeCliVersion("claude"));
   const probeCodexVersion = deps.probeCodexVersion ?? (() => probeCliVersion("codex"));
   const probeOpencode = deps.probeOpencode ?? ((url) => probeOpencodeVersion(url));
-  const serverUrl = cfg.opencode?.serverUrl;
+  const configuredServerUrl = cfg.opencode?.serverUrl;
+  const opencodeProbeUrl = configuredServerUrl ?? DEFAULT_OPENCODE_SERVER_URL;
   const [claudeOnPathResult, claudeVersion, codexVersion, opencodeVersion] = await Promise.all([
     withTimeout(probeClaudePresence(), false),
     withTimeout(probeClaudeVersion(), null),
     withTimeout(probeCodexVersion(), null),
-    serverUrl ? withTimeout(probeOpencode(serverUrl), null) : Promise.resolve(null)
+    configuredServerUrl ? withTimeout(probeOpencode(opencodeProbeUrl), null) : probeDefaultOpencodeVersion(probeOpencode)
   ]);
   return {
     claudeOnPath: claudeOnPathResult,
@@ -1443,13 +1468,14 @@ async function probeHarnessSignals(cfg, deps = {}) {
     codexOnPath: codexVersion !== null,
     codexVersion,
     codexEnabled: isCodexEnabled(cfg),
-    opencodeConfigured: !!serverUrl,
+    opencodeConfigured: !!configuredServerUrl,
     // A version came back ⟺ the serve answered its health endpoint (CT584).
     opencodeReachable: opencodeVersion !== null,
-    opencodeVersion
+    opencodeVersion,
+    opencodeDetectedUrl: opencodeVersion !== null ? opencodeProbeUrl : null
   };
 }
-function withTimeout(promise, fallback) {
+function withTimeout(promise, fallback, timeoutMs = PROBE_TIMEOUT_MS) {
   return new Promise((resolve) => {
     let settled = false;
     const done = (v) => {
@@ -1458,7 +1484,7 @@ function withTimeout(promise, fallback) {
         resolve(v);
       }
     };
-    const timer = setTimeout(() => done(fallback), PROBE_TIMEOUT_MS);
+    const timer = setTimeout(() => done(fallback), timeoutMs);
     timer.unref?.();
     promise.then(
       (v) => {
@@ -8513,6 +8539,7 @@ var CompanionSupervisor = class {
   // NOT the cached beat signal — someone connecting right after installing Claude
   // Code shouldn't be refused by a snapshot up to a heartbeat old.
   probeClaudePresence;
+  probeCodexPresence;
   exitFn;
   reexecFn;
   dispatcherFactory;
@@ -8545,6 +8572,7 @@ var CompanionSupervisor = class {
     this.hub = opts.hub;
     this.claudeCode = opts.claudeCode ?? true;
     this.probeClaudePresence = opts.probeClaudePresence ?? claudeOnPath;
+    this.probeCodexPresence = opts.probeCodexPresence ?? codexOnPath;
     this.harnessVersions = opts.harnessVersions ?? emptyHarnessVersions();
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
     this.reexecFn = opts.reexec ?? defaultReexec;
@@ -9292,7 +9320,8 @@ var CompanionSupervisor = class {
   //   - claude-code (CT1082): set `claudeCode.enabled`, after checking `claude` is
   //     on PATH. This is the callable the terminal offer ("We found Claude Code.
   //     Connect it? [Y/n]") and the web pairing flow both wire to.
-  //   - codex: set `codex.enabled` (the CLI + `codex login` remain the user's).
+  //   - codex: set `codex.enabled` after checking `codex` is on PATH (the CLI +
+  //     `codex login` remain the user's).
   //   - opencode: set `opencode.serverUrl` — but ONLY after health-probing the URL,
   //     so we never advertise a serve that isn't there. An unreachable URL is a
   //     typed failure the UI shows in place, not a silent bad write.
@@ -9310,6 +9339,9 @@ var CompanionSupervisor = class {
       }
       next = { ...this.config, claudeCode: { enabled: true } };
     } else if (input.runtime === "codex") {
+      if (!await this.probeCodexPresence()) {
+        return { ok: false, error: absentLine("codex") };
+      }
       next = { ...this.config, codex: { enabled: true } };
     } else {
       const serverUrl = input.serverUrl.trim();
@@ -9559,11 +9591,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 currentConfig = supervisor.currentConfig();
+    const resolvedServerUrl = runtime === "opencode" ? await resolveOpencodeServerUrl(currentConfig.opencode?.serverUrl, serverUrl) : null;
+    const candidate = runtime === "opencode" ? { ...currentConfig, opencode: { serverUrl: resolvedServerUrl ?? "" } } : 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 }
+      runtime === "opencode" ? { runtime: "opencode", serverUrl: resolvedServerUrl ?? "" } : { runtime }
     );
     if (!result.ok) return { ok: false, error: result.error };
     return { ok: true, message: connectedLine(runtime, verdict) };

package/dist/static/app.js

@@ -158,6 +158,7 @@ function renderHarnesses() {
       const input = el('input');
       input.type = 'text';
       input.placeholder = 'opencode serve URL (e.g. http://127.0.0.1:4096)';
+      if (h.state === 'detected_not_exposed') input.value = h.detail;
       const btn = el('button', 'primary small', 'Add opencode');
       const submit = () => {
         const url = input.value.trim();

package/package.json

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