fix: cleanup must run even when current hook is already present

The exact-match guard skipped the entire cleanup block when the current
hook was found, even if stale duplicates coexisted. Now cleanup runs
when the current hook is missing OR any stale copy exists.

Also adds Test 7h (current + stale coexist) and tightens SessionEnd
path assertion. Updates AGENTS.md to reflect the two-phase matching
model (exact detect, substring cleanup).

Author: timvw

AGENTS.md

@@ -74,10 +74,14 @@ process args as a reliable fallback.
 - Log files go to `~/.tmux/resurrect/assistant-{save,restore}.log` (truncated to 500 lines per run)
 - Process inspection uses `ps -eo pid=,ppid=` (not `pgrep -P` -- unreliable on macOS)
 - Agent detection matches binary names via `case` patterns in `detect_tool()`
-- Hook matching in jq uses `(.command // "") | contains("claude-session-track")`
-  (not exact `==`) to tolerate quoting changes across versions and ensure backward
-  compatibility. The `// ""` null-coalescing prevents crashes on hook entries that
-  lack a `.command` field (e.g., URL-type hooks added by other tools)
+- Hook install uses two-phase matching: **exact equality** (`== $cmd`) to detect
+  whether the current-path hook is already installed, and **substring match**
+  (`contains("claude-session-track")`) to clean up stale copies left by path
+  changes (e.g., Nix rebuilds). Cleanup runs when the current hook is missing OR
+  stale copies exist. The `// ""` null-coalescing on `.command` prevents crashes
+  on hook entries that lack a `.command` field (e.g., URL-type hooks), and
+  `.hooks` is null-coalesced before mapping to handle entries with missing/null
+  hooks arrays
 - Use `posix_quote()` from `lib-detect.sh` for any values sent to tmux panes
   via `send-keys` (safe for bash, zsh, fish, and other POSIX-ish shells)
 - Hook command paths use single quotes (`bash '${CURRENT_DIR}/hooks/...'`);

test/run-tests.sh

@@ -2040,6 +2040,57 @@ assert_eq "Null hooks: exactly 1 track hook installed" "1" "$null_track"
 null_end=$(jq '[.hooks.SessionEnd[]?.hooks[]? | select((.command // "") | contains("claude-session-cleanup"))] | length' "$HOME/.claude/settings.json")
 assert_eq "Null hooks: exactly 1 cleanup hook installed" "1" "$null_end"
 
+# --- Test 7h: Current + stale hook coexist (cleanup must still run) ---
+#
+# If both the current-path hook AND a stale-path duplicate are present
+# (e.g. from manual editing or corruption), the cleanup block must still
+# fire to remove the stale copy. Previously the exact-match guard would
+# see the current hook, skip the block, and leave the stale duplicate.
+
+echo ""
+echo "=== Test 7h: Current + stale hook coexist ==="
+echo ""
+
+rm -f "$HOME/.claude/settings.json"
+echo '{}' >"$HOME/.claude/settings.json"
+
+# Inject both the CURRENT path and a STALE path for SessionStart and SessionEnd
+current_track="bash '${REPO_DIR}/hooks/claude-session-track.sh'"
+current_cleanup="bash '${REPO_DIR}/hooks/claude-session-cleanup.sh'"
+tmp_dual=$(mktemp)
+jq --arg cur_track "$current_track" --arg stale_track "$stale_track" \
+   --arg cur_cleanup "$current_cleanup" --arg stale_cleanup "$stale_cleanup" '
+    .hooks = {
+        "SessionStart": [
+            {"matcher": "", "hooks": [{"type": "command", "command": $cur_track}]},
+            {"matcher": "", "hooks": [{"type": "command", "command": $stale_track}]}
+        ],
+        "SessionEnd": [
+            {"matcher": "", "hooks": [{"type": "command", "command": $cur_cleanup}]},
+            {"matcher": "", "hooks": [{"type": "command", "command": $stale_cleanup}]}
+        ]
+    }
+' "$HOME/.claude/settings.json" >"$tmp_dual" && mv "$tmp_dual" "$HOME/.claude/settings.json"
+
+# Verify both are in place
+dual_before=$(jq '[.hooks.SessionStart[]?.hooks[]? | select(.command | contains("claude-session-track"))] | length' "$HOME/.claude/settings.json")
+assert_eq "Dual: 2 track hooks present before cleanup" "2" "$dual_before"
+
+# Run the plugin — must remove the stale copy, keep exactly 1
+bash "$REPO_DIR/tmux-assistant-resurrect.tmux"
+
+dual_after=$(jq '[.hooks.SessionStart[]?.hooks[]? | select(.command | contains("claude-session-track"))] | length' "$HOME/.claude/settings.json")
+assert_eq "Dual: exactly 1 SessionStart hook after cleanup" "1" "$dual_after"
+
+dual_cmd=$(jq -r '.hooks.SessionStart[]?.hooks[]? | select(.command | contains("claude-session-track")) | .command' "$HOME/.claude/settings.json")
+assert_eq "Dual: surviving hook has current path" "$current_track" "$dual_cmd"
+
+dual_end_after=$(jq '[.hooks.SessionEnd[]?.hooks[]? | select(.command | contains("claude-session-cleanup"))] | length' "$HOME/.claude/settings.json")
+assert_eq "Dual: exactly 1 SessionEnd hook after cleanup" "1" "$dual_end_after"
+
+dual_end_cmd=$(jq -r '.hooks.SessionEnd[]?.hooks[]? | select(.command | contains("claude-session-cleanup")) | .command' "$HOME/.claude/settings.json")
+assert_eq "Dual: surviving SessionEnd hook has current path" "$current_cleanup" "$dual_end_cmd"
+
 # --- Test 8: strip_assistant_pane_contents() ---
 
 suite "strip_pane_contents"

