@pmelab/gtd 31.0.0 → 32.0.0

package/.claude-plugin/plugin.json

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

package/README.md

@@ -339,28 +339,29 @@ asks, and moves the process on only when you say so; a review you leave
 untouched signs off. While a step runs you can keep asking; requests for changes
 wait for the next rest. When the process finishes, Claude offers to squash it
 and open its pull request(s) (or run `/gtd ship`; `GTD_SHIP_MODE` picks one
-stacked pull request per slice or one commit per slice, see the
-[driver doc](docs/driver.md)); a process started for an issue ships with
-`Closes #N` on its top pull request; a later process on an already-stacked
-branch, such as review fixes, lands one commit per slice on the top pull request
-and keeps the stack; a closed pull request whose branch was deleted from origin
-is left behind and a new one opens; re-running `/gtd ship` after a lower stacked
-pull request merged restacks the rest (it refuses, with nothing changed, when
-that pull request merged anywhere but the default branch (unless into a lower
-slice branch before that one merged into it), a slice branch is checked out in
-another worktree, an unrelated local branch sits inside the rebased commits, or
-a slice's change is already upstream; a failed rebase is rolled back; to tear a
-stack down from its worktree, delete the top branch with
-`git push origin --delete`, since `gh pr close --delete-branch` cannot). A
-process can change hands at any gate: ask Claude to hand it off (or run
-`/gtd throw @dev`) and it opens a draft pull request assigned to them, and
-`/gtd catch <pr>` picks it up exactly where it waits, so whoever wrote the
-requirements can hand the build to someone else. Ship, hand-off and throw answer
-at once and run in the background, with progress on the status line; they report
-by waking Claude, a toast, a transcript line and a push notification, and a
-failed push or `gh` call reports as a failure. While a ship or hand-off runs or
-is queued, `/gtd catch`, the doors, `/gtd <requirements>` and bare `/gtd` wait
-for its report. See
+commit per slice under one pull request (the default) or, set to `stack`, one
+stacked pull request per slice, see the [driver doc](docs/driver.md)); a process
+started for an issue ships with `Closes #N` on its top pull request; a closed
+pull request whose branch was deleted from origin is left behind and a new one
+opens; on a branch an earlier ship in this clone stacked (unless
+`GTD_SHIP_MODE=commits`), a later process, such as review fixes, lands one
+commit per slice on the top pull request and keeps the stack, and re-running
+`/gtd ship` after a lower stacked pull request merged restacks the rest (it
+refuses, with nothing changed, when that pull request merged anywhere but the
+default branch (unless into a lower slice branch before that one merged into
+it), a slice branch is checked out in another worktree, an unrelated local
+branch sits inside the rebased commits, or a slice's change is already upstream;
+a failed rebase is rolled back; to tear a stack down from its worktree, delete
+the top branch with `git push origin --delete`, since
+`gh pr close --delete-branch` cannot). A process can change hands at any gate:
+ask Claude to hand it off (or run `/gtd throw @dev`) and it opens a draft pull
+request assigned to them, and `/gtd catch <pr>` picks it up exactly where it
+waits, so whoever wrote the requirements can hand the build to someone else.
+Ship, hand-off and throw answer at once and run in the background, with progress
+on the status line; they report by waking Claude, a toast, a transcript line and
+a push notification, and a failed push or `gh` call reports as a failure. While
+a ship or hand-off runs or is queued, `/gtd catch`, the doors,
+`/gtd <requirements>` and bare `/gtd` wait for its report. See
 [Inside Claude Code](https://github.com/pmelab/gtd/blob/main/docs/driver.md#inside-claude-code-the-gtd-mod).
 
 ### Then let an agent build your own

package/claude/hooks/ship.ts

@@ -49,7 +49,7 @@ export function costTrailers(log: string) {
 export type ShipMode = "stack" | "commits"
 
 export function shipMode(raw: string | undefined): ShipMode | { refusal: string } {
-  if (!raw) return "stack"
+  if (!raw) return "commits"
   if (raw === "stack" || raw === "commits") return raw
   return { refusal: `GTD_SHIP_MODE must be 'stack' or 'commits', not '${raw}'.` }
 }
@@ -209,8 +209,8 @@ async function preflight(git: Git, ok: Ok) {
 }
 
 export async function ship(io: ShipIo, isDry: boolean, rawMode?: string): Promise<Shipped> {
-  const mode = shipMode(rawMode)
-  if (typeof mode === "object") return fail(mode.refusal)
+  const valid = shipMode(rawMode)
+  if (typeof valid === "object") return fail(valid.refusal)
   const git = async (...args: string[]) => (await io.run(["git", ...args])).out.trim()
   const ok = async (...args: string[]) => (await io.run(["git", ...args])).code === 0
 
@@ -223,6 +223,10 @@ export async function ship(io: ShipIo, isDry: boolean, rawMode?: string): Promis
   const live = names(await git("config", "--local", "--get", STACK_KEY(branch)))
   const retired = names(await git("config", "--local", "--get", RETIRED_KEY(branch)))
   const recorded = [...live, ...retired]
+  // Unset keeps a live stack stacking: commits mode would retarget its top PR
+  // and strand the lower ones. A dead record ships as commits.
+  const stacked = !rawMode && live.length > 0 && (await chainsToHead(git, ok, branch, live))
+  const mode: ShipMode = stacked ? "stack" : valid
   const squashed = await squash(io, git, ok, branch, baseBranch, isDry, mode)
   if (!squashed.ok) return squashed
   // Until the PR step succeeds the record only moves aside: a retry must not

package/package.json

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