@pmelab/gtd 7.6.0 → 7.6.2

package/bin/gtd

@@ -184,15 +184,25 @@ report_commits() {
 
 # ── Log file (resolve_log_path, gtd log) ────────────────────────────────────
 
+# worktree_git_dir — the git dir of the working tree gtd is operating in,
+# derived purely from the cwd. GIT_DIR/GIT_WORK_TREE are scrubbed for this one
+# call so an inherited GIT_DIR (e.g. leaked from a parent git process, a hook,
+# or another worktree's shell) can never point our per-worktree state at a
+# DIFFERENT worktree — that would let two concurrently looping worktrees
+# collide on one log/memory file. A linked worktree's git-dir is its own
+# private .git/worktrees/<name>, so this is per-repository AND per-worktree.
+worktree_git_dir() {
+  env -u GIT_DIR -u GIT_WORK_TREE -u GIT_COMMON_DIR -u GIT_INDEX_FILE \
+    git rev-parse --git-dir
+}
+
 # resolve_log_path — echoes the loop's logfile path: $GTD_LOOP_LOG verbatim if
-# set, else "$(git rev-parse --git-dir)/gtd-loop.log" (per-repository AND
-# per-worktree automatically, since a linked worktree's git-dir is its own
-# private .git/worktrees/<name>).
+# set, else "$(worktree_git_dir)/gtd-loop.log".
 resolve_log_path() {
   if [[ -n "${GTD_LOOP_LOG:-}" ]]; then
     echo "$GTD_LOOP_LOG"
   else
-    echo "$(git rev-parse --git-dir)/gtd-loop.log"
+    echo "$(worktree_git_dir)/gtd-loop.log"
   fi
 }
 
@@ -385,7 +395,7 @@ prev_state=""
 prev_content=""
 # Where the last "prompt" turn's `memory` scope + session id are remembered
 # across iterations and across restarts. In the git dir, never the work tree.
-memory_marker="$(git rev-parse --git-dir 2>/dev/null || echo .git)/gtd-loop-memory"
+memory_marker="$(worktree_git_dir 2>/dev/null || echo .git)/gtd-loop-memory"
 
 # Truncated once here (not every iteration), so the file always reflects the
 # current run but survives after the loop exits for a later `gtd log`.

package/docs/loop.md

@@ -165,10 +165,14 @@ The driver — not the prompt text — owns ending the agent's turn
 prompt says explicitly not to run `gtd step agent` itself.
 
 `bin/gtd log` opens the current repo/worktree's loop logfile —
-`"$(git rev-parse --git-dir)/gtd-loop.log"` by default, or `$GTD_LOOP_LOG`
-verbatim when set — in `${VISUAL:-$EDITOR}`, the same editor resolution
-`bin/gtd edit` uses. It takes no arguments and errors out (rather than opening
-an empty buffer) if no loop has produced a log yet.
+`"$(worktree_git_dir)/gtd-loop.log"` by default, or `$GTD_LOOP_LOG` verbatim
+when set — in `${VISUAL:-$EDITOR}`, the same editor resolution `bin/gtd edit`
+uses. It takes no arguments and errors out (rather than opening an empty buffer)
+if no loop has produced a log yet. `worktree_git_dir` derives the git dir from
+the cwd with `GIT_DIR`/`GIT_WORK_TREE` scrubbed, so an inherited `GIT_DIR`
+(leaked from a parent git process, a hook, or another worktree's shell) can
+never key the log — or the loop's memory marker — to a different worktree; two
+worktrees looping at once each keep their own log.
 
 ## Rendered output and logging
 

package/package.json

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