@pmelab/gtd 1.9.1 → 1.9.2

package/dist/gtd.bundle.mjs

@@ -388261,978 +388261,1013 @@ var formatFile = (path15) => Effect_exports.gen(function* () {
   }
 }).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))));
 
-// src/Events.ts
-var TODO_FILE = "TODO.md";
-var GTD_DIR = ".gtd";
-var REVIEW_FILE = "REVIEW.md";
-var FEEDBACK_FILE = "FEEDBACK.md";
-var ERRORS_FILE = "ERRORS.md";
-var HEALTH_FILE = "HEALTH.md";
-var EMPTY_FAILURE_SENTINEL = "Test command failed with no output (exit code non-zero).";
-var UNANSWERED_MARKER = "<!-- user answers here -->";
-var HEALTH_CHECK_SUBJECT = "gtd: health-check";
-var HEALTH_FIX_SUBJECT = "gtd: health-fix";
-var NEW_TASK_SUBJECT = "gtd: new task";
-var GRILLING_SUBJECT = "gtd: grilling";
-var PLANNING_SUBJECT = "gtd: planning";
-var BUILDING_SUBJECT = "gtd: building";
-var ERRORS_SUBJECT = "gtd: errors";
-var FEEDBACK_SUBJECT = "gtd: feedback";
-var PACKAGE_DONE_SUBJECT = "gtd: package done";
-var AWAITING_REVIEW_SUBJECT = "gtd: awaiting review";
-var DONE_SUBJECT = "gtd: done";
-var REVIEW_FEEDBACK_SUBJECT = "gtd: review feedback";
-var REVIEWING_SUBJECT = "gtd: reviewing";
-var SQUASH_MSG_FILE = "SQUASH_MSG.md";
-var STEERING_FILES = [
-  TODO_FILE,
-  REVIEW_FILE,
-  FEEDBACK_FILE,
-  ERRORS_FILE,
-  HEALTH_FILE,
-  SQUASH_MSG_FILE
-];
-var WORKFLOW_FILE_EXCLUDES = [...STEERING_FILES, GTD_DIR];
-var isGtdPath = (path15) => path15 === GTD_DIR || path15.startsWith(`${GTD_DIR}/`);
-var isSteeringFile = (path15) => STEERING_FILES.includes(path15);
-var isUncommittedStatus = (status2) => status2.includes("?") || status2.includes("A");
-var EMPTY_TREE = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
-var unquoteGitPath = (raw) => {
-  if (!raw.startsWith('"')) return raw;
-  const inner = raw.slice(1, raw.endsWith('"') ? raw.length - 1 : raw.length);
-  const bytes = [];
-  const chars = [];
-  const flushBytes = () => {
-    if (bytes.length === 0) return;
-    const buf = Buffer.from(bytes);
-    chars.push(buf.toString("utf8"));
-    bytes.length = 0;
-  };
-  let i = 0;
-  while (i < inner.length) {
-    if (inner[i] !== "\\") {
-      flushBytes();
-      chars.push(inner[i]);
-      i++;
-      continue;
-    }
-    const esc = inner[i + 1];
-    if (esc === void 0) {
-      flushBytes();
-      chars.push("\\");
-      i++;
-      continue;
-    }
-    if (esc >= "0" && esc <= "7") {
-      const oct = inner.slice(i + 1, i + 4);
-      bytes.push(parseInt(oct, 8));
-      i += 4;
-      continue;
-    }
-    flushBytes();
-    switch (esc) {
-      case "n":
-        chars.push("\n");
-        break;
-      case "t":
-        chars.push("	");
-        break;
-      case "r":
-        chars.push("\r");
-        break;
-      case "\\":
-        chars.push("\\");
-        break;
-      case '"':
-        chars.push('"');
-        break;
-      default:
-        chars.push("\\", esc);
-    }
-    i += 2;
+// src/Machine.ts
+var HEALTH_SQUASH_SENTINEL = "<!-- gtd-health-squash-ready -->\n";
+var GtdStateError = class extends Error {
+  kind;
+  constructor(kind, message) {
+    super(message);
+    this.name = "GtdStateError";
+    this.kind = kind;
   }
-  flushBytes();
-  return chars.join("");
 };
-var parsePorcelainPaths = (porcelain) => porcelain.split("\n").map((line3) => line3.replace(/\r$/, "")).filter((line3) => line3.length > 0).map((line3) => ({ status: line3.slice(0, 2), path: unquoteGitPath(line3.slice(3)) }));
-var isNumberedDir = (name) => /^\d+-/.test(name);
-var isTaskFile = (name) => name.endsWith(".md");
-var stripCode = (content) => content.replace(/^(`{3,}|~{3,})[^\n]*\n[\s\S]*?(?:\n\1[^\n]*|$(?![\s\S]))/gm, "").replace(/`[^`\n]+`/g, "");
-var getPackages = (fs9, root2) => Effect_exports.gen(function* () {
-  const resolve5 = (p4) => join11(root2, p4);
-  const gtdExists = yield* fs9.exists(resolve5(GTD_DIR));
-  if (!gtdExists) return [];
-  const entries2 = yield* fs9.readDirectory(resolve5(GTD_DIR));
-  const packageDirs = entries2.filter(isNumberedDir).sort();
-  const packages = [];
-  for (const dir of packageDirs) {
-    const packagePath = `${GTD_DIR}/${dir}`;
-    const stat4 = yield* fs9.stat(resolve5(packagePath));
-    if (stat4.type !== "Directory") continue;
-    const files = yield* fs9.readDirectory(resolve5(packagePath));
-    const tasks = files.filter(isTaskFile).sort();
-    const taskContents = [];
-    for (const taskFile of tasks) {
-      const content = yield* fs9.readFileString(resolve5(`${packagePath}/${taskFile}`));
-      taskContents.push({ name: taskFile, content });
-    }
-    packages.push({ name: dir, tasks, taskContents });
+var foldCounters = (events) => {
+  let testFixCount = 0;
+  let reviewFixCount = 0;
+  let healthFixCount = 0;
+  for (const event of events) {
+    if (event.type !== "COMMIT") continue;
+    if (event.isPackageStart || event.isFeedback || event.removedErrors) testFixCount = 0;
+    if (event.isErrors) testFixCount += 1;
+    if (event.isPackageStart) reviewFixCount = 0;
+    if (event.isFeedback) reviewFixCount += 1;
+    if (event.isPackageStart || event.removedErrors) healthFixCount = 0;
+    if (event.isHealthCheck) healthFixCount += 1;
   }
-  return packages;
-}).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))));
-var CAPTURE_RULES = [
-  "Interpret the captured diff with these rules:",
-  "",
-  "- **Code changes** are suggestions, not finished work \u2014 plan to re-implement",
-  "  them properly, including test coverage, rather than restoring them verbatim.",
-  "- **Code comments** are positional feedback about the code at that location.",
-  "- **TODO.md / REVIEW.md text changes** are global feedback on the plan or the",
-  "  reviewed work as a whole.",
-  "- **Checkbox flips** in a captured REVIEW.md diff are approval noise \u2014 ignore",
-  "  them."
-].join("\n");
-var seedTodo = (capturedDiff) => {
-  const body = capturedDiff.replace(/\n+$/, "");
-  const fence = fenceFor(body);
-  return [
-    "# Plan",
-    "",
-    "## Captured input",
-    "",
-    "These changes were captured as the starting point for this feature. Develop",
-    "them into a concrete plan and surface any open questions for the user.",
-    "",
-    CAPTURE_RULES,
-    "",
-    `${fence}diff`,
-    body,
-    fence,
-    ""
-  ].join("\n");
-};
-var appendCapturedInput = (todo, capturedDiff) => {
-  const body = capturedDiff.replace(/\n+$/, "");
-  if (todo.includes(body)) return todo;
-  const fence = fenceFor(body);
-  const section = [
-    "## Captured input (grilling)",
-    "",
-    "These code changes were made during grilling and captured as suggestions;",
-    "gtd has reverted them from the working tree.",
-    "",
-    ...todo.includes(CAPTURE_RULES) ? [] : [CAPTURE_RULES, ""],
-    `${fence}diff`,
-    body,
-    fence,
-    ""
-  ].join("\n");
-  return todo.replace(/\n*$/, "\n\n") + section;
+  return { testFixCount, reviewFixCount, healthFixCount };
 };
-var isCheckboxOnlyDiff = (diff8) => {
-  if (diff8.trim() === "") return false;
-  const checkboxRe = /^(\s*- \[)([xX ])\](.*)$/;
-  const removedLines = [];
-  const addedLines = [];
-  for (const raw of diff8.split("\n")) {
-    const line3 = raw.replace(/\r$/, "");
-    if (line3.startsWith("---") || line3.startsWith("+++") || line3.startsWith("@@") || line3.startsWith("diff ") || line3.startsWith("index ") || line3.startsWith("new file") || line3.startsWith("deleted file") || line3.startsWith("similarity") || line3.startsWith("rename"))
-      continue;
-    if (line3.startsWith("-")) {
-      removedLines.push(line3.slice(1));
-    } else if (line3.startsWith("+")) {
-      addedLines.push(line3.slice(1));
-    }
-  }
-  if (removedLines.length !== addedLines.length) return false;
-  let flips = 0;
-  for (let i = 0; i < removedLines.length; i++) {
-    const rm4 = removedLines[i];
-    const add7 = addedLines[i];
-    if (rm4 === add7) continue;
-    if (!checkboxRe.test(rm4) || !checkboxRe.test(add7)) return false;
-    const rmNorm = rm4.replace(/\[[ xX]\]/, "[ ]");
-    const addNorm = add7.replace(/\[[ xX]\]/, "[ ]");
-    if (rmNorm !== addNorm) return false;
-    flips += 1;
-  }
-  return flips > 0;
+var isBoundary = (subject) => !subject.startsWith("gtd: ") || subject === "gtd: done";
+var DEFAULT_PAYLOAD = {
+  todoExists: false,
+  todoCommitted: false,
+  gtdDirExists: false,
+  reviewPresent: false,
+  feedbackPresent: false,
+  errorsPresent: false,
+  gtdModified: false,
+  codeDirty: false,
+  todoMarkerPresent: false,
+  feedbackCommitted: false,
+  feedbackEmpty: false,
+  feedbackContent: "",
+  reviewCommitted: false,
+  reviewDirty: false,
+  reviewCheckboxOnly: false,
+  pendingErrorsDeletion: false,
+  lastCommitSubject: "",
+  workingTreeClean: true,
+  packages: [],
+  diff: "",
+  hasCommitsAfterLastDone: true,
+  agenticReviewEnabled: true,
+  fixAttemptCap: 3,
+  reviewThreshold: 3,
+  squashEnabled: false,
+  squashMsgPresent: false,
+  squashMsgContent: "",
+  healthPresent: false,
+  healthContent: "",
+  healthCommitted: false
 };
-var gatherEvents = () => (
-  // fallow-ignore-next-line complexity
-  Effect_exports.gen(function* () {
-    const git = yield* GitService;
-    const fs9 = yield* FileSystem_exports.FileSystem;
-    const config2 = yield* ConfigService;
-    const { root: root2 } = yield* Cwd;
-    const resolve5 = (p4) => join11(root2, p4);
-    const defaultBranch = yield* git.resolveDefaultBranch();
-    const headHash = yield* git.resolveRef("HEAD").pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
-    const mergeBase = Option_exports.isSome(defaultBranch) ? yield* git.mergeBase(defaultBranch.value, "HEAD") : Option_exports.none();
-    const base = Option_exports.isSome(mergeBase) && mergeBase.value !== headHash ? mergeBase : Option_exports.none();
-    const history = yield* git.commitHistory(Option_exports.getOrUndefined(base));
-    const commitEvents = history.map(
-      ({ message, removedErrors }) => {
-        const subject = (message.split("\n")[0] ?? "").trim();
-        return {
-          type: "COMMIT",
-          isErrors: subject === ERRORS_SUBJECT,
-          isFeedback: subject === FEEDBACK_SUBJECT,
-          isPackageStart: subject === PLANNING_SUBJECT || subject === PACKAGE_DONE_SUBJECT,
-          isWorkflowCommit: subject.startsWith("gtd: "),
-          removedErrors,
-          isHealthCheck: subject === HEALTH_CHECK_SUBJECT,
-          isHealthFix: subject === HEALTH_FIX_SUBJECT
-        };
+var buildContext = (p4, counters, grillingCase) => ({
+  testFixCount: counters.testFixCount,
+  reviewFixCount: counters.reviewFixCount,
+  packages: p4.packages,
+  diff: p4.diff,
+  ...p4.refDiff !== void 0 ? { refDiff: p4.refDiff } : {},
+  ...p4.reviewBase !== void 0 ? { reviewBase: p4.reviewBase } : {},
+  ...p4.squashBase !== void 0 ? { squashBase: p4.squashBase } : {},
+  ...p4.squashDiff !== void 0 ? { squashDiff: p4.squashDiff } : {},
+  lastCommitSubject: p4.lastCommitSubject,
+  workingTreeClean: p4.workingTreeClean,
+  feedbackContent: p4.feedbackContent !== "" ? p4.feedbackContent : p4.healthContent,
+  ...grillingCase !== void 0 ? { grillingCase } : {}
+});
+var assertLegal = (p4) => {
+  const fail20 = (msg) => {
+    throw new GtdStateError("illegal-combination", msg);
+  };
+  if (p4.reviewPresent && p4.gtdDirExists) fail20("illegal combination: REVIEW.md + .gtd");
+  if (p4.reviewPresent && p4.todoCommitted) fail20("illegal combination: REVIEW.md + committed TODO.md");
+  if (p4.reviewPresent && !(p4.reviewCommitted || p4.reviewDirty) && p4.todoExists)
+    fail20("illegal combination: uncommitted REVIEW.md + TODO.md");
+  if (p4.feedbackPresent && p4.reviewPresent) fail20("illegal combination: FEEDBACK.md + REVIEW.md");
+  if (p4.feedbackPresent && !p4.gtdDirExists) fail20("illegal combination: FEEDBACK.md without .gtd");
+  if (p4.errorsPresent && p4.feedbackPresent) fail20("illegal combination: ERRORS.md + FEEDBACK.md");
+  const isHealthCapEscalation = p4.lastCommitSubject === "gtd: health-check" || p4.lastCommitSubject === "gtd: health-fix";
+  if (p4.errorsPresent && !p4.gtdDirExists && !isHealthCapEscalation)
+    fail20("illegal combination: ERRORS.md without .gtd");
+  if (p4.healthPresent && p4.gtdDirExists) fail20("illegal combination: HEALTH.md + .gtd");
+  if (p4.healthPresent && p4.reviewPresent) fail20("illegal combination: HEALTH.md + REVIEW.md");
+  if (p4.healthPresent && p4.feedbackPresent) fail20("illegal combination: HEALTH.md + FEEDBACK.md");
+  if (p4.healthPresent && p4.errorsPresent) fail20("illegal combination: HEALTH.md + ERRORS.md");
+};
+var resolveHealth = (p4, counters) => {
+  const hasPendingWork = !p4.healthCommitted || !p4.workingTreeClean;
+  const prefix = p4.healthCommitted ? "gtd: health-fix" : "gtd: health-check";
+  return {
+    state: "health-fixing",
+    autoAdvance: true,
+    ...hasPendingWork ? {
+      edgeAction: {
+        kind: "commitPending",
+        prefix,
+        // Always remove HEALTH.md: on gtd: health-check this clears it so
+        // the next run re-enters resolveCleanOrIdle; on gtd: health-fix it
+        // clears the marker left by a prior health-check run.
+        removeHealth: true
       }
-    );
-    const hasCommits = yield* git.hasCommits();
-    const porcelain = yield* git.statusPorcelain();
-    const entries2 = parsePorcelainPaths(porcelain);
-    const workingTreeClean = entries2.length === 0;
-    const lastCommitSubject = hasCommits ? yield* git.lastCommitSubject() : "";
-    const gtdModified = entries2.some((e7) => isGtdPath(e7.path));
-    const codeDirty = entries2.some((e7) => !isSteeringFile(e7.path) && !isGtdPath(e7.path));
-    const todoExists = yield* fs9.exists(resolve5(TODO_FILE));
-    const gtdDirExists = yield* fs9.exists(resolve5(GTD_DIR));
-    const reviewPresent = yield* fs9.exists(resolve5(REVIEW_FILE));
-    const feedbackPresent = yield* fs9.exists(resolve5(FEEDBACK_FILE));
-    const errorsPresent = yield* fs9.exists(resolve5(ERRORS_FILE));
-    const todoContent = todoExists ? yield* fs9.readFileString(resolve5(TODO_FILE)) : "";
-    const todoMarkerPresent = todoExists && stripCode(todoContent).includes(UNANSWERED_MARKER);
-    const isUncommitted = (path15) => {
-      const entry = entries2.find((e7) => e7.path === path15);
-      return entry !== void 0 && isUncommittedStatus(entry.status);
+    } : {},
+    context: buildContext(p4, counters)
+  };
+};
+var resolveFeedback = (p4, counters) => {
+  if (p4.feedbackEmpty) {
+    return {
+      state: "close-package",
+      autoAdvance: true,
+      edgeAction: { kind: "closePackage" },
+      context: buildContext(p4, counters)
     };
-    const feedbackCommitted = feedbackPresent && !isUncommitted(FEEDBACK_FILE);
-    const feedbackContent = feedbackPresent ? yield* fs9.readFileString(resolve5(FEEDBACK_FILE)) : "";
-    const feedbackEmpty = feedbackPresent && !/\S/.test(feedbackContent);
-    const reviewTrackedAtHead = reviewPresent && !isUncommitted(REVIEW_FILE);
-    const reviewCommitted = reviewTrackedAtHead && workingTreeClean;
-    const reviewDirty = reviewTrackedAtHead && !workingTreeClean;
-    const todoCommitted = todoExists && !isUncommitted(TODO_FILE);
-    const pendingErrorsDeletion = entries2.some(
-      (e7) => e7.path === ERRORS_FILE && e7.status.includes("D")
-    );
-    const packages = yield* getPackages(fs9, root2);
-    const diff8 = hasCommits && entries2.length > 0 ? yield* git.diffHead() : "";
-    const onlyReviewDirty = entries2.length > 0 && entries2.every((e7) => e7.path === REVIEW_FILE);
-    const reviewCheckboxOnly = onlyReviewDirty && isCheckboxOnlyDiff(
-      yield* git.diffPath(REVIEW_FILE).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")))
-    );
-    let reviewBase;
-    let refDiff;
-    let hasCommitsAfterLastDone = true;
-    if (hasCommits) {
-      const allHistory = Option_exports.isNone(base) ? history : yield* git.commitHistory();
-      const lastDoneIdx = (() => {
-        let idx = -1;
-        for (let i = 0; i < allHistory.length; i++) {
-          const subject = (allHistory[i].message.split("\n")[0] ?? "").trim();
-          if (subject === DONE_SUBJECT) idx = i;
-        }
-        return idx;
-      })();
-      const currentCycle = lastDoneIdx === -1 ? allHistory : allHistory.slice(lastDoneIdx + 1);
-      hasCommitsAfterLastDone = lastDoneIdx === -1 || currentCycle.length > 0;
-      const firstGrilling = currentCycle.find(
-        (c7) => (c7.message.split("\n")[0] ?? "").trim() === GRILLING_SUBJECT
-      );
-      const lastAwaitingReview = (() => {
-        let found;
-        for (const c7 of currentCycle) {
-          if ((c7.message.split("\n")[0] ?? "").trim().startsWith(AWAITING_REVIEW_SUBJECT)) {
-            found = c7;
-          }
-        }
-        return found;
-      })();
-      const withinProcess = firstGrilling !== void 0;
-      let candidate;
-      if (withinProcess) {
-        if (lastAwaitingReview !== void 0) {
-          candidate = lastAwaitingReview.hash ?? EMPTY_TREE;
-        } else {
-          candidate = firstGrilling.hash ?? EMPTY_TREE;
-        }
-      } else {
-      }
-      if (candidate !== void 0 && hasCommitsAfterLastDone) {
-        const candidateDiff = yield* git.diffRef(candidate, WORKFLOW_FILE_EXCLUDES).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
-        if (candidateDiff.trim().length > 0) {
-          reviewBase = candidate;
-          refDiff = candidateDiff;
-        }
+  }
+  return {
+    state: "fixing",
+    autoAdvance: true,
+    edgeAction: {
+      kind: "commitPending",
+      prefix: p4.feedbackCommitted ? "gtd: fixing" : "gtd: feedback",
+      // Delete FEEDBACK.md so its removal lands in this commit; without it the
+      // next run re-detects FEEDBACK (precedence 2) and Fixing never returns to
+      // Testing (STATES.md § Fixing: "FEEDBACK.md is removed either way").
+      removeFeedback: true
+    },
+    context: buildContext(p4, counters)
+  };
+};
+var resolveGtdLifecycle = (p4, counters, head7, corrupt) => {
+  if (p4.gtdModified) {
+    return {
+      state: "planning",
+      autoAdvance: true,
+      edgeAction: { kind: "commitPending", prefix: "gtd: planning" },
+      context: buildContext(p4, counters)
+    };
+  }
+  const noOpFixer = p4.workingTreeClean && head7 === "gtd: fixing";
+  if (p4.codeDirty || p4.pendingErrorsDeletion || noOpFixer) {
+    const resume2 = p4.pendingErrorsDeletion;
+    return {
+      state: "testing",
+      autoAdvance: true,
+      edgeAction: {
+        kind: "runTest",
+        errorCount: resume2 ? 0 : counters.testFixCount,
+        capReached: (resume2 ? 0 : counters.testFixCount) >= p4.fixAttemptCap
+      },
+      context: buildContext(p4, counters)
+    };
+  }
+  if (p4.workingTreeClean) {
+    if (head7 === "gtd: planning" || head7 === "gtd: package done") {
+      if (head7 === "gtd: planning" && p4.todoExists) {
+        return {
+          state: "building",
+          autoAdvance: true,
+          edgeAction: { kind: "commitPending", prefix: "gtd: planning", removeTodo: true },
+          context: buildContext(p4, counters)
+        };
       }
+      return { state: "building", autoAdvance: true, context: buildContext(p4, counters) };
     }
-    let squashBase;
-    let squashDiff;
-    if (hasCommits && lastCommitSubject === DONE_SUBJECT && config2.squash) {
-      const squashHistory = history;
-      const subjectOf = (c7) => (c7.message.split("\n")[0] ?? "").trim();
-      let lastDoneIdxForSquash = -1;
-      let prevDoneIdx = -1;
-      for (let i = 0; i < squashHistory.length; i++) {
-        if (subjectOf(squashHistory[i]) === DONE_SUBJECT) {
-          prevDoneIdx = lastDoneIdxForSquash;
-          lastDoneIdxForSquash = i;
-        }
-      }
-      if (lastDoneIdxForSquash !== -1) {
-        const squashCycle = squashHistory.slice(prevDoneIdx + 1, lastDoneIdxForSquash + 1);
-        let startIdx = -1;
-        for (let i = squashCycle.length - 1; i >= 0; i--) {
-          if (subjectOf(squashCycle[i]) === NEW_TASK_SUBJECT || subjectOf(squashCycle[i]) === REVIEWING_SUBJECT) {
-            startIdx = i;
-            break;
-          }
-        }
-        if (startIdx === -1) {
-          for (let i = squashCycle.length - 1; i >= 0; i--) {
-            if (subjectOf(squashCycle[i]) === GRILLING_SUBJECT) {
-              startIdx = i;
-              while (startIdx > 0 && subjectOf(squashCycle[startIdx - 1]) === GRILLING_SUBJECT) {
-                startIdx--;
-              }
-              break;
-            }
-          }
-        }
-        const squashStart = startIdx === -1 ? void 0 : squashCycle[startIdx];
-        if (squashStart !== void 0) {
-          const squashStartParent = yield* git.resolveRef(`${squashStart.hash}~1`).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
-          const candidateDiff = yield* git.diffRef(squashStartParent).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
-          if (candidateDiff.trim().length > 0) {
-            squashBase = squashStartParent;
-            squashDiff = candidateDiff;
-          }
-        }
+    if (head7 === "gtd: building") {
+      const forceApprove = !p4.agenticReviewEnabled || counters.reviewFixCount >= p4.reviewThreshold;
+      if (forceApprove) {
+        return {
+          state: "close-package",
+          autoAdvance: true,
+          edgeAction: { kind: "closePackage" },
+          context: buildContext(p4, counters)
+        };
       }
+      return { state: "agentic-review", autoAdvance: true, context: buildContext(p4, counters) };
     }
-    const squashMsgPresent = yield* fs9.exists(resolve5(SQUASH_MSG_FILE));
-    const squashMsgContent = squashMsgPresent ? yield* fs9.readFileString(resolve5(SQUASH_MSG_FILE)) : "";
-    const healthPresent = yield* fs9.exists(resolve5(HEALTH_FILE));
-    const healthContent = healthPresent ? yield* fs9.readFileString(resolve5(HEALTH_FILE)) : "";
-    const healthCommitted = healthPresent && !isUncommitted(HEALTH_FILE);
-    let healthFixBase;
-    if (config2.squash) {
-      const subjectOf = (c7) => (c7.message.split("\n")[0] ?? "").trim();
-      let firstHealthCheckHash;
-      let healthCheckCount = 0;
-      for (const commit3 of history) {
-        const s5 = subjectOf(commit3);
-        const isPackageStart = s5 === PLANNING_SUBJECT || s5 === PACKAGE_DONE_SUBJECT;
-        if (isPackageStart || commit3.removedErrors) {
-          firstHealthCheckHash = void 0;
-          healthCheckCount = 0;
-        }
-        if (s5 === HEALTH_CHECK_SUBJECT) {
-          healthCheckCount++;
-          if (healthCheckCount === 1) firstHealthCheckHash = commit3.hash;
-        }
-      }
-      if (healthCheckCount > 0 && firstHealthCheckHash !== void 0) {
-        const base2 = yield* git.resolveRef(`${firstHealthCheckHash}~1`).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
-        healthFixBase = base2;
-      }
-    }
-    const payload = {
-      todoExists,
-      todoCommitted,
-      gtdDirExists,
-      reviewPresent,
-      feedbackPresent,
-      errorsPresent,
-      gtdModified,
-      codeDirty,
-      todoMarkerPresent,
-      feedbackCommitted,
-      feedbackEmpty,
-      feedbackContent,
-      reviewCommitted,
-      reviewDirty,
-      reviewCheckboxOnly,
-      pendingErrorsDeletion,
-      lastCommitSubject,
-      workingTreeClean,
-      packages,
-      diff: diff8,
-      ...reviewBase !== void 0 ? { reviewBase } : {},
-      ...refDiff !== void 0 ? { refDiff } : {},
-      hasCommitsAfterLastDone,
-      agenticReviewEnabled: config2.agenticReview,
-      fixAttemptCap: config2.fixAttemptCap,
-      reviewThreshold: config2.reviewThreshold,
-      squashEnabled: config2.squash,
-      ...squashBase !== void 0 ? { squashBase } : {},
-      ...squashDiff !== void 0 ? { squashDiff } : {},
-      squashMsgPresent,
-      squashMsgContent,
-      healthPresent,
-      healthContent,
-      healthCommitted,
-      ...healthFixBase !== void 0 ? { healthFixBase } : {}
+  }
+  return corrupt();
+};
+var resolveReviewLifecycle = (p4, counters, head7) => {
+  if (head7 === "gtd: review feedback") {
+    return {
+      state: "accept-review",
+      autoAdvance: true,
+      edgeAction: { kind: "seedAcceptReview" },
+      context: buildContext(p4, counters)
     };
-    const resolveEvent = { type: "RESOLVE", payload };
-    return [...commitEvents, resolveEvent];
-  }).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))))
-);
-var captureAndRevert = (git, subject, onRegen) => Effect_exports.gen(function* () {
-  const head7 = yield* git.lastCommitSubject().pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
-  if (head7 !== subject) {
-    yield* git.commitAllWithPrefix(subject);
-  } else {
-    yield* onRegen;
   }
-  const base = yield* git.resolveRef("HEAD~1").pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
-  const captured = yield* git.diffRef(base).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
-  yield* git.revertNoCommit("HEAD");
-  return captured;
-});
-var reviewAgainst = (target) => Effect_exports.gen(function* () {
-  const git = yield* GitService;
-  const targetHash = yield* git.resolveRef(target);
-  const mergeBase = yield* git.mergeBase(target, "HEAD");
-  const mergeBaseHash = Option_exports.isNone(mergeBase) || mergeBase.value === targetHash ? targetHash : mergeBase.value;
-  const refDiff = yield* git.diffRef(mergeBaseHash, WORKFLOW_FILE_EXCLUDES);
-  if (refDiff.trim().length === 0) return void 0;
-  return { reviewBase: mergeBaseHash, refDiff };
-});
-var perform = (action) => (
-  // fallow-ignore-next-line complexity
-  Effect_exports.gen(function* () {
-    const git = yield* GitService;
-    const fs9 = yield* FileSystem_exports.FileSystem;
-    const { root: root2 } = yield* Cwd;
-    const resolve5 = (p4) => join11(root2, p4);
-    switch (action.kind) {
-      // Transport: mixed-reset the hand-made `gtd: transport` HEAD, keeping the
-      // work in the tree, then re-derive. (No producer command — consume only.)
-      case "transportReset": {
-        yield* git.mixedResetHead();
-        return { stop: false };
-      }
-      // New Feature: capture the raw input as `gtd: new task` (unless HEAD is
-      // already there — the lost-seed regenerate case), revert it back to a
-      // clean baseline (inverse staged), and seed TODO.md from that diff.
-      case "seedNewFeature": {
-        const captured = yield* captureAndRevert(git, NEW_TASK_SUBJECT, Effect_exports.void);
-        yield* fs9.writeFileString(resolve5(TODO_FILE), seedTodo(captured));
-        return { stop: false };
-      }
-      // Accept Review: capture the human's pending changeset durably as
-      // `gtd: review feedback` (annotations, code edits, and new files alike),
-      // revert it back to the reviewed baseline, rm REVIEW.md (which is what
-      // stops Accept Review re-firing), and seed TODO.md from the captured
-      // diff. The regen case (the machine's rule-4 carve-out fired) discards
-      // any partial revert/seed state with a hard reset first.
-      case "seedAcceptReview": {
-        const captured = yield* captureAndRevert(git, REVIEW_FEEDBACK_SUBJECT, git.resetHard());
-        yield* fs9.remove(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        yield* fs9.writeFileString(resolve5(TODO_FILE), seedTodo(captured));
-        return { stop: false };
-      }
-      // Grilling capture: the plan is already committed and the user sketched
-      // code during the round. Fold the code diff (untracked included, steering
-      // files excluded) into TODO.md as a suggestion block, drop the code
-      // changes — reset tracked, delete untracked/added — and commit the lot as
-      // one `gtd: grilling`. TODO.md's own pending edits are preserved verbatim
-      // (snapshotted before the reset). Binary edits survive only as the diff's
-      // "Binary files differ" line — an accepted limitation.
-      case "captureGrillingEdits": {
-        const porcelain = yield* git.statusPorcelain();
-        const entries2 = parsePorcelainPaths(porcelain);
-        const pendingCodeFiles = entries2.filter(
-          (e7) => isUncommittedStatus(e7.status) && !isSteeringFile(e7.path) && !isGtdPath(e7.path)
-        );
-        const todoNow = yield* fs9.readFileString(resolve5(TODO_FILE));
-        const captured = yield* git.diffHead(WORKFLOW_FILE_EXCLUDES);
-        yield* git.resetHard();
-        for (const entry of pendingCodeFiles) {
-          yield* fs9.remove(resolve5(entry.path), { recursive: true }).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        }
-        yield* fs9.writeFileString(resolve5(TODO_FILE), appendCapturedInput(todoNow, captured));
-        yield* git.commitAllWithPrefix(GRILLING_SUBJECT);
-        return { stop: false };
-      }
-      // Testing: commit the pending tree `gtd: building` (nothing pending in the
-      // no-op-fixer case), run tests; on red write FEEDBACK (below cap) or ERRORS
-      // (at cap) and commit `gtd: errors`; on green proceed.
-      case "runTest": {
-        const runner = yield* TestRunner;
-        const status2 = yield* git.statusPorcelain();
-        const committedBuilding = status2.trim().length > 0;
-        if (committedBuilding) {
-          yield* git.commitAllWithPrefix(BUILDING_SUBJECT);
-        }
-        const result = yield* runner.run();
-        if (result.exitCode === 0) {
-          if (!committedBuilding) {
-            yield* git.commitAllWithPrefix(BUILDING_SUBJECT);
-          }
-          return { stop: false };
-        }
-        const target = action.capReached ? ERRORS_FILE : FEEDBACK_FILE;
-        const body = /\S/.test(result.output) ? result.output : EMPTY_FAILURE_SENTINEL;
-        yield* fs9.writeFileString(resolve5(target), body);
-        yield* git.commitAllWithPrefix(ERRORS_SUBJECT);
-        return { stop: false };
-      }
-      // Health check: run tests on an idle/clean tree.
-      // Green, no prior fixes → stop immediately (no commit).
-      // Green, fixes exist → stop immediately (squash handled via healthFixBase
-      //   when gatherEvents sets it; the machine resolves squashing state).
-      // Red below cap → write HEALTH.md (uncommitted); resolveHealth will
-      //   commit it as `gtd: health-check` via `commitPending removeHealth`.
-      // Red at cap → write ERRORS.md and commit `gtd: health-check` immediately
-      //   so the Escalate state fires on the next resolve.
-      case "runHealthCheck": {
-        if (action.commitErrorsReset === true) {
-          yield* git.commitAllWithPrefix(HEALTH_FIX_SUBJECT);
-        }
-        const runner = yield* TestRunner;
-        const result = yield* runner.run();
-        if (result.exitCode === 0) {
-          if (action.healthFixBase !== void 0 && action.commitErrorsReset !== true) {
-            yield* fs9.writeFileString(
-              resolve5(SQUASH_MSG_FILE),
-              "chore: health-check cycle squash\n"
-            );
-            return { stop: false };
-          }
-          return { stop: true };
-        }
-        const body = /\S/.test(result.output) ? result.output : EMPTY_FAILURE_SENTINEL;
-        if (action.capReached) {
-          yield* fs9.writeFileString(resolve5(ERRORS_FILE), body);
-          yield* git.commitAllWithPrefix(HEALTH_CHECK_SUBJECT);
-        } else {
-          yield* fs9.writeFileString(resolve5(HEALTH_FILE), body);
-        }
-        return { stop: false };
-      }
-      // Grilling / Grilled / Planning / Fixing: commit the pending tree under a
-      // fixed phase prefix. Fixing sets `removeFeedback` so FEEDBACK.md's removal
-      // lands in the `gtd: fixing` / `gtd: feedback` commit — otherwise the next
-      // run re-detects FEEDBACK (precedence 2) and Fixing re-fires forever instead
-      // of returning to Testing (STATES.md § Fixing).
-      case "commitPending": {
-        if (action.removeFeedback === true) {
-          yield* fs9.remove(resolve5(FEEDBACK_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        }
-        if (action.removeTodo === true) {
-          yield* fs9.remove(resolve5(TODO_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        }
-        if (action.removeHealth === true) {
-          yield* fs9.remove(resolve5(HEALTH_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        }
-        if (action.removeTodo !== true) {
-          yield* formatFile(resolve5(TODO_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        }
-        yield* git.commitAllWithPrefix(action.prefix);
-        return { stop: false };
-      }
-      // Close package: remove the (maybe-empty / maybe-absent) FEEDBACK.md, rm
-      // the first (finished) package dir (+ the now-empty `.gtd/`), commit
-      // `gtd: package done`. Tolerates an absent FEEDBACK.md (force-approve).
-      case "closePackage": {
-        yield* fs9.remove(resolve5(FEEDBACK_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        const packages = yield* getPackages(fs9, root2);
-        const first2 = packages[0];
-        if (first2 !== void 0) {
-          yield* git.removePackageDir(`${GTD_DIR}/${first2.name}`);
-        }
-        yield* git.commitAllWithPrefix(PACKAGE_DONE_SUBJECT);
-        return { stop: false };
-      }
-      // Await Review: commit REVIEW.md as `gtd: awaiting review`.
-      case "commitReview": {
-        yield* formatFile(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        yield* git.commitAllWithPrefix(AWAITING_REVIEW_SUBJECT);
-        return { stop: false };
-      }
-      // Done: rm REVIEW.md, commit `gtd: done`.
-      case "done": {
-        yield* fs9.remove(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        yield* git.commitAllWithPrefix(DONE_SUBJECT);
-        return { stop: false };
-      }
-      // Squash: rm SQUASH_MSG.md, soft-reset to squashBase, commit everything
-      // under the provided commit message.
-      case "squashCommit": {
-        yield* fs9.remove(resolve5(SQUASH_MSG_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
-        yield* git.softResetTo(action.squashBase);
-        yield* git.commitAllWithPrefix(action.commitMessage);
-        return { stop: false };
-      }
-    }
-  }).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))))
-);
-
-// src/Machine.ts
-var GtdStateError = class extends Error {
-  kind;
-  constructor(kind, message) {
-    super(message);
-    this.name = "GtdStateError";
-    this.kind = kind;
+  if (p4.reviewCommitted || p4.reviewDirty && p4.reviewCheckboxOnly) {
+    return {
+      state: "done",
+      autoAdvance: true,
+      edgeAction: { kind: "done" },
+      context: buildContext(p4, counters)
+    };
   }
-};
-var foldCounters = (events) => {
-  let testFixCount = 0;
-  let reviewFixCount = 0;
-  let healthFixCount = 0;
-  for (const event of events) {
-    if (event.type !== "COMMIT") continue;
-    if (event.isPackageStart || event.isFeedback || event.removedErrors) testFixCount = 0;
-    if (event.isErrors) testFixCount += 1;
-    if (event.isPackageStart) reviewFixCount = 0;
-    if (event.isFeedback) reviewFixCount += 1;
-    if (event.isPackageStart || event.removedErrors) healthFixCount = 0;
-    if (event.isHealthCheck) healthFixCount += 1;
+  if (p4.reviewDirty) {
+    return {
+      state: "accept-review",
+      autoAdvance: true,
+      edgeAction: { kind: "seedAcceptReview" },
+      context: buildContext(p4, counters)
+    };
   }
-  return { testFixCount, reviewFixCount, healthFixCount };
-};
-var isBoundary = (subject) => !subject.startsWith("gtd: ") || subject === "gtd: done";
-var DEFAULT_PAYLOAD = {
-  todoExists: false,
-  todoCommitted: false,
-  gtdDirExists: false,
-  reviewPresent: false,
-  feedbackPresent: false,
-  errorsPresent: false,
-  gtdModified: false,
-  codeDirty: false,
-  todoMarkerPresent: false,
-  feedbackCommitted: false,
-  feedbackEmpty: false,
-  feedbackContent: "",
-  reviewCommitted: false,
-  reviewDirty: false,
-  reviewCheckboxOnly: false,
-  pendingErrorsDeletion: false,
-  lastCommitSubject: "",
-  workingTreeClean: true,
-  packages: [],
-  diff: "",
-  hasCommitsAfterLastDone: true,
-  agenticReviewEnabled: true,
-  fixAttemptCap: 3,
-  reviewThreshold: 3,
-  squashEnabled: false,
-  squashMsgPresent: false,
-  squashMsgContent: "",
-  healthPresent: false,
-  healthContent: "",
-  healthCommitted: false
-};
-var buildContext = (p4, counters, grillingCase) => ({
-  testFixCount: counters.testFixCount,
-  reviewFixCount: counters.reviewFixCount,
-  packages: p4.packages,
-  diff: p4.diff,
-  ...p4.refDiff !== void 0 ? { refDiff: p4.refDiff } : {},
-  ...p4.reviewBase !== void 0 ? { reviewBase: p4.reviewBase } : {},
-  ...p4.squashBase !== void 0 ? { squashBase: p4.squashBase } : {},
-  ...p4.squashDiff !== void 0 ? { squashDiff: p4.squashDiff } : {},
-  lastCommitSubject: p4.lastCommitSubject,
-  workingTreeClean: p4.workingTreeClean,
-  feedbackContent: p4.feedbackContent !== "" ? p4.feedbackContent : p4.healthContent,
-  ...grillingCase !== void 0 ? { grillingCase } : {}
-});
-var assertLegal = (p4) => {
-  const fail20 = (msg) => {
-    throw new GtdStateError("illegal-combination", msg);
+  return {
+    state: "await-review",
+    autoAdvance: true,
+    edgeAction: { kind: "commitReview" },
+    context: buildContext(p4, counters)
   };
-  if (p4.reviewPresent && p4.gtdDirExists) fail20("illegal combination: REVIEW.md + .gtd");
-  if (p4.reviewPresent && p4.todoCommitted) fail20("illegal combination: REVIEW.md + committed TODO.md");
-  if (p4.reviewPresent && !(p4.reviewCommitted || p4.reviewDirty) && p4.todoExists)
-    fail20("illegal combination: uncommitted REVIEW.md + TODO.md");
-  if (p4.feedbackPresent && p4.reviewPresent) fail20("illegal combination: FEEDBACK.md + REVIEW.md");
-  if (p4.feedbackPresent && !p4.gtdDirExists) fail20("illegal combination: FEEDBACK.md without .gtd");
-  if (p4.errorsPresent && p4.feedbackPresent) fail20("illegal combination: ERRORS.md + FEEDBACK.md");
-  const isHealthCapEscalation = p4.lastCommitSubject === "gtd: health-check" || p4.lastCommitSubject === "gtd: health-fix";
-  if (p4.errorsPresent && !p4.gtdDirExists && !isHealthCapEscalation)
-    fail20("illegal combination: ERRORS.md without .gtd");
-  if (p4.healthPresent && p4.gtdDirExists) fail20("illegal combination: HEALTH.md + .gtd");
-  if (p4.healthPresent && p4.reviewPresent) fail20("illegal combination: HEALTH.md + REVIEW.md");
-  if (p4.healthPresent && p4.feedbackPresent) fail20("illegal combination: HEALTH.md + FEEDBACK.md");
-  if (p4.healthPresent && p4.errorsPresent) fail20("illegal combination: HEALTH.md + ERRORS.md");
 };
-var resolveHealth = (p4, counters) => {
-  const hasPendingWork = !p4.healthCommitted || !p4.workingTreeClean;
-  const prefix = p4.healthCommitted ? "gtd: health-fix" : "gtd: health-check";
+var resolveGrilling = (p4, counters, head7) => {
+  const grillCommit = p4.todoCommitted && p4.codeDirty ? { kind: "captureGrillingEdits" } : { kind: "commitPending", prefix: "gtd: grilling" };
+  if (p4.todoMarkerPresent) {
+    const alreadyAtGrillingStop = p4.workingTreeClean && head7 === "gtd: grilling";
+    return {
+      state: "grilling",
+      autoAdvance: false,
+      ...alreadyAtGrillingStop ? {} : { edgeAction: grillCommit },
+      context: buildContext(p4, counters, "stop")
+    };
+  }
+  if (!p4.workingTreeClean) {
+    return {
+      state: "grilling",
+      autoAdvance: true,
+      edgeAction: grillCommit,
+      context: buildContext(p4, counters, "iterate")
+    };
+  }
   return {
-    state: "health-fixing",
+    state: "grilled",
     autoAdvance: true,
-    ...hasPendingWork ? {
-      edgeAction: {
-        kind: "commitPending",
-        prefix,
-        // Always remove HEALTH.md: on gtd: health-check this clears it so
-        // the next run re-enters resolveCleanOrIdle; on gtd: health-fix it
-        // clears the marker left by a prior health-check run.
-        removeHealth: true
-      }
-    } : {},
+    edgeAction: { kind: "commitPending", prefix: "gtd: grilled" },
     context: buildContext(p4, counters)
   };
 };
-var resolveFeedback = (p4, counters) => {
-  if (p4.feedbackEmpty) {
+var resolveCleanOrIdle = (p4, counters, head7) => {
+  const isHealthHead = head7 === "gtd: health-check" || head7 === "gtd: health-fix";
+  if (!p4.workingTreeClean && !p4.pendingErrorsDeletion && isHealthHead) {
     return {
-      state: "close-package",
+      state: "health-check",
       autoAdvance: true,
-      edgeAction: { kind: "closePackage" },
+      edgeAction: { kind: "commitPending", prefix: "gtd: health-fix" },
       context: buildContext(p4, counters)
     };
   }
+  if (!p4.workingTreeClean && !p4.pendingErrorsDeletion) return null;
+  if (!p4.workingTreeClean && p4.pendingErrorsDeletion && p4.gtdDirExists) return null;
+  if (!p4.workingTreeClean && p4.pendingErrorsDeletion && !isBoundary(head7) && head7 !== "gtd: package done" && !isHealthHead)
+    return null;
+  if (p4.workingTreeClean && !isBoundary(head7) && head7 !== "gtd: package done" && !isHealthHead)
+    return null;
+  if (head7 === "gtd: done" && p4.squashEnabled && p4.squashBase !== void 0) {
+    if (p4.squashMsgPresent) {
+      return {
+        state: "squashing",
+        autoAdvance: false,
+        edgeAction: {
+          kind: "squashCommit",
+          squashBase: p4.squashBase,
+          commitMessage: p4.squashMsgContent
+        },
+        context: buildContext(p4, counters)
+      };
+    }
+    return { state: "squashing", autoAdvance: true, context: buildContext(p4, counters) };
+  }
+  const reviewable = p4.hasCommitsAfterLastDone && p4.reviewBase !== void 0 && (p4.refDiff ?? "").trim().length > 0;
+  if (reviewable) {
+    return { state: "clean", autoAdvance: false, context: buildContext(p4, counters) };
+  }
+  const squashHealth = p4.squashEnabled && counters.healthFixCount > 0 && p4.healthFixBase !== void 0;
   return {
-    state: "fixing",
+    state: "health-check",
     autoAdvance: true,
     edgeAction: {
-      kind: "commitPending",
-      prefix: p4.feedbackCommitted ? "gtd: fixing" : "gtd: feedback",
-      // Delete FEEDBACK.md so its removal lands in this commit; without it the
-      // next run re-detects FEEDBACK (precedence 2) and Fixing never returns to
-      // Testing (STATES.md § Fixing: "FEEDBACK.md is removed either way").
-      removeFeedback: true
+      kind: "runHealthCheck",
+      errorCount: counters.healthFixCount,
+      capReached: counters.healthFixCount >= p4.fixAttemptCap,
+      ...squashHealth ? { healthFixBase: p4.healthFixBase } : {},
+      ...p4.pendingErrorsDeletion ? { commitErrorsReset: true } : {}
     },
     context: buildContext(p4, counters)
   };
 };
-var resolveGtdLifecycle = (p4, counters, head7, corrupt) => {
-  if (p4.gtdModified) {
+var resolve4 = (events) => {
+  const counters = foldCounters(events);
+  let payload = DEFAULT_PAYLOAD;
+  for (const event of events) if (event.type === "RESOLVE") payload = event.payload;
+  const p4 = payload;
+  assertLegal(p4);
+  const head7 = p4.lastCommitSubject;
+  const corrupt = () => {
+    throw new GtdStateError(
+      "corruption",
+      `no precedence rule matched (HEAD="${head7}", clean=${p4.workingTreeClean}); repo is in an unrecognized state \u2014 refusing to guess`
+    );
+  };
+  if (head7 === "gtd: transport") {
     return {
-      state: "planning",
+      state: "transport",
       autoAdvance: true,
-      edgeAction: { kind: "commitPending", prefix: "gtd: planning" },
+      edgeAction: { kind: "transportReset" },
       context: buildContext(p4, counters)
     };
   }
-  const noOpFixer = p4.workingTreeClean && head7 === "gtd: fixing";
-  if (p4.codeDirty || p4.pendingErrorsDeletion || noOpFixer) {
-    const resume2 = p4.pendingErrorsDeletion;
+  if (p4.errorsPresent)
+    return { state: "escalate", autoAdvance: false, context: buildContext(p4, counters) };
+  if (p4.healthPresent) return resolveHealth(p4, counters);
+  if (p4.feedbackPresent) return resolveFeedback(p4, counters);
+  if (p4.gtdDirExists) return resolveGtdLifecycle(p4, counters, head7, corrupt);
+  if (p4.reviewPresent) return resolveReviewLifecycle(p4, counters, head7);
+  if (head7 === "gtd: done" && p4.squashEnabled && p4.squashBase !== void 0 && p4.squashMsgPresent && !p4.codeDirty) {
     return {
-      state: "testing",
-      autoAdvance: true,
+      state: "squashing",
+      autoAdvance: false,
       edgeAction: {
-        kind: "runTest",
-        errorCount: resume2 ? 0 : counters.testFixCount,
-        capReached: (resume2 ? 0 : counters.testFixCount) >= p4.fixAttemptCap
+        kind: "squashCommit",
+        squashBase: p4.squashBase,
+        commitMessage: p4.squashMsgContent
       },
       context: buildContext(p4, counters)
     };
   }
-  if (p4.workingTreeClean) {
-    if (head7 === "gtd: planning" || head7 === "gtd: package done") {
-      if (head7 === "gtd: planning" && p4.todoExists) {
-        return {
-          state: "building",
-          autoAdvance: true,
-          edgeAction: { kind: "commitPending", prefix: "gtd: planning", removeTodo: true },
-          context: buildContext(p4, counters)
-        };
-      }
-      return { state: "building", autoAdvance: true, context: buildContext(p4, counters) };
-    }
-    if (head7 === "gtd: building") {
-      const forceApprove = !p4.agenticReviewEnabled || counters.reviewFixCount >= p4.reviewThreshold;
-      if (forceApprove) {
-        return {
-          state: "close-package",
-          autoAdvance: true,
-          edgeAction: { kind: "closePackage" },
-          context: buildContext(p4, counters)
-        };
-      }
-      return { state: "agentic-review", autoAdvance: true, context: buildContext(p4, counters) };
-    }
-  }
-  return corrupt();
-};
-var resolveReviewLifecycle = (p4, counters, head7) => {
-  if (head7 === "gtd: review feedback") {
+  if (p4.squashEnabled && p4.healthFixBase !== void 0 && p4.squashMsgPresent && p4.squashMsgContent !== HEALTH_SQUASH_SENTINEL && !p4.codeDirty) {
     return {
-      state: "accept-review",
-      autoAdvance: true,
-      edgeAction: { kind: "seedAcceptReview" },
+      state: "squashing",
+      autoAdvance: false,
+      edgeAction: {
+        kind: "squashCommit",
+        squashBase: p4.healthFixBase,
+        commitMessage: p4.squashMsgContent
+      },
       context: buildContext(p4, counters)
     };
   }
-  if (p4.reviewCommitted || p4.reviewDirty && p4.reviewCheckboxOnly) {
+  if (p4.squashEnabled && p4.healthFixBase !== void 0 && p4.squashMsgPresent && p4.squashMsgContent === HEALTH_SQUASH_SENTINEL) {
     return {
-      state: "done",
+      state: "squashing",
       autoAdvance: true,
-      edgeAction: { kind: "done" },
+      edgeAction: { kind: "removeHealthSentinel" },
       context: buildContext(p4, counters)
     };
   }
-  if (p4.reviewDirty) {
+  if (isBoundary(head7) && p4.squashMsgPresent && !p4.codeDirty) {
     return {
-      state: "accept-review",
+      state: "squashing",
       autoAdvance: true,
-      edgeAction: { kind: "seedAcceptReview" },
+      edgeAction: { kind: "removeStraySquashMsg" },
       context: buildContext(p4, counters)
     };
   }
-  return {
-    state: "await-review",
-    autoAdvance: true,
-    edgeAction: { kind: "commitReview" },
-    context: buildContext(p4, counters)
-  };
-};
-var resolveGrilling = (p4, counters, head7) => {
-  const grillCommit = p4.todoCommitted && p4.codeDirty ? { kind: "captureGrillingEdits" } : { kind: "commitPending", prefix: "gtd: grilling" };
-  if (p4.todoMarkerPresent) {
-    const alreadyAtGrillingStop = p4.workingTreeClean && head7 === "gtd: grilling";
-    return {
-      state: "grilling",
-      autoAdvance: false,
-      ...alreadyAtGrillingStop ? {} : { edgeAction: grillCommit },
-      context: buildContext(p4, counters, "stop")
-    };
-  }
-  if (!p4.workingTreeClean) {
+  if (isBoundary(head7) && !p4.workingTreeClean && !p4.todoCommitted || head7 === "gtd: new task" && p4.workingTreeClean) {
     return {
-      state: "grilling",
+      state: "new-feature",
       autoAdvance: true,
-      edgeAction: grillCommit,
-      context: buildContext(p4, counters, "iterate")
+      edgeAction: { kind: "seedNewFeature" },
+      context: buildContext(p4, counters)
     };
   }
-  return {
-    state: "grilled",
-    autoAdvance: true,
-    edgeAction: { kind: "commitPending", prefix: "gtd: grilled" },
-    context: buildContext(p4, counters)
+  if (p4.todoExists) return resolveGrilling(p4, counters, head7);
+  return resolveCleanOrIdle(p4, counters, head7) ?? corrupt();
+};
+var cleanResult = (args2) => ({
+  state: "clean",
+  autoAdvance: args2.autoAdvance,
+  context: {
+    ...buildContext(
+      {
+        ...DEFAULT_PAYLOAD,
+        reviewBase: args2.reviewBase,
+        refDiff: args2.refDiff
+      },
+      { testFixCount: 0, reviewFixCount: 0, healthFixCount: 0 }
+    )
+  }
+});
+
+// src/Events.ts
+var TODO_FILE = "TODO.md";
+var GTD_DIR = ".gtd";
+var REVIEW_FILE = "REVIEW.md";
+var FEEDBACK_FILE = "FEEDBACK.md";
+var ERRORS_FILE = "ERRORS.md";
+var HEALTH_FILE = "HEALTH.md";
+var EMPTY_FAILURE_SENTINEL = "Test command failed with no output (exit code non-zero).";
+var UNANSWERED_MARKER = "<!-- user answers here -->";
+var HEALTH_CHECK_SUBJECT = "gtd: health-check";
+var HEALTH_FIX_SUBJECT = "gtd: health-fix";
+var NEW_TASK_SUBJECT = "gtd: new task";
+var GRILLING_SUBJECT = "gtd: grilling";
+var PLANNING_SUBJECT = "gtd: planning";
+var BUILDING_SUBJECT = "gtd: building";
+var ERRORS_SUBJECT = "gtd: errors";
+var FEEDBACK_SUBJECT = "gtd: feedback";
+var PACKAGE_DONE_SUBJECT = "gtd: package done";
+var AWAITING_REVIEW_SUBJECT = "gtd: awaiting review";
+var DONE_SUBJECT = "gtd: done";
+var REVIEW_FEEDBACK_SUBJECT = "gtd: review feedback";
+var REVIEWING_SUBJECT = "gtd: reviewing";
+var SQUASH_MSG_FILE = "SQUASH_MSG.md";
+var STEERING_FILES = [
+  TODO_FILE,
+  REVIEW_FILE,
+  FEEDBACK_FILE,
+  ERRORS_FILE,
+  HEALTH_FILE,
+  SQUASH_MSG_FILE
+];
+var WORKFLOW_FILE_EXCLUDES = [...STEERING_FILES, GTD_DIR];
+var isGtdPath = (path15) => path15 === GTD_DIR || path15.startsWith(`${GTD_DIR}/`);
+var isSteeringFile = (path15) => STEERING_FILES.includes(path15);
+var isUncommittedStatus = (status2) => status2.includes("?") || status2.includes("A");
+var EMPTY_TREE = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
+var unquoteGitPath = (raw) => {
+  if (!raw.startsWith('"')) return raw;
+  const inner = raw.slice(1, raw.endsWith('"') ? raw.length - 1 : raw.length);
+  const bytes = [];
+  const chars = [];
+  const flushBytes = () => {
+    if (bytes.length === 0) return;
+    const buf = Buffer.from(bytes);
+    chars.push(buf.toString("utf8"));
+    bytes.length = 0;
   };
+  let i = 0;
+  while (i < inner.length) {
+    if (inner[i] !== "\\") {
+      flushBytes();
+      chars.push(inner[i]);
+      i++;
+      continue;
+    }
+    const esc = inner[i + 1];
+    if (esc === void 0) {
+      flushBytes();
+      chars.push("\\");
+      i++;
+      continue;
+    }
+    if (esc >= "0" && esc <= "7") {
+      const oct = inner.slice(i + 1, i + 4);
+      bytes.push(parseInt(oct, 8));
+      i += 4;
+      continue;
+    }
+    flushBytes();
+    switch (esc) {
+      case "n":
+        chars.push("\n");
+        break;
+      case "t":
+        chars.push("	");
+        break;
+      case "r":
+        chars.push("\r");
+        break;
+      case "\\":
+        chars.push("\\");
+        break;
+      case '"':
+        chars.push('"');
+        break;
+      default:
+        chars.push("\\", esc);
+    }
+    i += 2;
+  }
+  flushBytes();
+  return chars.join("");
 };
-var resolveCleanOrIdle = (p4, counters, head7) => {
-  const isHealthHead = head7 === "gtd: health-check" || head7 === "gtd: health-fix";
-  if (!p4.workingTreeClean && !p4.pendingErrorsDeletion && isHealthHead) {
-    return {
-      state: "health-check",
-      autoAdvance: true,
-      edgeAction: { kind: "commitPending", prefix: "gtd: health-fix" },
-      context: buildContext(p4, counters)
-    };
+var parsePorcelainPaths = (porcelain) => porcelain.split("\n").map((line3) => line3.replace(/\r$/, "")).filter((line3) => line3.length > 0).map((line3) => ({ status: line3.slice(0, 2), path: unquoteGitPath(line3.slice(3)) }));
+var isNumberedDir = (name) => /^\d+-/.test(name);
+var isTaskFile = (name) => name.endsWith(".md");
+var stripCode = (content) => content.replace(/^(`{3,}|~{3,})[^\n]*\n[\s\S]*?(?:\n\1[^\n]*|$(?![\s\S]))/gm, "").replace(/`[^`\n]+`/g, "");
+var getPackages = (fs9, root2) => Effect_exports.gen(function* () {
+  const resolve5 = (p4) => join11(root2, p4);
+  const gtdExists = yield* fs9.exists(resolve5(GTD_DIR));
+  if (!gtdExists) return [];
+  const entries2 = yield* fs9.readDirectory(resolve5(GTD_DIR));
+  const packageDirs = entries2.filter(isNumberedDir).sort();
+  const packages = [];
+  for (const dir of packageDirs) {
+    const packagePath = `${GTD_DIR}/${dir}`;
+    const stat4 = yield* fs9.stat(resolve5(packagePath));
+    if (stat4.type !== "Directory") continue;
+    const files = yield* fs9.readDirectory(resolve5(packagePath));
+    const tasks = files.filter(isTaskFile).sort();
+    const taskContents = [];
+    for (const taskFile of tasks) {
+      const content = yield* fs9.readFileString(resolve5(`${packagePath}/${taskFile}`));
+      taskContents.push({ name: taskFile, content });
+    }
+    packages.push({ name: dir, tasks, taskContents });
   }
-  if (!p4.workingTreeClean && !p4.pendingErrorsDeletion) return null;
-  if (!p4.workingTreeClean && p4.pendingErrorsDeletion && p4.gtdDirExists) return null;
-  if (!p4.workingTreeClean && p4.pendingErrorsDeletion && !isBoundary(head7) && head7 !== "gtd: package done" && !isHealthHead)
-    return null;
-  if (p4.workingTreeClean && !isBoundary(head7) && head7 !== "gtd: package done" && !isHealthHead)
-    return null;
-  if (head7 === "gtd: done" && p4.squashEnabled && p4.squashBase !== void 0) {
-    if (p4.squashMsgPresent) {
-      return {
-        state: "squashing",
-        autoAdvance: false,
-        edgeAction: {
-          kind: "squashCommit",
-          squashBase: p4.squashBase,
-          commitMessage: p4.squashMsgContent
-        },
-        context: buildContext(p4, counters)
-      };
+  return packages;
+}).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))));
+var CAPTURE_RULES = [
+  "Interpret the captured diff with these rules:",
+  "",
+  "- **Code changes** are suggestions, not finished work \u2014 plan to re-implement",
+  "  them properly, including test coverage, rather than restoring them verbatim.",
+  "- **Code comments** are positional feedback about the code at that location.",
+  "- **TODO.md / REVIEW.md text changes** are global feedback on the plan or the",
+  "  reviewed work as a whole.",
+  "- **Checkbox flips** in a captured REVIEW.md diff are approval noise \u2014 ignore",
+  "  them."
+].join("\n");
+var seedTodo = (capturedDiff) => {
+  const body = capturedDiff.replace(/\n+$/, "");
+  const fence = fenceFor(body);
+  return [
+    "# Plan",
+    "",
+    "## Captured input",
+    "",
+    "These changes were captured as the starting point for this feature. Develop",
+    "them into a concrete plan and surface any open questions for the user.",
+    "",
+    CAPTURE_RULES,
+    "",
+    `${fence}diff`,
+    body,
+    fence,
+    ""
+  ].join("\n");
+};
+var appendCapturedInput = (todo, capturedDiff) => {
+  const body = capturedDiff.replace(/\n+$/, "");
+  if (todo.includes(body)) return todo;
+  const fence = fenceFor(body);
+  const section = [
+    "## Captured input (grilling)",
+    "",
+    "These code changes were made during grilling and captured as suggestions;",
+    "gtd has reverted them from the working tree.",
+    "",
+    ...todo.includes(CAPTURE_RULES) ? [] : [CAPTURE_RULES, ""],
+    `${fence}diff`,
+    body,
+    fence,
+    ""
+  ].join("\n");
+  return todo.replace(/\n*$/, "\n\n") + section;
+};
+var isCheckboxOnlyDiff = (diff8) => {
+  if (diff8.trim() === "") return false;
+  const checkboxRe = /^(\s*- \[)([xX ])\](.*)$/;
+  const removedLines = [];
+  const addedLines = [];
+  for (const raw of diff8.split("\n")) {
+    const line3 = raw.replace(/\r$/, "");
+    if (line3.startsWith("---") || line3.startsWith("+++") || line3.startsWith("@@") || line3.startsWith("diff ") || line3.startsWith("index ") || line3.startsWith("new file") || line3.startsWith("deleted file") || line3.startsWith("similarity") || line3.startsWith("rename"))
+      continue;
+    if (line3.startsWith("-")) {
+      removedLines.push(line3.slice(1));
+    } else if (line3.startsWith("+")) {
+      addedLines.push(line3.slice(1));
     }
-    return { state: "squashing", autoAdvance: true, context: buildContext(p4, counters) };
   }
-  const reviewable = p4.hasCommitsAfterLastDone && p4.reviewBase !== void 0 && (p4.refDiff ?? "").trim().length > 0;
-  if (reviewable) {
-    return { state: "clean", autoAdvance: false, context: buildContext(p4, counters) };
+  if (removedLines.length !== addedLines.length) return false;
+  let flips = 0;
+  for (let i = 0; i < removedLines.length; i++) {
+    const rm4 = removedLines[i];
+    const add7 = addedLines[i];
+    if (rm4 === add7) continue;
+    if (!checkboxRe.test(rm4) || !checkboxRe.test(add7)) return false;
+    const rmNorm = rm4.replace(/\[[ xX]\]/, "[ ]");
+    const addNorm = add7.replace(/\[[ xX]\]/, "[ ]");
+    if (rmNorm !== addNorm) return false;
+    flips += 1;
   }
-  const squashHealth = p4.squashEnabled && counters.healthFixCount > 0 && p4.healthFixBase !== void 0;
-  return {
-    state: "health-check",
-    autoAdvance: true,
-    edgeAction: {
-      kind: "runHealthCheck",
-      errorCount: counters.healthFixCount,
-      capReached: counters.healthFixCount >= p4.fixAttemptCap,
-      ...squashHealth ? { healthFixBase: p4.healthFixBase } : {},
-      ...p4.pendingErrorsDeletion ? { commitErrorsReset: true } : {}
-    },
-    context: buildContext(p4, counters)
-  };
+  return flips > 0;
 };
-var resolve4 = (events) => {
-  const counters = foldCounters(events);
-  let payload = DEFAULT_PAYLOAD;
-  for (const event of events) if (event.type === "RESOLVE") payload = event.payload;
-  const p4 = payload;
-  assertLegal(p4);
-  const head7 = p4.lastCommitSubject;
-  const corrupt = () => {
-    throw new GtdStateError(
-      "corruption",
-      `no precedence rule matched (HEAD="${head7}", clean=${p4.workingTreeClean}); repo is in an unrecognized state \u2014 refusing to guess`
+var gatherEvents = () => (
+  // fallow-ignore-next-line complexity
+  Effect_exports.gen(function* () {
+    const git = yield* GitService;
+    const fs9 = yield* FileSystem_exports.FileSystem;
+    const config2 = yield* ConfigService;
+    const { root: root2 } = yield* Cwd;
+    const resolve5 = (p4) => join11(root2, p4);
+    const defaultBranch = yield* git.resolveDefaultBranch();
+    const headHash = yield* git.resolveRef("HEAD").pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+    const mergeBase = Option_exports.isSome(defaultBranch) ? yield* git.mergeBase(defaultBranch.value, "HEAD") : Option_exports.none();
+    const base = Option_exports.isSome(mergeBase) && mergeBase.value !== headHash ? mergeBase : Option_exports.none();
+    const history = yield* git.commitHistory(Option_exports.getOrUndefined(base));
+    const commitEvents = history.map(
+      ({ message, removedErrors }) => {
+        const subject = (message.split("\n")[0] ?? "").trim();
+        return {
+          type: "COMMIT",
+          isErrors: subject === ERRORS_SUBJECT,
+          isFeedback: subject === FEEDBACK_SUBJECT,
+          isPackageStart: subject === PLANNING_SUBJECT || subject === PACKAGE_DONE_SUBJECT,
+          isWorkflowCommit: subject.startsWith("gtd: "),
+          removedErrors,
+          isHealthCheck: subject === HEALTH_CHECK_SUBJECT,
+          isHealthFix: subject === HEALTH_FIX_SUBJECT
+        };
+      }
     );
-  };
-  if (head7 === "gtd: transport") {
-    return {
-      state: "transport",
-      autoAdvance: true,
-      edgeAction: { kind: "transportReset" },
-      context: buildContext(p4, counters)
-    };
-  }
-  if (p4.errorsPresent)
-    return { state: "escalate", autoAdvance: false, context: buildContext(p4, counters) };
-  if (p4.healthPresent) return resolveHealth(p4, counters);
-  if (p4.feedbackPresent) return resolveFeedback(p4, counters);
-  if (p4.gtdDirExists) return resolveGtdLifecycle(p4, counters, head7, corrupt);
-  if (p4.reviewPresent) return resolveReviewLifecycle(p4, counters, head7);
-  if (head7 === "gtd: done" && p4.squashEnabled && p4.squashBase !== void 0 && p4.squashMsgPresent && !p4.codeDirty) {
-    return {
-      state: "squashing",
-      autoAdvance: false,
-      edgeAction: {
-        kind: "squashCommit",
-        squashBase: p4.squashBase,
-        commitMessage: p4.squashMsgContent
-      },
-      context: buildContext(p4, counters)
-    };
-  }
-  if (p4.squashEnabled && p4.healthFixBase !== void 0 && p4.squashMsgPresent && !p4.codeDirty) {
-    return {
-      state: "squashing",
-      autoAdvance: false,
-      edgeAction: {
-        kind: "squashCommit",
-        squashBase: p4.healthFixBase,
-        commitMessage: p4.squashMsgContent
-      },
-      context: buildContext(p4, counters)
+    const hasCommits = yield* git.hasCommits();
+    const porcelain = yield* git.statusPorcelain();
+    const entries2 = parsePorcelainPaths(porcelain);
+    const workingTreeClean = entries2.length === 0;
+    const lastCommitSubject = hasCommits ? yield* git.lastCommitSubject() : "";
+    const gtdModified = entries2.some((e7) => isGtdPath(e7.path));
+    const codeDirty = entries2.some((e7) => !isSteeringFile(e7.path) && !isGtdPath(e7.path));
+    const todoExists = yield* fs9.exists(resolve5(TODO_FILE));
+    const gtdDirExists = yield* fs9.exists(resolve5(GTD_DIR));
+    const reviewPresent = yield* fs9.exists(resolve5(REVIEW_FILE));
+    const feedbackPresent = yield* fs9.exists(resolve5(FEEDBACK_FILE));
+    const errorsPresent = yield* fs9.exists(resolve5(ERRORS_FILE));
+    const todoContent = todoExists ? yield* fs9.readFileString(resolve5(TODO_FILE)) : "";
+    const todoMarkerPresent = todoExists && stripCode(todoContent).includes(UNANSWERED_MARKER);
+    const isUncommitted = (path15) => {
+      const entry = entries2.find((e7) => e7.path === path15);
+      return entry !== void 0 && isUncommittedStatus(entry.status);
     };
-  }
-  if (isBoundary(head7) && !p4.workingTreeClean && !p4.todoCommitted || head7 === "gtd: new task" && p4.workingTreeClean) {
-    return {
-      state: "new-feature",
-      autoAdvance: true,
-      edgeAction: { kind: "seedNewFeature" },
-      context: buildContext(p4, counters)
+    const feedbackCommitted = feedbackPresent && !isUncommitted(FEEDBACK_FILE);
+    const feedbackContent = feedbackPresent ? yield* fs9.readFileString(resolve5(FEEDBACK_FILE)) : "";
+    const feedbackEmpty = feedbackPresent && !/\S/.test(feedbackContent);
+    const reviewTrackedAtHead = reviewPresent && !isUncommitted(REVIEW_FILE);
+    const reviewCommitted = reviewTrackedAtHead && workingTreeClean;
+    const reviewDirty = reviewTrackedAtHead && !workingTreeClean;
+    const todoCommitted = todoExists && !isUncommitted(TODO_FILE);
+    const pendingErrorsDeletion = entries2.some(
+      (e7) => e7.path === ERRORS_FILE && e7.status.includes("D")
+    );
+    const packages = yield* getPackages(fs9, root2);
+    const diff8 = hasCommits && entries2.length > 0 ? yield* git.diffHead() : "";
+    const onlyReviewDirty = entries2.length > 0 && entries2.every((e7) => e7.path === REVIEW_FILE);
+    const reviewCheckboxOnly = onlyReviewDirty && isCheckboxOnlyDiff(
+      yield* git.diffPath(REVIEW_FILE).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")))
+    );
+    let reviewBase;
+    let refDiff;
+    let hasCommitsAfterLastDone = true;
+    if (hasCommits) {
+      const allHistory = Option_exports.isNone(base) ? history : yield* git.commitHistory();
+      const lastDoneIdx = (() => {
+        let idx = -1;
+        for (let i = 0; i < allHistory.length; i++) {
+          const subject = (allHistory[i].message.split("\n")[0] ?? "").trim();
+          if (subject === DONE_SUBJECT) idx = i;
+        }
+        return idx;
+      })();
+      const currentCycle = lastDoneIdx === -1 ? allHistory : allHistory.slice(lastDoneIdx + 1);
+      hasCommitsAfterLastDone = lastDoneIdx === -1 || currentCycle.length > 0;
+      const firstGrilling = currentCycle.find(
+        (c7) => (c7.message.split("\n")[0] ?? "").trim() === GRILLING_SUBJECT
+      );
+      const lastAwaitingReview = (() => {
+        let found;
+        for (const c7 of currentCycle) {
+          if ((c7.message.split("\n")[0] ?? "").trim().startsWith(AWAITING_REVIEW_SUBJECT)) {
+            found = c7;
+          }
+        }
+        return found;
+      })();
+      const withinProcess = firstGrilling !== void 0;
+      let candidate;
+      if (withinProcess) {
+        if (lastAwaitingReview !== void 0) {
+          candidate = lastAwaitingReview.hash ?? EMPTY_TREE;
+        } else {
+          candidate = firstGrilling.hash ?? EMPTY_TREE;
+        }
+      } else {
+      }
+      if (candidate !== void 0 && hasCommitsAfterLastDone) {
+        const candidateDiff = yield* git.diffRef(candidate, WORKFLOW_FILE_EXCLUDES).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+        if (candidateDiff.trim().length > 0) {
+          reviewBase = candidate;
+          refDiff = candidateDiff;
+        }
+      }
+    }
+    let squashBase;
+    let squashDiff;
+    if (hasCommits && lastCommitSubject === DONE_SUBJECT && config2.squash) {
+      const squashHistory = history;
+      const subjectOf = (c7) => (c7.message.split("\n")[0] ?? "").trim();
+      let lastDoneIdxForSquash = -1;
+      let prevDoneIdx = -1;
+      for (let i = 0; i < squashHistory.length; i++) {
+        if (subjectOf(squashHistory[i]) === DONE_SUBJECT) {
+          prevDoneIdx = lastDoneIdxForSquash;
+          lastDoneIdxForSquash = i;
+        }
+      }
+      if (lastDoneIdxForSquash !== -1) {
+        const squashCycle = squashHistory.slice(prevDoneIdx + 1, lastDoneIdxForSquash + 1);
+        let startIdx = -1;
+        for (let i = squashCycle.length - 1; i >= 0; i--) {
+          if (subjectOf(squashCycle[i]) === NEW_TASK_SUBJECT || subjectOf(squashCycle[i]) === REVIEWING_SUBJECT) {
+            startIdx = i;
+            break;
+          }
+        }
+        if (startIdx === -1) {
+          for (let i = squashCycle.length - 1; i >= 0; i--) {
+            if (subjectOf(squashCycle[i]) === GRILLING_SUBJECT) {
+              startIdx = i;
+              while (startIdx > 0 && subjectOf(squashCycle[startIdx - 1]) === GRILLING_SUBJECT) {
+                startIdx--;
+              }
+              break;
+            }
+          }
+        }
+        const squashStart = startIdx === -1 ? void 0 : squashCycle[startIdx];
+        if (squashStart !== void 0) {
+          const squashStartParent = yield* git.resolveRef(`${squashStart.hash}~1`).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
+          const candidateDiff = yield* git.diffRef(squashStartParent).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+          if (candidateDiff.trim().length > 0) {
+            squashBase = squashStartParent;
+            squashDiff = candidateDiff;
+          }
+        }
+      }
+    }
+    const squashMsgPresent = yield* fs9.exists(resolve5(SQUASH_MSG_FILE));
+    const squashMsgContent = squashMsgPresent ? yield* fs9.readFileString(resolve5(SQUASH_MSG_FILE)) : "";
+    const healthPresent = yield* fs9.exists(resolve5(HEALTH_FILE));
+    const healthContent = healthPresent ? yield* fs9.readFileString(resolve5(HEALTH_FILE)) : "";
+    const healthCommitted = healthPresent && !isUncommitted(HEALTH_FILE);
+    let healthFixBase;
+    if (config2.squash) {
+      const subjectOf = (c7) => (c7.message.split("\n")[0] ?? "").trim();
+      let firstHealthCheckHash;
+      let healthCheckCount = 0;
+      for (const commit3 of history) {
+        const s5 = subjectOf(commit3);
+        const isPackageStart = s5 === PLANNING_SUBJECT || s5 === PACKAGE_DONE_SUBJECT;
+        if (isPackageStart || commit3.removedErrors) {
+          firstHealthCheckHash = void 0;
+          healthCheckCount = 0;
+        }
+        if (s5 === HEALTH_CHECK_SUBJECT) {
+          healthCheckCount++;
+          if (healthCheckCount === 1) firstHealthCheckHash = commit3.hash;
+        }
+      }
+      if (healthCheckCount > 0 && firstHealthCheckHash !== void 0) {
+        const base2 = yield* git.resolveRef(`${firstHealthCheckHash}~1`).pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
+        healthFixBase = base2;
+        const healthCandidateDiff = yield* git.diffRef(base2).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+        if (healthCandidateDiff.trim().length > 0) {
+          squashBase = base2;
+          squashDiff = healthCandidateDiff;
+        }
+      }
+    }
+    const payload = {
+      todoExists,
+      todoCommitted,
+      gtdDirExists,
+      reviewPresent,
+      feedbackPresent,
+      errorsPresent,
+      gtdModified,
+      codeDirty,
+      todoMarkerPresent,
+      feedbackCommitted,
+      feedbackEmpty,
+      feedbackContent,
+      reviewCommitted,
+      reviewDirty,
+      reviewCheckboxOnly,
+      pendingErrorsDeletion,
+      lastCommitSubject,
+      workingTreeClean,
+      packages,
+      diff: diff8,
+      ...reviewBase !== void 0 ? { reviewBase } : {},
+      ...refDiff !== void 0 ? { refDiff } : {},
+      hasCommitsAfterLastDone,
+      agenticReviewEnabled: config2.agenticReview,
+      fixAttemptCap: config2.fixAttemptCap,
+      reviewThreshold: config2.reviewThreshold,
+      squashEnabled: config2.squash,
+      ...squashBase !== void 0 ? { squashBase } : {},
+      ...squashDiff !== void 0 ? { squashDiff } : {},
+      squashMsgPresent,
+      squashMsgContent,
+      healthPresent,
+      healthContent,
+      healthCommitted,
+      ...healthFixBase !== void 0 ? { healthFixBase } : {}
     };
+    const resolveEvent = { type: "RESOLVE", payload };
+    return [...commitEvents, resolveEvent];
+  }).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))))
+);
+var captureAndRevert = (git, subject, onRegen) => Effect_exports.gen(function* () {
+  const head7 = yield* git.lastCommitSubject().pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+  if (head7 !== subject) {
+    yield* git.commitAllWithPrefix(subject);
+  } else {
+    yield* onRegen;
   }
-  if (p4.todoExists) return resolveGrilling(p4, counters, head7);
-  return resolveCleanOrIdle(p4, counters, head7) ?? corrupt();
-};
-var cleanResult = (args2) => ({
-  state: "clean",
-  autoAdvance: args2.autoAdvance,
-  context: {
-    ...buildContext(
-      {
-        ...DEFAULT_PAYLOAD,
-        reviewBase: args2.reviewBase,
-        refDiff: args2.refDiff
-      },
-      { testFixCount: 0, reviewFixCount: 0, healthFixCount: 0 }
-    )
-  }
+  const base = yield* git.resolveRef("HEAD~1").pipe(Effect_exports.catchAll(() => Effect_exports.succeed(EMPTY_TREE)));
+  const captured = yield* git.diffRef(base).pipe(Effect_exports.catchAll(() => Effect_exports.succeed("")));
+  yield* git.revertNoCommit("HEAD");
+  return captured;
+});
+var reviewAgainst = (target) => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const targetHash = yield* git.resolveRef(target);
+  const mergeBase = yield* git.mergeBase(target, "HEAD");
+  const mergeBaseHash = Option_exports.isNone(mergeBase) || mergeBase.value === targetHash ? targetHash : mergeBase.value;
+  const refDiff = yield* git.diffRef(mergeBaseHash, WORKFLOW_FILE_EXCLUDES);
+  if (refDiff.trim().length === 0) return void 0;
+  return { reviewBase: mergeBaseHash, refDiff };
 });
+var perform = (action) => (
+  // fallow-ignore-next-line complexity
+  Effect_exports.gen(function* () {
+    const git = yield* GitService;
+    const fs9 = yield* FileSystem_exports.FileSystem;
+    const { root: root2 } = yield* Cwd;
+    const resolve5 = (p4) => join11(root2, p4);
+    switch (action.kind) {
+      // Transport: mixed-reset the hand-made `gtd: transport` HEAD, keeping the
+      // work in the tree, then re-derive. (No producer command — consume only.)
+      case "transportReset": {
+        yield* git.mixedResetHead();
+        return { stop: false };
+      }
+      // New Feature: capture the raw input as `gtd: new task` (unless HEAD is
+      // already there — the lost-seed regenerate case), revert it back to a
+      // clean baseline (inverse staged), and seed TODO.md from that diff.
+      case "seedNewFeature": {
+        const captured = yield* captureAndRevert(git, NEW_TASK_SUBJECT, Effect_exports.void);
+        yield* fs9.writeFileString(resolve5(TODO_FILE), seedTodo(captured));
+        return { stop: false };
+      }
+      // Accept Review: capture the human's pending changeset durably as
+      // `gtd: review feedback` (annotations, code edits, and new files alike),
+      // revert it back to the reviewed baseline, rm REVIEW.md (which is what
+      // stops Accept Review re-firing), and seed TODO.md from the captured
+      // diff. The regen case (the machine's rule-4 carve-out fired) discards
+      // any partial revert/seed state with a hard reset first.
+      case "seedAcceptReview": {
+        const captured = yield* captureAndRevert(git, REVIEW_FEEDBACK_SUBJECT, git.resetHard());
+        yield* fs9.remove(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        yield* fs9.writeFileString(resolve5(TODO_FILE), seedTodo(captured));
+        return { stop: false };
+      }
+      // Grilling capture: the plan is already committed and the user sketched
+      // code during the round. Fold the code diff (untracked included, steering
+      // files excluded) into TODO.md as a suggestion block, drop the code
+      // changes — reset tracked, delete untracked/added — and commit the lot as
+      // one `gtd: grilling`. TODO.md's own pending edits are preserved verbatim
+      // (snapshotted before the reset). Binary edits survive only as the diff's
+      // "Binary files differ" line — an accepted limitation.
+      case "captureGrillingEdits": {
+        const porcelain = yield* git.statusPorcelain();
+        const entries2 = parsePorcelainPaths(porcelain);
+        const pendingCodeFiles = entries2.filter(
+          (e7) => isUncommittedStatus(e7.status) && !isSteeringFile(e7.path) && !isGtdPath(e7.path)
+        );
+        const todoNow = yield* fs9.readFileString(resolve5(TODO_FILE));
+        const captured = yield* git.diffHead(WORKFLOW_FILE_EXCLUDES);
+        yield* git.resetHard();
+        for (const entry of pendingCodeFiles) {
+          yield* fs9.remove(resolve5(entry.path), { recursive: true }).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        }
+        yield* fs9.writeFileString(resolve5(TODO_FILE), appendCapturedInput(todoNow, captured));
+        yield* git.commitAllWithPrefix(GRILLING_SUBJECT);
+        return { stop: false };
+      }
+      // Testing: commit the pending tree `gtd: building` (nothing pending in the
+      // no-op-fixer case), run tests; on red write FEEDBACK (below cap) or ERRORS
+      // (at cap) and commit `gtd: errors`; on green proceed.
+      case "runTest": {
+        const runner = yield* TestRunner;
+        const status2 = yield* git.statusPorcelain();
+        const committedBuilding = status2.trim().length > 0;
+        if (committedBuilding) {
+          yield* git.commitAllWithPrefix(BUILDING_SUBJECT);
+        }
+        const result = yield* runner.run();
+        if (result.exitCode === 0) {
+          if (!committedBuilding) {
+            yield* git.commitAllWithPrefix(BUILDING_SUBJECT);
+          }
+          return { stop: false };
+        }
+        const target = action.capReached ? ERRORS_FILE : FEEDBACK_FILE;
+        const body = /\S/.test(result.output) ? result.output : EMPTY_FAILURE_SENTINEL;
+        yield* fs9.writeFileString(resolve5(target), body);
+        yield* git.commitAllWithPrefix(ERRORS_SUBJECT);
+        return { stop: false };
+      }
+      // Health check: run tests on an idle/clean tree.
+      // Green, no prior fixes → stop immediately (no commit).
+      // Green, fixes exist → stop immediately (squash handled via healthFixBase
+      //   when gatherEvents sets it; the machine resolves squashing state).
+      // Red below cap → write HEALTH.md (uncommitted); resolveHealth will
+      //   commit it as `gtd: health-check` via `commitPending removeHealth`.
+      // Red at cap → write ERRORS.md and commit `gtd: health-check` immediately
+      //   so the Escalate state fires on the next resolve.
+      case "runHealthCheck": {
+        if (action.commitErrorsReset === true) {
+          yield* git.commitAllWithPrefix(HEALTH_FIX_SUBJECT);
+        }
+        const runner = yield* TestRunner;
+        const result = yield* runner.run();
+        if (result.exitCode === 0) {
+          if (action.healthFixBase !== void 0 && action.commitErrorsReset !== true) {
+            yield* fs9.writeFileString(resolve5(SQUASH_MSG_FILE), HEALTH_SQUASH_SENTINEL);
+            return { stop: false };
+          }
+          return { stop: true };
+        }
+        const body = /\S/.test(result.output) ? result.output : EMPTY_FAILURE_SENTINEL;
+        if (action.capReached) {
+          yield* fs9.writeFileString(resolve5(ERRORS_FILE), body);
+          yield* git.commitAllWithPrefix(HEALTH_CHECK_SUBJECT);
+        } else {
+          yield* fs9.writeFileString(resolve5(HEALTH_FILE), body);
+        }
+        return { stop: false };
+      }
+      // Grilling / Grilled / Planning / Fixing: commit the pending tree under a
+      // fixed phase prefix. Fixing sets `removeFeedback` so FEEDBACK.md's removal
+      // lands in the `gtd: fixing` / `gtd: feedback` commit — otherwise the next
+      // run re-detects FEEDBACK (precedence 2) and Fixing re-fires forever instead
+      // of returning to Testing (STATES.md § Fixing).
+      case "commitPending": {
+        if (action.removeFeedback === true) {
+          yield* fs9.remove(resolve5(FEEDBACK_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        }
+        if (action.removeTodo === true) {
+          yield* fs9.remove(resolve5(TODO_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        }
+        if (action.removeHealth === true) {
+          yield* fs9.remove(resolve5(HEALTH_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        }
+        if (action.removeTodo !== true) {
+          yield* formatFile(resolve5(TODO_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        }
+        yield* git.commitAllWithPrefix(action.prefix);
+        return { stop: false };
+      }
+      // Close package: remove the (maybe-empty / maybe-absent) FEEDBACK.md, rm
+      // the first (finished) package dir (+ the now-empty `.gtd/`), commit
+      // `gtd: package done`. Tolerates an absent FEEDBACK.md (force-approve).
+      case "closePackage": {
+        yield* fs9.remove(resolve5(FEEDBACK_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        const packages = yield* getPackages(fs9, root2);
+        const first2 = packages[0];
+        if (first2 !== void 0) {
+          yield* git.removePackageDir(`${GTD_DIR}/${first2.name}`);
+        }
+        yield* git.commitAllWithPrefix(PACKAGE_DONE_SUBJECT);
+        return { stop: false };
+      }
+      // Await Review: commit REVIEW.md as `gtd: awaiting review`.
+      case "commitReview": {
+        yield* formatFile(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        yield* git.commitAllWithPrefix(AWAITING_REVIEW_SUBJECT);
+        return { stop: false };
+      }
+      // Done: rm REVIEW.md, commit `gtd: done`.
+      case "done": {
+        yield* fs9.remove(resolve5(REVIEW_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        yield* git.commitAllWithPrefix(DONE_SUBJECT);
+        return { stop: false };
+      }
+      // Squash: rm SQUASH_MSG.md, soft-reset to squashBase, commit everything
+      // under the provided commit message.
+      case "squashCommit": {
+        yield* fs9.remove(resolve5(SQUASH_MSG_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        yield* git.softResetTo(action.squashBase);
+        yield* git.commitAllWithPrefix(action.commitMessage);
+        return { stop: false };
+      }
+      // Remove the HEALTH_SQUASH_SENTINEL file written by runHealthCheck on
+      // green-with-fixes, so the squash-prompt state is presented clean. The
+      // agent then writes the real SQUASH_MSG.md on its turn. This action runs
+      // BEFORE the prompt is emitted (squashing is not edge-only, so the driver
+      // emits the prompt after perform returns).
+      case "removeHealthSentinel": {
+        yield* fs9.remove(resolve5(SQUASH_MSG_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        return { stop: false };
+      }
+      // Stray SQUASH_MSG.md found under a boundary HEAD with no matching squash
+      // cycle (squashBase absent / squashEnabled false). Remove it so the next
+      // gather sees a clean tree and settles to health-check or idle.
+      case "removeStraySquashMsg": {
+        yield* fs9.remove(resolve5(SQUASH_MSG_FILE)).pipe(Effect_exports.catchAll(() => Effect_exports.void));
+        return { stop: false };
+      }
+    }
+  }).pipe(Effect_exports.mapError((e7) => e7 instanceof Error ? e7 : new Error(String(e7))))
+);
 
 // src/State.ts
 var EDGE_ONLY_STATES2 = /* @__PURE__ */ new Set([