@pmelab/gtd 2.7.0 → 3.0.0

package/bin/gtd-loop

@@ -1,18 +1,22 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Drives the two-beat protocol (README.md "The reference loop driver") to a
-# human gate. Both mutators are attempted every iteration, refusal-tolerant:
-# whichever actor is actually awaited claims the turn (captures the human's
-# uncommitted edit after a halt, or the agent's own edit from the previous
-# iteration), the other refuses harmlessly.
+# Drives the v3 pattern-machine loop (see docs/loop.md): each iteration asks
+# `gtd next --json` who's up and what they should do, dispatching on `kind`:
+#   - "message" (a human rest)  -> halt, tell the user what gtd is waiting on.
+#   - "script"  (a check rest) -> `gtd run` executes it and steps the check
+#     actor in one command; zero new commits = green with nothing owed (the
+#     terminal signal at idle).
+#   - "prompt"  (an agent rest) -> feed `content` to the agent, then
+#     `gtd step <actor>` ourselves — the harness owns ending the turn, not
+#     the prompt text.
+# `.model` (optional, opaque) is exported as $GTD_LOOP_MODEL for the agent
+# adapter invoked at a "prompt" rest; the default adapter appends `--model
+# "$GTD_LOOP_MODEL"` only when it's non-empty.
 prev_state=""
-prev_prompt=""
+prev_content=""
 
 while true; do
-  gtd step --json >/dev/null 2>&1 || true
-  gtd step-agent --json >/dev/null 2>&1 || true
-
   if ! next_json="$(gtd next --json 2>&1)"; then
     echo "gtd-loop: could not determine the next step:" >&2
     echo "$next_json" >&2
@@ -20,39 +24,55 @@ while true; do
     exit 1
   fi
 
-  actor="$(jq -r .actor <<<"$next_json")"
-  pending="$(jq -r .pending <<<"$next_json")"
   state="$(jq -r .state <<<"$next_json")"
-  prompt="$(jq -r .prompt <<<"$next_json")"
+  actor="$(jq -r .actor <<<"$next_json")"
+  kind="$(jq -r .kind <<<"$next_json")"
+  content="$(jq -r .content <<<"$next_json")"
+  model="$(jq -r '.model // empty' <<<"$next_json")"
 
-  if [[ "$actor" != "agent" ]]; then
+  if [[ "$kind" == "message" ]]; then
     echo "--- Your turn ($state) ---"
     gtd next
     exit 0
   fi
 
-  if [[ "$pending" == "true" ]]; then
+  if [[ "$kind" == "script" ]]; then
+    head_before="$(git rev-parse HEAD 2>/dev/null || echo none)"
+    gtd run
+    head_after="$(git rev-parse HEAD 2>/dev/null || echo none)"
+    if [[ "$head_before" == "$head_after" ]]; then
+      echo "--- Settled ($state: check passed, nothing to do) ---"
+      exit 0
+    fi
     prev_state=""
-    prev_prompt=""
+    prev_content=""
     continue
   fi
 
-  # Stall detection (skills/loop/SKILL.md): the same agent-owned state and
-  # prompt repeating means the last dispatch made no progress — stop rather
-  # than spin on it.
-  if [[ "$state" == "$prev_state" && "$prompt" == "$prev_prompt" ]]; then
+  # kind == "prompt": stall detection (skills/loop/SKILL.md) — the same
+  # agent-owned state and content repeating means the last dispatch made no
+  # progress; stop rather than spin on it.
+  if [[ "$state" == "$prev_state" && "$content" == "$prev_content" ]]; then
     echo "gtd-loop: no progress at '$state' — the agent's last turn changed nothing. Stopping to avoid spinning." >&2
     gtd next >&2
     exit 1
   fi
   prev_state="$state"
-  prev_prompt="$prompt"
+  prev_content="$content"
 
   # Swappable agent adapter: GTD_LOOP_AGENT_CMD lets any coding agent CLI
-  # stand in for the default, receiving the prompt via $GTD_LOOP_PROMPT.
+  # stand in for the default, receiving the prompt via $GTD_LOOP_PROMPT and
+  # the state's opaque model hint (if any) via $GTD_LOOP_MODEL. An adapter
+  # that ignores $GTD_LOOP_MODEL keeps working — it's exported alongside
+  # $GTD_LOOP_PROMPT, never required.
   cmd="${GTD_LOOP_AGENT_CMD:-}"
   if [[ -z "$cmd" ]]; then
-    cmd='claude -p "$GTD_LOOP_PROMPT" --dangerously-skip-permissions'
+    if [[ -n "$model" ]]; then
+      cmd='claude -p "$GTD_LOOP_PROMPT" --model "$GTD_LOOP_MODEL" --dangerously-skip-permissions'
+    else
+      cmd='claude -p "$GTD_LOOP_PROMPT" --dangerously-skip-permissions'
+    fi
   fi
-  GTD_LOOP_PROMPT="$prompt" bash -c "$cmd"
+  GTD_LOOP_PROMPT="$content" GTD_LOOP_MODEL="$model" bash -c "$cmd"
+  gtd step "$actor" >/dev/null
 done