devlog-tracker 0.31.0 → 0.31.1

package/README.md

@@ -2,7 +2,7 @@
 
 *English | [繁體中文](README.zh-TW.md)*
 
-**Version** 0.31.0
+**Version** 0.31.1
 
 Maintains a `.devlog/devlog.md` in your project, turning each conversation round's requests, decisions, and outcomes into a permanent record. A conversation disappears the moment you `/clear` or switch sessions; this file fills that gap so work can pause and resume. Nothing is touched until you explicitly run `/devlog-tracker:start` — installing the plugin alone doesn't create or modify any files.
 

package/README.zh-TW.md

@@ -2,7 +2,7 @@
 
 *[English](README.md) | 繁體中文*
 
-**版本** 0.31.0
+**版本** 0.31.1
 
 在專案中維護一份 `.devlog/devlog.md`，把每一輪對話的請求、決策與結果寫成永久紀錄。對話一 `/clear` 或換 session 就沒了；這份檔案取代那個缺口，讓工作可以中斷再接。沒下過 `/devlog-tracker:start` 時，裝著也不會動任何檔案。
 

package/core/scripts/devlog-lock.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # Sourced helper for serializing writes under .devlog.
+#
+# The holder exports DEVLOG_LOCK_OWNER=<its pid>, so a script it runs as a
+# child (round-start.sh -> close-open-round.sh) finds the lock already its
+# own and proceeds instead of waiting out the contention timeout on its
+# parent. The child never holds it, so its release leaves the lock alone.
 devlog_lock_acquire() {
   local dir="${DEVLOG_DIR:-.}/.lock"
   local start now pid
@@ -14,12 +19,16 @@ devlog_lock_acquire() {
     if mkdir "$dir" 2>/dev/null; then
       LOCK_HELD=1
       printf '%s\n' "$$" > "$dir/pid" 2>/dev/null || true
+      export DEVLOG_LOCK_OWNER="$$"
       return 0
     fi
     pid="$(cat "$dir/pid" 2>/dev/null || true)"
     case "$pid" in
       ''|*[!0-9]*) pid='' ;;
     esac
+    if [ -n "$pid" ] && [ "$pid" = "${DEVLOG_LOCK_OWNER:-}" ]; then
+      return 0
+    fi
     # Stale lock: the pid that created it is no longer running (a crashed
     # session), so reclaim it immediately instead of waiting out the full
     # contention timeout below.
@@ -42,6 +51,7 @@ devlog_lock_release() {
     rm -f "${DEVLOG_DIR:-.}/.lock/pid" 2>/dev/null || true
     rmdir "${DEVLOG_DIR:-.}/.lock" 2>/dev/null || true
     LOCK_HELD=0
+    unset DEVLOG_LOCK_OWNER
   fi
 }
 

package/core/scripts/tests/test-close-open-round.sh

@@ -316,6 +316,60 @@ fi
 rm -rf "$REC_DIR"
 export CLAUDE_PROJECT_DIR="$TMP_ROOT"
 
+# --- L1: run as a child of the lock holder (round-start.sh's dangling heal)
+#         -> no wait on the parent's lock, still stamps, and its EXIT-trap
+#         release leaves the parent's lock in place ----------------------
+# shellcheck source=../devlog-lock.sh
+. "$SCRIPT_DIR/devlog-lock.sh"
+write_skeleton
+devlog_lock_acquire
+START="$(date +%s)"
+bash "$SCRIPT_DIR/close-open-round.sh" "dangling:next_prompt"
+ELAPSED=$(( $(date +%s) - START ))
+if [ "$ELAPSED" -le 1 ]; then
+  echo "PASS: child of lock holder doesn't wait (${ELAPSED}s)"
+else
+  echo "FAIL: child of lock holder waited ${ELAPSED}s"
+  FAIL=1
+fi
+assert_contains "child of lock holder still stamps" $'### Status\nINTERRUPTED' "$(cat "$DEVLOG_DIR/devlog.md")"
+if [ -d "$DEVLOG_DIR/.lock" ] && [ "$(cat "$DEVLOG_DIR/.lock/pid" 2>/dev/null)" = "$$" ]; then
+  echo "PASS: child's exit leaves the holder's lock"
+else
+  echo "FAIL: holder's lock removed by child"
+  FAIL=1
+fi
+devlog_lock_release
+assert_file_absent "holder release removes lock" "$DEVLOG_DIR/.lock/pid"
+
+# --- L2: lock held by an unrelated live process (no inherited owner) ->
+#         still waits out the contention timeout, stamps fail-open, and
+#         leaves the foreign lock alone --------------------------------------
+write_skeleton
+sleep 5 &
+LIVE_PID=$!
+mkdir "$DEVLOG_DIR/.lock"
+echo "$LIVE_PID" > "$DEVLOG_DIR/.lock/pid"
+START="$(date +%s)"
+bash "$SCRIPT_DIR/close-open-round.sh" "dangling:next_prompt"
+ELAPSED=$(( $(date +%s) - START ))
+if [ "$ELAPSED" -ge 2 ]; then
+  echo "PASS: unrelated holder still contends (${ELAPSED}s)"
+else
+  echo "FAIL: unrelated holder skipped contention (${ELAPSED}s)"
+  FAIL=1
+fi
+assert_contains "contended run still stamps (fail-open)" $'### Status\nINTERRUPTED' "$(cat "$DEVLOG_DIR/devlog.md")"
+if [ "$(cat "$DEVLOG_DIR/.lock/pid" 2>/dev/null)" = "$LIVE_PID" ]; then
+  echo "PASS: foreign lock left in place"
+else
+  echo "FAIL: foreign lock touched"
+  FAIL=1
+fi
+kill "$LIVE_PID" 2>/dev/null || true
+wait "$LIVE_PID" 2>/dev/null || true
+rm -rf "$DEVLOG_DIR/.lock"
+
 if [ "$FAIL" -eq 0 ]; then
   echo "All checks passed."
   exit 0

package/core/scripts/tests/test-devlog-lock.sh

@@ -72,5 +72,49 @@ kill "$LIVE_PID" 2>/dev/null || true
 wait "$LIVE_PID" 2>/dev/null || true
 rm -rf "$DEVLOG_DIR/.lock"
 
+# Re-entry from a child process: a script run by the lock holder (e.g.
+# round-start.sh -> close-open-round.sh) sees the lock as already its own —
+# returns at once, and its release leaves the parent's lock in place.
+devlog_lock_acquire
+START="$(date +%s)"
+CHILD="$(bash -c '. "$1"; DEVLOG_DIR="$2"; devlog_lock_acquire; echo "held=${LOCK_HELD:-0} by=${LOCK_CONTENDED_BY:-}"; devlog_lock_release' _ "$SCRIPT_DIR/devlog-lock.sh" "$DEVLOG_DIR")"
+ELAPSED=$(( $(date +%s) - START ))
+[ "$ELAPSED" -le 1 ] && [ "$CHILD" = "held=0 by=" ] \
+  && echo "PASS: child of holder re-enters without waiting" \
+  || { echo "FAIL: child re-entry elapsed=$ELAPSED child='$CHILD'"; FAIL=1; }
+[ -d "$DEVLOG_DIR/.lock" ] && [ "$(cat "$DEVLOG_DIR/.lock/pid")" = "$$" ] \
+  && echo "PASS: child release leaves parent's lock" \
+  || { echo "FAIL: parent's lock gone after child release"; FAIL=1; }
+# Grandchild (holder -> script -> script) inherits the owner too.
+START="$(date +%s)"
+GRAND="$(bash -c 'bash -c ". \"\$1\"; DEVLOG_DIR=\"\$2\"; devlog_lock_acquire; echo held=\${LOCK_HELD:-0}; devlog_lock_release" _ "$1" "$2"' _ "$SCRIPT_DIR/devlog-lock.sh" "$DEVLOG_DIR")"
+ELAPSED=$(( $(date +%s) - START ))
+[ "$GRAND" = "held=0" ] && [ "$ELAPSED" -le 1 ] && [ -d "$DEVLOG_DIR/.lock" ] \
+  && echo "PASS: grandchild of holder re-enters" || { echo "FAIL: grandchild got '$GRAND' elapsed=$ELAPSED"; FAIL=1; }
+devlog_lock_release
+[ -z "${DEVLOG_LOCK_OWNER:-}" ] && [ ! -d "$DEVLOG_DIR/.lock" ] \
+  && echo "PASS: release clears owner" || { echo "FAIL: owner=${DEVLOG_LOCK_OWNER:-} survives release"; FAIL=1; }
+
+# After the holder releases, a child it spawns later no longer carries the
+# owner, so it would contend on a lock someone else took meanwhile.
+OUT="$(bash -c 'echo "owner=${DEVLOG_LOCK_OWNER:-}"')"
+[ "$OUT" = "owner=" ] && echo "PASS: owner not exported after release" \
+  || { echo "FAIL: child still sees $OUT"; FAIL=1; }
+
+# A process that did not inherit the owner (another hook launched by the
+# agent while the lock is held) still waits out the timeout.
+sleep 5 &
+LIVE_PID=$!
+mkdir "$DEVLOG_DIR/.lock"
+echo "$LIVE_PID" > "$DEVLOG_DIR/.lock/pid"
+START="$(date +%s)"
+OUT="$(DEVLOG_LOCK_OWNER=12345 bash -c '. "$1"; DEVLOG_DIR="$2"; devlog_lock_acquire; echo "${LOCK_HELD:-0}"' _ "$SCRIPT_DIR/devlog-lock.sh" "$DEVLOG_DIR")"
+ELAPSED=$(( $(date +%s) - START ))
+[ "$OUT" = "0" ] && [ "$ELAPSED" -ge 2 ] \
+  && echo "PASS: unrelated owner still contends" || { echo "FAIL: unrelated owner out=$OUT elapsed=$ELAPSED"; FAIL=1; }
+kill "$LIVE_PID" 2>/dev/null || true
+wait "$LIVE_PID" 2>/dev/null || true
+rm -rf "$DEVLOG_DIR/.lock"
+
 if [ "$FAIL" -eq 0 ]; then echo "All checks passed."; exit 0
 else echo "Some checks FAILED."; exit 1; fi

package/core/scripts/tests/test-round-start.sh

@@ -125,7 +125,19 @@ hello world
 ```
 EOF
 printf '%s\n' '{"round": 1, "opened_at": "2026-09-09T12:00:00+08:00"}' > "$DEVLOG_DIR/.round-open"
+# round-start.sh holds .devlog/.lock while it runs close-open-round.sh as a
+# child; the child must not wait out the 2s contention timeout on its own
+# parent's lock.
+HEAL_START="$(date +%s)"
 printf '%s' '{"prompt":"second"}' | bash "$SCRIPT_DIR/round-start.sh"
+HEAL_ELAPSED=$(( $(date +%s) - HEAL_START ))
+if [ "$HEAL_ELAPSED" -le 1 ]; then
+  echo "PASS: dangling heal doesn't block on parent's lock (${HEAL_ELAPSED}s)"
+else
+  echo "FAIL: dangling heal took ${HEAL_ELAPSED}s (child waited on parent's lock)"
+  FAIL=1
+fi
+assert_file_absent "dangling heal releases .lock" "$DEVLOG_DIR/.lock"
 MAIN_BODY="$(cat "$DEVLOG_DIR/devlog.md")"
 CUR_BODY="$(cat "$DEVLOG_DIR/.round-current.md" 2>/dev/null || echo '')"
 assert_contains "Round 2 heading in .round-current.md" "## Round 2 —" "$CUR_BODY"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlog-tracker",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "npx installer for devlog-tracker's Claude Code, Cursor and Codex adapters.",
   "bin": {
     "devlog-tracker": "bin/devlog-tracker.js"