@tablation/crew 0.67.0 → 0.67.2

package/dist/cli.js

@@ -10364,6 +10364,11 @@ ${section}`;
   return [...lines.slice(0, anchor), section, ...lines.slice(anchor)].join("\n");
 }
 var RELEASE_COMMIT_SUBJECT = /^Release \S+$/;
+function subjectsSince(cwd, sha) {
+  if (!isAncestor(cwd, sha, "HEAD")) return null;
+  return (gitOk(cwd, ["log", "--format=%h %s", `${sha}..HEAD`]) ?? "").split("\n").filter(Boolean);
+}
+var isReleaseCommitLine = (line) => RELEASE_COMMIT_SUBJECT.test(line.replace(/^\S+ /, ""));
 function decideRelease(cwd, tickets, contract, opts = {}) {
   const pattern = opts.tagPattern ?? "v*";
   const base = opts.base ?? "main";
@@ -11109,11 +11114,18 @@ async function runReleaseCycle(o, movedPast2) {
   }
   o.state?.clearBlocked();
   const failedAt = o.state?.deployFailedSha();
-  if (!o.force && failedAt && failedAt === decision.head) {
-    o.emit.warn(
-      `a deploy already failed on ${failedAt.slice(0, 8)} \u2014 not retrying until a new commit lands (force it with \`crew deploy\`)`
-    );
-    return { merged: [], deployed: false, stopped: "previous deploy failed on this commit", decision };
+  if (!o.force && failedAt) {
+    const since2 = failedAt === decision.head ? [] : subjectsSince(o.cwd, failedAt);
+    const real = since2?.filter((l) => !isReleaseCommitLine(l)) ?? null;
+    if (real && real.length === 0) {
+      o.emit.warn(
+        `a deploy already failed on ${failedAt.slice(0, 8)} \u2014 not retrying until a new commit lands ` + (since2.length > 0 ? `(${since2.length} release commit(s) from elsewhere since do not count: ${since2.join("; ")}) ` : "") + "(force it with `crew deploy`)"
+      );
+      return { merged: [], deployed: false, stopped: "previous deploy failed on this commit", decision };
+    }
+    if (real) {
+      o.emit.emit(`deploy guard lifted by ${real.length} new commit(s) since ${failedAt.slice(0, 8)}: ${real.join("; ")}`);
+    }
   }
   if (o.repo.release.mode === "external") {
     o.emit.emit("release.mode is external \u2014 the crew hands work off and does not release");

package/package.json

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