@pmelab/gtd 35.0.0 → 37.0.0

package/dist/workflows/feature.mjs

@@ -1,7 +1,7 @@
-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 { agent, answered, applyScript, changes, changesSince, check, codeChanges, 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, wrote } from "../flows.mjs";
 import { lensEntriesOf, review as review$1 } from "../workflow-kit.mjs";
-import { $ as refactorBuildingPrompt, A as buildReviewCollectingPrompt, B as deferNotesScript, C as planner, D as agentWithSkills, E as reviewing, F as clearCriteriaQuestion, H as designSystem, I as coverageMessage, J as implementBuildingPrompt, L as coverageQuestion, M as buildReviewTriageMessage, N as builderSystem, O as buildReviewAnswerQuestionsPrompt, P as clearCriteriaMessage, Q as qualityUnresolvedMessage, R as coveringPrompt, S as fixRisks, U as designTriagePrompt, V as designGateAnswerMessage, X as naivePassPrompt, Y as implementFixPrompt, Z as normaliseCriteriaScript, _ as REVIEW, a as flagModeOn, b as fixCheck, ct as seamByHandMessage, d as guarded, dt as uncoveredMessage, et as refactorDroppedRefusal, f as healthy, ft as unwindFailedMessage, g as REQUIREMENTS, gt as testFileGlobs, h as REFACTOR, ht as envDefaults, i as skills, it as reviewEditsCapture, j as buildReviewFixNitsPrompt, k as buildReviewAwaitAfterDeferMessage, lt as seamSteerMessage, m as QUALITY, mt as defaults, n as summary, nt as refactorRules, ot as reviewNotesCapture, p as FEEDBACK, pt as unwindFailure, q as idleMessage, r as access, rt as reviewEditNotesCapture, s as shipped, st as reviewerSystem, t as steering, tt as refactorFixPrompt, u as gate, ut as startGateBlockedMessage, v as awaitReview, w as reviewMissing, y as coder, z as criterionLine } from "../chunks/reserved-C8Fm3s72.mjs";
-import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-oaYewBN_.mjs";
+import { $ as normaliseCriteriaScript, A as buildReviewAwaitAfterDeferMessage, B as criterionLine, C as fixRisks, D as reviewing, F as clearCriteriaMessage, H as designGateAnswerMessage, I as clearCriteriaQuestion, J as idleMessage, L as coverageMessage, M as buildReviewFixNitsPrompt, N as buildReviewTriageMessage, O as agentWithSkills, P as builderSystem, Q as naivePassPrompt, R as coverageQuestion, T as reviewMissing, U as designSystem, V as deferNotesScript, W as designTriagePrompt, X as implementFixPrompt, Y as implementBuildingPrompt, Z as naiveApplyFailure, _ as REQUIREMENTS, _t as defaults, a as flagModeOn, at as refactorRules, b as coder, d as guarded, dt as seamByHandMessage, et as qualityUnresolvedMessage, f as healthy, ft as seamSteerMessage, g as REFACTOR_NOTE, gt as unwindFailure, h as REFACTOR, ht as unwindFailedMessage, i as skills, it as refactorNotePrompt, j as buildReviewCollectingPrompt, k as buildReviewAnswerQuestionsPrompt, lt as reviewNotesCapture, m as QUALITY, mt as uncoveredMessage, n as summary, nt as refactorDroppedRefusal, ot as reviewEditNotesCapture, p as FEEDBACK, pt as startGateBlockedMessage, r as access, rt as refactorFixPrompt, s as shipped, st as reviewEditsCapture, t as steering, tt as refactorBuildingPrompt, u as gate, ut as reviewerSystem, v as REVIEW, vt as envDefaults, w as planner, x as fixCheck, y as awaitReview, yt as testFileGlobs, z as coveringPrompt } from "../chunks/reserved-zAfoJtR7.mjs";
+import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-BRC4DGdV.mjs";
 import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
