@tablation/crew 0.80.0 → 0.80.1

package/dist/cli.js

@@ -11975,6 +11975,27 @@ function planStamp(cwd, tickets, contract, fromSha, toSha, merged = /* @__PURE__
 function mergedAtFor(cwd, sha, fallback) {
   return cwd && commitDate(cwd, sha) || fallback;
 }
+async function applyMergeStamp(tracker, merged, tickets, emit, dryRun, cwd) {
+  let stamped = 0;
+  const at = (/* @__PURE__ */ new Date()).toISOString();
+  for (const ticket of tickets) {
+    const sha = merged.get(ticket.issue_id);
+    if (dryRun) {
+      emit.emit(`would stamp commit_sha${sha ? ` (${sha.slice(0, 8)})` : ""}`, { ticket: ticket.issue_id });
+      stamped++;
+      continue;
+    }
+    if (!sha || ticket.commit_sha === sha) continue;
+    try {
+      await tracker.updateTicket(ticket.id, { commit_sha: sha, merged_at: mergedAtFor(cwd, sha, at) });
+      emit.emit(`stamped commit_sha (${sha.slice(0, 8)})`, { ticket: ticket.issue_id });
+      stamped++;
+    } catch (e) {
+      emit.warn(`could not stamp commit_sha: ${e.message}`, { ticket: ticket.issue_id });
+    }
+  }
+  return stamped;
+}
 async function applyStamp(tracker, plan, version, contract, emit, dryRun, cwd) {
   let stamped = 0;
   const at = (/* @__PURE__ */ new Date()).toISOString();
@@ -11987,6 +12008,7 @@ async function applyStamp(tracker, plan, version, contract, emit, dryRun, cwd) {
       stamped++;
       continue;
     }
+    const recordMerge = !!sha && !ticket.commit_sha;
     try {
       await tracker.updateTicket(ticket.id, {
         status: contract.statuses.deployed,
@@ -11997,7 +12019,7 @@ async function applyStamp(tracker, plan, version, contract, emit, dryRun, cwd) {
         // ticket's record should mean the same thing regardless of which
         // release mode closed it (ISSUE-218). `merged_at` is the commit's own
         // date, not the stamp time (which trails the deploy in ci_* modes).
-        ...sha ? { commit_sha: sha, merged_at: mergedAtFor(cwd, sha, at) } : {}
+        ...recordMerge && sha ? { commit_sha: sha, merged_at: mergedAtFor(cwd, sha, at) } : {}
       });
       emit.emit(`stamped ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
         ticket: ticket.issue_id
@@ -13072,6 +13094,13 @@ async function mergeAndRelease(o, decision, fresh, releaseBranch, isolated = fal
       }
     }
   }
+  if (o.repo.release.mode === "ci_auto" || o.repo.release.mode === "ci_manual") {
+    try {
+      await o.onBasePushed?.(merged);
+    } catch (e) {
+      o.emit.warn(`could not record merged tickets: ${e.message}`);
+    }
+  }
   let deployed = false;
   let integrated = false;
   if (o.repo.release.mode === "integrate") {
@@ -18292,6 +18321,19 @@ ${changed2.map((c) => `  - ${c}
         skipTests: flag("skip-tests"),
         shell: cfg.ship.shell,
         mergeOnly: command === "merge",
+        // ci_* modes: record the merge on the board when it lands on base,
+        // not only once CI confirms the release live (CREW-2820).
+        onBasePushed: async (merged) => {
+          remit.enter("reconcile");
+          await applyMergeStamp(
+            tracker,
+            new Map(merged.map((m) => [m.ticket.issue_id, m.sha])),
+            merged.map((m) => m.ticket),
+            remit,
+            dryRun,
+            target.dir
+          );
+        },
         // `deploy` is the "go now" button: it exists for a commit a previous
         // deploy failed on, where nothing new will merge but the work is
         // genuinely unreleased.

package/package.json

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