@pmelab/gtd 56.0.0 → 57.0.0

package/dist/workflows/feature.mjs

@@ -1,8 +1,8 @@
-import { agent, answered, applyScript, changes, changesSince, check, codeChanges, env, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireThreadsClosed, revertScript, run, scope, start, vars, wrote } from "../flows.mjs";
+import { agent, answered, applyScript, changes, changesSince, check, codeChanges, env, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireThreadsClosed, restoreScript, revertScript, run, scope, start, vars, wrote } from "../flows.mjs";
 import { lensEntriesOf } from "../workflow-kit.mjs";
-import { $ as normaliseCriteriaScript, B as designSystem, Ct as unwindFailedMessage, D as planner, Dt as defaults, F as clearCriteriaMessage, I as clearCriteriaQuestion, J as implementBuildingPrompt, L as criterionLine, M as buildReviewCollectingPrompt, Ot as envDefaults, P as builderSystem, R as designGateAnswerMessage, S as collecting, St as testerSystem, V as designTriagePrompt, X as naiveApplyFailure, Y as implementFixPrompt, Z as naivePassPrompt, _ as REQUIREMENTS, a as flagModeOn, at as prototypeUnguidedMessage, bt as seamSteerMessage, ct as refactorBuildingPrompt, d as healthy, dt as refactorNotePrompt, et as observableMessage, f as FEEDBACK, ft as refactorRules, g as REFACTOR_NOTE, h as REFACTOR, i as skills, it as prototypeTestingPrompt, j as agentWithSkills, kt as testFileGlobs, l as gate, lt as refactorDroppedRefusal, n as summary, nt as prototypeFixingPrompt, p as PROTOTYPE, q as idleMessage, r as access, rt as prototypeOpenMessage, s as shipped, t as steering, tt as observableQuestion, ut as refactorFixPrompt, vt as reviewerSystem, w as fixNits, wt as unwindFailure, x as coder, xt as startGateBlockedMessage, y as answerReviewQuestions, yt as seamByHandMessage, z as designImpactPrompt } from "../chunks/reserved-B8EC-WE8.mjs";
-import { a as refusePendingHandOff } from "../chunks/tail-BSLah2mA.mjs";
-import { n as isCode$1, r as reUnwind, t as buildTail } from "../chunks/review-HdrX0FJ7.mjs";
+import { $ as naiveTryMessage, B as designImpactPrompt, C as collecting, Ct as envDefaults, F as builderSystem, H as designTriagePrompt, I as clearCriteriaMessage, J as idleMessage, L as clearCriteriaQuestion, M as agentWithSkills, N as buildReviewCollectingPrompt, O as planner, Q as naivePassPrompt, R as criterionLine, S as coder, St as defaults, T as fixNits, V as designSystem, X as implementFixPrompt, Y as implementBuildingPrompt, Z as naiveApplyFailure, _ as REFACTOR_NOTE, _t as startGateBlockedMessage, a as flagModeOn, at as refactorDroppedRefusal, b as answerReviewQuestions, c as shipped, ct as refactorRules, f as healthy, g as REFACTOR, gt as seamSteerMessage, ht as seamByHandMessage, i as skills, it as refactorBuildingPrompt, m as NAIVE_TEST, mt as reviewerSystem, n as summary, ot as refactorFixPrompt, p as FEEDBACK, r as access, s as naiveTestOn, st as refactorNotePrompt, t as steering, tt as normaliseCriteriaScript, u as gate, v as REQUIREMENTS, vt as unwindFailedMessage, wt as testFileGlobs, yt as unwindFailure, z as designGateAnswerMessage } from "../chunks/reserved-X2RkNHin.mjs";
+import { a as refusePendingHandOff } from "../chunks/tail-S04KEewi.mjs";
+import { n as isCode$1, r as reUnwind, t as buildTail } from "../chunks/review-v7sh5GF4.mjs";
 import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
@@ -26,11 +26,10 @@ const ITEM = /^ ?(?:[-*+]|\d+[.)])\s+(?:\[[ xX]\]\s+)?(.*)$/;
 //#region src/workflows/feature/criteria.ts
 /** Below this the judge's `yes` is not trusted: a wrong skip builds against criteria nobody can check. */
 const CLEAR_MIN_P = .8;
