@cabane/companion 0.6.237 → 0.6.239

package/dist/cli.js

@@ -279,7 +279,7 @@ var init_errors = __esm({
 });
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -289,13 +289,57 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
+function addressToKeep(pairedOver, cabaneNamed, env = process.env) {
+  const allowed = plainHttpHost(env);
+  if (allowed === null) return cabaneNamed;
+  let url;
+  try {
+    url = new URL(pairedOver);
+  } catch {
+    return cabaneNamed;
+  }
+  return url.protocol === "http:" && url.hostname.toLowerCase() === allowed ? pairedOver.replace(/\/+$/, "") : cabaneNamed;
+}
+var ALLOW_PLAIN_HTTP_HOST_ENV;
 var init_pairing = __esm({
   "src/pairing.ts"() {
     "use strict";
+    ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
   }
 });
 
@@ -712,10 +756,10 @@ var init_config = __esm({
     }).strict();
     agentsConfigSchema = z2.record(z2.string(), localAgentConfigSchema);
     companionConfigSchema = z2.object({
-      // https-enforced (loopback exempt), so a hand-edited config can't put the
-      // device token and prompt on a plaintext channel.
-      baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-        message: "baseUrl must be https (loopback http is allowed for local dev only)"
+      // https-enforced (loopback, and the one private host a person names, exempt), so a
+      // hand-edited config can't put the device token and prompt on a plaintext channel.
+      baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+        message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
       }),
       // The `cabdev_` device token plaintext — the companion's one durable credential,
       // presented as `Authorization: Bearer <token>` on the device-facing pull +
