@tablation/crew 0.73.2 → 0.73.4

package/dist/cli.js

@@ -4239,7 +4239,7 @@ function describeComposition(c) {
 
 ${rows}
 
-The gate runs on the base plus every verified branch above, not on the base alone: reproduce on that composition.`;
+The gate runs on the base plus every verified branch above, not on the base alone: reproduce on that composition. A fix that compiles only on the composition belongs on one of those branches (the one owning the failing file, after merging the others into it), not on a new branch cut from the base: a separate fix branch conflicts with the branches it contains when the release squash-merges them all. Re-queue the touched ticket to QA and close this alert with a note.`;
 }
 
 // src/shell.ts
@@ -10331,7 +10331,8 @@ var lastActedHandBack = (ticket, events) => {
   return mine.filter((e) => e.event_type === "conflict_handed_back" && pushes.some((p) => p > stampOf(e))).sort((a, b) => stampOf(b).localeCompare(stampOf(a)))[0];
 };
 var MAX_ABSORBED_HANDBACKS = 2;
-function planConflictBounce(cwd, ticket, branch, base, paths, events) {
+function planConflictBounce(cwd, ticket, branch, base, paths, events, merged = []) {
+  const siblings = merged.filter((m) => m.branch !== branch && paths.some((p) => (gitOk(cwd, ["diff", "--name-only", `${base}...${m.branch}`, "--", p]) ?? "").trim() !== ""));
   return {
     ticket,
     branch,
@@ -10341,7 +10342,8 @@ function planConflictBounce(cwd, ticket, branch, base, paths, events) {
     priorBounces: priorBounces(ticket, events),
     cwd,
     baseSha: gitOk(cwd, ["rev-parse", "--verify", "-q", base]) || null,
-    priorBaseSha: baseShaOf(lastActedHandBack(ticket, events) ?? { record_id: "", event_type: "" })
+    priorBaseSha: baseShaOf(lastActedHandBack(ticket, events) ?? { record_id: "", event_type: "" }),
+    siblings
   };
 }
 function refreshBranch(worktree, base) {
@@ -10370,7 +10372,7 @@ function handBackComment(b, merged) {
 
 **Back with the dev lane \u2014 this branch no longer merges.**
 
-\`${b.branch}\` was verified, but squash-merging it into \`${b.base}\` conflicts in ${list}. Work that landed on \`${b.base}\` after this branch was cut has changed the same lines.
+\`${b.branch}\` was verified, but squash-merging it into \`${b.base}\` conflicts in ${list}. ${b.siblings?.length ? `This conflicts with ${b.siblings.map((x) => `${x.key} (\`${x.branch}\`)`).join(", ")}, merged earlier in the same release, not with a \`${b.base}\` that moved: merging \`${b.base}\` in will change nothing. Merge ${b.siblings.length === 1 ? "that branch" : "those branches"} into this one (or move this change onto ${b.siblings.length === 1 ? "it" : "one of them"}), resolve, and push.` : `Work that landed on \`${b.base}\` after this branch was cut has changed the same lines.`}
 
 ${merged ? `\`${b.base}\` has been merged into \`${b.branch}\` in its worktree and the conflict is left in place, so \`git status\` there shows exactly what disagrees. Resolve it, commit, push as a plain fast-forward (the branch is pushed, so rebasing it is not an option) and hand back to QA as usual \u2014 \`git merge --abort\` backs the merge out if you would rather start differently.` : `This ship has no worktree for \`${b.branch}\`, so nothing has been merged for you. Merge \`${b.base}\` into the branch wherever it lives, resolve the conflict, and commit.`}
 
@@ -14749,7 +14751,15 @@ function planFix(f) {
   const actions = [];
   const notes = [];
   for (const r of f.routes) {
-    if (!r.enabled && sound(r)) actions.push({ kind: "enable", route: r.route });
+    if (!r.enabled && sound(r)) {
+      actions.push({ kind: "enable", route: r.route });
+      const gaps = r.readiness ?? [];
+      if (gaps.length) {
+        notes.push(`${r.route}: ${gaps.length} release-readiness gap${gaps.length === 1 ? "" : "s"} (${gaps[0]}${gaps.length > 1 ? ", ..." : ""}) \u2014 the route will run, but releases stop at the first missing hook until it is added`);
+      }
+    } else if (!sound(r) && !r.enabled) {
+      notes.push(`${r.route}: not enabled \u2014 ${r.hasRepos ? r.problems[0] : "no checkout is configured"}`);
+    }
   }
   if (f.schedulerAbsent && f.routes.some(sound)) {
     if (f.host === "windows") notes.push("scheduler support is not built for Windows yet \u2014 nothing to install; run `crew run` by hand");
@@ -14759,12 +14769,15 @@ function planFix(f) {
 }
 async function gatherHealth(c, check) {
   let problems;
+  let readiness = [];
   try {
-    problems = await check();
+    const r = await check();
+    if (Array.isArray(r)) problems = r;
+    else ({ problems, readiness } = r);
   } catch (e) {
     problems = [`checks could not run: ${e instanceof Error ? e.message : String(e)}`];
   }
-  return { route: c.route, enabled: c.enabled, hasRepos: c.hasRepos, problems };
+  return { route: c.route, enabled: c.enabled, hasRepos: c.hasRepos, problems, readiness };
 }
 function routesInScope(routes, named) {
   return named ? routes.filter((r) => r.route === named) : routes;
@@ -17096,6 +17109,7 @@ if (command === "passenger-sync-daemon") {
   async function routeProblems(c) {
     const host = hostPlatform();
     const problems = [];
+    const readiness = [];
     if (c.hostPassengers) {
       if (!dockerAvailable()) problems.push("host passengers: docker is not available");
       if (!sshKeygenAvailable()) problems.push("host passengers: ssh-keygen is not available");
@@ -17105,7 +17119,7 @@ if (command === "passenger-sync-daemon") {
     for (const r of await resolvedRepos(c)) {
       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}`));
+      readiness.push(...validateEffective(r.config).map((p) => `repo ${r.name}: ${p}`));
     }
     try {
       const ships = await tracker.shipRows();
@@ -17117,7 +17131,7 @@ if (command === "passenger-sync-daemon") {
     } catch (e) {
       problems.push(`tracker unreachable: ${e instanceof Error ? e.message : String(e)}`);
     }
-    return problems;
+    return { problems, readiness };
   }
   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))));
@@ -17559,7 +17573,8 @@ ${changed2.map((c) => `  - ${c}
               f.candidate.branch,
               repo.branch.base,
               f.paths,
-              handedBack
+              handedBack,
+              outcome.merged.filter((m) => m.branch).map((m) => ({ key: m.ticket.issue_id, branch: m.branch }))
             );
             const r = await applyConflictBounce(tracker, bounce, tracker.contract, seat, remit, dryRun);
             if (r.kind === "failed") {
@@ -20404,6 +20419,9 @@ Signed in as ${result.identity.email} \u2014 minted an API key in workspace "${r
               // Additive (CREW-1379): `unsafe` means a ship must not cut a
               // worktree or release from this base. `version` stays 1.
               baseBranch: baseHealth(r),
+              // Additive (CREW-2537): gaps that only matter once a ticket reaches
+              // release (no deploy hook, no CI provider...). They never stop a poll.
+              releaseReadiness: validateEffective(r.config),
               // Additive (CREW-2051): worktrees the sweep refuses to remove.
               heldWorktrees: openShipAttention(state).filter((i) => i.kind === "worktree_held" && i.held?.repo === r.name).map((i) => ({
                 path: i.held.path,
@@ -20613,7 +20631,7 @@ routes:            ${cfg.routes.map((c) => c.route).join(", ")}
           );
         }
         for (const p2 of validateEffective(config)) {
-          process.stdout.write(`                   - ${p2}
+          process.stdout.write(`                   - release readiness: ${p2}
 `);
         }
         const dh = doctorBaseReport(r, config.branch.base, baseHealth);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablation/crew",
-  "version": "0.73.2",
+  "version": "0.73.4",
   "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",