@tablation/crew 0.126.0 → 0.126.2

package/dist/cli.js

@@ -794,7 +794,7 @@ function shellInitScript(shell) {
 
 // src/config.ts
 import { readFileSync as readFileSync15, existsSync as existsSync15 } from "fs";
-import { resolve as resolve2, dirname as dirname7, isAbsolute as isAbsolute2, join as join17, basename as basename4 } from "path";
+import { resolve as resolve2, dirname as dirname8, isAbsolute as isAbsolute2, join as join17, basename as basename4 } from "path";
 import { homedir as homedir6, tmpdir } from "os";
 import { parse as parse2 } from "yaml";
 
@@ -2661,7 +2661,7 @@ function explain(ship, required) {
 
 // src/repo-config.ts
 import { readFileSync as readFileSync14, existsSync as existsSync14 } from "fs";
-import { join as join16, basename as basename3 } from "path";
+import { join as join16, basename as basename3, dirname as dirname7 } from "path";
 import { parse } from "yaml";
 
 // src/sandbox-policy.ts
@@ -2863,6 +2863,19 @@ var SPEC_VERSION = 1;
 var REPO_CONFIG_FILENAMES = [".crew.yaml", ".crew.yml", ".crew.json"];
 var RepoConfigError = class extends Error {
 };
+function versionFileProblem(name, text2) {
+  const remedy = `a version file that is not a JSON object with a string "version" needs hooks.bump instead of release.versionFiles (docs/REPO_SPEC.md)`;
+  let doc;
+  try {
+    doc = JSON.parse(text2);
+  } catch {
+    return `release.versionFiles entry "${name}" is not a JSON document \u2014 ${remedy}`;
+  }
+  if (!doc || typeof doc !== "object" || Array.isArray(doc) || typeof doc.version !== "string") {
+    return `release.versionFiles entry "${name}" has no string "version" field \u2014 ${remedy}`;
+  }
+  return null;
+}
 var HOOK_NAMES = [
   "test",
   "build",
@@ -3197,6 +3210,22 @@ function parseRepoConfig(text2, file) {
   if (versionFiles.length === 0) {
     throw new RepoConfigError(`${file}: release.versionFiles cannot be empty`);
   }
+  if (versionFilesGiven) {
+    for (const name of versionFiles) {
+      const path = join16(dirname7(file), name);
+      if (!existsSync14(path)) continue;
+      let text3;
+      try {
+        text3 = readFileSync14(path, "utf8");
+      } catch (e) {
+        throw new RepoConfigError(
+          `${file}: release.versionFiles entry "${name}" cannot be read (${e.code ?? "read error"})`
+        );
+      }
+      const problem = versionFileProblem(name, text3);
+      if (problem) throw new RepoConfigError(`${file}: ${problem}`);
+    }
+  }
   const inspectorRaw = raw.periscope?.inspector;
   if (inspectorRaw !== void 0 && inspectorRaw !== "proxy" && inspectorRaw !== "repo") {
     throw new RepoConfigError(`${file}: periscope.inspector must be "proxy" or "repo"`);
@@ -3898,7 +3927,7 @@ function loadConfig(crewHome, configFile, opts = {}) {
 ` + configSearchPath(crewHome).map((c) => `  - ${c}`).join("\n") + `
 
 Create the first of those:
-  mkdir -p ${dirname7(defaultConfigPath())} && cp ${join17(crewHome, "crew.example.yaml")} ${defaultConfigPath()}`
+  mkdir -p ${dirname8(defaultConfigPath())} && cp ${join17(crewHome, "crew.example.yaml")} ${defaultConfigPath()}`
     );
   }
   let raw;
@@ -3908,7 +3937,7 @@ Create the first of those:
     throw new ConfigError(`${file}: not valid YAML \u2014 ${e.message}`);
   }
   if (!raw || typeof raw !== "object") throw new ConfigError(`${file} is empty or not a mapping`);
-  const base = dirname7(file);
+  const base = dirname8(file);
   const missing = new Missing();
   rejectUnknownKeys(raw, /* @__PURE__ */ new Set(["ship", "routes"]), "top-level", file);
   const shipRaw = raw.ship ?? {};
@@ -4275,7 +4304,7 @@ function locateDir(cfg, dir, commonDirOf) {
   const direct = find(target);
   if (direct) return direct;
   const common = commonDirOf?.(target);
-  return common ? find(dirname7(resolve2(target, common))) : void 0;
+  return common ? find(dirname8(resolve2(target, common))) : void 0;
 }
 function findRoute(cfg, route2) {
   if (!route2) {
@@ -4717,7 +4746,7 @@ function recoveredFailureHeadlines(o, route2) {
 }
 
 // src/install.ts
-import { dirname as dirname8, join as join18, extname } from "path";
+import { dirname as dirname9, join as join18, extname } from "path";
 import { homedir as homedir7, userInfo } from "os";
 import { accessSync as accessSync2, constants as constants2, existsSync as existsSync16, mkdirSync as mkdirSync11, readdirSync as readdirSync3, readFileSync as readFileSync16, statSync as statSync5, writeFileSync as writeFileSync12, unlinkSync, realpathSync } from "fs";
 import { spawnSync as spawnSync5 } from "child_process";
@@ -4762,7 +4791,7 @@ function schedulerLogFor(crewLog, job) {
   return `${stem}.${suffix}${ext || ".log"}`;
 }
 function pathFor(ship) {
-  const nodeBinDir = dirname8(process.execPath);
+  const nodeBinDir = dirname9(process.execPath);
   const parts = [nodeBinDir];
   if (ship.extraPath) parts.push(ship.extraPath);
   parts.push("/usr/bin", "/bin", "/usr/sbin", "/sbin");
@@ -4784,7 +4813,7 @@ function dockerPathProblem(ship, shellPath = process.env.PATH ?? "") {
   const schedulerPath = pathFor(ship);
   if (findOnPath("docker", schedulerPath)) return void 0;
   const inShell = findOnPath("docker", shellPath);
-  return inShell ? `\`docker\` is not on the scheduler PATH (${schedulerPath}) but is at ${inShell} in your shell; add ${dirname8(inShell)} to ship.extraPath in crew.yaml and run \`crew install\`` : `\`docker\` is not on the scheduler PATH (${schedulerPath}) or your shell PATH; install Docker, then add its directory to ship.extraPath in crew.yaml and run \`crew install\``;
+  return inShell ? `\`docker\` is not on the scheduler PATH (${schedulerPath}) but is at ${inShell} in your shell; add ${dirname9(inShell)} to ship.extraPath in crew.yaml and run \`crew install\`` : `\`docker\` is not on the scheduler PATH (${schedulerPath}) or your shell PATH; install Docker, then add its directory to ship.extraPath in crew.yaml and run \`crew install\``;
 }
 var USER_INSTALL = { root: false, user: "" };
 function installContext(env = process.env) {
@@ -5079,7 +5108,7 @@ async function applyInstall(plan, crewHome, dryRun, log) {
     }
     const before = existsSync16(path) ? readFileSync16(path, "utf8") : null;
     if (before !== plan.unitContent[path]) changed2 = true;
-    mkdirSync11(dirname8(path), { recursive: true });
+    mkdirSync11(dirname9(path), { recursive: true });
     writeFileSync12(path, plan.unitContent[path]);
     log.emit(`wrote ${path}`);
   }
@@ -5308,7 +5337,7 @@ import {
   readdirSync as readdirSync4,
   rmSync as rmSync9
 } from "fs";
-import { dirname as dirname9, basename as basename5, join as join19 } from "path";
+import { dirname as dirname10, basename as basename5, join as join19 } from "path";
 var GitError = class extends Error {
 };
 function streamText(x) {
@@ -5688,7 +5717,7 @@ function recoverStrandedReleaseCheckouts(cwd) {
     if (line.startsWith("worktree ")) path = line.slice("worktree ".length);
     else if (line.startsWith("branch refs/heads/crew/release-") && path) {
       gitOk(cwd, ["worktree", "remove", "--force", path]);
-      const root = dirname9(path);
+      const root = dirname10(path);
       if (basename5(root).startsWith("crew-release-")) rmSync9(root, { recursive: true, force: true });
     }
   }
@@ -5768,7 +5797,7 @@ function ensureRepoCheckout(dir, remote, opts = {}) {
       `${dir} does not exist and this repo has no discovered remote to clone from \u2014 re-run \`crew connect\`, or check out the repository yourself and point \`repos:\` at it`
     );
   }
-  mkdirSync12(dirname9(dir), { recursive: true });
+  mkdirSync12(dirname10(dir), { recursive: true });
   const url = cloneUrlFor(remote, opts);
   try {
     execFileSync5("git", ["clone", url, dir], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
@@ -5793,7 +5822,7 @@ function sleepSync(ms3) {
 }
 function acquireCheckoutLock(dir, timeoutMs = 3e4) {
   const lockPath = checkoutLockPath(dir);
-  mkdirSync12(dirname9(lockPath), { recursive: true });
+  mkdirSync12(dirname10(lockPath), { recursive: true });
   const deadline = Date.now() + timeoutMs;
   for (; ; ) {
     try {
@@ -6305,7 +6334,7 @@ import { createHash as createHash6 } from "crypto";
 import { spawn as spawn5 } from "child_process";
 import { execFileSync as execFileSync8 } from "child_process";
 import { existsSync as existsSync30, mkdirSync as mkdirSync19, readFileSync as readFileSync27, renameSync as renameSync3, writeFileSync as writeFileSync20, rmSync as rmSync15 } from "fs";
-import { dirname as dirname14, join as join32 } from "path";
+import { dirname as dirname15, join as join32 } from "path";
 import { fileURLToPath } from "url";
 import { tmpdir as tmpdir3 } from "os";
 
@@ -6330,7 +6359,7 @@ import { spawnSync as spawnSync6 } from "child_process";
 import { readFileSync as readFileSync25, existsSync as existsSync26, statSync as statSync8, mkdirSync as mkdirSync18, writeFileSync as writeFileSync19, createWriteStream, openSync as openSync4, closeSync as closeSync4, readSync } from "fs";
 import { StringDecoder } from "string_decoder";
 import { finished } from "stream/promises";
-import { join as join29, dirname as dirname13, basename as basename9 } from "path";
+import { join as join29, dirname as dirname14, basename as basename9 } from "path";
 import { createHash as createHash4 } from "crypto";
 
 // src/state.ts
@@ -7235,7 +7264,7 @@ function renderEnvironment(i) {
 
 // src/intel-bridge.ts
 import { existsSync as existsSync20, mkdirSync as mkdirSync14, readFileSync as readFileSync20, rmSync as rmSync11, writeFileSync as writeFileSync15 } from "fs";
-import { dirname as dirname10, join as join22 } from "path";
+import { dirname as dirname11, join as join22 } from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -7255,7 +7284,7 @@ function intelDir(stateDir, route2, ticket) {
 }
 var attachFilePath = (stateDir, route2, ticket) => join22(intelDir(stateDir, route2, ticket), "url");
 function writeAttachFile(file, url) {
-  mkdirSync14(dirname10(file), { recursive: true });
+  mkdirSync14(dirname11(file), { recursive: true });
   writeFileSync15(file, `${url}
 `);
 }
@@ -9300,7 +9329,7 @@ function holdWarnings(tickets, ships, contract, humanHolds, now = Date.now()) {
 
 // src/run-worktree.ts
 import { existsSync as existsSync22 } from "fs";
-import { dirname as dirname11, join as join24 } from "path";
+import { dirname as dirname12, join as join24 } from "path";
 var describeRunWorktreePlan = (p) => {
   switch (p.action) {
     case "cut-remote":
@@ -9357,7 +9386,7 @@ function planRunWorktree(dir, cfg, t, role, opts = {}) {
     if (countCommits(existing.path, `${baseRef}..HEAD`) > 0) return { action: "leave-unpushed", path: existing.path, branch };
     return { action: "recut", path: existing.path, branch, base: baseRef };
   }
-  const path = join24(dirname11(dir), worktreeForTicket(dir, cfg, t, role));
+  const path = join24(dirname12(dir), worktreeForTicket(dir, cfg, t, role));
   if (located?.where === "remote" || located && hasRemote && remoteBranchExists(dir, remote, located.branch)) {
     return { action: "cut-remote", path, branch: located.branch };
   }
@@ -10631,7 +10660,7 @@ function skillMarkerWarnings(promptsDir, personaPrompts) {
 import { spawn as spawn3, execFile, execFileSync as execFileSync6 } from "child_process";
 import { mkdtempSync, mkdirSync as mkdirSync17, writeFileSync as writeFileSync18, rmSync as rmSync14 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { basename as basename8, dirname as dirname12, join as join28 } from "path";
+import { basename as basename8, dirname as dirname13, join as join28 } from "path";
 import { promisify } from "util";
 
 // src/run-limit.ts
@@ -10760,7 +10789,7 @@ var SandboxRunner = class {
         throw new Error(`cannot generate the sandbox policy: ${e.message}`);
       }
       policyFile = policyPathFor(plan.streamPath);
-      mkdirSync17(dirname12(policyFile), { recursive: true });
+      mkdirSync17(dirname13(policyFile), { recursive: true });
       writeFileSync18(policyFile, generated.yaml, { mode: 384 });
     }
     const create2 = ["sandbox", "create", "--name", name, "--detach"];
@@ -11022,7 +11051,7 @@ function codeBridgeFor(o, harness) {
     "--clone",
     o.ship.sandbox?.workDir ?? DEFAULT_SANDBOX_WORKDIR,
     "--state-dir",
-    dirname13(SANDBOX_INTEL_DIR),
+    dirname14(SANDBOX_INTEL_DIR),
     "--ticket",
     number,
     ...seed ? ["--seed-cache", seed] : []
@@ -11036,7 +11065,7 @@ function codeBridgeFor(o, harness) {
       bridge.files = [{ path: bridge.settingsFile, content: text2 }];
     } else {
       const file = join29(intelDir(o.stateDir, o.route.route, number), "gemini-settings.json");
-      mkdirSync18(dirname13(file), { recursive: true });
+      mkdirSync18(dirname14(file), { recursive: true });
       writeFileSync19(file, text2);
       bridge.settingsFile = file;
     }
@@ -11259,7 +11288,7 @@ async function killForDeadline(kill, pid, emit, role, ticket, spawnedAt, limitMi
 var withoutKey = ({ apiKey: _apiKey, ...rest }) => rest;
 function openSink(path) {
   try {
-    mkdirSync18(dirname13(path), { recursive: true });
+    mkdirSync18(dirname14(path), { recursive: true });
     return createWriteStream(path, { flags: "a" });
   } catch {
     return void 0;
@@ -11611,7 +11640,7 @@ function spawnAgent(plan, emit, hintMoved) {
   const id = identityOf(plan, adapter.harness);
   let streamFd;
   try {
-    mkdirSync18(dirname13(plan.streamPath), { recursive: true });
+    mkdirSync18(dirname14(plan.streamPath), { recursive: true });
     streamFd = openSync4(plan.streamPath, "a");
   } catch (e) {
     void endSink(eventsSink);
@@ -12830,7 +12859,7 @@ var SANDBOX_UID = 1e3;
 var CREW_PREFIX = "/opt/crew";
 var SANDBOX_BRIDGE_PATH = `${CREW_PREFIX}/bin/intel-bridge`;
 function readBridgeBundle() {
-  const here = dirname14(fileURLToPath(import.meta.url));
+  const here = dirname15(fileURLToPath(import.meta.url));
   for (const p of [join32(here, "sandbox-intel-bridge.cjs"), join32(here, "..", "dist", "sandbox-intel-bridge.cjs")]) {
     if (existsSync30(p)) return readFileSync27(p, "utf8");
   }
@@ -13055,7 +13084,7 @@ async function buildSandboxImage(plan, deps) {
     try {
       writeFileSync20(join32(ctx, "Dockerfile"), layer.dockerfile);
       for (const [name, content] of Object.entries(layer.files)) {
-        mkdirSync19(dirname14(join32(ctx, name)), { recursive: true });
+        mkdirSync19(dirname15(join32(ctx, name)), { recursive: true });
         writeFileSync20(join32(ctx, name), content);
       }
       const code = await deps.run(["build", "--tag", layer.tag, "--file", join32(ctx, "Dockerfile"), ctx], logPath);
@@ -13468,7 +13497,7 @@ function doctorSelftestLines(stored, toolchains) {
 }
 
 // src/cli.ts
-import { resolve as resolve7, dirname as dirname33, join as join55, basename as basename16 } from "path";
+import { resolve as resolve7, dirname as dirname34, join as join55, basename as basename16 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { hostname as hostname4, homedir as homedir11 } from "os";
 import { spawnSync as spawnSync11 } from "child_process";
@@ -13667,7 +13696,7 @@ function rosterMarkdown(roster, meId) {
 
 // src/connect-resume.ts
 import { mkdirSync as mkdirSync21, readFileSync as readFileSync29, rmSync as rmSync17, writeFileSync as writeFileSync22 } from "fs";
-import { dirname as dirname15, join as join34 } from "path";
+import { dirname as dirname16, join as join34 } from "path";
 function lastSessionFile(stateDir) {
   return join34(stateDir, "connect-session.json");
 }
@@ -13687,7 +13716,7 @@ function readPointers(stateDir) {
 }
 function writePointers(stateDir, pointers) {
   const file = lastSessionFile(stateDir);
-  mkdirSync21(dirname15(file), { recursive: true });
+  mkdirSync21(dirname16(file), { recursive: true });
   writeFileSync22(file, `${JSON.stringify(pointers, null, 2)}
 `, { mode: 384 });
 }
@@ -13774,7 +13803,7 @@ async function signOutSessions(o) {
 
 // src/reset.ts
 import { existsSync as existsSync32, mkdirSync as mkdirSync22, readFileSync as readFileSync30, readdirSync as readdirSync12, rmSync as rmSync18, statSync as statSync10, writeFileSync as writeFileSync23 } from "fs";
-import { dirname as dirname16, join as join35 } from "path";
+import { dirname as dirname17, join as join35 } from "path";
 import { hostFromUrl as hostFromUrl3 } from "@tablation/client";
 function clonedCheckoutsFile(stateDir) {
   return join35(stateDir, "cloned-checkouts.json");
@@ -13791,7 +13820,7 @@ function recordClonedCheckout(stateDir, dir) {
   const known = readClonedCheckouts(stateDir);
   if (known.includes(dir)) return;
   const file = clonedCheckoutsFile(stateDir);
-  mkdirSync22(dirname16(file), { recursive: true });
+  mkdirSync22(dirname17(file), { recursive: true });
   writeFileSync23(file, `${JSON.stringify([...known, dir], null, 2)}
 `);
 }
@@ -13974,7 +14003,7 @@ async function runDeprovision(o, fx, deps) {
 // src/pool-member.ts
 import { mkdirSync as mkdirSync23, readFileSync as readFileSync31, renameSync as renameSync4, writeFileSync as writeFileSync24 } from "fs";
 import { homedir as homedir8 } from "os";
-import { dirname as dirname17, join as join36 } from "path";
+import { dirname as dirname18, join as join36 } from "path";
 var POOL_EXIT = { ok: 0, failed: 1, credential: 2 };
 function backoffMs(attempt) {
   return Math.min(6e4, 5e3 * 2 ** Math.max(0, attempt));
@@ -14218,7 +14247,7 @@ function fileMemberStore(dir) {
       }
     },
     write(f) {
-      mkdirSync23(dirname17(file), { recursive: true, mode: 448 });
+      mkdirSync23(dirname18(file), { recursive: true, mode: 448 });
       const tmp = `${file}.tmp`;
       writeFileSync24(tmp, `${JSON.stringify(f)}
 `, { mode: 384 });
@@ -14279,7 +14308,7 @@ import { hostname as hostname3 } from "os";
 import { execFileSync as execFileSync10 } from "child_process";
 import { createHash as createHash7 } from "crypto";
 import { existsSync as existsSync33, mkdirSync as mkdirSync24, readFileSync as readFileSync32, writeFileSync as writeFileSync25 } from "fs";
-import { dirname as dirname18, join as join37 } from "path";
+import { dirname as dirname19, join as join37 } from "path";
 function machineIdPathFor(stateDir) {
   return join37(stateDir, "machine-id");
 }
@@ -14313,7 +14342,7 @@ function ensureMachineId(stateDir, opts = {}) {
   const raw = (opts.read ?? readRawMachineId)();
   if (!raw) return void 0;
   const hashed = sha256(raw);
-  mkdirSync24(dirname18(path), { recursive: true });
+  mkdirSync24(dirname19(path), { recursive: true });
   writeFileSync25(path, `${hashed}
 `, { mode: 384 });
   return hashed;
@@ -16594,7 +16623,7 @@ async function resolveOne(tracker, t, seat, approvedStatus, buildingStatus, affi
 
 // src/repo-refresh.ts
 import { existsSync as existsSync37, mkdirSync as mkdirSync26, readFileSync as readFileSync35, writeFileSync as writeFileSync29 } from "fs";
-import { dirname as dirname20 } from "path";
+import { dirname as dirname21 } from "path";
 var REFRESH_COOLDOWN_MS = 2 * 6e4;
 var UNSERVABLE_PASSES_BEFORE_ATTENTION = 3;
 var lastAsked = /* @__PURE__ */ new Map();
@@ -16626,7 +16655,7 @@ function persistRepoRows(stateDir, routeName, rows) {
   if (!existsSync37(path)) return;
   const raw = JSON.parse(readFileSync35(path, "utf8"));
   applyRepoRows(raw, rows);
-  mkdirSync26(dirname20(path), { recursive: true });
+  mkdirSync26(dirname21(path), { recursive: true });
   writeFileSync29(path, `${JSON.stringify(raw, null, 2)}
 `);
 }
@@ -17077,7 +17106,7 @@ Ship ${shipName2} found: ${problem}. The release refuses to squash a ref nobody
 var localRefSkipReported = (ticket, problem, events) => events.some((e) => e.record_id === ticket.id && e.event_type === "local_ref_skip" && (e.message ?? "").includes(problem));
 
 // src/connect-wizard.ts
-import { delimiter, dirname as dirname21, join as join41 } from "path";
+import { delimiter, dirname as dirname22, join as join41 } from "path";
 import { accessSync as accessSync3, constants as constants3, existsSync as existsSync38, mkdirSync as mkdirSync27, writeFileSync as writeFileSync30 } from "fs";
 import { stringify as stringify3 } from "yaml";
 var HOST_PASSENGERS_DOCS_URL = "https://crew.tablation.dev/host-passengers";
@@ -17126,9 +17155,9 @@ async function runWizard(p, env) {
     if (entered && isExec(entered)) agentBin = entered;
     else p.say(entered ? `${entered} is not an executable file.` : "A path is required.");
   }
-  const nodeDir = dirname21(env.nodePath);
+  const nodeDir = dirname22(env.nodePath);
   const pnpmPath = findOnPath2("pnpm", env.pathEnv, isExec);
-  const baseDirs = [nodeDir, pnpmPath ? dirname21(pnpmPath) : void 0];
+  const baseDirs = [nodeDir, pnpmPath ? dirname22(pnpmPath) : void 0];
   p.say(
     `
 Host Passengers lets this machine run the agent sessions that other people's
@@ -17139,7 +17168,7 @@ Tablation workspaces ask for, in a container. More: ${HOST_PASSENGERS_DOCS_URL}`
     p.say("Docker is not available here, so nothing will be hosted until it is. Your answer is recorded anyway.");
   }
   const dockerPath = hostPassengers ? findOnPath2("docker", env.pathEnv, isExec) : void 0;
-  const extraPath = deriveExtraPath([...baseDirs, dockerPath ? dirname21(dockerPath) : void 0]);
+  const extraPath = deriveExtraPath([...baseDirs, dockerPath ? dirname22(dockerPath) : void 0]);
   if (extraPath) {
     p.say(`Hooks will get ${extraPath} on their PATH (where node, pnpm${dockerPath ? " and docker" : ""} live).`);
   }
@@ -17161,7 +17190,7 @@ routes:
 ${routeBlock}`;
 }
 function writeNewConfig(path, text2) {
-  mkdirSync27(dirname21(path), { recursive: true });
+  mkdirSync27(dirname22(path), { recursive: true });
   try {
     writeFileSync30(path, text2, { mode: 384, flag: "wx" });
     return true;
@@ -17197,7 +17226,7 @@ Wrote ${o.configPath}.
 // src/connect-json.ts
 import { accessSync as accessSync4, constants as constants4 } from "fs";
 import { homedir as homedir10 } from "os";
-import { dirname as dirname22, join as join42 } from "path";
+import { dirname as dirname23, join as join42 } from "path";
 import { delimiter as delimiter2 } from "path";
 var CHOICE_EXIT_CODE = 3;
 function createEmitter(json2, write) {
@@ -17263,7 +17292,7 @@ function flagWizardAnswers(f, env) {
   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([dirname22(env.nodePath), pnpmPath ? dirname22(pnpmPath) : void 0, dockerPath ? dirname22(dockerPath) : void 0]);
+  const extraPath = f.extraPath ?? deriveExtraPath([dirname23(env.nodePath), pnpmPath ? dirname23(pnpmPath) : void 0, dockerPath ? dirname23(dockerPath) : void 0]);
   return {
     answers: {
       name: f.shipName?.trim() || env.hostname,
@@ -17278,7 +17307,7 @@ function flagWizardAnswers(f, env) {
 
 // src/release-run.ts
 import { readFileSync as readFileSync36, writeFileSync as writeFileSync31, existsSync as existsSync39, copyFileSync, mkdirSync as mkdirSync28, mkdtempSync as mkdtempSync3, rmSync as rmSync19 } from "fs";
-import { dirname as dirname23, join as join43 } from "path";
+import { dirname as dirname24, join as join43 } from "path";
 import { tmpdir as tmpdir5 } from "os";
 
 // src/release.ts
@@ -18025,7 +18054,13 @@ async function bump(o, size) {
     o.emit.error(`no ${o.repo.release.versionFiles[0]} to read a version from`);
     return null;
   }
-  const current = JSON.parse(readFileSync36(first, "utf8")).version;
+  const firstText = readFileSync36(first, "utf8");
+  const problem = versionFileProblem(o.repo.release.versionFiles[0], firstText);
+  if (problem) {
+    o.emit.error(problem);
+    return null;
+  }
+  const current = JSON.parse(firstText).version;
   if (!current) {
     o.emit.error(`no version field in ${o.repo.release.versionFiles[0]}`);
     return null;
@@ -18164,7 +18199,7 @@ function openReleaseCheckout(o) {
   for (const f of o.repo.worktrees.copy) {
     const src = join43(o.cwd, f);
     if (!existsSync39(src)) continue;
-    mkdirSync28(dirname23(join43(dir, f)), { recursive: true });
+    mkdirSync28(dirname24(join43(dir, f)), { recursive: true });
     copyFileSync(src, join43(dir, f));
   }
   return { dir, branch, close };
@@ -18493,6 +18528,20 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
     }
     merged.push(c);
   }
+  if (applied > 0 && !o.dryRun && !o.mergeOnly && o.reloadRepo) {
+    const changed2 = gitOk(o.cwd, ["diff", "--name-only", preMerge, "HEAD", "--", ...REPO_CONFIG_FILENAMES]);
+    if (changed2) {
+      try {
+        const next = o.reloadRepo(o.cwd);
+        if (next) {
+          o = { ...o, repo: next };
+          o.emit.emit(`${changed2.split("\n")[0]} changed in this release \u2014 continuing under the merged contract`);
+        }
+      } catch (e) {
+        o.emit.warn(`could not re-read the merged repo config: ${e.message}; releasing under the earlier one`);
+      }
+    }
+  }
   if (o.mergeOnly) {
     o.emit.emit(`merge only: ${merged.length} branch(es) merged, not releasing`);
     return { merged, conflicts, unbuildable, deployed: false, stopped: "merge only", decision };
@@ -18517,7 +18566,8 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
     o.emit.emit("nothing to release");
     return { merged, conflicts, unbuildable, deployed: false, stopped: "nothing to release", decision };
   }
-  if (merged.length === 0 && decision.unseeded && !o.force) {
+  const waiting = decision.merges.some((c) => c.skipReason === "already-merged" && c.mergedSha);
+  if (merged.length === 0 && decision.unseeded && !waiting && !o.force) {
     o.emit.emit(
       `nothing merged, and ${o.repo.branch.base} carries no release tag to compare against \u2014 nothing to release`
     );
@@ -19489,7 +19539,7 @@ function nextRoles(decision, ran) {
 
 // src/ship-name.ts
 import { existsSync as existsSync41, mkdirSync as mkdirSync29, readFileSync as readFileSync37, renameSync as renameSync5, writeFileSync as writeFileSync32 } from "fs";
-import { dirname as dirname24 } from "path";
+import { dirname as dirname25 } from "path";
 import { parseDocument as parseDocument5 } from "yaml";
 var ShipNameError = class extends Error {
 };
@@ -19568,7 +19618,7 @@ function writeSyncedName(resolvedFile, name) {
   }
   if (raw.shipName === name) return;
   raw.shipName = name;
-  mkdirSync29(dirname24(resolvedFile), { recursive: true });
+  mkdirSync29(dirname25(resolvedFile), { recursive: true });
   const tmp = `${resolvedFile}.tmp${process.pid}`;
   writeFileSync32(tmp, `${JSON.stringify(raw, null, 2)}
 `);
@@ -20262,7 +20312,7 @@ function describeCapability(i) {
 
 // src/agents-sync-run.ts
 import { existsSync as existsSync42, mkdirSync as mkdirSync30, readFileSync as readFileSync38, writeFileSync as writeFileSync33 } from "fs";
-import { dirname as dirname25 } from "path";
+import { dirname as dirname26 } from "path";
 async function runAgentsSync(target, o) {
   const dryRun = o.dryRun ?? false;
   const force = o.force ?? false;
@@ -20299,7 +20349,7 @@ async function runAgentsSync(target, o) {
     raw.agentPersonas = personaResult.agentPersonas;
     if (skillResult) raw.agentSkills = skillResult.agentSkills;
     if (personaResult.releaseAgentId) raw.releaseAgentId = personaResult.releaseAgentId;
-    mkdirSync30(dirname25(resolvedPath), { recursive: true });
+    mkdirSync30(dirname26(resolvedPath), { recursive: true });
     writeFileSync33(resolvedPath, `${JSON.stringify(raw, null, 2)}
 `);
     if (target.resolved) {
@@ -20922,7 +20972,7 @@ ${run3.err}` });
 }
 
 // src/sample-ticket.ts
-import { basename as basename12, dirname as dirname26, join as join44 } from "path";
+import { basename as basename12, dirname as dirname27, join as join44 } from "path";
 var SAMPLE_REPO = "crew-sample";
 var SAMPLE_REMOTE = `local/${SAMPLE_REPO}`;
 var SAMPLE_MARKER = "sample: true";
@@ -20945,7 +20995,7 @@ 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 join44(dirname26(existing[0]), SAMPLE_REPO);
+  if (existing.length > 0) return join44(dirname27(existing[0]), SAMPLE_REPO);
   return join44(reposBase, workspace, SAMPLE_REPO);
 }
 var SAMPLE_TITLE = "Sample: add a documented `greet` function with a test";
@@ -20991,7 +21041,7 @@ function planSampleTicket(i) {
 
 // src/worktree-sweep.ts
 import { existsSync as existsSync43, readFileSync as readFileSync40, readdirSync as readdirSync14 } from "fs";
-import { basename as basename13, dirname as dirname27, join as join45, resolve as resolve5 } from "path";
+import { basename as basename13, dirname as dirname28, join as join45, resolve as resolve5 } 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;
@@ -21055,7 +21105,7 @@ function worktreeTicketNumbers(target) {
   return [...nums];
 }
 function siblingWorktreeDirs(target) {
-  const parent = dirname27(target.dir.replace(/[/\\]+$/, ""));
+  const parent = dirname28(target.dir.replace(/[/\\]+$/, ""));
   const stem = `${basename13(target.dir.replace(/[/\\]+$/, ""))}-`;
   const registered = new Set(worktrees(target.dir).map((w) => resolve5(w.path)));
   let names;
@@ -21907,7 +21957,7 @@ import { dirname as dirOf2, resolve as resolvePath } from "path";
 // src/ssh-keys.ts
 import { execFileSync as execFileSync13 } from "child_process";
 import { existsSync as existsSync46, mkdirSync as mkdirSync32, readFileSync as readFileSync42, chmodSync as chmodSync3 } from "fs";
-import { dirname as dirname28, join as join49 } from "path";
+import { dirname as dirname29, join as join49 } from "path";
 var SshKeyError = class extends Error {
 };
 function shipSshKeyPathFor(stateDir) {
@@ -21917,7 +21967,7 @@ function ensureShipSshKeypair(stateDir) {
   const privateKeyPath = shipSshKeyPathFor(stateDir);
   const publicKeyPath = `${privateKeyPath}.pub`;
   if (!existsSync46(privateKeyPath)) {
-    mkdirSync32(dirname28(privateKeyPath), { recursive: true });
+    mkdirSync32(dirname29(privateKeyPath), { recursive: true });
     try {
       execFileSync13("ssh-keygen", [
         "-t",
@@ -22109,7 +22159,7 @@ import { join as join50 } from "path";
 
 // src/passenger-mirror.ts
 import { mkdirSync as mkdirSync33 } from "fs";
-import { dirname as dirname29 } from "path";
+import { dirname as dirname30 } from "path";
 function mirrorRepoOf(spec) {
   const fromOrigin = spec.originUrl ? parseRemote(spec.originUrl) : null;
   if (fromOrigin) return fromOrigin;
@@ -22127,7 +22177,7 @@ async function materializeMirrorCheckouts(specs, cacheFor = (s) => new SandboxCa
       continue;
     }
     try {
-      const parent = dirname29(spec.dir);
+      const parent = dirname30(spec.dir);
       mkdirSync33(parent, { recursive: true });
       mkdirSync33(spec.dir, { recursive: true });
       const r = await cacheFor(spec).materialize(repo, spec.base, parent, spec.name);
@@ -22333,7 +22383,7 @@ import { createServer, request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
 import { connect as netConnect } from "net";
 import { connect as tlsConnect } from "tls";
-import { dirname as dirname30, isAbsolute as isAbsolute4 } from "path";
+import { dirname as dirname31, isAbsolute as isAbsolute4 } from "path";
 import { brotliDecompressSync, gunzipSync, inflateSync } from "zlib";
 
 // src/periscope-inspector.ts
@@ -22447,7 +22497,7 @@ function parsePointedBody(raw) {
   return entry;
 }
 function appendPointed(file, entry, now = /* @__PURE__ */ new Date()) {
-  mkdirSync35(dirname30(file), { recursive: true });
+  mkdirSync35(dirname31(file), { recursive: true });
   appendFileSync3(file, `${JSON.stringify({ ...entry, at: now.toISOString() })}
 `);
 }
@@ -23465,7 +23515,7 @@ import {
 } from "fs";
 import { createConnection } from "net";
 import { createServer as createServer2 } from "http";
-import { basename as basename14, dirname as dirname31, join as join52 } from "path";
+import { basename as basename14, dirname as dirname32, join as join52 } from "path";
 import { execFile as execFile3, spawn as spawn12 } from "child_process";
 
 // src/periscope-control.ts
@@ -23781,7 +23831,7 @@ function candidates(live, rotated) {
   const out = [live];
   if (!rotated) return out;
   try {
-    for (const n of readdirSync18(dirname31(live))) if (ROTATED_EVENTS_RE.test(n)) out.push(join52(dirname31(live), n));
+    for (const n of readdirSync18(dirname32(live))) if (ROTATED_EVENTS_RE.test(n)) out.push(join52(dirname32(live), n));
   } catch {
   }
   return out;
@@ -23941,7 +23991,7 @@ async function tailReply(path, q2, rotated, abort) {
   const deadline = Date.now() + Math.min(wait, MAX_WAIT_SECONDS) * 1e3;
   let r = readTail(path, { after, tail: tail3, rotated });
   while (after && !r.lines.length && !r.reset && Date.now() < deadline && !abort.aborted) {
-    await waitForChange(dirname31(path), deadline - Date.now(), abort);
+    await waitForChange(dirname32(path), deadline - Date.now(), abort);
     r = readTail(path, { after: r.cursor, rotated });
   }
   return reply2(200, r);
@@ -24131,7 +24181,7 @@ function crewJson(args, timeoutMs = 6e4) {
 
 // src/periscope-mcp.ts
 import { lstat, mkdir, readdir, readFile, readlink, realpath, rm, stat, writeFile } from "fs/promises";
-import { basename as basename15, dirname as dirname32, isAbsolute as isAbsolute5, join as join54, relative as relative2, resolve as resolve6, sep } from "path";
+import { basename as basename15, dirname as dirname33, isAbsolute as isAbsolute5, join as join54, relative as relative2, resolve as resolve6, sep } from "path";
 import { z } from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
@@ -24269,10 +24319,10 @@ async function realAncestor(p) {
     }
     if (isLink) {
       if (++hops > 40) throw new PathRefusal(`too many symbolic links resolving ${p}`);
-      cur = resolve6(dirname32(cur), await readlink(cur));
+      cur = resolve6(dirname33(cur), await readlink(cur));
       continue;
     }
-    const parent = dirname32(cur);
+    const parent = dirname33(cur);
     if (parent === cur) throw new PathRefusal(`cannot resolve ${p}`);
     tail3.push(basename15(cur));
     cur = parent;
@@ -24383,7 +24433,7 @@ function createPeriscopeMcpServer(d, sc) {
     if (Buffer.byteLength(content) > MAX_WRITE_BYTES) return text(`content exceeds ${MAX_WRITE_BYTES} bytes`, true);
     const abs = await inTree(path);
     if (abs === await realpath(root)) return text("path must name a file", true);
-    await mkdir(dirname32(abs), { recursive: true });
+    await mkdir(dirname33(abs), { recursive: true });
     await inTree(path);
     await writeFile(abs, content);
     return text(`Wrote ${Buffer.byteLength(content)} bytes to ${await rel(abs)}`);
@@ -24423,7 +24473,7 @@ function createPeriscopeMcpServer(d, sc) {
     inputSchema: { path: z.string() },
     annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: false }
   }, async ({ path }) => {
-    const parent = await inTree(dirname32(path) === "" ? "." : dirname32(path));
+    const parent = await inTree(dirname33(path) === "" ? "." : dirname33(path));
     const abs = join54(parent, basename15(path));
     if (basename15(path) === ".git" || abs === parent) return text("path must name a file", true);
     const st = await lstat(abs).catch(() => void 0);
@@ -24545,7 +24595,7 @@ function findPeriscope(sidecars, segment) {
 }
 
 // src/cli.ts
-var CREW_HOME = isCompiledBinary(import.meta.url) ? dirname33(process.execPath) : resolve7(dirname33(fileURLToPath2(import.meta.url)), "..");
+var CREW_HOME = isCompiledBinary(import.meta.url) ? dirname34(process.execPath) : resolve7(dirname34(fileURLToPath2(import.meta.url)), "..");
 var RELEASE_LOCK_TTL_MS = 20 * 60 * 1e3;
 var CYCLE_SECONDS2 = 120;
 var STALE_CYCLES = 3;
@@ -25828,6 +25878,13 @@ ${changed2.map((c) => `  - ${c}
       const outcome = await runRelease({
         cwd: target.dir,
         repo,
+        reloadRepo: (dir) => resolveRepoConfig(loadRepoConfig(dir), {
+          hooks: { ...c.hooks, ...o?.hooks },
+          labels: { ...c.labels, ...o?.labels },
+          release: mergeRouteRelease(c.release, o?.release),
+          branch: { ...c.branch, ...o?.branch },
+          worktrees: { prefix: shipWorktreePrefixFor(c), nameOverride: o?.worktreeName }
+        }, dir),
         contract: tracker.contract,
         tickets,
         blockerInfo,
@@ -25872,7 +25929,12 @@ ${changed2.map((c) => `  - ${c}
           tracker.contract,
           outcome.stampFrom ?? outcome.decision.lastReleased,
           outcome.decision.head,
-          new Map(outcome.merged.map((m) => [m.ticket.issue_id, m.sha]))
+          new Map([
+            // Squashed onto an untagged base by an earlier cycle: no release range
+            // names it, so the first release carries it out here (CREW-2925).
+            ...outcome.decision.merges.filter((m) => m.skipReason === "already-merged" && m.mergedSha).map((m) => [m.ticket.issue_id, m.mergedSha]),
+            ...outcome.merged.map((m) => [m.ticket.issue_id, m.sha])
+          ])
         );
         if (plan.length) await applyStamp(tracker, plan, outcome.version, tracker.contract, remit, dryRun, target.dir);
       } else if (outcome.stopped) {
@@ -27082,7 +27144,7 @@ ${cu.tail.trimEnd()}
           const found = cfg.routes.find((r) => r.route === routeArg);
           if (!found) throw new ReposError(`no route "${routeArg}" in the config (have: ${cfg.routes.map((r) => r.route).join(", ") || "none"})`);
           const named2 = value("route") ? void 0 : positional[3];
-          const dir = named2 ? repoDirOf(configText, dirname33(cfg.configFile), found.route, named2) : resolvePath(positional[value("route") ? 2 : 3] ?? ".");
+          const dir = named2 ? repoDirOf(configText, dirname34(cfg.configFile), found.route, named2) : resolvePath(positional[value("route") ? 2 : 3] ?? ".");
           const target = reposOf(found).find((t) => resolvePath(t.dir) === dir || t.name === named2);
           const o = target ? found.repoOverrides[target.name] : void 0;
           runReposCheck(dir, {
@@ -27106,7 +27168,7 @@ ${cu.tail.trimEnd()}
       if (sub === "hooks") {
         try {
           const a = parseHooksArgs(positional.slice(2), routeNamesOf(configText));
-          const dir = repoDirOf(configText, dirname33(cfg.configFile), a.route, a.name);
+          const dir = repoDirOf(configText, dirname34(cfg.configFile), a.route, a.name);
           if (!existsSync51(dir)) throw new ReposError(`${dir} does not exist on disk`);
           const files = { exists: (r) => existsSync51(resolvePath(dir, r)), list: (r) => {
             try {
@@ -27273,7 +27335,7 @@ ${cu.tail.trimEnd()}
       }
       const originOf = (dir) => gitOk(dir, ["remote", "get-url", "origin"]) ?? void 0;
       const text2 = configText;
-      const base = dirname33(cfg.configFile);
+      const base = dirname34(cfg.configFile);
       const isCheckout = (d) => existsSync51(`${d}/.git`);
       try {
         if (sub === "list") {
@@ -27288,7 +27350,8 @@ ${cu.tail.trimEnd()}
               isCheckout,
               repoHasHooks: (d) => REPO_CONFIG_FILENAMES.some((f) => {
                 try {
-                  return Object.keys(parseRepoConfig(readFileSync46(resolvePath(d, f), "utf8"), f).hooks).length > 0;
+                  const path = resolvePath(d, f);
+                  return Object.keys(parseRepoConfig(readFileSync46(path, "utf8"), path).hooks).length > 0;
                 } catch {
                   return false;
                 }
@@ -27951,7 +28014,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
           process.stderr.write(`(dry run) would write resolved ids to ${resolvedPath}
 `);
         } else {
-          mkdirSync38(dirname33(resolvedPath), { recursive: true });
+          mkdirSync38(dirname34(resolvedPath), { recursive: true });
           if (hadPreviousFile) copyFileSync2(resolvedPath, `${resolvedPath}.bak`);
           const tmpPath = `${resolvedPath}.tmp${process.pid}`;
           writeFileSync38(tmpPath, `${JSON.stringify(resolved, null, 2)}
@@ -28000,7 +28063,7 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
             process.stderr.write(`(dry run) would write the minted API key to ${apiKeyFile}
 `);
           } else {
-            mkdirSync38(dirname33(apiKeyFile), { recursive: true });
+            mkdirSync38(dirname34(apiKeyFile), { recursive: true });
             writeFileSync38(apiKeyFile, `${apiKeyVar}=${apiKey}
 `, { mode: 384 });
             process.stderr.write(`API key written to ${apiKeyFile}
@@ -29473,7 +29536,7 @@ ${where.join("\n")}`);
       if (!route2.resolved) fail2(`route ${route2.route} is not connected \u2014 run \`crew connect\` first`);
       const tracker = new Tracker(route2, cfg.ship);
       const configText = readFileSync46(cfg.configFile, "utf8");
-      const cfgBase = dirname33(cfg.configFile);
+      const cfgBase = dirname34(cfg.configFile);
       const configured2 = configuredRepos(configText, route2.route, cfgBase);
       const dir = configured2.find((r) => r.name === SAMPLE_REPO)?.dir ?? sampleDir(configured2.map((r) => r.dir), route2.reposBasePath, route2.route.split("/")[0]);
       const resolvedFile = resolvedPathFor(cfg.ship.stateDir, route2.route);

package/dist/sandbox-intel-bridge.cjs

@@ -24682,6 +24682,19 @@ var SPEC_VERSION = 1;
 var REPO_CONFIG_FILENAMES = [".crew.yaml", ".crew.yml", ".crew.json"];
 var RepoConfigError = class extends Error {
 };
+function versionFileProblem(name, text) {
+  const remedy = `a version file that is not a JSON object with a string "version" needs hooks.bump instead of release.versionFiles (docs/REPO_SPEC.md)`;
+  let doc;
+  try {
+    doc = JSON.parse(text);
+  } catch {
+    return `release.versionFiles entry "${name}" is not a JSON document \u2014 ${remedy}`;
+  }
+  if (!doc || typeof doc !== "object" || Array.isArray(doc) || typeof doc.version !== "string") {
+    return `release.versionFiles entry "${name}" has no string "version" field \u2014 ${remedy}`;
+  }
+  return null;
+}
 var HOOK_NAMES = [
   "test",
   "build",
@@ -25015,6 +25028,22 @@ function parseRepoConfig(text, file) {
   if (versionFiles.length === 0) {
     throw new RepoConfigError(`${file}: release.versionFiles cannot be empty`);
   }
+  if (versionFilesGiven) {
+    for (const name of versionFiles) {
+      const path = (0, import_node_path6.join)((0, import_node_path6.dirname)(file), name);
+      if (!(0, import_node_fs5.existsSync)(path)) continue;
+      let text2;
+      try {
+        text2 = (0, import_node_fs5.readFileSync)(path, "utf8");
+      } catch (e) {
+        throw new RepoConfigError(
+          `${file}: release.versionFiles entry "${name}" cannot be read (${e.code ?? "read error"})`
+        );
+      }
+      const problem = versionFileProblem(name, text2);
+      if (problem) throw new RepoConfigError(`${file}: ${problem}`);
+    }
+  }
   const inspectorRaw = raw.periscope?.inspector;
   if (inspectorRaw !== void 0 && inspectorRaw !== "proxy" && inspectorRaw !== "repo") {
     throw new RepoConfigError(`${file}: periscope.inspector must be "proxy" or "repo"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.126.0",
+  "version": "0.126.2",
   "description": "A standing team of headless agents that picks work off a Tablation board, does it on a machine you control, and reports back.",
   "type": "module",
   "license": "MIT",