@@ -724,7 +768,7 @@ var init_config = __esm({
       // the rest of the config; `pair` always writes one.
       deviceToken: z2.string().optional(),
       // Identity hints, learned from the device flow and refreshed on the first
-      // assignments pull. Cosmetic — used for `status`/dashboard display only.
+      // assignments pull. Cosmetic — used for `status` display only.
       deviceId: z2.string().optional(),
       deviceLabel: z2.string().optional(),
       // Optional per-agent machine-local overrides (cwd / prepareHook), keyed by
@@ -736,9 +780,8 @@ var init_config = __esm({
       // silent roster: an agent nobody listed gets no hook and no error, and starts
       // in the operator's `$HOME`.
       prepareHook: prepareHookSchema.optional(),
-      // The CLI ignores both dashboard settings. Desktop uses `dashboardPort`;
-      // `autoOpen` remains parseable for older config files but no longer controls
-      // startup. `logLevel` is pino's level, live-editable.
+      // Nothing reads either dashboard setting any more; both stay parseable so an
+      // older config file still loads. `logLevel` is pino's level, live-editable.
       dashboardPort: z2.number().int().min(1).max(65535).optional(),
       autoOpen: z2.boolean().optional(),
       logLevel: z2.enum(["warn", "info", "debug"]).optional(),
@@ -7434,10 +7477,6 @@ var init_turn_committer = __esm({
       get lastMessageSeq() {
         return this.pump.lastMessageSeq;
       }
-      // The turn's final reply text, or null if none landed.
-      get replyBody() {
-        return this.pump.replyBody;
-      }
       get finalSource() {
         return this.pump.finalSource;
       }
@@ -7815,7 +7854,6 @@ var init_turn_execution = __esm({
           );
         }
         const durationMs = Date.now() - startedAt;
-        this.supervisor.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
         return { ok: false, durationMs, reason, runtime: this.turnContext?.runtime };
       }
       // The admitted turn holds the conversation's lease, so the clear must NAME the
@@ -7854,7 +7892,6 @@ var init_turn_execution = __esm({
           }
         }
         const durationMs = Date.now() - startedAt;
-        this.supervisor.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
         return { ok: false, durationMs, reason, runtime: this.turnContext?.runtime };
       }
       async fetchContext() {
@@ -7963,11 +8000,7 @@ var init_turn_execution = __esm({
           turnLog.debug({ role: message2.role }, "dispatcher: trigger role not dispatchable \u2014 skipping");
           throw this.concluded("unexpected_role", UNEXPECTED_ROLE_REASON);
         }
-        this.supervisor.notifyStart({
-          id: this.dispatchId,
-          conversationId: payload.conversationId,
-          message: message2.body
-        });
+        this.supervisor.notifyStart({ id: this.dispatchId, conversationId: payload.conversationId });
       }
       async resolveSecrets() {
         const { turnLog } = this;
@@ -8736,7 +8769,6 @@ var init_turn_execution = __esm({
         const o = this.outcome;
         const { startedAt, turnLog } = this;
         const durationMs = Date.now() - startedAt;
-        const finalReplyBody = this.committer.replyBody;
         if (this.transcript) {
           this.transcript.close({
             ok: o.okResult,
@@ -8749,21 +8781,9 @@ var init_turn_execution = __esm({
         }
         if (o.okResult) {
           turnLog.debug({ durationMs }, "dispatcher: turn end (ok)");
-          this.supervisor.notifyEnd({
-            id: this.dispatchId,
-            ok: true,
-            durationMs,
-            ...finalReplyBody ? { reply: finalReplyBody.trim() } : {}
-          });
           return { ok: true, durationMs };
         }
         turnLog.debug({ durationMs, reason: o.resultReason }, "dispatcher: turn end (not ok)");
-        this.supervisor.notifyEnd({
-          id: this.dispatchId,
-          ok: false,
-          durationMs,
-          ...o.resultReason ? { reason: o.resultReason } : {}
-        });
         return {
           ok: false,
           durationMs,
@@ -9269,8 +9289,7 @@ async function runTurn(env, deps) {
         emit({ cabaneRunner: "session_write_notice" });
         return true;
       },
-      notifyStart: (info) => emit({ cabaneRunner: "start", ...info }),
-      notifyEnd: (info) => emit({ cabaneRunner: "end", ...info })
+      notifyStart: (info) => emit({ cabaneRunner: "start", ...info })
     };
     let outbox;
     const opts = runnerTurnOptions(input, log2, emit, {
@@ -10312,6 +10331,9 @@ function openLink(link) {
   });
 }
 
+// src/commands/setup.ts
+init_pairing();
+
 // src/commands/start.ts
 init_cabane_command();
 init_config();
@@ -10322,13 +10344,12 @@ init_config();
 init_pairing();
 init_errors();
 init_install_kind();
-init_errors();
 function resolvePairBaseUrl(server) {
   const raw = (server ?? process.env.CABANE_BASE_URL ?? "").trim();
   if (!raw) throw new NoPairAddressError();
   if (!isAllowedBaseUrl(raw)) {
     throw new CompanionError(
-      `invalid server URL "${raw}": must be an https URL (loopback http is allowed for local dev). Pass it as \`${cabane("setup --server https://your-cabane")}\`.`
+      `invalid server URL "${raw}": must be an https URL (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names). Pass it as \`${cabane("setup --server https://your-cabane")}\`.`
     );
   }
   return raw;
@@ -10371,7 +10392,6 @@ function isDevicePaired() {
 init_config();
 init_cabane_command();
 import { randomUUID as randomUUID7 } from "crypto";
-import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/prereqs.ts
 init_config();
@@ -10388,71 +10408,37 @@ function warnAboutHarnessReadiness(cfg, deps = {}) {
 }
 
 // src/state.ts
-import { EventEmitter } from "events";
-function dispatchToWire(r) {
-  return {
-    id: r.id,
-    timestamp: r.timestamp,
-    workspace_slug: r.workspaceSlug,
-    ...r.agentUsername ? { agent_username: r.agentUsername } : {},
-    message: r.message,
-    status: r.status,
-    ...r.durationMs !== void 0 ? { duration_ms: r.durationMs } : {},
-    ...r.error ? { error: r.error } : {},
-    ...r.reply ? { reply: r.reply } : {}
-  };
-}
-var MAX_DISPATCHES = 50;
 function today() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 }
 var CompanionStateHub = class {
   constructor(opts) {
     this.opts = opts;
-    this.emitter.setMaxListeners(0);
   }
   opts;
-  emitter = new EventEmitter();
   workspaces = /* @__PURE__ */ new Map();
-  dispatches = [];
-  dashboardUrl = null;
   deviceId = null;
   deviceLabel = null;
   deviceError = null;
   // The latest harness snapshot the supervisor probed, or null before the
   // first probe (see CompanionStatusJson.harnesses).
   harnesses = null;
-  // ---- subscription (SSE) ----
-  on(listener) {
-    this.emitter.on("event", listener);
-    return () => this.emitter.off("event", listener);
-  }
-  emit(type, data) {
-    this.emitter.emit("event", { type, data });
-  }
   // ---- device ----
   setDevice(info) {
     if (info.deviceId !== void 0) this.deviceId = info.deviceId;
     if (info.deviceLabel !== void 0) this.deviceLabel = info.deviceLabel;
-    this.emitStatus();
   }
   setDeviceError(message2) {
-    if (this.deviceError === message2) return;
     this.deviceError = message2;
-    this.emitStatus();
   }
   clearDeviceError() {
-    if (this.deviceError === null) return;
     this.deviceError = null;
-    this.emitStatus();
   }
   // ---- harnesses ----
-  // Replace the harness snapshot and push a status change (so the SSE feed flips
-  // the Companion's Harnesses surface live). The supervisor calls this on each
+  // Replace the harness snapshot. The supervisor calls this on each
   // heartbeat-cadence probe and on an on-demand recheck.
   setHarnesses(harnesses) {
     this.harnesses = harnesses;
-    this.emitStatus();
   }
   // ---- workspace lifecycle ----
   registerWorkspace(ws) {
@@ -10473,29 +10459,21 @@ var CompanionStateHub = class {
       countDate: today(),
       agents: /* @__PURE__ */ new Map()
     });
-    this.emitStatus();
   }
   removeWorkspace(workspaceId) {
-    const ws = this.workspaces.get(workspaceId);
-    if (!ws) return;
     this.workspaces.delete(workspaceId);
-    this.emit("workspace:disconnected", { slug: ws.slug });
-    this.emitStatus();
   }
   setConnected(workspaceId, connected) {
     const ws = this.workspaces.get(workspaceId);
     if (!ws || ws.connected === connected) return;
     ws.connected = connected;
     if (connected) ws.authFailed = false;
-    this.emitStatus();
   }
   setAuthFailed(workspaceId) {
     const ws = this.workspaces.get(workspaceId);
     if (!ws) return;
-    if (ws.authFailed && !ws.connected) return;
     ws.authFailed = true;
     ws.connected = false;
-    this.emitStatus();
   }
   recordEvent(workspaceId) {
     const ws = this.workspaces.get(workspaceId);
@@ -10508,22 +10486,15 @@ var CompanionStateHub = class {
     const ws = this.workspaces.get(workspaceId);
     if (!ws) return;
     ws.agents.set(agent.agentId, agent);
-    this.emitStatus();
   }
   removeAgent(workspaceId, agentId) {
-    const ws = this.workspaces.get(workspaceId);
-    if (!ws) return;
-    if (ws.agents.delete(agentId)) this.emitStatus();
+    this.workspaces.get(workspaceId)?.agents.delete(agentId);
   }
-  // ---- dispatch feed ----
-  // A DispatchObserver bound to one (workspace, agent), handed to that agent's
-  // Dispatcher by the supervisor.
-  observerFor(workspaceId, agentId, slug) {
-    const username = () => this.workspaces.get(workspaceId)?.agents.get(agentId)?.username ?? "";
-    return {
-      onStart: (info) => this.dispatchStarted(workspaceId, slug, username(), info),
-      onEnd: (info) => this.dispatchEnded(slug, username(), info)
-    };
+  // ---- dispatch count ----
+  // A DispatchObserver bound to one workspace, handed to each of its agents'
+  // Dispatchers by the supervisor: a turn counts toward the day when it starts.
+  observerFor(workspaceId) {
+    return { onStart: () => this.bumpCount(workspaceId) };
   }
   bumpCount(workspaceId) {
     const ws = this.workspaces.get(workspaceId);
@@ -10535,52 +10506,6 @@ var CompanionStateHub = class {
     }
     ws.dispatchCountToday += 1;
   }
-  dispatchStarted(workspaceId, slug, agentUsername, info) {
-    this.bumpCount(workspaceId);
-    const record = {
-      id: info.id,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      workspaceSlug: slug,
-      ...agentUsername ? { agentUsername } : {},
-      message: info.message,
-      status: "running"
-    };
-    this.upsertDispatch(record);
-    this.emit("dispatch:started", dispatchToWire(record));
-    this.emitStatus();
-  }
-  dispatchEnded(slug, agentUsername, info) {
-    const existing = this.dispatches.find((d) => d.id === info.id);
-    const record = {
-      id: info.id,
-      timestamp: existing?.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
-      workspaceSlug: existing?.workspaceSlug ?? slug,
-      ...existing?.agentUsername ?? agentUsername ? { agentUsername: existing?.agentUsername ?? agentUsername } : {},
-      message: existing?.message ?? "",
-      status: info.ok ? "replied" : "error",
-      durationMs: info.durationMs,
-      ...info.reason ? { error: info.reason } : {},
-      ...info.reply ? { reply: info.reply } : {}
-    };
-    this.upsertDispatch(record);
-    this.emit(info.ok ? "dispatch:completed" : "dispatch:error", dispatchToWire(record));
-  }
-  upsertDispatch(record) {
-    const idx = this.dispatches.findIndex((d) => d.id === record.id);
-    if (idx >= 0) {
-      this.dispatches[idx] = record;
-      return;
-    }
-    this.dispatches.unshift(record);
-    if (this.dispatches.length > MAX_DISPATCHES) this.dispatches.length = MAX_DISPATCHES;
-  }
-  // ---- snapshots for the HTTP routes ----
-  setDashboardUrl(url) {
-    this.dashboardUrl = url;
-  }
-  recentDispatches(limit = 20) {
-    return this.dispatches.slice(0, Math.max(0, limit));
-  }
   statusJson() {
     const list = [...this.workspaces.values()].sort((a, b) => a.name.localeCompare(b.name));
     const lastOverall = list.reduce((acc, ws) => {
@@ -10610,15 +10535,11 @@ var CompanionStateHub = class {
         }))
       })),
       last_event_at_overall: lastOverall,
-      dashboard_url: this.dashboardUrl,
       companion_version: this.opts.companionVersion,
       instance_id: this.opts.instanceId ?? null,
       harnesses: this.harnesses
     };
   }
-  emitStatus() {
-    this.emit("status:changed", this.statusJson());
-  }
 };
 
 // src/supervisor.ts
@@ -11387,7 +11308,6 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     duties.releaseAbort(turnId, controller);
     const durationMs2 = Date.now() - startedAt;
     await settleUnstarted(opts, payload, turnId, minted.errorReason, log2);
-    duties.notifyEnd({ id: payload.messageId, ok: false, durationMs: durationMs2, reason: minted.reason });
     return { ok: false, durationMs: durationMs2, reason: minted.reason };
   }
   let result;
@@ -11418,7 +11338,6 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
       reason: "provider_failed"
     });
     const durationMs2 = Date.now() - startedAt;
-    duties.notifyEnd({ id: payload.messageId, ok: false, durationMs: durationMs2, reason: reason2 });
     return { ok: false, durationMs: durationMs2, reason: reason2 };
   }
   try {
@@ -11482,17 +11401,8 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
           }
           return;
         case "start":
-          duties.notifyStart({
-            id: event.id,
-            conversationId: event.conversationId,
-            message: event.message
-          });
-          return;
-        case "end": {
-          const { cabaneRunner: _kind, ...info } = event;
-          duties.notifyEnd(info);
+          duties.notifyStart({ id: event.id, conversationId: event.conversationId });
           return;
-        }
         case "session_write_notice":
           duties.markSessionWriteNotice();
           return;
@@ -11596,7 +11506,6 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   if (thrown !== void 0) throw new Error(thrown);
   if (stopped) log2.info({ turnId, code }, "runner: stopped before it could report");
   else log2.warn({ turnId, code }, "runner: exited without reporting a result");
-  duties.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
   return { ok: false, durationMs, reason };
 }
 
@@ -11623,12 +11532,6 @@ var Dispatcher = class {
     } catch {
     }
   }
-  notifyEnd(info) {
-    try {
-      this.opts.observer?.onEnd(info);
-    } catch {
-    }
-  }
   // The supervisor supplies a stable turnId on both fresh and resumed dispatch.
   // resumed is separate: only replay seeds sequence/speech recovery from the
   // prior span. A direct caller omitting turnId gets a fresh id.
@@ -11656,8 +11559,7 @@ var Dispatcher = class {
         markSessionWriteNotice: () => {
           this.sessionWriteNotified.add(key);
         },
-        notifyStart: (info) => this.notifyStart(info),
-        notifyEnd: (info) => this.notifyEnd(info)
+        notifyStart: (info) => this.notifyStart(info)
       },
       payload,
       {
@@ -12756,7 +12658,6 @@ var CompanionSupervisor = class {
   runHarnessCheck;
   probeOpencode;
   exitFn;
-  reexecFn;
   dispatcherFactory;
   runnerCommand;
   runnerEnv;
@@ -12767,8 +12668,8 @@ var CompanionSupervisor = class {
   host = hostReport();
   deviceApi = null;
   deviceSub = null;
-  // Whether the device stream is open, which is what every workspace's link on
-  // the dashboard reports.
+  // Whether the device stream is open, which is what every workspace's link in
+  // the status snapshot reports.
   deviceConnected = false;
   // Set when the device stream ended on a 403: the device was deactivated, not
   // unpaired. The next accepted heartbeat proves it was reactivated, and
@@ -12829,7 +12730,6 @@ var CompanionSupervisor = class {
     this.probeOpencode = opts.probeOpencode;
     this.harnessVersions = opts.harnessVersions ?? emptyHarnessVersions();
     this.exitFn = opts.exit ?? ((code) => process.exit(code));
-    this.reexecFn = opts.reexec ?? defaultReexec;
     this.restartForUpdate = opts.restartForUpdate ?? (async () => {
       await this.shutdown();
       this.exitFn(0);
@@ -13463,7 +13363,7 @@ var CompanionSupervisor = class {
         locks: this.runnerLocks,
         gzipBodies: this.gzipBodies
       },
-      observer: this.hub.observerFor(ctx2.workspaceId, ctx2.agentId, ctx2.workspaceSlug),
+      observer: this.hub.observerFor(ctx2.workspaceId),
       aborts: ctx2.aborts
     });
   }
@@ -13917,36 +13817,9 @@ var CompanionSupervisor = class {
     };
     return { kick, cancel: cancel2 };
   }
-  // ---- dashboard-facing operations ----
-  // Re-read `~/.cabane/config.json` (the operator may have edited the `agents`
-  // overrides or dashboard prefs), apply the log level live, and re-pull
-  // assignments so any structural change is reflected. A device-token change
-  // means re-pairing, which `pair` + a restart handle.
-  reloadConfig() {
-    const next = loadConfig();
-    if (!next) return;
-    this.config = next;
-    configureLogger(this.log, next);
-    this.rebuildDispatchers();
-    void this.refreshAssignments();
-  }
-  // The dashboard "refresh assignments" control — an immediate pull.
-  refresh() {
-    void this.refreshAssignments();
-  }
-  applySettings(patch) {
-    const next = {
-      ...this.config,
-      ...patch.logLevel ? { logLevel: patch.logLevel } : {},
-      ...patch.autoOpen !== void 0 ? { autoOpen: patch.autoOpen } : {}
-    };
-    this.config = next;
-    saveConfig(next);
-    configureLogger(this.log, next);
-  }
   // ---- harnesses ----
   // Look at every agent, in this process: the one whose environment turns run
-  // in. Cached for the heartbeat and the dashboard; coalesced, so a re-detect
+  // in. Cached for the heartbeat and the status snapshot; coalesced, so a re-detect
   // during the timer's own run waits for that one. Never throws.
   async detect() {
     if (this.detecting) return this.detecting;
@@ -13974,8 +13847,8 @@ var CompanionSupervisor = class {
     });
     return this.detecting;
   }
-  // A re-detect asked for over the control socket (`setup`, `connect`) or the
-  // dashboard: read the config file again first — this process owns it, so an
+  // A re-detect asked for over the control socket (`setup`, `connect`): read
+  // the config file again first — this process owns it, so an
   // edit made on disk (the allowlist, the OpenCode address) is adopted here
   // rather than overwritten by its next save — then detect now, and beat at
   // once so Cabane shows it promptly.
@@ -14111,9 +13984,6 @@ var CompanionSupervisor = class {
     await this.shutdown();
     this.exitFn(0);
   }
-  requestRestart() {
-    this.reexecFn();
-  }
 };
 async function waitForBoundedHeartbeat(heartbeat) {
   let timer = null;
@@ -14127,21 +13997,6 @@ async function waitForBoundedHeartbeat(heartbeat) {
     if (timer) clearTimeout(timer);
   }
 }
-function defaultReexec() {
-  clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn8 }) => {
-    try {
-      const child = spawn8(process.execPath, process.argv.slice(1), {
-        stdio: "inherit",
-        detached: false
-      });
-      child.on("spawn", () => process.exit(0));
-      child.on("error", () => {
-      });
-    } catch {
-    }
-  });
-}
 
 // src/safety.ts
 var RECOVERABLE_CODES = /* @__PURE__ */ new Set([
@@ -14313,15 +14168,6 @@ function strayCompanionLines(strays, retry) {
 }
 
 // src/runtime.ts
-init_errors();
-function embeddedRunner(host) {
-  if (!host.electron) return null;
-  const cli = fileURLToPath5(new URL("./cli.js", host.moduleUrl));
-  return {
-    runnerCommand: [host.execPath, cli, "run-turn"],
-    runnerEnv: { ...host.env, ELECTRON_RUN_AS_NODE: "1" }
-  };
-}
 async function createCompanionRuntime(opts = {}) {
   const log2 = getLogger();
   installProcessSafetyNet(log2);
@@ -14361,7 +14207,7 @@ async function createCompanionRuntime(opts = {}) {
   const clearRuntimeOnExit = () => clearRuntimeStateIfOurs(instanceId);
   process.on("exit", clearRuntimeOnExit);
   const hub = new CompanionStateHub({
-    // The dashboard's connection line shows it.
+    // `status` names the Cabane it is paired with.
     baseUrl: cfg.baseUrl,
     companionVersion: COMPANION_VERSION,
     // Surfaced on `/api/status` so `stop`/`status` can confirm the
@@ -14372,7 +14218,6 @@ async function createCompanionRuntime(opts = {}) {
   };
   let supervisor;
   let control = null;
-  let dashboard = null;
   let stopped = false;
   const stop2 = async () => {
     if (stopped) return;
@@ -14381,8 +14226,7 @@ async function createCompanionRuntime(opts = {}) {
     process.removeListener("exit", clearRuntimeOnExit);
     await Promise.allSettled([
       ...supervisor ? [supervisor.shutdown()] : [],
-      ...control ? [control.close()] : [],
-      ...dashboard ? [dashboard.close()] : []
+      ...control ? [control.close()] : []
     ]);
   };
   try {
@@ -14391,12 +14235,6 @@ async function createCompanionRuntime(opts = {}) {
       log: log2,
       hub,
       ...opts.checkHarness ? { checkHarness: opts.checkHarness } : {},
-      ...embeddedRunner({
-        electron: Boolean(process.versions.electron),
-        execPath: process.execPath,
-        moduleUrl: import.meta.url,
-        env: process.env
-      }) ?? {},
       restartForUpdate: () => restartForUpdate()
     });
     const active2 = supervisor;
@@ -14411,21 +14249,10 @@ async function createCompanionRuntime(opts = {}) {
       update: (auto) => active2.update(auto),
       stop: () => void stop2().then(() => active2.requestStop())
     });
-    if (opts.startDashboard) {
-      const preferredPort = cfg.dashboardPort;
-      dashboard = await opts.startDashboard({
-        supervisor,
-        hub,
-        logPath: companionLogPath(),
-        ...preferredPort !== void 0 ? { port: preferredPort } : {}
-      });
-      hub.setDashboardUrl(dashboard.url);
-    }
     if (stopped) throw new Error("The companion was stopped during startup.");
     writeRuntimeState({
       pid: process.pid,
       socket: control.path,
-      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
       startedAt,
       // The daemon launcher sets this env on the detached child, so the
       // marker records whether this companion is backgrounded (foreground start
@@ -14440,8 +14267,7 @@ async function createCompanionRuntime(opts = {}) {
     process.removeListener("exit", clearRuntimeOnExit);
     await Promise.allSettled([
       ...supervisor ? [supervisor.shutdown()] : [],
-      ...control ? [control.close()] : [],
-      ...dashboard ? [dashboard.close()] : []
+      ...control ? [control.close()] : []
     ]);
     recordCrash({
       reason: err instanceof Error ? err.message : String(err),
@@ -14465,7 +14291,6 @@ async function createCompanionRuntime(opts = {}) {
   return {
     ok: true,
     runtime: {
-      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
       socketPath: control.path,
       config: cfg,
       stop: stop2,
@@ -15346,7 +15171,7 @@ async function setupScript(opts, deps) {
       onCode: () => rememberPairAddress(baseUrl)
     });
     if (!device) return;
-    writePairedConfig(device);
+    writePairedConfig({ ...device, baseUrl: addressToKeep(baseUrl, device.baseUrl) });
     justPaired = true;
   }
   const detection = await start(