tmux-assistant-resurrect.tmux

@@ -50,21 +50,12 @@ install_claude_hooks() {
         return
     fi
 
-    # Install SessionStart hook, refreshing a stale path if one exists.
-    #
-    # The earlier check matched on the substring "claude-session-track" and
-    # skipped install if any hook contained it. That left STALE paths in
-    # place across reinstalls — e.g. on Nix/NixOS, where each rebuild can
-    # produce a new /nix/store hash for the plugin and the previous
-    # derivation gets garbage-collected. Claude Code then ran a hook
-    # pointing at a path that no longer existed and emitted
-    # "SessionStart:clear hook error / bash: <gone-path>: No such file".
-    #
-    # New idempotency: skip only when the EXACT current command (path-
-    # matched) is already installed. Otherwise filter out any prior
-    # instance of this hook (any path) and add the current one. Each
-    # tmux start now self-heals stale entries left by a previous install.
-    if ! jq -e --arg cmd "$track_cmd" '.hooks.SessionStart[]?.hooks[]? | select((.command // "") == $cmd)' "$settings" >/dev/null 2>&1; then
+    # Install SessionStart hook, refreshing stale paths if any exist.
+    # Skip only when the current command is present AND no stale copies remain.
+    local has_current_track has_stale_track
+    has_current_track=$(jq --arg cmd "$track_cmd" '[.hooks.SessionStart[]?.hooks[]? | select((.command // "") == $cmd)] | length' "$settings" 2>/dev/null || echo 0)
+    has_stale_track=$(jq --arg cmd "$track_cmd" '[.hooks.SessionStart[]?.hooks[]? | select(((.command // "") | contains("claude-session-track")) and ((.command // "") != $cmd))] | length' "$settings" 2>/dev/null || echo 0)
+    if [ "$has_current_track" = "0" ] || [ "$has_stale_track" != "0" ]; then
         local tmp
         tmp=$(mktemp)
         jq --arg cmd "$track_cmd" '
@@ -84,7 +75,10 @@ install_claude_hooks() {
     fi
 
     # Install SessionEnd hook (same self-healing pattern as SessionStart).
-    if ! jq -e --arg cmd "$cleanup_cmd" '.hooks.SessionEnd[]?.hooks[]? | select((.command // "") == $cmd)' "$settings" >/dev/null 2>&1; then
+    local has_current_cleanup has_stale_cleanup
+    has_current_cleanup=$(jq --arg cmd "$cleanup_cmd" '[.hooks.SessionEnd[]?.hooks[]? | select((.command // "") == $cmd)] | length' "$settings" 2>/dev/null || echo 0)
+    has_stale_cleanup=$(jq --arg cmd "$cleanup_cmd" '[.hooks.SessionEnd[]?.hooks[]? | select(((.command // "") | contains("claude-session-cleanup")) and ((.command // "") != $cmd))] | length' "$settings" 2>/dev/null || echo 0)
+    if [ "$has_current_cleanup" = "0" ] || [ "$has_stale_cleanup" != "0" ]; then
         local tmp
         tmp=$(mktemp)
         jq --arg cmd "$cleanup_cmd" '