@tablation/crew 0.19.0 → 0.19.1

package/dist/cli.js

@@ -2735,7 +2735,20 @@ function patchIdOf(cwd, from, to) {
     return null;
   }
 }
+var BRANCH_TIP_TRAILER = "Branch-tip";
+function findSquashByBranchTip(cwd, key, branch, range) {
+  const tip = gitOk(cwd, ["rev-parse", "--verify", "-q", `${branch}^{commit}`]);
+  if (!tip) return null;
+  const wanted = `${BRANCH_TIP_TRAILER}: ${tip}`;
+  for (const sha of keyCommitsInRange(cwd, key, range)) {
+    const body = gitOk(cwd, ["show", "-s", "--format=%B", sha]) ?? "";
+    if (body.split("\n").some((l) => l.trim() === wanted)) return sha;
+  }
+  return null;
+}
 function findSquashOfBranch(cwd, key, branch, base, range) {
+  const byTip = findSquashByBranchTip(cwd, key, branch, range);
+  if (byTip) return byTip;
   const candidates = keyCommitsInRange(cwd, key, range);
   if (candidates.length === 0) return null;
   const mb = gitOk(cwd, ["merge-base", base, branch]);
@@ -6478,14 +6491,9 @@ function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => bran
         skipReason: "never-built"
       };
     }
-    const squash = findSquashOfBranch(
-      cwd,
-      referenceKeys(ticket),
-      branch,
-      base,
-      lastReleased ? `${lastReleased}..${base}` : base
-    );
+    const squash = findSquashOfBranch(cwd, referenceKeys(ticket), branch, base, base);
     if (squash) {
+      const released = !!lastReleased && isAncestor(cwd, squash, lastReleased);
       return {
         ticket,
         branch,
@@ -6493,7 +6501,7 @@ function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => bran
         usedFallback: false,
         bump: "patch",
         majorRequested: false,
-        skipReason: "already-merged",
+        skipReason: released ? "already-released" : "already-merged",
         mergedSha: squash
       };
     }
@@ -6511,6 +6519,20 @@ function planMerge(cwd, tickets, contract, lastReleased, branchFor = (t) => bran
     };
   });
 }
+function planReleasedBranches(cwd, tickets, contract, branchFor, base = "main", tagPattern = "v*") {
+  const eligible = /* @__PURE__ */ new Set([contract.statuses.building, contract.statuses.needsHuman]);
+  const out = [];
+  for (const ticket of tickets) {
+    if (!eligible.has(ticket.status)) continue;
+    const branch = branchFor(ticket);
+    if (!branch) continue;
+    const sha = findSquashByBranchTip(cwd, referenceKeys(ticket), branch, base);
+    if (!sha) continue;
+    const tag = firstReleaseTagContaining(cwd, sha, tagPattern);
+    if (tag) out.push({ ticket, sha, tag });
+  }
+  return out;
+}
 function requestedBump(bodies) {
   const asks = [...bodies.matchAll(BUMP_LINE)].map((m) => m[1].toLowerCase());
   const majorRequested = asks.includes("major");
@@ -6973,9 +6995,13 @@ function mergeOne(o, c) {
       );
       return "noop";
     }
+    const tip = gitOk(o.cwd, ["rev-parse", "--verify", "-q", `${c.branch}^{commit}`]);
+    const trailer = tip ? `
+
+${BRANCH_TIP_TRAILER}: ${tip}` : "";
     git(o.cwd, ["commit", "-m", `${subject}
 
-Closes ${c.ticket.issue_id}.`]);
+Closes ${c.ticket.issue_id}.${trailer}`]);
     const sha = headSha(o.cwd);
     o.emit.emit(`merged ${c.branch}`, { ticket: c.ticket.issue_id });
     return { applied: true, sha };
@@ -10990,6 +11016,25 @@ ${changed2.map((c) => `  - ${c}
           target.dir
         );
       }
+      for (const r of planReleasedBranches(
+        target.dir,
+        tickets,
+        tracker.contract,
+        (t) => locateBranchForTicket(target.dir, repo, t)?.branch ?? null,
+        repo.branch.base,
+        repo.release.tagPattern ?? "v*"
+      )) {
+        remit.enter("reconcile");
+        await applyStamp(
+          tracker,
+          [{ ticket: r.ticket, reason: `branch already released in ${r.tag}`, sha: r.sha }],
+          r.tag.replace(/^v/, ""),
+          tracker.contract,
+          remit,
+          dryRun,
+          target.dir
+        );
+      }
       if (outcome.gateRed && !dryRun) {
         try {
           const g = outcome.gateRed;

package/package.json

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