@tablation/crew 0.71.2 → 0.72.0

package/dist/cli.js

@@ -108,6 +108,25 @@ async function settleRepos(items, nameOf, resolve6) {
   }
   return { settled, errors };
 }
+function pidRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e.code !== "ESRCH";
+  }
+}
+function staleOwnLockClaim(holder, shipName2, running = pidRunning) {
+  if (!holder) return false;
+  const i = holder.lastIndexOf(":");
+  if (i < 0 || holder.slice(0, i) !== shipName2) return false;
+  const pid = Number(holder.slice(i + 1));
+  return Number.isInteger(pid) && pid > 0 && !running(pid);
+}
+function formatStaleOwnLock(scope, holder) {
+  return `WARN lock ${scope} is held by ${holder}, but that process is gone \u2014 the next release cycle reclaims it
+`;
+}
 
 // src/selftest.ts
 import { spawn as spawn3 } from "child_process";
@@ -5569,7 +5588,7 @@ import { StaleWriteError } from "@tablation/client";
 function releaseLockScope(route, repo) {
   return `${route}/${repo}`;
 }
-async function acquireBoardLock(client2, modelId, scope, holderLabel, ttlMs) {
+async function acquireBoardLock(client2, modelId, scope, holderLabel, ttlMs, log = {}) {
   if (!modelId) return { ok: true, release: async () => {
   }, exclusion: "off" };
   const filters = JSON.stringify([{ columnName: "scope", operator: "EQ", value: scope }]);
@@ -5577,7 +5596,9 @@ async function acquireBoardLock(client2, modelId, scope, holderLabel, ttlMs) {
   const row = rows[0];
   if (!row) return { ok: false, reason: "missing" };
   const age = Date.now() - new Date(row.updated_at).getTime();
-  const free = !row.holder || row.holder === holderLabel || age > ttlMs;
+  const staleOwn = !!row.holder && row.holder !== holderLabel && isDeadOwnClaim(row.holder, holderLabel);
+  const free = !row.holder || row.holder === holderLabel || age > ttlMs || staleOwn;
+  if (staleOwn) log.warn?.(`reclaimed stale own claim ${row.holder} on ${scope} (process is gone)`);
   if (!free) return { ok: false, heldBy: row.holder ?? void 0, reason: "held" };
   let claimed;
   try {
@@ -5591,12 +5612,34 @@ async function acquireBoardLock(client2, modelId, scope, holderLabel, ttlMs) {
     exclusion: "taken",
     release: async () => {
       try {
-        await client2.update(modelId, row.id, { holder: "" }, claimed.updated_at);
-      } catch {
+        try {
+          await client2.update(modelId, row.id, { holder: "" }, claimed.updated_at);
+        } catch (e) {
+          if (!(e instanceof StaleWriteError)) throw e;
+          const [now] = await client2.list(modelId, { filters: scopeFilter(scope), limit: 1 });
+          if (now?.holder === holderLabel) await client2.update(modelId, row.id, { holder: "" }, now.updated_at);
+        }
+        log.debug?.(`lock released for ${scope}`);
+      } catch (e) {
+        log.warn?.(`lock release failed for ${scope}: ${e.message}`);
       }
     }
   };
 }
+function isDeadOwnClaim(holder, mine) {
+  const split = (l) => {
+    const i = l.lastIndexOf(":");
+    return i < 0 ? null : { ship: l.slice(0, i), pid: Number(l.slice(i + 1)) };
+  };
+  const h = split(holder), m = split(mine);
+  if (!h || !m || h.ship !== m.ship || !Number.isInteger(h.pid) || h.pid <= 0) return false;
+  try {
+    process.kill(h.pid, 0);
+    return false;
+  } catch (e) {
+    return e.code === "ESRCH";
+  }
+}
 async function lockRowState(client2, modelId, scope) {
   const rows = await client2.list(modelId, { filters: scopeFilter(scope), limit: 1 });
   const row = rows[0];
@@ -5877,6 +5920,12 @@ var Tracker = class {
       return [];
     }
   }
+  /** Renames a Ships row (CREW-2495). Throws on a refused write (a member key may not edit the table). */
+  async renameShipRow(rowId, name) {
+    const model = this.route.resolved?.shipsModelId;
+    if (!model) throw new Error("this workspace has no Ships table");
+    await this.client.records.update(model, rowId, { name });
+  }
   /**
    * This ship's own row on the `Ships` table, matched by name — the same
    * exact-string match `doctor` has always used (see the callsign comment
@@ -6068,8 +6117,8 @@ var Tracker = class {
    * Locks table with no row for `scope` is `{ ok: false, reason: 'missing' }`
    * (CREW-1384): `crew connect` provisions the row.
    */
-  acquireBoardLock(scope, holderLabel, ttlMs) {
-    return acquireBoardLock(this.client.records, this.route.resolved?.locksModelId, scope, holderLabel, ttlMs);
+  acquireBoardLock(scope, holderLabel, ttlMs, log) {
+    return acquireBoardLock(this.client.records, this.route.resolved?.locksModelId, scope, holderLabel, ttlMs, log);
   }
   /** The Locks row for `scope` — present? held by whom? Undefined when this workspace has no Locks table. */
   async lockState(scope) {
@@ -8563,9 +8612,9 @@ function doctorSelftestLines(stored, toolchains) {
 }
 
 // src/cli.ts
-import { resolve as resolve5, dirname as dirname19, join as join34, basename as basename11 } from "path";
+import { resolve as resolve5, dirname as dirname20, join as join35, basename as basename11 } from "path";
 import { fileURLToPath } from "url";
-import { hostname as hostname2, homedir as homedir8 } from "os";
+import { hostname as hostname2, homedir as homedir9 } from "os";
 import { spawnSync as spawnSync6 } from "child_process";
 import { parse as parseYaml2 } from "yaml";
 
@@ -8579,6 +8628,7 @@ var VALUE_FLAGS = /* @__PURE__ */ new Set([
   "extra-path",
   "harness",
   "hook",
+  "host",
   "key",
   "level",
   "limit",
@@ -8641,6 +8691,9 @@ function versionRequest(argv2) {
   if (rest.some((a) => a !== "--json")) return null;
   return { json: rest.length > 0 };
 }
+function helpRequest(argv2) {
+  return argv2[0] === "--help" || argv2[0] === "-h" || argv2[0] === "help";
+}
 
 // src/roster.ts
 function memberByIdentity(roster, identityId) {
@@ -8736,7 +8789,7 @@ function rosterMarkdown(roster, meId) {
 }
 
 // src/connect-resume.ts
-import { mkdirSync as mkdirSync10, readFileSync as readFileSync16, writeFileSync as writeFileSync11 } from "fs";
+import { mkdirSync as mkdirSync10, readFileSync as readFileSync16, rmSync as rmSync10, writeFileSync as writeFileSync11 } from "fs";
 import { dirname as dirname8, join as join19 } from "path";
 function lastSessionFile(stateDir) {
   return join19(stateDir, "connect-session.json");
@@ -8771,10 +8824,45 @@ async function resumeKeychainSession(o) {
     return void 0;
   }
 }
+function rememberedSessions(stateDir) {
+  return Object.entries(readPointers(stateDir)).map(([host, workspace]) => ({ host, workspace }));
+}
+function forgetSession(stateDir, host) {
+  try {
+    const { [host]: _gone, ...rest } = readPointers(stateDir);
+    if (Object.keys(rest).length) writeFileSync11(lastSessionFile(stateDir), `${JSON.stringify(rest, null, 2)}
+`, { mode: 384 });
+    else rmSync10(lastSessionFile(stateDir), { force: true });
+  } catch {
+  }
+}
+async function signOutSessions(o) {
+  const targets = rememberedSessions(o.stateDir).filter((t) => !o.host || t.host === o.host);
+  if (o.host && o.workspace && !targets.some((t) => t.host === o.host && t.workspace === o.workspace)) {
+    targets.push({ host: o.host, workspace: o.workspace });
+  }
+  const out = [];
+  for (const t of targets) {
+    try {
+      const stored = await o.store.get(t.host, t.workspace);
+      if (stored?.apiKey) {
+        if (!o.dryRun) await o.store.clear(t.host, t.workspace);
+        out.push({ ...t, action: o.dryRun ? "would-remove" : "removed" });
+      } else {
+        out.push({ ...t, action: "absent", detail: "no keychain entry" });
+      }
+      if (!o.dryRun) forgetSession(o.stateDir, t.host);
+    } catch (e) {
+      out.push({ ...t, action: "failed", detail: e.message });
+    }
+  }
+  return out;
+}
 
 // src/reset.ts
-import { existsSync as existsSync20, mkdirSync as mkdirSync11, readFileSync as readFileSync17, readdirSync as readdirSync7, rmSync as rmSync10, statSync as statSync6, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync20, mkdirSync as mkdirSync11, readFileSync as readFileSync17, readdirSync as readdirSync7, rmSync as rmSync11, statSync as statSync6, writeFileSync as writeFileSync12 } from "fs";
 import { dirname as dirname9, join as join20 } from "path";
+import { hostFromUrl as hostFromUrl2 } from "@tablation/client";
 function clonedCheckoutsFile(stateDir) {
   return join20(stateDir, "cloned-checkouts.json");
 }
@@ -8820,12 +8908,31 @@ async function runReset(o, fx) {
       steps.push({ step: "credential", target: route.route, action: "failed", detail: e.message });
     }
   }
+  const covered = new Set([...o.routes, ...o.droppedRoutes ?? []].map((r) => `${hostFromUrl2(r.baseUrl)}/${splitRoute(r.route)[0]}`));
+  try {
+    for (const s of await fx.hostSessions(o.stateDir)) {
+      const target = `${s.host}/${s.workspace}`;
+      if (covered.has(target)) continue;
+      try {
+        if (!s.stored) {
+          steps.push({ step: "credential", target, action: "absent", detail: "no host session in the keychain" });
+          continue;
+        }
+        if (!o.dryRun) await s.clear();
+        steps.push({ step: "credential", target, action: mark(o.dryRun), detail: "host session stored by a dry-run connect" });
+      } catch (e) {
+        steps.push({ step: "credential", target, action: "failed", detail: e.message });
+      }
+    }
+  } catch (e) {
+    steps.push({ step: "credential", target: "host sessions", action: "failed", detail: e.message });
+  }
   if (o.removeCheckouts) {
     for (const dir of readClonedCheckouts(o.stateDir)) steps.push(removeCheckout(dir, o.dryRun, fx));
   }
   steps.push(...removeState(o.stateDir, o.dryRun));
   if (existsSync20(o.configFile)) {
-    if (!o.dryRun) rmSync10(o.configFile, { force: true });
+    if (!o.dryRun) rmSync11(o.configFile, { force: true });
     steps.push({ step: "config", target: o.configFile, action: mark(o.dryRun) });
   } else {
     steps.push({ step: "config", target: o.configFile, action: "absent" });
@@ -8841,7 +8948,7 @@ function removeCheckout(dir, dryRun, fx) {
   if (linkedWorktrees.length) {
     return { step: "checkout", target: dir, action: "kept", detail: `has linked worktrees (${linkedWorktrees.join(", ")}); remove them first` };
   }
-  if (!dryRun) rmSync10(dir, { recursive: true, force: true });
+  if (!dryRun) rmSync11(dir, { recursive: true, force: true });
   return { step: "checkout", target: dir, action: mark(dryRun) };
 }
 function removeState(stateDir, dryRun) {
@@ -8855,7 +8962,7 @@ function removeState(stateDir, dryRun) {
   }
   for (const t of targets) {
     if (!existsSync20(t)) continue;
-    if (!dryRun) rmSync10(t, { recursive: true, force: true });
+    if (!dryRun) rmSync11(t, { recursive: true, force: true });
     out.push({ step: "state", target: t, action: mark(dryRun) });
   }
   if (!out.length) out.push({ step: "state", target: stateDir, action: "absent", detail: "nothing to remove" });
@@ -10519,7 +10626,9 @@ Wrote ${o.configPath}.
 
 // src/connect-json.ts
 import { accessSync as accessSync3, constants as constants3 } from "fs";
-import { dirname as dirname11 } from "path";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname11, join as join23 } from "path";
+import { delimiter as delimiter2 } from "path";
 var CHOICE_EXIT_CODE = 3;
 function createEmitter(json, write) {
   return {
@@ -10553,6 +10662,23 @@ function usesFlagAnswers(f, isTTY) {
   if (isTTY) return false;
   return !!(f.shipName || f.agentBin || f.extraPath || f.hostPassengers);
 }
+function agentBinSearchDirs(home, pathEnv, extraPath) {
+  const dirs = [
+    ...pathEnv.split(delimiter2),
+    ...(extraPath ?? "").split(delimiter2),
+    join23(home, ".local/bin"),
+    join23(home, ".claude/local"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    join23(home, ".npm-global/bin"),
+    join23(home, ".volta/bin")
+  ];
+  return [...new Set(dirs.filter(Boolean))];
+}
+function findAgentBin(name, env, extraPath, isExec) {
+  const searched = agentBinSearchDirs(env.home ?? homedir7(), env.pathEnv, extraPath);
+  return { bin: findOnPath2(name, searched.join(delimiter2), isExec), searched };
+}
 function flagWizardAnswers(f, env) {
   const isExec = env.isExecutable ?? ((p) => {
     try {
@@ -10562,9 +10688,9 @@ function flagWizardAnswers(f, env) {
       return false;
     }
   });
-  const agentBin = f.agentBin ?? findOnPath2("claude", env.pathEnv, isExec);
-  if (!agentBin) return { error: 'no agent binary: "claude" is not on PATH \u2014 pass --agent-bin /absolute/path' };
   if (f.agentBin && !isExec(f.agentBin)) return { error: `--agent-bin ${f.agentBin} is not an executable file` };
+  const found = f.agentBin ? void 0 : findAgentBin("claude", env, f.extraPath, isExec);
+  const agentBin = f.agentBin ?? found?.bin;
   const pnpmPath = findOnPath2("pnpm", env.pathEnv, isExec);
   const dockerPath = f.hostPassengers ? findOnPath2("docker", env.pathEnv, isExec) : void 0;
   const extraPath = f.extraPath ?? deriveExtraPath([dirname11(env.nodePath), pnpmPath ? dirname11(pnpmPath) : void 0, dockerPath ? dirname11(dockerPath) : void 0]);
@@ -10572,16 +10698,17 @@ function flagWizardAnswers(f, env) {
     answers: {
       name: f.shipName?.trim() || env.hostname,
       platform: env.platform,
-      agentBin,
+      agentBin: agentBin ?? "claude",
       extraPath,
       hostPassengers: f.hostPassengers
-    }
+    },
+    ...agentBin ? {} : { agentBinSearched: found?.searched ?? [] }
   };
 }
 
 // src/release-run.ts
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync15, existsSync as existsSync22, copyFileSync, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync2, rmSync as rmSync11 } from "fs";
-import { dirname as dirname12, join as join23 } from "path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync15, existsSync as existsSync22, copyFileSync, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync2, rmSync as rmSync12 } from "fs";
+import { dirname as dirname12, join as join24 } from "path";
 import { tmpdir as tmpdir3 } from "os";
 
 // src/release.ts
@@ -11299,7 +11426,7 @@ async function bump(o, size) {
     }
     return printed;
   }
-  const files = o.repo.release.versionFiles.map((f) => join23(o.cwd, f));
+  const files = o.repo.release.versionFiles.map((f) => join24(o.cwd, f));
   const first = files[0];
   if (!existsSync22(first)) {
     o.emit.error(`no ${o.repo.release.versionFiles[0]} to read a version from`);
@@ -11331,7 +11458,7 @@ async function bump(o, size) {
 function writeChangelog(o, version, entries) {
   const file = o.repo.release.changelog;
   if (!file || entries.length === 0) return;
-  const path = join23(o.cwd, file);
+  const path = join24(o.cwd, file);
   const section = renderChangelogSection(version, (/* @__PURE__ */ new Date()).toISOString().slice(0, 10), entries);
   if (o.dryRun) {
     o.emit.emit(`would prepend ${entries.length} entr(ies) to ${file}`);
@@ -11421,7 +11548,7 @@ function closeReleaseCheckout(cwd, root, dir, branch, run2 = gitOk) {
     run2(cwd, ["worktree", "remove", "--force", dir]);
   } finally {
     try {
-      rmSync11(root, { recursive: true, force: true });
+      rmSync12(root, { recursive: true, force: true });
     } finally {
       run2(cwd, ["worktree", "prune"]);
       run2(cwd, ["branch", "-D", branch]);
@@ -11431,8 +11558,8 @@ function closeReleaseCheckout(cwd, root, dir, branch, run2 = gitOk) {
 function openReleaseCheckout(o) {
   const { remote, base } = o.repo.branch;
   const branch = `crew/release-${Date.now()}`;
-  const root = mkdtempSync2(join23(tmpdir3(), "crew-release-"));
-  const dir = join23(root, "checkout");
+  const root = mkdtempSync2(join24(tmpdir3(), "crew-release-"));
+  const dir = join24(root, "checkout");
   o.emit.emit(`release checkout: ${dir}`, { step: "release" });
   const close = () => closeReleaseCheckout(o.cwd, root, dir, branch);
   try {
@@ -11442,10 +11569,10 @@ function openReleaseCheckout(o) {
     throw e;
   }
   for (const f of o.repo.worktrees.copy) {
-    const src = join23(o.cwd, f);
+    const src = join24(o.cwd, f);
     if (!existsSync22(src)) continue;
-    mkdirSync13(dirname12(join23(dir, f)), { recursive: true });
-    copyFileSync(src, join23(dir, f));
+    mkdirSync13(dirname12(join24(dir, f)), { recursive: true });
+    copyFileSync(src, join24(dir, f));
   }
   return { dir, branch, close };
 }
@@ -12515,6 +12642,217 @@ function nextRoles(decision, ran) {
   return decision.selection.pending.filter((r) => !ran.includes(r)).sort((a, b) => (decision.selection.ranks[a] ?? 0) - (decision.selection.ranks[b] ?? 0));
 }
 
+// src/ship-name.ts
+import { existsSync as existsSync25, mkdirSync as mkdirSync15, readFileSync as readFileSync20, renameSync as renameSync2, writeFileSync as writeFileSync17 } from "fs";
+import { dirname as dirname14 } from "path";
+import { parseDocument } from "yaml";
+
+// src/machine-id.ts
+import { execFileSync as execFileSync4 } from "child_process";
+import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync24, mkdirSync as mkdirSync14, readFileSync as readFileSync19, writeFileSync as writeFileSync16 } from "fs";
+import { dirname as dirname13, join as join25 } from "path";
+function machineIdPathFor(stateDir) {
+  return join25(stateDir, "machine-id");
+}
+var sha256 = (s) => createHash3("sha256").update(s).digest("hex");
+function readRawMachineId(platform2 = process.platform) {
+  try {
+    if (platform2 === "darwin") {
+      const out = execFileSync4("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+      return /"IOPlatformUUID"\s*=\s*"([^"]+)"/.exec(out)?.[1];
+    }
+    for (const p of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
+      if (existsSync24(p)) {
+        const id = readFileSync19(p, "utf8").trim();
+        if (id) return id;
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
+function ensureMachineId(stateDir, opts = {}) {
+  if (opts.override?.trim()) return sha256(opts.override.trim());
+  const path = machineIdPathFor(stateDir);
+  if (existsSync24(path)) {
+    const cached = readFileSync19(path, "utf8").trim();
+    if (/^[0-9a-f]{64}$/.test(cached)) return cached;
+  }
+  const raw = (opts.read ?? readRawMachineId)();
+  if (!raw) return void 0;
+  const hashed = sha256(raw);
+  mkdirSync14(dirname13(path), { recursive: true });
+  writeFileSync16(path, `${hashed}
+`, { mode: 384 });
+  return hashed;
+}
+function matchShipRows(ships, shipName2, machineId) {
+  const hasColumn = ships.some((r) => "machine_id" in r);
+  const byId = hasColumn && machineId ? ships.filter((r) => r.machine_id === machineId) : [];
+  if (byId.length > 0) return { rows: byId, by: "machine_id", hasColumn };
+  return { rows: ships.filter((r) => (r.name ?? "").trim() === shipName2.trim()), by: "name", hasColumn };
+}
+
+// src/ship-name.ts
+var ShipNameError = class extends Error {
+};
+function validateShipName(raw) {
+  const name = raw.trim();
+  if (!name) throw new ShipNameError("the ship name cannot be empty");
+  if (/[\u0000-\u001f\u007f]/.test(name)) throw new ShipNameError("the ship name cannot contain control characters");
+  return name;
+}
+function planNameSync(local, row, lastSynced) {
+  if (local === row) return { drift: "none", action: "none" };
+  const rowMoved = lastSynced === void 0 || row !== lastSynced;
+  const localMoved = lastSynced === void 0 || local !== lastSynced;
+  if (rowMoved && localMoved) return { drift: "both", action: "row-wins" };
+  if (rowMoved) return { drift: "row", action: "adopt" };
+  return { drift: "local", action: "push" };
+}
+function shipNameOfYaml(text) {
+  const v = parseDocument(text).getIn(["ship", "name"]);
+  return typeof v === "string" && v.trim() ? v.trim() : void 0;
+}
+function setShipNameInYaml(text, name) {
+  const doc = parseDocument(text);
+  doc.setIn(["ship", "name"], name);
+  return doc.toString();
+}
+function pickShipRow(rows, machineId, byName = []) {
+  const hasColumn = rows.some((r) => "machine_id" in r);
+  if (!hasColumn || !machineId) return { kind: "unsupported" };
+  const byId = rows.filter((r) => r.machine_id === machineId);
+  if (byId.length === 1) return { kind: "row", row: byId[0], by: "machine_id" };
+  if (byId.length > 1) return { kind: "ambiguous" };
+  const names = new Set(byName.map((n) => n.trim()));
+  const named = rows.filter((r) => !r.machine_id && names.has((r.name ?? "").trim()));
+  if (named.length === 1) return { kind: "row", row: named[0], by: "name" };
+  return { kind: named.length > 1 ? "ambiguous" : "none" };
+}
+async function syncRouteName(i) {
+  const picked = pickShipRow(i.rows, i.machineId);
+  if (picked.kind !== "row") {
+    const status2 = picked.kind === "none" ? "no-row" : picked.kind;
+    return { status: status2, drift: "none", action: "none", name: i.local };
+  }
+  const rowName = (picked.row.name ?? "").trim();
+  if (!rowName) return { status: "no-row", drift: "none", action: "none", name: i.local };
+  const { drift, action } = planNameSync(i.local, rowName, i.lastSynced);
+  const base = { drift, rowId: picked.row.id, rowName };
+  if (action === "push") {
+    if (!i.rename) return { status: "ok", ...base, action, name: i.local };
+    try {
+      await i.rename(picked.row.id, i.local);
+    } catch (e) {
+      return { status: "refused", ...base, action: "none", name: i.local, error: e.message };
+    }
+    return { status: "ok", ...base, action, name: i.local };
+  }
+  if (action === "adopt" || action === "row-wins") return { status: "ok", ...base, action, name: rowName, from: i.local };
+  return { status: "ok", ...base, action, name: i.local };
+}
+function readSyncedName(resolvedFile) {
+  if (!existsSync25(resolvedFile)) return void 0;
+  try {
+    const v = JSON.parse(readFileSync20(resolvedFile, "utf8")).shipName;
+    return typeof v === "string" ? v : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function writeSyncedName(resolvedFile, name) {
+  if (!existsSync25(resolvedFile)) return;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync20(resolvedFile, "utf8"));
+  } catch {
+    return;
+  }
+  if (raw.shipName === name) return;
+  raw.shipName = name;
+  mkdirSync15(dirname14(resolvedFile), { recursive: true });
+  const tmp = `${resolvedFile}.tmp${process.pid}`;
+  writeFileSync17(tmp, `${JSON.stringify(raw, null, 2)}
+`);
+  renameSync2(tmp, resolvedFile);
+}
+async function reconcileShipName(i) {
+  let local = i.ship.name;
+  try {
+    local = shipNameOfYaml(readFileSync20(i.configFile, "utf8")) ?? local;
+  } catch {
+  }
+  const resolvedFile = resolvedPathFor(i.stateDir, i.route);
+  const lastSynced = readSyncedName(resolvedFile);
+  let rows = [];
+  try {
+    rows = await i.rows();
+  } catch {
+  }
+  const result = await syncRouteName({
+    local,
+    lastSynced,
+    rows,
+    machineId: i.machineId,
+    rename: i.readOnly ? void 0 : i.rename
+  });
+  if (i.readOnly || result.status === "unsupported") return result;
+  if (result.status === "refused") {
+    i.emit?.warn(`could not rename the Ships row to "${local}": ${result.error}`, { step: "poll", data: { event: "ship_rename_refused", route: i.route, to: local } });
+    return result;
+  }
+  if (result.status !== "ok") return result;
+  if (result.action === "adopt" || result.action === "row-wins") {
+    const text = readFileSync20(i.configFile, "utf8");
+    writeFileSync17(i.configFile, setShipNameInYaml(text, result.name));
+    i.ship.name = result.name;
+    if (result.action === "row-wins") {
+      i.emit?.warn(
+        `ship name changed in both crew.yaml ("${result.from}") and the Ships table ("${result.name}"); the Ships row wins`,
+        { step: "poll", data: { event: "ship_renamed", route: i.route, from: result.from, to: result.name, source: "table", conflict: true } }
+      );
+    } else {
+      i.emit?.emit(`ship renamed to "${result.name}" in the Ships table; crew.yaml updated`, {
+        step: "poll",
+        data: { event: "ship_renamed", route: i.route, from: result.from, to: result.name, source: "table" }
+      });
+    }
+  } else if (result.action === "push") {
+    i.emit?.emit(`ship name "${result.name}" pushed to the Ships table`, {
+      step: "poll",
+      data: { event: "ship_renamed", route: i.route, from: result.rowName, to: result.name, source: "crew.yaml" }
+    });
+  }
+  writeSyncedName(resolvedFile, result.name);
+  return result;
+}
+async function reconcileRouteShipName(o) {
+  const fallback = { status: "unsupported", drift: "none", action: "none", name: o.ship.name };
+  if (!o.route.resolved?.shipsModelId) return fallback;
+  try {
+    const machineId = o.machineId ?? ensureMachineId(o.ship.stateDir);
+    const tracker = new Tracker(o.route, o.ship);
+    return await reconcileShipName({
+      route: o.route.route,
+      configFile: o.configFile,
+      stateDir: o.ship.stateDir,
+      ship: o.ship,
+      machineId,
+      rows: () => tracker.shipRows(),
+      rename: (id, name) => tracker.renameShipRow(id, name),
+      emit: o.emit,
+      readOnly: o.readOnly
+    });
+  } catch {
+    return fallback;
+  }
+}
+
 // src/connect.ts
 var ConnectHttpError = class extends Error {
   status;
@@ -12592,7 +12930,22 @@ async function provisionReleaseLocks(o, locksModelId, route, repoNames) {
   };
   return ensureLockRows(client2, locksModelId, scopes);
 }
-var ISSUES_TEMPLATE_IDENTIFIER = "crew.issues";
+var ISSUES_TEMPLATE_IDENTIFIERS = ["tablation.issues", "crew.issues"];
+async function resolveIssuesTemplateKeys(o) {
+  const keys = new Set(ISSUES_TEMPLATE_IDENTIFIERS);
+  await Promise.all(ISSUES_TEMPLATE_IDENTIFIERS.map(async (identifier) => {
+    try {
+      const t = await get(
+        o,
+        `/library-templates/by-identifier/${encodeURIComponent(identifier)}`
+      );
+      if (t.id) keys.add(t.id);
+      if (t.identifier) keys.add(t.identifier);
+    } catch {
+    }
+  }));
+  return keys;
+}
 async function listLibraryTemplates(o) {
   return get(o, "/library-templates");
 }
@@ -12633,6 +12986,7 @@ async function discover(o) {
     models: {},
     seats: {},
     holds: [],
+    candidates: [],
     problems,
     provisioning
   };
@@ -12641,6 +12995,7 @@ async function discover(o) {
     out.role = me.role;
     out.meEmail = me.email;
     out.meId = me.id;
+    out.meIdentityId = me.identityId;
     out.meName = me.name;
   } catch {
   }
@@ -12664,7 +13019,8 @@ async function discover(o) {
     }
   } else {
     const projects = await get(o, `/projects?workspaceId=${ws.id}`);
-    const defaultCandidate = projects.find((p) => p.sourceTemplateId === ISSUES_TEMPLATE_IDENTIFIER) ?? projects.find((p) => eq(p.slug ?? "", "issues"));
+    const issuesKeys = await resolveIssuesTemplateKeys(o);
+    const defaultCandidate = projects.find((p) => !!p.sourceTemplateId && issuesKeys.has(p.sourceTemplateId)) ?? projects.find((p) => eq(p.slug ?? "", "issues"));
     if (defaultCandidate && (await missingTables(o, defaultCandidate.id)).length === 0) {
       out.projectId = defaultCandidate.id;
       out.projectSlug = defaultCandidate.slug;
@@ -12802,10 +13158,16 @@ async function discover(o) {
       out.shipRow = { id: shipRowId, name: o.ship.name, action: "matched", matchedBy };
       const patchBody = {};
       if (matchedBy === "machine_id") {
-        const keptName = (mine[0].name ?? "").trim();
-        if (keptName !== o.ship.name.trim()) {
-          out.shipRow.name = keptName;
-          provisioning.push(`matched Ships row "${keptName}" by machine id \u2014 this host is now called "${o.ship.name}"; the row's name is kept`);
+        const rowName = (mine[0].name ?? "").trim();
+        const route = `${out.workspaceSlug}/${out.projectSlug ?? out.projectId}`;
+        const plan = planNameSync(o.ship.name.trim(), rowName, o.ship.lastSyncedName?.(route));
+        if (plan.action === "push") {
+          patchBody.name = o.ship.name.trim();
+          provisioning.push(`renamed Ships row "${rowName}" to "${o.ship.name.trim()}" (crew.yaml changed)`);
+        } else if (plan.action === "adopt" || plan.action === "row-wins") {
+          out.shipRow.name = rowName;
+          out.shipNameAdopted = rowName;
+          provisioning.push(`matched Ships row "${rowName}" by machine id \u2014 this host's name becomes "${rowName}"${plan.action === "row-wins" ? " (crew.yaml also changed; the Ships row wins)" : ""}`);
         }
         patchBody.last_seen = (/* @__PURE__ */ new Date()).toISOString();
       }
@@ -12856,13 +13218,32 @@ async function discover(o) {
       o,
       `/data-models/${out.models.crew}/records?limit=200`
     );
-    const scoped = shipRowId ? rows.filter((r) => r.ship_id === shipRowId) : rows;
-    const unclaimed = shipRowId ? rows.filter((r) => !r.ship_id) : [];
+    let seatShipId = shipRowId;
+    if (!seatShipId && o.dryRun && o.ship && out.shipsModelId) {
+      try {
+        const shipRows = await get(
+          o,
+          `/data-models/${out.shipsModelId}/records?limit=200`
+        );
+        const byId = o.ship.machineId ? shipRows.filter((r) => r.machine_id === o.ship.machineId) : [];
+        const mineRows = byId.length > 0 ? byId : shipRows.filter((r) => (r.name ?? "").trim() === o.ship.name.trim() && !r.machine_id);
+        if (mineRows.length === 1) seatShipId = mineRows[0].id;
+      } catch {
+      }
+    }
+    const scoped = seatShipId ? rows.filter((r) => r.ship_id === seatShipId) : rows.filter((r) => !r.ship_id);
+    const unclaimed = seatShipId ? rows.filter((r) => !r.ship_id) : [];
     for (const role of ["dev", "design", "qa", "triage"]) {
       const searchTerm = role === "dev" ? "develop" : role;
       let id = seatFor(scoped, searchTerm);
       let seatAction = "matched";
-      if (!id && shipRowId) {
+      if (!id && seatShipId && !shipRowId) {
+        const legacyId = seatFor(unclaimed, searchTerm);
+        if (legacyId) {
+          id = legacyId;
+          seatAction = "claimed";
+        }
+      } else if (!id && shipRowId) {
         const legacyId = seatFor(unclaimed, searchTerm);
         if (legacyId) {
           await patch(o, `/data-models/${out.models.crew}/records/${legacyId}`, { ship_id: shipRowId });
@@ -12882,10 +13263,13 @@ async function discover(o) {
       }
       if (id) {
         out.seats[role] = id;
-        (out.seatRows ??= []).push({ role, id, action: seatAction });
+        const rowShip = rows.find((r) => r.id === id)?.ship_id ?? shipRowId ?? void 0;
+        (out.seatRows ??= []).push({ role, id, action: seatAction, ...rowShip ? { shipId: rowShip } : {} });
+      } else if (o.dryRun && o.ship && out.shipsModelId) {
+        (out.seatRows ??= []).push({ role, id: "", action: "would-create" });
       } else problems.push(`no Crew row looking like the ${role} seat \u2014 create one, or omit that role`);
     }
-    const pairId = seatFor(scoped, "pair") || (shipRowId ? seatFor(unclaimed, "pair") : void 0);
+    const pairId = seatFor(scoped, "pair") || (seatShipId ? seatFor(unclaimed, "pair") : void 0);
     if (pairId) out.seats.pair = pairId;
     if (shipRowId) {
       const releaseId = seatFor(scoped, "release");
@@ -12903,25 +13287,56 @@ async function discover(o) {
     const holdRows = rows.filter((r) => !seatIds.has(r.id));
     out.holds = holdRows.map((r) => ({ id: r.id, name: r.name ?? "", email: r.email, user_id: r.user_id }));
     out.crewModelId = out.models.crew;
+    const people = holdRows.filter((r) => !r.agent_id && (!r.ship_id || !!r.user_id));
+    const members = /* @__PURE__ */ new Map();
+    try {
+      const list = await get(
+        o,
+        `/workspaces/${out.workspaceId}/members`
+      );
+      for (const m of Array.isArray(list) ? list : []) {
+        const key = m.id ?? m.userId;
+        if (key) members.set(key, { identityId: m.identityId, email: m.email });
+      }
+    } catch {
+    }
+    for (const h of out.holds) {
+      const e = h.user_id ? members.get(h.user_id)?.email : void 0;
+      if (e) h.memberEmail = e;
+    }
+    out.candidates = people.map((r) => ({
+      id: r.id,
+      name: r.name ?? "",
+      email: r.email,
+      user_id: r.user_id,
+      detail: r.email || (r.user_id ? members.get(r.user_id)?.email : void 0) || void 0
+    }));
+    const isMine = (r) => !!r.user_id && (r.user_id === out.meId || !!out.meIdentityId && members.get(r.user_id)?.identityId === out.meIdentityId);
+    const emailOf = (r) => [r.email, r.user_id ? members.get(r.user_id)?.email : void 0].filter((e) => !!e);
     if (!out.meId) {
-      if (out.holds.length === 0) problems.push("no non-seat Crew rows \u2014 which row is the operator?");
+      if (out.candidates.length === 0) problems.push("no non-seat Crew rows \u2014 which row is the operator?");
       else {
-        const byEmail = out.meEmail ? holdRows.filter((r) => eq(r.email, out.meEmail)) : [];
+        const byEmail = out.meEmail ? people.filter((r) => emailOf(r).some((e) => eq(e, out.meEmail))) : [];
         if (byEmail.length === 1) out.operator = byEmail[0].id;
-        else if (out.holds.length === 1) out.operator = out.holds[0].id;
+        else if (out.candidates.length === 1) out.operator = out.candidates[0].id;
       }
     } else {
-      const candidates = holdRows.filter((r) => !r.user_id || r.user_id === out.meId);
-      const mine = holdRows.find((r) => r.user_id === out.meId);
-      const byEmail = out.meEmail ? candidates.filter((r) => eq(r.email, out.meEmail)) : [];
-      const only = holdRows.length === 1 && candidates.length === 1 ? candidates[0] : void 0;
+      const candidates = people.filter((r) => !r.user_id || isMine(r));
+      const mine = people.find(isMine);
+      const byEmail = out.meEmail ? candidates.filter((r) => emailOf(r).some((e) => eq(e, out.meEmail))) : [];
+      const unlinked = people.filter((r) => !r.user_id);
+      const only = candidates.length === 1 && unlinked.length === 1 ? candidates[0] : void 0;
       const pick = mine ?? (byEmail.length === 1 ? byEmail[0] : only);
       if (pick) {
         out.operator = pick.id;
-        out.operatorAction = pick.user_id === out.meId ? "matched" : "linked";
-        if (pick.user_id !== out.meId && o.ship) await linkOperatorRow(o, out, pick);
-      } else if (o.ship && (!o.interactive || candidates.length === 0)) {
-        await createOperatorRow(o, out);
+        out.operatorAction = isMine(pick) ? "matched" : "linked";
+        if (!isMine(pick) && o.ship) await linkOperatorRow(o, out, pick);
+      } else {
+        out.operatorCompared = `signed in as ${out.meEmail ?? "unknown email"} (identity ${out.meIdentityId ?? out.meId}); ` + (people.length === 0 ? "no person rows in the Crew table" : people.map((r) => {
+          const m = r.user_id ? members.get(r.user_id) : void 0;
+          return `"${r.name || "unnamed row"}" <${r.email ?? "no email"}>` + (r.user_id ? ` linked to member ${m?.email ?? r.user_id}${m?.identityId ? ` (identity ${m.identityId})` : ""}` : " unlinked");
+        }).join("; "));
+        if (o.ship && (!o.interactive || candidates.length === 0)) await createOperatorRow(o, out);
       }
     }
   }
@@ -12962,6 +13377,7 @@ async function createOperatorRow(o, found) {
     found.operator = created.id;
     found.operatorAction = "created";
     found.holds.push({ id: created.id, name, email: found.meEmail, user_id: found.meId });
+    found.candidates.push({ id: created.id, name, email: found.meEmail, user_id: found.meId, detail: found.meEmail });
     found.provisioning.push(`created Crew row "${name}" for you`);
   } catch (e) {
     if (!(e instanceof ConnectHttpError) || e.status !== 403) throw e;
@@ -12991,14 +13407,14 @@ ${opts.hostPassengers ? "    hostPassengers: true\n" : ""}${apiKeyFileLine}${api
 // src/cli.ts
 import {
   getSessionStore as getSessionStore3,
-  hostFromUrl as hostFromUrl3,
+  hostFromUrl as hostFromUrl4,
   loginWithDeviceCode,
   getOrCreateShipId,
   DeviceLoginError
 } from "@tablation/client";
 
 // src/seat-keys.ts
-import { getSessionStore as getSessionStore2, hostFromUrl as hostFromUrl2 } from "@tablation/client";
+import { getSessionStore as getSessionStore2, hostFromUrl as hostFromUrl3 } from "@tablation/client";
 var SEAT_KEY_ROLES = ROLE_NAMES.filter((r) => r !== "pair");
 function keyIsAdmin(route) {
   const role = route.resolved?.role;
@@ -13022,7 +13438,7 @@ async function resolveReleaseKey(route, getStore = getSessionStore2) {
   const agentId = route.resolved?.releaseAgentId;
   if (!agentId) return ship(keyIsAdmin(route) ? "release seat has no linked Agents row (run `crew agents sync`)" : `release seat ${MEMBER_NO_ROW}`);
   try {
-    const session = await getStore().get(hostFromUrl2(route.baseUrl), slugFor(route, agentId));
+    const session = await getStore().get(hostFromUrl3(route.baseUrl), slugFor(route, agentId));
     if (session?.apiKey) return { kind: "agent", apiKey: session.apiKey, agentId };
     return ship(keyIsAdmin(route) ? "no agent key stored for the release seat (run `crew agents sync`)" : MEMBER_NO_KEY);
   } catch {
@@ -13035,7 +13451,7 @@ async function resolveSeatKey(route, role, getStore = getSessionStore2) {
   const agentId = seatAgentId(route, role);
   if (!agentId) return ship(keyIsAdmin(route) ? "seat has no linked Agents row (run `crew agents sync`)" : `seat ${MEMBER_NO_ROW}`);
   try {
-    const session = await getStore().get(hostFromUrl2(route.baseUrl), slugFor(route, agentId));
+    const session = await getStore().get(hostFromUrl3(route.baseUrl), slugFor(route, agentId));
     if (session?.apiKey) return { kind: "agent", apiKey: session.apiKey, agentId };
     return ship(keyIsAdmin(route) ? "no agent key stored for this seat (run `crew agents sync`)" : MEMBER_NO_KEY);
   } catch {
@@ -13068,7 +13484,7 @@ async function mintMissingSeatKeys(route, o) {
       detail: describeStoreError(e)
     }));
   }
-  const host = hostFromUrl2(route.baseUrl);
+  const host = hostFromUrl3(route.baseUrl);
   const base = route.baseUrl.replace(/\/+$/, "");
   if (!o.dryRun) {
     const probeSlug = seatKeySlug(splitRoute(route.route)[0], "_probe");
@@ -13189,7 +13605,7 @@ async function revokeSeatKeys(route, o) {
   } catch (e) {
     return targets.map(({ role }) => ({ role, action: "failed", detail: describeStoreError(e) }));
   }
-  const host = hostFromUrl2(route.baseUrl);
+  const host = hostFromUrl3(route.baseUrl);
   const base = route.baseUrl.replace(/\/+$/, "");
   for (const { role, agentId } of targets) {
     if (!agentId) {
@@ -13301,8 +13717,8 @@ function describeCapability(i) {
 }
 
 // src/agents-sync-run.ts
-import { existsSync as existsSync24, mkdirSync as mkdirSync14, readFileSync as readFileSync19, writeFileSync as writeFileSync16 } from "fs";
-import { dirname as dirname13 } from "path";
+import { existsSync as existsSync26, mkdirSync as mkdirSync16, readFileSync as readFileSync21, writeFileSync as writeFileSync18 } from "fs";
+import { dirname as dirname15 } from "path";
 async function runAgentsSync(target, o) {
   const dryRun = o.dryRun ?? false;
   const force = o.force ?? false;
@@ -13335,12 +13751,12 @@ async function runAgentsSync(target, o) {
   for (const s of skillResult?.outcomes ?? []) o.say(describeSkillSyncOutcome(s));
   if (!dryRun) {
     const resolvedPath = resolvedPathFor(o.stateDir, target.route);
-    const raw = existsSync24(resolvedPath) ? JSON.parse(readFileSync19(resolvedPath, "utf8")) : {};
+    const raw = existsSync26(resolvedPath) ? JSON.parse(readFileSync21(resolvedPath, "utf8")) : {};
     raw.agentPersonas = personaResult.agentPersonas;
     if (skillResult) raw.agentSkills = skillResult.agentSkills;
     if (personaResult.releaseAgentId) raw.releaseAgentId = personaResult.releaseAgentId;
-    mkdirSync14(dirname13(resolvedPath), { recursive: true });
-    writeFileSync16(resolvedPath, `${JSON.stringify(raw, null, 2)}
+    mkdirSync16(dirname15(resolvedPath), { recursive: true });
+    writeFileSync18(resolvedPath, `${JSON.stringify(raw, null, 2)}
 `);
     if (target.resolved) {
       target.resolved.agentPersonas = personaResult.agentPersonas;
@@ -13355,7 +13771,7 @@ async function runAgentsSync(target, o) {
 }
 
 // src/logbook.ts
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 import { TablationClient as TablationClient4 } from "@tablation/client";
 var LogbookError = class extends Error {
 };
@@ -13428,7 +13844,7 @@ async function showLogEntry(route, entryId, opts = {}) {
     };
   }
   const prompt = appendAdditions(match.prompt ?? "", match.prompt_additions);
-  const actualSha = createHash3("sha256").update(prompt).digest("hex");
+  const actualSha = createHash4("sha256").update(prompt).digest("hex");
   const exact = !!entry.prompt_sha && actualSha === entry.prompt_sha;
   return {
     entry,
@@ -13443,12 +13859,12 @@ async function showLogEntry(route, entryId, opts = {}) {
 }
 
 // src/repos-hooks.ts
-import { isMap as isMap2, parseDocument as parseDocument2, YAMLMap } from "yaml";
+import { isMap as isMap2, parseDocument as parseDocument3, YAMLMap } from "yaml";
 
 // src/repos-cmd.ts
-import { homedir as homedir7 } from "os";
-import { basename as basename8, join as join24, resolve as resolve3 } from "path";
-import { isMap, isSeq, parseDocument, stringify as stringify2 } from "yaml";
+import { homedir as homedir8 } from "os";
+import { basename as basename8, join as join26, resolve as resolve3 } from "path";
+import { isMap, isSeq, parseDocument as parseDocument2, stringify as stringify2 } from "yaml";
 var ReposError = class extends Error {
 };
 function normalizeRemote(url) {
@@ -13472,7 +13888,7 @@ function matchRepoName(origin, resolved) {
   return void 0;
 }
 function routeNamesOf(text) {
-  const routes = parseDocument(text).get("routes", true);
+  const routes = parseDocument2(text).get("routes", true);
   if (!isSeq(routes)) return [];
   return routes.items.flatMap((i) => isMap(i) && typeof i.get("route") === "string" ? [i.get("route")] : []);
 }
@@ -13493,7 +13909,7 @@ function parseAddArgs(args, routes, isDir) {
   return { route, path: "." };
 }
 function expandDir(p, base) {
-  const home = p === "~" ? homedir7() : p.startsWith("~/") ? `${homedir7()}/${p.slice(2)}` : p;
+  const home = p === "~" ? homedir8() : p.startsWith("~/") ? `${homedir8()}/${p.slice(2)}` : p;
   return resolve3(base, home);
 }
 function routeMapOf(doc, route) {
@@ -13507,7 +13923,7 @@ function routeMapOf(doc, route) {
   throw new ReposError(`no route "${route}" in the config (have: ${have})`);
 }
 function configuredRepos(text, route, base) {
-  const doc = parseDocument(text);
+  const doc = parseDocument2(text);
   const m = routeMapOf(doc, route);
   const repos = m.get("repos");
   if (isMap(repos)) {
@@ -13522,7 +13938,7 @@ function configuredRepos(text, route, base) {
   return dir ? [{ name: basename8(String(dir)), dir: expandDir(String(dir), base) }] : [];
 }
 function routeSetsHooks(text, route, name) {
-  const m = routeMapOf(parseDocument(text), route);
+  const m = routeMapOf(parseDocument2(text), route);
   const repos = m.get("repos", true);
   let target = m;
   if (isMap(repos)) target = repos.get(name, true);
@@ -13578,7 +13994,7 @@ function listRepoRows(i) {
   return rows;
 }
 function planRepoAdd(i) {
-  const doc = parseDocument(i.text);
+  const doc = parseDocument2(i.text);
   if (doc.errors.length > 0) throw new ReposError(`config is not valid YAML \u2014 ${doc.errors[0].message}`);
   const m = routeMapOf(doc, i.route);
   const existing = configuredRepos(i.text, i.route, i.base);
@@ -13615,7 +14031,7 @@ function planRepoAdd(i) {
   return { text: String(doc), mode, name, block: renderBlock(m), warning, unmatched: !matched };
 }
 function planRepoRemove(text, base, route, path) {
-  const doc = parseDocument(text);
+  const doc = parseDocument2(text);
   if (doc.errors.length > 0) throw new ReposError(`config is not valid YAML \u2014 ${doc.errors[0].message}`);
   const m = routeMapOf(doc, route);
   const target = expandDir(path, base);
@@ -13693,7 +14109,7 @@ function planRepoClone(i) {
       `the Repos row "${name}" has no remote to clone from \u2014 attach an existing checkout with \`crew repos add ${i.route} ${name} <path>\`, or set the row's remote in the tracker and re-run \`crew connect\``
     );
   }
-  const doc = parseDocument(i.text);
+  const doc = parseDocument2(i.text);
   const m = routeMapOf(doc, i.route);
   const existing = configuredRepos(i.text, i.route, i.base);
   if (existing.some((e) => e.name.toLowerCase() === name.toLowerCase())) {
@@ -13701,7 +14117,7 @@ function planRepoClone(i) {
   }
   const ship = doc.get("ship", true);
   const basePath = String(m.get("reposBasePath") ?? (isMap(ship) ? ship.get("reposBasePath") : void 0) ?? "~/Crew");
-  const target = i.dir ? expandDir(i.dir, i.base) : join24(expandDir(basePath, i.base), i.route.split("/")[0], name);
+  const target = i.dir ? expandDir(i.dir, i.base) : join26(expandDir(basePath, i.base), i.route.split("/")[0], name);
   const add = planRepoAdd({ text: i.text, base: i.base, route: i.route, path: target, origin: remote, resolved: i.resolved, name });
   return { ...add, remote, target };
 }
@@ -13847,7 +14263,7 @@ function repoDirOf(text, base, route, name) {
   return hit.dir;
 }
 function planRouteHooks(text, route, name, hooks) {
-  const doc = parseDocument2(text);
+  const doc = parseDocument3(text);
   if (doc.errors.length > 0) throw new ReposError(`config is not valid YAML \u2014 ${doc.errors[0].message}`);
   const m = routeMapOf(doc, route);
   const repos = m.get("repos", true);
@@ -13909,7 +14325,7 @@ function existingRepoConfig(f) {
 }
 
 // src/repos-hooks-agent.ts
-import { spawn as spawn4, execFileSync as execFileSync4 } from "child_process";
+import { spawn as spawn4, execFileSync as execFileSync5 } from "child_process";
 import { realpathSync as realpathSync2 } from "fs";
 import { isAbsolute as isAbsolute2, relative } from "path";
 var AgentSuggestError = class extends Error {
@@ -14012,7 +14428,7 @@ function classifyFailure(o) {
 }
 function porcelain(dir) {
   try {
-    return execFileSync4("git", ["status", "--porcelain", "--untracked-files=all"], { cwd: dir, encoding: "utf8" });
+    return execFileSync5("git", ["status", "--porcelain", "--untracked-files=all"], { cwd: dir, encoding: "utf8" });
   } catch {
     return void 0;
   }
@@ -14081,7 +14497,7 @@ ${run2.err}` });
 }
 
 // src/sample-ticket.ts
-import { basename as basename9, dirname as dirname15, join as join25 } from "path";
+import { basename as basename9, dirname as dirname17, join as join27 } from "path";
 var SAMPLE_REPO = "crew-sample";
 var SAMPLE_REMOTE = `local/${SAMPLE_REPO}`;
 var SAMPLE_MARKER = "sample: true";
@@ -14104,8 +14520,8 @@ has something safe to work on: its test and build hooks always pass, it has no
 remote, and \`crew sample-ticket --remove\` deletes it.
 `;
 function sampleDir(existing, reposBase, workspace) {
-  if (existing.length > 0) return join25(dirname15(existing[0]), SAMPLE_REPO);
-  return join25(reposBase, workspace, SAMPLE_REPO);
+  if (existing.length > 0) return join27(dirname17(existing[0]), SAMPLE_REPO);
+  return join27(reposBase, workspace, SAMPLE_REPO);
 }
 var SAMPLE_TITLE = "Sample: add a documented `greet` function with a test";
 function sampleDescription() {
@@ -14149,7 +14565,7 @@ function planSampleTicket(i) {
 }
 
 // src/doctor-fix.ts
-import { parseDocument as parseDocument3 } from "yaml";
+import { parseDocument as parseDocument4 } from "yaml";
 var sound = (r) => r.hasRepos && r.problems.length === 0;
 function planFix(f) {
   const actions = [];
@@ -14176,7 +14592,7 @@ function routesInScope(routes, named) {
   return named ? routes.filter((r) => r.route === named) : routes;
 }
 function planEnable(text, route) {
-  const doc = parseDocument3(text);
+  const doc = parseDocument4(text);
   routeMapOf(doc, route).set("enabled", true);
   return String(doc);
 }
@@ -14186,8 +14602,8 @@ function schedulerInstalled(plan, exists, crontab) {
 }
 
 // src/worktree-sweep.ts
-import { existsSync as existsSync25, readFileSync as readFileSync20, readdirSync as readdirSync8 } from "fs";
-import { basename as basename10, dirname as dirname16, join as join26, resolve as resolve4 } from "path";
+import { existsSync as existsSync27, readFileSync as readFileSync22, readdirSync as readdirSync8 } from "fs";
+import { basename as basename10, dirname as dirname18, join as join28, resolve as resolve4 } from "path";
 function planWorktreeSweep(target, tickets, contract) {
   const terminal = new Set(contract.statuses.resolved.filter((s) => s !== contract.statuses.verified));
   const verified = contract.statuses.verified;
@@ -14241,7 +14657,7 @@ function worktreeTicketNumbers(target) {
   return [...nums];
 }
 function siblingWorktreeDirs(target) {
-  const parent = dirname16(target.dir.replace(/[/\\]+$/, ""));
+  const parent = dirname18(target.dir.replace(/[/\\]+$/, ""));
   const stem = `${basename10(target.dir.replace(/[/\\]+$/, ""))}-`;
   const registered = new Set(worktrees(target.dir).map((w) => resolve4(w.path)));
   let names;
@@ -14254,7 +14670,7 @@ function siblingWorktreeDirs(target) {
   for (const name of names) {
     if (!name.startsWith(stem)) continue;
     const m = DIR_NUMBER_SUFFIXED.exec(name);
-    const path = join26(parent, name);
+    const path = join28(parent, name);
     if (m && !registered.has(resolve4(path))) out.push({ path, number: m[1] });
   }
   return out;
@@ -14289,7 +14705,7 @@ async function applyWorktreeSweep(cwd, actions, dryRun, log, remote = "origin",
   let removed = 0;
   let keptBranches = 0;
   for (const a of actions) {
-    if (!dryRun && base && !a.keepBranch && existsSync25(a.path) && isHandBackMerge(a.path, base)) {
+    if (!dryRun && base && !a.keepBranch && existsSync27(a.path) && isHandBackMerge(a.path, base)) {
       if (gitOk(a.path, ["merge", "--abort"]) !== null) {
         log.emit(
           `abandoned the hand-back merge of ${base} in ${a.path}: ${a.ticket.issue_id} deployed without it`,
@@ -14297,7 +14713,7 @@ async function applyWorktreeSweep(cwd, actions, dryRun, log, remote = "origin",
         );
       }
     }
-    if (!dryRun && existsSync25(a.path)) {
+    if (!dryRun && existsSync27(a.path)) {
       let dirty = false;
       try {
         dirty = status(a.path).length > 0;
@@ -14308,7 +14724,7 @@ async function applyWorktreeSweep(cwd, actions, dryRun, log, remote = "origin",
         continue;
       }
     }
-    if (!dryRun && a.requirePushed && a.branch && existsSync25(a.path) && remoteConfigured(cwd, remote) && worktreeHoldsUnpushed(a.path, remote)) {
+    if (!dryRun && a.requirePushed && a.branch && existsSync27(a.path) && remoteConfigured(cwd, remote) && worktreeHoldsUnpushed(a.path, remote)) {
       refuse(a, "unpushed commits", `${a.branch} has commits that are not on ${remote}`);
       continue;
     }
@@ -14357,7 +14773,7 @@ function isHandBackMerge(path, base) {
   if (!msgPath) return false;
   let first;
   try {
-    first = readFileSync20(resolve4(path, msgPath), "utf8").split("\n")[0] ?? "";
+    first = readFileSync22(resolve4(path, msgPath), "utf8").split("\n")[0] ?? "";
   } catch {
     return false;
   }
@@ -14462,14 +14878,14 @@ function applyRemoteBranchCleanup(cwd, remote, branches2, dryRun, log) {
 }
 
 // src/stream-sweep.ts
-import { existsSync as existsSync26, readdirSync as readdirSync9, rmSync as rmSync12, statSync as statSync8 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync28, readdirSync as readdirSync9, rmSync as rmSync13, statSync as statSync8 } from "fs";
+import { join as join29 } from "path";
 var DAY_MS2 = 24 * 60 * 60 * 1e3;
 function planStreamSweep(stateDir, retentionDays, now = Date.now()) {
-  const dir = join27(stateDir, "streams");
-  if (!existsSync26(dir)) return [];
+  const dir = join29(stateDir, "streams");
+  if (!existsSync28(dir)) return [];
   const cutoff = now - retentionDays * DAY_MS2;
-  return readdirSync9(dir).map((name) => join27(dir, name)).filter((path) => {
+  return readdirSync9(dir).map((name) => join29(dir, name)).filter((path) => {
     try {
       return statSync8(path).mtimeMs < cutoff;
     } catch {
@@ -14485,7 +14901,7 @@ function applyStreamSweep(paths, dryRun, log) {
       continue;
     }
     try {
-      rmSync12(path, { force: true });
+      rmSync13(path, { force: true });
       removed++;
       log.emit(`removed stream artifact ${path}`, { step: "worktree" });
     } catch (e) {
@@ -14495,9 +14911,9 @@ function applyStreamSweep(paths, dryRun, log) {
   return removed;
 }
 function planEventsSweep(stateDir, retentionDays, now = Date.now()) {
-  if (!existsSync26(stateDir)) return [];
+  if (!existsSync28(stateDir)) return [];
   const cutoff = now - retentionDays * DAY_MS2;
-  return readdirSync9(stateDir).filter((name) => ROTATED_EVENTS_RE.test(name)).map((name) => join27(stateDir, name)).filter((path) => {
+  return readdirSync9(stateDir).filter((name) => ROTATED_EVENTS_RE.test(name)).map((name) => join29(stateDir, name)).filter((path) => {
     try {
       return statSync8(path).mtimeMs < cutoff;
     } catch {
@@ -14507,26 +14923,26 @@ function planEventsSweep(stateDir, retentionDays, now = Date.now()) {
 }
 
 // src/cli.ts
-import { realpathSync as realpathSync3, readFileSync as readFileSync27, existsSync as existsSync33, mkdirSync as mkdirSync20, writeFileSync as writeFileSync21, rmSync as rmSync14, unlinkSync as unlinkSync5, copyFileSync as copyFileSync2, renameSync as renameSync2, statSync as statSync10, readdirSync as readdirSync14 } from "fs";
+import { realpathSync as realpathSync3, readFileSync as readFileSync28, existsSync as existsSync34, mkdirSync as mkdirSync21, writeFileSync as writeFileSync22, rmSync as rmSync15, unlinkSync as unlinkSync5, copyFileSync as copyFileSync2, renameSync as renameSync3, statSync as statSync10, readdirSync as readdirSync14 } from "fs";
 import { createInterface } from "readline/promises";
 import { dirname as dirOf, resolve as resolvePath } from "path";
 
 // src/ssh-keys.ts
-import { execFileSync as execFileSync5 } from "child_process";
-import { existsSync as existsSync27, mkdirSync as mkdirSync15, readFileSync as readFileSync21, chmodSync } from "fs";
-import { dirname as dirname17, join as join28 } from "path";
+import { execFileSync as execFileSync6 } from "child_process";
+import { existsSync as existsSync29, mkdirSync as mkdirSync17, readFileSync as readFileSync23, chmodSync } from "fs";
+import { dirname as dirname19, join as join30 } from "path";
 var SshKeyError = class extends Error {
 };
 function shipSshKeyPathFor(stateDir) {
-  return join28(stateDir, "ssh", "id_ed25519");
+  return join30(stateDir, "ssh", "id_ed25519");
 }
 function ensureShipSshKeypair(stateDir) {
   const privateKeyPath = shipSshKeyPathFor(stateDir);
   const publicKeyPath = `${privateKeyPath}.pub`;
-  if (!existsSync27(privateKeyPath)) {
-    mkdirSync15(dirname17(privateKeyPath), { recursive: true });
+  if (!existsSync29(privateKeyPath)) {
+    mkdirSync17(dirname19(privateKeyPath), { recursive: true });
     try {
-      execFileSync5("ssh-keygen", [
+      execFileSync6("ssh-keygen", [
         "-t",
         "ed25519",
         "-N",
@@ -14544,71 +14960,21 @@ function ensureShipSshKeypair(stateDir) {
     }
     chmodSync(privateKeyPath, 384);
   }
-  if (!existsSync27(publicKeyPath)) {
+  if (!existsSync29(publicKeyPath)) {
     throw new SshKeyError(`${privateKeyPath} exists but ${publicKeyPath} does not \u2014 regenerate or restore it`);
   }
-  const publicKey = readFileSync21(publicKeyPath, "utf8").trim();
+  const publicKey = readFileSync23(publicKeyPath, "utf8").trim();
   return { privateKeyPath, publicKeyPath, publicKey };
 }
 function sshKeygenAvailable() {
   try {
-    execFileSync5("ssh-keygen", ["-V"], { stdio: ["ignore", "ignore", "ignore"] });
+    execFileSync6("ssh-keygen", ["-V"], { stdio: ["ignore", "ignore", "ignore"] });
     return true;
   } catch (e) {
     return e.code !== "ENOENT";
   }
 }
 
-// src/machine-id.ts
-import { execFileSync as execFileSync6 } from "child_process";
-import { createHash as createHash4 } from "crypto";
-import { existsSync as existsSync28, mkdirSync as mkdirSync16, readFileSync as readFileSync22, writeFileSync as writeFileSync17 } from "fs";
-import { dirname as dirname18, join as join29 } from "path";
-function machineIdPathFor(stateDir) {
-  return join29(stateDir, "machine-id");
-}
-var sha256 = (s) => createHash4("sha256").update(s).digest("hex");
-function readRawMachineId(platform2 = process.platform) {
-  try {
-    if (platform2 === "darwin") {
-      const out = execFileSync6("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"], {
-        encoding: "utf8",
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      return /"IOPlatformUUID"\s*=\s*"([^"]+)"/.exec(out)?.[1];
-    }
-    for (const p of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
-      if (existsSync28(p)) {
-        const id = readFileSync22(p, "utf8").trim();
-        if (id) return id;
-      }
-    }
-  } catch {
-  }
-  return void 0;
-}
-function ensureMachineId(stateDir, opts = {}) {
-  if (opts.override?.trim()) return sha256(opts.override.trim());
-  const path = machineIdPathFor(stateDir);
-  if (existsSync28(path)) {
-    const cached = readFileSync22(path, "utf8").trim();
-    if (/^[0-9a-f]{64}$/.test(cached)) return cached;
-  }
-  const raw = (opts.read ?? readRawMachineId)();
-  if (!raw) return void 0;
-  const hashed = sha256(raw);
-  mkdirSync16(dirname18(path), { recursive: true });
-  writeFileSync17(path, `${hashed}
-`, { mode: 384 });
-  return hashed;
-}
-function matchShipRows(ships, shipName2, machineId) {
-  const hasColumn = ships.some((r) => "machine_id" in r);
-  const byId = hasColumn && machineId ? ships.filter((r) => r.machine_id === machineId) : [];
-  if (byId.length > 0) return { rows: byId, by: "machine_id", hasColumn };
-  return { rows: ships.filter((r) => (r.name ?? "").trim() === shipName2.trim()), by: "name", hasColumn };
-}
-
 // src/passenger-containers.ts
 import { execFileSync as execFileSync7 } from "child_process";
 import { createHash as createHash5 } from "crypto";
@@ -14813,9 +15179,9 @@ function syncAllPassengerCheckouts(cfg) {
 
 // src/tunnel.ts
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync29, mkdirSync as mkdirSync17, readFileSync as readFileSync23, writeFileSync as writeFileSync18, unlinkSync as unlinkSync3, readdirSync as readdirSync10 } from "fs";
+import { existsSync as existsSync30, mkdirSync as mkdirSync18, readFileSync as readFileSync24, writeFileSync as writeFileSync19, unlinkSync as unlinkSync3, readdirSync as readdirSync10 } from "fs";
 import { randomInt } from "crypto";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var DEFAULT_SPAWN_OPTIONS = { stdio: "ignore", detached: true };
 var defaultSpawn = (cmd, args) => spawn5(cmd, args, DEFAULT_SPAWN_OPTIONS);
 var SLUG_ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789";
@@ -14882,21 +15248,21 @@ function startTunnel(opts) {
   };
 }
 function tunnelStatePath(stateDir, workspaceId) {
-  return join30(stateDir, "passengers", `${workspaceId}.json`);
+  return join31(stateDir, "passengers", `${workspaceId}.json`);
 }
 function readPersistedTunnel(stateDir, workspaceId) {
   const path = tunnelStatePath(stateDir, workspaceId);
-  if (!existsSync29(path)) return void 0;
+  if (!existsSync30(path)) return void 0;
   try {
-    return JSON.parse(readFileSync23(path, "utf8"));
+    return JSON.parse(readFileSync24(path, "utf8"));
   } catch {
     return void 0;
   }
 }
 function writePersistedTunnel(stateDir, state) {
   const path = tunnelStatePath(stateDir, state.workspaceId);
-  mkdirSync17(join30(stateDir, "passengers"), { recursive: true });
-  writeFileSync18(path, `${JSON.stringify(state, null, 2)}
+  mkdirSync18(join31(stateDir, "passengers"), { recursive: true });
+  writeFileSync19(path, `${JSON.stringify(state, null, 2)}
 `);
 }
 function updatePersistedTunnel(stateDir, workspaceId, patch2) {
@@ -14993,8 +15359,8 @@ function syncPassengerTunnels(plans, relayHost, relayPort, privateKeyPath, state
   }
 }
 function readAllPersistedWorkspaceIds(stateDir) {
-  const dir = join30(stateDir, "passengers");
-  if (!existsSync29(dir)) return [];
+  const dir = join31(stateDir, "passengers");
+  if (!existsSync30(dir)) return [];
   return readdirSync10(dir).filter((f) => f.endsWith(".json") && !f.endsWith("-sync.json")).map((f) => f.slice(0, -".json".length));
 }
 
@@ -15115,8 +15481,8 @@ async function unregisterEndpoint(workspaceId, info, d) {
 import { createServer as createHttpServer } from "http";
 import { spawn as spawn6 } from "child_process";
 import { randomBytes } from "crypto";
-import { existsSync as existsSync30, mkdirSync as mkdirSync18, readFileSync as readFileSync24, writeFileSync as writeFileSync19, unlinkSync as unlinkSync4, readdirSync as readdirSync11 } from "fs";
-import { join as join31 } from "path";
+import { existsSync as existsSync31, mkdirSync as mkdirSync19, readFileSync as readFileSync25, writeFileSync as writeFileSync20, unlinkSync as unlinkSync4, readdirSync as readdirSync11 } from "fs";
+import { join as join32 } from "path";
 
 // src/secret-compare.ts
 import { timingSafeEqual } from "crypto";
@@ -15205,21 +15571,21 @@ var defaultSpawn2 = (cmd, args, env) => {
   return child;
 };
 function syncDaemonStatePath(stateDir, workspaceId) {
-  return join31(stateDir, "passengers", `${workspaceId}-sync.json`);
+  return join32(stateDir, "passengers", `${workspaceId}-sync.json`);
 }
 function readPersistedSyncDaemon(stateDir, workspaceId) {
   const path = syncDaemonStatePath(stateDir, workspaceId);
-  if (!existsSync30(path)) return void 0;
+  if (!existsSync31(path)) return void 0;
   try {
-    return JSON.parse(readFileSync24(path, "utf8"));
+    return JSON.parse(readFileSync25(path, "utf8"));
   } catch {
     return void 0;
   }
 }
 function writePersistedSyncDaemon(stateDir, state) {
   const path = syncDaemonStatePath(stateDir, state.workspaceId);
-  mkdirSync18(join31(stateDir, "passengers"), { recursive: true });
-  writeFileSync19(path, `${JSON.stringify(state, null, 2)}
+  mkdirSync19(join32(stateDir, "passengers"), { recursive: true });
+  writeFileSync20(path, `${JSON.stringify(state, null, 2)}
 `);
 }
 function removePersistedSyncDaemon(stateDir, workspaceId) {
@@ -15239,8 +15605,8 @@ function waitForExit(pid, alive, timeoutMs = 5e3) {
   }
 }
 function readAllPersistedSyncWorkspaceIds(stateDir) {
-  const dir = join31(stateDir, "passengers");
-  if (!existsSync30(dir)) return [];
+  const dir = join32(stateDir, "passengers");
+  if (!existsSync31(dir)) return [];
   const suffix = "-sync.json";
   return readdirSync11(dir).filter((f) => f.endsWith(suffix)).map((f) => f.slice(0, -suffix.length));
 }
@@ -15328,12 +15694,12 @@ function describeCause(err) {
 }
 
 // src/daemon.ts
-import { existsSync as existsSync32, mkdirSync as mkdirSync19, readFileSync as readFileSync26, readdirSync as readdirSync13, rmSync as rmSync13, statSync as statSync9, writeFileSync as writeFileSync20 } from "fs";
-import { join as join33 } from "path";
+import { existsSync as existsSync33, mkdirSync as mkdirSync20, readFileSync as readFileSync27, readdirSync as readdirSync13, rmSync as rmSync14, statSync as statSync9, writeFileSync as writeFileSync21 } from "fs";
+import { join as join34 } from "path";
 
 // src/interrupted.ts
-import { existsSync as existsSync31, readdirSync as readdirSync12, readFileSync as readFileSync25 } from "fs";
-import { join as join32 } from "path";
+import { existsSync as existsSync32, readdirSync as readdirSync12, readFileSync as readFileSync26 } from "fs";
+import { join as join33 } from "path";
 var INTERRUPTED_MARKER = calloutHeader("NOTE", "Interrupted");
 function interruptedComment(b) {
   const tree = b.dirty === null ? "The worktree could not be checked." : b.dirty ? "The worktree has uncommitted changes \u2014 they are this seat's own, from that run." : "The worktree is clean.";
@@ -15352,21 +15718,21 @@ var pidAlive = (pid) => {
 };
 function runFinished(streamPath) {
   const path = `${streamPath}.meta.json`;
-  if (!existsSync31(path)) return false;
+  if (!existsSync32(path)) return false;
   try {
-    return JSON.parse(readFileSync25(path, "utf8")).running !== true;
+    return JSON.parse(readFileSync26(path, "utf8")).running !== true;
   } catch {
     return true;
   }
 }
 function orphanedStreams(o) {
-  const dir = join32(o.stateDir, "streams");
-  if (!existsSync31(dir)) return [];
+  const dir = join33(o.stateDir, "streams");
+  if (!existsSync32(dir)) return [];
   const ownerAlive = o.isOwnerAlive ?? pidAlive;
   const out = [];
   for (const name of readdirSync12(dir)) {
     if (!name.endsWith(".jsonl") || name.endsWith(".events.jsonl")) continue;
-    const streamPath = join32(dir, name);
+    const streamPath = join33(dir, name);
     if (runFinished(streamPath)) continue;
     const sidecar = readRunSidecar(streamPath);
     if (!sidecar || sidecar.route !== o.routeLabel) continue;
@@ -15486,7 +15852,7 @@ function latestMtime(path) {
   if (!stat.isDirectory()) return 0;
   let latest = stat.mtimeMs;
   for (const entry of readdirSync13(path, { withFileTypes: true })) {
-    latest = Math.max(latest, latestMtime(join33(path, entry.name)));
+    latest = Math.max(latest, latestMtime(join34(path, entry.name)));
   }
   return latest;
 }
@@ -15495,23 +15861,23 @@ function computeTreeSignature(paths) {
 }
 function makeStaleChecker(paths, opts = {}) {
   const initial = computeTreeSignature(paths);
-  return () => computeTreeSignature(paths) !== initial || opts.reloadSentinel !== void 0 && existsSync32(opts.reloadSentinel);
+  return () => computeTreeSignature(paths) !== initial || opts.reloadSentinel !== void 0 && existsSync33(opts.reloadSentinel);
 }
 function reloadSentinelFor(stateDir) {
-  return join33(stateDir, "reload-requested");
+  return join34(stateDir, "reload-requested");
 }
 function daemonStampFor(stateDir) {
-  return join33(stateDir, "daemon.started");
+  return join34(stateDir, "daemon.started");
 }
 function noteDaemonStarted(stateDir, now = Date.now()) {
-  mkdirSync19(stateDir, { recursive: true });
-  rmSync13(reloadSentinelFor(stateDir), { force: true });
-  writeFileSync20(daemonStampFor(stateDir), `${JSON.stringify({ pid: process.pid, startedAt: now })}
+  mkdirSync20(stateDir, { recursive: true });
+  rmSync14(reloadSentinelFor(stateDir), { force: true });
+  writeFileSync21(daemonStampFor(stateDir), `${JSON.stringify({ pid: process.pid, startedAt: now })}
 `);
 }
 function readDaemonStarted(stateDir) {
   try {
-    const v = JSON.parse(readFileSync26(daemonStampFor(stateDir), "utf8")).startedAt;
+    const v = JSON.parse(readFileSync27(daemonStampFor(stateDir), "utf8")).startedAt;
     return typeof v === "number" ? v : null;
   } catch {
     return null;
@@ -15574,6 +15940,7 @@ async function runOnePassUnguarded(o) {
   const spawn7 = o.spawnRoleAgent ?? runRoleAgent;
   const breaker = o.spawnBreaker ?? new SpawnBreaker();
   const ctx = { route: o.route, ship: o.ship, state: o.state, emit, getSessionStore: o.getSessionStore };
+  if (o.configFile) await reconcileRouteShipName({ route: o.route, ship: o.ship, configFile: o.configFile, emit });
   try {
     await (o.reconcile ?? reconcileForRoute)(ctx, o);
   } catch (e) {
@@ -15896,7 +16263,7 @@ async function buildEnvironment(route, ship, ticket) {
 }
 
 // src/cli.ts
-var CREW_HOME = isCompiledBinary(import.meta.url) ? dirname19(process.execPath) : resolve5(dirname19(fileURLToPath(import.meta.url)), "..");
+var CREW_HOME = isCompiledBinary(import.meta.url) ? dirname20(process.execPath) : resolve5(dirname20(fileURLToPath(import.meta.url)), "..");
 var RELEASE_LOCK_TTL_MS = 20 * 60 * 1e3;
 var CYCLE_SECONDS2 = 120;
 var STALE_CYCLES = 3;
@@ -15940,7 +16307,7 @@ async function pickOperator(holds2, me) {
   const choices = holds2.filter((h) => !h.user_id || h.user_id === me.id);
   const canCreate = !!me.id;
   process.stderr.write("\nWhich of these Crew rows is you?\n");
-  choices.forEach((h, i) => process.stderr.write(`  ${i + 1}. ${h.name || h.id}
+  choices.forEach((h, i) => process.stderr.write(`  ${i + 1}. ${h.name || "unnamed row"}${h.detail ? ` <${h.detail}>` : ""}
 `));
   if (canCreate) process.stderr.write(`  0. Create a new Crew row for ${me.name ?? ""} ${me.email ?? ""}`.trimEnd() + "\n");
   const rl = createInterface({ input: process.stdin, output: process.stderr });
@@ -15974,10 +16341,11 @@ async function pickResolvedStatuses(unrecognized) {
 }
 async function offerTemplateInstall(authOpts, workspaceId, decided) {
   const templates = await listLibraryTemplates(authOpts);
-  const template = templates.find((t) => t.identifier === ISSUES_TEMPLATE_IDENTIFIER);
+  const keys = await resolveIssuesTemplateKeys(authOpts);
+  const template = templates.find((t) => t.identifier === ISSUES_TEMPLATE_IDENTIFIERS[0]) ?? templates.find((t) => keys.has(t.identifier) || keys.has(t.id));
   if (!template) {
     process.stderr.write(`
-  No template with identifier "${ISSUES_TEMPLATE_IDENTIFIER}" is published to the Library yet \u2014 nothing to offer to install.
+  No template with identifier "${ISSUES_TEMPLATE_IDENTIFIERS[0]}" is published to the Library yet \u2014 nothing to offer to install.
 `);
     return void 0;
   }
@@ -16015,8 +16383,8 @@ No project here has what a route needs. Install the "${template.name}" library t
 `);
   return installed.project.slug;
 }
-function usage() {
-  process.stderr.write(`crew \u2014 a standing team of headless agents
+function usage(problem, requested = false) {
+  const text = `crew \u2014 a standing team of headless agents
 
   crew poll [route]              decide a cycle and report it; writes nothing
   crew run [route] [--role R]    run the winning role's session
@@ -16044,12 +16412,14 @@ function usage() {
                                  resume with no argument clears only the whole-crew pause; a role or release pause needs its own resume
   crew log [route]               tail the log
   crew inbox [--member NAME]    your tickets across every workspace (or a colleague's)
+  crew connect --sign-out [--host H] [--workspace W] [--json]  clear the keychain session a dry-run connect stored (no crew.yaml needed; nothing to remove still exits 0)
   crew connect                  resolve a workspace's ids into a crew.yaml block, then (admin key) sync personas/skills and mint seat keys (--no-agents-sync skips that; --no-mcp skips registering the Tablation MCP server with Claude Code; --mcp replace overwrites a different one; --dry-run works with no crew.yaml and writes none: no file, no rows, no seat keys \u2014 the device approval and workspace credential behave as in a real run; with no workspace named it first reuses the keychain session a previous dry-run stored for the host, falling back to device approval when that is missing or rejected, and the signed_in event's session field says which)
   crew disconnect               remove what connect installed for Pair (Claude MCP; Codex/Gemini instructions block and MCP entry per ship.pair)
   crew disconnect --reset [--remove-checkouts] [--dry-run] [--json]   remove everything connect and install wrote on this machine: scheduler units, Pair/MCP entries, seat keys, keychain credential, resolved state, then crew.yaml (--remove-checkouts also deletes checkouts crew cloned, never one with local changes)
   crew agents sync [route] [--force] [--revoke-seat-keys]   push crew's personas AND skill files into the workspace Agents/Agent Skills tables (--force overwrites even a diverged persona or skill; never one marked Customize prompt)
   crew agents prompt R [route] print one persona's current prompt (e.g. R=pair, for a SessionStart hook; --harness H adds which CLI it serves)
   crew skills sync [route]      push only crew's skill files (e.g. grill-me) into the workspace Agent Skills table
+  crew ship rename NAME [--json] rename this ship in crew.yaml and on every workspace's Ships row
   crew repos add [ROUTE] [NAME] [PATH]  attach a local checkout to a route in crew.yaml (--dry-run previews)
   crew repos clone [ROUTE] NAME  clone a Repos row's remote into the route directory and attach it (--dir PATH, --dry-run, --json)
   crew repos hooks [ROUTE] NAME suggest test/build hooks for a checkout (--agent, --write route|repo, --recipes, --json)
@@ -16078,10 +16448,18 @@ Options:
   --all          (inbox) include closed tickets
 
 In watch: space pauses the stream, q quits.
-`);
+`;
+  if (requested) {
+    process.stdout.write(text);
+    process.exit(0);
+  }
+  process.stderr.write(problem ? `crew: ${problem}
+
+${text}` : text);
   process.exit(2);
 }
 var argv = process.argv.slice(2);
+if (helpRequest(argv)) usage(void 0, true);
 var versionReq = versionRequest(argv);
 if (versionReq) {
   const version = crewVersion(CREW_HOME);
@@ -16101,7 +16479,46 @@ var connectEvents = createEmitter(command === "connect" && flag("json"), (l) =>
   process.stdout.write(l);
 });
 var connectChoices = parseChoices(argv);
-if (!command) usage();
+if (!command) usage(argv.length ? `unknown option "${argv[0]}"` : void 0);
+var KNOWN_COMMANDS = /* @__PURE__ */ new Set([
+  "passenger-sync-daemon",
+  "agents",
+  "connect",
+  "daemon",
+  "deploy",
+  "disconnect",
+  "doctor",
+  "drop",
+  "inbox",
+  "install",
+  "log",
+  "logbook",
+  "merge",
+  "passengers",
+  "pause",
+  "poll",
+  "ports",
+  "projects",
+  "reap",
+  "release",
+  "reload",
+  "repos",
+  "resume",
+  "rotate-passenger-url",
+  "run",
+  "sample-ticket",
+  "selftest",
+  "ship",
+  "skills",
+  "status",
+  "sync",
+  "unassign",
+  "uninstall",
+  "watch",
+  "whoami",
+  "worktree"
+]);
+if (!KNOWN_COMMANDS.has(command)) usage(`unknown command "${command}"`);
 function findSyncRoute(c, name) {
   if (!name && c.routes.length > 1) {
     throw new ConfigError(`this ship has ${c.routes.length} routes \u2014 name one: ${c.routes.map((r) => r.route).join(", ")}`);
@@ -16191,6 +16608,7 @@ if (command === "passenger-sync-daemon") {
   let cfg;
   let firstRun;
   let firstRunFromFlags = false;
+  let agentBinSearched;
   try {
     const connectIsTTY = !!(process.stdin.isTTY && process.stdout.isTTY);
     const wizardFlags = {
@@ -16200,7 +16618,7 @@ if (command === "passenger-sync-daemon") {
       hostPassengers: flag("host-passengers"),
       noWizard: flag("no-wizard")
     };
-    if (command === "connect" && usesFlagAnswers(wizardFlags, connectIsTTY) && shouldRunWizard({ isTTY: true, crewHome: CREW_HOME })) {
+    if (command === "connect" && !flag("sign-out") && usesFlagAnswers(wizardFlags, connectIsTTY) && shouldRunWizard({ isTTY: true, crewHome: CREW_HOME })) {
       const flagged = flagWizardAnswers(wizardFlags, {
         hostname: hostname2(),
         platform: hostPlatform(),
@@ -16217,8 +16635,9 @@ if (command === "passenger-sync-daemon") {
       const configPath = firstRunConfigPath();
       firstRun = { answers: flagged.answers, configPath };
       firstRunFromFlags = true;
+      agentBinSearched = flagged.agentBinSearched;
       cfg = loadConfig(CREW_HOME, configPath, { text: renderShipBlock(flagged.answers), allowNoRoutes: true });
-    } else if (command === "connect" && shouldRunWizard({
+    } else if (command === "connect" && !flag("sign-out") && shouldRunWizard({
       isTTY: connectIsTTY,
       crewHome: CREW_HOME
     })) {
@@ -16239,7 +16658,13 @@ if (command === "passenger-sync-daemon") {
       firstRun = { answers, configPath };
       cfg = loadConfig(CREW_HOME, configPath, { text: renderShipBlock(answers), allowNoRoutes: true });
     } else {
-      cfg = loadConfig(CREW_HOME, void 0, command === "repos" || command === "disconnect" && flag("reset") ? { allowNoRoutes: true } : {});
+      const toleratesNoRoutes = command === "repos" || command === "ship" || command === "disconnect" && flag("reset") || command === "connect" && flag("sign-out");
+      const configless = command === "connect" && flag("sign-out") || command === "disconnect" && flag("reset");
+      if (configless && !existsSync34(findConfigFile(CREW_HOME))) {
+        cfg = loadConfig(CREW_HOME, firstRunConfigPath(), { text: "ship: {}\n", allowNoRoutes: true });
+      } else {
+        cfg = loadConfig(CREW_HOME, void 0, toleratesNoRoutes ? { allowNoRoutes: true } : {});
+      }
     }
   } catch (e) {
     if (e instanceof ConfigError) {
@@ -16257,7 +16682,7 @@ if (command === "passenger-sync-daemon") {
   const DAEMON_SUBCOMMANDS = /* @__PURE__ */ new Set(["start", "stop", "status", "restart"]);
   const worktreeArgs = command === "worktree" ? splitWorktreeArgs(positional, cfg.routes.map((r) => r.route)) : void 0;
   const named = worktreeArgs ? worktreeArgs.route : command === "daemon" && DAEMON_SUBCOMMANDS.has(positional[1] ?? "") ? positional[2] : positional[1];
-  const fleetWide = command === "inbox" || command === "connect" || command === "disconnect" || command === "agents" || command === "skills" || command === "logbook" || command === "repos" || command === "projects" || command === "whoami" || releaseFleetWide || command === "pause" || command === "resume" || command === "reload" || FLEET_CAPABLE.has(command) && !named && cfg.routes.length > 1 || worktreeArgs !== void 0 && !named && cfg.routes.length > 1;
+  const fleetWide = command === "inbox" || command === "connect" || command === "disconnect" || command === "agents" || command === "skills" || command === "logbook" || command === "repos" || command === "ship" || command === "projects" || command === "whoami" || releaseFleetWide || command === "pause" || command === "resume" || command === "reload" || FLEET_CAPABLE.has(command) && !named && cfg.routes.length > 1 || worktreeArgs !== void 0 && !named && cfg.routes.length > 1;
   let route;
   try {
     route = fleetWide ? cfg.routes[0] : findRoute(cfg, named);
@@ -16473,8 +16898,8 @@ if (command === "passenger-sync-daemon") {
     }
     if (host === "linux" && hasSystemd) {
       const label = labelFor(CREW_HOME, "run");
-      const staleTimer = join34(homedir8(), ".config", "systemd", "user", `${label}.timer`);
-      if (existsSync33(staleTimer)) {
+      const staleTimer = join35(homedir9(), ".config", "systemd", "user", `${label}.timer`);
+      if (existsSync34(staleTimer)) {
         process.stdout.write(
           `removing stale run timer from before the persistent-service cutover: ${staleTimer}${dryRun ? " (dry run)" : ""}
 `
@@ -16500,7 +16925,7 @@ if (command === "passenger-sync-daemon") {
     const tracker = new Tracker(c, cfg.ship);
     problems.push(...validateContract(tracker.contract).map((p) => `contract: ${p}`));
     for (const r of await resolvedRepos(c)) {
-      if (!existsSync33(r.dir)) problems.push(`repo ${r.name}: ${r.dir} is missing on disk`);
+      if (!existsSync34(r.dir)) problems.push(`repo ${r.name}: ${r.dir} is missing on disk`);
       if (!satisfies(host, r.config.platform)) problems.push(`repo ${r.name}: requires ${r.config.platform}, this host is ${host}`);
       problems.push(...validateEffective(r.config).map((p) => `repo ${r.name}: ${p}`));
     }
@@ -16518,7 +16943,7 @@ if (command === "passenger-sync-daemon") {
   }
   async function doctorFix(o) {
     const routes = await Promise.all(routesInScope(cfg.routes, named).map((c) => gatherHealth({ route: c.route, enabled: c.enabled, hasRepos: reposOf(c).length > 0 }, () => routeProblems(c))));
-    const unitExists = (p) => existsSync33(p);
+    const unitExists = (p) => existsSync34(p);
     const crontab = o.host === "linux" ? spawnSync6("crontab", ["-l"], { encoding: "utf8" }).stdout ?? "" : "";
     const schedulerAbsent = o.host !== "windows" ? !schedulerInstalled(planInstall(cfg.ship, CREW_HOME, o.host, detectSystemd(), "run"), unitExists, crontab) : true;
     const plan = planFix({ routes, schedulerAbsent, host: o.host });
@@ -16535,7 +16960,7 @@ if (command === "passenger-sync-daemon") {
       for (const a of plan.actions) {
         if (a.kind === "enable") {
           if (prompter && !await prompter.confirm(`Route ${a.route} passes every check \u2014 set enabled: true in ${cfg.configFile}?`, false)) continue;
-          writeFileSync21(cfg.configFile, planEnable(readFileSync27(cfg.configFile, "utf8"), a.route));
+          writeFileSync22(cfg.configFile, planEnable(readFileSync28(cfg.configFile, "utf8"), a.route));
           enabledSound.add(a.route);
           changed2.push(`enabled route ${a.route} in ${cfg.configFile}`);
         } else {
@@ -16721,7 +17146,10 @@ ${changed2.map((c) => `  - ${c}
       }
       if (!dryRun) {
         const holderLabel = `${cfg.ship.name}:${process.pid}`;
-        const got = await tracker.acquireBoardLock(scope, holderLabel, RELEASE_LOCK_TTL_MS);
+        const got = await tracker.acquireBoardLock(scope, holderLabel, RELEASE_LOCK_TTL_MS, {
+          warn: (m) => remit.warn(m, { step: "release" }),
+          debug: (m) => remit.emit(m, { step: "release" })
+        });
         if (!got.ok && got.reason === "missing") {
           const detail = `no Locks row for ${scope} \u2014 run \`crew connect ${c.route}\` to provision it`;
           remit.warn(`release for ${scope} refused: ${detail}`, { step: "release" });
@@ -17015,6 +17443,11 @@ ${changed2.map((c) => `  - ${c}
     case "poll":
     case "run": {
       const skipInlineRelease = flag("no-release");
+      if (!dryRun) {
+        for (const r of fleetWide ? cfg.routes : [route]) {
+          await reconcileRouteShipName({ route: r, ship: cfg.ship, configFile: cfg.configFile, emit: emit.forRoute(r.route) });
+        }
+      }
       if (fleetWide) {
         const fleet = await decideFleet({
           routes: cfg.routes,
@@ -17536,7 +17969,7 @@ ${changed2.map((c) => `  - ${c}
         process.exit(1);
       }
       requireArmed("run the daemon loop");
-      const watchPaths = isCompiledBinary(import.meta.url) ? [process.execPath] : [join34(CREW_HOME, "src"), join34(CREW_HOME, "dist"), join34(CREW_HOME, "bin")];
+      const watchPaths = isCompiledBinary(import.meta.url) ? [process.execPath] : [join35(CREW_HOME, "src"), join35(CREW_HOME, "dist"), join35(CREW_HOME, "bin")];
       const configPaths = daemonConfigPaths(cfg);
       watchPaths.push(...configPaths);
       noteDaemonStarted(cfg.ship.stateDir);
@@ -17548,6 +17981,7 @@ ${changed2.map((c) => `  - ${c}
           state,
           maxConcurrentAgents: cfg.ship.maxConcurrentAgents,
           spawnBreaker,
+          configFile: cfg.configFile,
           newEmitter: () => new Emitter({
             route: route.route,
             eventFile: eventFileFor(cfg.ship.stateDir),
@@ -17754,15 +18188,72 @@ ${changed2.map((c) => `  - ${c}
 `);
       if (!dryRun) {
         const resolvedPath = resolvedPathFor(cfg.ship.stateDir, target.route);
-        const raw = existsSync33(resolvedPath) ? JSON.parse(readFileSync27(resolvedPath, "utf8")) : {};
+        const raw = existsSync34(resolvedPath) ? JSON.parse(readFileSync28(resolvedPath, "utf8")) : {};
         raw.agentSkills = result.agentSkills;
-        mkdirSync20(dirOf(resolvedPath), { recursive: true });
-        writeFileSync21(resolvedPath, `${JSON.stringify(raw, null, 2)}
+        mkdirSync21(dirOf(resolvedPath), { recursive: true });
+        writeFileSync22(resolvedPath, `${JSON.stringify(raw, null, 2)}
 `);
       }
       if (result.outcomes.some((o) => o.action === "diverged")) process.exitCode = 1;
       break;
     }
+    case "ship": {
+      if (positional[1] !== "rename" || positional.length !== 3) {
+        process.stderr.write("crew ship rename NAME [--json]\n");
+        process.exit(2);
+      }
+      let newName;
+      try {
+        newName = validateShipName(positional[2]);
+      } catch (e) {
+        if (e instanceof ShipNameError) {
+          process.stderr.write(`crew ship: ${e.message}
+`);
+          process.exit(2);
+        }
+        throw e;
+      }
+      const oldName = cfg.ship.name;
+      writeFileSync22(cfg.configFile, setShipNameInYaml(readFileSync28(cfg.configFile, "utf8"), newName));
+      cfg.ship.name = newName;
+      let renameMachineId;
+      try {
+        renameMachineId = ensureMachineId(cfg.ship.stateDir);
+      } catch {
+      }
+      const outcomes = [];
+      for (const r of cfg.routes) {
+        if (!r.resolved?.shipsModelId) {
+          outcomes.push({ route: r.route, status: "no-ships-table" });
+          continue;
+        }
+        const resolvedFile = resolvedPathFor(cfg.ship.stateDir, r.route);
+        const tracker = new Tracker(r, cfg.ship);
+        const picked = pickShipRow(await tracker.shipRows(), renameMachineId, [oldName, readSyncedName(resolvedFile) ?? ""]);
+        if (picked.kind !== "row") {
+          outcomes.push({ route: r.route, status: picked.kind === "unsupported" ? "unsupported" : picked.kind === "none" ? "no-row" : "ambiguous" });
+          continue;
+        }
+        try {
+          await tracker.renameShipRow(picked.row.id, newName);
+          writeSyncedName(resolvedFile, newName);
+          outcomes.push({ route: r.route, status: "renamed", rowId: picked.row.id });
+        } catch (e) {
+          outcomes.push({ route: r.route, status: "refused", rowId: picked.row.id, error: e.message });
+        }
+      }
+      if (flag("json")) {
+        process.stdout.write(`${JSON.stringify({ name: newName, previous: oldName, configFile: cfg.configFile, routes: outcomes })}
+`);
+      } else {
+        process.stdout.write(`ship renamed "${oldName}" -> "${newName}" in ${cfg.configFile}
+`);
+        for (const o of outcomes) process.stdout.write(`  ${o.route}: ${o.status}${o.error ? ` (${o.error})` : ""}
+`);
+      }
+      if (outcomes.some((o) => o.status === "refused")) process.exitCode = 1;
+      break;
+    }
     case "repos": {
       const sub = positional[1];
       const usage2 = () => {
@@ -17770,13 +18261,13 @@ ${changed2.map((c) => `  - ${c}
         process.exit(2);
       };
       if (sub !== "add" && sub !== "list" && sub !== "clone" && sub !== "hooks") usage2();
-      const configText = readFileSync27(cfg.configFile, "utf8");
+      const configText = readFileSync28(cfg.configFile, "utf8");
       if (sub === "hooks") {
         try {
           const a = parseHooksArgs(positional.slice(2), routeNamesOf(configText));
-          const dir = repoDirOf(configText, dirname19(cfg.configFile), a.route, a.name);
-          if (!existsSync33(dir)) throw new ReposError(`${dir} does not exist on disk`);
-          const files = { exists: (r) => existsSync33(resolvePath(dir, r)), list: (r) => {
+          const dir = repoDirOf(configText, dirname20(cfg.configFile), a.route, a.name);
+          if (!existsSync34(dir)) throw new ReposError(`${dir} does not exist on disk`);
+          const files = { exists: (r) => existsSync34(resolvePath(dir, r)), list: (r) => {
             try {
               return readdirSync14(resolvePath(dir, r));
             } catch {
@@ -17784,7 +18275,7 @@ ${changed2.map((c) => `  - ${c}
             }
           }, read: (r) => {
             try {
-              return readFileSync27(resolvePath(dir, r), "utf8");
+              return readFileSync28(resolvePath(dir, r), "utf8");
             } catch {
               return void 0;
             }
@@ -17822,13 +18313,13 @@ ${changed2.map((c) => `  - ${c}
           if (write && suggestion.source === null && recipeIds.length === 0 && hookSpecs.length === 0) throw new ReposError(`nothing to write: ${suggestion.notes[0]}`);
           if (write === "route") {
             const plan = planRouteHooks(configText, a.route, a.name, picked.hooks);
-            writeFileSync21(cfg.configFile, plan.text);
+            writeFileSync22(cfg.configFile, plan.text);
             written = { target: "route", file: cfg.configFile, hooks: plan.written, kept: plan.kept };
           } else if (write === "repo") {
             const have = existingRepoConfig(files);
             if (have) throw new ReposError(`${resolvePath(dir, have)} already exists; not overwriting it`);
             const file = resolvePath(dir, ".crew.yaml");
-            writeFileSync21(file, starterRepoConfig(picked.hooks, picked.release), { flag: "wx" });
+            writeFileSync22(file, starterRepoConfig(picked.hooks, picked.release), { flag: "wx" });
             written = { target: "repo", file, hooks: Object.keys(picked.hooks), kept: [] };
           }
           if (flag("json")) {
@@ -17880,7 +18371,7 @@ ${changed2.map((c) => `  - ${c}
       if (sub === "list" && !routeName) usage2();
       if (sub === "add") {
         try {
-          const a = parseAddArgs(positional.slice(2), routeNamesOf(configText), (p) => existsSync33(resolvePath(p.replace(/^~(?=\/|$)/, homedir8()))));
+          const a = parseAddArgs(positional.slice(2), routeNamesOf(configText), (p) => existsSync34(resolvePath(p.replace(/^~(?=\/|$)/, homedir9()))));
           routeName = a.route;
           addPath = a.path;
           addName = a.name;
@@ -17909,15 +18400,15 @@ ${changed2.map((c) => `  - ${c}
       }
       const resolvedFile = resolvedPathFor(cfg.ship.stateDir, routeName);
       let resolvedRemotes;
-      if (existsSync33(resolvedFile)) {
+      if (existsSync34(resolvedFile)) {
         try {
-          resolvedRemotes = JSON.parse(readFileSync27(resolvedFile, "utf8"));
+          resolvedRemotes = JSON.parse(readFileSync28(resolvedFile, "utf8"));
         } catch {
         }
       }
       const originOf = (dir) => gitOk(dir, ["remote", "get-url", "origin"]) ?? void 0;
       const text = configText;
-      const base = dirname19(cfg.configFile);
+      const base = dirname20(cfg.configFile);
       try {
         if (sub === "list") {
           if (flag("json")) {
@@ -17927,10 +18418,10 @@ ${changed2.map((c) => `  - ${c}
               base,
               resolved: resolvedRemotes,
               originOf,
-              exists: (d) => existsSync33(d),
+              exists: (d) => existsSync34(d),
               repoHasHooks: (d) => REPO_CONFIG_FILENAMES.some((f) => {
                 try {
-                  return Object.keys(parseRepoConfig(readFileSync27(resolvePath(d, f), "utf8"), f).hooks).length > 0;
+                  return Object.keys(parseRepoConfig(readFileSync28(resolvePath(d, f), "utf8"), f).hooks).length > 0;
                 } catch {
                   return false;
                 }
@@ -17946,7 +18437,7 @@ ${changed2.map((c) => `  - ${c}
           for (const r of repos) {
             const origin2 = originOf(r.dir);
             const row = matchRepoName(origin2, resolvedRemotes);
-            const note = !existsSync33(r.dir) ? "missing on disk" : row ? `Repos row: ${row}` : `no Repos row matches ${normalizeRemote(origin2) ?? "this checkout (no origin remote)"}`;
+            const note = !existsSync34(r.dir) ? "missing on disk" : row ? `Repos row: ${row}` : `no Repos row matches ${normalizeRemote(origin2) ?? "this checkout (no origin remote)"}`;
             process.stdout.write(`${r.name}	${r.dir}	${note}
 `);
           }
@@ -17958,9 +18449,9 @@ ${changed2.map((c) => `  - ${c}
 ` : `${human}
 `);
           const plan2 = planRepoClone({ text, base, route: routeName, name: addName, resolved: resolvedRemotes, dir: value("dir") });
-          if (existsSync33(plan2.target) && (existsSync33(`${plan2.target}/.git`) || readdirSync14(plan2.target).length > 0)) {
+          if (existsSync34(plan2.target) && (existsSync34(`${plan2.target}/.git`) || readdirSync14(plan2.target).length > 0)) {
             throw new ReposError(
-              existsSync33(`${plan2.target}/.git`) ? `${plan2.target} is already a checkout \u2014 attach it with \`crew repos add ${routeName} ${plan2.name} ${plan2.target}\`` : `${plan2.target} exists and is not empty \u2014 pass --dir to clone somewhere else`
+              existsSync34(`${plan2.target}/.git`) ? `${plan2.target} is already a checkout \u2014 attach it with \`crew repos add ${routeName} ${plan2.name} ${plan2.target}\`` : `${plan2.target} exists and is not empty \u2014 pass --dir to clone somewhere else`
             );
           }
           if (dryRun) {
@@ -17978,12 +18469,12 @@ ${changed2.map((c) => `  - ${c}
             throw new ReposError(`${e.message}${authHint}
   crew.yaml was not changed`);
           }
-          writeFileSync21(cfg.configFile, plan2.text);
+          writeFileSync22(cfg.configFile, plan2.text);
           say("attached", { route: routeName, name: plan2.name, dir: plan2.target, mode: plan2.mode }, `cloned and attached ${plan2.target} to ${routeName} as ${plan2.mode === "dir" ? "dir" : `repos.${plan2.name}`} in ${cfg.configFile}`);
           break;
         }
-        const target = resolvePath(addPath.replace(/^~(?=\/|$)/, homedir8()));
-        const top = existsSync33(target) ? gitOk(target, ["rev-parse", "--show-toplevel"]) : null;
+        const target = resolvePath(addPath.replace(/^~(?=\/|$)/, homedir9()));
+        const top = existsSync34(target) ? gitOk(target, ["rev-parse", "--show-toplevel"]) : null;
         if (!top) throw new ReposError(`${target} is not a git checkout`);
         const origin = originOf(top);
         const plan = planRepoAdd({
@@ -18032,15 +18523,15 @@ ${changed2.map((c) => `  - ${c}
           const created = await rowTracker.createRepoRow(rowPayload);
           process.stdout.write(`created Repos row ${String(rowPayload.name)} (${String(rowPayload.remote)}) ${created.id}
 `);
-          if (existsSync33(resolvedFile)) {
-            const raw = JSON.parse(readFileSync27(resolvedFile, "utf8"));
+          if (existsSync34(resolvedFile)) {
+            const raw = JSON.parse(readFileSync28(resolvedFile, "utf8"));
             raw.repoNames = { ...raw.repoNames, [created.id]: String(rowPayload.name) };
             raw.repoRemotes = { ...raw.repoRemotes, [created.id]: String(rowPayload.remote) };
-            writeFileSync21(resolvedFile, `${JSON.stringify(raw, null, 2)}
+            writeFileSync22(resolvedFile, `${JSON.stringify(raw, null, 2)}
 `);
           }
         }
-        writeFileSync21(cfg.configFile, plan.text);
+        writeFileSync22(cfg.configFile, plan.text);
         process.stdout.write(`added ${top} to ${routeName} as ${plan.mode === "dir" ? "dir" : `repos.${plan.name}`} in ${cfg.configFile}
 `);
       } catch (e) {
@@ -18134,6 +18625,29 @@ ${reconstruction.prompt}
     }
     case "connect": {
       const arg = positional[1];
+      if (flag("sign-out")) {
+        let signOutStore;
+        try {
+          signOutStore = getSessionStore3();
+        } catch {
+          signOutStore = void 0;
+        }
+        const outcomes = signOutStore ? await signOutSessions({
+          store: signOutStore,
+          stateDir: cfg.ship.stateDir,
+          dryRun,
+          host: value("host") ?? (value("base-url") ? hostFromUrl4(value("base-url")) : void 0),
+          workspace: value("workspace")
+        }) : [];
+        const failed = outcomes.some((o) => o.action === "failed");
+        if (flag("json")) process.stdout.write(`${JSON.stringify({ dryRun, ok: !failed, sessions: outcomes })}
+`);
+        else if (!outcomes.length) process.stdout.write("nothing to sign out of\n");
+        else for (const o of outcomes) process.stdout.write(`${o.action}: ${o.host}/${o.workspace}${o.detail ? ` (${o.detail})` : ""}
+`);
+        if (failed) process.exitCode = 1;
+        break;
+      }
       const canAsk = !!(process.stdin.isTTY && process.stdout.isTTY) && !connectEvents.json;
       const stopForChoice = (key, message, options) => {
         connectEvents.emit("choice", message, choiceData(key, options));
@@ -18151,6 +18665,7 @@ ${reconstruction.prompt}
       const project = argProject ?? value("project") ?? connectChoices.project;
       const baseUrl = value("base-url") ?? cfg.routes[0]?.baseUrl ?? DEFAULT_BASE_URL;
       let apiKey = value("key") ?? process.env.CREW_CONNECT_KEY ?? cfg.routes.find((c) => c.apiKey)?.apiKey;
+      const givenKeySource = value("key") ?? process.env.CREW_CONNECT_KEY ? "flag" : "config";
       let store;
       try {
         store = getSessionStore3();
@@ -18160,11 +18675,11 @@ ${reconstruction.prompt}
       let keychainBacked = false;
       if (!apiKey && workspace && store) {
         try {
-          const existing = await store.get(hostFromUrl3(baseUrl), workspace);
+          const existing = await store.get(hostFromUrl4(baseUrl), workspace);
           if (existing?.apiKey) {
             apiKey = existing.apiKey;
             keychainBacked = true;
-            process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl3(baseUrl)}/${workspace}.
+            process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl4(baseUrl)}/${workspace}.
 `);
           }
         } catch {
@@ -18175,7 +18690,7 @@ ${reconstruction.prompt}
         const resumed = await resumeKeychainSession({
           store,
           stateDir: cfg.ship.stateDir,
-          host: hostFromUrl3(baseUrl),
+          host: hostFromUrl4(baseUrl),
           verify: async (k) => {
             try {
               await get({ baseUrl, apiKey: k, userAgent: cfg.ship.userAgent }, "/auth/me");
@@ -18190,7 +18705,7 @@ ${reconstruction.prompt}
           workspace = resumed.workspace;
           keychainBacked = true;
           signInSource = "keychain";
-          process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl3(baseUrl)}/${workspace}.
+          process.stderr.write(`Reusing the existing keychain session for ${hostFromUrl4(baseUrl)}/${workspace}.
 `);
         }
       }
@@ -18247,13 +18762,14 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         connectEvents.emit("signed_in", `signed in as ${result.identity.email}`, {
           identity: { id: result.identity.id, email: result.identity.email },
           workspaces: [{ slug: result.workspace.slug, name: result.workspace.name }],
-          session: "device"
+          session: "device",
+          host: hostFromUrl4(baseUrl)
         });
         const deviceWorkspace = "path" in result.workspace && typeof result.workspace.path === "string" ? result.workspace.path : result.workspace.slug;
         if (!workspace) workspace = deviceWorkspace;
         if (store) {
           try {
-            await store.set(hostFromUrl3(baseUrl), deviceWorkspace, {
+            await store.set(hostFromUrl4(baseUrl), deviceWorkspace, {
               apiKey: result.apiKey.key,
               shipId: getOrCreateShipId(),
               workspaceId: result.workspace.id,
@@ -18261,9 +18777,9 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
               createdAt: result.apiKey.createdAt
             });
             keychainBacked = true;
-            rememberSession(cfg.ship.stateDir, hostFromUrl3(baseUrl), deviceWorkspace);
+            rememberSession(cfg.ship.stateDir, hostFromUrl4(baseUrl), deviceWorkspace);
             process.stderr.write(
-              `API key stored in the OS keychain for ${hostFromUrl3(baseUrl)}/${deviceWorkspace}.
+              `API key stored in the OS keychain for ${hostFromUrl4(baseUrl)}/${deviceWorkspace}.
 `
             );
           } catch (e) {
@@ -18299,7 +18815,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         platform: cfg.ship.platform,
         machineId,
         hostPassengers: firstRun?.answers.hostPassengers ?? existingRoute?.hostPassengers === true,
-        sshPublicKey
+        sshPublicKey,
+        lastSyncedName: (r) => readSyncedName(resolvedPathFor(cfg.ship.stateDir, r))
       };
       const runConnect = async (ws, proj) => {
         let found = await discover({ ...authOpts, workspace: ws, project: proj, area: value("area"), ship, dryRun, interactive: canAsk || connectEvents.json });
@@ -18308,7 +18825,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           connectEvents.emit("signed_in", `key belongs to ${found.meEmail ?? found.meId}`, {
             identity: { id: found.meId, email: found.meEmail, name: found.meName },
             workspaces: [{ slug: found.workspaceSlug, name: found.workspaceName, role: found.role }],
-            session: signInSource
+            session: signInSource,
+            host: hostFromUrl4(baseUrl)
           });
         }
         connectEvents.emit("workspace_resolved", `workspace ${found.workspaceSlug}`, {
@@ -18355,6 +18873,10 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           }
           process.exit(2);
         }
+        if (found.shipNameAdopted && !dryRun) {
+          writeFileSync22(cfg.configFile, setShipNameInYaml(readFileSync28(cfg.configFile, "utf8"), found.shipNameAdopted));
+          cfg.ship.name = found.shipNameAdopted;
+        }
         if (found.shipRow) {
           connectEvents.emit("ship_row", `Ships row "${found.shipRow.name}" ${found.shipRow.action}`, found.shipRow);
         }
@@ -18383,8 +18905,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           }
         }
         let operator = found.operator;
-        if (!operator && found.holds.length > 0 && canAsk) {
-          const picked = await pickOperator(found.holds, { id: found.meId, name: found.meName, email: found.meEmail });
+        if (!operator && found.candidates.length > 0 && canAsk) {
+          const picked = await pickOperator(found.candidates, { id: found.meId, name: found.meName, email: found.meEmail });
           if (picked === NEW_OPERATOR_ROW) {
             await createOperatorRow({ ...authOpts, dryRun }, found);
             operator = found.operator;
@@ -18395,15 +18917,15 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           }
         }
         let previous;
-        const hadPreviousFile = existsSync33(resolvedPath);
+        const hadPreviousFile = existsSync34(resolvedPath);
         if (hadPreviousFile) {
           try {
-            previous = JSON.parse(readFileSync27(resolvedPath, "utf8"));
+            previous = JSON.parse(readFileSync28(resolvedPath, "utf8"));
           } catch {
           }
         }
         if (!operator) operator = previous?.operator;
-        if (connectEvents.json && !operator && found.holds.length > 0) {
+        if (connectEvents.json && !operator && found.candidates.length > 0) {
           const answer = connectChoices.operator;
           if (answer === "new") {
             await createOperatorRow({ ...authOpts, dryRun }, found);
@@ -18418,27 +18940,36 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
               found.operatorAction = "linked";
             }
           } else {
-            const mine = found.holds.filter((h) => !h.user_id || h.user_id === found.meId);
+            const mine = found.candidates.filter((h) => !h.user_id || h.user_id === found.meId);
             stopForChoice("operator", "Which Crew row is you?", [
-              ...mine.map((h) => ({ value: h.id, label: h.name || h.id })),
+              ...mine.map((h) => ({ value: h.id, label: h.name || "unnamed row", ...h.detail ? { detail: h.detail } : { detail: h.id } })),
               ...found.meId ? [{ value: "new", label: `Create a new Crew row for ${found.meName ?? found.meEmail ?? "me"}` }] : []
             ]);
           }
         }
+        if (!operator && found.operatorCompared) {
+          process.stderr.write(`crew connect: no Crew row matched you \u2014 ${found.operatorCompared}
+`);
+          connectEvents.emit("operator_row", "no Crew row matched you", { action: "unmatched", compared: found.operatorCompared });
+        }
         if (operator) {
-          connectEvents.emit("operator_row", `operator ${found.holds.find((h) => h.id === operator)?.name ?? operator}`, {
+          const opRow = found.holds.find((h) => h.id === operator);
+          const opEmail = opRow?.email || opRow?.memberEmail || (opRow?.user_id && opRow.user_id === found.meId ? found.meEmail : void 0);
+          connectEvents.emit("operator_row", `operator ${opRow?.name ?? operator}`, {
             id: operator,
-            action: found.operatorAction ?? "previous"
+            action: found.operatorAction ?? "previous",
+            ...opRow?.name ? { name: opRow.name } : {},
+            ...opEmail ? { email: opEmail } : {}
           });
         }
         if (!operator && !hadPreviousFile) {
           process.stderr.write(
-            `crew connect ${route2}: cannot determine the operator \u2014 ${found.holds.length} Crew row(s) could be it, none matching this key's own email, and there's no terminal to ask.
+            `crew connect ${route2}: cannot determine the operator \u2014 ${found.candidates.length} Crew row(s) could be it, none matching this key's own email, and there's no terminal to ask.
   Re-run from a real terminal to pick one, or pass --key for a key whose own
   identity email matches exactly one Crew row.
 `
           );
-          stopWithProblem(`cannot determine the operator \u2014 ${found.holds.length} Crew row(s) could be it`, "operator");
+          stopWithProblem(`cannot determine the operator \u2014 ${found.candidates.length} Crew row(s) could be it`, "operator");
         }
         const alreadyReviewed = new Set(previous?.reviewedStatuses ?? []);
         const stillUnrecognized = (found.unrecognizedStatuses ?? []).filter((s) => !alreadyReviewed.has(s.value));
@@ -18501,18 +19032,20 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           // nothing about its prompt actually changed.
           ...previous?.agentPersonas ? { agentPersonas: previous.agentPersonas } : {},
           ...previous?.agentSkills ? { agentSkills: previous.agentSkills } : {},
-          ...previous?.releaseAgentId ? { releaseAgentId: previous.releaseAgentId } : {}
+          ...previous?.releaseAgentId ? { releaseAgentId: previous.releaseAgentId } : {},
+          // CREW-2495: the ship name this route last saw agree with its Ships row.
+          ...found.shipRow ? { shipName: found.shipRow.name } : previous?.shipName ? { shipName: previous.shipName } : {}
         };
         if (dryRun) {
           process.stderr.write(`(dry run) would write resolved ids to ${resolvedPath}
 `);
         } else {
-          mkdirSync20(dirname19(resolvedPath), { recursive: true });
+          mkdirSync21(dirname20(resolvedPath), { recursive: true });
           if (hadPreviousFile) copyFileSync2(resolvedPath, `${resolvedPath}.bak`);
           const tmpPath = `${resolvedPath}.tmp${process.pid}`;
-          writeFileSync21(tmpPath, `${JSON.stringify(resolved, null, 2)}
+          writeFileSync22(tmpPath, `${JSON.stringify(resolved, null, 2)}
 `);
-          renameSync2(tmpPath, resolvedPath);
+          renameSync3(tmpPath, resolvedPath);
           process.stderr.write(`Resolved ids written to ${resolvedPath}
 `);
         }
@@ -18533,20 +19066,27 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             role: sr.role,
             id: sr.id,
             action: sr.action,
+            ...sr.shipId ? { ship_id: sr.shipId } : {},
             key: minted?.action ?? "none",
             ...minted?.detail ? { detail: minted.detail } : {}
           });
         }
         let apiKeyFile;
         const apiKeyVar = "CREW_API_KEY";
+        if (firstRunFromFlags && agentBinSearched && !dryRun) {
+          const msg = `no agent binary: "claude" was not found on PATH or in ${agentBinSearched.join(", ")} \u2014 pass --agent-bin /absolute/path`;
+          process.stderr.write(`crew connect: ${msg}
+`);
+          stopWithProblem(msg, "wizard");
+        }
         if ((mintedFromDevice || firstRunFromFlags) && !keychainBacked) {
           apiKeyFile = apiKeyPathFor(cfg.ship.stateDir, route2);
           if (dryRun) {
             process.stderr.write(`(dry run) would write the minted API key to ${apiKeyFile}
 `);
           } else {
-            mkdirSync20(dirname19(apiKeyFile), { recursive: true });
-            writeFileSync21(apiKeyFile, `${apiKeyVar}=${apiKey}
+            mkdirSync21(dirname20(apiKeyFile), { recursive: true });
+            writeFileSync22(apiKeyFile, `${apiKeyVar}=${apiKey}
 `, { mode: 384 });
             process.stderr.write(`API key written to ${apiKeyFile}
 `);
@@ -18555,7 +19095,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         const keyPersisted = keychainBacked || apiKeyFile !== void 0;
         const wizard = firstRun;
         const writeFirstRun = wizard !== void 0 && !dryRun && keyPersisted;
-        const routeDir = value("dir") ?? (writeFirstRun ? join34(DEFAULT_REPOS_BASE_PATH, found.workspaceSlug) : void 0);
+        const routeDir = value("dir") ?? (writeFirstRun ? join35(DEFAULT_REPOS_BASE_PATH, found.workspaceSlug) : void 0);
         const routeBlock = renderConnection(
           found,
           route2,
@@ -18704,13 +19244,39 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           wroteConfig,
           operator,
           dryRun,
-          unresolved: found.problems.length
+          unresolved: found.problems.length,
+          ...firstRunFromFlags ? { agentBin: agentBinSearched ? null : firstRun?.answers.agentBin } : {},
+          ...agentBinSearched ? { agentBinNote: `no \`claude\` found on PATH or in ${agentBinSearched.join(", ")}; a real run needs --agent-bin` } : {}
         });
       };
       try {
         if (!workspace) {
           const workspaces = await listWorkspaces(authOpts);
-          if (workspaces.length === 0) {
+          const configWorkspaces = [...new Set(cfg.routes.map((r) => splitRoute(r.route)[0]))];
+          const defaulted = dryRun && givenKeySource === "config" && configWorkspaces.length === 1 ? workspaces.find((w) => w.slug === configWorkspaces[0]) : void 0;
+          if (!signedInEmitted && (apiKey ?? "") !== "") {
+            let me = {};
+            try {
+              me = await get(authOpts, "/auth/me");
+            } catch {
+            }
+            if (me.id || me.email) {
+              signedInEmitted = true;
+              connectEvents.emit(
+                "signed_in",
+                `key belongs to ${me.email ?? me.id}${defaulted ? `; using ${defaulted.slug}, the workspace crew.yaml already names` : ""}`,
+                {
+                  identity: { id: me.id, email: me.email, name: me.name },
+                  workspaces: workspaces.map((w) => ({ slug: w.slug, name: w.name, role: w.role })),
+                  session: givenKeySource,
+                  host: hostFromUrl4(baseUrl)
+                }
+              );
+            }
+          }
+          if (defaulted) {
+            await runConnect(defaulted.slug, project);
+          } else if (workspaces.length === 0) {
             process.stderr.write("crew connect: this key's identity has no workspace memberships.\n");
             stopWithProblem("this key's identity has no workspace memberships", "workspace");
           } else if (workspaces.length === 1) {
@@ -19186,11 +19752,20 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           if (!resetStore) return { stored: false, clear: async () => {
           } };
           const store = resetStore;
-          const h = hostFromUrl3(r.baseUrl);
+          const h = hostFromUrl4(r.baseUrl);
           const [slug] = splitRoute(r.route);
           const session = await store.get(h, slug);
           return { stored: Boolean(session?.apiKey), clear: () => store.clear(h, slug) };
         },
+        async hostSessions(stateDir) {
+          const store = resetStore;
+          return Promise.all(rememberedSessions(stateDir).map(async ({ host: h, workspace: w }) => {
+            const session = store ? await store.get(h, w).catch(() => void 0) : void 0;
+            return { host: h, workspace: w, stored: Boolean(session?.apiKey), clear: async () => {
+              await store?.clear(h, w);
+            } };
+          }));
+        },
         inspectCheckout(dir) {
           const dirty = status(dir).map((c) => c.path);
           const linkedWorktrees = worktrees(dir).map((w) => w.path).filter((p) => realpathSync3(p) !== realpathSync3(dir));
@@ -19199,7 +19774,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
       };
       const droppedRoutes = [];
       try {
-        const rawCfg = parseYaml2(readFileSync27(cfg.configFile, "utf8"));
+        const rawCfg = parseYaml2(readFileSync28(cfg.configFile, "utf8"));
         for (const r of rawCfg?.routes ?? []) {
           if (typeof r?.route !== "string" || cfg.routes.some((x) => x.route === r.route)) continue;
           try {
@@ -19241,8 +19816,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         process.stdout.write("crew reload: no daemon unit is running \u2014 nothing to reload (the next run reads crew.yaml fresh)\n");
         break;
       }
-      mkdirSync20(cfg.ship.stateDir, { recursive: true });
-      writeFileSync21(sentinel, `${(/* @__PURE__ */ new Date()).toISOString()}
+      mkdirSync21(cfg.ship.stateDir, { recursive: true });
+      writeFileSync22(sentinel, `${(/* @__PURE__ */ new Date()).toISOString()}
 `);
       process.stdout.write("crew reload: requested \u2014 the daemon finishes its in-flight pass, then relaunches with the new config\n");
       if (flag("now") && control?.stopCommand && control.startCommand) {
@@ -19293,7 +19868,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
     }
     case "log": {
       try {
-        const text = readFileSync27(cfg.ship.logFile, "utf8").split("\n");
+        const text = readFileSync28(cfg.ship.logFile, "utf8").split("\n");
         process.stdout.write(`${text.slice(-(Number(value("tail")) || 40)).join("\n")}
 `);
       } catch {
@@ -19316,8 +19891,8 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
       };
       if (!route.resolved) fail(`route ${route.route} is not connected \u2014 run \`crew connect\` first`);
       const tracker = new Tracker(route, cfg.ship);
-      const configText = readFileSync27(cfg.configFile, "utf8");
-      const cfgBase = dirname19(cfg.configFile);
+      const configText = readFileSync28(cfg.configFile, "utf8");
+      const cfgBase = dirname20(cfg.configFile);
       const configured = configuredRepos(configText, route.route, cfgBase);
       const dir = configured.find((r) => r.name === SAMPLE_REPO)?.dir ?? sampleDir(configured.map((r) => r.dir), route.reposBasePath, route.route.split("/")[0]);
       const resolvedFile = resolvedPathFor(cfg.ship.stateDir, route.route);
@@ -19345,7 +19920,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         }
         if (configured.some((r) => r.dir === dir)) {
           try {
-            writeFileSync21(cfg.configFile, planRepoRemove(configText, cfgBase, route.route, dir).text);
+            writeFileSync22(cfg.configFile, planRepoRemove(configText, cfgBase, route.route, dir).text);
           } catch (e) {
             if (e instanceof ReposError) fail(e.message);
             throw e;
@@ -19353,29 +19928,29 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
         }
         if (row) {
           await tracker.deleteRepoRow(row.id);
-          if (existsSync33(resolvedFile)) {
-            const raw = JSON.parse(readFileSync27(resolvedFile, "utf8"));
+          if (existsSync34(resolvedFile)) {
+            const raw = JSON.parse(readFileSync28(resolvedFile, "utf8"));
             if (raw.repoNames) delete raw.repoNames[row.id];
             if (raw.repoRemotes) delete raw.repoRemotes[row.id];
-            writeFileSync21(resolvedFile, `${JSON.stringify(raw, null, 2)}
+            writeFileSync22(resolvedFile, `${JSON.stringify(raw, null, 2)}
 `);
           }
         }
-        if (existsSync33(join34(dir, ".git")) && basename11(dir) === SAMPLE_REPO) rmSync14(dir, { recursive: true, force: true });
+        if (existsSync34(join35(dir, ".git")) && basename11(dir) === SAMPLE_REPO) rmSync15(dir, { recursive: true, force: true });
         say("removed", { dir, closed }, `removed the sample repo${closed.length ? `, closed ${closed.join(", ")}` : ""}`);
         break;
       }
       const projectId = route.resolved.areaId ?? resolveRepoProject(await tracker.projectRows(), value("project"));
-      const fresh = !existsSync33(join34(dir, ".git"));
-      if (existsSync33(dir) && fresh && readdirSync14(dir).length > 0) fail(`${dir} exists and is not a git checkout \u2014 move it aside`);
+      const fresh = !existsSync34(join35(dir, ".git"));
+      if (existsSync34(dir) && fresh && readdirSync14(dir).length > 0) fail(`${dir} exists and is not a git checkout \u2014 move it aside`);
       if (dryRun) {
         say("dry-run", { dir, newCheckout: fresh, repoRow: row?.id ?? null }, `would ${fresh ? "create" : "reuse"} ${dir}${row ? "" : ", create the Repos row"}, and file one ${tracker.contract.statuses.approved} ticket`);
         break;
       }
       if (fresh) {
-        mkdirSync20(dir, { recursive: true });
-        writeFileSync21(join34(dir, "README.md"), SAMPLE_README);
-        writeFileSync21(join34(dir, ".crew.yaml"), SAMPLE_CREW_YAML);
+        mkdirSync21(dir, { recursive: true });
+        writeFileSync22(join35(dir, "README.md"), SAMPLE_README);
+        writeFileSync22(join35(dir, ".crew.yaml"), SAMPLE_CREW_YAML);
         const g = (...a) => {
           const r = spawnSync6("git", a, { cwd: dir, encoding: "utf8" });
           if (r.status !== 0) fail(`git ${a[0]} failed in ${dir}: ${(r.stderr || r.stdout).trim()}`);
@@ -19393,17 +19968,17 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           spec: { platform: "unix", releaseMode: "integrate", ciProvider: "none" }
         });
         repoId = (await tracker.createRepoRow(payload)).id;
-        if (existsSync33(resolvedFile)) {
-          const raw = JSON.parse(readFileSync27(resolvedFile, "utf8"));
+        if (existsSync34(resolvedFile)) {
+          const raw = JSON.parse(readFileSync28(resolvedFile, "utf8"));
           raw.repoNames = { ...raw.repoNames, [repoId]: SAMPLE_REPO };
           raw.repoRemotes = { ...raw.repoRemotes, [repoId]: SAMPLE_REMOTE };
-          writeFileSync21(resolvedFile, `${JSON.stringify(raw, null, 2)}
+          writeFileSync22(resolvedFile, `${JSON.stringify(raw, null, 2)}
 `);
         }
       }
       if (!configured.some((r) => r.dir === dir)) {
         try {
-          writeFileSync21(cfg.configFile, planRepoAdd({ text: configText, base: cfgBase, route: route.route, path: dir, name: SAMPLE_REPO }).text);
+          writeFileSync22(cfg.configFile, planRepoAdd({ text: configText, base: cfgBase, route: route.route, path: dir, name: SAMPLE_REPO }).text);
         } catch (e) {
           if (e instanceof ReposError) fail(e.message);
           throw e;
@@ -19524,6 +20099,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
       const projects = projectModeLabels(await statusTracker.projectRowsWithModes().catch(() => []));
       const crewMinVersion = await readCrewFloor(route, cfg.ship) ?? null;
       if (flag("json")) {
+        const nameSync = await reconcileRouteShipName({ route, ship: cfg.ship, configFile: cfg.configFile, readOnly: true });
         const repos = await resolvedRepos(route);
         const seatIds = route.resolved?.seats ?? {};
         const crewRows = Object.keys(seatIds).length ? await statusTracker.crewRows() : [];
@@ -19567,7 +20143,10 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             eventFile: eventFileFor(cfg.ship.stateDir),
             // Additive (CREW-1373): open ship-level items, including the
             // derived `release_stale`. `version` stays 1.
-            attention: openShipAttention(state)
+            attention: openShipAttention(state),
+            // Additive (CREW-2495): this ship's Ships-row name and whether it has drifted from `name`.
+            rowName: nameSync.rowName ?? null,
+            nameDrift: nameSync.drift
           },
           // Additive (CREW-1402): what the operator owes. `version` stays 1.
           todo: todo.map((i) => ({ ticket: displayKey(i.ticket), title: i.ticket.title ?? null, reasons: i.reasons })),
@@ -19714,7 +20293,7 @@ watermark:  ${state.watermark()}
           }
           for (const r of repos) {
             const remote = r.config.branch.remote;
-            if (existsSync33(r.dir)) {
+            if (existsSync34(r.dir)) {
               pushAuth.push({
                 route: c.route,
                 repo: r.name,
@@ -19742,7 +20321,7 @@ routes:            ${cfg.routes.map((c) => c.route).join(", ")}
       );
       try {
         const evFile = eventFileFor(cfg.ship.stateDir);
-        const evSize = existsSync33(evFile) ? statSync10(evFile).size : 0;
+        const evSize = existsSync34(evFile) ? statSync10(evFile).size : 0;
         process.stdout.write(
           evSize > cfg.ship.eventsRotateBytes * 4 ? `events log:        WARN ${evFile} is ${Math.round(evSize / 1048576)} MB (> 4x eventsRotateBytes); run \`crew reap\` to rotate it
 ` : "events log:        ok\n"
@@ -19753,7 +20332,7 @@ routes:            ${cfg.routes.map((c) => c.route).join(", ")}
         const unitPlan = planInstall(cfg.ship, CREW_HOME, host, detectSystemd(), "run");
         const abandons = unitAbandonsAgents(unitPlan, (p) => {
           try {
-            return readFileSync27(p, "utf8");
+            return readFileSync28(p, "utf8");
           } catch {
             return null;
           }
@@ -19825,6 +20404,11 @@ routes:            ${cfg.routes.map((c) => c.route).join(", ")}
           if (warn) process.stdout.write(`                   WARNING ${warn}
 `);
         }
+        const scope = releaseLockScope(route.route, r.name);
+        const lock2 = await tracker.lockState(scope).catch(() => void 0);
+        if (lock2?.holder && staleOwnLockClaim(lock2.holder, cfg.ship.name)) {
+          process.stdout.write(`                   ${formatStaleOwnLock(scope, lock2.holder)}`);
+        }
       }
       const missingAuthorship = await tracker.missingAuthorshipColumns();
       process.stdout.write(
@@ -20145,7 +20729,7 @@ ${foreign.join("\n")}
       break;
     }
     default:
-      usage();
+      usage(`unknown command "${command}"`);
   }
   lock?.release();
 }