@pmelab/gtd 1.5.4 → 1.5.5

package/README.md

@@ -442,12 +442,17 @@ loop before the next one starts.
    (`gtd: done`) → **Squashing** → **Idle**. The Squashing agent authors a
    conventional-commits message from the full process diff and squashes all
    intermediate `gtd: *` commits into one with `git reset --soft <base>` +
-   `git commit`, then **gtd STOPs**. Post-squash review does not fire
-   automatically — it fires only on the next manual `gtd` run (when the squash
-   commit is the boundary HEAD and a reviewable diff exists). Squashing fires
-   when the tree has no unrelated code dirty — a lone untracked `SQUASH_MSG.md`
-   is tolerated and deleted before the squash commit. If unrelated code is dirty
-   at `gtd: done`, gtd routes to **New Feature** instead. Set `squash: false` in
+   `git commit`, then **gtd STOPs**. The base is the parent of the current
+   cycle's start marker **nearest to HEAD** (the last `gtd: new task`; for
+   legacy cycles the last contiguous `gtd: grilling` run), and on a feature
+   branch it never reaches below the merge-base with the default branch — stray
+   markers left behind by older squashes can never drag the squash into
+   previously shipped features. Post-squash review does not fire automatically —
+   it fires only on the next manual `gtd` run (when the squash commit is the
+   boundary HEAD and a reviewable diff exists). Squashing fires when the tree
+   has no unrelated code dirty — a lone untracked `SQUASH_MSG.md` is tolerated
+   and deleted before the squash commit. If unrelated code is dirty at
+   `gtd: done`, gtd routes to **New Feature** instead. Set `squash: false` in
    `.gtdrc` to skip squashing and go straight to Idle. Checking off REVIEW.md
    checkboxes (`- [ ]` → `- [x]`) also counts as approval and routes to **Done**
    — they are navigation aids, not feedback. Only **non-checkbox** edits (code

package/dist/gtd.bundle.mjs

@@ -388100,29 +388100,37 @@ var gatherEvents = () => (
     let squashBase;
     let squashDiff;
     if (hasCommits && lastCommitSubject === DONE_SUBJECT && config2.squash) {
-      const allHistoryForSquash = Option_exports.isNone(base) ? history : yield* git.commitHistory();
-      const lastDoneIdxForSquash = (() => {
-        let idx = -1;
-        for (let i = 0; i < allHistoryForSquash.length; i++) {
-          const subject = (allHistoryForSquash[i].message.split("\n")[0] ?? "").trim();
-          if (subject === DONE_SUBJECT) idx = i;
+      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;
         }
-        return idx;
-      })();
+      }
       if (lastDoneIdxForSquash !== -1) {
-        let prevDoneIdx = -1;
-        for (let i = 0; i < lastDoneIdxForSquash; i++) {
-          const subject = (allHistoryForSquash[i].message.split("\n")[0] ?? "").trim();
-          if (subject === DONE_SUBJECT) prevDoneIdx = i;
-        }
-        const squashCycle = allHistoryForSquash.slice(prevDoneIdx + 1, lastDoneIdxForSquash + 1);
-        const squashNewTask = squashCycle.find(
-          (c7) => (c7.message.split("\n")[0] ?? "").trim() === NEW_TASK_SUBJECT
-        );
-        const squashGrilling = squashCycle.find(
-          (c7) => (c7.message.split("\n")[0] ?? "").trim() === GRILLING_SUBJECT
-        );
-        const squashStart = squashNewTask ?? squashGrilling;
+        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) {
+            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("")));

package/package.json

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