@cabane/companion 0.6.236 → 0.6.238

package/dist/cli.js

@@ -14,6 +14,13 @@ import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
+function installScriptCommand(address) {
+  return `curl -fsSL ${address.replace(/\/+$/, "")}/install.sh | bash`;
+}
+function installLineWords(install = companionInstall()) {
+  const line = install === "script" ? "installer line" : "npm line";
+  return `the ${line} from Your settings \u2192 Devices \u2192 Add a device in your Cabane`;
+}
 function companionInstall(execPath = process.execPath, home = homedir()) {
   const real = (path) => {
     try {
@@ -36,11 +43,9 @@ function repairRoute(packageRoot = ownRoot(), install = companionInstall()) {
 function ownRoot() {
   return dirname(dirname(fileURLToPath(import.meta.url)));
 }
-var INSTALL_SCRIPT_COMMAND;
 var init_install_kind = __esm({
   "src/install-kind.ts"() {
     "use strict";
-    INSTALL_SCRIPT_COMMAND = "curl -fsSL https://cabane.ai/install.sh | bash";
   }
 });
 
@@ -222,7 +227,7 @@ var init_cabane_command = __esm({
 });
 
 // src/errors.ts
-var CompanionError, ApiError, EdgeBlockError, ConfigError, PrepareHookError;
+var CompanionError, StandaloneError, ApiError, EdgeBlockError, ConfigError, PrepareHookError;
 var init_errors = __esm({
   "src/errors.ts"() {
     "use strict";
@@ -232,6 +237,12 @@ var init_errors = __esm({
         this.name = "CompanionError";
       }
     };
+    StandaloneError = class extends CompanionError {
+      constructor(message2) {
+        super(message2);
+        this.name = "StandaloneError";
+      }
+    };
     ApiError = class extends CompanionError {
       constructor(status2, message2, body) {
         super(message2);
@@ -603,31 +614,13 @@ function loadConfigTolerant() {
   const strict = companionConfigSchema.safeParse(parsed);
   if (strict.success) {
     const {
-      agents: agents2,
-      prepareHook: prepareHook2,
-      root: root2,
-      dashboardPort,
-      autoOpen,
-      logLevel,
-      logFormat,
-      harnesses: harnesses2,
-      opencode: opencode2
+      baseUrl: _baseUrl,
+      deviceToken: _deviceToken,
+      deviceId: _deviceId,
+      deviceLabel: _deviceLabel,
+      ...local2
     } = strict.data;
-    return {
-      local: {
-        ...agents2 !== void 0 ? { agents: agents2 } : {},
-        ...prepareHook2 !== void 0 ? { prepareHook: prepareHook2 } : {},
-        ...root2 !== void 0 ? { root: root2 } : {},
-        ...dashboardPort !== void 0 ? { dashboardPort } : {},
-        ...autoOpen !== void 0 ? { autoOpen } : {},
-        ...logLevel !== void 0 ? { logLevel } : {},
-        ...logFormat !== void 0 ? { logFormat } : {},
-        ...harnesses2 !== void 0 ? { harnesses: harnesses2 } : {},
-        ...opencode2 !== void 0 ? { opencode: opencode2 } : {}
-      },
-      note: null,
-      hadPriorConfig: true
-    };
+    return { local: local2, note: null, hadPriorConfig: true };
   }
   const obj = parsed && typeof parsed === "object" ? parsed : {};
   const local = {};
@@ -647,6 +640,11 @@ function loadConfigTolerant() {
   if (harnesses.success && harnesses.data !== void 0) local.harnesses = harnesses.data;
   const opencode = companionConfigSchema.shape.opencode.safeParse(obj.opencode);
   if (opencode.success && opencode.data !== void 0) local.opencode = opencode.data;
+  const update2 = companionConfigSchema.shape.update.safeParse(obj.update);
+  if (update2.success && update2.data !== void 0) local.update = update2.data;
+  if (typeof obj.serviceDeclined === "boolean") local.serviceDeclined = obj.serviceDeclined;
+  const runner = companionConfigSchema.shape.runner.safeParse(obj.runner);
+  if (runner.success && runner.data !== void 0) local.runner = runner.data;
   return {
     local,
     note: `the existing ${path} was from an older or incompatible companion; re-pairing rewrote it.`,
@@ -726,7 +724,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
@@ -738,9 +736,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(),
@@ -958,18 +955,32 @@ function resolveBundledBinary(runtime, env = defaultResolveEnv()) {
 function missingNoun(status2) {
   return status2 === "executable_missing" ? "executable" : "platform package";
 }
-function repairCommands(route = repairRoute(), spell = cabane) {
+function repairCommands(route = repairRoute(), spell = cabane, address = configuredAddress()) {
   if (route === "managed") return [spell("stop"), spell("update")];
-  if (route === "script") return [spell("stop"), INSTALL_SCRIPT_COMMAND];
+  if (route === "script")
+    return [
+      spell("stop"),
+      address ? installScriptCommand(address) : { words: installLineWords("script") }
+    ];
   return ["npm i -g @cabane/companion --include=optional"];
 }
-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}`;
+function configuredAddress() {
+  try {
+    return loadConfig()?.baseUrl ?? null;
+  } catch {
+    return null;
+  }
+}
+function quoteStep(step, quote) {
+  return typeof step === "string" ? quote(step) : step.words;
+}
+function repairAction(route = repairRoute(), spell = cabane, address = configuredAddress()) {
+  const [first, ...rest] = repairCommands(route, spell, address);
+  if (rest.length === 0) return `Reinstall with ${quoteStep(first, backticks)}.`;
+  return `Run ${quoteStep(first, backticks)}, then ${rest.map((step) => quoteStep(step, backticks)).join(", then ")}. ${STOP_WARNING}`;
 }
 function repairSteps(route = repairRoute()) {
-  return repairCommands(route).join(", then ");
+  return repairCommands(route).map((step) => quoteStep(step, (command) => command)).join(", then ");
 }
 function repairCost(route = repairRoute()) {
   return repairCommands(route).length > 1 ? STOP_WARNING : "";
@@ -981,11 +992,12 @@ function startupWarning(r) {
 function turnIncompleteCopy(runtime) {
   return `**This device's ${HARNESS_LABEL[runtime]} runtime is incomplete.** ${repairAction()} Restart it, then try again.`;
 }
-var CLAUDE_SDK, CODEX_SDK, CODEX_CLI, CODEX_PACKAGE_BY_TRIPLE, HARNESS_LABEL, HARNESS_INTENT_WORD, STOP_WARNING;
+var CLAUDE_SDK, CODEX_SDK, CODEX_CLI, CODEX_PACKAGE_BY_TRIPLE, HARNESS_LABEL, HARNESS_INTENT_WORD, backticks, STOP_WARNING;
 var init_bundled_binaries = __esm({
   "src/bundled-binaries.ts"() {
     "use strict";
     init_cabane_command();
+    init_config();
     init_install_kind();
     CLAUDE_SDK = "@anthropic-ai/claude-agent-sdk";
     CODEX_SDK = "@openai/codex-sdk";
@@ -1006,6 +1018,7 @@ var init_bundled_binaries = __esm({
       "claude-code": "connected",
       codex: "enabled"
     };
+    backticks = (command) => `\`${command}\``;
     STOP_WARNING = "Stopping ends any turn in progress.";
   }
 });
@@ -7420,10 +7433,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;
       }
@@ -7801,7 +7810,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
@@ -7840,7 +7848,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() {
@@ -7949,11 +7956,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;
@@ -8722,7 +8725,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,
@@ -8735,21 +8737,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,
@@ -9255,8 +9245,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, {
@@ -9959,6 +9948,7 @@ import { hostname } from "os";
 
 // src/enrollment.ts
 init_errors();
+init_install_kind();
 var EnrollmentExpiredError = class extends CompanionError {
   constructor() {
     super("this pairing code expired before it was confirmed.");
@@ -10012,8 +10002,9 @@ async function postJson(baseUrl, path, body, signal) {
         "Too many pairing requests from this network. Wait a few minutes and run  cabane setup  again."
       );
     if (res.status === 404 && path.endsWith("/code"))
-      throw new CompanionError(
-        `No pairing endpoint at ${baseUrl}. Either that server is too old for this companion, or it isn't a Cabane API origin: the hosted app is https://app.cabane.ai (pass \`--server <url>\` for your own instance).`
+      throw new StandaloneError(
+        `No pairing endpoint at ${baseUrl}: it isn't a Cabane's address, or that Cabane is too old for this companion.
+Run ${installLineWords()}.`
       );
     const msg = parsed && typeof parsed === "object" && "error" in parsed ? String(parsed.error) : `${res.status}`;
     throw new ApiError(res.status, `${res.status} ${msg}`, parsed);
@@ -10198,6 +10189,7 @@ async function pairDevice(opts, deps = {}) {
         process.exitCode = 130;
         return null;
       }
+      if (!current) opts.onCode?.();
       current = code;
       const minutes = Math.max(1, Math.round(code.expiresIn / 60));
       const codeLines = ["", `  ${code.userCode}`, `  ${code.verificationUri}`, ""];
@@ -10304,10 +10296,10 @@ init_cabane_command();
 init_config();
 init_pairing();
 init_errors();
-init_errors();
-var DEFAULT_BASE_URL = "https://app.cabane.ai";
+init_install_kind();
 function resolvePairBaseUrl(server) {
-  const raw = (server ?? process.env.CABANE_BASE_URL ?? DEFAULT_BASE_URL).trim();
+  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")}\`.`
@@ -10315,6 +10307,20 @@ function resolvePairBaseUrl(server) {
   }
   return raw;
 }
+var NoPairAddressError = class extends StandaloneError {
+  constructor(install = companionInstall()) {
+    const words = installLineWords(install);
+    super(
+      `Setup doesn't know which Cabane to pair this device with. Run the
+${words.slice("the ".length)}.`
+    );
+    this.name = "NoPairAddressError";
+  }
+};
+function rememberPairAddress(baseUrl) {
+  const { local } = loadConfigTolerant();
+  saveConfig({ ...local, baseUrl });
+}
 function writePairedConfig(paired) {
   const { local, note: note2 } = loadConfigTolerant();
   const config = {
@@ -10339,7 +10345,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();
@@ -10356,71 +10361,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) {
@@ -10441,29 +10412,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);
@@ -10476,22 +10439,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);
@@ -10503,52 +10459,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) => {
@@ -10578,15 +10488,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
@@ -10652,7 +10558,7 @@ function turnFailureCopy(reason, runtime) {
     const stopsFirst = commands.length > 1;
     if (!stopsFirst) commands.push("cabane stop");
     commands.push("cabane start");
-    const list = commands.map((command) => `\`${command}\``);
+    const list = commands.map((step) => quoteStep(step, (command) => `\`${command}\``));
     return `${harnessLabel(runtime ?? reason.slice("runtime_incomplete:".length))}'s installation on this device is incomplete. Run ${list.slice(0, -1).join(", ")} and ${list.at(-1)}. ${stopsFirst ? `${STOP_WARNING} ` : ""}Reply in Cabane to try again.`;
   }
   const unavailable = /^(codex|opencode)_unavailable:/.exec(reason ?? "")?.[1] ?? (reason?.startsWith("runtime_unavailable:") ? reason.slice("runtime_unavailable:".length).trim() : void 0);
@@ -11355,7 +11261,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;
@@ -11386,7 +11291,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 {
@@ -11450,17 +11354,8 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
           }
           return;
         case "start":
-          duties.notifyStart({
-            id: event.id,
-            conversationId: event.conversationId,
-            message: event.message
-          });
+          duties.notifyStart({ id: event.id, conversationId: event.conversationId });
           return;
-        case "end": {
-          const { cabaneRunner: _kind, ...info } = event;
-          duties.notifyEnd(info);
-          return;
-        }
         case "session_write_notice":
           duties.markSessionWriteNotice();
           return;
@@ -11564,7 +11459,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 };
 }
 
@@ -11591,12 +11485,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.
@@ -11624,8 +11512,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,
       {
@@ -12724,7 +12611,6 @@ var CompanionSupervisor = class {
   runHarnessCheck;
   probeOpencode;
   exitFn;
-  reexecFn;
   dispatcherFactory;
   runnerCommand;
   runnerEnv;
@@ -12735,8 +12621,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
@@ -12797,7 +12683,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);
@@ -13431,7 +13316,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
     });
   }
@@ -13885,36 +13770,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;
@@ -13942,8 +13800,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.
@@ -14079,9 +13937,6 @@ var CompanionSupervisor = class {
     await this.shutdown();
     this.exitFn(0);
   }
-  requestRestart() {
-    this.reexecFn();
-  }
 };
 async function waitForBoundedHeartbeat(heartbeat) {
   let timer = null;
@@ -14095,21 +13950,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([
@@ -14281,15 +14121,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);
@@ -14329,7 +14160,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
@@ -14340,7 +14171,6 @@ async function createCompanionRuntime(opts = {}) {
   };
   let supervisor;
   let control = null;
-  let dashboard = null;
   let stopped = false;
   const stop2 = async () => {
     if (stopped) return;
@@ -14349,8 +14179,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 {
@@ -14359,12 +14188,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;
@@ -14379,21 +14202,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
@@ -14408,8 +14220,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),
@@ -14433,7 +14244,6 @@ async function createCompanionRuntime(opts = {}) {
   return {
     ok: true,
     runtime: {
-      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
       socketPath: control.path,
       config: cfg,
       stop: stop2,
@@ -14822,6 +14632,7 @@ function userName() {
     return process.env.USER ?? "";
   }
 }
+var SCRIPT_WRAPPER_COMMENT = /^# Written by \S+\/install\.sh\. /m;
 function rewriteScriptWrappers(dir2 = join27(cabaneDir(), "bin")) {
   for (const name of ["cabane", "cabane-companion"]) {
     const path = join27(dir2, name);
@@ -14831,7 +14642,7 @@ function rewriteScriptWrappers(dir2 = join27(cabaneDir(), "bin")) {
     } catch {
       continue;
     }
-    if (!text.includes("Written by https://cabane.ai/install.sh")) continue;
+    if (!SCRIPT_WRAPPER_COMMENT.test(text)) continue;
     if (!text.includes("/dist/cli.js")) continue;
     writeAtomic(path, text.replace("/dist/cli.js", "/dist/bin.js"));
     chmodSync5(path, 493);
@@ -15168,6 +14979,9 @@ async function runAttached(runtime) {
   });
 }
 
+// src/commands/setup.ts
+init_errors();
+
 // src/prompts.ts
 init_term();
 import * as clack from "@clack/prompts";
@@ -15188,7 +15002,8 @@ function terminalUi() {
     },
     spinner: () => railSpinner(),
     outro: (lines2) => clack.outro(lines2.join("\n   ")),
-    cancel: (message2) => clack.cancel(message2)
+    // Clack draws only the first line on the rail's end; the rest align under its text.
+    cancel: (message2) => clack.cancel(message2.split("\n").join("\n   "))
   };
 }
 var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
@@ -15244,7 +15059,10 @@ function plainUi() {
     outro: (lines2) => {
       for (const line of lines2) write(`${INDENT}${line}`);
     },
-    cancel: (message2) => write(`${INDENT}${message2}`)
+    // A closing message can run to more than one line; each is indented like the first.
+    cancel: (message2) => {
+      for (const line of message2.split("\n")) write(`${INDENT}${line}`);
+    }
   };
 }
 
@@ -15256,9 +15074,13 @@ async function setup(opts = {}, deps = {}) {
   try {
     await setupScript(opts, deps);
   } catch (err) {
-    for (const line of pathLines(reloadLine())) write(line);
-    write(err instanceof Error ? err.message : String(err));
-    write(`Check the server connection, then run  ${cabane("setup")}  again.`);
+    if (err instanceof StandaloneError) {
+      write(err.message);
+    } else {
+      for (const line of pathLines(reloadLine())) write(line);
+      write(err instanceof Error ? err.message : String(err));
+      write(`Check the server connection, then run  ${cabane("setup")}  again.`);
+    }
     process.exitCode = 1;
   } finally {
     setConsoleLogging(true);
@@ -15286,8 +15108,21 @@ async function setupScript(opts, deps) {
   }
   let justPaired = false;
   if (!paired) {
-    const baseUrl = resolvePairBaseUrl(opts.server ?? cfg?.baseUrl);
-    const device = await (deps.pair ?? pairDevice)({ baseUrl, interactive, ui });
+    let baseUrl;
+    try {
+      baseUrl = resolvePairBaseUrl(opts.server ?? cfg?.baseUrl);
+    } catch (err) {
+      if (!(err instanceof NoPairAddressError)) throw err;
+      ui.cancel(err.message);
+      process.exitCode = 1;
+      return;
+    }
+    const device = await (deps.pair ?? pairDevice)({
+      baseUrl,
+      interactive,
+      ui,
+      onCode: () => rememberPairAddress(baseUrl)
+    });
     if (!device) return;
     writePairedConfig(device);
     justPaired = true;
@@ -16378,7 +16213,7 @@ init_cabane_command();
 rememberInvokedCommand();
 var program = new Command();
 program.name("cabane").description("Run your Cabane agents on this device, with Claude Code, Codex or OpenCode.").version(COMPANION_VERSION);
-program.command("setup").argument("[code]", "not taken: run  cabane setup  and enter the code it shows in Cabane").description("set up this device: find your agents, pair it with Cabane, and keep it running.").allowExcessArguments(false).option("--server <url>", "the Cabane instance to pair with (default https://app.cabane.ai)").addOption(
+program.command("setup").argument("[code]", "not taken: run  cabane setup  and enter the code it shows in Cabane").description("set up this device: find your agents, pair it with Cabane, and keep it running.").allowExcessArguments(false).option("--server <url>", "the address of the Cabane to pair with").addOption(
   new Option("--log-level <level>", "info (default), warn, or debug").choices([
     "info",
     "warn",