@pmelab/gtd 35.0.0 → 36.0.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gtd",
-  "version": "35.0.0",
+  "version": "36.0.0",
   "description": "Drive the gtd loop inside Claude Code: agent turns run as subagents, gtd decides every beat",
   "author": {
     "name": "Philipp Melab"

package/README.md

@@ -430,18 +430,19 @@ you open the `review` door.
 3. **You wait.** The agent first implements the requirements the quickest way
    that works — the naive pass — and a judge reads where it changed code (see
    [the naive pass](#the-naive-pass) below; with [flag mode](#the-naive-pass)
-   off, neither runs). Then the change is built test-first, checked against the
-   full suite (`testCommand`) and fixed until it passes — so keep that suite
-   fast; gtd has no lighter one. Scenario wording is not frozen: a review's
-   `## Scenarios` chunk marks any assertion an existing scenario lost as
-   `Weakened:` — **risk: `feature` has no review, so a build turn that weakens a
-   scenario reaches `idle` unflagged unless you open the `review` door.** After
-   the build the quality lap runs, and the process ends: the feature workflow
-   has no human review of the finished change. Two points along the process (one
-   with flag mode off) are judged rather than always asking you outright — each
-   stops and hands you a verdict to make (`gtd judge answer`, or land with a
-   clean tree to accept the conservative default, which never skips work;
-   `gtd judge run --provider fixed --answers <path>` — or the
+   off, no judge runs). A pass the judge lets through is the implementation; one
+   whose seam is refactored first is built again test-first. Then it is checked
+   against the full suite (`testCommand`) and fixed until it passes — so keep
+   that suite fast; gtd has no lighter one. Scenario wording is not frozen: a
+   review's `## Scenarios` chunk marks any assertion an existing scenario lost
+   as `Weakened:` — **risk: `feature` has no review, so a build turn that
+   weakens a scenario reaches `idle` unflagged unless you open the `review`
+   door.** After the build the quality lap runs, and the process ends: the
+   feature workflow has no human review of the finished change. Two points along
+   the process (one with flag mode off) are judged rather than always asking you
+   outright — each stops and hands you a verdict to make (`gtd judge answer`, or
+   land with a clean tree to accept the conservative default, which never skips
+   work; `gtd judge run --provider fixed --answers <path>` — or the
    `GTD_JUDGE_ANSWERS` env var, inline JSON — answers one from a file, piped
    between `gtd judge --json` and `gtd judge answer`;
    `gtd judge run --provider jev` asks TypeSafe's Jev instead, with the key in
@@ -605,16 +606,18 @@ its ID (`[AC-3] …`) and reaches only code that existed before the pass. The pa
 is sent back while a criterion's ID is missing from its tests, a test imports a
 file it added, or the suite is red on it. A judge checks whether it changed
 anything outside the expected set (tests, steering files; see `seamAllow`).
-Incidental changes land; a needed seam change is refactored first, in its own
-slice with its own quality lap (`refactorQualityReviews`) and review, before the
-feature is implemented; a wrong approach is retried twice, then rests for you to
-steer or overrule it. `gtd slices` lists the `refactor` and `feature` slices. A
-refactor that already carried the whole feature leaves the implementation
-nothing to do: its empty turn passes, and the feature's quality lap covers the
-whole change. Once the implementation is green, a judge checks every criterion
-ID has a covering test: an uncovered one goes back to the agent (twice, then to
-you) instead of ending the feature, and each covered ID is recorded as a
-`Gtd-Mark: covers=<id>` trailer. See
+Incidental changes land: the pass itself is the implementation, with no rebuild,
+straight through the health loop and the quality lap. A needed seam change is
+refactored first, in its own slice with its own quality lap
+(`refactorQualityReviews`) and review, before the feature is implemented afresh;
+a wrong approach is retried twice, then rests for you to steer or overrule it.
+`gtd slices` lists the `refactor` and `feature` slices. A refactor that already
+carried the whole feature leaves the implementation nothing to do: its empty
+turn passes, and the feature's quality lap covers the whole change. Once the
+implementation is green, a judge checks every criterion ID has a covering test:
+an uncovered one goes back to the agent (twice, then to you) instead of ending
+the feature, and each covered ID is recorded as a `Gtd-Mark: covers=<id>`
+trailer. See
 [Acceptance-criteria coverage](docs/configuration.md#acceptance-criteria-coverage).
 Feedback at the refactor review re-runs the refactor, never design; a
 refactor-review change the refactor cannot build is refused, and the only way
@@ -623,12 +626,13 @@ out is `gtd abandon`. A process from 27.5.0 or later whose judge ruled
 that slice. Details in
 [the naive-pass path](docs/configuration.md#the-naive-pass-path).
 
-**Flag mode (`flagMode`, on by default).** On, the implementation is asked for a
-new release flag (none at a `low` risk tier) and the naive pass and its judge
-run as above. A project that is not publicly released turns it off explicitly —
+**Flag mode (`flagMode`, on by default).** On, the naive pass's judge runs as
+above and a rebuilt implementation is asked for a new release flag (none at a
+`low` risk tier); a pass the judge lets land is not asked for one. A project
+that is not publicly released turns it off explicitly —
 `feature({ flagMode: false })` in `gtd.config.ts`, it is never detected: then no
-flag is asked for, no seam judge or refactor runs, and the implementation is the
-naive version, straight through the health loop and the quality lap. See
+flag is asked for, no seam judge or refactor runs, and the naive pass lands as
+the implementation, straight through the health loop and the quality lap. See
 [`flagMode`](docs/configuration.md#the-bundled-workflows-settings).
 
 **Risk tier (flag `GTD_FLAG_RISK_TIER=1`, off by default).** Triage proposes a

package/dist/chunks/{reserved-C8Fm3s72.mjs → reserved-BAv71I4i.mjs}

@@ -391,6 +391,7 @@ const agentWithSkills = (name, prompt, options = {}) => {
 	return agent(name, withSkills(skillsFor(name).join(", "), body), options);
 };
 const unwindFailure = (commit) => `gtd could not unwind ${commit} out of your working tree.`;
+const naiveApplyFailure = (commit) => `gtd could not apply the naive pass ${commit} to the working tree; it is built fresh instead.`;
 const idleMessage = () => `No active gtd process.
 
 To start one, make ANY change — a hand-edit to real code, a scratch
@@ -1239,8 +1240,8 @@ const naivePassPrompt = (retry) => `${stateFileRules}
 - Read \`.gtd/REQUIREMENTS.md\`: the settled requirements for this change
 ${criteriaBinding(false)}
 - Implement them the quickest way that works — the naive version. Do not
-  restructure, abstract or refactor around the change; a later step judges
-  the shape of your diff and a reviewer makes it fit
+  restructure, abstract or refactor around the change; it may land exactly as
+  you leave it, and a reviewer makes it fit
 - Work breadth-first: rough out every part of the change before finishing any
   one, so a run cut off midway still shows the whole shape
 - Write behaviour-level acceptance tests, at least one per criterion, each
@@ -1290,12 +1291,13 @@ An edit together with an approval counts as steer. Only
 \`.gtd/REQUIREMENTS.md\` is meant to change here: any other edit lands on the
 branch unjudged.
 `;
-const seamSteerMessage = (retry) => isFault(retry) ? `The naive pass failed three times and the retries are spent. The last
+/** `judged`: whether an overruled pass still meets the seam judge (`flagMode` on). */
+const seamSteerMessage = (retry, judged = true) => isFault(retry) ? `The naive pass failed three times and the retries are spent. The last
 attempt's tests (\`git show ${retry.hash}\`) fall short:
 ${retry.fault}
 
 ${steerChoices(`land a clean tree to go on with the last attempt as it is:
-  \`seam.check\` runs its suite and the seam judge rules on its shape. Use it
+  \`seam.check\` runs its suite and ${judged ? "the seam judge rules on its shape" : "it lands as the implementation"}. Use it
   when the rule cannot fit this change (tests the globs do not see, or no
   entry point that existed before). Risk: a criterion may have no test that
   survives a later refactor — the choice is recorded in history.`)}` : isRed(retry) ? `The naive pass failed three times and the retries are spent. The last
@@ -1306,7 +1308,7 @@ Two ways forward (then run \`gtd land\`):
 - **Steer** — edit \`.gtd/REQUIREMENTS.md\` to redirect the change; the naive
   pass runs again with a fresh retry budget
 - **Overrule** — land a clean tree to go on with the last attempt as it is:
-  the seam judge rules on its shape, and the implementation's health loop
+  ${judged ? "the seam judge rules on its shape" : "it lands as the implementation"}, and the implementation's health loop
   must turn the suite green. Risk: the criteria's tests never passed on the
   naive pass — the choice is recorded in history.
 
@@ -1322,9 +1324,8 @@ Two ways forward (then run \`gtd land\`):
 - **Steer** — edit \`.gtd/REQUIREMENTS.md\` to redirect the change; the naive
   pass runs again with a fresh retry budget (the risk tier stays as the
   design gate settled it; a tier edit here is not applied)
-- **Overrule** — land a clean tree to accept the last attempt's approach:
-  the implementation is built against it as reference, with no seam gate
-  and no refactor. Risk: this ships the seam the judge objected to,
+- **Overrule** — land a clean tree to accept the last attempt as it is: it
+  lands as the implementation, with no seam gate and no refactor. Risk: this ships the seam the judge objected to,
   unaddressed — the choice is recorded in history.
 
 An edit together with an approval counts as steer. Only
@@ -1672,4 +1673,4 @@ const steering = {
 	[REVIEW]: "review"
 };
 //#endregion
-export { refactorBuildingPrompt as $, buildReviewCollectingPrompt as A, deferNotesScript as B, planner as C, agentWithSkills as D, reviewing as E, clearCriteriaQuestion as F, fixReviewNotesPrompt as G, designSystem as H, coverageMessage as I, implementBuildingPrompt as J, handOffAwaitReviewMessage as K, coverageQuestion as L, buildReviewTriageMessage as M, builderSystem as N, buildReviewAnswerQuestionsPrompt as O, clearCriteriaMessage as P, qualityUnresolvedMessage as Q, coveringPrompt as R, fixRisks as S, reviewQuality as T, designTriagePrompt as U, designGateAnswerMessage as V, finisherSystem as W, naivePassPrompt as X, implementFixPrompt as Y, normaliseCriteriaScript as Z, REVIEW as _, flagMentions as _t, flagModeOn as a, reviewGateBlockedMessage as at, fixCheck as b, registryEntry as bt, baseline as c, seamByHandMessage as ct, guarded as d, uncoveredMessage as dt, refactorDroppedRefusal as et, healthy as f, unwindFailedMessage as ft, REQUIREMENTS as g, testFileGlobs as gt, REFACTOR as h, envDefaults as ht, skills as i, reviewEditsCapture as it, buildReviewFixNitsPrompt as j, buildReviewAwaitAfterDeferMessage as k, escalation as l, seamSteerMessage as lt, QUALITY as m, defaults as mt, summary as n, refactorRules as nt, flagShipped as o, reviewNotesCapture as ot, FEEDBACK as p, unwindFailure as pt, idleMessage as q, access as r, reviewEditNotesCapture as rt, shipped as s, reviewerSystem as st, steering as t, refactorFixPrompt as tt, gate as u, startGateBlockedMessage as ut, awaitReview as v, flagReferences as vt, reviewMissing as w, fixQuality as x, requireFlag as xt, coder as y, flipProblems as yt, criterionLine as z };
+export { qualityUnresolvedMessage as $, buildReviewCollectingPrompt as A, deferNotesScript as B, planner as C, agentWithSkills as D, reviewing as E, clearCriteriaQuestion as F, fixReviewNotesPrompt as G, designSystem as H, coverageMessage as I, implementBuildingPrompt as J, handOffAwaitReviewMessage as K, coverageQuestion as L, buildReviewTriageMessage as M, builderSystem as N, buildReviewAnswerQuestionsPrompt as O, clearCriteriaMessage as P, normaliseCriteriaScript as Q, coveringPrompt as R, fixRisks as S, requireFlag as St, reviewQuality as T, designTriagePrompt as U, designGateAnswerMessage as V, finisherSystem as W, naiveApplyFailure as X, implementFixPrompt as Y, naivePassPrompt as Z, REVIEW as _, testFileGlobs as _t, flagModeOn as a, reviewEditsCapture as at, fixCheck as b, flipProblems as bt, baseline as c, reviewerSystem as ct, guarded as d, startGateBlockedMessage as dt, refactorBuildingPrompt as et, healthy as f, uncoveredMessage as ft, REQUIREMENTS as g, envDefaults as gt, REFACTOR as h, defaults as ht, skills as i, reviewEditNotesCapture as it, buildReviewFixNitsPrompt as j, buildReviewAwaitAfterDeferMessage as k, escalation as l, seamByHandMessage as lt, QUALITY as m, unwindFailure as mt, summary as n, refactorFixPrompt as nt, flagShipped as o, reviewGateBlockedMessage as ot, FEEDBACK as p, unwindFailedMessage as pt, idleMessage as q, access as r, refactorRules as rt, shipped as s, reviewNotesCapture as st, steering as t, refactorDroppedRefusal as tt, gate as u, seamSteerMessage as ut, awaitReview as v, flagMentions as vt, reviewMissing as w, fixQuality as x, registryEntry as xt, coder as y, flagReferences as yt, criterionLine as z };

package/dist/chunks/{tail-oaYewBN_.mjs → tail-kar1zhOb.mjs}

@@ -1,6 +1,6 @@
 import { read, refuse, removeScript, run, scope, showScript, vars } from "../flows.mjs";
 import { fixFindings, lensEntriesOf, lensOf, qualityLap as qualityLap$1, reviewToHandOff } from "../workflow-kit.mjs";
-import { E as reviewing, K as handOffAwaitReviewMessage, S as fixRisks, T as reviewQuality, _ as REVIEW, b as fixCheck, d as guarded, f as healthy, l as escalation, m as QUALITY, v as awaitReview, w as reviewMissing, x as fixQuality } from "./reserved-C8Fm3s72.mjs";
+import { E as reviewing, K as handOffAwaitReviewMessage, S as fixRisks, T as reviewQuality, _ as REVIEW, b as fixCheck, d as guarded, f as healthy, l as escalation, m as QUALITY, v as awaitReview, w as reviewMissing, x as fixQuality } from "./reserved-BAv71I4i.mjs";
 //#region src/workflows/shared/tail.ts
 /** The reviewer's own `.gtd/REVIEW.md`, kept beside the human's notes so `fix` can tell them apart. */
 const REVIEW_ORIG = ".gtd/REVIEW.orig.md";

package/dist/flows.mjs

@@ -226,25 +226,21 @@ const checkScript = (command, options) => {
 		""
 	].join("\n");
 };
-/**
-* Reverse-apply `commit`'s changes to the working tree. A failure — the
-* patch no longer applies — writes `failure` and git's error to `report`,
-* since a failed revert and one with nothing to undo both leave the tree clean.
-*/
-const revertScript = (commit, report, failure) => {
+const patchScript = (commit, report, failure, reverse, exclude = []) => {
+	const paths = exclude.length === 0 ? "" : ` . ${exclude.map((p) => quote(`:(exclude,literal)${p}`)).join(" ")}`;
 	const range = `${quote(`${commit}^`)} ${quote(commit)}`;
 	const error = quote(`${report}.output`);
 	return [
 		"#!/usr/bin/env sh",
 		"set +e",
-		`if ! git diff --quiet ${range} --; then`,
+		`if ! git diff --quiet ${range} --${paths}; then`,
 		`  mkdir -p "$(dirname ${quote(report)})"`,
-		`  git diff --binary ${range} -- | git apply -R 2> ${error}`,
+		`  git diff --binary --no-color --no-ext-diff --no-textconv --src-prefix=a/ --dst-prefix=b/ ${range} --${paths} | git apply --whitespace=nowarn${reverse ? " -R" : ""} 2> ${error}`,
 		"  code=$?",
 		"  if [ \"$code\" -ne 0 ]; then",
 		"    {",
 		`      printf '%s\\n\\n' ${quote(failure)}`,
-		`      if [ -s ${error} ]; then cat ${error}; else printf 'Reverting it exited %s and produced no output.\\n' "$code"; fi`,
+		`      if [ -s ${error} ]; then cat ${error}; else printf '${reverse ? "Reverting" : "Applying"} it exited %s and produced no output.\\n' "$code"; fi`,
 		`    } > ${quote(report)}`,
 		"  fi",
 		`  rm -f ${error}`,
@@ -253,6 +249,14 @@ const revertScript = (commit, report, failure) => {
 	].join("\n");
 };
 /**
+* Reverse-apply `commit`'s changes to the working tree. A failure — the
+* patch no longer applies — writes `failure` and git's error to `report`,
+* since a failed revert and one with nothing to undo both leave the tree clean.
+*/
+const revertScript = (commit, report, failure) => patchScript(commit, report, failure, true);
+/** Apply `commit`'s changes outside `exclude` to the working tree; a failure is reported as `revertScript`'s is. */
+const applyScript = (commit, report, failure, exclude = []) => patchScript(commit, report, failure, false, exclude);
+/**
 * Undo the edits one commit made to `paths`: each goes back to its content
 * before `commit` — or away, when `commit` added it — but only while it is
 * still exactly as `commit` left it. A path changed since is left alone.
@@ -620,6 +624,7 @@ var flows_exports = /* @__PURE__ */ __exportAll({
 	accessFor: () => accessFor,
 	agent: () => agent,
 	answered: () => answered,
+	applyScript: () => applyScript,
 	changes: () => changes,
 	changesSince: () => changesSince,
 	check: () => check,
@@ -673,4 +678,4 @@ var flows_exports = /* @__PURE__ */ __exportAll({
 	wrote: () => wrote
 });
 //#endregion
-export { FLOWS_PROTOCOL, FlowsProtocolError, accessFor, agent, answered, changes, changesSince, check, checkScript, codeChanges, codeThreads, configProblems, configure, defineConfig, defineWorkflow, displayPath, env, glob, hasThreadFor, head, human, installContext, isFactoryWorkflow, judge, judgeDiffShape, kept, mark, matches, moveScript, numeric, openQuestions, protocolMismatch, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireRevert, requireThreadsClosed, restart, restoreScript, revertScript, run, scope, seamGate, sectionBodies, sections, showScript, skillsFor, slice, start, flows_exports as t, threads, vars, wrote };
+export { FLOWS_PROTOCOL, FlowsProtocolError, accessFor, agent, answered, applyScript, changes, changesSince, check, checkScript, codeChanges, codeThreads, configProblems, configure, defineConfig, defineWorkflow, displayPath, env, glob, hasThreadFor, head, human, installContext, isFactoryWorkflow, judge, judgeDiffShape, kept, mark, matches, moveScript, numeric, openQuestions, protocolMismatch, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireRevert, requireThreadsClosed, restart, restoreScript, revertScript, run, scope, seamGate, sectionBodies, sections, showScript, skillsFor, slice, start, flows_exports as t, threads, vars, wrote };

package/dist/gtd.bundle.mjs

@@ -21865,25 +21865,21 @@ const checkScript = (command, options) => {
 		""
 	].join("\n");
 };
-/**
-* Reverse-apply `commit`'s changes to the working tree. A failure — the
-* patch no longer applies — writes `failure` and git's error to `report`,
-* since a failed revert and one with nothing to undo both leave the tree clean.
-*/
-const revertScript = (commit, report, failure) => {
+const patchScript = (commit, report, failure, reverse, exclude = []) => {
+	const paths = exclude.length === 0 ? "" : ` . ${exclude.map((p) => quote(`:(exclude,literal)${p}`)).join(" ")}`;
 	const range = `${quote(`${commit}^`)} ${quote(commit)}`;
 	const error = quote(`${report}.output`);
 	return [
 		"#!/usr/bin/env sh",
 		"set +e",
-		`if ! git diff --quiet ${range} --; then`,
+		`if ! git diff --quiet ${range} --${paths}; then`,
 		`  mkdir -p "$(dirname ${quote(report)})"`,
-		`  git diff --binary ${range} -- | git apply -R 2> ${error}`,
+		`  git diff --binary --no-color --no-ext-diff --no-textconv --src-prefix=a/ --dst-prefix=b/ ${range} --${paths} | git apply --whitespace=nowarn${reverse ? " -R" : ""} 2> ${error}`,
 		"  code=$?",
 		"  if [ \"$code\" -ne 0 ]; then",
 		"    {",
 		`      printf '%s\\n\\n' ${quote(failure)}`,
-		`      if [ -s ${error} ]; then cat ${error}; else printf 'Reverting it exited %s and produced no output.\\n' "$code"; fi`,
+		`      if [ -s ${error} ]; then cat ${error}; else printf '${reverse ? "Reverting" : "Applying"} it exited %s and produced no output.\\n' "$code"; fi`,
 		`    } > ${quote(report)}`,
 		"  fi",
 		`  rm -f ${error}`,
@@ -21892,6 +21888,14 @@ const revertScript = (commit, report, failure) => {
 	].join("\n");
 };
 /**
+* Reverse-apply `commit`'s changes to the working tree. A failure — the
+* patch no longer applies — writes `failure` and git's error to `report`,
+* since a failed revert and one with nothing to undo both leave the tree clean.
+*/
+const revertScript = (commit, report, failure) => patchScript(commit, report, failure, true);
+/** Apply `commit`'s changes outside `exclude` to the working tree; a failure is reported as `revertScript`'s is. */
+const applyScript = (commit, report, failure, exclude = []) => patchScript(commit, report, failure, false, exclude);
+/**
 * Undo the edits one commit made to `paths`: each goes back to its content
 * before `commit` — or away, when `commit` added it — but only while it is
 * still exactly as `commit` left it. A path changed since is left alone.
@@ -22259,6 +22263,7 @@ var flows_exports = /* @__PURE__ */ __exportAll({
 	accessFor: () => accessFor,
 	agent: () => agent,
 	answered: () => answered,
+	applyScript: () => applyScript,
 	changes: () => changes,
 	changesSince: () => changesSince,
 	check: () => check,

package/dist/testkit.mjs

@@ -1,4 +1,4 @@
-import { checkScript, configProblems, configure, installContext, isFactoryWorkflow, moveScript, protocolMismatch, removeScript, restoreScript, revertScript, showScript, t as flows_exports } from "./flows.mjs";
+import { applyScript, checkScript, configProblems, configure, installContext, isFactoryWorkflow, moveScript, protocolMismatch, removeScript, restoreScript, revertScript, showScript, t as flows_exports } from "./flows.mjs";
 import { O as ACCESS_REFUSAL, a as selectPath, d as renderLandPlain, g as statusOf, h as renderBeatJson, i as resolveSession, j as renderFormat, l as noopText, m as beatDocument, n as slicesDocument, o as judgeJson, p as renderBeatPlain, r as globMatches, s as landFields, t as renderSlicesJson, u as renderLandJson, v as beatKindOf, y as demandOf } from "./chunks/wire-D3Rc5r22.mjs";
 import { C as headingSections, S as headingSectionBodies, a as unansweredQuestions, b as parseThreadsWithFindings, n as openThreads, r as steeringFormatFor, s as parseCodeThreads, t as BUILT_IN_MODE_NAMES, w as formatFinding } from "./chunks/steering-DVILanVf.mjs";
 import { $ as logWarning, $i as NodeInspectSymbol, $n as map$5, $r as make$19, $t as provide$1, A as catchIf, Ai as add, An as scopeMake, Ar as flatMap$3, At as suspend$5, B as flatMap$4, Bi as getOrElse, Bn as get$3, Br as sync$1, Bt as unsafeMakeLatch, C as all$1, Ci as toArray, Cn as isInterrupted, Cr as exitFail, Ct as sandbox, D as async, Di as GenericTag, Dn as squash, Dr as exitZipRight, Dt as scopedWith$1, E as asVoid$1, Ei as unsafeHead, En as reduceWithContext, Er as exitVoid, Et as scoped$4, F as ensuring$2, Fi as fromIterable, Fn as join$3, Fr as map$3, Ft as tryMap, G as forkIn, Gi as none, Gn as TypeId$10, Gr as whenEffect, Gt as zipLeft, H as fnUntraced, Hi as isSome, Hn as modify$1, Hr as uninterruptible, Ht as when, I as exit, Ii as splitAt, In as sequential, Ir as onInterrupt, It as tryPromise, J as ignore, Ji as left, Jn as all, Jr as DeferredTypeId$1, Jt as spaced$1, K as forkScoped, Ki as some, Kn as Class, Kr as withFiberRuntime, Kt as zipRight$3, L as fail$5, Li as filter$1, Ln as bind, Lr as scopeClose, Lt as try_, M as die$2, Mi as getOption, Mn as _await$2, Mr as interruptAsFiber, Mt as tap, N as dieMessage, Ni as omit, Nn as inheritAll$1, Nr as interruptFiber, Nt as tapErrorCause, O as catchAll$1, Oi as Reference, On as ensuring$3, Or as fiberId, Ot as serviceOption, P as either, Pi as empty$5, Pn as interruptAllAs$1, Pr as interruptible$1, Pt as timeout, Q as isEffect, Qi as BaseProto, Qn as isFailure, Qr as ids, Qt as mergeAll$2, R as failCause$4, Ri as flatMap$5, Rn as bindTo, Rr as succeed$4, Rt as uninterruptible$1, S as addFinalizer$1, Si as takeRight, Sn as isDieType, Sr as exitAs, St as runtime, T as as, Ti as unsafeGet, Tn as map$6, Tr as exitSucceed, Tt as scopeWith, U as forEach$2, Ui as map$8, Un as set$1, Ur as uninterruptibleMask$1, Ut as withFiberRuntime$1, V as flatten$4, Vi as isNone, Vn as make$16, Vr as tap$1, Vt as unsafeMakeSemaphore$1, W as forkDaemon, Wi as match$4, Wn as update$1, Wr as void_$2, Wt as zip$1, X as interruptible, Xi as right, Xn as fail$4, Xr as combine, Xt as tagged, Y as interrupt$4, Yi as match$2, Yn as die, Yr as empty$6, Yt as TaggedError$1, Z as intoDeferred, Zi as pipeArguments, Zn as failCause$3, Zr as combineAll, Zt as fromEffect$5, _ as decodeSync, _i as of, _n as fail$3, _r as deferredIsDone, _t as raceWith, a as Literal, aa as constTrue, ai as size$2, an as updateContext$1, ar as zipRight$2, at as matchCause, b as acquireRelease, bi as reverse, bn as interrupt$3, br as deferredUnsafeDone, bt as runPromise, c as String$, ca as dual, ci as append$1, cn as Scope, cr as asyncInterrupt, ct as negate, d as Union, di as empty$4, dn as close, dr as deferredAwait, dt as orElse, ea as format, ei as none$1, en as provideMerge$1, er as mapBoth, et as makeSemaphore, f as between, fi as filter, fn as extend, fr as deferredComplete, ft as orElseSucceed, gi as map$7, gn as die$1, gr as deferredInterruptWith, gt as race, hi as isEmpty$2, hn as NoSuchElementException, hr as deferredInterrupt, ht as provideService, i as Defect, ia as constFalse, ii as has, in as unsafeRunPromiseExit, ir as zip$2, it as match$5, j as catchTag, ji as get$5, jn as scopeTag, jr as interrupt$2, jt as sync$2, k as catchAllCause, ki as Tag, kn as forEachConcurrentDiscard, kr as fiberRefLocally, kt as succeed$6, l as Struct, la as identity, li as appendAll, ln as addFinalizer, lr as catchAll, lt as onError, m as optional$1, mi as isChunk, mn as make$18, mr as deferredFailCause, mt as provide$2, n as Boolean$, na as equals, ni as make$17, nn as succeed$3, nr as succeed$5, nt as mapBoth$1, o as Never, oa as constUndefined, oi as decode, on as forkIn$1, or as as$1, ot as matchCauseEffect, p as decodeUnknown, pi as fromIterable$1, pn as fork, pr as deferredFail, pt as promise, q as gen, qi as isLeft, qn as spanTag, qr as zipRight$1, qt as zipWith, r as Cause, ra as hasProperty, ri as set$2, rn as unsafeFork, rr as void_$3, rt as mapError, s as Number$, sa as constVoid, si as isFinite, sn as unsafeMakeSemaphore, sr as asVoid, st as matchEffect, t as Array$, ta as toJSON, ti as get$4, tn as scoped$3, tr as match$3, tt as map$4, u as TaggedError, ua as pipe, ui as drop, un as addFinalizerExit, ur as currentContext$1, ut as orDie, v as encodeSync, vi as prepend, vn as failureOrCause, vr as deferredMake, vt as repeat, w as annotateLogs, wi as unsafeFromArray, wn as isInterruptedOnly, wr as exitFailCause, wt as scope, x as acquireUseRelease$2, xi as take$2, xn as interruptors, xr as deferredUnsafeMake, xt as runPromiseExit$1, y as _void, yi as reduce, yn as flipCauseOption, yr as deferredSucceed, yt as retry, z as fiberIdWith, zi as fromNullable, zn as sleep, zr as suspend$4, zt as uninterruptibleMask } from "./chunks/Schema-DO5ttJaI.mjs";
@@ -12774,37 +12774,57 @@ const recognizeRestore = (repo, script) => {
 	return ok();
 };
 const PATCH_FAILED = "error: patch does not apply";
-/**
-* `git diff C^ C | git apply -R`, which is all or nothing. A file still
-* exactly as `C` left it reverts; a file gone, or one `C` added and that
-* changed since, fails the whole patch. A file `C` modified and that changed
-* since may still apply through its context — that needs real git, so it
-* throws rather than guess.
-*/
-const reverseApply = (repo, commit) => {
+const outside = (path, exclude) => !exclude.some((e) => path === e || path.startsWith(`${e}/`));
+/** Why `path` blocks the patch, `undefined` when it is exactly as `from` has it. */
+const blocking = (repo, path, from, to) => {
+	const expected = repo.fileAtRef(from, path);
+	const current = repo.readFile(path) ?? null;
+	if (current === expected) return void 0;
+	if (current === null || expected === null || repo.fileAtRef(to, path) === null) return `${PATCH_FAILED}: ${path}`;
+	throw new Error(`testkit: cannot tell in memory whether the patch of ${from}..${to} applies to the hand-edited ${path} — run this @live`);
+};
+/**
+* `git diff C^ C | git apply [-R]`, which is all or nothing. A file exactly
+* as the side being undone (`from`) has it moves to the other side (`to`); a
+* file missing where `from` has one, or present where `from` has none, fails
+* the whole patch. A file both sides have that differs from `from` may still
+* apply through its context — that needs real git, so `blocking` throws
+* rather than guess.
+*/
+const patch = (repo, commit, reverse, exclude) => {
 	const parent = `${commit}^`;
-	const changed = [.../* @__PURE__ */ new Set([...repo.pathsAtRef(parent), ...repo.pathsAtRef(commit)])].filter((p) => repo.fileAtRef(parent, p) !== repo.fileAtRef(commit, p));
+	const [from, to] = reverse ? [commit, parent] : [parent, commit];
+	const changed = [.../* @__PURE__ */ new Set([...repo.pathsAtRef(parent), ...repo.pathsAtRef(commit)])].filter((p) => repo.fileAtRef(parent, p) !== repo.fileAtRef(commit, p) && outside(p, exclude));
 	for (const path of changed) {
-		const after = repo.fileAtRef(commit, path);
-		const current = repo.readFile(path) ?? null;
-		if (current === after) continue;
-		if (current === null || after === null || repo.fileAtRef(parent, path) === null) return `${PATCH_FAILED}: ${path}`;
-		throw new Error(`testkit: cannot tell in memory whether reverting ${commit} applies to the hand-edited ${path} — run this @live`);
+		const error = blocking(repo, path, from, to);
+		if (error !== void 0) return error;
 	}
 	for (const path of changed) {
-		const before = repo.fileAtRef(parent, path);
-		if (before === null) repo.deleteFile(path);
-		else repo.writeFile(path, before);
+		const content = repo.fileAtRef(to, path);
+		if (content === null) repo.deleteFile(path);
+		else repo.writeFile(path, content);
 	}
 };
-const recognizeRevert = (repo, script) => {
+const parsePatch = (script) => {
 	const lines = script.split("\n");
-	const [, commit] = words$1(lines.find((l) => l.startsWith("if ! git diff --quiet ")) ?? "");
+	const [, commit, ...pathspecs] = words$1(lines.find((l) => l.startsWith("if ! git diff --quiet ")) ?? "");
 	const [, failure] = words$1(lines.find((l) => l.includes("printf '%s\\n\\n' ")) ?? "");
 	const [report] = words$1(lines.find((l) => l.startsWith("    } > ")) ?? "");
 	if (commit === void 0 || failure === void 0 || report === void 0) return void 0;
-	if (revertScript(commit, report, failure) !== script) return void 0;
-	const error = reverseApply(repo, commit);
+	return {
+		commit,
+		failure,
+		report,
+		exclude: pathspecs.map((p) => p.replace(/^:\(exclude,literal\)/, ""))
+	};
+};
+const recognizePatch = (repo, script) => {
+	const parsed = parsePatch(script);
+	if (parsed === void 0) return void 0;
+	const { commit, failure, report, exclude } = parsed;
+	const reverse = revertScript(commit, report, failure) === script;
+	if (!reverse && applyScript(commit, report, failure, exclude) !== script) return void 0;
+	const error = patch(repo, commit, reverse, reverse ? [] : exclude);
 	if (error !== void 0) repo.writeFile(report, `${failure}\n\n${error}\n`);
 	return ok();
 };
@@ -12935,7 +12955,7 @@ const recognizeCheck = (repo, commands, script) => {
 */
 const applyFlowScript = (repo, commands, script) => {
 	if (!script.startsWith(`${SHEBANG}\n`)) return void 0;
-	return recognizeRemove(repo, script) ?? recognizeMove(repo, script) ?? recognizeShow(repo, script) ?? recognizeRevert(repo, script) ?? recognizeRestore(repo, script) ?? recognizeCheck(repo, commands, script);
+	return recognizeRemove(repo, script) ?? recognizeMove(repo, script) ?? recognizeShow(repo, script) ?? recognizePatch(repo, script) ?? recognizeRestore(repo, script) ?? recognizeCheck(repo, commands, script);
 };
 //#endregion
 //#region src/testkit/EmittedScriptRecognizer.ts

package/dist/workflows/cleanup.mjs

@@ -1,6 +1,6 @@
 import { agent, changes, glob, read, refuse, scope, start, vars } from "../flows.mjs";
-import { bt as registryEntry, ht as envDefaults, i as skills, mt as defaults, n as summary, o as flagShipped, r as access, t as steering, vt as flagReferences, xt as requireFlag, y as coder } from "../chunks/reserved-C8Fm3s72.mjs";
-import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-oaYewBN_.mjs";
+import { St as requireFlag, gt as envDefaults, ht as defaults, i as skills, n as summary, o as flagShipped, r as access, t as steering, xt as registryEntry, y as coder, yt as flagReferences } from "../chunks/reserved-BAv71I4i.mjs";
+import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-kar1zhOb.mjs";
 //#region src/workflows/cleanup/cleanup.ts
 const removingPrompt = (name, registry) => `Clean up the release flag "${name}", which is default-on: delete its entry in ${registry}, and remove every \`GTD_FLAG_${name.toUpperCase()}\` check from the shipped sources. Keep the flag-on path; delete code only the off path reached, including tests that pin the off path.`;
 const cleanupFlow = async () => {

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 { 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 qualityUnresolvedMessage, 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 normaliseCriteriaScript, R as coveringPrompt, S as fixRisks, U as designTriagePrompt, V as designGateAnswerMessage, X as naiveApplyFailure, Y as implementFixPrompt, Z as naivePassPrompt, _ as REVIEW, _t as testFileGlobs, a as flagModeOn, at as reviewEditsCapture, b as fixCheck, ct as reviewerSystem, d as guarded, dt as startGateBlockedMessage, et as refactorBuildingPrompt, f as healthy, ft as uncoveredMessage, g as REQUIREMENTS, gt as envDefaults, h as REFACTOR, ht as defaults, i as skills, it as reviewEditNotesCapture, j as buildReviewFixNitsPrompt, k as buildReviewAwaitAfterDeferMessage, lt as seamByHandMessage, m as QUALITY, mt as unwindFailure, n as summary, nt as refactorFixPrompt, p as FEEDBACK, pt as unwindFailedMessage, q as idleMessage, r as access, rt as refactorRules, s as shipped, st as reviewNotesCapture, t as steering, tt as refactorDroppedRefusal, u as gate, ut as seamSteerMessage, v as awaitReview, w as reviewMissing, y as coder, z as criterionLine } from "../chunks/reserved-BAv71I4i.mjs";
+import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-kar1zhOb.mjs";
 import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
@@ -883,7 +883,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 +902,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,7 +914,7 @@ function implement(first, tier, amend) {
 		amend
 	};
 	return scope("implement", async () => {
-		await agentWithSkills("building", implementBuildingPrompt(options.reference, options.tier, options.amend, options.afterRefactor, flagModeOn()), {
+		if (options.naive === void 0 || !await applied(options.naive)) await agentWithSkills("building", implementBuildingPrompt(options.reference, options.tier, options.amend, options.afterRefactor, flagModeOn()), {
 			label: "Implementing",
 			model: coder(),
 			system: builderSystem(),
@@ -924,7 +929,7 @@ function implement(first, tier, amend) {
 /** 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
@@ -988,7 +993,7 @@ 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 });
 		if (!("kind" in outcome)) return outcome;
 		retry = outcome.kind === "retry" ? outcome.retry : void 0;
 	}
@@ -997,7 +1002,8 @@ const seamBuild = async (base) => {
 	const { reference, shape } = await decide();
 	if (shape === void 0) return {
 		reference,
-		base
+		base,
+		land: true
 	};
 	if (shape.unreadable.length > 0) {
 		await scope("seam", () => human("by-hand", {
@@ -1028,15 +1034,16 @@ 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
 		});
 		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path)) ? firstBase : seam.base;
 		await tail(settleQuality, {

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 { D as agentWithSkills, G as fixReviewNotesPrompt, W as finisherSystem, _ as REVIEW, c as baseline, gt as envDefaults, ht as defaults, i as skills, n as summary, r as access, s as shipped, t as steering, y as coder } from "../chunks/reserved-BAv71I4i.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-kar1zhOb.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 { gt as envDefaults, ht as defaults, i as skills, n as summary, ot as reviewGateBlockedMessage, r as access, s as shipped, t as steering, u as gate } from "../chunks/reserved-BAv71I4i.mjs";
+import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-kar1zhOb.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 requireFlag, bt as flipProblems, gt as envDefaults, ht as defaults, i as skills, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, vt as flagMentions, y as coder } from "../chunks/reserved-BAv71I4i.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.";