@pmelab/gtd 32.1.0 → 34.0.0

package/dist/workflows/feature.mjs

@@ -1,7 +1,8 @@
-import { answered, changes, changesSince, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, numeric, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireRevert, requireThreadsClosed, restoreScript, revertScript, run, scope, slice, start, vars } from "../flows.mjs";
+import { answered, changes, changesSince, check, env, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, numeric, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireRevert, requireThreadsClosed, restoreScript, revertScript, run, scope, slice, start, vars } from "../flows.mjs";
 import { lensEntriesOf, review as review$1 } from "../workflow-kit.mjs";
-import { $ as reviewEditNotesCapture, A as buildReviewCollectingPrompt, B as designTriagePrompt, C as planner, D as agentWithSkills, E as reviewing, F as clearCriteriaQuestion, G as implementBuildingPrompt, I as criterionLine, J as normaliseCriteriaScript, K as implementFixPrompt, L as deferNotesScript, M as buildReviewTriageMessage, N as builderSystem, O as buildReviewAnswerQuestionsPrompt, P as clearCriteriaMessage, Q as refactorRules, R as designGateAnswerMessage, S as fixRisks, W as idleMessage, X as refactorDroppedRefusal, Y as refactorBuildingPrompt, Z as refactorFixPrompt, _ as REVIEW, a as flagModeOn, at as seamSteerMessage, b as fixCheck, ct as unwindFailure, d as guarded, dt as testFileGlobs, et as reviewEditsCapture, f as healthy, g as REQUIREMENTS, h as REFACTOR, i as skills, it as seamByHandMessage, j as buildReviewFixNitsPrompt, k as buildReviewAwaitAfterDeferMessage, lt as defaults, n as summary, nt as reviewNotesCapture, ot as startGateBlockedMessage, p as FEEDBACK, q as naivePassPrompt, r as access, rt as reviewerSystem, s as shipped, st as unwindFailedMessage, t as steering, u as gate, ut as envDefaults, v as awaitReview, w as reviewMissing, y as coder, z as designSystem } from "../chunks/reserved-2fV0mj14.mjs";
-import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-BynhCfuv.mjs";
+import { $ as refactorRules, A as buildReviewCollectingPrompt, B as designTriagePrompt, C as planner, D as agentWithSkills, E as reviewing, F as clearCriteriaQuestion, G as implementBuildingPrompt, I as criterionLine, J as normaliseCriteriaScript, K as implementFixPrompt, L as deferNotesScript, M as buildReviewTriageMessage, N as builderSystem, O as buildReviewAnswerQuestionsPrompt, P as clearCriteriaMessage, Q as refactorFixPrompt, R as designGateAnswerMessage, S as fixRisks, W as idleMessage, X as refactorBuildingPrompt, Y as qualityUnresolvedMessage, Z as refactorDroppedRefusal, _ as REVIEW, a as flagModeOn, at as seamByHandMessage, b as fixCheck, ct as unwindFailedMessage, d as guarded, dt as envDefaults, et as reviewEditNotesCapture, f as healthy, ft as testFileGlobs, g as REQUIREMENTS, h as REFACTOR, i as skills, it as reviewerSystem, j as buildReviewFixNitsPrompt, k as buildReviewAwaitAfterDeferMessage, lt as unwindFailure, m as QUALITY, n as summary, ot as seamSteerMessage, p as FEEDBACK, q as naivePassPrompt, r as access, rt as reviewNotesCapture, s as shipped, st as startGateBlockedMessage, t as steering, tt as reviewEditsCapture, u as gate, ut as defaults, v as awaitReview, w as reviewMissing, y as coder, z as designSystem } from "../chunks/reserved-BcJgt5_R.mjs";
+import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-CM_fa93v.mjs";
+import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
 	let fence;
@@ -727,7 +728,7 @@ const reviewedRefactor = async (shape, options = {}) => {
 };
 //#endregion
 //#region src/workflows/feature/seam.ts
