@tablation/crew 0.126.0 → 0.126.1

package/dist/cli.js

@@ -18493,6 +18493,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 +18531,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`
     );
@@ -25828,6 +25843,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 +25894,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) {

package/package.json

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