-const ID = /^(AC-\d+)(\s*\(no hands-on\))?:\s*(.*)$/;
+const ID = /^(AC-\d+):\s*(.*)$/;
 const criterion = (id, as = id[1]) => ({
 	id: as,
-	text: id[3],
-	...id[2] === void 0 ? {} : { noHandsOn: true }
+	text: id[2]
 });
 /** The list items under the first heading `title` matches (at `level` when given), up to the next heading; wrapped lines joined, fenced lines ignored. */
 const listUnder = (text, title, level) => {
@@ -67,11 +66,6 @@ const criteriaOf = (text) => listUnder(text, /^acceptance criteria$/i, 2)?.map((
 });
 /** The ID'd criteria of `text`. */
 const criterionIds = (text) => (criteriaOf(text) ?? []).map((c) => c.id).filter((id) => id !== "");
-/** The ID'd criteria of `text` a person can try by hand: none tagged `(no hands-on)`. */
-const handsOnIds = (text) => {
-	const tagged = (criteriaOf(text) ?? []).filter((c) => c.noHandsOn).map((c) => c.id);
-	return criterionIds(text).filter((id) => !tagged.includes(id));
-};
 /** Items numbered `AC-1`…, unless every one already carries its own distinct ID. */
 const numbered = (items) => {
 	const ids = items.map((item) => ID.exec(item));
@@ -314,147 +308,6 @@ const green = () => healthy(() => agentWithSkills("fix.suite.fixing", implementF
 	guardRests: false
 });
 //#endregion
-//#region src/workflows/feature/prototype.ts
-/** Only a `no` at this or above skips a criterion: no verdict, or an unsure one, sends it to the hands-on test. */
-const UNOBSERVABLE_MIN_P = .5;
-/** The `prototypeRounds` setting. Anything but a non-negative integer fails rather than guess a cap. */
-const prototypeRounds = () => {
-	const value = vars.prototypeRounds ?? defaults.prototypeRounds;
-	if (!/^(0|[1-9]\d*)$/.test(value)) refuse(`gtd: prototypeRounds must be a non-negative integer, got ${JSON.stringify(value)}`);
-	return Number(value);
-};
-const CHUNK = /^(AC-\d+|Problem\b.*?)\s*:\s*(pass|fail|blocked)$/i;
-const UNGUIDED = /^no testing instructions$/i;
-/** The `## ` chunks of a prototype report; a heading in neither shape is prose, not an item. */
-const reportOf = (text) => {
-	let unguided = false;
-	const items = [];
-	const malformed = [];
-	for (const { line, fenced } of markFenced(text)) {
-		const heading = fenced ? null : HEADING.exec(line);
-		if (heading?.[1] !== "##") continue;
-		if (UNGUIDED.test(heading[2])) unguided = true;
-		const chunk = CHUNK.exec(heading[2]);
-		if (chunk === null && /^(ac-\d|problem)/i.test(heading[2])) malformed.push(heading[2]);
-		if (chunk !== null) items.push({
-			subject: /^ac-/i.test(chunk[1]) ? chunk[1].toUpperCase() : chunk[1],
-			verdict: chunk[2].toLowerCase()
-		});
-	}
-	return {
-		unguided,
-		items,
-		malformed
-	};
-};
-/**
-* The report the testing turn left, refused unless it is the only change and
-* names each of `ids` once, with its open items: any other criterion is not
-* this test's to fix.
-*/
-const requireReport = (ids, retest) => {
-	const others = changes().map((c) => c.path).filter((path) => path !== PROTOTYPE);
-	if (others.length > 0) refuse(`gtd land: prototype-report: test in a disposable place and change nothing but ${PROTOTYPE} — revert these:\n${others.map((path) => `  - ${path}`).join("\n")}`);
-	const text = read(PROTOTYPE);
-	if (text === void 0) return refuse(`gtd land: prototype-report: write ${PROTOTYPE}`);
-	const report = reportOf(text);
-	if (report.malformed.length > 0) refuse(`gtd land: prototype-report: head each chunk \`## <ID>: pass|fail|blocked\` or \`## Problem <title>: pass|fail|blocked\` — these miss it:\n${report.malformed.map((h) => `  - ${h}`).join("\n")}`);
-	if (report.unguided && report.items.length === 0 && !retest) return {
-		unguided: true,
-		open: []
-	};
-	const elsewhere = criterionIds(read(".gtd/REQUIREMENTS.md") ?? "").filter((id) => !ids.includes(id));
-	const count = (id) => report.items.filter((i) => i.subject === id).length;
-	const wrong = ids.filter((id) => count(id) !== 1);
-	if (wrong.length > 0) refuse(`gtd land: prototype-report: ${PROTOTYPE} needs exactly one chunk headed \`## <ID>: pass|fail|blocked\` for ${wrong.join(", ")}`);
-	return {
-		unguided: false,
-		open: report.items.filter((i) => i.verdict !== "pass" && !elsewhere.includes(i.subject))
-	};
-};
-/**
-* The criteria a person can observe by using the change, by the judge: those
-* tagged `(no hands-on)` are never asked about.
-*/
-const observable = async () => {
-	const requirements = read(".gtd/REQUIREMENTS.md") ?? "";
-	const own = handsOnIds(requirements);
-	const criteria = (criteriaOf(requirements) ?? []).filter((c) => own.includes(c.id));
-	if (criteria.length === 0) return [];
-	const { answers } = await judge("observable", {
-		questions: criteria.map(observableQuestion),
-		evidence: { requirements },
-		message: observableMessage(),
-		label: "Judging which criteria to test by hand"
-	});
-	return own.filter((id) => !answered(answers[id], "no", UNOBSERVABLE_MIN_P));
-};
-const frozen = () => requireCriteriaFrozen(REQUIREMENTS);
-const testing = async (ids, retest) => {
-	await agentWithSkills("testing", prototypeTestingPrompt(criterionIds(read(".gtd/REQUIREMENTS.md") ?? "").filter((id) => !ids.includes(id)), retest), {
-		label: retest ? "Re-testing the change by hand" : "Testing the change by hand",
-		file: PROTOTYPE,
-		model: coder(),
-		system: testerSystem(),
-		allowEmpty: true
-	});
-	return requireReport(ids, retest);
-};
-const fixing = async () => {
-	await scope("fix", () => agentWithSkills("fixing", prototypeFixingPrompt(), {
-		label: "Fixing what the hands-on test found",
-		file: PROTOTYPE,
-		model: coder(),
-		system: builderSystem(),
-		allowEmpty: true
-	}));
-	if (changes().some((c) => c.path === ".gtd/PROTOTYPE.md")) refuse(`gtd land: prototype-fix: leave ${PROTOTYPE} as it is — the next round re-tests from it`);
-	frozen();
-};
-/** A person's rest; resolves `true` when they changed something to test again, `false` on a clean overrule. */
-const askPerson = async (name, message, label) => {
-	await human(name, {
-		message,
-		label,
-		file: PROTOTYPE,
-		acceptClean: true
-	});
-	if (!changes().some((c) => c.path !== ".gtd/PROTOTYPE.md")) return false;
-	frozen();
-	return true;
-};
-/**
-* Use the change by hand: a testing turn reports on every criterion a person
-* can observe, a fix turn takes each failure, and the change is tested again —
-* until the report is clean, or `prototypeRounds` fixes are spent and a person
-* decides. A change with no such criterion is not tested by hand.
-*/
-const prototypeTest = async () => {
-	const cap = prototypeRounds();
-	if (cap === 0) return;
-	await scope("prototype", async () => {
-		const ids = await observable();
-		if (ids.length === 0) return;
-		let fixes = 0;
-		let retest = false;
-		for (;;) {
-			const { unguided, open } = await testing(ids, retest);
-			retest = !unguided;
-			if (unguided) {
-				if (!await askPerson("unguided", prototypeUnguidedMessage(), "No way to test by hand")) return;
-			} else if (open.length === 0) return;
-			else if (fixes < cap && open.some((i) => i.verdict === "fail")) {
-				fixes++;
-				await fixing();
-			} else {
-				if (!await askPerson("open", prototypeOpenMessage(open, fixes), "Hands-on test still failing")) return;
-				fixes = 0;
-			}
-			await green();
-		}
-	});
-};
-//#endregion
 //#region src/workflows/feature/refactor.ts
 const REFACTOR_PACKAGE = REFACTOR;
 const isCode = (path) => path !== ".gtd" && !path.startsWith(".gtd/");
@@ -825,13 +678,8 @@ const implementing = (options) => scope("implement", async () => {
 	if (options.naive === void 0 || !await applied(options.naive)) await build(options);
 	else requireCriteriaFrozen(REQUIREMENTS);
 	await green();
-	await prototypeTest();
 	const ids = criterionIds(read(".gtd/REQUIREMENTS.md") ?? "");
-	await run("closing", removeScript([
-		REQUIREMENTS,
-		REFACTOR_NOTE,
-		PROTOTYPE
-	]), { label: "Closing out the implementation" });
+	await run("closing", removeScript([REQUIREMENTS, REFACTOR_NOTE]), { label: "Closing out the implementation" });
 	return ids;
 });
 /** Resolves `true` when the human steered (edited), `false` on a clean overrule. */
@@ -899,6 +747,39 @@ const ruled = async (tip, again) => {
 		tip
 	} : next;
 };
+/** Back to `before`: every code path, and the notes file. `.gtd/` edits (the requirements) stay. */
+const untryScript = (before) => {
+	const code = changesSince(before).filter((c) => isCode$1(c.path));
+	return restoreScript(head(), {
+		restore: code.filter((c) => c.status !== "added").map((c) => c.path),
+		remove: [...code.filter((c) => c.status === "added").map((c) => c.path), NAIVE_TEST]
+	}, before);
+};
+/**
+* A person tries the green pass `tip` in the working tree. Resolves
+* `undefined` on a clean landing (signed off), else what they sent back;
+* either way the pass, their code edits and the notes file leave the tree.
+*/
+const tried = async (tip) => {
+	const before = head();
+	await run("applying", applyScript(tip.hash, FEEDBACK, naiveApplyFailure(tip.hash), [".gtd"]), { label: "Applying the naive pass to try it" });
+	await human("try", {
+		message: naiveTryMessage(flagModeOn()),
+		label: "Try the naive pass",
+		file: NAIVE_TEST,
+		acceptClean: true
+	});
+	const landed = changes();
+	const edits = landed.some((c) => isCode$1(c.path)) ? head() : void 0;
+	const notes = read(".gtd/NAIVE-TEST.md")?.trim() || void 0;
+	if (landed.some((c) => c.path === ".gtd/REQUIREMENTS.md")) requireCriteria(REQUIREMENTS);
+	await run("restoring", untryScript(before), { label: "Taking the naive pass out again" });
+	return landed.length === 0 ? void 0 : {
+		tested: tip.hash,
+		notes,
+		edits
+	};
+};
 const decide = () => scope("seam", async () => {
 	const vetting = {
 		again: budget(),
@@ -908,7 +789,16 @@ const decide = () => scope("seam", async () => {
 	for (;;) {
 		await naivePass(retry);
 		const tip = kept("naive");
-		const outcome = await vetted(tip, vetting) ?? (flagModeOn() ? await ruled(tip, vetting.again) : {
+		const verdict = await vetted(tip, vetting);
+		if (verdict === void 0 && naiveTestOn()) {
+			const sentBack = await tried(tip);
+			if (sentBack !== void 0) {
+				vetting.again = budget();
+				retry = sentBack;
+				continue;
+			}
+		}
+		const outcome = verdict ?? (flagModeOn() ? await ruled(tip, vetting.again) : {
 			reference: tip.hash,
 			tip
 		});
@@ -1070,7 +960,7 @@ const ordinaryStart = async () => {
 	});
 	refusePendingHandOff();
 	flagModeOn();
-	prototypeRounds();
+	naiveTestOn();
 	const stated = statedCriteria(changes(), head());
 	await unwind();
 	if (changes(".gtd/FEEDBACK.md").some((c) => c.status !== "deleted")) await human("unwind-failed", {
@@ -1086,4 +976,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, criterionIds, feature_default as default, defaults, design, envDefaults, feature, fixNits, handsOnIds, hasImpact, holdsCallSites, implement, implementing, isTestFile, judgeSeam, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireCriteria, requireCriteriaFrozen, requireImpact, requireImpactOnly, requireNoNewFlags, requireNoTestFiles, requireStableIds, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, statedCriteria, steering, summary, triage, unstableIds, unwind };
+export { COMMENT, REFACTOR_PACKAGE, acceptanceFault, access, afterTail, answerProductQuestions, answerReviewQuestions, buildFeature, buildTail, collecting, criteriaOf, criterionIds, feature_default as default, defaults, design, envDefaults, feature, fixNits, hasImpact, holdsCallSites, implement, implementing, isTestFile, judgeSeam, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireCriteria, requireCriteriaFrozen, requireImpact, requireImpactOnly, requireNoNewFlags, requireNoTestFiles, requireStableIds, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, statedCriteria, steering, summary, triage, unstableIds, unwind };

package/dist/workflows/fix.mjs

@@ -1,7 +1,7 @@
 import { read, refuse, removeScript, run, scope, start } from "../flows.mjs";
 import { b as reviewNotes, x as reviewRisks } from "../chunks/steering-CCNvngSH.mjs";
-import { Dt as defaults, G as fixReviewNotesPrompt, Ot as envDefaults, W as finisherSystem, c as baseline, i as skills, j as agentWithSkills, n as summary, r as access, s as shipped, t as steering, v as REVIEW, x as coder } from "../chunks/reserved-B8EC-WE8.mjs";
-import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-BSLah2mA.mjs";
+import { Ct as envDefaults, G as finisherSystem, K as fixReviewNotesPrompt, M as agentWithSkills, S as coder, St as defaults, c as shipped, i as skills, l as baseline, n as summary, r as access, t as steering, y as REVIEW } from "../chunks/reserved-X2RkNHin.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-S04KEewi.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,7 +1,7 @@
 import { read, refuse, removeScript, run, start } from "../flows.mjs";
-import { Dt as defaults, Ot as envDefaults, W as finisherSystem, _ as REQUIREMENTS, gt as reviewGateBlockedMessage, ht as reviewFeedbackFixPrompt, i as skills, j as agentWithSkills, l as gate, n as summary, r as access, s as shipped, t as steering, x as coder } from "../chunks/reserved-B8EC-WE8.mjs";
-import { a as refusePendingHandOff } from "../chunks/tail-BSLah2mA.mjs";
-import { r as reUnwind, t as buildTail } from "../chunks/review-HdrX0FJ7.mjs";
+import { Ct as envDefaults, G as finisherSystem, M as agentWithSkills, S as coder, St as defaults, c as shipped, dt as reviewFeedbackFixPrompt, ft as reviewGateBlockedMessage, i as skills, n as summary, r as access, t as steering, u as gate, v as REQUIREMENTS } from "../chunks/reserved-X2RkNHin.mjs";
+import { a as refusePendingHandOff } from "../chunks/tail-S04KEewi.mjs";
+import { r as reUnwind, t as buildTail } from "../chunks/review-v7sh5GF4.mjs";
 //#region src/workflows/review/review.ts
 const fixFeedback = async () => {
 	await agentWithSkills("feedback.fixing", reviewFeedbackFixPrompt(), {

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 { Dt as defaults, Ot as envDefaults, Ut as requireFlag, Vt as flipProblems, f as FEEDBACK, i as skills, l as gate, n as summary, o as flagShipped, r as access, t as steering, x as coder, zt as flagMentions } from "../chunks/reserved-B8EC-WE8.mjs";
+import { Ct as envDefaults, It as flipProblems, Pt as flagMentions, Rt as requireFlag, S as coder, St as defaults, i as skills, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate } from "../chunks/reserved-X2RkNHin.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.";