@tablation/crew 0.1.4 → 0.1.6

package/dist/cli.js

@@ -1613,7 +1613,8 @@ var DEFAULT_CONTRACT = {
     deployed: "closed_deployed",
     needsHuman: "needs_info",
     reviewing: null,
-    wontFix: "closed_wont_fix"
+    wontFix: "closed_wont_fix",
+    draft: "draft"
   },
   epics: {
     statusColumn: "status",
@@ -4962,6 +4963,85 @@ crew: cannot run ${shell.bin}: ${err.message}` });
   });
 }
 
+// src/stamp.ts
+function planStamp(cwd, tickets, contract, fromSha, toSha, merged = /* @__PURE__ */ new Map()) {
+  const range = fromSha ? `${fromSha.slice(0, 8)}..${toSha.slice(0, 8)}` : null;
+  const bodies = fromSha ? commitBodies(cwd, `${fromSha}..${toSha}`) : "";
+  return tickets.filter((t) => t.status === contract.statuses.verified).map((t) => {
+    if (merged.has(t.issue_id)) {
+      return { ticket: t, reason: "merged by this release", sha: merged.get(t.issue_id) };
+    }
+    const keys = referenceKeys(t);
+    const pattern = keys.map((k) => k.replace(/[.[\]{}()*+?^$|\\]/g, "\\$&")).join("|");
+    if (range && new RegExp(`(^|[^0-9A-Za-z_-])(${pattern})([^0-9]|$)`).test(bodies)) {
+      const sha = findKeyInRange(cwd, keys, range) ?? void 0;
+      return { ticket: t, reason: `named in ${range}`, sha };
+    }
+    return null;
+  }).filter((p) => p !== null);
+}
+async function applyStamp(tracker, plan, version, contract, emit, dryRun) {
+  let stamped = 0;
+  const at = (/* @__PURE__ */ new Date()).toISOString();
+  for (const { ticket, sha } of plan) {
+    const shaNote = sha ? `, commit_sha ${sha.slice(0, 8)}` : "";
+    if (dryRun) {
+      emit.emit(`would stamp -> ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
+        ticket: ticket.issue_id
+      });
+      stamped++;
+      continue;
+    }
+    try {
+      await tracker.updateTicket(ticket.id, {
+        status: contract.statuses.deployed,
+        // `released_at` is always a real release moment here; only the version is optional (versioning: none).
+        released_at: at,
+        ...version ? { released_version: version } : {},
+        // Written here rather than only on the external path (below): a
+        // ticket's record should mean the same thing regardless of which
+        // release mode closed it (ISSUE-218). `merged_at` is stamped
+        // alongside — not read off the commit itself — since that is the
+        // moment the tracker learns of it, same as the external path.
+        ...sha ? { commit_sha: sha, merged_at: at } : {}
+      });
+      emit.emit(`stamped ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
+        ticket: ticket.issue_id
+      });
+      stamped++;
+    } catch (e) {
+      emit.warn(`could not stamp: ${e.message}`, { ticket: ticket.issue_id });
+    }
+  }
+  return stamped;
+}
+async function applyExternalClosures(tracker, closures, contract, emit, dryRun) {
+  if (!closures?.length) return 0;
+  let stamped = 0;
+  const at = (/* @__PURE__ */ new Date()).toISOString();
+  for (const { ticket, closure, confirmed, version } of closures) {
+    if (closure.state !== "merged" || !closure.mergedAt) continue;
+    const shippedNote = confirmed ? ` and ${contract.statuses.deployed}${version ? ` (${version})` : ""}` : "";
+    if (dryRun) {
+      emit.emit(`would stamp commit_sha (${closure.mergedAt.slice(0, 8)})${shippedNote}`, { ticket: ticket.issue_id });
+      stamped++;
+      continue;
+    }
+    try {
+      await tracker.updateTicket(ticket.id, {
+        commit_sha: closure.mergedAt,
+        merged_at: at,
+        ...confirmed ? { status: contract.statuses.deployed, released_at: at, ...version ? { released_version: version } : {} } : {}
+      });
+      emit.emit(`stamped commit_sha (${closure.mergedAt.slice(0, 8)})${shippedNote}`, { ticket: ticket.issue_id });
+      stamped++;
+    } catch (e) {
+      emit.warn(`could not stamp commit_sha: ${e.message}`, { ticket: ticket.issue_id });
+    }
+  }
+  return stamped;
+}
+
 // src/release-run.ts
 function emitReleaseSummary(emit, summaries) {
   if (summaries.length <= 1) return;
@@ -5240,6 +5320,26 @@ function refreshBase(o) {
       return { ok: false, why: r.detail };
   }
 }
+async function reconfirmLastRelease(o, decision) {
+  if (!canReconfirm(o, decision)) return void 0;
+  const prevTag = latestReleaseTag(o.cwd, o.repo.release.tagPattern ?? "v*", `${decision.lastTag}^`);
+  const from = prevTag ? tagCommit(o.cwd, prevTag) : null;
+  if (!from) return void 0;
+  const pending = planStamp(o.cwd, o.tickets, o.contract, from, decision.lastReleased);
+  if (pending.length === 0) return void 0;
+  o.emit.emit(
+    `${pending.length} verified ticket(s) were in ${decision.lastTag} but never confirmed live \u2014 re-checking`
+  );
+  return { ...await confirmLastRelease(o, decision), from };
+}
+var canReconfirm = (o, decision) => !o.dryRun && (o.repo.release.mode === "ci_manual" || o.repo.release.mode === "ci_auto") && !!o.repo.hooks.released && !!decision.lastTag && !!decision.lastReleased;
+async function confirmLastRelease(o, decision) {
+  const version = decision.lastTag.replace(/^v/, "");
+  const expected = o.repo.release.verify.match === "version" ? version : decision.lastReleased;
+  const confirmed = await confirm(o, expected) === true;
+  if (!confirmed) o.emit.warn(`${decision.lastTag} is still not confirmed live \u2014 tickets stay verified`);
+  return { confirmed, version };
+}
 async function runRelease(o) {
   const scoped = (msg) => o.scope ? `${o.scope}: ${msg}` : msg;
   const tagPattern = o.repo.release.tagPattern ?? "v*";
@@ -5319,6 +5419,20 @@ async function runRelease(o) {
   o.emit.enter("release");
   const head = o.dryRun ? decision.head : headSha(o.cwd);
   if (merged.length === 0 && decision.upToDate && !o.force) {
+    const re = await reconfirmLastRelease(o, decision);
+    if (re) {
+      return {
+        merged,
+        conflicts,
+        unbuildable,
+        deployed: false,
+        version: re.version,
+        confirmed: re.confirmed || void 0,
+        stampFrom: re.from,
+        stopped: "nothing to release",
+        decision
+      };
+    }
     o.emit.emit("nothing to release");
     return { merged, conflicts, unbuildable, deployed: false, stopped: "nothing to release", decision };
   }
@@ -5329,6 +5443,12 @@ async function runRelease(o) {
     return { merged, conflicts, unbuildable, deployed: false, stopped: "nothing merged and no release marker", decision };
   }
   if (applied === 0 && merged.length > 0 && decision.upToDate && !o.force) {
+    if (canReconfirm(o, decision)) {
+      const re = await confirmLastRelease(o, decision);
+      if (!re.confirmed) {
+        return { merged, conflicts, unbuildable, deployed: false, stopped: "release not yet confirmed live", decision };
+      }
+    }
     o.emit.emit(
       `nothing to release \u2014 ${merged.length} branch(es) were already contained in ${o.repo.branch.base}; stamping without cutting a version`
     );
@@ -5487,7 +5607,8 @@ async function runRelease(o) {
       }
     }
   }
-  const confirmed = await confirm(o, o.dryRun ? head : headSha(o.cwd));
+  const expected = o.repo.release.verify.match === "version" && version ? version : o.dryRun ? head : headSha(o.cwd);
+  const confirmed = await confirm(o, expected);
   o.emit.emit(
     `release ${o.dryRun ? "plan complete" : "complete"}: ${merged.length} merged${version ? `, ${version}` : ""}${tag ? `, tagged ${tag}` : ""}`,
     { data: { merged: merged.length, version, tag, deployed, integrated, confirmed } }
@@ -5495,83 +5616,6 @@ async function runRelease(o) {
   return { merged, conflicts, unbuildable, version, tag, deployed, integrated, confirmed, decision };
 }
 
-// src/stamp.ts
-function planStamp(cwd, tickets, contract, fromSha, toSha, merged = /* @__PURE__ */ new Map()) {
-  const range = fromSha ? `${fromSha.slice(0, 8)}..${toSha.slice(0, 8)}` : null;
-  const bodies = fromSha ? commitBodies(cwd, `${fromSha}..${toSha}`) : "";
-  return tickets.filter((t) => t.status === contract.statuses.verified).map((t) => {
-    if (merged.has(t.issue_id)) {
-      return { ticket: t, reason: "merged by this release", sha: merged.get(t.issue_id) };
-    }
-    const keys = referenceKeys(t);
-    const pattern = keys.map((k) => k.replace(/[.[\]{}()*+?^$|\\]/g, "\\$&")).join("|");
-    if (range && new RegExp(`(^|[^0-9A-Za-z_-])(${pattern})([^0-9]|$)`).test(bodies)) {
-      const sha = findKeyInRange(cwd, keys, range) ?? void 0;
-      return { ticket: t, reason: `named in ${range}`, sha };
-    }
-    return null;
-  }).filter((p) => p !== null);
-}
-async function applyStamp(tracker, plan, version, contract, emit, dryRun) {
-  let stamped = 0;
-  const at = (/* @__PURE__ */ new Date()).toISOString();
-  for (const { ticket, sha } of plan) {
-    const shaNote = sha ? `, commit_sha ${sha.slice(0, 8)}` : "";
-    if (dryRun) {
-      emit.emit(`would stamp -> ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
-        ticket: ticket.issue_id
-      });
-      stamped++;
-      continue;
-    }
-    try {
-      await tracker.updateTicket(ticket.id, {
-        status: contract.statuses.deployed,
-        ...version ? { released_version: version, released_at: at } : {},
-        // Written here rather than only on the external path (below): a
-        // ticket's record should mean the same thing regardless of which
-        // release mode closed it (ISSUE-218). `merged_at` is stamped
-        // alongside — not read off the commit itself — since that is the
-        // moment the tracker learns of it, same as the external path.
-        ...sha ? { commit_sha: sha, merged_at: at } : {}
-      });
-      emit.emit(`stamped ${contract.statuses.deployed}${version ? ` (${version})` : ""}${shaNote}`, {
-        ticket: ticket.issue_id
-      });
-      stamped++;
-    } catch (e) {
-      emit.warn(`could not stamp: ${e.message}`, { ticket: ticket.issue_id });
-    }
-  }
-  return stamped;
-}
-async function applyExternalClosures(tracker, closures, contract, emit, dryRun) {
-  if (!closures?.length) return 0;
-  let stamped = 0;
-  const at = (/* @__PURE__ */ new Date()).toISOString();
-  for (const { ticket, closure, confirmed, version } of closures) {
-    if (closure.state !== "merged" || !closure.mergedAt) continue;
-    const shippedNote = confirmed ? ` and ${contract.statuses.deployed}${version ? ` (${version})` : ""}` : "";
-    if (dryRun) {
-      emit.emit(`would stamp commit_sha (${closure.mergedAt.slice(0, 8)})${shippedNote}`, { ticket: ticket.issue_id });
-      stamped++;
-      continue;
-    }
-    try {
-      await tracker.updateTicket(ticket.id, {
-        commit_sha: closure.mergedAt,
-        merged_at: at,
-        ...confirmed ? { status: contract.statuses.deployed, released_at: at, ...version ? { released_version: version } : {} } : {}
-      });
-      emit.emit(`stamped commit_sha (${closure.mergedAt.slice(0, 8)})${shippedNote}`, { ticket: ticket.issue_id });
-      stamped++;
-    } catch (e) {
-      emit.warn(`could not stamp commit_sha: ${e.message}`, { ticket: ticket.issue_id });
-    }
-  }
-  return stamped;
-}
-
 // src/notify.ts
 async function notify(route, ship, n, emit, dryRun = false) {
   const script = route.hooks.notify;
@@ -6580,7 +6624,11 @@ async function discover(o) {
     try {
       const issuesModel = await get(o, `/data-models/${out.models.issues}`);
       const statusField = issuesModel.fields.find((f) => f.columnName === DEFAULT_CONTRACT.columns.status);
-      const known = /* @__PURE__ */ new Set([...DEFAULT_CONTRACT.statuses.open, ...DEFAULT_CONTRACT.statuses.resolved]);
+      const known = /* @__PURE__ */ new Set([
+        ...DEFAULT_CONTRACT.statuses.open,
+        ...DEFAULT_CONTRACT.statuses.resolved,
+        DEFAULT_CONTRACT.statuses.draft
+      ]);
       out.unrecognizedStatuses = (statusField?.fieldType?.choiceOptions ?? []).filter((opt) => !known.has(opt.value)).sort((a, b) => (a.position ?? 0) - (b.position ?? 0)).map((opt) => ({ value: opt.value, label: opt.label ?? void 0, position: opt.position ?? void 0 }));
     } catch {
     }
@@ -8770,7 +8818,7 @@ ${changed2.map((c) => `  - ${c}
           target.dir,
           tickets,
           tracker.contract,
-          outcome.decision.lastReleased,
+          outcome.stampFrom ?? outcome.decision.lastReleased,
           outcome.decision.head,
           new Map(outcome.merged.map((m) => [m.ticket.issue_id, m.sha]))
         );

package/package.json

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