@tablation/crew 0.79.0 → 0.79.1

package/dist/cli.js

@@ -11388,14 +11388,14 @@ function dedupeChangelogEntries(entries, ticket) {
   return out;
 }
 var BUMP_LINE = /^Bump:[ \t]*(major|minor|patch)\b/gim;
-function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => branchForIssue(cwd, t.issue_id), base = "main", blockerInfo) {
+function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => branchForIssue(cwd, t.issue_id), base = "main", blockerInfo, ref = "HEAD") {
   const held = new Set(heldByBlockers(tickets, contract.statuses.verified, blockerInfo).map((h) => h.ticket.id));
   const verified = tickets.filter((t) => t.status === contract.statuses.verified && !held.has(t.id)).sort((a, b) => Number.parseInt(a.issue_id.replace(/^\D+/, ""), 10) - Number.parseInt(b.issue_id.replace(/^\D+/, ""), 10));
   return verified.map((ticket) => {
     const branch = branchFor(ticket);
     if (!branch) {
       const keys = referenceKeys(ticket);
-      const unreleased = lastReleased ? findKeyInRange(cwd, keys, `${lastReleased}..HEAD`) : null;
+      const unreleased = lastReleased ? findKeyInRange(cwd, keys, `${lastReleased}..${ref}`) : null;
       if (unreleased) {
         return {
           ticket,
@@ -11407,7 +11407,7 @@ function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => bran
           skipReason: "already-merged"
         };
       }
-      const anywhere = findKeyInRange(cwd, keys, "HEAD");
+      const anywhere = findKeyInRange(cwd, keys, ref);
       if (anywhere) {
         return {
           ticket,
@@ -11504,21 +11504,22 @@ ${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);
+function subjectsSince(cwd, sha, ref = "HEAD") {
+  if (!isAncestor(cwd, sha, ref)) return null;
+  return (gitOk(cwd, ["log", "--format=%h %s", `${sha}..${ref}`]) ?? "").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";
-  const block = checkGuards(cwd, base);
-  const lastTag = latestReleaseTag(cwd, pattern, "HEAD");
+  const ref = opts.ref ?? "HEAD";
+  const block = opts.guard === false ? null : checkGuards(cwd, base);
+  const lastTag = latestReleaseTag(cwd, pattern, ref);
   const lastReleased = lastTag ? tagCommit(cwd, lastTag) : null;
-  const head = resolve2(cwd, "HEAD") ?? "";
-  const merges = block ? [] : planMerge(cwd, tickets, contract, lastReleased, opts.branchFor ?? ((t) => branchForIssue(cwd, t.issue_id)), base, opts.blockerInfo);
-  const unreleasedCommits = lastReleased ? countCommits(cwd, `${lastReleased}..HEAD`) : 0;
-  const unreleasedWork = lastReleased ? (gitOk(cwd, ["log", "--format=%s", `${lastReleased}..HEAD`]) ?? "").split("\n").filter((l) => l && !RELEASE_COMMIT_SUBJECT.test(l)).length : 0;
+  const head = resolve2(cwd, ref) ?? "";
+  const merges = block ? [] : planMerge(cwd, tickets, contract, lastReleased, opts.branchFor ?? ((t) => branchForIssue(cwd, t.issue_id)), opts.ref ?? base, opts.blockerInfo, ref);
+  const unreleasedCommits = lastReleased ? countCommits(cwd, `${lastReleased}..${ref}`) : 0;
+  const unreleasedWork = lastReleased ? (gitOk(cwd, ["log", "--format=%s", `${lastReleased}..${ref}`]) ?? "").split("\n").filter((l) => l && !RELEASE_COMMIT_SUBJECT.test(l)).length : 0;
   return {
     block,
     merges,
@@ -12233,10 +12234,14 @@ async function runReleaseCycle(o, movedPast2, localRefSkips) {
     }
     if (drop.size) releasable = releasable.filter((t) => !drop.has(t.id));
   }
+  const { remote, base } = o.repo.branch;
+  const inPlace = o.dryRun || !!o.mergeOnly || !remoteBranchExists(o.cwd, remote, base);
+  const remoteRef = `${remote}/${base}`;
   const decision = decideRelease(o.cwd, releasable, o.contract, {
     tagPattern,
-    base: o.repo.branch.base,
+    base,
     blockerInfo: o.blockerInfo,
+    ...inPlace ? {} : { ref: remoteRef, guard: false },
     // CREW-1364: a branch another ship built and pushed at `fixed` exists
     // here only on the remote. Materialize it so the squash below has a ref.
     // A dry run only looks.
@@ -12265,7 +12270,7 @@ async function runReleaseCycle(o, movedPast2, localRefSkips) {
   o.state?.clearBlocked();
   const failedAt = o.state?.deployFailedSha();
   if (!o.force && failedAt) {
-    const since2 = failedAt === decision.head ? [] : subjectsSince(o.cwd, failedAt);
+    const since2 = failedAt === decision.head ? [] : subjectsSince(o.cwd, failedAt, inPlace ? "HEAD" : remoteRef);
     const real = since2?.filter((l) => !isReleaseCommitLine(l)) ?? null;
     if (real && real.length === 0) {
       o.emit.warn(
@@ -12292,10 +12297,13 @@ async function runReleaseCycle(o, movedPast2, localRefSkips) {
     const review = await reviewHandoff(o, externalClosures, decision.merges, reviewing);
     return { merged: [], deployed: false, stopped: "external", decision, externalClosures, review };
   }
-  const { remote, base } = o.repo.branch;
-  if (o.dryRun || o.mergeOnly || !remoteBranchExists(o.cwd, remote, base)) {
+  if (inPlace) {
     return mergeAndRelease(o, decision, fresh);
   }
+  const primary = checkGuards(o.cwd, base);
+  if (primary) {
+    o.emit.emit(scoped(`primary checkout not fast-forwarded: ${primary.detail}; its dist/ is stale until rebuilt`), { step: "release" });
+  }
   let checkout;
   const stranded = recoverStrandedReleaseCheckouts(o.cwd);
   if (stranded.length > 0) o.emit.warn(scoped(`dropped release checkout(s) stranded by a crash: ${stranded.join(", ")}`));
@@ -17952,9 +17960,11 @@ ${changed2.map((c) => `  - ${c}
           preModes
         );
         reportUnplaceable(c.route, preUnplaceable, tracker.contract.statuses.verified, remit);
+        const remoteBase = remoteBranchExists(target.dir, repo.branch.remote, repo.branch.base);
         const d = decideRelease(target.dir, pre, tracker.contract, {
           tagPattern: repo.release.tagPattern ?? "v*",
-          base: repo.branch.base
+          base: repo.branch.base,
+          ...remoteBase ? { ref: `${repo.branch.remote}/${repo.branch.base}`, guard: false } : {}
         });
         const unstamped = planReleasedBranches(
           target.dir,

package/package.json

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