-/** Naive-pass retries after a `reject`; the next `reject` rests at `seam.steer`. */
+/** Naive-pass retries after a `reject` or a red suite; the next one rests at `seam.steer`. */
 const NAIVE_RETRIES = 2;
 /** A change to an existing file outside the allowlist is a stray even when the task needs it: the judge decides. */
 const judgeSeam = (tip) => judgeDiffShape("judge", {
@@ -735,12 +736,95 @@ const judgeSeam = (tip) => judgeDiffShape("judge", {
 	allow: (vars.seamAllow ?? defaults.seamAllow).split(",").map((glob) => glob.trim()).filter((glob) => glob !== ""),
 	exempt: tip.changes.filter((c) => c.status === "added").map((c) => c.path)
 });
-const naivePass = (rejection) => agentWithSkills("naive", naivePassPrompt(rejection), {
-	label: rejection === void 0 ? "Writing the naive pass" : "Rewriting the naive pass",
+const naivePass = (retry) => agentWithSkills("naive", naivePassPrompt(retry), {
+	label: retry === void 0 ? "Writing the naive pass" : "Rewriting the naive pass",
 	keep: true,
 	model: coder(),
 	system: builderSystem()
 });
+const IMPORTED = /(?:\bfrom|\bimport|\brequire\s*\(|\bmock\s*\()\s*\(?\s*(["'`])([^"'`\n]+)\1/g;
+const EXTENSION = /\.[\w-]+$/;
+const ALIAS = /^(?:[@~]\/|#)/;
+/** The specifiers an added `path` answers to: itself, without its extension, and its directory for an `index`. */
+const namesOf = (path) => {
+	const bare = path.replace(EXTENSION, "");
+	return posix.basename(bare) === "index" ? [
+		path,
+		bare,
+		posix.dirname(bare)
+	] : [path, bare];
+};
+/**
+* The repository paths `test` imports, each with and without an extension: a
+* relative specifier resolved from its directory, an aliased one (`@/`, `~/`,
+* `#`) as a path tail, anything else as written. Comments are skipped; a
+* computed import goes unseen.
+*/
+const importsOf = (test) => [...(test.after ?? "").replace(COMMENT, "").matchAll(IMPORTED)].flatMap(([, , spec]) => {
+	const relative = /^\.\.?(\/|$)/.test(spec);
+	const tail = ALIAS.test(spec);
+	const path = relative ? posix.join(posix.dirname(test.path), spec) : spec.replace(ALIAS, "");
+	return [path, path.replace(EXTENSION, "")].map((p) => ({
+		path: p,
+		tail
+	}));
+});
+const reaches = (imports, added) => namesOf(added).some((name) => imports.some(({ path, tail }) => name === path || tail && name.endsWith(`/${path}`)));
+const named = (id, text) => new RegExp(`(?<![\\w-])${id}(?!\\d)`).test(text);
+/** The lines `change` added: an ID an earlier change left in the file does not count. */
+const addedLines = (change) => {
+	const before = new Set((change.before ?? "").split("\n"));
+	return change.after.split("\n").filter((line) => !before.has(line)).join("\n");
+};
+/**
+* Why `tip`'s tests fall short, or `undefined`: a criterion ID of `file` no
+* test line of the pass names, or a test importing a file the pass added —
+* naive structure a reset and refactor replaces, which the tests must survive.
+*/
+const acceptanceFault = (file, tip) => {
+	const ids = (criteriaOf(read(file) ?? "") ?? []).map((c) => c.id).filter((id) => id !== "");
+	const tests = tip.changes.filter((c) => c.after !== void 0 && isCode$1(c.path) && isTestFile(c.path));
+	const lines = tests.map(addedLines);
+	const untested = ids.filter((id) => !lines.some((text) => named(id, text)));
+	if (untested.length > 0) return `acceptance-tests: no test of the naive pass names ${untested.join(", ")} — write a behaviour-level test for each criterion with its ID in the test or scenario name, e.g. "[${untested[0]}] …"`;
+	const added = tip.changes.filter((c) => c.status === "added" && isCode$1(c.path) && !isTestFile(c.path)).map((c) => c.path);
+	const reaching = tests.filter((test) => holdsCallSites(test.path)).flatMap((test) => {
+		const imports = importsOf(test);
+		return added.filter((path) => reaches(imports, path)).map((path) => `  - ${test.path} → ${path}`);
+	});
+	if (reaching.length > 0) return `acceptance-internals: these tests import files the naive pass added — test through code that existed before it (a public entry point, an existing module's exports):\n${reaching.join("\n")}`;
+};
+const restore = (path) => `if git cat-file -e ${quote(`HEAD:${path}`)} 2>/dev/null; then git checkout -q HEAD -- ${quote(path)}; else rm -f -- ${quote(path)}; fi`;
+/**
+* Run the suite with `tip`'s diff applied, then take it out again; resolves
+* `true` when green. The pass's paths go back to HEAD before (an interrupted
+* run left them applied) and after; afterwards so does anything else the run
+* changed, judged against what was already dirty, which is left alone.
+*/
+const naiveGreen = (tip) => {
+	const paths = tip.changes.map((c) => restore(c.path));
+	return check("check", [
+		...paths,
+		"dirty=$(git -c core.quotePath=false ls-files -m -d -o --exclude-standard)",
+		`if ! git diff --binary ${quote(`${tip.hash}^`)} ${quote(tip.hash)} -- | git apply; then`,
+		"  echo 'gtd: the kept naive pass no longer applies to HEAD; no test ran'",
+		"  exit 1",
+		"fi",
+		"(",
+		env.testCommand ?? "",
+		")",
+		"code=$?",
+		...paths,
+		"git -c core.quotePath=false ls-files -m -d -o --exclude-standard | while IFS= read -r path; do",
+		"  printf '%s\\n' \"$dirty\" | grep -qxF -- \"$path\" && continue",
+		"  if git cat-file -e \"HEAD:$path\" 2>/dev/null; then git checkout -q HEAD -- \"$path\"; else rm -f -- \"$path\"; fi",
+		"done",
+		"exit \"$code\""
+	].join("\n"), {
+		report: FEEDBACK,
+		label: "Running the naive pass's tests"
+	});
+};
 function implement(first, tier, amend) {
 	const options = typeof first === "object" && first !== null ? first : {
 		reference: first,
@@ -767,36 +851,76 @@ function implement(first, tier, amend) {
 		await run("closing", removeScript([REQUIREMENTS]), { label: "Closing out the implementation" });
 	});
 }
-const decide = () => scope("seam", async () => {
-	let rejection;
+/** Resolves `true` when the human steered (edited), `false` on a clean overrule. */
+const steer = async (retry) => {
+	await human("steer", {
+		message: seamSteerMessage(retry),
+		label: "Steer or overrule the naive pass",
+		file: REQUIREMENTS,
+		acceptClean: true
+	});
+	if (changes().length === 0) return false;
+	requireCriteria(REQUIREMENTS);
+	return true;
+};
+/** Rejects, test faults and red checks share one budget; a steer or an overrule refills it. */
+const budget = () => {
 	let retries = 0;
-	for (;;) {
-		await naivePass(rejection);
-		const tip = kept("naive");
-		const shape = await judgeSeam(tip);
-		if (shape.choice === "land") return { reference: tip.hash };
-		if (shape.choice === "refactor-first") return {
-			reference: tip.hash,
-			shape
-		};
-		rejection = {
-			strays: shape.strays,
-			p: shape.judgment?.answers.shape?.p ?? 0
-		};
+	return async (next) => {
 		if (retries < NAIVE_RETRIES) {
 			retries++;
-			continue;
+			return {
+				kind: "retry",
+				retry: next
+			};
 		}
-		await human("steer", {
-			message: seamSteerMessage(rejection),
-			label: "Steer or overrule the rejected naive pass",
-			file: REQUIREMENTS,
-			acceptClean: true
-		});
-		if (changes().length === 0) return { reference: tip.hash };
-		requireCriteria(REQUIREMENTS);
-		rejection = void 0;
+		const steered = await steer(next);
 		retries = 0;
+		if (read(".gtd/FEEDBACK.md") !== void 0) await run("clear", removeScript([FEEDBACK]), { label: "Clearing the red check" });
+		return { kind: steered ? "steered" : "overruled" };
+	};
+};
+/** Sends a pass whose tests fall short or run red back (`undefined`: it goes on, an overruled one as it is). */
+const vetted = async (tip, vetting) => {
+	const fault = vetting.waived ? void 0 : acceptanceFault(REQUIREMENTS, tip);
+	if (fault !== void 0) {
+		const verdict = await vetting.again({
+			fault,
+			hash: tip.hash
+		});
+		if (verdict.kind !== "overruled") return verdict;
+		vetting.waived = true;
+	}
+	if (await naiveGreen(tip)) return void 0;
+	const verdict = await vetting.again({ red: tip.hash });
+	return verdict.kind === "overruled" ? void 0 : verdict;
+};
+/** The judge's ruling on a vetted pass: the decision, or the next attempt's verdict. */
+const ruled = async (tip, again) => {
+	const shape = await judgeSeam(tip);
+	if (shape.choice === "land") return { reference: tip.hash };
+	if (shape.choice === "refactor-first") return {
+		reference: tip.hash,
+		shape
+	};
+	const next = await again({
+		strays: shape.strays,
+		p: shape.judgment?.answers.shape?.p ?? 0
+	});
+	return next.kind === "overruled" ? { reference: tip.hash } : next;
+};
+const decide = () => scope("seam", async () => {
+	const vetting = {
+		again: budget(),
+		waived: false
+	};
+	let retry;
+	for (;;) {
+		await naivePass(retry);
+		const tip = kept("naive");
+		const outcome = await vetted(tip, vetting) ?? await ruled(tip, vetting.again);
+		if (!("kind" in outcome)) return outcome;
+		retry = outcome.kind === "retry" ? outcome.retry : void 0;
 	}
 });
 const seamBuild = async (base) => {
@@ -834,7 +958,7 @@ const unwind = () => {
 	const commit = head();
 	return run("unwind", revertScript(commit, FEEDBACK, unwindFailure(commit)), { label: "Unwinding your input" });
 };
-/** A judged naive pass (none with `flagMode` off), then implement and review until a review round signs off; design must have run since `firstBase`. */
+/** A judged naive pass (none with `flagMode` off), then implement and the quality lap; design must have run since `firstBase`. */
 const buildFeature = async (firstBase) => {
 	const tier = riskTierOn() ? recordRisk() : void 0;
 	const seam = flagModeOn() ? await seamBuild(firstBase) : { base: firstBase };
@@ -845,18 +969,31 @@ const buildFeature = async (firstBase) => {
 			afterRefactor: seam.refactored
 		});
 		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path)) ? firstBase : seam.base;
-		await featureFeedback(await buildTail(base, {
+		await tail(settleQuality, {
 			green: true,
 			lensBase: base
-		}), base);
+		});
 	});
 };
+const settleQuality = async () => {
+	let rested = false;
+	while ((read(".gtd/QUALITY.md") ?? "").length > 0) {
+		rested = true;
+		await human("quality-unresolved", {
+			message: qualityUnresolvedMessage(),
+			label: "Quality findings left unresolved",
+			file: QUALITY
+		});
+	}
+	if (rested) await healthy(() => fixCheck());
+};
 /** Design — skipped when the sketch's own criteria are judged clear — then `buildFeature`. */
 const planAndBuild = async (firstBase, stated) => {
 	if (!await skipDesign(riskTierOn() ? void 0 : stated)) await design(firstBase);
 	await buildFeature(firstBase);
 };
-const featureFeedback = async (first, lensBase) => {
+/** After a tail that skipped planning: stop on sign-off, re-plan on feedback. Opens no slice: slices cannot nest. */
+const afterTail = async (first) => {
 	let outcome = first;
 	while (outcome.verdict === "feedback") {
 		await reUnwind(outcome);
@@ -867,13 +1004,10 @@ const featureFeedback = async (first, lensBase) => {
 		});
 		outcome = await buildTail(outcome.base, {
 			green: true,
-			lap: "feedback",
-			lensBase
+			lap: "feedback"
 		});
 	}
 };
-/** After a tail that skipped planning: stop on sign-off, re-plan on feedback. Opens no slice: slices cannot nest. */
-const afterTail = (outcome) => featureFeedback(outcome);
 /** An ordinary start: wait at `idle`, unwind the sketch, check the baseline, then plan and build. */
 const ordinaryStart = async () => {
 	await human("idle", {
@@ -898,4 +1032,4 @@ const feature = shipped(ordinaryStart);
 //#region src/workflows/feature/index.ts
 var feature_default = feature;
 //#endregion
-export { REFACTOR_PACKAGE, access, afterTail, answerProductQuestions, answerReviewQuestions, buildFeature, buildTail, collecting, criteriaOf, feature_default as default, defaults, deferNotes, design, envDefaults, feature, fixNits, implement, judgeSeam, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorStrays, requireCriteria, requireCriteriaFrozen, requireNoNewFlags, requireNoTestFiles, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, statedCriteria, steering, summary, triage, unwind };
+export { COMMENT, REFACTOR_PACKAGE, acceptanceFault, access, afterTail, answerProductQuestions, answerReviewQuestions, buildFeature, buildTail, collecting, criteriaOf, feature_default as default, defaults, deferNotes, design, envDefaults, feature, fixNits, holdsCallSites, implement, isTestFile, judgeSeam, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorStrays, requireCriteria, requireCriteriaFrozen, requireNoNewFlags, requireNoTestFiles, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, statedCriteria, steering, summary, triage, unwind };

package/dist/workflows/fix.mjs

@@ -1,7 +1,7 @@
 import { read, refuse, removeScript, run, scope, start } from "../flows.mjs";
 import { d as reviewNotes, f as reviewRisks } from "../chunks/steering-DVILanVf.mjs";
-import { D as agentWithSkills, H as fixReviewNotesPrompt, V as finisherSystem, _ as REVIEW, c as baseline, i as skills, lt as defaults, n as summary, r as access, s as shipped, t as steering, ut as envDefaults, y as coder } from "../chunks/reserved-2fV0mj14.mjs";
-import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-BynhCfuv.mjs";
+import { D as agentWithSkills, H as fixReviewNotesPrompt, V as finisherSystem, _ as REVIEW, c as baseline, dt as envDefaults, i as skills, n as summary, r as access, s as shipped, t as steering, ut as defaults, y as coder } from "../chunks/reserved-BcJgt5_R.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-CM_fa93v.mjs";
 //#region src/workflows/fix/fix.ts
 /**
 * Fix every note a human left in a handed-off `.gtd/REVIEW.md` and every

package/dist/workflows/review.mjs

@@ -1,6 +1,6 @@
 import { start } from "../flows.mjs";
-import { i as skills, lt as defaults, n as summary, r as access, s as shipped, t as steering, tt as reviewGateBlockedMessage, u as gate, ut as envDefaults } from "../chunks/reserved-2fV0mj14.mjs";
-import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-BynhCfuv.mjs";
+import { dt as envDefaults, i as skills, n as summary, nt as reviewGateBlockedMessage, r as access, s as shipped, t as steering, u as gate, ut as defaults } from "../chunks/reserved-BcJgt5_R.mjs";
+import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-CM_fa93v.mjs";
 //#region src/workflows/review/review.ts
 /**
 * Pure review of everything since `reviewBase`: a green gate, the quality

package/dist/workflows/rollout.mjs

@@ -1,5 +1,5 @@
 import { agent, changesSince, glob, head, mark, read, refuse, removeScript, run, scope, vars } from "../flows.mjs";
-import { ft as flagMentions, gt as requireFlag, i as skills, lt as defaults, mt as flipProblems, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, ut as envDefaults, y as coder } from "../chunks/reserved-2fV0mj14.mjs";
+import { _t as requireFlag, dt as envDefaults, ht as flipProblems, i as skills, n as summary, o as flagShipped, p as FEEDBACK, pt as flagMentions, r as access, t as steering, u as gate, ut as defaults, y as coder } from "../chunks/reserved-BcJgt5_R.mjs";
 //#region src/workflows/rollout/rollout.ts
 const flippingPrompt = (name, registry) => `Roll out the release flag "${name}": in ${registry}, set \`defaultOn: true\` on its entry. Change nothing else — no other entry, no other field, no other file, no comments.`;
 const suiteBlockedMessage = () => "The suite is red after the rollout. Fix it by hand — a rollout may only touch the flag's registry entry — then land.";