@cabane/companion 0.6.159 → 0.6.161

package/dist/launch.js

@@ -1,50 +1,47 @@
 // src/launch.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { join as join5 } from "path";
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join6 } from "path";
 import { pathToFileURL } from "url";
 
 // src/cabane-command.ts
 import { accessSync, constants, realpathSync as realpathSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { delimiter, join as join2, sep as sep2 } from "path";
+import { homedir as homedir4 } from "os";
+import { basename as basename2, delimiter, dirname as dirname2, join as join3, sep as sep2 } from "path";
 
-// src/bundled-binaries.ts
-import { realpathSync, statSync } from "fs";
-import { createRequire } from "module";
+// src/install-kind.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
-var CODEX_CLI = "@openai/codex";
-var CODEX_PACKAGE_BY_TRIPLE = {
-  "x86_64-unknown-linux-musl": `${CODEX_CLI}-linux-x64`,
-  "aarch64-unknown-linux-musl": `${CODEX_CLI}-linux-arm64`,
-  "x86_64-apple-darwin": `${CODEX_CLI}-darwin-x64`,
-  "aarch64-apple-darwin": `${CODEX_CLI}-darwin-arm64`,
-  "x86_64-pc-windows-msvc": `${CODEX_CLI}-win32-x64`,
-  "aarch64-pc-windows-msvc": `${CODEX_CLI}-win32-arm64`
-};
 
 // src/cli-entry.ts
 import { existsSync } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
-// src/term.ts
-import { createInterface } from "readline";
+// src/install-record.ts
+import { existsSync as existsSync2, readFileSync } from "fs";
 import { homedir as homedir2 } from "os";
+import { basename, join as join2 } from "path";
+
+// src/term.ts
+import { homedir as homedir3 } from "os";
 import pc from "picocolors";
 
+// src/cabane-command.ts
+var VERSIONS_SEGMENT = `${sep2}.cabane${sep2}versions${sep2}`;
+
 // src/config.ts
 import {
   chmodSync,
   mkdirSync,
-  readFileSync,
+  readFileSync as readFileSync2,
   renameSync,
   rmSync,
   writeFileSync,
-  existsSync as existsSync2
+  existsSync as existsSync3
 } from "fs";
-import { homedir as homedir4, userInfo } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { homedir as homedir5, userInfo } from "os";
+import { dirname as dirname3, join as join4 } from "path";
 import { z as z2 } from "zod";
 
 // src/pairing.ts
@@ -101,6 +98,7 @@ var prepareResultSchema = z.object({
 });
 
 // src/config.ts
+var HARNESS_RUNTIMES = ["claude-code", "codex", "opencode"];
 var realHomeCache;
 function realAccountHome() {
   if (realHomeCache === void 0) {
@@ -113,10 +111,10 @@ function realAccountHome() {
   return realHomeCache;
 }
 function cabaneDir() {
-  const dir = join3(process.env.CABANE_COMPANION_HOME || homedir4(), ".cabane");
+  const dir = join4(process.env.CABANE_COMPANION_HOME || homedir5(), ".cabane");
   if (process.env.VITEST) {
     const real = realAccountHome();
-    if (real && dir === join3(real, ".cabane")) {
+    if (real && dir === join4(real, ".cabane")) {
       throw new Error(
         `cabaneDir() resolved to the real ${dir} during a test run. Companion tests must swap process.env.HOME to a tmp dir before touching the config dir; this guard prevents wiping the operator's real companion config (see apps/companion/test/setup-home.ts).`
       );
@@ -185,31 +183,18 @@ var companionConfigSchema = z2.object({
   autoOpen: z2.boolean().optional(),
   logLevel: z2.enum(["warn", "info", "debug"]).optional(),
   logFormat: z2.enum(["human", "json"]).optional(),
-  // An `opencode serve` the operator runs here (auth via opencode's own
-  // `/connect`; Cabane never sees provider keys). Set, the device advertises the
-  // `opencode` runtime and registers its adapter.
+  // Where this device's `opencode serve` answers, when it isn't the default
+  // address (`DEFAULT_OPENCODE_SERVER_URL`). Detection probes this one; a serve
+  // that answers is connected. Auth is opencode's own; Cabane never sees
+  // provider keys.
   opencode: z2.object({
     serverUrl: z2.string().url()
   }).strict().optional(),
-  // Whether the user connected Claude Code on this machine: consent, opted into
-  // like codex. The manifest advertises claude-code only when this says so AND
-  // the Agent SDK's bundled executable resolves (not `claude` on PATH, which the
-  // SDK never runs).
-  //
-  // Absent means one of two things, told apart by `harnessesChosen`: a legacy
-  // config whose user was never asked (`migrateConnectedHarnesses`), or a
-  // device that has never been offered Claude Code. `enabled: false` is a
-  // decline, and `start` doesn't offer it again.
-  //
-  // Not the per-agent `agents.<key>.claudeCode.autoMemory`, one agent's memory
-  // switch.
-  claudeCode: z2.object({
-    enabled: z2.boolean().optional()
-  }).strict().optional(),
-  // Written by every pairing that asks which agents to connect. With it, an
-  // absent `claudeCode` block means "never offered"; without it, the block's
-  // absence marks a config from before connectors were chosen.
-  harnessesChosen: z2.boolean().optional(),
+  // The one knob on agents: an allowlist. Agents are detected, never offered
+  // (`harness-detect.ts`): whatever is signed in here is connected. Someone with
+  // Codex on the device who doesn't want Cabane to see it lists the ones it may:
+  // `"harnesses": ["claude-code"]`. Absent means all three.
+  harnesses: z2.array(z2.enum(HARNESS_RUNTIMES)).optional(),
   // Whether this companion keeps itself current: installs the version Cabane names, between
   // turns, and rolls back one that doesn't come up (`updater.ts`). Absent means never asked,
   // which `start` offers; off either way until someone says yes.
@@ -219,18 +204,6 @@ var companionConfigSchema = z2.object({
   // The answer to `start`'s "start at boot?" when it was no, so it isn't asked again.
   // `cabane service install` still installs it.
   serviceDeclined: z2.boolean().optional(),
-  // OpenCode's decline. Its block is an address, so a decline can't live there
-  // the way `claudeCode`/`codex` `enabled: false` does; without it a declined
-  // serve would be offered again on every `start`.
-  opencodeDeclined: z2.boolean().optional(),
-  // Codex is a local CLI the SDK spawns per turn, so this is an opt-in flag, not
-  // an address. The operator logs in (`codex login` or `CODEX_API_KEY`; Cabane
-  // never sees the key). The block's presence enables it; `enabled: false` turns
-  // it off. Half the answer: advertising also requires the SDK's vendored
-  // `codex` binary to resolve.
-  codex: z2.object({
-    enabled: z2.boolean().optional()
-  }).strict().optional(),
   // Run each turn in a child runner process. Absent or `enabled: false` is the
   // in-process path. `sandbox: 'os'` wraps the runner in an OS sandbox where the
   // host supports one; `'none'` (the default) is a plain child, supported in its
@@ -274,30 +247,36 @@ var companionConfigSchema = z2.object({
     policy: z2.unknown().optional()
   }).strict().optional()
 });
+var legacyOfferSchema = z2.object({
+  claudeCode: z2.object({ enabled: z2.boolean().optional() }).passthrough().optional(),
+  codex: z2.object({ enabled: z2.boolean().optional() }).passthrough().optional(),
+  harnessesChosen: z2.boolean().optional(),
+  opencodeDeclined: z2.boolean().optional()
+});
 
 // src/install-layout.ts
 import {
-  existsSync as existsSync3,
+  existsSync as existsSync4,
   lstatSync,
   mkdirSync as mkdirSync2,
-  readFileSync as readFileSync2,
+  readFileSync as readFileSync3,
   readdirSync,
   realpathSync as realpathSync3,
   renameSync as renameSync2,
   rmSync as rmSync2,
   symlinkSync
 } from "fs";
-import { dirname as dirname3, join as join4 } from "path";
+import { dirname as dirname4, join as join5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function currentLink() {
-  return join4(cabaneDir(), "current");
+  return join5(cabaneDir(), "current");
 }
 function ownPackageRoot(moduleUrl = import.meta.url) {
-  return dirname3(dirname3(fileURLToPath3(moduleUrl)));
+  return dirname4(dirname4(fileURLToPath3(moduleUrl)));
 }
 function packageVersion(root) {
   try {
-    const pkg = JSON.parse(readFileSync2(join4(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync3(join5(root, "package.json"), "utf8"));
     return typeof pkg.version === "string" ? pkg.version : null;
   } catch {
     return null;
@@ -306,14 +285,14 @@ function packageVersion(root) {
 function currentRoot() {
   try {
     const root = realpathSync3(currentLink());
-    return existsSync3(join4(root, "dist", "cli.js")) ? root : null;
+    return existsSync4(join5(root, "dist", "cli.js")) ? root : null;
   } catch {
     return null;
   }
 }
 function pointCurrentAt(root) {
   const link = currentLink();
-  mkdirSync2(dirname3(link), { recursive: true });
+  mkdirSync2(dirname4(link), { recursive: true });
   const fresh = `${link}.${process.pid}.${Date.now()}`;
   symlinkSync(root, fresh);
   try {
@@ -369,7 +348,7 @@ function parseEnvFile(text) {
 function loadServiceEnv() {
   let text;
   try {
-    text = readFileSync3(join5(cabaneDir(), "service.env"), "utf8");
+    text = readFileSync4(join6(cabaneDir(), "service.env"), "utf8");
   } catch {
     return;
   }
@@ -402,7 +381,7 @@ async function launch(argv = process.argv.slice(2)) {
     await import("./cli.js");
     return;
   }
-  await import(pathToFileURL(join5(run.root, "dist", "cli.js")).href);
+  await import(pathToFileURL(join6(run.root, "dist", "cli.js")).href);
 }
 export {
   chooseInstall,

package/dist/pairing-config.js

@@ -1,120 +1,45 @@
 // src/cabane-command.ts
 import { accessSync, constants, realpathSync as realpathSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { delimiter, join as join2, sep as sep2 } from "path";
+import { homedir as homedir4 } from "os";
+import { basename as basename2, delimiter, dirname as dirname2, join as join3, sep as sep2 } from "path";
 
-// src/bundled-binaries.ts
-import { realpathSync, statSync } from "fs";
-import { createRequire } from "module";
+// src/install-kind.ts
+import { realpathSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
-var CODEX_CLI = "@openai/codex";
-var CODEX_PACKAGE_BY_TRIPLE = {
-  "x86_64-unknown-linux-musl": `${CODEX_CLI}-linux-x64`,
-  "aarch64-unknown-linux-musl": `${CODEX_CLI}-linux-arm64`,
-  "x86_64-apple-darwin": `${CODEX_CLI}-darwin-x64`,
-  "aarch64-apple-darwin": `${CODEX_CLI}-darwin-arm64`,
-  "x86_64-pc-windows-msvc": `${CODEX_CLI}-win32-x64`,
-  "aarch64-pc-windows-msvc": `${CODEX_CLI}-win32-arm64`
-};
-function companionInstall(execPath = process.execPath, home = homedir()) {
-  const real = (path) => {
-    try {
-      return realpathSync(path);
-    } catch {
-      return path;
-    }
-  };
-  const scriptNode = join(real(home), ".cabane", "node") + sep;
-  return real(execPath).startsWith(scriptNode) ? "script" : "npm";
-}
 
 // src/cli-entry.ts
 import { existsSync } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-var RELATIVE_CANDIDATES = ["./cli.js", "../dist/cli.js", "../cli.js"];
-function companionCliEntry(deps = {}) {
-  const exists = deps.exists ?? existsSync;
-  const candidates = deps.candidates ?? RELATIVE_CANDIDATES.map((rel) => fileURLToPath2(new URL(rel, import.meta.url)));
-  for (const candidate of candidates) {
-    if (exists(candidate)) return candidate;
-  }
-  const argv1 = "argv1" in deps ? deps.argv1 : process.argv[1];
-  if (argv1 && exists(argv1)) return argv1;
-  return candidates[0] ?? "";
-}
 
-// src/term.ts
-import { createInterface } from "readline";
+// src/install-record.ts
+import { existsSync as existsSync2, readFileSync } from "fs";
 import { homedir as homedir2 } from "os";
+import { basename, join as join2 } from "path";
+
+// src/term.ts
+import { homedir as homedir3 } from "os";
 import pc from "picocolors";
-function tildePath(path, home = homedir2()) {
-  if (home && path.startsWith(home + "/")) return `~${path.slice(home.length)}`;
-  return path;
-}
 
 // src/cabane-command.ts
-function installedCommandPath(deps = {}) {
-  const install = deps.install ?? companionInstall();
-  const home = deps.home ?? homedir3();
-  if (install === "script") return join2(home, ".cabane", "bin", "cabane");
-  const entry = deps.cliEntry ?? companionCliEntry();
-  const marker = `${sep2}lib${sep2}node_modules${sep2}@cabane${sep2}companion${sep2}`;
-  const at = entry.indexOf(marker);
-  if (at < 0) return null;
-  return join2(entry.slice(0, at), "bin", "cabane");
-}
-function cabaneCommand(deps = {}) {
-  const own = installedCommandPath(deps);
-  if (!own) return "cabane";
-  const realpath = deps.realpath ?? safeRealpath;
-  const isExecutable = deps.isExecutable ?? executable;
-  const ownReal = realpath(own);
-  if (!ownReal) return "cabane";
-  const onPath = firstOnPath("cabane", "path" in deps ? deps.path : process.env.PATH, isExecutable);
-  if (onPath && realpath(onPath) === ownReal) return "cabane";
-  return tildePath(own, deps.home);
-}
-function cabane(rest, deps) {
-  return `${cabaneCommand(deps)} ${rest}`;
-}
-function firstOnPath(name, path, isExecutable = executable) {
-  for (const dir of (path ?? "").split(delimiter)) {
-    if (!dir) continue;
-    const candidate = join2(dir, name);
-    if (isExecutable(candidate)) return candidate;
-  }
-  return null;
-}
-function executable(path) {
-  try {
-    accessSync(path, constants.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function safeRealpath(path) {
-  try {
-    return realpathSync2(path);
-  } catch {
-    return null;
-  }
+var VERSIONS_SEGMENT = `${sep2}.cabane${sep2}versions${sep2}`;
+function cabane(rest) {
+  return `cabane ${rest}`;
 }
 
 // src/config.ts
 import {
   chmodSync,
   mkdirSync,
-  readFileSync,
+  readFileSync as readFileSync2,
   renameSync,
   rmSync,
   writeFileSync,
-  existsSync as existsSync2
+  existsSync as existsSync3
 } from "fs";
-import { homedir as homedir4, userInfo } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { homedir as homedir5, userInfo } from "os";
+import { dirname as dirname3, join as join4 } from "path";
 import { z as z2 } from "zod";
 
 // src/errors.ts
@@ -195,6 +120,7 @@ var prepareResultSchema = z.object({
 });
 
 // src/config.ts
+var HARNESS_RUNTIMES = ["claude-code", "codex", "opencode"];
 var realHomeCache;
 function realAccountHome() {
   if (realHomeCache === void 0) {
@@ -207,10 +133,10 @@ function realAccountHome() {
   return realHomeCache;
 }
 function cabaneDir() {
-  const dir = join3(process.env.CABANE_COMPANION_HOME || homedir4(), ".cabane");
+  const dir = join4(process.env.CABANE_COMPANION_HOME || homedir5(), ".cabane");
   if (process.env.VITEST) {
     const real = realAccountHome();
-    if (real && dir === join3(real, ".cabane")) {
+    if (real && dir === join4(real, ".cabane")) {
       throw new Error(
         `cabaneDir() resolved to the real ${dir} during a test run. Companion tests must swap process.env.HOME to a tmp dir before touching the config dir; this guard prevents wiping the operator's real companion config (see apps/companion/test/setup-home.ts).`
       );
@@ -219,7 +145,7 @@ function cabaneDir() {
   return dir;
 }
 function configPath() {
-  return join3(cabaneDir(), "config.json");
+  return join4(cabaneDir(), "config.json");
 }
 var localAgentConfigSchema = z2.object({
   cwd: z2.string().optional(),
@@ -282,31 +208,18 @@ var companionConfigSchema = z2.object({
   autoOpen: z2.boolean().optional(),
   logLevel: z2.enum(["warn", "info", "debug"]).optional(),
   logFormat: z2.enum(["human", "json"]).optional(),
-  // An `opencode serve` the operator runs here (auth via opencode's own
-  // `/connect`; Cabane never sees provider keys). Set, the device advertises the
-  // `opencode` runtime and registers its adapter.
+  // Where this device's `opencode serve` answers, when it isn't the default
+  // address (`DEFAULT_OPENCODE_SERVER_URL`). Detection probes this one; a serve
+  // that answers is connected. Auth is opencode's own; Cabane never sees
+  // provider keys.
   opencode: z2.object({
     serverUrl: z2.string().url()
   }).strict().optional(),
-  // Whether the user connected Claude Code on this machine: consent, opted into
-  // like codex. The manifest advertises claude-code only when this says so AND
-  // the Agent SDK's bundled executable resolves (not `claude` on PATH, which the
-  // SDK never runs).
-  //
-  // Absent means one of two things, told apart by `harnessesChosen`: a legacy
-  // config whose user was never asked (`migrateConnectedHarnesses`), or a
-  // device that has never been offered Claude Code. `enabled: false` is a
-  // decline, and `start` doesn't offer it again.
-  //
-  // Not the per-agent `agents.<key>.claudeCode.autoMemory`, one agent's memory
-  // switch.
-  claudeCode: z2.object({
-    enabled: z2.boolean().optional()
-  }).strict().optional(),
-  // Written by every pairing that asks which agents to connect. With it, an
-  // absent `claudeCode` block means "never offered"; without it, the block's
-  // absence marks a config from before connectors were chosen.
-  harnessesChosen: z2.boolean().optional(),
+  // The one knob on agents: an allowlist. Agents are detected, never offered
+  // (`harness-detect.ts`): whatever is signed in here is connected. Someone with
+  // Codex on the device who doesn't want Cabane to see it lists the ones it may:
+  // `"harnesses": ["claude-code"]`. Absent means all three.
+  harnesses: z2.array(z2.enum(HARNESS_RUNTIMES)).optional(),
   // Whether this companion keeps itself current: installs the version Cabane names, between
   // turns, and rolls back one that doesn't come up (`updater.ts`). Absent means never asked,
   // which `start` offers; off either way until someone says yes.
@@ -316,18 +229,6 @@ var companionConfigSchema = z2.object({
   // The answer to `start`'s "start at boot?" when it was no, so it isn't asked again.
   // `cabane service install` still installs it.
   serviceDeclined: z2.boolean().optional(),
-  // OpenCode's decline. Its block is an address, so a decline can't live there
-  // the way `claudeCode`/`codex` `enabled: false` does; without it a declined
-  // serve would be offered again on every `start`.
-  opencodeDeclined: z2.boolean().optional(),
-  // Codex is a local CLI the SDK spawns per turn, so this is an opt-in flag, not
-  // an address. The operator logs in (`codex login` or `CODEX_API_KEY`; Cabane
-  // never sees the key). The block's presence enables it; `enabled: false` turns
-  // it off. Half the answer: advertising also requires the SDK's vendored
-  // `codex` binary to resolve.
-  codex: z2.object({
-    enabled: z2.boolean().optional()
-  }).strict().optional(),
   // Run each turn in a child runner process. Absent or `enabled: false` is the
   // in-process path. `sandbox: 'os'` wraps the runner in an OS sandbox where the
   // host supports one; `'none'` (the default) is a plain child, supported in its
@@ -371,12 +272,33 @@ var companionConfigSchema = z2.object({
     policy: z2.unknown().optional()
   }).strict().optional()
 });
+var legacyOfferSchema = z2.object({
+  claudeCode: z2.object({ enabled: z2.boolean().optional() }).passthrough().optional(),
+  codex: z2.object({ enabled: z2.boolean().optional() }).passthrough().optional(),
+  harnessesChosen: z2.boolean().optional(),
+  opencodeDeclined: z2.boolean().optional()
+});
+function migrateHarnessAllowlist(raw) {
+  const legacy = legacyOfferSchema.safeParse(raw);
+  if (!legacy.success || !legacy.data.harnessesChosen) return null;
+  const declined = /* @__PURE__ */ new Set();
+  if (legacy.data.claudeCode?.enabled === false) declined.add("claude-code");
+  if (legacy.data.codex?.enabled === false) declined.add("codex");
+  if (legacy.data.opencodeDeclined === true) declined.add("opencode");
+  if (declined.size === 0) return null;
+  return HARNESS_RUNTIMES.filter((runtime) => !declined.has(runtime));
+}
+function carriesLegacyOffer(raw) {
+  if (!raw || typeof raw !== "object") return false;
+  const obj = raw;
+  return "harnessesChosen" in obj || "opencodeDeclined" in obj || typeof obj.claudeCode === "object" && obj.claudeCode !== null && "enabled" in obj.claudeCode || obj.codex !== void 0;
+}
 function loadConfig() {
   const path = configPath();
-  if (!existsSync2(path)) return null;
+  if (!existsSync3(path)) return null;
   let raw;
   try {
-    raw = readFileSync(path, "utf8");
+    raw = readFileSync2(path, "utf8");
   } catch (err) {
     throw new ConfigError(
       `couldn't read ${path}: ${err instanceof Error ? err.message : String(err)}`
@@ -400,19 +322,28 @@ function loadConfig() {
       );
     }
     throw new ConfigError(
-      `${path} is from an incompatible or older version of the companion, or was hand-edited. Run \`${cabane("pair")}\` to re-pair, or \`${cabane("logout --purge")}\` to reset.`
+      `${path} is from an incompatible or older version of the companion, or was hand-edited. Run \`${cabane("setup")}\` to pair again, or \`${cabane("logout --purge")}\` to reset.`
     );
   }
+  if (carriesLegacyOffer(parsed)) {
+    const allowlist = migrateHarnessAllowlist(parsed);
+    const migrated = {
+      ...result.data,
+      ...allowlist && !result.data.harnesses ? { harnesses: allowlist } : {}
+    };
+    saveConfig(migrated);
+    return migrated;
+  }
   return result.data;
 }
 function loadConfigTolerant() {
   const path = configPath();
   const empty = {};
   const fresh = { local: empty, note: null, hadPriorConfig: false };
-  if (!existsSync2(path)) return fresh;
+  if (!existsSync3(path)) return fresh;
   let raw;
   try {
-    raw = readFileSync(path, "utf8");
+    raw = readFileSync2(path, "utf8");
   } catch {
     return fresh;
   }
@@ -436,11 +367,8 @@ function loadConfigTolerant() {
       autoOpen,
       logLevel,
       logFormat,
-      claudeCode: claudeCode2,
-      codex: codex2,
-      opencode: opencode2,
-      opencodeDeclined,
-      harnessesChosen
+      harnesses: harnesses2,
+      opencode: opencode2
     } = strict.data;
     return {
       local: {
@@ -450,11 +378,8 @@ function loadConfigTolerant() {
         ...autoOpen !== void 0 ? { autoOpen } : {},
         ...logLevel !== void 0 ? { logLevel } : {},
         ...logFormat !== void 0 ? { logFormat } : {},
-        ...claudeCode2 !== void 0 ? { claudeCode: claudeCode2 } : {},
-        ...codex2 !== void 0 ? { codex: codex2 } : {},
-        ...opencode2 !== void 0 ? { opencode: opencode2 } : {},
-        ...opencodeDeclined !== void 0 ? { opencodeDeclined } : {},
-        ...harnessesChosen !== void 0 ? { harnessesChosen } : {}
+        ...harnesses2 !== void 0 ? { harnesses: harnesses2 } : {},
+        ...opencode2 !== void 0 ? { opencode: opencode2 } : {}
       },
       note: null,
       hadPriorConfig: true
@@ -472,14 +397,10 @@ function loadConfigTolerant() {
   if (obj.logLevel === "warn" || obj.logLevel === "info" || obj.logLevel === "debug") {
     local.logLevel = obj.logLevel;
   }
-  const claudeCode = companionConfigSchema.shape.claudeCode.safeParse(obj.claudeCode);
-  if (claudeCode.success && claudeCode.data !== void 0) local.claudeCode = claudeCode.data;
-  const codex = companionConfigSchema.shape.codex.safeParse(obj.codex);
-  if (codex.success && codex.data !== void 0) local.codex = codex.data;
+  const harnesses = companionConfigSchema.shape.harnesses.safeParse(obj.harnesses);
+  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;
-  if (obj.opencodeDeclined === true) local.opencodeDeclined = true;
-  if (obj.harnessesChosen === true) local.harnessesChosen = true;
   return {
     local,
     note: `the existing ${path} was from an older or incompatible companion; re-pairing rewrote it.`,
@@ -488,7 +409,7 @@ function loadConfigTolerant() {
 }
 function saveConfig(cfg) {
   const path = configPath();
-  mkdirSync(dirname2(path), { recursive: true });
+  mkdirSync(dirname3(path), { recursive: true });
   try {
     chmodSync(cabaneDir(), 448);
   } catch {
@@ -626,21 +547,14 @@ function resolvePairBaseUrl(server) {
   const raw = (server ?? process.env.CABANE_BASE_URL ?? DEFAULT_BASE_URL).trim();
   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("start --server https://your-cabane")}\`.`
+      `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")}\`.`
     );
   }
   return raw;
 }
 function writePairedConfig(paired) {
-  const { local, note, hadPriorConfig } = loadConfigTolerant();
+  const { local, note } = loadConfigTolerant();
   const config = {
-    // A device pairs connected to NOTHING, and its agents are chosen from here
-    // on: `harnessesChosen` tells the harness migration that an absent
-    // `claudeCode` block means "never offered", not a legacy Claude device.
-    // Only when there was no config before: stamped on a RE-pair, an upgrading
-    // user's working device would be disconnected. `local` spreads after,
-    // keeping a prior answer.
-    ...hadPriorConfig ? {} : { harnessesChosen: true },
     ...local,
     baseUrl: paired.baseUrl,
     deviceToken: paired.deviceToken,