@bensandee/tooling 0.84.0 → 0.84.1

package/dist/bin.mjs

@@ -269,7 +269,7 @@ function loadEnvFileForBin(rawArgs, bin, io = processIo) {
 */
 const envFileLoad = loadEnvFileForBin(process.argv.slice(2), {
 	name: "bst",
-	version: "0.84.0"
+	version: "0.84.1"
 });
 //#endregion
 //#region ../cli-kit/src/logger.ts
@@ -7163,7 +7163,7 @@ function buildManagedDevDeps(ctx) {
 	const devDeps = { ...rootDevDeps(ctx.config) };
 	if (!isMonorepo) Object.assign(devDeps, perPackageDevDeps(ctx.config));
 	if (ctx.config.stack !== "none" || ctx.config.ci === "forgejo") devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.14.5";
-	if (!isWorkspacePackage(ctx, "@bensandee/tooling")) devDeps["@bensandee/tooling"] = "0.84.0";
+	if (!isWorkspacePackage(ctx, "@bensandee/tooling")) devDeps["@bensandee/tooling"] = "0.84.1";
 	if (ctx.config.useEslintPlugin && ctx.config.stack !== "none") devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.15.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "3.0.3",
@@ -11950,6 +11950,10 @@ const GIT_GUIDE_BODY = [
 	"",
 	"Start a pull request's title with the stage it carries: `Spec:` for a spec, `Plan:` for a plan, and no stem once it carries the implementation. A draft keeps its `WIP:` marker in front (`WIP: Plan: Add retry to uploads`). When a pull request moves on to the next stage, move the stem with it. This is informational -- nothing checks it and nothing fails without it -- but it tells a reviewer at a glance what they are reading.",
 	"",
+	"**Drop `WIP:` and fix the stem when the work is done.** Once the pull request carries finished work you are handing over for review -- a spec or a plan ready to approve, or an implementation whose check passes -- remove the `WIP:` marker and make the stem match what it now carries: no stem for an implementation. Do it in the same step that reports the work done, without being asked. A marker left behind tells a reviewer the work is still moving.",
+	"",
+	"`pr:update` never changes a pull request's draft state, so it keeps `WIP:` on a retitle. On Forgejo a draft is only that title prefix: retitle the pull request without it (`bst-fj issue:update <n> --title \"<title>\"` where `bst-fj` is installed). On GitHub, run `gh pr ready` and then edit the title.",
+	"",
 	"## Merging the default branch in",
 	"",
 	"**A merge with no conflicts is not yet a merge that works.** Read the incoming diff for what your branch builds on -- a field made required, a shared schema, a size budget -- and run the full check before you push the merge. Fix what it finds in the merge commit itself, so that commit passes on its own.",
@@ -12692,7 +12696,7 @@ function reportFailures(failed, command) {
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.84.0 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.84.1 repo:sync\` on ${timestamp}_\n`);
 	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
 	if (changed.length > 0) {
 		const items = changed.map((r) => {
@@ -27877,13 +27881,39 @@ function normalizeIssue(raw) {
 	};
 }
 /**
+* Parse the backing issue number out of a PR body's `Closes #<n>` line. Returns null when the
+* body carries no such line (a hand-written PR, or a body that could not be read). Lives beside
+* {@link toIssueSummaries}, which keeps it for every pull request a search returns.
+*
+* `Closes` only, deliberately -- narrower than the `Closes`/`Fixes`/`Resolves` vocabulary the
+* closing-ref machinery in `closing-refs.ts` recognizes, and it must stay
+* that way. A body whose *first* closing reference names some other issue is what a caller
+* resolves the backing issue against, and a branch name derived from that number follows it, so
+* every keyword added here widens the set of bodies that can be misrouted. The
+* cost of the narrow set is the opposite failure and the cheaper one: an adopted body already
+* saying `Fixes #<n>` gets no `Closes` line appended (it already closes the issue), so this
+* returns null and the PR is treated as having no backing issue -- which still closes its issue
+* on merge and still runs on the PR's own head ref, losing only the issue mapping.
+*/
+function backingIssueNumber(prBody) {
+	const match = /Closes #(\d+)/i.exec(prBody);
+	if (match === null) return null;
+	const parsed = Number(match[1]);
+	return Number.isNaN(parsed) ? null : parsed;
+}
+/**
 * Normalize a raw issue list, drop pull requests (both platforms serve them
 * through the issues endpoint), and strip bodies down to summaries. Shared by
 * the Forgejo and GitHub list transports so the post-processing chain lives
 * in exactly one place.
 */
 function toIssueSummaries(raw, type = "issues") {
-	const summaries = raw.map(normalizeIssue).map(({ body: _body, ...summary }) => summary);
+	const summaries = raw.map(normalizeIssue).map(({ body, ...summary }) => {
+		const result = summary;
+		const backingIssue = summary.isPullRequest ? backingIssueNumber(body) : null;
+		if (backingIssue !== null) result.backingIssue = backingIssue;
+		return result;
+	});
 	return type === "issues" ? summaries.filter((s) => !s.isPullRequest) : summaries;
 }
 /** Fetch a single issue by number. */
@@ -30533,6 +30563,71 @@ function writeReviewPackage(planPath, base, head, cwd, out) {
 	};
 }
 //#endregion
+//#region src/plan-workspace/task-label.ts
+/** The line shapes `plan:brief` and `plan:status` both read a task's number from. */
+const HEADING = /^(#{1,6})[ \t]+(.*)$/;
+const BOX = /^([ \t]*)[-*] \[[ xX]\][ \t]*(.*)$/;
+const LABEL = /^Task[ \t]+([0-9]+)(?![0-9])/;
+/** A line that opens a fence: three or more of one character, after any amount of whitespace. */
+const FENCE_OPEN = /^[ \t]*(`{3,}|~{3,})/;
+/** The same shape with nothing but whitespace after the run, which is what closes a fence. */
+const FENCE_CLOSE = /^[ \t]*(`{3,}|~{3,})[ \t]*$/;
+/** Whether a line closes the fence opened by `fenceChar` repeated `fenceLength` times. */
+function closesFence(text, fenceChar, fenceLength) {
+	const run = FENCE_CLOSE.exec(text)?.[1];
+	if (run === void 0) return false;
+	return run[0] === fenceChar && run.length >= fenceLength;
+}
+/**
+* Which lines of a document a rendered markdown viewer would show as code rather than parse as
+* markdown: true at every fence line and every line inside one, false elsewhere. The rules are
+* CommonMark's, with two choices that belong to these readers:
+*
+* - Any indentation opens a fence, not the 0-3 spaces CommonMark allows, because plans nest
+*   example fences under list items and none of the readers tracks list nesting.
+* - An unclosed fence runs to the end of the document, which is how a renderer shows one.
+*
+* A closer is the opener's own character repeated at least as many times, with nothing after it
+* but whitespace; a run of the other character, a shorter run, or a run carrying an info string is
+* code content and keeps the fence open.
+*
+* `stripFencedCodeBlocks` in `docs-check/links.ts` walks fences by the same rule but is a
+* different reader with different rules (it limits the opener's indent and tracks blockquote
+* depth), which is why this walk is not shared with it.
+*/
+function fencedLines(lines) {
+	const fenced = lines.map(() => false);
+	let fenceChar;
+	let fenceLength = 0;
+	for (let index = 0; index < lines.length; index++) {
+		const text = lines[index] ?? "";
+		if (fenceChar === void 0) {
+			const run = FENCE_OPEN.exec(text)?.[1];
+			if (run === void 0) continue;
+			fenceChar = run[0];
+			fenceLength = run.length;
+			fenced[index] = true;
+			continue;
+		}
+		fenced[index] = true;
+		if (closesFence(text, fenceChar, fenceLength)) {
+			fenceChar = void 0;
+			fenceLength = 0;
+		}
+	}
+	return fenced;
+}
+/**
+* The `<n>` of a heading or checkbox text that starts `Task <n>` (after an opening `**` or `__`),
+* or null. A number with a leading zero reads as null, because `plan:brief <n>` matches the digits
+* as written and could never find `Task 05`.
+*/
+function taskLabelNumber(text) {
+	const digits = LABEL.exec(text.replace(/^(\*\*|__)/, ""))?.[1];
+	if (digits === void 0 || String(Number(digits)) !== digits) return null;
+	return Number(digits);
+}
+//#endregion
 //#region src/plan-workspace/plan-boxes.ts
 /**
 * Read a plan document's checkboxes and the notes committed under them. One strict parser, fail-
@@ -30545,8 +30640,14 @@ function writeReviewPackage(planPath, base, head, cwd, out) {
 * boundary matters because a batched plan is a sequence of `### <title>`
 * sections and a note must never leak across one.
 *
-* The agent imports this module (`run-outcome.ts`, `run-gates.ts`, `prompt.ts`, `run.ts`), so a
-* change here changes how the agent reads a plan as well as what `plan:status` reports.
+* A line inside a fenced code block (`fencedLines`, `task-label.ts`) is invisible in every role:
+* a fenced box is not counted, a fenced heading does not end a block, and a fenced note or
+* declination is not one. The fail-safe direction holds -- an ambiguous line degrades to "not
+* declined".
+*
+* The agent imports this module (`run-outcome.ts`, `run-gates.ts`, `run.ts`, `plan-box-diff.ts`,
+* `plan-box-watch.ts`, `plan-box-walk.ts`, `plan-progress.ts`), so a change here changes how the
+* agent reads a plan as well as what `plan:status` reports.
 *
 * An unchecked box is **declined** when its block carries a line matching
 * `^[ \t]*(?:[-*][ \t]+)?\*\*Declined:\*\*[ \t]*(.*)$` whose trimmed remainder is non-empty; that
@@ -30599,8 +30700,10 @@ function unwrapEmphasis(rawTitle) {
 /** Parse every checkbox on a plan document, each with its own block already resolved. */
 function parsePlanBoxes(planText) {
 	const lines = planText.split("\n");
+	const fenced = fencedLines(lines);
 	const boxStarts = [];
 	for (let index = 0; index < lines.length; index++) {
+		if (fenced[index] === true) continue;
 		const match = BOX_LINE_REGEX.exec(lines[index] ?? "");
 		if (match === null) continue;
 		boxStarts.push({
@@ -30612,13 +30715,17 @@ function parsePlanBoxes(planText) {
 	return boxStarts.map((box, position) => {
 		const nextBoxIndex = boxStarts[position + 1]?.index ?? lines.length;
 		let blockEnd = nextBoxIndex;
-		for (let index = box.index + 1; index < nextBoxIndex; index++) if (HEADING_REGEX.test(lines[index] ?? "")) {
-			blockEnd = index;
-			break;
+		for (let index = box.index + 1; index < nextBoxIndex; index++) {
+			if (fenced[index] === true) continue;
+			if (HEADING_REGEX.test(lines[index] ?? "")) {
+				blockEnd = index;
+				break;
+			}
 		}
 		const title = unwrapEmphasis(box.rawTitle);
 		const retireTask = RETIRE_TASK_REGEX.test(title);
 		if (box.checked) return {
+			line: box.index,
 			checked: true,
 			declined: false,
 			reason: null,
@@ -30628,6 +30735,7 @@ function parsePlanBoxes(planText) {
 		};
 		const notes = [];
 		for (let index = box.index + 1; index < blockEnd; index++) {
+			if (fenced[index] === true) continue;
 			const noteMatch = NOTE_LINE_REGEX.exec(lines[index] ?? "");
 			if (noteMatch === null) continue;
 			const text = (noteMatch[2] ?? "").trim();
@@ -30638,6 +30746,7 @@ function parsePlanBoxes(planText) {
 		}
 		let reason = null;
 		for (let index = box.index + 1; index < blockEnd; index++) {
+			if (fenced[index] === true) continue;
 			const declinedMatch = DECLINED_LINE_REGEX.exec(lines[index] ?? "");
 			if (declinedMatch === null) continue;
 			const remainder = (declinedMatch[1] ?? "").trim();
@@ -30647,6 +30756,7 @@ function parsePlanBoxes(planText) {
 			}
 		}
 		return {
+			line: box.index,
 			checked: false,
 			declined: reason !== null,
 			reason,
@@ -30657,45 +30767,23 @@ function parsePlanBoxes(planText) {
 	});
 }
 //#endregion
-//#region src/plan-workspace/task-label.ts
-/** The line shapes `plan:brief` and `plan:status` both read a task's number from. */
-const FENCE = /^[ \t]*(```|~~~)/;
-const HEADING = /^(#{1,6})[ \t]+(.*)$/;
-const BOX = /^([ \t]*)[-*] \[[ xX]\][ \t]*(.*)$/;
-const LABEL = /^Task[ \t]+([0-9]+)(?![0-9])/;
-/**
-* The `<n>` of a heading or checkbox text that starts `Task <n>` (after an opening `**` or `__`),
-* or null. A number with a leading zero reads as null, because `plan:brief <n>` matches the digits
-* as written and could never find `Task 05`.
-*/
-function taskLabelNumber(text) {
-	const digits = LABEL.exec(text.replace(/^(\*\*|__)/, ""))?.[1];
-	if (digits === void 0 || String(Number(digits)) !== digits) return null;
-	return Number(digits);
-}
-//#endregion
 //#region src/plan-workspace/status.ts
 const RETIRED_SEGMENT = /(^|\/)retired\//;
 /**
-* The nearest `Task <n>` label at or before the plan's `ordinal`-th box line. Box lines are counted
-* fence-blind, as `parsePlanBoxes` counts them, so the ordinal lands on the same line; only the
-* label tracking skips fences, as `plan:brief` does.
+* The nearest `Task <n>` label at or before the box on `line`, the box's own title winning. The
+* walk shares `fencedLines` with `plan:brief`, so a fenced `Task <n>` line is no more a label here
+* than it is a task boundary there.
 */
-function enclosingTaskNumber(planText, ordinal) {
-	let inFence = false;
-	let boxes = -1;
+function enclosingTaskNumber(planText, line) {
+	const lines = planText.split("\n");
+	const fenced = fencedLines(lines);
 	let label = null;
-	for (const line of planText.split("\n")) {
-		const box = BOX.exec(line);
-		if (box !== null) boxes++;
-		if (box !== null && boxes === ordinal) return taskLabelNumber(box[2] ?? "") ?? label;
-		if (FENCE.test(line)) {
-			inFence = !inFence;
-			continue;
-		}
-		if (inFence) continue;
-		const text = box?.[2] ?? HEADING.exec(line)?.[2];
-		const n = text === void 0 ? null : taskLabelNumber(text);
+	for (let index = 0; index < lines.length; index++) {
+		const text = lines[index] ?? "";
+		if (index === line) return taskLabelNumber(BOX.exec(text)?.[2] ?? "") ?? label;
+		if (fenced[index] === true) continue;
+		const title = BOX.exec(text)?.[2] ?? HEADING.exec(text)?.[2];
+		const n = title === void 0 ? null : taskLabelNumber(title);
 		if (n !== null) label = n;
 	}
 	return null;
@@ -30718,7 +30806,7 @@ function planStatus(planText, planPath) {
 		outstanding: open.length,
 		declined: boxes.filter((box) => box.declined).length,
 		next: nextBox === void 0 || nextBox.title === "" ? null : nextBox.title,
-		nextTask: nextBox === void 0 ? null : enclosingTaskNumber(planText, boxes.indexOf(nextBox)),
+		nextTask: nextBox === void 0 ? null : enclosingTaskNumber(planText, nextBox.line),
 		onlyRetireLeft: open.length > 0 && open.every((box) => box.retireTask),
 		notes
 	};
@@ -30735,17 +30823,13 @@ function isTaskLabel(text, n) {
 */
 function extractTask(planText, n) {
 	const lines = planText.split("\n");
-	let inFence = false;
+	const fenced = fencedLines(lines);
 	let start = -1;
 	let shape = null;
 	let end = lines.length;
 	for (let index = 0; index < lines.length; index++) {
+		if (fenced[index] === true) continue;
 		const line = lines[index] ?? "";
-		if (FENCE.test(line)) {
-			inFence = !inFence;
-			continue;
-		}
-		if (inFence) continue;
 		const heading = HEADING.exec(line);
 		const box = BOX.exec(line);
 		if (shape === null) {
@@ -31171,7 +31255,7 @@ setForgejoLogger(log$1);
 * `local <sha>[-dirty]` otherwise -- so an artifact built from the working tree
 * can't pass itself off as the published release whose version it carries.
 */
-const displayVersion = "0.84.0";
+const displayVersion = "0.84.1";
 /**
 * The registered `bst` subcommand map, exported so both the JSON entry path below (resolving a
 * command name before citty parses anything) and the coverage test (enumerating every

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.84.0",
+  "version": "0.84.1",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {