Skip to content

fix(lock): identify Claude session pid under daemon and treat daemon lock as stale #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
landonbrice merged 1 commit into from
Sep 13, 2026
Merged

fix(lock): identify Claude session pid under daemon and treat daemon lock as stale #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion bin/fm-session-lock-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ fm_harness_ancestry_pids() {
comm=$(ps -o comm= -p "$pid" 2>/dev/null) || break
args=$(ps -o args= -p "$pid" 2>/dev/null)
if fm_harness_process_matches "$comm" "$args"; then
if [ "$FM_HARNESS_IS_CLAUDE" -eq 1 ] && printf '%s\n' "$args" | grep -qE 'daemon run|bg-spare'; then
break
fi
printf '%s\n' "$pid"
printed=1
[ "$FM_HARNESS_IS_CLAUDE" -eq 1 ] || break
Expand Down Expand Up @@ -156,7 +159,13 @@ fm_harness_pid_alive() {
kill -0 "$pid" 2>/dev/null || return 1
comm=$(ps -o comm= -p "$pid" 2>/dev/null) || return 1
args=$(ps -o args= -p "$pid" 2>/dev/null)
fm_harness_process_matches "$comm" "$args"
if fm_harness_process_matches "$comm" "$args"; then
if [ "$FM_HARNESS_IS_CLAUDE" -eq 1 ] && printf '%s\n' "$args" | grep -qE 'daemon run|bg-spare'; then
return 1
fi
return 0
fi
return 1
}

# True when state dir $1 holds a session lock whose pid is ANY harness ancestor
Expand Down
78 changes: 78 additions & 0 deletions tests/fm-session-lock-ancestry.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,83 @@ SH
pass "session-lock: a live version-named session holding the lock is not mistaken for a stale owner"
}

test_daemon_hosted_session_ancestry() {
local dir fakebin got
dir="$TMP_ROOT/daemon-ancestry"
fakebin=$(fm_fakebin "$dir")
mkdir -p "$dir/state"
cat > "$fakebin/ps" <<'SH'
#!/usr/bin/env bash
set -u
field= pid=
while [ "$#" -gt 0 ]; do
case "$1" in
-o) field=$2; shift 2 ;;
-p) pid=$2; shift 2 ;;
*) shift ;;
esac
done
case "$pid:$field" in
800:comm=) printf '%s\n' claude ;;
800:args=) printf '%s\n' 'claude daemon run' ;;
800:ppid=) printf '%s\n' 1 ;;
801:comm=) printf '%s\n' claude ;;
801:args=) printf '%s\n' 'claude --bg-pty-host' ;;
801:ppid=) printf '%s\n' 800 ;;
802:comm=) printf '%s\n' bash ;;
802:args=) printf '%s\n' 'bash /repo/bin/fm-claude-stop-autoarm.sh' ;;
802:ppid=) printf '%s\n' 801 ;;
900:comm=) printf '%s\n' claude ;;
900:args=) printf '%s\n' 'claude' ;;
900:ppid=) printf '%s\n' 901 ;;
901:comm=) printf '%s\n' bash ;;
901:args=) printf '%s\n' 'bash' ;;
901:ppid=) printf '%s\n' 1 ;;
902:comm=) printf '%s\n' bash ;;
902:args=) printf '%s\n' 'bash /repo/bin/fm-claude-stop-autoarm.sh' ;;
902:ppid=) printf '%s\n' 900 ;;
700:comm=) printf '%s\n' pi ;;
700:args=) printf '%s\n' 'pi' ;;
700:ppid=) printf '%s\n' 701 ;;
701:comm=) printf '%s\n' bash ;;
701:args=) printf '%s\n' 'bash' ;;
701:ppid=) printf '%s\n' 1 ;;
702:comm=) printf '%s\n' bash ;;
702:args=) printf '%s\n' 'bash /repo/bin/some-hook.sh' ;;
702:ppid=) printf '%s\n' 700 ;;
*:comm=) printf '%s\n' bash ;;
*:args=) printf '%s\n' 'bash' ;;
*:ppid=)
if [ -n "${FM_TEST_HOOK_PARENT:-}" ]; then
printf '%s\n' "$FM_TEST_HOOK_PARENT"
else
printf '%s\n' 802
fi
;;
esac
SH
chmod +x "$fakebin/ps"

got=$(FM_TEST_HOOK_PARENT=802 lib_eval "$fakebin" 'fm_harness_ancestry_pid') || fail "daemon-hosted session was not resolved"
[ "$got" = 801 ] || fail "daemon-hosted resolved '$got', expected per-session 801"

got=$(FM_TEST_HOOK_PARENT=902 lib_eval "$fakebin" 'fm_harness_ancestry_pid') || fail "interactive session was not resolved"
[ "$got" = 900 ] || fail "interactive session resolved '$got', expected 900"

if lib_eval "$fakebin" 'fm_harness_pid_alive 800'; then
fail "legacy daemon lock was treated as a valid live owner"
fi

printf '801\n' > "$dir/state/.lock"
FM_TEST_HOOK_PARENT=802 lib_eval "$fakebin" "fm_session_lock_owned_by_self '$dir/state'" \
|| fail "daemon-hosted session did not recognize its own lock"

got=$(FM_TEST_HOOK_PARENT=702 lib_eval "$fakebin" 'fm_harness_ancestry_pid') || fail "non-Claude harness was not resolved"
[ "$got" = 700 ] || fail "non-Claude harness resolved '$got', expected 700"

pass "session-lock: daemon-hosted ancestry stops before the daemon, non-Claude unchanged, legacy lock treated as stale"
}

# --- end-to-end layer: the real Stop auto-arm in real process trees ----------

install_autoarm_scripts() {
Expand Down Expand Up @@ -412,3 +489,4 @@ test_competing_version_named_session_is_seen_as_live
test_e2e_version_named_session_claims_the_home
test_e2e_daemon_parented_session_claims_the_home
test_e2e_daemon_parented_version_named_session_keeps_its_lock
test_daemon_hosted_session_ancestry
Loading