@pmelab/gtd 7.1.0 → 7.2.0

package/README.md

@@ -76,8 +76,8 @@ over — a `workflow:` is the whole definition). See
 
 gtd is a small **pattern machine**: named states, each awaiting one actor and
 carrying one piece of content (a script, a prompt, a message, or a squash commit
-template), with an ordered set of change-patterns routing to the next state.
-Four commands drive it:
+template), with an ordered set of change-patterns routing to the next state. A
+handful of commands drive it:
 
 - **`gtd step <actor>`** — authenticate as `<actor>` and perform the one
   transition the pending changes match.
@@ -91,6 +91,13 @@ Four commands drive it:
 - **`gtd fix`** — start a brand new process that goes straight into repairing
   the current failing tests, then runs the shared review/squash tail (a no-op if
   the suite is already green).
+- **`gtd abandon`** — end the process underway without completing it: rewind to
+  the commit it started from, keeping everything it produced as uncommitted
+  changes (nothing is discarded).
+- **`gtd restore`** — undo the last squash (or `gtd abandon`) by hard-resetting
+  HEAD back to its retained pre-squash tip, bringing the turn-by-turn history
+  back. Refuses on a dirty working tree, when there is nothing retained to
+  restore, or when HEAD has since moved past it with commits that would be lost.
 - **`gtd visualize`** — serve an interactive diagram of the active workflow on a
   local web server (the main flow, its sub-machines, and per-state details).
 
@@ -181,6 +188,15 @@ checkers (see
 [Configuration](docs/configuration.md#modes--pluggable-steering-file-modes)).
 Both halves are enforced by `gtd validate` and the `gtd step` gate.
 
+Herdr integration: a workflow state can declare an optional `label:` — a
+human-readable display name surfaced in `gtd next --json`/`gtd status`. The
+reference `bin/gtd-loop` driver uses it to report its lifecycle
+(working/blocked/idle) to a [Herdr](https://herdr.dev) pane sidebar via the
+`herdr` CLI when running under Herdr (`HERDR_ENV=1`, a pane ID, and `herdr` on
+`$PATH`); outside Herdr this is a complete no-op. See
+[Driving the loop](docs/loop.md#herdr-integration-optional) for the full
+reporting contract.
+
 ## Documentation
 
 - [STATES.md](STATES.md) — the full pattern-machine specification: the model,

package/bin/gtd-loop

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