@open-tomato/rafa 0.24.0 → 0.24.1

package/dist/cli.js

@@ -1787,7 +1787,7 @@ function restoreRunningCommand(previous) {
 var running = null;
 
 // package.json
-var name = "@open-tomato/rafa", version = "0.24.0";
+var name = "@open-tomato/rafa", version = "0.24.1";
 var init_package = () => {};
 
 // src/cli/version.ts
@@ -21780,7 +21780,7 @@ function readMergeRefusal(reading2) {
   return held.length === 0 ? null : worktreeRefusal(reading2.branch, held);
 }
 function cleanUpSteps(plan) {
-  const { base, branch, remote = DEFAULT_REMOTE2, remoteBranchPresent } = plan;
+  const { base, branch, remote = DEFAULT_REMOTE2, localBranchPresent, remoteBranchPresent } = plan;
   const steps = [
     { id: "switch-base", label: `switch to ${base}`, argv: ["git", "switch", base] },
     {
@@ -21791,7 +21791,8 @@ function cleanUpSteps(plan) {
     {
       id: "delete-local",
       label: `delete the local branch ${branch}`,
-      argv: ["git", "branch", "-D", branch]
+      argv: ["git", "branch", "-D", branch],
+      ...localBranchPresent ? {} : { skip: `no local branch ${branch}; nothing to delete` }
     }
   ];
   if (remoteBranchPresent) {
@@ -21816,7 +21817,7 @@ function commandLine(step) {
 }
 function remainingFrom(steps, failed2) {
   const at = steps.findIndex((step) => step.id === failed2);
-  return at === -1 ? Object.freeze([]) : Object.freeze(steps.slice(at));
+  return at === -1 ? Object.freeze([]) : Object.freeze(steps.slice(at).filter((step) => step.skip === undefined));
 }
 var REFUSAL_PREFIX = "rafa pr merge refuses", MAX_LISTED_CHANGES = 10, DEFAULT_REMOTE2 = "origin", BRANCH_REF_PREFIX = "refs/heads/", INDENT2 = "   ";
 var init_merge2 = __esm(() => {
@@ -42118,6 +42119,16 @@ function remoteHoldsBranch(git, branch, warn3) {
   warn3(`${REMOTE3} could not be asked whether it still holds ${branch}, so it is left alone: ${gitSaid(probe2)}`);
   return false;
 }
+function localHoldsBranch(git, branch, warn3) {
+  const probe2 = git(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]);
+  if (probe2.ok)
+    return true;
+  const said = gitSaid(probe2);
+  if (said === "")
+    return false;
+  warn3(`could not read whether this checkout holds a local branch ${branch}, so its delete runs: ${said}`);
+  return true;
+}
 function textOf4(path7) {
   try {
     return readFileSync52(path7, "utf8");
@@ -42195,25 +42206,34 @@ async function reportTick(context, pr, seams, detail) {
   }
   return tick;
 }
-function readyLine(base, branch, remoteBranchPresent) {
-  const remote = remoteBranchPresent ? `and ${branch} is gone locally and on ${REMOTE3}.` : `and ${branch} is gone locally; ${REMOTE3} had already deleted it.`;
-  return `${base} is checked out and pulled, ${remote}`;
+function readyLine(base, branch, present) {
+  const pulled = `${base} is checked out and pulled`;
+  if (present.local) {
+    return present.remote ? `${pulled}, and ${branch} is gone locally and on ${REMOTE3}.` : `${pulled}, and ${branch} is gone locally; ${REMOTE3} had already deleted it.`;
+  }
+  return present.remote ? `${pulled}, and ${branch} is gone on ${REMOTE3}; there was no local branch to delete.` : `${pulled}; ${branch} had no local branch, and ${REMOTE3} had already deleted it.`;
 }
 function quotedLines3(said) {
   return said === "" ? [] : said.split(`
 `).map((line) => `${INDENT10}${line}`);
 }
-function runCleanUp(context, git, detail, remoteBranchPresent) {
+function runCleanUp(context, git, detail, present) {
   const steps = cleanUpSteps({
     branch: detail.headRefName,
     base: detail.baseRefName,
     remote: REMOTE3,
-    remoteBranchPresent
+    localBranchPresent: present.local,
+    remoteBranchPresent: present.remote
   });
   const reports = [];
   for (const step2 of steps) {
+    if (step2.skip !== undefined) {
+      reports.push({ id: step2.id, label: step2.label, command: commandLine(step2), ok: true, skipped: true });
+      context.output.info(`${step2.label}: skipped \u2014 ${step2.skip}`);
+      continue;
+    }
     const result = git(step2.argv.slice(1));
-    reports.push({ id: step2.id, label: step2.label, command: commandLine(step2), ok: result.ok });
+    reports.push({ id: step2.id, label: step2.label, command: commandLine(step2), ok: result.ok, skipped: false });
     if (result.ok) {
       context.output.info(`${step2.label}: done`);
       continue;
@@ -42309,11 +42329,15 @@ async function runMerge(context, seams) {
   context.output.info(`Merged #${detail.number} into ${detail.baseRefName} (${method}).`);
   const commentUrl = await commentIfUnchecked(context, pr, detail.number, answer4.unchecked);
   const roadmapTicks = await reportTick(context, pr, seams, detail);
-  const remoteBranchPresent = remoteHoldsBranch(git, detail.headRefName, (message) => {
+  const warn3 = (message) => {
     context.output.warn(message);
-  });
-  const steps = runCleanUp(context, git, detail, remoteBranchPresent);
-  context.output.info(readyLine(detail.baseRefName, detail.headRefName, remoteBranchPresent));
+  };
+  const present = {
+    remote: remoteHoldsBranch(git, detail.headRefName, warn3),
+    local: localHoldsBranch(git, detail.headRefName, warn3)
+  };
+  const steps = runCleanUp(context, git, detail, present);
+  context.output.info(readyLine(detail.baseRefName, detail.headRefName, present));
   const followUps = followUpsFor(pr, git);
   if (followUps.length > 0) {
     context.output.info("Follow-ups:");
@@ -42340,7 +42364,7 @@ function createPrMergeCommand(seams = DEFAULT_MERGE_SEAMS) {
     subject: "pr",
     action: "merge",
     summary: "merge a pull request and clean up both branches",
-    description: "Merges one pull request through the GitHub CLI and then, in code, switches to the base branch," + " pulls it fast-forward only, deletes the head branch locally and on the remote where it is still there," + " and prunes, reporting each step. Refuses before it asks anything on a dirty working tree, on a pull" + " request that is not green or does not merge, and on a head branch checked out in another worktree. It" + " shows the pull request, its branches and the method and asks `Merge? [y/N]`; `--yes` skips the question," + " and without a terminal and without `--yes` it refuses. A pull request that reports no checks at all is" + " refused unless `--skip-checks` is given, which is refused on any pull request that does report checks;" + " with it the command reads how many workflows the repository defines, prints a warning for that case, asks" + " `Merge #<n> with no checks? [y/N]` (which `--yes` answers only where the repository defines no workflow)," + " and after the merge posts one comment on the pull request saying so. A step that fails never undoes the merge: it" + " prints what is left as commands to paste and exits 1. After the merge it ticks the `Closes #<n>` line of" + " every issue the pull request closes on every open board whose checklist lists it, or on the roadmap issue while no issue carries `type:roadmap`, warning rather than failing when that write" + ' does not land. It ends by reading every open issue whose "Blocked by:" line names an issue this pull' + " request closes, asking whether to remove `spec:blocked` from each one whose blockers have all closed;" + " `--yes` does not answer that question, and every failure of that reading is a warning. With" + " `--output=json` the pull request, the method, the steps that ran, the follow-ups, the roadmap tick and" + " the unblock reading are the data of the terminal result event. Refuses with exit code 2 where" + " `pr.provider` is not `gh`.",
+    description: "Merges one pull request through the GitHub CLI and then, in code, switches to the base branch," + " pulls it fast-forward only, deletes the head branch locally and on the remote where it is still there," + " and prunes, reporting each step; a head branch this checkout has no local branch for is reported as a" + " skipped local delete, and the rest still run. Refuses before it asks anything on a dirty working tree, on a pull" + " request that is not green or does not merge, and on a head branch checked out in another worktree. It" + " shows the pull request, its branches and the method and asks `Merge? [y/N]`; `--yes` skips the question," + " and without a terminal and without `--yes` it refuses. A pull request that reports no checks at all is" + " refused unless `--skip-checks` is given, which is refused on any pull request that does report checks;" + " with it the command reads how many workflows the repository defines, prints a warning for that case, asks" + " `Merge #<n> with no checks? [y/N]` (which `--yes` answers only where the repository defines no workflow)," + " and after the merge posts one comment on the pull request saying so. A step that fails never undoes the merge: it" + " prints what is left as commands to paste and exits 1. After the merge it ticks the `Closes #<n>` line of" + " every issue the pull request closes on every open board whose checklist lists it, or on the roadmap issue while no issue carries `type:roadmap`, warning rather than failing when that write" + ' does not land. It ends by reading every open issue whose "Blocked by:" line names an issue this pull' + " request closes, asking whether to remove `spec:blocked` from each one whose blockers have all closed;" + " `--yes` does not answer that question, and every failure of that reading is a warning. With" + " `--output=json` the pull request, the method, the steps that ran, the follow-ups, the roadmap tick and" + " the unblock reading are the data of the terminal result event. Refuses with exit code 2 where" + " `pr.provider` is not `gh`.",
     args: [
       {
         name: "n",
@@ -44923,6 +44947,46 @@ var init_wait = __esm(() => {
   wait_default = createPrWaitCommand();
 });
 
+// src/commands/release/release-commit.ts
+function unread2(reason, message) {
+  return { commit: null, ahead: 0, problem: { reason, message } };
+}
+function versionAt(git, commit, path7) {
+  const shown2 = git(["show", `${commit}:./${path7}`]);
+  return shown2.ok ? readManifestVersion(shown2.stdout) : null;
+}
+function readReleaseCommit(git, path7, version2) {
+  const log = git(["log", "--first-parent", "--format=%H", "HEAD", "--", `./${path7}`]);
+  if (!log.ok)
+    return unread2("git", `the history of ${path7} could not be read: ${gitSaid(log)}`);
+  const changed = log.stdout.split(`
+`).map((line) => line.trim()).filter((line) => line !== "");
+  if (changed.length === 0) {
+    return unread2("version", `no commit on this branch holds ${path7}; commit it before tagging`);
+  }
+  let release = null;
+  let newest;
+  for (const commit of changed) {
+    const declared = versionAt(git, commit, path7);
+    if (newest === undefined)
+      newest = declared;
+    if (declared !== version2)
+      break;
+    release = commit;
+  }
+  if (release === null) {
+    return unread2("version", `${path7} says ${version2}, and the last commit on this branch that changed it` + ` says ${newest ?? "no version"}; commit the version before tagging it`);
+  }
+  const count2 = git(["rev-list", "--count", "--first-parent", `${release}..HEAD`]);
+  if (!count2.ok)
+    return unread2("git", `the commits past ${release} could not be counted: ${gitSaid(count2)}`);
+  return { commit: release, ahead: Number.parseInt(count2.stdout.trim(), 10), problem: null };
+}
+var init_release_commit = __esm(() => {
+  init_pr();
+  init_version2();
+});
+
 // src/commands/release/tag.ts
 import { readFileSync as readFileSync54 } from "fs";
 import { join as join63 } from "path";
@@ -44996,18 +45060,21 @@ function readPublishTarget(text2) {
     isPrivate: fields["private"] === true
   };
 }
-function followUpsFor2(tag, version2, target) {
+function followUpsFor2(tag, version2, target, place2 = ON_HEAD) {
   const push = {
     command: `git push ${RELEASE_REMOTE2} ${tag}`,
     why: `the tag is local until ${RELEASE_REMOTE2} has it`
   };
   if (target.name === null || target.isPrivate)
     return [push];
+  const publishes = `publishes ${target.name}@${version2} to ${target.registry}`;
+  if (place2.ahead === 0)
+    return [push, { command: `${target.manager} publish`, why: publishes }];
   return [
     push,
     {
-      command: `${target.manager} publish`,
-      why: `publishes ${target.name}@${version2} to ${target.registry}`
+      command: `git switch --detach ${tag} && ${target.manager} publish && git switch ${place2.branch}`,
+      why: `${publishes} from the tagged commit, not HEAD; skip it if ${target.registry} has that version already`
     }
   ];
 }
@@ -45047,7 +45114,14 @@ function decideTag(inputs) {
   const disagrees = changelogRefusal(inputs, version2);
   if (disagrees !== null)
     return disagrees;
-  return { kind: "ready", version: version2, tag: versionTag(version2) };
+  const release = inputs.release;
+  if (release === null)
+    return refuse7("version", `${inputs.version.path} was not looked up in the history`);
+  if (release.problem !== null)
+    return refuse7(release.problem.reason, release.problem.message);
+  if (release.commit === null)
+    return refuse7("git", `no commit could be named for ${version2}`);
+  return { kind: "ready", version: version2, tag: versionTag(version2), commit: release.commit, ahead: release.ahead };
 }
 function projectOf10(context) {
   if (context.project === null)
@@ -45070,23 +45144,34 @@ function tagConfig(project, warn3) {
   }
 }
 function readTagInputs(root, git, config) {
+  const branch = readBranch3(git);
+  const version2 = readVersion(root, config.versionFile);
+  const walkable = version2.version !== null && branch.branch === config.releaseBranch;
   return {
     releaseBranch: config.releaseBranch,
-    branch: readBranch3(git),
-    version: readVersion(root, config.versionFile),
+    branch,
+    version: version2,
     changelog: readNewestRelease(root, config.changelog),
-    tags: readTags(git)
+    tags: readTags(git),
+    release: walkable && version2.version !== null ? readReleaseCommit(git, config.versionFile, version2.version) : null
   };
 }
-function writeTag(git, tag) {
-  const result = git(["tag", tag, "HEAD"]);
+function writeTag(git, tag, commit) {
+  const result = git(["tag", tag, commit]);
   if (result.ok)
     return;
   throw new CommandExit(1, `\u274C ${tag} could not be written: ${gitSaid(result)}`);
 }
+function pastReleaseWarning(written, branch) {
+  if (written.ahead === 0)
+    return null;
+  const commits = written.ahead === 1 ? "1 commit" : `${String(written.ahead)} commits`;
+  return `HEAD of ${branch} is ${commits} past ${written.commit.slice(0, SHORT_COMMIT)}, where ${written.version}` + ` was set; they are not in ${written.tag}.`;
+}
 function renderTagged(written, branch, followUps) {
+  const where = written.ahead === 0 ? `the HEAD of ${branch}` : `${written.commit.slice(0, SHORT_COMMIT)}, the commit of ${branch} that set ${written.version}`;
   return [
-    `\u2705 Tagged ${written.tag} at the HEAD of ${branch}.`,
+    `\u2705 Tagged ${written.tag} at ${where}.`,
     "Next:",
     ...followUps.map((followUp2) => `${INDENT14}${followUp2.command} \u2014 ${followUp2.why}`)
   ];
@@ -45104,8 +45189,9 @@ function runTag(context, seams = DEFAULT_RELEASE_SEAMS) {
     throw new CommandExit(1, `\u274C ${decision.message}
 Usage: ${RELEASE_TAG_USAGE}`);
   }
-  writeTag(git, decision.tag);
-  const followUps = followUpsFor2(decision.tag, decision.version, readPublishTarget(inputs.version.text));
+  writeTag(git, decision.tag, decision.commit);
+  const place2 = { ahead: decision.ahead, branch: config.releaseBranch };
+  const followUps = followUpsFor2(decision.tag, decision.version, readPublishTarget(inputs.version.text), place2);
   return { inputs, written: decision, followUps };
 }
 function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
@@ -45113,8 +45199,8 @@ function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
     name: "release tag",
     subject: "release",
     action: "tag",
-    summary: "tag the release branch's HEAD with the version both release files agree on",
-    description: "Writes `v<version>` on the HEAD of the release branch \u2014 `pr.base`, or `main` \u2014 when the" + " version `release.versionFile` declares is the one the newest section of `release.changelog` names." + " It refuses, and writes nothing, when another branch is checked out, when a tag already names that" + " version, when the two files disagree, and when either the version file or the tag list could not" + " be read. After the tag it prints what to run next: the push that puts the tag on the remote, and" + " the publish line for the registry the version file configures, which it does not run. With" + " `--output=json` the readings, the decision and the follow-ups are the data of the terminal result" + " event.",
+    summary: "tag the commit that set the version both release files agree on",
+    description: "Writes `v<version>` on the release branch \u2014 `pr.base`, or `main` \u2014 when the" + " version `release.versionFile` declares is the one the newest section of `release.changelog` names." + " The tag goes on the commit that set that version: HEAD, or, where later commits landed on the branch," + " the earlier commit, with a warning naming how many commits HEAD is past it." + " It refuses, and writes nothing, when another branch is checked out, when a tag already names that" + " version, when the two files disagree, when no commit holds the version yet, and when the version" + " file, the tag list or the history could not be read. After the tag it prints what to run next: the" + " push that puts the tag on the remote, and the publish line for the registry the version file" + " configures, spelled to publish from the tag when HEAD is past it, which it does not run. With" + " `--output=json` the readings, the decision and the follow-ups are the data of the terminal result" + " event.",
     args: [],
     flags: [],
     examples: [
@@ -45130,6 +45216,9 @@ function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
     outputs: ["text", "json"],
     run: async (context) => {
       const result = runTag(context, seams);
+      const past = pastReleaseWarning(result.written, result.inputs.releaseBranch);
+      if (past !== null)
+        context.output.warn(past);
       if (context.outputMode === "json") {
         context.output.result(result);
         return;
@@ -45141,7 +45230,7 @@ function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
   };
   return Object.freeze(command);
 }
-var RELEASE_TAG_USAGE = "rafa release tag", DEFAULT_RELEASE_BRANCH = "main", DEFAULT_REGISTRY = "https://registry.npmjs.org", RELEASE_REMOTE2 = "origin", INDENT14 = "  ", NO_PACKAGE2, tag_default;
+var RELEASE_TAG_USAGE = "rafa release tag", DEFAULT_RELEASE_BRANCH = "main", DEFAULT_REGISTRY = "https://registry.npmjs.org", RELEASE_REMOTE2 = "origin", INDENT14 = "  ", SHORT_COMMIT = 7, NO_PACKAGE2, ON_HEAD, tag_default;
 var init_tag = __esm(() => {
   init_command();
   init_config_load();
@@ -45150,6 +45239,7 @@ var init_tag = __esm(() => {
   init_version2();
   init_plan_files();
   init_merge_followups();
+  init_release_commit();
   init_status();
   NO_PACKAGE2 = Object.freeze({
     manager: "npm",
@@ -45157,6 +45247,7 @@ var init_tag = __esm(() => {
     name: null,
     isPrivate: false
   });
+  ON_HEAD = Object.freeze({ ahead: 0, branch: DEFAULT_RELEASE_BRANCH });
   tag_default = createReleaseTagCommand();
 });
 
@@ -47477,7 +47568,7 @@ import { existsSync as existsSync47 } from "fs";
 function isIdleWorktree(row3) {
   return !row3.blockers.some((blocker) => blocker.kind === "recent");
 }
-function unread2(problem2) {
+function unread3(problem2) {
   return { read: false, problem: problem2 };
 }
 function read2(reading2) {
@@ -47488,7 +47579,7 @@ function localSection(work) {
     const reading2 = work();
     return isUnread(reading2) ? reading2 : read2(reading2);
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   }
 }
 function isUnread(value) {
@@ -47521,13 +47612,13 @@ async function networkSection(what, deadline, work) {
   let timer;
   const expired = new Promise((resolve30) => {
     timer = setTimeout(() => {
-      resolve30(unread2(`the ${what} was not read within the ${String(deadline.ms)}ms network deadline`));
+      resolve30(unread3(`the ${what} was not read within the ${String(deadline.ms)}ms network deadline`));
     }, Math.max(0, deadline.left()));
   });
   try {
     return await Promise.race([work().then((reading2) => read2(reading2)), expired]);
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   } finally {
     clearTimeout(timer);
   }
@@ -47543,7 +47634,7 @@ function readBranchSection(sources) {
   };
   const branch = readBranch2(sources, note);
   if (branch === "") {
-    return unread2(notes.join("; ") || "the branch at the project root could not be read");
+    return unread3(notes.join("; ") || "the branch at the project root could not be read");
   }
   const plans = readPlans(sources, note);
   return { branch, plan: readBranchPlan(branch, plans), notes };
@@ -47570,9 +47661,9 @@ function readLoopsSection(root, sources) {
 }
 function pullSection(sources, branch, provider, deadline) {
   if (provider.provider !== "gh")
-    return Promise.resolve(unread2(notGhProblem("pull request", provider)));
+    return Promise.resolve(unread3(notGhProblem("pull request", provider)));
   if (!branch.read) {
-    return Promise.resolve(unread2(`no pull request was looked for, as the branch was not read: ${branch.problem}`));
+    return Promise.resolve(unread3(`no pull request was looked for, as the branch was not read: ${branch.problem}`));
   }
   return networkSection("pull request", deadline, () => readPull(sources, branch.branch));
 }
@@ -47656,11 +47747,11 @@ async function readHousekeeping(input, cleanup, now) {
     const settings = doctorCleanupSettings({ root: input.root, home: input.home, config: input.config, gh: null }, now);
     const reading2 = await readCleanup(cleanup, settings);
     if (!reading2.ok)
-      return unread2(reading2.detail);
+      return unread3(reading2.detail);
     const idle = reading2.worktrees.filter((row3) => isIdleWorktree(row3));
     return read2({ counts: cleanupCounts(reading2), idleWorktrees: idle.length, notes: reading2.notes });
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   }
 }
 async function readStatusSections(input, seams = {}) {
@@ -47689,7 +47780,7 @@ async function readStatusSections(input, seams = {}) {
   const blockedIssues = seams.blockedIssues ?? ((runner) => readBlockedIssues({ gh: runner }));
   deadline.start();
   const pull = pullSection(sources, branch, provider, deadline);
-  const boardSection = isGh ? networkSection("board", deadline, () => readBoard(root, board, listing3, blockedIssues(gh))) : Promise.resolve(unread2(notGhProblem("board", provider)));
+  const boardSection = isGh ? networkSection("board", deadline, () => readBoard(root, board, listing3, blockedIssues(gh))) : Promise.resolve(unread3(notGhProblem("board", provider)));
   const housekeeping = readHousekeeping(input, cleanup, now);
   return {
     branch,
@@ -47917,7 +48008,7 @@ var init_commands2 = __esm(() => {
     { name: "agent", summary: "copy an agent definition into the project; list what a session sees" },
     { name: "skill", summary: "check a skills directory; list each tier; demote and backfill it" },
     { name: "instinct", summary: "check an instincts directory; list, show, flag and promote its records" },
-    { name: "release", summary: "read the release state of the project; tag the release branch's HEAD" },
+    { name: "release", summary: "read the release state of the project; tag the commit that set the version" },
     { name: "board", summary: "list the boards with their owner, epic count, and which is current and home" },
     { name: "epic", summary: "show one epic's issues as the Roadmap table; create an epic; defer or promote it; move an issue to it; close it through the gate or cancel it" }
   ]);

package/dist/{index-zzvc0gkb.js → index-amyd4dse.js}

@@ -283,7 +283,7 @@ import {
   writePositionFile,
   writeSession,
   writeShippedFile
-} from "./index-gt9acb1y.js";
+} from "./index-h369efkh.js";
 import {
   PROBE_TIMEOUT_MS,
   findNextTask,
@@ -15149,6 +15149,16 @@ function remoteHoldsBranch(git, branch, warn3) {
   warn3(`${REMOTE3} could not be asked whether it still holds ${branch}, so it is left alone: ${gitSaid(probe2)}`);
   return false;
 }
+function localHoldsBranch(git, branch, warn3) {
+  const probe2 = git(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]);
+  if (probe2.ok)
+    return true;
+  const said = gitSaid(probe2);
+  if (said === "")
+    return false;
+  warn3(`could not read whether this checkout holds a local branch ${branch}, so its delete runs: ${said}`);
+  return true;
+}
 function textOf(path) {
   try {
     return readFileSync19(path, "utf8");
@@ -15226,25 +15236,34 @@ async function reportTick(context, pr, seams, detail) {
   }
   return tick;
 }
-function readyLine(base, branch, remoteBranchPresent) {
-  const remote = remoteBranchPresent ? `and ${branch} is gone locally and on ${REMOTE3}.` : `and ${branch} is gone locally; ${REMOTE3} had already deleted it.`;
-  return `${base} is checked out and pulled, ${remote}`;
+function readyLine(base, branch, present) {
+  const pulled = `${base} is checked out and pulled`;
+  if (present.local) {
+    return present.remote ? `${pulled}, and ${branch} is gone locally and on ${REMOTE3}.` : `${pulled}, and ${branch} is gone locally; ${REMOTE3} had already deleted it.`;
+  }
+  return present.remote ? `${pulled}, and ${branch} is gone on ${REMOTE3}; there was no local branch to delete.` : `${pulled}; ${branch} had no local branch, and ${REMOTE3} had already deleted it.`;
 }
 function quotedLines2(said) {
   return said === "" ? [] : said.split(`
 `).map((line) => `${INDENT4}${line}`);
 }
-function runCleanUp(context, git, detail, remoteBranchPresent) {
+function runCleanUp(context, git, detail, present) {
   const steps = cleanUpSteps({
     branch: detail.headRefName,
     base: detail.baseRefName,
     remote: REMOTE3,
-    remoteBranchPresent
+    localBranchPresent: present.local,
+    remoteBranchPresent: present.remote
   });
   const reports = [];
   for (const step of steps) {
+    if (step.skip !== undefined) {
+      reports.push({ id: step.id, label: step.label, command: commandLine(step), ok: true, skipped: true });
+      context.output.info(`${step.label}: skipped \u2014 ${step.skip}`);
+      continue;
+    }
     const result = git(step.argv.slice(1));
-    reports.push({ id: step.id, label: step.label, command: commandLine(step), ok: result.ok });
+    reports.push({ id: step.id, label: step.label, command: commandLine(step), ok: result.ok, skipped: false });
     if (result.ok) {
       context.output.info(`${step.label}: done`);
       continue;
@@ -15340,11 +15359,15 @@ async function runMerge(context, seams) {
   context.output.info(`Merged #${detail.number} into ${detail.baseRefName} (${method}).`);
   const commentUrl = await commentIfUnchecked(context, pr, detail.number, answer2.unchecked);
   const roadmapTicks = await reportTick(context, pr, seams, detail);
-  const remoteBranchPresent = remoteHoldsBranch(git, detail.headRefName, (message) => {
+  const warn3 = (message) => {
     context.output.warn(message);
-  });
-  const steps = runCleanUp(context, git, detail, remoteBranchPresent);
-  context.output.info(readyLine(detail.baseRefName, detail.headRefName, remoteBranchPresent));
+  };
+  const present = {
+    remote: remoteHoldsBranch(git, detail.headRefName, warn3),
+    local: localHoldsBranch(git, detail.headRefName, warn3)
+  };
+  const steps = runCleanUp(context, git, detail, present);
+  context.output.info(readyLine(detail.baseRefName, detail.headRefName, present));
   const followUps = followUpsFor(pr, git);
   if (followUps.length > 0) {
     context.output.info("Follow-ups:");
@@ -15371,7 +15394,7 @@ function createPrMergeCommand(seams = DEFAULT_MERGE_SEAMS) {
     subject: "pr",
     action: "merge",
     summary: "merge a pull request and clean up both branches",
-    description: "Merges one pull request through the GitHub CLI and then, in code, switches to the base branch," + " pulls it fast-forward only, deletes the head branch locally and on the remote where it is still there," + " and prunes, reporting each step. Refuses before it asks anything on a dirty working tree, on a pull" + " request that is not green or does not merge, and on a head branch checked out in another worktree. It" + " shows the pull request, its branches and the method and asks `Merge? [y/N]`; `--yes` skips the question," + " and without a terminal and without `--yes` it refuses. A pull request that reports no checks at all is" + " refused unless `--skip-checks` is given, which is refused on any pull request that does report checks;" + " with it the command reads how many workflows the repository defines, prints a warning for that case, asks" + " `Merge #<n> with no checks? [y/N]` (which `--yes` answers only where the repository defines no workflow)," + " and after the merge posts one comment on the pull request saying so. A step that fails never undoes the merge: it" + " prints what is left as commands to paste and exits 1. After the merge it ticks the `Closes #<n>` line of" + " every issue the pull request closes on every open board whose checklist lists it, or on the roadmap issue while no issue carries `type:roadmap`, warning rather than failing when that write" + ' does not land. It ends by reading every open issue whose "Blocked by:" line names an issue this pull' + " request closes, asking whether to remove `spec:blocked` from each one whose blockers have all closed;" + " `--yes` does not answer that question, and every failure of that reading is a warning. With" + " `--output=json` the pull request, the method, the steps that ran, the follow-ups, the roadmap tick and" + " the unblock reading are the data of the terminal result event. Refuses with exit code 2 where" + " `pr.provider` is not `gh`.",
+    description: "Merges one pull request through the GitHub CLI and then, in code, switches to the base branch," + " pulls it fast-forward only, deletes the head branch locally and on the remote where it is still there," + " and prunes, reporting each step; a head branch this checkout has no local branch for is reported as a" + " skipped local delete, and the rest still run. Refuses before it asks anything on a dirty working tree, on a pull" + " request that is not green or does not merge, and on a head branch checked out in another worktree. It" + " shows the pull request, its branches and the method and asks `Merge? [y/N]`; `--yes` skips the question," + " and without a terminal and without `--yes` it refuses. A pull request that reports no checks at all is" + " refused unless `--skip-checks` is given, which is refused on any pull request that does report checks;" + " with it the command reads how many workflows the repository defines, prints a warning for that case, asks" + " `Merge #<n> with no checks? [y/N]` (which `--yes` answers only where the repository defines no workflow)," + " and after the merge posts one comment on the pull request saying so. A step that fails never undoes the merge: it" + " prints what is left as commands to paste and exits 1. After the merge it ticks the `Closes #<n>` line of" + " every issue the pull request closes on every open board whose checklist lists it, or on the roadmap issue while no issue carries `type:roadmap`, warning rather than failing when that write" + ' does not land. It ends by reading every open issue whose "Blocked by:" line names an issue this pull' + " request closes, asking whether to remove `spec:blocked` from each one whose blockers have all closed;" + " `--yes` does not answer that question, and every failure of that reading is a warning. With" + " `--output=json` the pull request, the method, the steps that ran, the follow-ups, the roadmap tick and" + " the unblock reading are the data of the terminal result event. Refuses with exit code 2 where" + " `pr.provider` is not `gh`.",
     args: [
       {
         name: "n",
@@ -17858,11 +17881,50 @@ var wait_default = createPrWaitCommand();
 // src/commands/release/tag.ts
 import { readFileSync as readFileSync21 } from "fs";
 import { join as join32 } from "path";
+
+// src/commands/release/release-commit.ts
+function unread2(reason, message) {
+  return { commit: null, ahead: 0, problem: { reason, message } };
+}
+function versionAt(git, commit, path) {
+  const shown = git(["show", `${commit}:./${path}`]);
+  return shown.ok ? readManifestVersion(shown.stdout) : null;
+}
+function readReleaseCommit(git, path, version2) {
+  const log = git(["log", "--first-parent", "--format=%H", "HEAD", "--", `./${path}`]);
+  if (!log.ok)
+    return unread2("git", `the history of ${path} could not be read: ${gitSaid(log)}`);
+  const changed = log.stdout.split(`
+`).map((line) => line.trim()).filter((line) => line !== "");
+  if (changed.length === 0) {
+    return unread2("version", `no commit on this branch holds ${path}; commit it before tagging`);
+  }
+  let release = null;
+  let newest;
+  for (const commit of changed) {
+    const declared = versionAt(git, commit, path);
+    if (newest === undefined)
+      newest = declared;
+    if (declared !== version2)
+      break;
+    release = commit;
+  }
+  if (release === null) {
+    return unread2("version", `${path} says ${version2}, and the last commit on this branch that changed it` + ` says ${newest ?? "no version"}; commit the version before tagging it`);
+  }
+  const count2 = git(["rev-list", "--count", "--first-parent", `${release}..HEAD`]);
+  if (!count2.ok)
+    return unread2("git", `the commits past ${release} could not be counted: ${gitSaid(count2)}`);
+  return { commit: release, ahead: Number.parseInt(count2.stdout.trim(), 10), problem: null };
+}
+
+// src/commands/release/tag.ts
 var RELEASE_TAG_USAGE = "rafa release tag";
 var DEFAULT_RELEASE_BRANCH = "main";
 var DEFAULT_REGISTRY = "https://registry.npmjs.org";
 var RELEASE_REMOTE = "origin";
 var INDENT8 = "  ";
+var SHORT_COMMIT = 7;
 function readBranch2(git) {
   const result = git(["rev-parse", "--abbrev-ref", "HEAD"]);
   if (!result.ok) {
@@ -17939,18 +18001,22 @@ function readPublishTarget(text) {
     isPrivate: fields["private"] === true
   };
 }
-function followUpsFor2(tag, version2, target) {
+var ON_HEAD = Object.freeze({ ahead: 0, branch: DEFAULT_RELEASE_BRANCH });
+function followUpsFor2(tag, version2, target, place2 = ON_HEAD) {
   const push = {
     command: `git push ${RELEASE_REMOTE} ${tag}`,
     why: `the tag is local until ${RELEASE_REMOTE} has it`
   };
   if (target.name === null || target.isPrivate)
     return [push];
+  const publishes = `publishes ${target.name}@${version2} to ${target.registry}`;
+  if (place2.ahead === 0)
+    return [push, { command: `${target.manager} publish`, why: publishes }];
   return [
     push,
     {
-      command: `${target.manager} publish`,
-      why: `publishes ${target.name}@${version2} to ${target.registry}`
+      command: `git switch --detach ${tag} && ${target.manager} publish && git switch ${place2.branch}`,
+      why: `${publishes} from the tagged commit, not HEAD; skip it if ${target.registry} has that version already`
     }
   ];
 }
@@ -17990,7 +18056,14 @@ function decideTag(inputs) {
   const disagrees = changelogRefusal(inputs, version2);
   if (disagrees !== null)
     return disagrees;
-  return { kind: "ready", version: version2, tag: versionTag(version2) };
+  const release = inputs.release;
+  if (release === null)
+    return refuse2("version", `${inputs.version.path} was not looked up in the history`);
+  if (release.problem !== null)
+    return refuse2(release.problem.reason, release.problem.message);
+  if (release.commit === null)
+    return refuse2("git", `no commit could be named for ${version2}`);
+  return { kind: "ready", version: version2, tag: versionTag(version2), commit: release.commit, ahead: release.ahead };
 }
 function projectOf9(context) {
   if (context.project === null)
@@ -18013,23 +18086,34 @@ function tagConfig(project, warn3) {
   }
 }
 function readTagInputs(root, git, config) {
+  const branch = readBranch2(git);
+  const version2 = readVersion(root, config.versionFile);
+  const walkable = version2.version !== null && branch.branch === config.releaseBranch;
   return {
     releaseBranch: config.releaseBranch,
-    branch: readBranch2(git),
-    version: readVersion(root, config.versionFile),
+    branch,
+    version: version2,
     changelog: readNewestRelease(root, config.changelog),
-    tags: readTags(git)
+    tags: readTags(git),
+    release: walkable && version2.version !== null ? readReleaseCommit(git, config.versionFile, version2.version) : null
   };
 }
-function writeTag(git, tag) {
-  const result = git(["tag", tag, "HEAD"]);
+function writeTag(git, tag, commit) {
+  const result = git(["tag", tag, commit]);
   if (result.ok)
     return;
   throw new CommandExit(1, `\u274C ${tag} could not be written: ${gitSaid(result)}`);
 }
+function pastReleaseWarning(written, branch) {
+  if (written.ahead === 0)
+    return null;
+  const commits = written.ahead === 1 ? "1 commit" : `${String(written.ahead)} commits`;
+  return `HEAD of ${branch} is ${commits} past ${written.commit.slice(0, SHORT_COMMIT)}, where ${written.version}` + ` was set; they are not in ${written.tag}.`;
+}
 function renderTagged(written, branch, followUps) {
+  const where = written.ahead === 0 ? `the HEAD of ${branch}` : `${written.commit.slice(0, SHORT_COMMIT)}, the commit of ${branch} that set ${written.version}`;
   return [
-    `\u2705 Tagged ${written.tag} at the HEAD of ${branch}.`,
+    `\u2705 Tagged ${written.tag} at ${where}.`,
     "Next:",
     ...followUps.map((followUp2) => `${INDENT8}${followUp2.command} \u2014 ${followUp2.why}`)
   ];
@@ -18047,8 +18131,9 @@ function runTag(context, seams = DEFAULT_RELEASE_SEAMS) {
     throw new CommandExit(1, `\u274C ${decision.message}
 Usage: ${RELEASE_TAG_USAGE}`);
   }
-  writeTag(git, decision.tag);
-  const followUps = followUpsFor2(decision.tag, decision.version, readPublishTarget(inputs.version.text));
+  writeTag(git, decision.tag, decision.commit);
+  const place2 = { ahead: decision.ahead, branch: config.releaseBranch };
+  const followUps = followUpsFor2(decision.tag, decision.version, readPublishTarget(inputs.version.text), place2);
   return { inputs, written: decision, followUps };
 }
 function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
@@ -18056,8 +18141,8 @@ function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
     name: "release tag",
     subject: "release",
     action: "tag",
-    summary: "tag the release branch's HEAD with the version both release files agree on",
-    description: "Writes `v<version>` on the HEAD of the release branch \u2014 `pr.base`, or `main` \u2014 when the" + " version `release.versionFile` declares is the one the newest section of `release.changelog` names." + " It refuses, and writes nothing, when another branch is checked out, when a tag already names that" + " version, when the two files disagree, and when either the version file or the tag list could not" + " be read. After the tag it prints what to run next: the push that puts the tag on the remote, and" + " the publish line for the registry the version file configures, which it does not run. With" + " `--output=json` the readings, the decision and the follow-ups are the data of the terminal result" + " event.",
+    summary: "tag the commit that set the version both release files agree on",
+    description: "Writes `v<version>` on the release branch \u2014 `pr.base`, or `main` \u2014 when the" + " version `release.versionFile` declares is the one the newest section of `release.changelog` names." + " The tag goes on the commit that set that version: HEAD, or, where later commits landed on the branch," + " the earlier commit, with a warning naming how many commits HEAD is past it." + " It refuses, and writes nothing, when another branch is checked out, when a tag already names that" + " version, when the two files disagree, when no commit holds the version yet, and when the version" + " file, the tag list or the history could not be read. After the tag it prints what to run next: the" + " push that puts the tag on the remote, and the publish line for the registry the version file" + " configures, spelled to publish from the tag when HEAD is past it, which it does not run. With" + " `--output=json` the readings, the decision and the follow-ups are the data of the terminal result" + " event.",
     args: [],
     flags: [],
     examples: [
@@ -18073,6 +18158,9 @@ function createReleaseTagCommand(seams = DEFAULT_RELEASE_SEAMS) {
     outputs: ["text", "json"],
     run: async (context) => {
       const result = runTag(context, seams);
+      const past = pastReleaseWarning(result.written, result.inputs.releaseBranch);
+      if (past !== null)
+        context.output.warn(past);
       if (context.outputMode === "json") {
         context.output.result(result);
         return;
@@ -20328,7 +20416,7 @@ var STATUS_NETWORK_TIMEOUT_MS = 5000;
 function isIdleWorktree(row2) {
   return !row2.blockers.some((blocker) => blocker.kind === "recent");
 }
-function unread2(problem2) {
+function unread3(problem2) {
   return { read: false, problem: problem2 };
 }
 function read2(reading) {
@@ -20339,7 +20427,7 @@ function localSection(work) {
     const reading = work();
     return isUnread(reading) ? reading : read2(reading);
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   }
 }
 function isUnread(value) {
@@ -20372,13 +20460,13 @@ async function networkSection(what, deadline, work) {
   let timer;
   const expired = new Promise((resolve16) => {
     timer = setTimeout(() => {
-      resolve16(unread2(`the ${what} was not read within the ${String(deadline.ms)}ms network deadline`));
+      resolve16(unread3(`the ${what} was not read within the ${String(deadline.ms)}ms network deadline`));
     }, Math.max(0, deadline.left()));
   });
   try {
     return await Promise.race([work().then((reading) => read2(reading)), expired]);
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   } finally {
     clearTimeout(timer);
   }
@@ -20394,7 +20482,7 @@ function readBranchSection(sources) {
   };
   const branch = readBranch(sources, note);
   if (branch === "") {
-    return unread2(notes.join("; ") || "the branch at the project root could not be read");
+    return unread3(notes.join("; ") || "the branch at the project root could not be read");
   }
   const plans = readPlans(sources, note);
   return { branch, plan: readBranchPlan(branch, plans), notes };
@@ -20421,9 +20509,9 @@ function readLoopsSection(root, sources) {
 }
 function pullSection(sources, branch, provider, deadline) {
   if (provider.provider !== "gh")
-    return Promise.resolve(unread2(notGhProblem("pull request", provider)));
+    return Promise.resolve(unread3(notGhProblem("pull request", provider)));
   if (!branch.read) {
-    return Promise.resolve(unread2(`no pull request was looked for, as the branch was not read: ${branch.problem}`));
+    return Promise.resolve(unread3(`no pull request was looked for, as the branch was not read: ${branch.problem}`));
   }
   return networkSection("pull request", deadline, () => readPull(sources, branch.branch));
 }
@@ -20507,11 +20595,11 @@ async function readHousekeeping(input, cleanup, now) {
     const settings = doctorCleanupSettings({ root: input.root, home: input.home, config: input.config, gh: null }, now);
     const reading = await readCleanup(cleanup, settings);
     if (!reading.ok)
-      return unread2(reading.detail);
+      return unread3(reading.detail);
     const idle = reading.worktrees.filter((row2) => isIdleWorktree(row2));
     return read2({ counts: cleanupCounts(reading), idleWorktrees: idle.length, notes: reading.notes });
   } catch (error) {
-    return unread2(messageOf(error));
+    return unread3(messageOf(error));
   }
 }
 async function readStatusSections(input, seams = {}) {
@@ -20540,7 +20628,7 @@ async function readStatusSections(input, seams = {}) {
   const blockedIssues = seams.blockedIssues ?? ((runner) => readBlockedIssues({ gh: runner }));
   deadline.start();
   const pull = pullSection(sources, branch, provider, deadline);
-  const boardSection = isGh ? networkSection("board", deadline, () => readBoard(root, board, listing2, blockedIssues(gh))) : Promise.resolve(unread2(notGhProblem("board", provider)));
+  const boardSection = isGh ? networkSection("board", deadline, () => readBoard(root, board, listing2, blockedIssues(gh))) : Promise.resolve(unread3(notGhProblem("board", provider)));
   const housekeeping = readHousekeeping(input, cleanup, now);
   return {
     branch,
@@ -20641,7 +20729,7 @@ var CORE_SUBJECTS = Object.freeze([
   { name: "agent", summary: "copy an agent definition into the project; list what a session sees" },
   { name: "skill", summary: "check a skills directory; list each tier; demote and backfill it" },
   { name: "instinct", summary: "check an instincts directory; list, show, flag and promote its records" },
-  { name: "release", summary: "read the release state of the project; tag the release branch's HEAD" },
+  { name: "release", summary: "read the release state of the project; tag the commit that set the version" },
   { name: "board", summary: "list the boards with their owner, epic count, and which is current and home" },
   { name: "epic", summary: "show one epic's issues as the Roadmap table; create an epic; defer or promote it; move an issue to it; close it through the gate or cancel it" }
 ]);

package/dist/{index-gt9acb1y.js → index-h369efkh.js}

@@ -5132,7 +5132,7 @@ async function report(args, repoRoot) {
 
 // package.json
 var name = "@open-tomato/rafa";
-var version = "0.24.0";
+var version = "0.24.1";
 
 // src/modules/manifest.ts
 var MANIFEST_VERSION = 1;
@@ -9930,7 +9930,7 @@ async function enforceRefsGate(options) {
 import path2 from "path";
 async function coreRoster() {
   const [{ CORE_REGISTRY }, { describeRegistry }] = await Promise.all([
-    import("./index-zzvc0gkb.js"),
+    import("./index-amyd4dse.js"),
     import("./describe-66gth329.js")
   ]);
   return describeRegistry(CORE_REGISTRY, version);
@@ -11496,7 +11496,7 @@ function readMergeRefusal(reading2) {
   return held.length === 0 ? null : worktreeRefusal(reading2.branch, held);
 }
 function cleanUpSteps(plan) {
-  const { base, branch, remote = DEFAULT_REMOTE2, remoteBranchPresent } = plan;
+  const { base, branch, remote = DEFAULT_REMOTE2, localBranchPresent, remoteBranchPresent } = plan;
   const steps = [
     { id: "switch-base", label: `switch to ${base}`, argv: ["git", "switch", base] },
     {
@@ -11507,7 +11507,8 @@ function cleanUpSteps(plan) {
     {
       id: "delete-local",
       label: `delete the local branch ${branch}`,
-      argv: ["git", "branch", "-D", branch]
+      argv: ["git", "branch", "-D", branch],
+      ...localBranchPresent ? {} : { skip: `no local branch ${branch}; nothing to delete` }
     }
   ];
   if (remoteBranchPresent) {
@@ -11532,7 +11533,7 @@ function commandLine(step) {
 }
 function remainingFrom(steps, failed2) {
   const at = steps.findIndex((step) => step.id === failed2);
-  return at === -1 ? Object.freeze([]) : Object.freeze(steps.slice(at));
+  return at === -1 ? Object.freeze([]) : Object.freeze(steps.slice(at).filter((step) => step.skip === undefined));
 }
 // src/pr/none.ts
 import { spawnSync as spawnSync2 } from "child_process";

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   start,
   usage,
   validateManifest
-} from "./index-gt9acb1y.js";
+} from "./index-h369efkh.js";
 import {
   PLAN_BLOCK_KINDS,
   PLAN_HEADER_FIELDS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tomato/rafa",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Alpha. Runs a plan through the ralph loop: one Claude Code session per task, one commit per task, then a pull request and a CI wait.",
   "private": false,
   "publishConfig": {