@@ -623,7 +623,8 @@ const plan = (shape, options) => {
 	return {
 		pattern,
 		strays,
-		reference: options.reference?.trim() ? options.reference : void 0
+		reference: options.reference?.trim() ? options.reference : void 0,
+		note: options.note?.trim() ? options.note : void 0
 	};
 };
 const guardOf = ({ pattern, strays }, entry) => () => {
@@ -632,13 +633,22 @@ const guardOf = ({ pattern, strays }, entry) => () => {
 };
 /** Derive, build, check and close one refactor lap; `feedback` is the collected review text of the lap before. */
 const refactorLap = async (p, guard, feedback) => {
-	const { pattern, strays, reference } = p;
-	await run("deriving", deriveScript([...packageLines(strays, pattern, reference), ...feedback === void 0 ? [] : [
-		"## Review feedback",
-		"",
-		...demoteHeadings(feedback),
-		""
-	]]), {
+	const { pattern, strays, reference, note } = p;
+	await run("deriving", deriveScript([
+		...packageLines(strays, pattern, reference),
+		...note === void 0 ? [] : [
+			"## Refactor note",
+			"",
+			...demoteHeadings(note),
+			""
+		],
+		...feedback === void 0 ? [] : [
+			"## Review feedback",
+			"",
+			...demoteHeadings(feedback),
+			""
+		]
+	]), {
 		label: "Deriving the refactor package",
 		file: REFACTOR_PACKAGE
 	});
@@ -647,7 +657,8 @@ const refactorLap = async (p, guard, feedback) => {
 		strays,
 		pattern,
 		reference,
-		feedback: feedback !== void 0
+		feedback: feedback !== void 0,
+		note: note !== void 0
 	}), {
 		label: "Refactoring",
 		model: coder(),
@@ -733,13 +744,16 @@ const COVERED_MIN_P = .7;
 /** Covering turns before the process rests at `uncovered`; a human edit there refills them. */
 const COVERING_RETRIES = 2;
 const frozen = () => requireCriteriaFrozen(REQUIREMENTS);
-const green = () => healthy(() => agentWithSkills("fix.suite.fixing", implementFixPrompt(), {
+const green = (guard) => healthy(() => agentWithSkills("fix.suite.fixing", implementFixPrompt(), {
 	label: "Fixing the check",
 	file: FEEDBACK,
 	model: coder(),
 	system: builderSystem()
 }), {
-	guard: frozen,
+	guard: () => {
+		frozen();
+		guard?.();
+	},
 	guardRests: false
 });
 const testsSince = (base) => changesSince(base).filter((c) => c.after !== void 0 && isCode$1(c.path) && isTestFile(c.path)).sort((a, b) => Number(/\bAC-\d/.test(a.after)) - Number(/\bAC-\d/.test(b.after))).map((c) => `=== ${c.path} (${c.status})\n${c.after}`).join("\n");
@@ -853,16 +867,20 @@ const addedLines = (change) => {
 	const before = new Set((change.before ?? "").split("\n"));
 	return change.after.split("\n").filter((line) => !before.has(line)).join("\n");
 };
+const acceptanceTests = (changes) => changes.filter((c) => c.after !== void 0 && isCode$1(c.path) && isTestFile(c.path));
+const idsOf = (file) => (criteriaOf(read(file) ?? "") ?? []).map((c) => c.id).filter((id) => id !== "");
+const unnamed = (ids, tests) => {
+	const lines = tests.map(addedLines);
+	return ids.filter((id) => !lines.some((text) => named(id, text)));
+};
 /**
 * 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)));
+	const tests = acceptanceTests(tip.changes);
+	const untested = unnamed(idsOf(file), tests);
 	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) => {
@@ -871,6 +889,41 @@ const acceptanceFault = (file, tip) => {
 	});
 	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")}`;
 };
+/** What a rebuild carries over from the naive pass `tip`: the IDs its tests name, and those test files. */
+const naiveAcceptance = (tip) => {
+	const ids = idsOf(REQUIREMENTS);
+	const perTest = acceptanceTests(tip.changes).map((c) => {
+		const lines = addedLines(c);
+		return {
+			path: c.path,
+			ids: ids.filter((id) => named(id, lines))
+		};
+	});
+	return {
+		hash: tip.hash,
+		tests: perTest.filter((c) => c.ids.length > 0).map((c) => c.path),
+		ids: ids.filter((id) => perTest.some((c) => c.ids.includes(id)))
+	};
+};
+/**
+* Refuse a rebuild whose test changes since `since` leave out an ID the naive
+* pass's tests named. A skipped test still counts: the gate reads text, never runs it.
+*/
+const requireAcceptance = (acceptance, since) => {
+	const missing = unnamed(acceptance.ids, acceptanceTests(changesSince(since)));
+	if (missing.length === 0) return;
+	refuse(`gtd land: rebuild-acceptance: the rebuild's tests leave out ${missing.join(", ")} — carry over the naive pass's acceptance tests (\`git show ${acceptance.hash} -- ${acceptance.tests.map(quote).join(" ")}\`), each with its ID in the test or scenario name`);
+};
+/**
+* Refuse a fix turn that, on its own, drops an ID the naive pass's tests named
+* from a test file. Turn-local, so a person's edit at an escalation rest never
+* wedges later fix turns.
+*/
+const requireAcceptanceKept = (acceptance) => {
+	const dropped = acceptance.ids.filter((id) => changes().filter((c) => isCode$1(c.path) && isTestFile(c.path)).some((c) => named(id, c.before ?? "") && !named(id, c.after ?? "")));
+	if (dropped.length === 0) return;
+	refuse(`gtd land: rebuild-acceptance: this turn drops ${dropped.join(", ")} from the tests — the naive pass's acceptance tests stay; fix the code, not them`);
+};
 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
@@ -883,7 +936,7 @@ const naiveGreen = (tip) => {
 	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`,
+		`if ! git diff --binary --no-color --no-ext-diff --no-textconv --src-prefix=a/ --dst-prefix=b/ ${quote(`${tip.hash}^`)} ${quote(tip.hash)} -- | git apply --whitespace=nowarn; then`,
 		"  echo 'gtd: the kept naive pass no longer applies to HEAD; no test ran'",
 		"  exit 1",
 		"fi",
@@ -902,6 +955,11 @@ const naiveGreen = (tip) => {
 		label: "Running the naive pass's tests"
 	});
 };
+/** Resolves `false` when the tip no longer applies (the failure is in `.gtd/FEEDBACK.md`) or has nothing outside `.gtd/` to apply. */
+const applied = async (tip) => {
+	await run("applying", applyScript(tip, FEEDBACK, naiveApplyFailure(tip), [".gtd"]), { label: "Applying the naive pass" });
+	return !wrote(".gtd/FEEDBACK.md") && codeChanges().length > 0;
+};
 function implement(first, tier, amend) {
 	const options = typeof first === "object" && first !== null ? first : {
 		reference: first,
@@ -909,22 +967,26 @@ function implement(first, tier, amend) {
 		amend
 	};
 	return scope("implement", async () => {
-		await agentWithSkills("building", implementBuildingPrompt(options.reference, options.tier, options.amend, options.afterRefactor, flagModeOn()), {
+		const since = head();
+		const acceptance = options.rebuild?.acceptance;
+		const built = options.naive === void 0 || !await applied(options.naive);
+		if (built) await agentWithSkills("building", implementBuildingPrompt(options.reference, options.tier, options.amend, options.afterRefactor, flagModeOn(), options.rebuild), {
 			label: "Implementing",
 			model: coder(),
 			system: builderSystem(),
 			...options.afterRefactor === true ? { allowEmpty: true } : {}
 		});
 		requireCriteriaFrozen(REQUIREMENTS);
-		await green();
+		if (built && acceptance !== void 0) requireAcceptance(acceptance, since);
+		await green(built && acceptance !== void 0 ? () => requireAcceptanceKept(acceptance) : void 0);
 		await requireCoverage();
-		await run("closing", removeScript([REQUIREMENTS]), { label: "Closing out the implementation" });
+		await run("closing", removeScript([REQUIREMENTS, REFACTOR_NOTE]), { label: "Closing out the implementation" });
 	});
 }
 /** Resolves `true` when the human steered (edited), `false` on a clean overrule. */
 const steer = async (retry) => {
 	await human("steer", {
-		message: seamSteerMessage(retry),
+		message: seamSteerMessage(retry, flagModeOn()),
 		label: "Steer or overrule the naive pass",
 		file: REQUIREMENTS,
 		acceptClean: true
@@ -968,16 +1030,23 @@ const vetted = async (tip, vetting) => {
 /** 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 === "land") return {
+		reference: tip.hash,
+		tip
+	};
 	if (shape.choice === "refactor-first") return {
 		reference: tip.hash,
+		tip,
 		shape
 	};
 	const next = await again({
 		strays: shape.strays,
 		p: shape.judgment?.answers.shape?.p ?? 0
 	});
-	return next.kind === "overruled" ? { reference: tip.hash } : next;
+	return next.kind === "overruled" ? {
+		reference: tip.hash,
+		tip
+	} : next;
 };
 const decide = () => scope("seam", async () => {
 	const vetting = {
@@ -988,16 +1057,33 @@ const decide = () => scope("seam", async () => {
 	for (;;) {
 		await naivePass(retry);
 		const tip = kept("naive");
-		const outcome = await vetted(tip, vetting) ?? await ruled(tip, vetting.again);
+		const outcome = await vetted(tip, vetting) ?? (flagModeOn() ? await ruled(tip, vetting.again) : {
+			reference: tip.hash,
+			tip
+		});
 		if (!("kind" in outcome)) return outcome;
 		retry = outcome.kind === "retry" ? outcome.retry : void 0;
 	}
 });
+/** Write the refactor note from the whole naive pass; a turn that changes anything else is refused. */
+const refactorNote = async (reference, strays) => {
+	await agent("note", refactorNotePrompt(reference, strays), {
+		label: "Writing the refactor note",
+		file: REFACTOR_NOTE,
+		model: coder(),
+		system: builderSystem()
+	});
+	const others = changes().map((c) => c.path).filter((path) => path !== REFACTOR_NOTE);
+	const note = read(".gtd/REFACTOR-NOTE.md") ?? "";
+	if (others.length > 0 || note.trim() === "") refuse(`gtd land: refactor-note: write ${REFACTOR_NOTE} and change nothing else${others.length > 0 ? ` — revert these:\n${others.map((path) => `  - ${path}`).join("\n")}` : ""}`);
+	return note;
+};
 const seamBuild = async (base) => {
-	const { reference, shape } = await decide();
+	const { reference, tip, shape } = await decide();
 	if (shape === void 0) return {
 		reference,
-		base
+		base,
+		land: true
 	};
 	if (shape.unreadable.length > 0) {
 		await scope("seam", () => human("by-hand", {
@@ -1007,18 +1093,29 @@ const seamBuild = async (base) => {
 		}));
 		return {
 			reference,
-			base
+			base,
+			rebuild: { acceptance: naiveAcceptance(tip) }
 		};
 	}
-	if (refactorStrays(shape).length === 0) return {
+	const strays = refactorStrays(shape);
+	if (strays.length === 0) return {
 		reference,
-		base
+		base,
+		rebuild: { acceptance: naiveAcceptance(tip) }
 	};
-	const refactored = await slice("refactor", () => reviewedRefactor(shape, { reference }));
+	const note = await scope("seam", () => refactorNote(reference, strays));
+	const refactored = await slice("refactor", () => reviewedRefactor(shape, {
+		reference,
+		note
+	}));
 	return {
 		reference,
 		base: head(),
-		refactored
+		refactored,
+		rebuild: {
+			note,
+			acceptance: naiveAcceptance(tip)
+		}
 	};
 };
 //#endregion
@@ -1028,17 +1125,20 @@ 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 the quality lap; design must have run since `firstBase`. */
+/** A naive pass (judged only with `flagMode` on), 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 };
+	const seam = await seamBuild(firstBase);
 	await slice("feature", async () => {
 		await implement({
 			reference: seam.reference,
 			tier,
-			afterRefactor: seam.refactored
+			afterRefactor: seam.refactored,
+			naive: seam.land === true ? seam.reference : void 0,
+			rebuild: seam.rebuild
 		});
-		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path)) ? firstBase : seam.base;
+		const carried = seam.rebuild?.acceptance?.tests ?? [];
+		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path) && !carried.includes(c.path)) ? firstBase : seam.base;
 		await tail(settleQuality, {
 			green: true,
 			lensBase: base
@@ -1102,4 +1202,4 @@ const feature = shipped(ordinaryStart);
 //#region src/workflows/feature/index.ts
 var feature_default = feature;
 //#endregion
-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 };
+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, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireAcceptance, requireAcceptanceKept, 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, G as fixReviewNotesPrompt, W as finisherSystem, _ as REVIEW, c as baseline, ht as envDefaults, i as skills, mt as defaults, n as summary, r as access, s as shipped, t as steering, y as coder } from "../chunks/reserved-C8Fm3s72.mjs";
-import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-oaYewBN_.mjs";
+import { G as finisherSystem, K as fixReviewNotesPrompt, O as agentWithSkills, _t as defaults, b as coder, c as baseline, i as skills, n as summary, r as access, s as shipped, t as steering, v as REVIEW, vt as envDefaults } from "../chunks/reserved-zAfoJtR7.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-BRC4DGdV.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 { at as reviewGateBlockedMessage, ht as envDefaults, i as skills, mt as defaults, n as summary, r as access, s as shipped, t as steering, u as gate } from "../chunks/reserved-C8Fm3s72.mjs";
-import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-oaYewBN_.mjs";
+import { _t as defaults, ct as reviewGateBlockedMessage, i as skills, n as summary, r as access, s as shipped, t as steering, u as gate, vt as envDefaults } from "../chunks/reserved-zAfoJtR7.mjs";
+import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-BRC4DGdV.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 { _t as flagMentions, ht as envDefaults, i as skills, mt as defaults, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, xt as requireFlag, y as coder, yt as flipProblems } from "../chunks/reserved-C8Fm3s72.mjs";
+import { St as flipProblems, _t as defaults, b as coder, bt as flagMentions, i as skills, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, vt as envDefaults, wt as requireFlag } from "../chunks/reserved-zAfoJtR7.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.";