@pmelab/gtd 7.1.1 → 7.2.0

package/README.md

@@ -94,6 +94,10 @@ handful of commands drive it:
 - **`gtd abandon`** — end the process underway without completing it: rewind to
   the commit it started from, keeping everything it produced as uncommitted
   changes (nothing is discarded).
+- **`gtd restore`** — undo the last squash (or `gtd abandon`) by hard-resetting
+  HEAD back to its retained pre-squash tip, bringing the turn-by-turn history
+  back. Refuses on a dirty working tree, when there is nothing retained to
+  restore, or when HEAD has since moved past it with commits that would be lost.
 - **`gtd visualize`** — serve an interactive diagram of the active workflow on a
   local web server (the main flow, its sub-machines, and per-state details).
 
@@ -184,6 +188,15 @@ checkers (see
 [Configuration](docs/configuration.md#modes--pluggable-steering-file-modes)).
 Both halves are enforced by `gtd validate` and the `gtd step` gate.
 
+Herdr integration: a workflow state can declare an optional `label:` — a
+human-readable display name surfaced in `gtd next --json`/`gtd status`. The
+reference `bin/gtd-loop` driver uses it to report its lifecycle
+(working/blocked/idle) to a [Herdr](https://herdr.dev) pane sidebar via the
+`herdr` CLI when running under Herdr (`HERDR_ENV=1`, a pane ID, and `herdr` on
+`$PATH`); outside Herdr this is a complete no-op. See
+[Driving the loop](docs/loop.md#herdr-integration-optional) for the full
+reporting contract.
+
 ## Documentation
 
 - [STATES.md](STATES.md) — the full pattern-machine specification: the model,

package/bin/gtd-loop

@@ -30,6 +30,29 @@ set -euo pipefail
 # resume-or-fresh flag are exported as $GTD_LOOP_MEMORY / $GTD_LOOP_SESSION_ID
 # / $GTD_LOOP_MEMORY_RESUME; the default adapter turns them into
 # `--resume`/`--session-id`. An adapter that ignores them keeps working.
+herdr_ok() { [ "${HERDR_ENV:-}" = 1 ] && [ -n "${HERDR_PANE_ID:-}" ] && command -v herdr >/dev/null 2>&1; }
+
+herdr_report() {  # $1=state (working|blocked|idle)  $2=message
+  herdr_ok || return 0
+  herdr pane report-agent --source herdr:gtd --agent gtd \
+    --state "$1" --message "$2" "$HERDR_PANE_ID" >/dev/null 2>&1 || true
+}
+
+herdr_notify() {  # $1=title  $2=body
+  herdr_ok || return 0
+  herdr notification show "$1" --body "$2" --sound request >/dev/null 2>&1 || true
+}
+
+herdr_release() {  # hand the pane back to Herdr's normal detection
+  herdr_ok || return 0
+  herdr pane release-agent --source herdr:gtd --agent gtd "$HERDR_PANE_ID" >/dev/null 2>&1 || true
+}
+
+trap 'code=$?; if [ "$code" -ne 0 ]; then
+        herdr_report blocked "${GTD_LAST_LABEL:-stopped}: exited $code"
+        herdr_notify "gtd stopped — $(basename "$PWD")" "${GTD_LAST_LABEL:-loop} failed (exit $code)"
+      fi' EXIT
+
 prev_state=""
 prev_content=""
 # Where the last "prompt" turn's `memory` scope + session id are remembered
@@ -107,8 +130,16 @@ while true; do
   content="$(jq -r .content <<<"$next_json")"
   model="$(jq -r '.model // empty' <<<"$next_json")"
   memory="$(jq -r '.memory // empty' <<<"$next_json")"
+  label="$(jq -r '.label // .state' <<<"$next_json")"
+  GTD_LAST_LABEL="$label"
+
+  if [[ "$kind" != "message" ]]; then
+    herdr_report working "$label"
+  fi
 
   if [[ "$kind" == "message" ]]; then
+    herdr_report blocked "$label"
+    herdr_notify "gtd needs you — $(basename "$PWD")" "$label"
     echo "--- Your turn ($state) ---"
     gtd next
     exit 0
@@ -124,6 +155,8 @@ while true; do
     gtd step "$actor" >/dev/null
     head_after="$(git rev-parse HEAD 2>/dev/null || echo none)"
     if [[ "$head_before" == "$head_after" ]]; then
+      herdr_report idle "$label"
+      herdr_release
       echo "--- Settled ($state: check passed, nothing to do) ---"
       exit 0
     fi

package/dist/gtd.bundle.mjs

@@ -189424,6 +189424,13 @@ const validateMemory = (name, state) => {
 	if (isCommitState(state) && state.memory !== void 0) errors.push(`state "${name}": a commit state cannot declare "memory"`);
 	return errors;
 };
+/** `label`, when present, must be a non-empty string; forbidden on a commit state — same rule family as `model`/`memory` (`validateModel`/`validateMemory`): a commit state is never at rest and emits nothing for a driver/viewer to display a label for. */
+const validateLabel = (name, state) => {
+	const errors = [];
+	if (state.label !== void 0 && state.label === "") errors.push(`state "${name}": "label" must be a non-empty string`);
+	if (isCommitState(state) && state.label !== void 0) errors.push(`state "${name}": a commit state cannot declare "label"`);
+	return errors;
+};
 /**
 * The `modes:` map itself: every declared mode must carry at least one of
 * `format`/`validate`, and neither may be blank (a whitespace-only shell
@@ -189618,6 +189625,7 @@ const validateState = (def, name, names) => {
 		...validateRetry(name, state, names),
 		...validateModel(name, state),
 		...validateMemory(name, state),
+		...validateLabel(name, state),
 		...validateFile(name, state),
 		...validateMode(def, name, state),
 		...validateReviewWindow(name, state),
@@ -189640,7 +189648,9 @@ const validateState = (def, name, names) => {
 * non-negative integer; `model`, when present, is a non-empty string and is
 * never declared on a commit state; `memory`, when present, is a non-empty
 * string and is never declared on a commit state (same rule family as
-* `model`); `file`, when present, is a non-empty
+* `model`); `label`, when present, is a non-empty string and is never
+* declared on a commit state (same rule family as `model`); `file`, when
+* present, is a non-empty
 * string and is never declared on a commit state; `mode`, when present, names
 * a mode the definition knows (a built-in or a `modes:` entry — see
 * `knownModes`), requires a sibling `file`, and is never declared on a commit
@@ -190018,6 +190028,7 @@ const collectGroups = (raw) => {
 *       otherwise: <targetState>
 *     model: <string>     # optional, opaque harness hint — never on a commit state
 *     memory: <string>    # optional, opaque memory-scope label — never on a commit state
+*     label: <string>     # optional, opaque display name — never on a commit state
 *     file: <string>      # optional, an Eta template naming the state's steering file — never on a commit state
 *     mode: <modeName>    # optional, requires "file" — a built-in (qa/review) or a `modes:` entry; never on a commit state
 * ```
@@ -190187,6 +190198,7 @@ const KNOWN_STATE_KEYS = /* @__PURE__ */ new Set([
 	"retry",
 	"model",
 	"memory",
+	"label",
 	"file",
 	"mode",
 	"reviewWindow",
@@ -190387,6 +190399,15 @@ const compileMemory = (raw, name, errors) => {
 	}
 	return raw.memory;
 };
+/** The `label` field: an opaque display name, or undefined (either absent or invalid — the type mismatch is its own error). Never interpreted or validated beyond "is it a string" — see `PatternMachine.StateDef.label`. */
+const compileLabel = (raw, name, errors) => {
+	if (raw.label === void 0) return void 0;
+	if (typeof raw.label !== "string") {
+		errors.push(`state "${name}": "label" must be a string`);
+		return;
+	}
+	return raw.label;
+};
 /** The `file` field: an Eta template string naming the state's steering file, or undefined (either absent or invalid — the type mismatch is its own error). Vocabulary/shape rules (non-empty, forbidden on a commit state) are `validateDefinition`'s concern, not this compiler's — see `PatternMachine.StateDef.file`. */
 const compileFile = (raw, name, errors) => {
 	if (raw.file === void 0) return void 0;
@@ -190444,6 +190465,7 @@ const assembleStateDef = (parts) => ({
 		retry: parts.retry,
 		model: parts.model,
 		memory: parts.memory,
+		label: parts.label,
 		file: parts.file,
 		mode: parts.mode,
 		reviewWindow: parts.reviewWindow,
@@ -190471,6 +190493,7 @@ const compileState = (name, raw, configDir, errors, inlineFileRefs) => {
 		retry: compileRetry(raw.retry, name, errors),
 		model: compileModel(raw, name, errors),
 		memory: compileMemory(raw, name, errors),
+		label: compileLabel(raw, name, errors),
 		file: compileFile(raw, name, errors),
 		mode: compileMode(raw, name, errors),
 		reviewWindow: compileBooleanFlag(raw, "reviewWindow", name, errors),
@@ -190525,7 +190548,7 @@ const compileWorkflowConfig = (raw, configDir, rcModes, inlineFileRefs = true) =
 };
 //#endregion
 //#region src/workflows/unified.yaml
-var unified_default = "# The unified gtd workflow template — gtd's BUILT-IN DEFAULT workflow. When no\n# `workflow:` key is configured anywhere in the cwd→home config chain,\n# src/Config.ts runs this template directly, so a state command works with no\n# configuration at all. `gtd init` seeds only the settings a project tunes\n# (vars.testCommand + a modes: formatting suggestion), never the workflow\n# itself. See STATES.md §10 for the full walkthrough.\n#\n# Compiled through the exact same `compileWorkflowConfig` a user's `.gtdrc`\n# `workflow:` key goes through — no privileged code path\n# (src/workflows/templates.ts does the compiling). Every content string below\n# is INLINE (no `./`-relative file references): the bundled template ships\n# inside a single-file build (`dist/gtd.bundle.mjs`), so its content must\n# already be resolved at BUILD time. `renderInitConfig` (src/workflows/\n# templates.ts) can MATERIALIZE this inline source into a `.gtdrc.json`\n# `workflow:` value — the way to eject/customize the machine, and the hermetic\n# test fixture — but `gtd init` itself no longer writes the workflow.\n#\n# ── Authored with SUB-MACHINES (Option C) ──────────────────────────────────\n#\n# This template is written with `submachines:`/`use:` (see src/Submachines.ts\n# and STATES.md). Expansion is a compile-time raw → raw pre-pass with NO runtime\n# footprint: the pure engine only ever sees the flat concrete states, and each\n# invocation's `as:` rename map reproduces the exact state names the flat\n# template used — so the compiled `WorkflowDefinition` is BYTE-IDENTICAL to the\n# frozen `unified.flat.yaml` (pinned by src/workflows/golden.test.ts). The\n# sub-machines split into DEDUP (a gate/loop authored once, invoked several\n# times) and ENCAPSULATION (a single-instance cluster grouped for reading):\n#\n#   * makeGreen (dedup ×2)    — the check/fix/escalate health triple shared by\n#                               the simple build tail and the advanced package\n#                               loop (identical script/prompt/message).\n#   * assertGreen (dedup ×3)  — the green-baseline gate (check + human blocked)\n#                               guarding the simple, advanced and review entries.\n#   * qaLoop (dedup ×2)       — the checkbox Q&A author/answer loop shared by the\n#                               product (adv-grilling) and technical (architecting)\n#                               phases of the advanced flow.\n#   * planLoop (encap)        — the simple flow's plan-iteration loop.\n#   * humanReview (encap)     — the shared review tail (reviewing → await-review →\n#                               review-deciding → feedback collect/build).\n#   * specGate (encap)        — the advanced flow's per-package agentic review.\n#   * packageLoop (encap)     — the advanced flow's per-package build queue.\n#\n# ── Four entry points behind a green-baseline gate, one shared tail ─────────\n#\n# EVERY entry first runs the test suite and only proceeds when it is GREEN — you\n# never start new work (or a review) on top of a red baseline. A red run halts\n# at a human `*-start-blocked` gate (fix the failures and re-run, exactly like\n# the `escalate` states), or is what `gtd fix` exists to repair.\n#\n# The initial `idle` state FORKS on which steering file the human creates,\n# routing into that flow's OWN start gate:\n#\n#   * .gtd/REQUIREMENTS.md -> `adv-start-check` -> the ADVANCED flow (product +\n#     technical Q&A, package decomposition, per-package parallel build +\n#     agentic spec-review).\n#   * anything else (e.g. .gtd/TODO.md) -> `start-check` -> the SIMPLE flow (one\n#     grilling Q&A loop, a monolithic build, no decomposition, no agentic\n#     review).\n#\n# A third entry, `gtd review <commitish>`, jumps to `review-start-check`\n# (reviewEntry) and, once green, to `reviewing` to review a foreign branch\n# through the same shared tail. A fourth, `gtd fix`, jumps to `fix-check`\n# (fixEntry): a red suite drops straight into the shared `fixing` loop and out\n# through the review + squash tail; a green suite is a no-op back to `idle`.\n#\n# All three converge at `reviewing` -> `await-review`. Ticking a REVIEW.md box\n# means only \"I reviewed this hunk\"; a COMMENT (not an unticked box) is what asks\n# for changes. Every human step at `await-review` goes to `review-deciding`,\n# which inspects the step and routes:\n#   * no comment (every box ticked, no REVIEW.md note, no code edit) -> the diff\n#     is a bare REVIEW.md deletion -> squashing -> done (the ONLY path to the\n#     finale — the whole cycle collapses into one commit).\n#   * any comment — a note in REVIEW.md OR a hand-edit to code — ->\n#     review-deciding writes REVIEW_FEEDBACK.md -> feedback-building implements\n#     it (completing any code the human hand-edited, never reverting their\n#     lines) -> checking -> reviewing regenerates an INCREMENTAL REVIEW.md\n#     (review-deciding carries `reviewBase: true`, so each feedback round's\n#     review + checkout window covers only `last-review..HEAD`, i.e. the agent's\n#     follow-through, not the human's own edit) -> await-review, looping until\n#     sign-off.\n# Two dead ends never commit: the sign-off gate (src/program.ts) REFUSES a step\n# that leaves a box unticked with no comment (finish reviewing first) and a\n# deleted REVIEW.md (restore it and tick the boxes).\n#\n# The shared health segment (`checking`/`fixing`/`escalate`) serves the simple\n# build and the feedback loop — its green edge targets\n# `reviewing`. The advanced per-package loop keeps its OWN health triple\n# (`adv-checking`/`adv-fixing`/`adv-escalate`) because its green edge targets\n# the per-package `spec-review` gate instead.\n#\n# KNOWN LIMITATION: `on` pattern keys are NOT Eta templates — they keep the\n# LITERAL `.gtd/...` paths matching these vars' DEFAULT values. Repointing a\n# file var changes what templates read/write WITHOUT changing what the `on`\n# patterns match, desyncing the machine (see docs/configuration.md).\n\nvars:\n  testCommand: npm test\n  todoFile: .gtd/TODO.md\n  requirementsFile: .gtd/REQUIREMENTS.md\n  architectureFile: .gtd/ARCHITECTURE.md\n  packagesDir: .gtd/packages\n  nextFile: .gtd/NEXT.md\n  reviewFile: .gtd/REVIEW.md\n  reviewRawFile: .gtd/REVIEW_RAW.md\n  reviewFeedbackFile: .gtd/REVIEW_FEEDBACK.md\n  feedbackFile: .gtd/FEEDBACK.md\n  specFeedbackFile: .gtd/SPEC_FEEDBACK.md\n  commitMsgFile: .gtd/COMMIT_MSG.md\n  # The two opaque model tiers every agent state draws from — repoint them here\n  # (or via a top-level `.gtdrc` `vars:` key / a `GTD_VAR_plannerModel` env var)\n  # to change every state on that tier at once. `plannerModel` (default \"smart\")\n  # is the heavier tier for the one-shot planning/architecting/review turns;\n  # `coderModel` (default \"base\") is the tier for the build/fix turns.\n  plannerModel: smart\n  coderModel: base\n\nsubmachines:\n  # ── DEDUP: the check/fix/escalate health triple ───────────────────────────\n  # Runs the suite; a red run records .gtd/FEEDBACK.md, a green run cleans it up.\n  # The `on` rules turn that into \"fix\" vs \"$onGreen\". The fix turn retries up to\n  # 3× before escalating to a human. Invoked for the shared build tail\n  # (checking/fixing/escalate -> reviewing) and the advanced package loop\n  # (adv-checking/adv-fixing/adv-escalate -> spec-review).\n  makeGreen:\n    params: [onGreen, escalateDescribe]\n    states:\n      check:\n        actor: check\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn — run the suite; a red run records .gtd/FEEDBACK.md, a\n          # green run cleans it up. The `on` rules decide what that means.\n          set +e\n          mkdir -p .gtd\n          # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n          # newline after an interpolation tag, so no tag may be the last token on\n          # a line — it would glue the next line's `else`/`fi` onto it and break\n          # the script. Below this point everything is plain bash.\n          feedback=\"<%~ it.vars.feedbackFile %>\"\n          <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n          code=$?\n          if [ \"$code\" -ne 0 ]; then\n            if [ -s .gtd/.check-output ]; then\n              mv .gtd/.check-output \"$feedback\"\n            else\n              rm -f .gtd/.check-output\n              printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n            fi\n          else\n            rm -f .gtd/.check-output\n            rm -f \"$feedback\"\n          fi\n        on:\n          \"A .gtd/FEEDBACK.md\": fix\n          \"M .gtd/FEEDBACK.md\": fix\n          \"D .gtd/FEEDBACK.md\": $onGreen\n          \"C\": $onGreen\n      fix:\n        actor: agent\n        file: <%= it.vars.feedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: fix\n        retry:\n          max: 3\n          otherwise: escalate\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.feedbackFile %>`, which this prompt tells you to address.\n\n          Read `<%= it.vars.feedbackFile %>` (the failing test output) and fix the\n          code so the suite passes. Keep the change focused — do not refactor\n          unrelated code. If the feedback is wrong, empty or delete\n          `<%= it.vars.feedbackFile %>` instead of \"fixing\" a non-issue.\n\n          Leave everything uncommitted and finish your turn — do not commit.\n        on:\n          \"* **\": check\n      escalate:\n        actor: human\n        file: <%= it.vars.feedbackFile %>\n        message: |\n          The agent could not get the check to pass after repeated attempts.\n          `<%= it.vars.feedbackFile %>` holds the last failing output.\n\n          What each change does next (then run `gtd step human`):\n          <% it.edges.forEach(function (e) { if (e.describe) { %>\n          <%~ \"- \" + e.describe + \"\\n\" %>\n          <% } }) %>\n        on:\n          \"* **\":\n            to: check\n            describe: $escalateDescribe\n\n  # ── DEDUP: the green-baseline gate ─────────────────────────────────────────\n  # Runs the suite before any work starts (its script is the health check's test\n  # wrapper — red -> .gtd/FEEDBACK.md, green -> remove it); the `on` rules turn\n  # that into \"halt at blocked\" vs \"proceed to $onGreen\". The script and blocked\n  # message/describe differ per entry, so they ride in as `with:` params.\n  assertGreen:\n    params: [onGreen, checkScript, blockedMessage, blockedDescribe]\n    states:\n      check:\n        actor: check\n        script: $checkScript\n        on:\n          \"A .gtd/FEEDBACK.md\": blocked\n          \"M .gtd/FEEDBACK.md\": blocked\n          \"D .gtd/FEEDBACK.md\": $onGreen\n          \"C\": $onGreen\n      blocked:\n        actor: human\n        file: <%= it.vars.feedbackFile %>\n        message: $blockedMessage\n        on:\n          \"* **\":\n            to: check\n            describe: $blockedDescribe\n\n  # ── DEDUP: the checkbox Q&A author/answer loop ─────────────────────────────\n  # The agent develops a plan file, surfacing `## Open Questions` as checkbox\n  # lists; the human answers (answerGate refuses an unanswered step) and either\n  # advances or sends it back. Invoked for the product (adv-grilling) and\n  # technical (architecting) phases of the advanced flow.\n  qaLoop:\n    params: [authorFile, authorPrompt, answerMessage, onAdvance, advanceDescribe, editDescribe]\n    states:\n      author:\n        actor: agent\n        file: $authorFile\n        mode: qa\n        model: <%= it.vars.plannerModel %>\n        memory: plan\n        prompt: $authorPrompt\n        on:\n          \"* **\": answer\n      answer:\n        actor: human\n        file: $authorFile\n        mode: qa\n        answerGate: true\n        message: $answerMessage\n        on:\n          \"C\":\n            to: $onAdvance\n            describe: $advanceDescribe\n          \"* **\":\n            to: author\n            describe: $editDescribe\n\n  # ── ENCAPSULATION: the simple flow's plan-iteration loop ───────────────────\n  planLoop:\n    params: [onAccept]\n    states:\n      planning:\n        actor: agent\n        file: <%= it.vars.todoFile %>\n        model: <%= it.vars.plannerModel %>\n        memory: plan\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.todoFile %>`, which this prompt tells you to develop.\n\n          `<%= it.vars.todoFile %>` holds a short sketch of what to build — or, on a\n          return lap, the plan you already wrote plus the human's edits and comments\n          on it. Read it, explore the codebase, and develop it into a concrete\n          implementation plan: the files to change, the approach, and the steps to\n          take.\n\n          Do NOT ask questions and do NOT add an \"Open Questions\" section — decide\n          every open point yourself and write the plan as a set of concrete\n          decisions. Where a decision is genuinely a judgement call, state the\n          choice you made and, in one line, why. The human iterates on the plan by\n          editing it directly, not by answering questions.\n\n          On a return lap, `<%= it.vars.todoFile %>` carries the human's edits and\n          inline comments on your previous plan. Fold every edit and comment into a\n          revised, self-contained plan and remove the addressed comments — the plan\n          is always the current, clean proposal, never a diff.\n\n          Leave `<%= it.vars.todoFile %>` uncommitted and finish your turn — do\n          not commit, and do not run `gtd step agent` yourself; the harness does\n          that.\n        on:\n          \"* **\": plan-review\n\n      plan-review:\n        actor: human\n        file: <%= it.vars.todoFile %>\n        message: |\n          `<%= it.vars.todoFile %>` holds the proposed implementation plan. Read it,\n          then either accept it as-is or edit it — rewrite a step, add a\n          constraint, or drop an inline comment — to send it back for another round.\n\n          What each change does next (then run `gtd step human`):\n          <% it.edges.forEach(function (e) { if (e.describe) { %>\n          <%~ \"- \" + e.describe + \"\\n\" %>\n          <% } }) %>\n        on:\n          \"C\":\n            to: $onAccept\n            describe: >-\n              Change nothing to accept the plan as-is and move on to implementation\n              (**building**).\n          \"* **\":\n            to: planning\n            describe: >-\n              Edit the plan — rewrite a step, add a constraint, or leave an inline\n              comment — to send it back for another round (**planning**).\n\n  # ── ENCAPSULATION: the shared review tail ──────────────────────────────────\n  humanReview:\n    params: [onSignoff]\n    states:\n      reviewing:\n        actor: agent\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        # `gtd review <commitish>` (a plain non-gtd branch, e.g. a colleague's PR)\n        # does NOT enter here directly — it enters `review-start-check` (reviewEntry)\n        # first, which runs the green-baseline gate and, once green, transitions\n        # here. The `Gtd-Review-Base:` trailer rides on that entry commit (the\n        # process's oldest), so everything below still reuses the same\n        # reviewing/await-review/feedback machinery over <commitish>..HEAD.\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.reviewFile %>`, which this prompt tells you to write.\n\n          Write `<%= it.vars.reviewFile %>` to help a human review the diff below in\n          this EXACT format:\n\n          - First non-blank line: `# Review: <%= it.currentCommit.slice(0, 7) %>`\n          - Somewhere in the document: `<!-- base: <%= it.startCommit %> -->`\n          - At least one `## <Chunk Title>` heading, grouping hunks semantically\n            (same feature/refactor/fix, even across files) — a short explanation of\n            what changed and why, then one `- [ ] ./path/to/file.ts#42 — note` file\n            pointer per hunk (checkboxes are for the human to tick, not you; every\n            path is `./`-relative, with an optional `#line` and an optional\n            ` — note`).\n\n          The diff below is `it.reviewDiff` — on a feedback round it covers ONLY the\n          changes made since the previous review, so you review just what changed,\n          not items already signed off. Leave `<%= it.vars.reviewFile %>`\n          uncommitted and finish your turn.\n          <% if (it.reviewDiff.trim()) { %>\n\n          ## Full diff under review\n\n          ```diff\n          <%~ it.reviewDiff %>\n          ```\n          <% } %>\n        on:\n          \"* **\": await-review\n\n      await-review:\n        actor: human\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        # While the cycle rests here, gtd opens a \"review checkout window\": raw HEAD\n        # is rewound to the review base (the most-recent `review-deciding` commit —\n        # so a feedback round shows only `last-review..HEAD` — or the process start\n        # on the first review) with the working tree untouched, surfacing the diff\n        # as ordinary uncommitted changes. It closes on the next invocation.\n        #\n        # Every human step here routes to `review-deciding`, which decides sign-off\n        # vs. feedback from the step's CONTENT (a comment, not a tick). Ticking a box\n        # only records \"I reviewed this hunk\". Two dead ends can't be told apart by a\n        # file-pattern edge, so the sign-off gate (`enforceReviewSignoffGate` in\n        # src/program.ts) catches them BEFORE the step commits and refuses: an\n        # unfinished review (a box still `- [ ]` with no comment) and a deleted\n        # REVIEW.md.\n        reviewWindow: true\n        message: |\n          `<%= it.vars.reviewFile %>` holds the review record for the cycle — one\n          `- [ ]` checkbox per reviewable item, grouped into chunks. Tick a box\n          (`- [x]`) as you review each hunk; ticking only records that you've read\n          it, it is not sign-off.\n\n          When you've been through the whole diff, run `gtd step human`:\n\n          - Tick EVERY box and leave no comment — no note in\n            `<%= it.vars.reviewFile %>`, no code edit — to sign off and collapse the\n            cycle into one commit (**squashing**).\n          - Leave a comment to request changes — a note on a\n            `<%= it.vars.reviewFile %>` line, or a direct code edit — to send it to a\n            build + re-review round (**review-deciding** → **feedback-building**). A\n            code edit counts as your own fix: the agent completes the follow-through\n            it implies and never reverts your lines.\n\n          Stepping with a box still unticked and no comment is refused (finish\n          reviewing first); so is deleting `<%= it.vars.reviewFile %>`.\n        on:\n          \"* **\": review-deciding\n\n      review-deciding:\n        actor: check\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        # Anchors the INCREMENTAL review base: its most-recent in-process commit is\n        # the point the previous review round ended, so the next `reviewing` turn\n        # (and the review checkout window) covers only the changes since then. On\n        # the first review there is no such commit, so the base is the cycle start.\n        reviewBase: true\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn — decide the human's review step from its CONTENT. HEAD is\n          # the human's `await-review -> review-deciding` commit; HEAD^ is the\n          # `reviewing` commit that wrote the agent's original REVIEW.md (the sign-off\n          # gate refuses an incomplete step, so review-deciding is entered exactly\n          # once per round — nothing commits in between). It is FEEDBACK when the\n          # human left a comment: a note in REVIEW.md (any edit beyond a \"[ ]\"->\"[x]\"\n          # tick) OR a hand-edit to any non-.gtd/ file this round. Otherwise it is a\n          # clean sign-off. This turn only CAPTURES the raw material into REVIEW_RAW.md\n          # (the `feedback-collecting` agent then turns it into instructions); it does\n          # NOT interpret it. Either way, remove REVIEW.md; what the resulting diff\n          # MEANS is decided by this state's own `on` rules — the A/M REVIEW_RAW.md\n          # rows are declared BEFORE the D REVIEW.md row so a feedback round (which\n          # also deletes REVIEW.md) is captured as feedback, not mistaken for a\n          # sign-off.\n          set +e\n          mkdir -p .gtd\n          # Hoist the paths once, at the TOP: Eta's autoTrim eats the newline after\n          # an interpolation tag, so no tag may be the last token on a line — it\n          # would glue the next line onto it and break the script. Below this point\n          # everything is plain bash.\n          reviewFile=\"<%~ it.vars.reviewFile %>\"\n          reviewRawFile=\"<%~ it.vars.reviewRawFile %>\"\n          # Which non-.gtd/ files did the human hand-edit this round?\n          codeFiles=$(git diff-tree --no-commit-id --name-only -r HEAD | grep -v '^\\.gtd/')\n          # A note is any REVIEW.md change beyond a checkbox flip: normalize every\n          # \"[ ]\"/\"[x]\" to a placeholder, then compare the agent's original (HEAD^)\n          # against the human's version (HEAD).\n          notes=\"\"\n          before=$(git show \"HEAD^:$reviewFile\" 2>/dev/null | sed -E 's/\\[[ xX]\\]/[_]/g')\n          after=$(git show \"HEAD:$reviewFile\" 2>/dev/null | sed -E 's/\\[[ xX]\\]/[_]/g')\n          if [ \"$before\" != \"$after\" ]; then notes=1; fi\n          if [ -n \"$codeFiles\" ] || [ -n \"$notes\" ]; then\n            {\n              echo \"Raw review material captured for classification. The human reviewed the diff and left the feedback below; a downstream agent turns it into an instruction list. This file is machine-captured input, not instructions.\"\n              if [ -n \"$notes\" ]; then\n                echo\n                echo \"## Notes the human added to REVIEW.md this round\"\n                echo\n                echo '```diff'\n                git show HEAD --format= -- \"$reviewFile\"\n                echo '```'\n              fi\n              if [ -n \"$codeFiles\" ]; then\n                echo\n                echo \"## Files the human hand-edited this round (already committed)\"\n                echo\n                echo '```diff'\n                git show HEAD --format= -- $codeFiles\n                echo '```'\n              fi\n            } > \"$reviewRawFile\"\n          fi\n          rm -f \"$reviewFile\"\n        on:\n          \"A .gtd/REVIEW_RAW.md\": feedback-collecting\n          \"M .gtd/REVIEW_RAW.md\": feedback-collecting\n          \"D .gtd/REVIEW.md\": $onSignoff\n\n      feedback-collecting:\n        actor: agent\n        file: <%= it.vars.reviewFeedbackFile %>\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        prompt: |\n          You are an autonomous coding agent turning raw review feedback into an\n          explicit instruction list for a builder. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.reviewRawFile %>` (delete it when done) and\n          `<%= it.vars.reviewFeedbackFile %>` (write it). Do NOT change any other\n          file — you classify, you do not build.\n\n          The raw review material is: <%~ it.read(it.vars.reviewRawFile) %>\n\n          Classify every piece of it into `<%= it.vars.reviewFeedbackFile %>` as a\n          flat, numbered instruction list. Each item is `N. ./path/to/file.ts#line —\n          <imperative>`. Read the two RAW sections and apply these rules exactly:\n\n          1. NOTES the human added to REVIEW.md — each note is a MANDATORY change,\n             regardless of whether its checkbox is ticked (ticking means only \"I read\n             this hunk\", never sign-off). Anchor each to the `./path#line` its review\n             item names (or the chunk it sits under). Emit it as a concrete\n             imperative.\n          2. Every COMMENT the human ADDED this round (a `+` line that is a code\n             comment, in the hand-edited files) is a MANDATORY instruction the human\n             is giving the builder — even a plain-prose one, even if its box is\n             ticked. Emit an imperative to satisfy it and note that the comment line\n             itself must be REMOVED once addressed. If a comment turns out to describe\n             behaviour the code already has, the instruction is still \"confirm the\n             code matches and remove the comment line\".\n          3. Every NON-comment code line the human hand-edited is an already-committed\n             INTENT, NOT a do-then-delete item. Emit an instruction that names those\n             files and says: their lines are final — complete ONLY the follow-through\n             they imply (callers, tests, types, docs) and NEVER revert or rewrite\n             them. Do not turn their own edit into a task.\n\n          Split each hand-edited hunk per line: comment `+` lines follow rule 2, the\n          surrounding real code follows rule 3.\n\n          If — and only if — nothing in the raw material is actionable (e.g. the human\n          left only an approving remark), write `<%= it.vars.reviewFeedbackFile %>`\n          containing exactly one line: `NOTHING ACTIONABLE — <one-sentence reason>`.\n          Never invent work to satisfy a non-actionable remark.\n\n          Delete `<%= it.vars.reviewRawFile %>`, leave everything else uncommitted,\n          and finish your turn.\n        on:\n          \"A .gtd/REVIEW_FEEDBACK.md\": feedback-building\n          \"M .gtd/REVIEW_FEEDBACK.md\": feedback-building\n\n      feedback-building:\n        actor: agent\n        file: <%= it.vars.reviewFeedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: build\n        # Refuse a work-free turn: a step whose only pending change is deleting the\n        # instructions file (the original \"captured then discarded\" bug). The edge\n        # gate (`enforceFeedbackProgressGate` in src/program.ts) reads this flag and\n        # exempts a `NOTHING ACTIONABLE` sentinel (a non-actionable review round,\n        # which legitimately makes no code change). The pure engine carries it inert.\n        requireProgress: true\n        prompt: |\n          You are an autonomous coding agent addressing review feedback. `.gtd/`\n          holds this workflow's own state — never create, edit, or delete anything\n          under `.gtd/` except `<%= it.vars.reviewFeedbackFile %>`, which this\n          prompt tells you to address and then delete.\n\n          The instructions to implement are: <%~ it.read(it.vars.reviewFeedbackFile) %>\n\n          This is a flat instruction list, not a diff — execute every item exactly as\n          written, no Q&A, no re-planning, using TDD discipline:\n\n          - An item that says the human's own lines are final: build ON TOP of them to\n            complete only the follow-through it names (callers, tests, types, docs).\n            NEVER revert or rewrite the lines they already committed.\n          - An item derived from a human comment: satisfy it AND delete that comment\n            line from the code (the human's review comments are transient — none of\n            them survive this round).\n\n          If the file's sole content is a `NOTHING ACTIONABLE` line, make no code\n          change; just delete the instructions file.\n\n          Delete `<%= it.vars.reviewFeedbackFile %>` once every item is addressed.\n          Leave everything else uncommitted and finish your turn. Deleting the\n          instructions file WITHOUT making the changes it asks for is refused — the\n          feedback must actually be addressed.\n        on:\n          \"* **\": checking\n\n  # ── ENCAPSULATION: the advanced flow's per-package agentic review ──────────\n  specGate:\n    params: [onApproved]\n    states:\n      spec-review:\n        actor: agent\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        # Bounded per cycle: once entered `max` times, a transition into it is\n        # redirected to `closing` (force-close the package and move on — the\n        # unresolved concern is deferred to the shared human review at the tail,\n        # which sees the whole diff anyway). NOTE the cap is PROCESS-scoped, so it\n        # pools across packages — the same documented limitation the shared\n        # `fixing` cap has (see STATES.md / docs/configuration.md).\n        retry:\n          max: 3\n          otherwise: $onApproved\n        prompt: |\n          You are an autonomous coding agent reviewing a freshly-built work package\n          against its own spec. `.gtd/` holds this workflow's own state — never\n          create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.specFeedbackFile %>`, which this prompt tells you to write\n          when — and only when — you find problems.\n\n          The package spec is: <%~ it.read(it.vars.nextFile) %>\n\n          Read that spec, then verify the package's implementation (the diff below)\n          against it: are all its tasks done, acceptance criteria met, and the code\n          sound and consistent with the codebase?\n\n          - If it fully satisfies the spec, write NOTHING and finish your turn — a\n            clean turn is your approval.\n          - If it does not, write `<%= it.vars.specFeedbackFile %>` listing the\n            concrete problems for a fix turn to address. Be specific.\n\n          Do not fix anything yourself and do not delete the package file — a later\n          step owns that. Finish your turn.\n          <% if (it.processDiff.trim()) { %>\n\n          ## Diff under review\n\n          ```diff\n          <%~ it.processDiff %>\n          ```\n          <% } %>\n        on:\n          \"A .gtd/SPEC_FEEDBACK.md\": spec-fix\n          \"M .gtd/SPEC_FEEDBACK.md\": spec-fix\n          \"D .gtd/SPEC_FEEDBACK.md\": $onApproved\n          \"C\": $onApproved\n\n      spec-fix:\n        actor: agent\n        file: <%= it.vars.specFeedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: fix\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.specFeedbackFile %>`, which this prompt tells you to address\n          and then delete.\n\n          Read `<%= it.vars.specFeedbackFile %>` (the reviewer's concerns about the\n          current package) and the package spec (`<%= it.read(it.vars.nextFile) %>`),\n          then fix the code to resolve every concern. Keep the change focused.\n\n          Delete `<%= it.vars.specFeedbackFile %>` once every concern is addressed.\n          Leave everything else uncommitted and finish your turn.\n        on:\n          \"* **\": adv-checking\n\n  # ── ENCAPSULATION: the advanced flow's per-package build queue ─────────────\n  packageLoop:\n    params: [onDrained]\n    states:\n      picking:\n        actor: check\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn (the package queue arbiter) — the loop driver executes\n          # this verbatim, then steps the check actor. Mechanics only: take the\n          # first package file (by name) under the packages dir into NEXT.md, or\n          # remove NEXT.md when the queue is empty. What NEXT.md's presence/absence\n          # MEANS (another package to build vs. the queue closing out to review) is\n          # decided by this state's own `on` rules at capture time — never here.\n          set +e\n          # Hoist the NEXT path once, at the TOP: Eta's autoTrim eats the newline\n          # after an interpolation tag, so no tag may be the last token on a line —\n          # it would glue the next line's `else`/`fi` onto it and break the script.\n          # Below this point everything is plain bash.\n          nextFile=\"<%~ it.vars.nextFile %>\"\n          next=$(ls <%~ it.vars.packagesDir %>/*.md 2>/dev/null | head -n 1)\n          if [ -n \"$next\" ]; then\n            printf '%s' \"$next\" > \"$nextFile\"\n          else\n            rm -f \"$nextFile\"\n          fi\n        on:\n          \"D .gtd/NEXT.md\": $onDrained\n          \"* .gtd/NEXT.md\": adv-building\n          \"C\": $onDrained\n\n      adv-building:\n        actor: agent\n        model: <%= it.vars.coderModel %>\n        memory: build\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/`; in\n          particular do NOT delete the package file (the `spec-review` gate reads it\n          after you) and never touch `<%= it.vars.nextFile %>` — the `picking` state\n          owns it.\n\n          The package to implement is: <%~ it.read(it.vars.nextFile) %>\n\n          That file describes a set of INDEPENDENT tasks. Implement ALL of them in\n          this one turn, fanning the independent tasks out to parallel subagents\n          where your harness supports it — each task is self-contained and can be\n          built concurrently. Implement EXACTLY the tasks this package describes — no\n          more, no less; leave every other package file untouched. Use TDD\n          discipline within each task.\n\n          Leave the package file in place and everything else uncommitted, then\n          finish your turn.\n        on:\n          \"* **\": adv-checking\n\n      closing:\n        actor: check\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn (the package closer) — remove the just-reviewed package\n          # file (its path is in NEXT.md) plus any leftover spec feedback, so\n          # `picking` selects the NEXT package (or falls through to review when the\n          # queue is empty). Reached on approval (spec-review clean) and on the\n          # spec-review retry cap (force-close, deferring the concern to the tail).\n          set +e\n          pkg=$(cat <%~ it.vars.nextFile %> 2>/dev/null)\n          [ -n \"$pkg\" ] && rm -f \"$pkg\"\n          rm -f <%~ it.vars.specFeedbackFile %> <%~ it.vars.nextFile %>\n        on:\n          \"* **\": picking\n\nuse:\n  # Shared health triple: checking/fixing/escalate -> reviewing.\n  - submachine: makeGreen\n    name: build\n    as: { check: checking, fix: fixing, escalate: escalate }\n    with:\n      onGreen: reviewing\n      escalateDescribe: >-\n        Fix the failure yourself — edit the code and/or `.gtd/FEEDBACK.md` —\n        to re-run the check (**checking**).\n  # Advanced package health triple: adv-checking/adv-fixing/adv-escalate -> spec-review.\n  - submachine: makeGreen\n    name: pkg\n    as: { check: adv-checking, fix: adv-fixing, escalate: adv-escalate }\n    with:\n      onGreen: spec-review\n      escalateDescribe: >-\n        Fix the failure yourself — edit the code and/or\n        `.gtd/FEEDBACK.md` — to re-run the check (**adv-checking**).\n\n  # Green-baseline gate: simple flow entry.\n  - submachine: assertGreen\n    name: start\n    as: { check: start-check, blocked: start-blocked }\n    with:\n      onGreen: planning\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before starting new work; a red run\n        # records .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start new work on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**start-check**). To repair the baseline as\n        its own separate reviewed commit instead, abandon this start and run\n        `gtd fix` from a clean `idle`.\n\n  # Green-baseline gate: advanced flow entry.\n  - submachine: assertGreen\n    name: adv-start\n    as: { check: adv-start-check, blocked: adv-start-blocked }\n    with:\n      onGreen: adv-grilling\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before starting the advanced flow; a red\n        # run records .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start new work on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**adv-start-check**). To repair the baseline\n        as its own separate reviewed commit instead, abandon this start and run\n        `gtd fix` from a clean `idle`.\n\n  # Green-baseline gate: `gtd review` entry (reviewEntry -> reviewing).\n  - submachine: assertGreen\n    name: review-start\n    as: { check: review-start-check, blocked: review-start-blocked }\n    set:\n      check: { reviewEntry: true }\n    with:\n      onGreen: reviewing\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before reviewing; a red run records\n        # .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed to reviewing).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start a review on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**review-start-check**).\n\n  # Advanced flow: product Q&A loop (adv-grilling/adv-grilling-answer -> architecting).\n  - submachine: qaLoop\n    name: grill\n    as: { author: adv-grilling, answer: adv-grilling-answer }\n    with:\n      authorFile: <%= it.vars.requirementsFile %>\n      onAdvance: architecting\n      authorPrompt: |\n        You are an autonomous coding agent. `.gtd/` holds this workflow's own\n        state — never create, edit, or delete anything under `.gtd/` except\n        `<%= it.vars.requirementsFile %>`, which this prompt tells you to develop.\n\n        `<%= it.vars.requirementsFile %>` holds the product requirements (or the\n        plan you already wrote plus the human's answers on a return lap). Read it,\n        explore the codebase, and develop it into a concrete, PRODUCT-level plan\n        in this one turn.\n\n        Scope: product and user-facing decisions only. Leave implementation\n        details (file/module structure, data models, tech-stack choices) for the\n        next phase (`<%= it.vars.architectureFile %>`).\n\n        For every open point you cannot settle yourself, add a question under a\n        `## Open Questions` heading near the top: one `### <question>` sub-heading\n        each, followed by a checkbox list of candidate answers — aim for TWO\n        concrete options plus a final free-text slot, ALL left UNTICKED:\n\n            ### <the question>\n\n            - [ ] <first option — a concrete answer, a few words of rationale>\n            - [ ] <second option>\n            - [ ] _your answer_\n\n        Never tick a box yourself — the human ticks exactly one per question. The\n        last `- [ ] _your answer_` line is the human's own-answer slot; write it\n        with the literal `_your answer_` placeholder and leave it for them.\n\n        On a RETURN lap the human has ticked one option per question (or replaced\n        `_your answer_` with their own text). For each answered question: fold the\n        chosen answer into the plan prose, then MOVE the question down into a\n        `## Answered Questions` section as `### <question>` followed by the\n        resolved answer in plain PROSE (drop the checkboxes). Never re-raise a\n        question the human deleted; if the human deleted the whole\n        `## Open Questions` section, treat the plan as accepted and surface no new\n        questions unless something is genuinely still blocking. Omit\n        `## Open Questions` entirely once there are none left.\n\n        Leave `<%= it.vars.requirementsFile %>` uncommitted and finish your turn.\n      answerMessage: |\n        `<%= it.vars.requirementsFile %>` holds the product plan under\n        development. Each question under `## Open Questions` offers a few options\n        plus a `- [ ] _your answer_` slot. Answer EVERY question by ticking\n        exactly one box (`- [x]`); for your own answer, replace `_your answer_`\n        with your text and tick that line. Stepping is refused while any question\n        is unanswered.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      advanceDescribe: >-\n        With no open questions left (the agent surfaced none, or you deleted\n        the section and it finalized the plan), change nothing to accept the\n        product plan and move on to technical architecting (**architecting**).\n      editDescribe: >-\n        Tick exactly one option per open question (replace `_your answer_` for\n        your own) to send the plan back for the agent to fold your answers in\n        (**adv-grilling**). Delete a question to skip it, or delete the whole\n        `## Open Questions` section to accept the plan as-is.\n\n  # Advanced flow: technical Q&A loop (architecting/architecting-answer -> decompose).\n  - submachine: qaLoop\n    name: arch\n    as: { author: architecting, answer: architecting-answer }\n    with:\n      authorFile: <%= it.vars.architectureFile %>\n      onAdvance: decompose\n      authorPrompt: |\n        You are an autonomous coding agent. `.gtd/` holds this workflow's own\n        state — never create, edit, or delete anything under `.gtd/` except\n        `<%= it.vars.architectureFile %>` and `<%= it.vars.requirementsFile %>`,\n        which this prompt tells you to write and delete respectively.\n\n        Read `<%= it.vars.requirementsFile %>` (the converged product plan) and\n        develop `<%= it.vars.architectureFile %>` from it in this one turn:\n        file/module structure, data models, library/tech-stack choices,\n        error-handling strategy — the *how*, building on the *what* already\n        settled. Do not re-open product-level decisions; treat them as settled.\n\n        For every open point you cannot settle yourself, add a question under a\n        `## Open Questions` heading exactly as the grilling phase does: one\n        `### <question>` each, followed by a checkbox list — TWO concrete options\n        plus a final free-text slot, ALL left UNTICKED:\n\n            ### <the question>\n\n            - [ ] <first option>\n            - [ ] <second option>\n            - [ ] _your answer_\n\n        Never tick a box yourself. On a RETURN lap the human has ticked one option\n        per question (or replaced `_your answer_` with their own text): fold each\n        chosen answer into the plan prose, then MOVE the question into a\n        `## Answered Questions` section as `### <question>` + the resolved answer\n        in plain PROSE (drop the checkboxes). Never re-raise a deleted question;\n        treat a deleted `## Open Questions` section as acceptance. Omit\n        `## Open Questions` once there are none left.\n\n        Once `<%= it.vars.architectureFile %>` is written, delete\n        `<%= it.vars.requirementsFile %>` — its content has been folded in and it\n        must not linger. Leave everything uncommitted and finish your turn.\n      answerMessage: |\n        `<%= it.vars.architectureFile %>` holds the technical plan under\n        development. Each question under `## Open Questions` offers a few options\n        plus a `- [ ] _your answer_` slot. Answer EVERY question by ticking\n        exactly one box (`- [x]`); for your own answer, replace `_your answer_`\n        with your text and tick that line. Stepping is refused while any question\n        is unanswered.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      advanceDescribe: >-\n        With no open questions left (the agent surfaced none, or you deleted\n        the section and it finalized the plan), change nothing to accept the\n        technical plan and move on to decomposing the work into packages\n        (**decompose**).\n      editDescribe: >-\n        Tick exactly one option per open question (replace `_your answer_` for\n        your own) to send the plan back for the agent to fold your answers in\n        (**architecting**). Delete a question to skip it, or delete the whole\n        `## Open Questions` section to accept the plan as-is.\n\n  # Simple flow plan-iteration loop (planning/plan-review -> building).\n  - submachine: planLoop\n    with:\n      onAccept: building\n\n  # Shared review tail (reviewing -> await-review -> ... -> squashing).\n  - submachine: humanReview\n    with:\n      onSignoff: squashing\n\n  # Advanced per-package agentic review (spec-review/spec-fix -> closing).\n  - submachine: specGate\n    with:\n      onApproved: closing\n\n  # Advanced per-package build queue (picking/adv-building/closing -> reviewing).\n  - submachine: packageLoop\n    with:\n      onDrained: reviewing\n\nstates:\n  # ── Shared entry ────────────────────────────────────────────────────────\n  idle:\n    actor: human\n    initial: true\n    # Every human-gate `message:` below closes with the same rendered \"What\n    # each change does next\" list, built from `it.edges` (the resting state's\n    # own `on` edges — each edge's `describe:` is the single source of truth).\n    message: |\n      No active gtd cycle.\n\n      To start one, create a steering file describing what you want built:\n\n      - `.gtd/TODO.md` — a short sketch — starts the SIMPLE flow (plan, build,\n        review).\n      - `.gtd/REQUIREMENTS.md` — the product requirements — starts the ADVANCED\n        flow (product + technical Q&A, package decomposition, parallel build,\n        per-package agentic review).\n\n      What each change does next (then run `gtd step human`):\n      <% it.edges.forEach(function (e) { if (e.describe) { %>\n      <%~ \"- \" + e.describe + \"\\n\" %>\n      <% } }) %>\n    on:\n      \"* .gtd/REQUIREMENTS.md\":\n        to: adv-start-check\n        describe: >-\n          Save the product requirements to `.gtd/REQUIREMENTS.md` to start the\n          ADVANCED flow — gtd first checks the test baseline is green, then the\n          agent develops them through product then technical Q&A, decomposes the\n          work into packages, and builds each in parallel (**adv-start-check**).\n      \"* **\":\n        to: start-check\n        describe: >-\n          Save a short sketch to `.gtd/TODO.md` (or any other change) to start\n          the SIMPLE flow — gtd first checks the test baseline is green, then the\n          agent reads it, explores the codebase, and develops it into a concrete\n          implementation plan (**start-check**).\n\n  # ── Simple flow: monolithic build (plan loop is the `planLoop` sub-machine) ─\n  building:\n    actor: agent\n    file: <%= it.vars.todoFile %>\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. `.gtd/` holds this workflow's own\n      state — never create or edit anything under `.gtd/` except deleting\n      `<%= it.vars.todoFile %>`, which this prompt tells you to delete once its\n      work is complete.\n\n      The plan to implement is: <%~ it.read(it.vars.todoFile) %>\n\n      Read that plan and implement it in full. Use TDD discipline: one test,\n      then the implementation that passes it, then the next — never write all\n      the tests first.\n\n      Delete `<%= it.vars.todoFile %>` once the work it describes is complete\n      and verified. Leave everything else uncommitted and finish your turn.\n    on:\n      \"* **\": checking\n\n  # ── Advanced flow: decomposition (Q&A loops are the `qaLoop` sub-machine) ───\n  decompose:\n    actor: agent\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. `.gtd/` holds this workflow's own\n      state — never create, edit, or delete anything under `.gtd/` except the\n      package files this prompt tells you to write (under\n      `<%= it.vars.packagesDir %>/`), and `<%= it.vars.architectureFile %>`,\n      which it tells you to delete.\n\n      Read `<%= it.vars.architectureFile %>` (the converged technical plan) and\n      decompose it into an ordered set of WORK PACKAGES, one file each under\n      `<%= it.vars.packagesDir %>/` (e.g. `<%= it.vars.packagesDir %>/01-name.md`,\n      `<%= it.vars.packagesDir %>/02-name.md`, ...). Order the packages so the\n      test suite can pass again after each one lands.\n\n      Each package file describes a set of INDEPENDENT tasks that can be\n      implemented concurrently without ordering constraints between them — a\n      single build turn will fan them out to parallel subagents. Give each task\n      a clear description, acceptance criteria as `- [ ]` checkboxes, and the\n      relevant paths. Also state the package's overall requirement so it can be\n      reviewed against its spec. Do NOT put ordering-dependent tasks in the same\n      package — split them across ordered packages instead.\n\n      No package file may reference any other `.gtd/` file. Once the package\n      files are written, delete `<%= it.vars.architectureFile %>`. Leave\n      everything uncommitted and finish your turn.\n    on:\n      \"* .gtd/packages/**\": picking\n\n  # ── Green-baseline gate: `gtd fix` entry ──────────────────────────────────\n  # `gtd fix` enters HERE (fixEntry): run the suite, then a red run drops\n  # straight into the shared `fixing` loop (-> checking -> review + squash\n  # tail); a green run is a no-op back to `idle` (nothing to fix).\n  fix-check:\n    actor: check\n    fixEntry: true\n    script: |\n      #!/usr/bin/env bash\n      # gtd check turn — run the suite to find what needs fixing; a red run\n      # records .gtd/FEEDBACK.md (-> fixing), a green run cleans it up (-> idle).\n      set +e\n      mkdir -p .gtd\n      # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n      # newline after an interpolation tag, so no tag may be the last token on\n      # a line — it would glue the next line's `else`/`fi` onto it and break\n      # the script. Below this point everything is plain bash.\n      feedback=\"<%~ it.vars.feedbackFile %>\"\n      <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n      code=$?\n      if [ \"$code\" -ne 0 ]; then\n        if [ -s .gtd/.check-output ]; then\n          mv .gtd/.check-output \"$feedback\"\n        else\n          rm -f .gtd/.check-output\n          printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n        fi\n      else\n        rm -f .gtd/.check-output\n        rm -f \"$feedback\"\n      fi\n    on:\n      \"A .gtd/FEEDBACK.md\": fixing\n      \"M .gtd/FEEDBACK.md\": fixing\n      \"D .gtd/FEEDBACK.md\": idle\n      \"C\": idle\n\n  # ── Shared tail: squash finale (review loop is the `humanReview` sub-machine) ─\n  squashing:\n    actor: agent\n    file: <%= it.vars.commitMsgFile %>\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. The cycle is approved and done.\n      `.gtd/` holds this workflow's own state — never create, edit, or delete\n      anything under `.gtd/` except `<%= it.vars.commitMsgFile %>`, which this\n      prompt tells you to write.\n\n      Leave `<%= it.vars.commitMsgFile %>` uncommitted and finish your turn —\n      entering this file squashes everything this process retains into one\n      commit using its content as the message. The diff below is exactly what\n      that commit will contain: `it.retainedDiff`, the changes THIS process\n      made (its trace/retry boundary onward). For a normal build cycle that is\n      the whole feature; for a `gtd review` process it is only the fixes made\n      during the review — NOT the changeset that was under review.\n      <% if (it.retainedDiff.trim()) { %>\n\n      Write `<%= it.vars.commitMsgFile %>` with ONE conventional-commits message\n      for the changes below (subject line `type(scope): subject`, imperative\n      mood, <= 72 characters; a body explaining the why, trade-offs, and key\n      decisions). Plain text, no markdown wrapper.\n\n      ## Retained diff\n\n      ```diff\n      <%~ it.retainedDiff %>\n      ```\n      <% } else { %>\n\n      This process retained NO changes (a clean review sign-off with no fixes).\n      Write `<%= it.vars.commitMsgFile %>` with exactly this one line and\n      nothing else:\n\n      chore: human review\n      <% } %>\n    on:\n      \"A .gtd/COMMIT_MSG.md\": done\n      \"M .gtd/COMMIT_MSG.md\": done\n\n  done:\n    commit: |\n      <%~ it.read(it.vars.commitMsgFile) %>\n\n      Token cost: <%= it.processCost %>\n      <% it.processCostByModel.forEach(function(m){ %>\n      - <%= m.model %>: <%= m.cost %>\n      <% }) %>\n";
+var unified_default = "# The unified gtd workflow template — gtd's BUILT-IN DEFAULT workflow. When no\n# `workflow:` key is configured anywhere in the cwd→home config chain,\n# src/Config.ts runs this template directly, so a state command works with no\n# configuration at all. `gtd init` seeds only the settings a project tunes\n# (vars.testCommand + a modes: formatting suggestion), never the workflow\n# itself. See STATES.md §10 for the full walkthrough.\n#\n# Compiled through the exact same `compileWorkflowConfig` a user's `.gtdrc`\n# `workflow:` key goes through — no privileged code path\n# (src/workflows/templates.ts does the compiling). Every content string below\n# is INLINE (no `./`-relative file references): the bundled template ships\n# inside a single-file build (`dist/gtd.bundle.mjs`), so its content must\n# already be resolved at BUILD time. `renderInitConfig` (src/workflows/\n# templates.ts) can MATERIALIZE this inline source into a `.gtdrc.json`\n# `workflow:` value — the way to eject/customize the machine, and the hermetic\n# test fixture — but `gtd init` itself no longer writes the workflow.\n#\n# ── Authored with SUB-MACHINES (Option C) ──────────────────────────────────\n#\n# This template is written with `submachines:`/`use:` (see src/Submachines.ts\n# and STATES.md). Expansion is a compile-time raw → raw pre-pass with NO runtime\n# footprint: the pure engine only ever sees the flat concrete states, and each\n# invocation's `as:` rename map reproduces the exact state names the flat\n# template used — so the compiled `WorkflowDefinition` is BYTE-IDENTICAL to the\n# frozen `unified.flat.yaml` (pinned by src/workflows/golden.test.ts). The\n# sub-machines split into DEDUP (a gate/loop authored once, invoked several\n# times) and ENCAPSULATION (a single-instance cluster grouped for reading):\n#\n#   * makeGreen (dedup ×2)    — the check/fix/escalate health triple shared by\n#                               the simple build tail and the advanced package\n#                               loop (identical script/prompt/message).\n#   * assertGreen (dedup ×3)  — the green-baseline gate (check + human blocked)\n#                               guarding the simple, advanced and review entries.\n#   * qaLoop (dedup ×2)       — the checkbox Q&A author/answer loop shared by the\n#                               product (adv-grilling) and technical (architecting)\n#                               phases of the advanced flow.\n#   * planLoop (encap)        — the simple flow's plan-iteration loop.\n#   * humanReview (encap)     — the shared review tail (reviewing → await-review →\n#                               review-deciding → feedback collect/build).\n#   * specGate (encap)        — the advanced flow's per-package agentic review.\n#   * packageLoop (encap)     — the advanced flow's per-package build queue.\n#\n# ── Four entry points behind a green-baseline gate, one shared tail ─────────\n#\n# EVERY entry first runs the test suite and only proceeds when it is GREEN — you\n# never start new work (or a review) on top of a red baseline. A red run halts\n# at a human `*-start-blocked` gate (fix the failures and re-run, exactly like\n# the `escalate` states), or is what `gtd fix` exists to repair.\n#\n# The initial `idle` state FORKS on which steering file the human creates,\n# routing into that flow's OWN start gate:\n#\n#   * .gtd/REQUIREMENTS.md -> `adv-start-check` -> the ADVANCED flow (product +\n#     technical Q&A, package decomposition, per-package parallel build +\n#     agentic spec-review).\n#   * anything else (e.g. .gtd/TODO.md) -> `start-check` -> the SIMPLE flow (one\n#     grilling Q&A loop, a monolithic build, no decomposition, no agentic\n#     review).\n#\n# A third entry, `gtd review <commitish>`, jumps to `review-start-check`\n# (reviewEntry) and, once green, to `reviewing` to review a foreign branch\n# through the same shared tail. A fourth, `gtd fix`, jumps to `fix-check`\n# (fixEntry): a red suite drops straight into the shared `fixing` loop and out\n# through the review + squash tail; a green suite is a no-op back to `idle`.\n#\n# All three converge at `reviewing` -> `await-review`. Ticking a REVIEW.md box\n# means only \"I reviewed this hunk\"; a COMMENT (not an unticked box) is what asks\n# for changes. Every human step at `await-review` goes to `review-deciding`,\n# which inspects the step and routes:\n#   * no comment (every box ticked, no REVIEW.md note, no code edit) -> the diff\n#     is a bare REVIEW.md deletion -> squashing -> done (the ONLY path to the\n#     finale — the whole cycle collapses into one commit).\n#   * any comment — a note in REVIEW.md OR a hand-edit to code — ->\n#     review-deciding writes REVIEW_FEEDBACK.md -> feedback-building implements\n#     it (completing any code the human hand-edited, never reverting their\n#     lines) -> checking -> reviewing regenerates an INCREMENTAL REVIEW.md\n#     (review-deciding carries `reviewBase: true`, so each feedback round's\n#     review + checkout window covers only `last-review..HEAD`, i.e. the agent's\n#     follow-through, not the human's own edit) -> await-review, looping until\n#     sign-off.\n# Two dead ends never commit: the sign-off gate (src/program.ts) REFUSES a step\n# that leaves a box unticked with no comment (finish reviewing first) and a\n# deleted REVIEW.md (restore it and tick the boxes).\n#\n# The shared health segment (`checking`/`fixing`/`escalate`) serves the simple\n# build and the feedback loop — its green edge targets\n# `reviewing`. The advanced per-package loop keeps its OWN health triple\n# (`adv-checking`/`adv-fixing`/`adv-escalate`) because its green edge targets\n# the per-package `spec-review` gate instead.\n#\n# KNOWN LIMITATION: `on` pattern keys are NOT Eta templates — they keep the\n# LITERAL `.gtd/...` paths matching these vars' DEFAULT values. Repointing a\n# file var changes what templates read/write WITHOUT changing what the `on`\n# patterns match, desyncing the machine (see docs/configuration.md).\n\nvars:\n  testCommand: npm test\n  todoFile: .gtd/TODO.md\n  requirementsFile: .gtd/REQUIREMENTS.md\n  architectureFile: .gtd/ARCHITECTURE.md\n  packagesDir: .gtd/packages\n  nextFile: .gtd/NEXT.md\n  reviewFile: .gtd/REVIEW.md\n  reviewRawFile: .gtd/REVIEW_RAW.md\n  reviewFeedbackFile: .gtd/REVIEW_FEEDBACK.md\n  feedbackFile: .gtd/FEEDBACK.md\n  specFeedbackFile: .gtd/SPEC_FEEDBACK.md\n  commitMsgFile: .gtd/COMMIT_MSG.md\n  # The two opaque model tiers every agent state draws from — repoint them here\n  # (or via a top-level `.gtdrc` `vars:` key / a `GTD_VAR_plannerModel` env var)\n  # to change every state on that tier at once. `plannerModel` (default \"smart\")\n  # is the heavier tier for the one-shot planning/architecting/review turns;\n  # `coderModel` (default \"base\") is the tier for the build/fix turns.\n  plannerModel: smart\n  coderModel: base\n\nsubmachines:\n  # ── DEDUP: the check/fix/escalate health triple ───────────────────────────\n  # Runs the suite; a red run records .gtd/FEEDBACK.md, a green run cleans it up.\n  # The `on` rules turn that into \"fix\" vs \"$onGreen\". The fix turn retries up to\n  # 3× before escalating to a human. Invoked for the shared build tail\n  # (checking/fixing/escalate -> reviewing) and the advanced package loop\n  # (adv-checking/adv-fixing/adv-escalate -> spec-review).\n  makeGreen:\n    params: [onGreen, escalateDescribe, checkLabel, fixLabel, escalateLabel]\n    states:\n      check:\n        actor: check\n        label: $checkLabel\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn — run the suite; a red run records .gtd/FEEDBACK.md, a\n          # green run cleans it up. The `on` rules decide what that means.\n          set +e\n          mkdir -p .gtd\n          # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n          # newline after an interpolation tag, so no tag may be the last token on\n          # a line — it would glue the next line's `else`/`fi` onto it and break\n          # the script. Below this point everything is plain bash.\n          feedback=\"<%~ it.vars.feedbackFile %>\"\n          <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n          code=$?\n          if [ \"$code\" -ne 0 ]; then\n            if [ -s .gtd/.check-output ]; then\n              mv .gtd/.check-output \"$feedback\"\n            else\n              rm -f .gtd/.check-output\n              printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n            fi\n          else\n            rm -f .gtd/.check-output\n            rm -f \"$feedback\"\n          fi\n        on:\n          \"A .gtd/FEEDBACK.md\": fix\n          \"M .gtd/FEEDBACK.md\": fix\n          \"D .gtd/FEEDBACK.md\": $onGreen\n          \"C\": $onGreen\n      fix:\n        actor: agent\n        label: $fixLabel\n        file: <%= it.vars.feedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: fix\n        retry:\n          max: 3\n          otherwise: escalate\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.feedbackFile %>`, which this prompt tells you to address.\n\n          Read `<%= it.vars.feedbackFile %>` (the failing test output) and fix the\n          code so the suite passes. Keep the change focused — do not refactor\n          unrelated code. If the feedback is wrong, empty or delete\n          `<%= it.vars.feedbackFile %>` instead of \"fixing\" a non-issue.\n\n          Leave everything uncommitted and finish your turn — do not commit.\n        on:\n          \"* **\": check\n      escalate:\n        actor: human\n        label: $escalateLabel\n        file: <%= it.vars.feedbackFile %>\n        message: |\n          The agent could not get the check to pass after repeated attempts.\n          `<%= it.vars.feedbackFile %>` holds the last failing output.\n\n          What each change does next (then run `gtd step human`):\n          <% it.edges.forEach(function (e) { if (e.describe) { %>\n          <%~ \"- \" + e.describe + \"\\n\" %>\n          <% } }) %>\n        on:\n          \"* **\":\n            to: check\n            describe: $escalateDescribe\n\n  # ── DEDUP: the green-baseline gate ─────────────────────────────────────────\n  # Runs the suite before any work starts (its script is the health check's test\n  # wrapper — red -> .gtd/FEEDBACK.md, green -> remove it); the `on` rules turn\n  # that into \"halt at blocked\" vs \"proceed to $onGreen\". The script and blocked\n  # message/describe differ per entry, so they ride in as `with:` params.\n  assertGreen:\n    params: [onGreen, checkScript, blockedMessage, blockedDescribe, checkLabel, blockedLabel]\n    states:\n      check:\n        actor: check\n        label: $checkLabel\n        script: $checkScript\n        on:\n          \"A .gtd/FEEDBACK.md\": blocked\n          \"M .gtd/FEEDBACK.md\": blocked\n          \"D .gtd/FEEDBACK.md\": $onGreen\n          \"C\": $onGreen\n      blocked:\n        actor: human\n        label: $blockedLabel\n        file: <%= it.vars.feedbackFile %>\n        message: $blockedMessage\n        on:\n          \"* **\":\n            to: check\n            describe: $blockedDescribe\n\n  # ── DEDUP: the checkbox Q&A author/answer loop ─────────────────────────────\n  # The agent develops a plan file, surfacing `## Open Questions` as checkbox\n  # lists; the human answers (answerGate refuses an unanswered step) and either\n  # advances or sends it back. Invoked for the product (adv-grilling) and\n  # technical (architecting) phases of the advanced flow.\n  qaLoop:\n    params:\n      [\n        authorFile,\n        authorPrompt,\n        answerMessage,\n        onAdvance,\n        advanceDescribe,\n        editDescribe,\n        authorLabel,\n        answerLabel,\n      ]\n    states:\n      author:\n        actor: agent\n        label: $authorLabel\n        file: $authorFile\n        mode: qa\n        model: <%= it.vars.plannerModel %>\n        memory: plan\n        prompt: $authorPrompt\n        on:\n          \"* **\": answer\n      answer:\n        actor: human\n        label: $answerLabel\n        file: $authorFile\n        mode: qa\n        answerGate: true\n        message: $answerMessage\n        on:\n          \"C\":\n            to: $onAdvance\n            describe: $advanceDescribe\n          \"* **\":\n            to: author\n            describe: $editDescribe\n\n  # ── ENCAPSULATION: the simple flow's plan-iteration loop ───────────────────\n  planLoop:\n    params: [onAccept]\n    states:\n      planning:\n        actor: agent\n        label: Refining the plan\n        file: <%= it.vars.todoFile %>\n        model: <%= it.vars.plannerModel %>\n        memory: plan\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.todoFile %>`, which this prompt tells you to develop.\n\n          `<%= it.vars.todoFile %>` holds a short sketch of what to build — or, on a\n          return lap, the plan you already wrote plus the human's edits and comments\n          on it. Read it, explore the codebase, and develop it into a concrete\n          implementation plan: the files to change, the approach, and the steps to\n          take.\n\n          Do NOT ask questions and do NOT add an \"Open Questions\" section — decide\n          every open point yourself and write the plan as a set of concrete\n          decisions. Where a decision is genuinely a judgement call, state the\n          choice you made and, in one line, why. The human iterates on the plan by\n          editing it directly, not by answering questions.\n\n          On a return lap, `<%= it.vars.todoFile %>` carries the human's edits and\n          inline comments on your previous plan. Fold every edit and comment into a\n          revised, self-contained plan and remove the addressed comments — the plan\n          is always the current, clean proposal, never a diff.\n\n          Leave `<%= it.vars.todoFile %>` uncommitted and finish your turn — do\n          not commit, and do not run `gtd step agent` yourself; the harness does\n          that.\n        on:\n          \"* **\": plan-review\n\n      plan-review:\n        actor: human\n        label: Awaiting your review\n        file: <%= it.vars.todoFile %>\n        message: |\n          `<%= it.vars.todoFile %>` holds the proposed implementation plan. Read it,\n          then either accept it as-is or edit it — rewrite a step, add a\n          constraint, or drop an inline comment — to send it back for another round.\n\n          What each change does next (then run `gtd step human`):\n          <% it.edges.forEach(function (e) { if (e.describe) { %>\n          <%~ \"- \" + e.describe + \"\\n\" %>\n          <% } }) %>\n        on:\n          \"C\":\n            to: $onAccept\n            describe: >-\n              Change nothing to accept the plan as-is and move on to implementation\n              (**building**).\n          \"* **\":\n            to: planning\n            describe: >-\n              Edit the plan — rewrite a step, add a constraint, or leave an inline\n              comment — to send it back for another round (**planning**).\n\n  # ── ENCAPSULATION: the shared review tail ──────────────────────────────────\n  humanReview:\n    params: [onSignoff]\n    states:\n      reviewing:\n        actor: agent\n        label: Reviewing\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        # `gtd review <commitish>` (a plain non-gtd branch, e.g. a colleague's PR)\n        # does NOT enter here directly — it enters `review-start-check` (reviewEntry)\n        # first, which runs the green-baseline gate and, once green, transitions\n        # here. The `Gtd-Review-Base:` trailer rides on that entry commit (the\n        # process's oldest), so everything below still reuses the same\n        # reviewing/await-review/feedback machinery over <commitish>..HEAD.\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.reviewFile %>`, which this prompt tells you to write.\n\n          Write `<%= it.vars.reviewFile %>` to help a human review the diff below in\n          this EXACT format:\n\n          - First non-blank line: `# Review: <%= it.currentCommit.slice(0, 7) %>`\n          - Somewhere in the document: `<!-- base: <%= it.startCommit %> -->`\n          - At least one `## <Chunk Title>` heading, grouping hunks semantically\n            (same feature/refactor/fix, even across files) — a short explanation of\n            what changed and why, then one `- [ ] ./path/to/file.ts#42 — note` file\n            pointer per hunk (checkboxes are for the human to tick, not you; every\n            path is `./`-relative, with an optional `#line` and an optional\n            ` — note`).\n\n          The diff below is `it.reviewDiff` — on a feedback round it covers ONLY the\n          changes made since the previous review, so you review just what changed,\n          not items already signed off. Leave `<%= it.vars.reviewFile %>`\n          uncommitted and finish your turn.\n          <% if (it.reviewDiff.trim()) { %>\n\n          ## Full diff under review\n\n          ```diff\n          <%~ it.reviewDiff %>\n          ```\n          <% } %>\n        on:\n          \"* **\": await-review\n\n      await-review:\n        actor: human\n        label: Awaiting your review\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        # While the cycle rests here, gtd opens a \"review checkout window\": raw HEAD\n        # is rewound to the review base (the most-recent `review-deciding` commit —\n        # so a feedback round shows only `last-review..HEAD` — or the process start\n        # on the first review) with the working tree untouched, surfacing the diff\n        # as ordinary uncommitted changes. It closes on the next invocation.\n        #\n        # Every human step here routes to `review-deciding`, which decides sign-off\n        # vs. feedback from the step's CONTENT (a comment, not a tick). Ticking a box\n        # only records \"I reviewed this hunk\". Two dead ends can't be told apart by a\n        # file-pattern edge, so the sign-off gate (`enforceReviewSignoffGate` in\n        # src/program.ts) catches them BEFORE the step commits and refuses: an\n        # unfinished review (a box still `- [ ]` with no comment) and a deleted\n        # REVIEW.md.\n        reviewWindow: true\n        message: |\n          `<%= it.vars.reviewFile %>` holds the review record for the cycle — one\n          `- [ ]` checkbox per reviewable item, grouped into chunks. Tick a box\n          (`- [x]`) as you review each hunk; ticking only records that you've read\n          it, it is not sign-off.\n\n          When you've been through the whole diff, run `gtd step human`:\n\n          - Tick EVERY box and leave no comment — no note in\n            `<%= it.vars.reviewFile %>`, no code edit — to sign off and collapse the\n            cycle into one commit (**squashing**).\n          - Leave a comment to request changes — a note on a\n            `<%= it.vars.reviewFile %>` line, or a direct code edit — to send it to a\n            build + re-review round (**review-deciding** → **feedback-building**). A\n            code edit counts as your own fix: the agent completes the follow-through\n            it implies and never reverts your lines.\n\n          Stepping with a box still unticked and no comment is refused (finish\n          reviewing first); so is deleting `<%= it.vars.reviewFile %>`.\n        on:\n          \"* **\": review-deciding\n\n      review-deciding:\n        actor: check\n        label: Reviewing\n        file: <%= it.vars.reviewFile %>\n        mode: review\n        # Anchors the INCREMENTAL review base: its most-recent in-process commit is\n        # the point the previous review round ended, so the next `reviewing` turn\n        # (and the review checkout window) covers only the changes since then. On\n        # the first review there is no such commit, so the base is the cycle start.\n        reviewBase: true\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn — decide the human's review step from its CONTENT. HEAD is\n          # the human's `await-review -> review-deciding` commit; HEAD^ is the\n          # `reviewing` commit that wrote the agent's original REVIEW.md (the sign-off\n          # gate refuses an incomplete step, so review-deciding is entered exactly\n          # once per round — nothing commits in between). It is FEEDBACK when the\n          # human left a comment: a note in REVIEW.md (any edit beyond a \"[ ]\"->\"[x]\"\n          # tick) OR a hand-edit to any non-.gtd/ file this round. Otherwise it is a\n          # clean sign-off. This turn only CAPTURES the raw material into REVIEW_RAW.md\n          # (the `feedback-collecting` agent then turns it into instructions); it does\n          # NOT interpret it. Either way, remove REVIEW.md; what the resulting diff\n          # MEANS is decided by this state's own `on` rules — the A/M REVIEW_RAW.md\n          # rows are declared BEFORE the D REVIEW.md row so a feedback round (which\n          # also deletes REVIEW.md) is captured as feedback, not mistaken for a\n          # sign-off.\n          set +e\n          mkdir -p .gtd\n          # Hoist the paths once, at the TOP: Eta's autoTrim eats the newline after\n          # an interpolation tag, so no tag may be the last token on a line — it\n          # would glue the next line onto it and break the script. Below this point\n          # everything is plain bash.\n          reviewFile=\"<%~ it.vars.reviewFile %>\"\n          reviewRawFile=\"<%~ it.vars.reviewRawFile %>\"\n          # Which non-.gtd/ files did the human hand-edit this round?\n          codeFiles=$(git diff-tree --no-commit-id --name-only -r HEAD | grep -v '^\\.gtd/')\n          # A note is any REVIEW.md change beyond a checkbox flip: normalize every\n          # \"[ ]\"/\"[x]\" to a placeholder, then compare the agent's original (HEAD^)\n          # against the human's version (HEAD).\n          notes=\"\"\n          before=$(git show \"HEAD^:$reviewFile\" 2>/dev/null | sed -E 's/\\[[ xX]\\]/[_]/g')\n          after=$(git show \"HEAD:$reviewFile\" 2>/dev/null | sed -E 's/\\[[ xX]\\]/[_]/g')\n          if [ \"$before\" != \"$after\" ]; then notes=1; fi\n          if [ -n \"$codeFiles\" ] || [ -n \"$notes\" ]; then\n            {\n              echo \"Raw review material captured for classification. The human reviewed the diff and left the feedback below; a downstream agent turns it into an instruction list. This file is machine-captured input, not instructions.\"\n              if [ -n \"$notes\" ]; then\n                echo\n                echo \"## Notes the human added to REVIEW.md this round\"\n                echo\n                echo '```diff'\n                git show HEAD --format= -- \"$reviewFile\"\n                echo '```'\n              fi\n              if [ -n \"$codeFiles\" ]; then\n                echo\n                echo \"## Files the human hand-edited this round (already committed)\"\n                echo\n                echo '```diff'\n                git show HEAD --format= -- $codeFiles\n                echo '```'\n              fi\n            } > \"$reviewRawFile\"\n          fi\n          rm -f \"$reviewFile\"\n        on:\n          \"A .gtd/REVIEW_RAW.md\": feedback-collecting\n          \"M .gtd/REVIEW_RAW.md\": feedback-collecting\n          \"D .gtd/REVIEW.md\": $onSignoff\n\n      feedback-collecting:\n        actor: agent\n        label: Collecting your feedback\n        file: <%= it.vars.reviewFeedbackFile %>\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        prompt: |\n          You are an autonomous coding agent turning raw review feedback into an\n          explicit instruction list for a builder. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.reviewRawFile %>` (delete it when done) and\n          `<%= it.vars.reviewFeedbackFile %>` (write it). Do NOT change any other\n          file — you classify, you do not build.\n\n          The raw review material is: <%~ it.read(it.vars.reviewRawFile) %>\n\n          Classify every piece of it into `<%= it.vars.reviewFeedbackFile %>` as a\n          flat, numbered instruction list. Each item is `N. ./path/to/file.ts#line —\n          <imperative>`. Read the two RAW sections and apply these rules exactly:\n\n          1. NOTES the human added to REVIEW.md — each note is a MANDATORY change,\n             regardless of whether its checkbox is ticked (ticking means only \"I read\n             this hunk\", never sign-off). Anchor each to the `./path#line` its review\n             item names (or the chunk it sits under). Emit it as a concrete\n             imperative.\n          2. Every COMMENT the human ADDED this round (a `+` line that is a code\n             comment, in the hand-edited files) is a MANDATORY instruction the human\n             is giving the builder — even a plain-prose one, even if its box is\n             ticked. Emit an imperative to satisfy it and note that the comment line\n             itself must be REMOVED once addressed. If a comment turns out to describe\n             behaviour the code already has, the instruction is still \"confirm the\n             code matches and remove the comment line\".\n          3. Every NON-comment code line the human hand-edited is an already-committed\n             INTENT, NOT a do-then-delete item. Emit an instruction that names those\n             files and says: their lines are final — complete ONLY the follow-through\n             they imply (callers, tests, types, docs) and NEVER revert or rewrite\n             them. Do not turn their own edit into a task.\n\n          Split each hand-edited hunk per line: comment `+` lines follow rule 2, the\n          surrounding real code follows rule 3.\n\n          If — and only if — nothing in the raw material is actionable (e.g. the human\n          left only an approving remark), write `<%= it.vars.reviewFeedbackFile %>`\n          containing exactly one line: `NOTHING ACTIONABLE — <one-sentence reason>`.\n          Never invent work to satisfy a non-actionable remark.\n\n          Delete `<%= it.vars.reviewRawFile %>`, leave everything else uncommitted,\n          and finish your turn.\n        on:\n          \"A .gtd/REVIEW_FEEDBACK.md\": feedback-building\n          \"M .gtd/REVIEW_FEEDBACK.md\": feedback-building\n\n      feedback-building:\n        actor: agent\n        label: Addressing your feedback\n        file: <%= it.vars.reviewFeedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: build\n        # Refuse a work-free turn: a step whose only pending change is deleting the\n        # instructions file (the original \"captured then discarded\" bug). The edge\n        # gate (`enforceFeedbackProgressGate` in src/program.ts) reads this flag and\n        # exempts a `NOTHING ACTIONABLE` sentinel (a non-actionable review round,\n        # which legitimately makes no code change). The pure engine carries it inert.\n        requireProgress: true\n        prompt: |\n          You are an autonomous coding agent addressing review feedback. `.gtd/`\n          holds this workflow's own state — never create, edit, or delete anything\n          under `.gtd/` except `<%= it.vars.reviewFeedbackFile %>`, which this\n          prompt tells you to address and then delete.\n\n          The instructions to implement are: <%~ it.read(it.vars.reviewFeedbackFile) %>\n\n          This is a flat instruction list, not a diff — execute every item exactly as\n          written, no Q&A, no re-planning, using TDD discipline:\n\n          - An item that says the human's own lines are final: build ON TOP of them to\n            complete only the follow-through it names (callers, tests, types, docs).\n            NEVER revert or rewrite the lines they already committed.\n          - An item derived from a human comment: satisfy it AND delete that comment\n            line from the code (the human's review comments are transient — none of\n            them survive this round).\n\n          If the file's sole content is a `NOTHING ACTIONABLE` line, make no code\n          change; just delete the instructions file.\n\n          Delete `<%= it.vars.reviewFeedbackFile %>` once every item is addressed.\n          Leave everything else uncommitted and finish your turn. Deleting the\n          instructions file WITHOUT making the changes it asks for is refused — the\n          feedback must actually be addressed.\n        on:\n          \"* **\": checking\n\n  # ── ENCAPSULATION: the advanced flow's per-package agentic review ──────────\n  specGate:\n    params: [onApproved]\n    states:\n      spec-review:\n        actor: agent\n        label: Reviewing the package\n        model: <%= it.vars.plannerModel %>\n        memory: review\n        # Bounded per cycle: once entered `max` times, a transition into it is\n        # redirected to `closing` (force-close the package and move on — the\n        # unresolved concern is deferred to the shared human review at the tail,\n        # which sees the whole diff anyway). NOTE the cap is PROCESS-scoped, so it\n        # pools across packages — the same documented limitation the shared\n        # `fixing` cap has (see STATES.md / docs/configuration.md).\n        retry:\n          max: 3\n          otherwise: $onApproved\n        prompt: |\n          You are an autonomous coding agent reviewing a freshly-built work package\n          against its own spec. `.gtd/` holds this workflow's own state — never\n          create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.specFeedbackFile %>`, which this prompt tells you to write\n          when — and only when — you find problems.\n\n          The package spec is: <%~ it.read(it.vars.nextFile) %>\n\n          Read that spec, then verify the package's implementation (the diff below)\n          against it: are all its tasks done, acceptance criteria met, and the code\n          sound and consistent with the codebase?\n\n          - If it fully satisfies the spec, write NOTHING and finish your turn — a\n            clean turn is your approval.\n          - If it does not, write `<%= it.vars.specFeedbackFile %>` listing the\n            concrete problems for a fix turn to address. Be specific.\n\n          Do not fix anything yourself and do not delete the package file — a later\n          step owns that. Finish your turn.\n          <% if (it.processDiff.trim()) { %>\n\n          ## Diff under review\n\n          ```diff\n          <%~ it.processDiff %>\n          ```\n          <% } %>\n        on:\n          \"A .gtd/SPEC_FEEDBACK.md\": spec-fix\n          \"M .gtd/SPEC_FEEDBACK.md\": spec-fix\n          \"D .gtd/SPEC_FEEDBACK.md\": $onApproved\n          \"C\": $onApproved\n\n      spec-fix:\n        actor: agent\n        label: Fixing review feedback\n        file: <%= it.vars.specFeedbackFile %>\n        model: <%= it.vars.coderModel %>\n        memory: fix\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/` except\n          `<%= it.vars.specFeedbackFile %>`, which this prompt tells you to address\n          and then delete.\n\n          Read `<%= it.vars.specFeedbackFile %>` (the reviewer's concerns about the\n          current package) and the package spec (`<%= it.read(it.vars.nextFile) %>`),\n          then fix the code to resolve every concern. Keep the change focused.\n\n          Delete `<%= it.vars.specFeedbackFile %>` once every concern is addressed.\n          Leave everything else uncommitted and finish your turn.\n        on:\n          \"* **\": adv-checking\n\n  # ── ENCAPSULATION: the advanced flow's per-package build queue ─────────────\n  packageLoop:\n    params: [onDrained]\n    states:\n      picking:\n        actor: check\n        label: Picking the next package\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn (the package queue arbiter) — the loop driver executes\n          # this verbatim, then steps the check actor. Mechanics only: take the\n          # first package file (by name) under the packages dir into NEXT.md, or\n          # remove NEXT.md when the queue is empty. What NEXT.md's presence/absence\n          # MEANS (another package to build vs. the queue closing out to review) is\n          # decided by this state's own `on` rules at capture time — never here.\n          set +e\n          # Hoist the NEXT path once, at the TOP: Eta's autoTrim eats the newline\n          # after an interpolation tag, so no tag may be the last token on a line —\n          # it would glue the next line's `else`/`fi` onto it and break the script.\n          # Below this point everything is plain bash.\n          nextFile=\"<%~ it.vars.nextFile %>\"\n          next=$(ls <%~ it.vars.packagesDir %>/*.md 2>/dev/null | head -n 1)\n          if [ -n \"$next\" ]; then\n            printf '%s' \"$next\" > \"$nextFile\"\n          else\n            rm -f \"$nextFile\"\n          fi\n        on:\n          \"D .gtd/NEXT.md\": $onDrained\n          \"* .gtd/NEXT.md\": adv-building\n          \"C\": $onDrained\n\n      adv-building:\n        actor: agent\n        label: Building\n        model: <%= it.vars.coderModel %>\n        memory: build\n        prompt: |\n          You are an autonomous coding agent. `.gtd/` holds this workflow's own\n          state — never create, edit, or delete anything under `.gtd/`; in\n          particular do NOT delete the package file (the `spec-review` gate reads it\n          after you) and never touch `<%= it.vars.nextFile %>` — the `picking` state\n          owns it.\n\n          The package to implement is: <%~ it.read(it.vars.nextFile) %>\n\n          That file describes a set of INDEPENDENT tasks. Implement ALL of them in\n          this one turn, fanning the independent tasks out to parallel subagents\n          where your harness supports it — each task is self-contained and can be\n          built concurrently. Implement EXACTLY the tasks this package describes — no\n          more, no less; leave every other package file untouched. Use TDD\n          discipline within each task.\n\n          Leave the package file in place and everything else uncommitted, then\n          finish your turn.\n        on:\n          \"* **\": adv-checking\n\n      closing:\n        actor: check\n        label: Closing out the package\n        script: |\n          #!/usr/bin/env bash\n          # gtd check turn (the package closer) — remove the just-reviewed package\n          # file (its path is in NEXT.md) plus any leftover spec feedback, so\n          # `picking` selects the NEXT package (or falls through to review when the\n          # queue is empty). Reached on approval (spec-review clean) and on the\n          # spec-review retry cap (force-close, deferring the concern to the tail).\n          set +e\n          pkg=$(cat <%~ it.vars.nextFile %> 2>/dev/null)\n          [ -n \"$pkg\" ] && rm -f \"$pkg\"\n          rm -f <%~ it.vars.specFeedbackFile %> <%~ it.vars.nextFile %>\n        on:\n          \"* **\": picking\n\nuse:\n  # Shared health triple: checking/fixing/escalate -> reviewing.\n  - submachine: makeGreen\n    name: build\n    as: { check: checking, fix: fixing, escalate: escalate }\n    with:\n      onGreen: reviewing\n      escalateDescribe: >-\n        Fix the failure yourself — edit the code and/or `.gtd/FEEDBACK.md` —\n        to re-run the check (**checking**).\n      checkLabel: Running checks\n      fixLabel: Fixing the check\n      escalateLabel: Escalating to a human\n  # Advanced package health triple: adv-checking/adv-fixing/adv-escalate -> spec-review.\n  - submachine: makeGreen\n    name: pkg\n    as: { check: adv-checking, fix: adv-fixing, escalate: adv-escalate }\n    with:\n      onGreen: spec-review\n      escalateDescribe: >-\n        Fix the failure yourself — edit the code and/or\n        `.gtd/FEEDBACK.md` — to re-run the check (**adv-checking**).\n      checkLabel: Running checks\n      fixLabel: Fixing the check\n      escalateLabel: Escalating to a human\n\n  # Green-baseline gate: simple flow entry.\n  - submachine: assertGreen\n    name: start\n    as: { check: start-check, blocked: start-blocked }\n    with:\n      onGreen: planning\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before starting new work; a red run\n        # records .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start new work on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**start-check**). To repair the baseline as\n        its own separate reviewed commit instead, abandon this start and run\n        `gtd fix` from a clean `idle`.\n      checkLabel: Checking the baseline\n      blockedLabel: Baseline is red\n\n  # Green-baseline gate: advanced flow entry.\n  - submachine: assertGreen\n    name: adv-start\n    as: { check: adv-start-check, blocked: adv-start-blocked }\n    with:\n      onGreen: adv-grilling\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before starting the advanced flow; a red\n        # run records .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start new work on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**adv-start-check**). To repair the baseline\n        as its own separate reviewed commit instead, abandon this start and run\n        `gtd fix` from a clean `idle`.\n      checkLabel: Checking the baseline\n      blockedLabel: Baseline is red\n\n  # Green-baseline gate: `gtd review` entry (reviewEntry -> reviewing).\n  - submachine: assertGreen\n    name: review-start\n    as: { check: review-start-check, blocked: review-start-blocked }\n    set:\n      check: { reviewEntry: true }\n    with:\n      onGreen: reviewing\n      checkScript: |\n        #!/usr/bin/env bash\n        # gtd check turn — run the suite before reviewing; a red run records\n        # .gtd/FEEDBACK.md (halt), a green run cleans it up (proceed to reviewing).\n        set +e\n        mkdir -p .gtd\n        # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n        # newline after an interpolation tag, so no tag may be the last token on\n        # a line — it would glue the next line's `else`/`fi` onto it and break\n        # the script. Below this point everything is plain bash.\n        feedback=\"<%~ it.vars.feedbackFile %>\"\n        <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n        code=$?\n        if [ \"$code\" -ne 0 ]; then\n          if [ -s .gtd/.check-output ]; then\n            mv .gtd/.check-output \"$feedback\"\n          else\n            rm -f .gtd/.check-output\n            printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n          fi\n        else\n          rm -f .gtd/.check-output\n          rm -f \"$feedback\"\n        fi\n      blockedMessage: |\n        The test baseline is red — gtd will not start a review on a broken suite.\n        `<%= it.vars.feedbackFile %>` holds the failing output.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      blockedDescribe: >-\n        Fix the failing tests — edit the code and/or `.gtd/FEEDBACK.md` — to\n        re-run the baseline check (**review-start-check**).\n      checkLabel: Checking the baseline\n      blockedLabel: Baseline is red\n\n  # Advanced flow: product Q&A loop (adv-grilling/adv-grilling-answer -> architecting).\n  - submachine: qaLoop\n    name: grill\n    as: { author: adv-grilling, answer: adv-grilling-answer }\n    with:\n      authorFile: <%= it.vars.requirementsFile %>\n      onAdvance: architecting\n      authorPrompt: |\n        You are an autonomous coding agent. `.gtd/` holds this workflow's own\n        state — never create, edit, or delete anything under `.gtd/` except\n        `<%= it.vars.requirementsFile %>`, which this prompt tells you to develop.\n\n        `<%= it.vars.requirementsFile %>` holds the product requirements (or the\n        plan you already wrote plus the human's answers on a return lap). Read it,\n        explore the codebase, and develop it into a concrete, PRODUCT-level plan\n        in this one turn.\n\n        Scope: product and user-facing decisions only. Leave implementation\n        details (file/module structure, data models, tech-stack choices) for the\n        next phase (`<%= it.vars.architectureFile %>`).\n\n        For every open point you cannot settle yourself, add a question under a\n        `## Open Questions` heading near the top: one `### <question>` sub-heading\n        each, followed by a checkbox list of candidate answers — aim for TWO\n        concrete options plus a final free-text slot, ALL left UNTICKED:\n\n            ### <the question>\n\n            - [ ] <first option — a concrete answer, a few words of rationale>\n            - [ ] <second option>\n            - [ ] _your answer_\n\n        Never tick a box yourself — the human ticks exactly one per question. The\n        last `- [ ] _your answer_` line is the human's own-answer slot; write it\n        with the literal `_your answer_` placeholder and leave it for them.\n\n        On a RETURN lap the human has ticked one option per question (or replaced\n        `_your answer_` with their own text). For each answered question: fold the\n        chosen answer into the plan prose, then MOVE the question down into a\n        `## Answered Questions` section as `### <question>` followed by the\n        resolved answer in plain PROSE (drop the checkboxes). Never re-raise a\n        question the human deleted; if the human deleted the whole\n        `## Open Questions` section, treat the plan as accepted and surface no new\n        questions unless something is genuinely still blocking. Omit\n        `## Open Questions` entirely once there are none left.\n\n        Leave `<%= it.vars.requirementsFile %>` uncommitted and finish your turn.\n      answerMessage: |\n        `<%= it.vars.requirementsFile %>` holds the product plan under\n        development. Each question under `## Open Questions` offers a few options\n        plus a `- [ ] _your answer_` slot. Answer EVERY question by ticking\n        exactly one box (`- [x]`); for your own answer, replace `_your answer_`\n        with your text and tick that line. Stepping is refused while any question\n        is unanswered.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      advanceDescribe: >-\n        With no open questions left (the agent surfaced none, or you deleted\n        the section and it finalized the plan), change nothing to accept the\n        product plan and move on to technical architecting (**architecting**).\n      editDescribe: >-\n        Tick exactly one option per open question (replace `_your answer_` for\n        your own) to send the plan back for the agent to fold your answers in\n        (**adv-grilling**). Delete a question to skip it, or delete the whole\n        `## Open Questions` section to accept the plan as-is.\n      authorLabel: Refining the product plan\n      answerLabel: Awaiting your answers\n\n  # Advanced flow: technical Q&A loop (architecting/architecting-answer -> decompose).\n  - submachine: qaLoop\n    name: arch\n    as: { author: architecting, answer: architecting-answer }\n    with:\n      authorFile: <%= it.vars.architectureFile %>\n      onAdvance: decompose\n      authorPrompt: |\n        You are an autonomous coding agent. `.gtd/` holds this workflow's own\n        state — never create, edit, or delete anything under `.gtd/` except\n        `<%= it.vars.architectureFile %>` and `<%= it.vars.requirementsFile %>`,\n        which this prompt tells you to write and delete respectively.\n\n        Read `<%= it.vars.requirementsFile %>` (the converged product plan) and\n        develop `<%= it.vars.architectureFile %>` from it in this one turn:\n        file/module structure, data models, library/tech-stack choices,\n        error-handling strategy — the *how*, building on the *what* already\n        settled. Do not re-open product-level decisions; treat them as settled.\n\n        For every open point you cannot settle yourself, add a question under a\n        `## Open Questions` heading exactly as the grilling phase does: one\n        `### <question>` each, followed by a checkbox list — TWO concrete options\n        plus a final free-text slot, ALL left UNTICKED:\n\n            ### <the question>\n\n            - [ ] <first option>\n            - [ ] <second option>\n            - [ ] _your answer_\n\n        Never tick a box yourself. On a RETURN lap the human has ticked one option\n        per question (or replaced `_your answer_` with their own text): fold each\n        chosen answer into the plan prose, then MOVE the question into a\n        `## Answered Questions` section as `### <question>` + the resolved answer\n        in plain PROSE (drop the checkboxes). Never re-raise a deleted question;\n        treat a deleted `## Open Questions` section as acceptance. Omit\n        `## Open Questions` once there are none left.\n\n        Once `<%= it.vars.architectureFile %>` is written, delete\n        `<%= it.vars.requirementsFile %>` — its content has been folded in and it\n        must not linger. Leave everything uncommitted and finish your turn.\n      answerMessage: |\n        `<%= it.vars.architectureFile %>` holds the technical plan under\n        development. Each question under `## Open Questions` offers a few options\n        plus a `- [ ] _your answer_` slot. Answer EVERY question by ticking\n        exactly one box (`- [x]`); for your own answer, replace `_your answer_`\n        with your text and tick that line. Stepping is refused while any question\n        is unanswered.\n\n        What each change does next (then run `gtd step human`):\n        <% it.edges.forEach(function (e) { if (e.describe) { %>\n        <%~ \"- \" + e.describe + \"\\n\" %>\n        <% } }) %>\n      advanceDescribe: >-\n        With no open questions left (the agent surfaced none, or you deleted\n        the section and it finalized the plan), change nothing to accept the\n        technical plan and move on to decomposing the work into packages\n        (**decompose**).\n      editDescribe: >-\n        Tick exactly one option per open question (replace `_your answer_` for\n        your own) to send the plan back for the agent to fold your answers in\n        (**architecting**). Delete a question to skip it, or delete the whole\n        `## Open Questions` section to accept the plan as-is.\n      authorLabel: Refining the technical plan\n      answerLabel: Awaiting your answers\n\n  # Simple flow plan-iteration loop (planning/plan-review -> building).\n  - submachine: planLoop\n    with:\n      onAccept: building\n\n  # Shared review tail (reviewing -> await-review -> ... -> squashing).\n  - submachine: humanReview\n    with:\n      onSignoff: squashing\n\n  # Advanced per-package agentic review (spec-review/spec-fix -> closing).\n  - submachine: specGate\n    with:\n      onApproved: closing\n\n  # Advanced per-package build queue (picking/adv-building/closing -> reviewing).\n  - submachine: packageLoop\n    with:\n      onDrained: reviewing\n\nstates:\n  # ── Shared entry ────────────────────────────────────────────────────────\n  idle:\n    actor: human\n    initial: true\n    label: Idle\n    # Every human-gate `message:` below closes with the same rendered \"What\n    # each change does next\" list, built from `it.edges` (the resting state's\n    # own `on` edges — each edge's `describe:` is the single source of truth).\n    message: |\n      No active gtd cycle.\n\n      To start one, create a steering file describing what you want built:\n\n      - `.gtd/TODO.md` — a short sketch — starts the SIMPLE flow (plan, build,\n        review).\n      - `.gtd/REQUIREMENTS.md` — the product requirements — starts the ADVANCED\n        flow (product + technical Q&A, package decomposition, parallel build,\n        per-package agentic review).\n\n      What each change does next (then run `gtd step human`):\n      <% it.edges.forEach(function (e) { if (e.describe) { %>\n      <%~ \"- \" + e.describe + \"\\n\" %>\n      <% } }) %>\n    on:\n      \"* .gtd/REQUIREMENTS.md\":\n        to: adv-start-check\n        describe: >-\n          Save the product requirements to `.gtd/REQUIREMENTS.md` to start the\n          ADVANCED flow — gtd first checks the test baseline is green, then the\n          agent develops them through product then technical Q&A, decomposes the\n          work into packages, and builds each in parallel (**adv-start-check**).\n      \"* **\":\n        to: start-check\n        describe: >-\n          Save a short sketch to `.gtd/TODO.md` (or any other change) to start\n          the SIMPLE flow — gtd first checks the test baseline is green, then the\n          agent reads it, explores the codebase, and develops it into a concrete\n          implementation plan (**start-check**).\n\n  # ── Simple flow: monolithic build (plan loop is the `planLoop` sub-machine) ─\n  building:\n    actor: agent\n    label: Building\n    file: <%= it.vars.todoFile %>\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. `.gtd/` holds this workflow's own\n      state — never create or edit anything under `.gtd/` except deleting\n      `<%= it.vars.todoFile %>`, which this prompt tells you to delete once its\n      work is complete.\n\n      The plan to implement is: <%~ it.read(it.vars.todoFile) %>\n\n      Read that plan and implement it in full. Use TDD discipline: one test,\n      then the implementation that passes it, then the next — never write all\n      the tests first.\n\n      Delete `<%= it.vars.todoFile %>` once the work it describes is complete\n      and verified. Leave everything else uncommitted and finish your turn.\n    on:\n      \"* **\": checking\n\n  # ── Advanced flow: decomposition (Q&A loops are the `qaLoop` sub-machine) ───\n  decompose:\n    actor: agent\n    label: Decomposing into packages\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. `.gtd/` holds this workflow's own\n      state — never create, edit, or delete anything under `.gtd/` except the\n      package files this prompt tells you to write (under\n      `<%= it.vars.packagesDir %>/`), and `<%= it.vars.architectureFile %>`,\n      which it tells you to delete.\n\n      Read `<%= it.vars.architectureFile %>` (the converged technical plan) and\n      decompose it into an ordered set of WORK PACKAGES, one file each under\n      `<%= it.vars.packagesDir %>/` (e.g. `<%= it.vars.packagesDir %>/01-name.md`,\n      `<%= it.vars.packagesDir %>/02-name.md`, ...). Order the packages so the\n      test suite can pass again after each one lands.\n\n      Each package file describes a set of INDEPENDENT tasks that can be\n      implemented concurrently without ordering constraints between them — a\n      single build turn will fan them out to parallel subagents. Give each task\n      a clear description, acceptance criteria as `- [ ]` checkboxes, and the\n      relevant paths. Also state the package's overall requirement so it can be\n      reviewed against its spec. Do NOT put ordering-dependent tasks in the same\n      package — split them across ordered packages instead.\n\n      No package file may reference any other `.gtd/` file. Once the package\n      files are written, delete `<%= it.vars.architectureFile %>`. Leave\n      everything uncommitted and finish your turn.\n    on:\n      \"* .gtd/packages/**\": picking\n\n  # ── Green-baseline gate: `gtd fix` entry ──────────────────────────────────\n  # `gtd fix` enters HERE (fixEntry): run the suite, then a red run drops\n  # straight into the shared `fixing` loop (-> checking -> review + squash\n  # tail); a green run is a no-op back to `idle` (nothing to fix).\n  fix-check:\n    actor: check\n    fixEntry: true\n    label: Checking the baseline\n    script: |\n      #!/usr/bin/env bash\n      # gtd check turn — run the suite to find what needs fixing; a red run\n      # records .gtd/FEEDBACK.md (-> fixing), a green run cleans it up (-> idle).\n      set +e\n      mkdir -p .gtd\n      # Hoist the feedback path once, at the TOP: Eta's autoTrim eats the\n      # newline after an interpolation tag, so no tag may be the last token on\n      # a line — it would glue the next line's `else`/`fi` onto it and break\n      # the script. Below this point everything is plain bash.\n      feedback=\"<%~ it.vars.feedbackFile %>\"\n      <%~ it.vars.testCommand %> > .gtd/.check-output 2>&1\n      code=$?\n      if [ \"$code\" -ne 0 ]; then\n        if [ -s .gtd/.check-output ]; then\n          mv .gtd/.check-output \"$feedback\"\n        else\n          rm -f .gtd/.check-output\n          printf 'the test command failed with exit code %s and produced no output.' \"$code\" > \"$feedback\"\n        fi\n      else\n        rm -f .gtd/.check-output\n        rm -f \"$feedback\"\n      fi\n    on:\n      \"A .gtd/FEEDBACK.md\": fixing\n      \"M .gtd/FEEDBACK.md\": fixing\n      \"D .gtd/FEEDBACK.md\": idle\n      \"C\": idle\n\n  # ── Shared tail: squash finale (review loop is the `humanReview` sub-machine) ─\n  squashing:\n    actor: agent\n    label: Squashing\n    file: <%= it.vars.commitMsgFile %>\n    model: <%= it.vars.coderModel %>\n    memory: build\n    prompt: |\n      You are an autonomous coding agent. The cycle is approved and done.\n      `.gtd/` holds this workflow's own state — never create, edit, or delete\n      anything under `.gtd/` except `<%= it.vars.commitMsgFile %>`, which this\n      prompt tells you to write.\n\n      Leave `<%= it.vars.commitMsgFile %>` uncommitted and finish your turn —\n      entering this file squashes everything this process retains into one\n      commit using its content as the message. The diff below is exactly what\n      that commit will contain: `it.retainedDiff`, the changes THIS process\n      made (its trace/retry boundary onward). For a normal build cycle that is\n      the whole feature; for a `gtd review` process it is only the fixes made\n      during the review — NOT the changeset that was under review.\n      <% if (it.retainedDiff.trim()) { %>\n\n      Write `<%= it.vars.commitMsgFile %>` with ONE conventional-commits message\n      for the changes below (subject line `type(scope): subject`, imperative\n      mood, <= 72 characters; a body explaining the why, trade-offs, and key\n      decisions). Plain text, no markdown wrapper.\n\n      ## Retained diff\n\n      ```diff\n      <%~ it.retainedDiff %>\n      ```\n      <% } else { %>\n\n      This process retained NO changes (a clean review sign-off with no fixes).\n      Write `<%= it.vars.commitMsgFile %>` with exactly this one line and\n      nothing else:\n\n      chore: human review\n      <% } %>\n    on:\n      \"A .gtd/COMMIT_MSG.md\": done\n      \"M .gtd/COMMIT_MSG.md\": done\n\n  done:\n    commit: |\n      <%~ it.read(it.vars.commitMsgFile) %>\n\n      Token cost: <%= it.processCost %>\n      <% it.processCostByModel.forEach(function(m){ %>\n      - <%= m.model %>: <%= m.cost %>\n      <% }) %>\n";
 //#endregion
 //#region src/workflows/templates.ts
 /**
@@ -191919,6 +191942,7 @@ const makeGitImpl = (executor, root) => {
 			})), { concurrency: "unbounded" }));
 		}),
 		lastCommitSubject: () => exec("git", "log", "-1", "--pretty=%s").pipe(map$4((s) => s.trim())),
+		lastCommitMessage: () => exec("git", "log", "-1", "--pretty=%B").pipe(map$4((s) => s.trim())),
 		hasCommits: () => exec("git", "rev-parse", "--verify", "HEAD").pipe(map$4(() => true), catchAll(() => succeed$3(false))),
 		diffRef: (ref, exclude = []) => gen(function* () {
 			const nameStatusOut = yield* exec("git", "diff", "--name-status", ref, "HEAD").pipe(catchAll(() => succeed$3("")));
@@ -192020,6 +192044,7 @@ const makeGitImpl = (executor, root) => {
 		updateRef: (ref, hash) => exec("git", "update-ref", ref, hash).pipe(asVoid),
 		deleteRef: (ref) => exec("git", "update-ref", "-d", ref).pipe(asVoid),
 		mixedResetTo: (ref) => exec("git", "reset", "--mixed", ref).pipe(asVoid),
+		hardResetTo: (ref) => exec("git", "reset", "--hard", ref).pipe(asVoid),
 		restoreStagedFrom: (source, paths) => paths.length === 0 ? _void : exec("git", "restore", "--staged", `--source=${source}`, "--", ...paths).pipe(catchAll(() => _void)),
 		addIntentToAdd: () => exec("git", "add", "--intent-to-add", ".").pipe(asVoid)
 	};
@@ -192564,6 +192589,76 @@ const renderStateTemplate = (template, context) => eta.renderString(template, co
 */
 const renderModeCommand = (template, context) => eta.renderString(template, context);
 //#endregion
+//#region src/RetainedHistory.ts
+/**
+* Retention of a squashed (or abandoned) process's turn-by-turn history —
+* Task C of `docs/design/pattern-machine-plan.md`'s follow-up note (see
+* `.gtd/packages/01-retention-primitives.md`). Squashing collapses a whole
+* cycle's turn commits into one; this module records the pre-squash tip so a
+* later `gtd restore` (a separate, not-yet-built command-layer piece of work)
+* can bring those turns back.
+*/
+/**
+* The retained-history ref lives in git's PER-WORKTREE `refs/worktree/gtd/*`
+* namespace — the same one `src/ReviewWindow.ts` uses for `REVIEW_HEAD_REF`/
+* `REVIEW_BASE_REF`, for the same reason: linked worktrees sharing one `.git`
+* must not clobber each other's retained history (issue #118).
+*/
+const HISTORY_REF = "refs/worktree/gtd/history";
+const HISTORY_TRAILER_PREFIX = "Gtd-History: ";
+const HISTORY_TRAILER_RE = /^Gtd-History:[ \t]*(\S+)[ \t]*$/m;
+/**
+* Append a `Gtd-History: <hash>` trailer (after a blank line) to a commit
+* `subject` — records the pre-squash tip commit hash so a later `gtd restore`
+* command can read it back. Mirrors `Edge.ts`'s `withReviewBaseTrailer`
+* placement: the subject (first line) is untouched.
+*/
+const withHistoryTrailer = (subject, hash) => `${subject}\n\n${HISTORY_TRAILER_PREFIX}${hash}`;
+/**
+* The `Gtd-History: <hash>` trailer recorded on a squash commit (see
+* `withHistoryTrailer`), or `undefined` when `message` carries none. Read back
+* by a later `gtd restore` command to recover the pre-squash tip.
+*/
+const parseHistoryTrailer = (message) => HISTORY_TRAILER_RE.exec(message)?.[1];
+/**
+* Record the pre-squash tip so a later `gtd restore` can find it. A no-op
+* (the git call is skipped entirely) when `tipHash === startParentHash`: an
+* empty process — no turns were ever committed — has no turn chain worth
+* keeping.
+*/
+const retainHistory = (git, tipHash, startParentHash) => tipHash === startParentHash ? _void : git.updateRef(HISTORY_REF, tipHash);
+/** A thin wrapper over `git.readRefOption(HISTORY_REF)`. */
+const readRetainedHistory = (git) => git.readRefOption(HISTORY_REF);
+/**
+* The safety predicate deciding whether a future `gtd restore` to `tipHash`
+* would be safe. Accepts exactly two shapes:
+*
+* (a) Fresh squash — HEAD IS the squash commit (a brand-new commit distinct
+*     from `tipHash`, the pre-squash tip it collapsed) and its own message
+*     still carries the `Gtd-History:` trailer pointing at that tip
+*     (`parseHistoryTrailer(headMessage) === tipHash`). Hard-resetting from
+*     here discards only that one squash commit, whose tree equals the tip's
+*     — no content loss. If HEAD's trailer names a DIFFERENT hash (or none),
+*     either a newer squash/abandon has since superseded this ref or HEAD
+*     isn't a squash commit at all, so this falls through to (b) rather than
+*     trusting a stale or absent match.
+* (b) Cleaned abandon / fast-forward — HEAD is an ancestor of the retained
+*     tip (`git.isAncestor(headHash, tipHash)`), i.e. nothing built on top of
+*     the tip would be discarded by resetting back to it.
+*
+* Anything else is refused with a reason naming what would be lost.
+*/
+const restorability = (git, headHash, headMessage, tipHash) => gen(function* () {
+	if (parseHistoryTrailer(headMessage) === tipHash) return { ok: true };
+	if (yield* git.isAncestor(headHash, tipHash)) return { ok: true };
+	return {
+		ok: false,
+		reason: "HEAD has advanced past the squash — restoring would discard commits built on top of it"
+	};
+});
+/** Idempotent: `deleteRef` already tolerates a missing ref. */
+const clearRetainedHistory = (git) => git.deleteRef(HISTORY_REF);
+//#endregion
 //#region src/Edge.ts
 /**
 * The v3 Effect edge (see `docs/design/pattern-machine-plan.md`, "Phase 3:
@@ -192814,6 +192909,18 @@ const renderMemory = (stateDef, context) => try_({
 	catch: (e) => e instanceof Error ? e : new Error(String(e))
 });
 /**
+* Render a state's declared `label:` (if any) through the SAME template
+* context as its content/`model` — see `renderModel`'s doc comment; a plain
+* label (e.g. `"planning"`) passes through unchanged, while
+* `label: "<%= it.vars.labelName %>"` resolves against the merged `it.vars`.
+* The render-failure semantics are identical (propagates as a thrown/rejected
+* error, same call site as `gtd next`/`gtd status`).
+*/
+const renderLabel = (stateDef, context) => try_({
+	try: () => stateDef.label !== void 0 ? renderStateTemplate(stateDef.label, context) : void 0,
+	catch: (e) => e instanceof Error ? e : new Error(String(e))
+});
+/**
 * Render a state's declared `file:` steering-file template (if any) through
 * the SAME template context as its content/`model` — see `renderModel`'s doc
 * comment; the render-failure semantics are identical (propagates as a
@@ -192823,7 +192930,8 @@ const renderFile = (stateDef, context) => try_({
 	try: () => stateDef.file !== void 0 ? renderStateTemplate(stateDef.file, context) : void 0,
 	catch: (e) => e instanceof Error ? e : new Error(String(e))
 });
-/** Render the resolved rest's declared content (script/prompt/message — never `commit`, since `resolveRest` never rests at a commit state) plus its `model:`/`memory:`/`file:` hints, if declared (see `renderModel`/`renderMemory`/`renderFile`). `mode:` is a closed literal, never Eta-rendered — passed through verbatim. */
+const omitUndefined = (obj) => Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== void 0));
+/** Render the resolved rest's declared content (script/prompt/message — never `commit`, since `resolveRest` never rests at a commit state) plus its `model:`/`memory:`/`label:`/`file:` hints, if declared (see `renderModel`/`renderMemory`/`renderLabel`/`renderFile`). `mode:` is a closed literal, never Eta-rendered — passed through verbatim. */
 const renderRest = (rest, context) => gen(function* () {
 	const kind = contentKindOf(rest.stateDef);
 	if (kind === void 0) return yield* fail$2(/* @__PURE__ */ new Error(`state "${rest.state}" declares no content — invalid definition`));
@@ -192832,18 +192940,19 @@ const renderRest = (rest, context) => gen(function* () {
 		try: () => renderStateTemplate(template, context),
 		catch: (e) => e instanceof Error ? e : new Error(String(e))
 	});
-	const model = yield* renderModel(rest.stateDef, context);
-	const memory = yield* renderMemory(rest.stateDef, context);
-	const file = yield* renderFile(rest.stateDef, context);
+	const hints = {
+		model: yield* renderModel(rest.stateDef, context),
+		memory: yield* renderMemory(rest.stateDef, context),
+		label: yield* renderLabel(rest.stateDef, context),
+		file: yield* renderFile(rest.stateDef, context),
+		mode: rest.stateDef.mode
+	};
 	return {
 		state: rest.state,
 		actor: rest.actor,
 		kind,
 		content,
-		...model !== void 0 ? { model } : {},
-		...memory !== void 0 ? { memory } : {},
-		...file !== void 0 ? { file } : {},
-		...rest.stateDef.mode !== void 0 ? { mode: rest.stateDef.mode } : {},
+		...omitUndefined(hints),
 		edges: toTemplateEdges(rest.stateDef.on)
 	};
 });
@@ -192853,13 +192962,15 @@ const renderRest = (rest, context) => gen(function* () {
 * `Gtd-Cost: <cost>[ <model>]` trailer (the invocation's `--cost`/`--model`,
 * persisted in the git log); a `"squash"` decision renders the commit-state
 * template against the PENDING tree — a render failure REFUSES the step,
-* touching nothing — then soft-resets to the process's start parent, writes
-* ONE commit with the rendered message (via `commitAsIs`, so the
-* still-uncommitted template file is excluded), and discards everything left
-* pending (the template file included). A squash records no trailer of its own
-* — the whole-process total and per-model breakdown reach the message through
-* `it.processCost`/`it.processCostByModel` in the rendered template. A
-* `"noop"` performs no IO.
+* touching nothing — then records the pre-squash tip on the retained-history
+* ref (`retainHistory`, a no-op for an empty process) before soft-resetting to
+* the process's start parent, writes ONE commit with the rendered message
+* plus a `Gtd-History: <hash>` trailer pointing at that tip (via
+* `withHistoryTrailer`/`commitAsIs`, so the still-uncommitted template file is
+* excluded), and discards everything left pending (the template file
+* included). The whole-process total and per-model breakdown reach the
+* message through `it.processCost`/`it.processCostByModel` in the rendered
+* template. A `"noop"` performs no IO.
 */
 const executeDecision = (git, run, decision, context, cost, model) => gen(function* () {
 	switch (decision.kind) {
@@ -192874,8 +192985,10 @@ const executeDecision = (git, run, decision, context, cost, model) => gen(functi
 				try: () => renderStateTemplate(decision.template, context),
 				catch: (e) => /* @__PURE__ */ new Error(`gtd: rendering the "${decision.state}" commit template failed — nothing was committed: ${e instanceof Error ? e.message : String(e)}`)
 			});
+			const tip = yield* git.resolveRef("HEAD");
+			yield* retainHistory(git, tip, run.startParentHash);
 			yield* git.softResetTo(run.startParentHash);
-			yield* git.commitAsIs(message);
+			yield* git.commitAsIs(withHistoryTrailer(message, tip));
 			yield* git.discardPending();
 			return {
 				kind: "squash",
@@ -205172,6 +205285,12 @@ Commands:
                    the commit the process started from, keeping everything it
                    produced as uncommitted changes. A no-op when no process is
                    underway
+  restore          Hard-reset HEAD back to the pre-squash tip retained by the
+                   last squash/abandon (refs/worktree/gtd/history), undoing a
+                   squash or bringing back an abandoned process's turns.
+                   Refuses on a dirty working tree, when there is no retained
+                   history, or when HEAD has advanced past the squash with
+                   commits that would be lost
   next             Print the resolved rest's rendered script/prompt/message
                    (no mutation)
   status           Print the resolved rest's state/actor and which declared
@@ -205521,6 +205640,7 @@ const runAbandonCommand = (argv, json, write) => gen(function* () {
 	}
 	const run = yield* computeProcessRun(git, rest.def);
 	if (run.startParentHash === EMPTY_TREE) return yield* fail$2(/* @__PURE__ */ new Error(`gtd abandon: the process underway (resting at "${rest.state}") starts at the repository's first commit — there is no earlier commit to rewind to`));
+	yield* retainHistory(git, yield* git.resolveRef("HEAD"), run.startParentHash);
 	yield* git.mixedResetTo(run.startParentHash);
 	const subject = yield* git.lastCommitSubject();
 	if (json) write(JSON.stringify({
@@ -205532,6 +205652,41 @@ const runAbandonCommand = (argv, json, write) => gen(function* () {
 	else write(`abandoned the process resting at "${rest.state}" — HEAD is back at ${run.startParentHash.slice(0, 7)} ("${subject}"), resting at "${initial}".\nEverything the process produced is kept as uncommitted changes (\`git status\`); discard them with \`git checkout -- . && git clean -fd .gtd\` for a clean tree.\n`);
 });
 /**
+* `gtd restore`: hard-reset HEAD back to the pre-squash tip a squash or
+* `gtd abandon` retained (`RetainedHistory.ts`'s `HISTORY_REF`), undoing
+* either. Unlike `gtd abandon` (which rewinds a process still underway),
+* restore reaches BACK past a completed squash — or re-applies an abandon's
+* own retained tip — to bring the turn-by-turn history back.
+*
+* Guarded by `restorability` so it never discards work it didn't create:
+* refuses on a dirty working tree, when there is no retained history, and
+* when HEAD has advanced past the retained tip with commits that would be
+* lost by resetting.
+*/
+const runRestoreCommand = (argv, json, write) => gen(function* () {
+	yield* rejectExtraArgs("restore", argv);
+	const git = yield* GitService;
+	if ((yield* pendingChanges(git)).length > 0) return yield* fail$2(/* @__PURE__ */ new Error("gtd restore: refuses on a dirty working tree — commit, stash, or discard your changes first."));
+	const retained = yield* readRetainedHistory(git);
+	if (isNone(retained)) return yield* fail$2(/* @__PURE__ */ new Error("gtd restore: no retained history to restore."));
+	const tip = retained.value;
+	const before = yield* resolveRest();
+	const headHash = yield* git.resolveRef("HEAD");
+	const check = yield* restorability(git, headHash, yield* git.lastCommitMessage(), tip);
+	if (!check.ok) return yield* fail$2(/* @__PURE__ */ new Error(`gtd restore: ${check.reason} — HEAD ${headHash.slice(0, 7)} is ahead of the retained tip ${tip.slice(0, 7)}.`));
+	yield* git.hardResetTo(tip);
+	yield* clearRetainedHistory(git);
+	const after = yield* resolveRest();
+	const subject = yield* git.lastCommitSubject();
+	if (json) write(JSON.stringify({
+		state: after.state,
+		restored: true,
+		to: tip,
+		from: before.state
+	}) + "\n");
+	else write(`restored the retained history — HEAD is back at ${tip.slice(0, 7)} ("${subject}"), resting at "${after.state}". Resume with the loop, or \`git reset\` to any earlier turn to restart from there.\n`);
+});
+/**
 * The self-validation instruction gtd APPENDS to a `prompt` rest that declares
 * both `file:` and `mode:` — i.e. a state whose actor hands over a steering
 * file `gtd validate` formats and checks. Appended ONLY to plain `gtd next`
@@ -205555,6 +205710,7 @@ const nextJsonOutput = (rendered) => JSON.stringify({
 	content: rendered.content,
 	...rendered.model !== void 0 ? { model: rendered.model } : {},
 	...rendered.memory !== void 0 ? { memory: rendered.memory } : {},
+	...rendered.label !== void 0 ? { label: rendered.label } : {},
 	...rendered.file !== void 0 ? { file: rendered.file } : {},
 	...rendered.mode !== void 0 ? { mode: rendered.mode } : {},
 	...rendered.edges.length > 0 ? { edges: rendered.edges } : {}
@@ -205834,8 +205990,8 @@ const costStatusLines = (cost, byModel) => {
 	if (breakdownIsInformative(byModel)) for (const m of byModel) lines.push(`  ${m.model}: ${m.cost}`);
 	return lines;
 };
-/** `gtd status --json`'s emission — `{state, actor, changes, model?, memory?, file?, mode?, cost?, costByModel?, edges?}`. */
-const writeStatusJson = (write, rest, statusChanges, model, memory, file, cost, costByModel) => {
+/** `gtd status --json`'s emission — `{state, actor, changes, model?, memory?, label?, file?, mode?, cost?, costByModel?, edges?}`. */
+const writeStatusJson = (write, rest, statusChanges, model, memory, label, file, cost, costByModel) => {
 	const edges = toTemplateEdges(rest.stateDef.on);
 	write(JSON.stringify({
 		state: rest.state,
@@ -205843,6 +205999,7 @@ const writeStatusJson = (write, rest, statusChanges, model, memory, file, cost,
 		changes: statusChanges,
 		...model !== void 0 ? { model } : {},
 		...memory !== void 0 ? { memory } : {},
+		...label !== void 0 ? { label } : {},
 		...file !== void 0 ? { file } : {},
 		...rest.stateDef.mode !== void 0 ? { mode: rest.stateDef.mode } : {},
 		...cost > 0 ? { cost } : {},
@@ -205850,9 +206007,10 @@ const writeStatusJson = (write, rest, statusChanges, model, memory, file, cost,
 		...edges.length > 0 ? { edges } : {}
 	}) + "\n");
 };
-/** `gtd status`'s plain-text emission — `State:`/`Awaits:`/`Model:`/`Memory:`/`File:`/`Mode:`/`Cost:`/`Pending:` lines. */
-const writeStatusPlain = (write, rest, statusChanges, model, memory, file, cost, costByModel) => {
+/** `gtd status`'s plain-text emission — `State:`/`Awaits:`/`Label:`/`Model:`/`Memory:`/`File:`/`Mode:`/`Cost:`/`Pending:` lines. */
+const writeStatusPlain = (write, rest, statusChanges, model, memory, label, file, cost, costByModel) => {
 	const lines = [`State: ${rest.state}`, `Awaits: ${rest.actor}`];
+	if (label !== void 0) lines.push(`Label: ${label}`);
 	if (model !== void 0) lines.push(`Model: ${model}`);
 	if (memory !== void 0) lines.push(`Memory: ${memory}`);
 	if (file !== void 0) lines.push(`File: ${file}`);
@@ -205873,10 +206031,11 @@ const runStatusCommand = (argv, json, write) => gen(function* () {
 	const changes = yield* pendingChanges(git);
 	const model = yield* renderModel(rest.stateDef, context);
 	const memory = yield* renderMemory(rest.stateDef, context);
+	const label = yield* renderLabel(rest.stateDef, context);
 	const file = yield* renderFile(rest.stateDef, context);
 	const statusChanges = computeStatusChanges(rest.stateDef.on ?? [], changes);
-	if (json) writeStatusJson(write, rest, statusChanges, model, memory, file, context.processCost, context.processCostByModel);
-	else writeStatusPlain(write, rest, statusChanges, model, memory, file, context.processCost, context.processCostByModel);
+	if (json) writeStatusJson(write, rest, statusChanges, model, memory, label, file, context.processCost, context.processCostByModel);
+	else writeStatusPlain(write, rest, statusChanges, model, memory, label, file, context.processCost, context.processCostByModel);
 });
 /** Parse a `--port` value: an integer 0–65535, or `undefined` if invalid/absent. */
 const parsePort = (value) => {
@@ -205960,6 +206119,7 @@ const KNOWN_SUBCOMMANDS = [
 	"review",
 	"fix",
 	"abandon",
+	"restore",
 	"next",
 	"status",
 	"validate"
@@ -206032,6 +206192,7 @@ const dispatchKnownSubcommand = (sub, argv, json, write, cost, model) => {
 		case "review": return runReviewCommand(argv, json, write);
 		case "fix": return runFixCommand(argv, json, write);
 		case "abandon": return runAbandonCommand(argv, json, write);
+		case "restore": return runRestoreCommand(argv, json, write);
 		case "next": return runNextCommand(json, write);
 		case "status": return runStatusCommand(argv, json, write);
 		case "validate": return runValidateCommand(argv, json, write);

package/docs/cli.md

@@ -30,6 +30,12 @@ Commands:
                    the commit the process started from, keeping everything it
                    produced as uncommitted changes. A no-op when no process is
                    underway
+  restore          Hard-reset HEAD back to the pre-squash tip retained by the
+                   last squash/abandon (refs/worktree/gtd/history), undoing a
+                   squash or bringing back an abandoned process's turns.
+                   Refuses on a dirty working tree, when there is no retained
+                   history, or when HEAD has advanced past the squash with
+                   commits that would be lost
   next             Print the resolved rest's rendered script/prompt/message
                    (no mutation)
   status           Print the resolved rest's state/actor and which declared
@@ -295,6 +301,47 @@ hash HEAD now points at:
 
 The no-op reports `{"state": "idle", "abandoned": false}` and still exits 0.
 
+## `gtd restore [--json]`
+
+Undoes the last squash or `gtd abandon` by hard-resetting HEAD back to the
+pre-squash tip that either one retains, before acting, on the per-worktree
+`refs/worktree/gtd/history` ref
+([STATES.md §8](../STATES.md#8-the-squash-lifecycle)):
+
+```
+restored the retained history — HEAD is back at 1a2b3c4 ("gtd(agent): drafting
+→ working"), resting at "await-review". Resume with the loop, or `git reset`
+to any earlier turn to restart from there.
+```
+
+Refuses on a dirty working tree — commit, stash, or discard your changes first.
+Refuses when there is no retained history to restore (nothing has been squashed
+or abandoned yet, or a previous `restore` already consumed it). Refuses when
+HEAD has advanced past the retained tip with commits that would be discarded by
+resetting:
+
+```
+gtd restore: HEAD has advanced past the squash — restoring would discard
+commits built on top of it — HEAD 4d5e6f7 is ahead of the retained tip
+1a2b3c4.
+```
+
+Takes no positional argument (extra arguments are a usage error).
+
+`--json` emits `{state, restored, to, from}` — `state` is the resolved rest
+after the reset, `restored` always `true` (a refusal exits non-zero instead),
+`to` the full hash HEAD was reset to, and `from` the state the machine rested at
+before the reset:
+
+```json
+{
+  "state": "await-review",
+  "restored": true,
+  "to": "1a2b3c4…",
+  "from": "idle"
+}
+```
+
 ## `gtd next [--json]`
 
 Pure emitter of the resolved rest's rendered content — it **never mutates** the

package/docs/configuration.md

@@ -261,6 +261,38 @@ value) only when the resolved state declares one — **omitted entirely**, never
 `null`, when unset. Plain `gtd status` prints a `Memory:` line (right after
 `Model:`, when present).
 
+### `label:` — the opaque display name, template-rendered
+
+A state may declare `label: <string>` — an OPAQUE display name gtd never
+interprets; it is only passed through so a driver/viewer can show something
+friendlier than the raw state name. Unset means the state has no display name.
+Forbidden on a commit state (never at rest, emits nothing):
+
+```yaml
+workflow:
+  states:
+    working:
+      actor: agent
+      label: Implement the feature
+      prompt: do the thing
+      on:
+        "* **": done
+```
+
+Like `model`/`memory`, `label:` is rendered as an Eta template through the exact
+same context as the state's content — a plain string with no Eta tags
+(`Implement the feature` above) passes through unchanged, but
+`label: "<%= it.vars.stateLabel %>"` resolves against the merged `it.vars` (see
+["Variables"](#variables)). A render failure behaves exactly like a content
+render failure at the same call site: `gtd next`/`gtd status` error out, nothing
+committed.
+
+`gtd next --json` and `gtd status --json` include a `"label"` key (the RENDERED
+value) only when the resolved state declares one — it is **omitted entirely**,
+never emitted as `null`, when unset. A driver/viewer choosing to fall back to
+the raw state name when `label` is absent is that consumer's own fallback, not
+something gtd itself does.
+
 ### `file:`/`mode:` — the steering-file association
 
 A state may additionally declare `file:` — an Eta template naming THE steering

package/docs/loop.md

@@ -18,13 +18,18 @@ DRIVER runs the emitted `content` and then steps that state's own actor.
 A loop is a simple cycle:
 
 1. Run `gtd next --json` — see [`cli.md`](cli.md#gtd-next---json) for the exact
-   `{state, actor, kind, content, model?, memory?}` field shape. `kind` is the
-   dispatch key: `"message"` → halt (a human rest); `"script"` → execute
+   `{state, actor, kind, content, model?, memory?, label?}` field shape. `kind`
+   is the dispatch key: `"message"` → halt (a human rest); `"script"` → execute
    `content` verbatim (ignoring its exit code), then `gtd step <actor>` to
    capture the outcome; `"prompt"` → feed `content` to the agent, then
    `gtd step <actor>` yourself once it's done acting. The optional `model` is an
    opaque string the workflow author chose, which you map onto your own
-   harness's model selection if you use one.
+   harness's model selection if you use one. The optional `label` is a
+   human-readable display name for the resolved state, present only when that
+   state declares `label:` in the workflow; when it's absent, a driver that
+   wants to show something falls back to `state` itself (that fallback lives in
+   the driver, not gtd core — see `bin/gtd-loop`'s
+   `label="$(jq -r '.label // .state' <<<"$next_json")"`).
 2. Repeat until a `"message"` rest halts the loop, or a zero-commit script step
    at idle settles it (the green terminal signal).
 
@@ -162,3 +167,35 @@ example, to drive a different agent CLI:
 ```bash
 GTD_LOOP_AGENT_CMD='my-agent-cli --prompt "$GTD_LOOP_PROMPT"' gtd-loop
 ```
+
+## Herdr integration (optional)
+
+`bin/gtd-loop` optionally reports its lifecycle to [Herdr](https://herdr.dev) (a
+terminal multiplexer for coding agents) via a `herdr` CLI binary, entirely at
+the driver's edge — gtd core never talks to Herdr. Every call is best-effort
+(guarded, output discarded, `|| true`), so a missing/failing `herdr` binary
+never blocks, slows, or fails the loop.
+
+The reporting is a no-op unless all three guard conditions hold: `HERDR_ENV=1`,
+a non-empty `$HERDR_PANE_ID`, and `herdr` on `$PATH`. When they do, `gtd-loop`
+makes three kinds of calls:
+
+- `herdr pane report-agent --source herdr:gtd --agent gtd --state <state> --message <label> "$HERDR_PANE_ID"`
+- `herdr pane release-agent --source herdr:gtd --agent gtd "$HERDR_PANE_ID"`
+- `herdr notification show <title> --body <label> --sound request`
+
+mapped onto the loop's states like this:
+
+| Loop moment                                                                          | Call(s)                                                                  |
+| ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------ |
+| Top of every non-`"message"` iteration                                               | `report-agent --state working`                                           |
+| Right before halting at a `"message"` (human) gate                                   | `report-agent --state blocked` + `notification show`                     |
+| Right before a clean settle (a script rest, zero new commits)                        | `report-agent --state idle` + `release-agent`                            |
+| Any non-zero exit (stall guard, validate-cap, `gtd next` failure, unhandled failure) | `report-agent --state blocked` + `notification show`, via an `EXIT` trap |
+
+`working`/`blocked` reports use the resolved rest's `label` (falling back to
+`state`, per the field above); the trap falls back to `$GTD_LAST_LABEL`, the
+label tracked from the last completed iteration, when it fires outside the
+normal per-iteration flow. `report-agent` claims display authority for the
+`herdr:gtd` source, so `working` is re-reported every lap rather than once, to
+stay fresh against Herdr's own heuristic detection of the inner agent process.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmelab/gtd",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "private": false,
   "description": "Git-aware CLI that emits the next prompt for an autonomous coding agent based on the current repository state",
   "bin": {