@miller-tech/uap 1.51.0 → 1.52.1

package/templates/hooks/pre-tool-use-edit-write.sh

@@ -69,8 +69,43 @@ for pattern in "${EXEMPT_PATTERNS[@]}"; do
   fi
 done
 
-# Allow if path is inside a worktree (substring match, handles nested worktrees)
+# Allow if path is inside a worktree (substring match, handles nested worktrees).
+# Before allowing a real source edit, announce it to the SHARED coordination DB
+# and check for a live overlap so independently-launched agents coordinate and
+# never silently clobber the same file. Always fails open.
 if echo "$ABS_PATH" | grep -q '\.worktrees/'; then
+  if [ -f "$HOOK_DIR/coordinate-file.sh" ]; then
+    # Shared coordination DB = the MAIN worktree's, so agents running in
+    # different .worktrees/ all see each other. git-common-dir resolves the
+    # shared .git even from a linked worktree.
+    GCD="$(git rev-parse --git-common-dir 2>/dev/null || true)"
+    case "$GCD" in
+      /*) : ;;
+      "") GCD="" ;;
+      *) GCD="$PWD/$GCD" ;;
+    esac
+    if [ -n "$GCD" ]; then
+      MAIN_ROOT="$(cd "$(dirname "$GCD")" 2>/dev/null && pwd || echo "$REPO_ROOT")"
+    else
+      MAIN_ROOT="$REPO_ROOT"
+    fi
+    COORD_DB="$MAIN_ROOT/agents/data/coordination/coordination.db"
+    # Repo-relative path so the same logical file across worktrees collides.
+    REL_PATH="${ABS_PATH#"$REPO_ROOT"/}"
+    WT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
+    SESSION_ID="$(printf '%s' "$INPUT" | jq -r '.session_id // .sessionId // empty' 2>/dev/null || true)"
+    if [ -n "$SESSION_ID" ]; then
+      AGENT_ID="claude-${SESSION_ID}"
+    else
+      AGENT_ID="${UAP_AGENT_ID:-claude-${WT_BRANCH:-unknown}}"
+    fi
+    if bash "$HOOK_DIR/coordinate-file.sh" \
+      "$COORD_DB" "$AGENT_ID" "${UAP_AGENT_NAME:-agent}" "$WT_BRANCH" "$REL_PATH" "$ABS_PATH"; then
+      exit 0
+    fi
+    # Non-zero from coordinate-file.sh = live-conflict block (reason on stderr).
+    exit 2
+  fi
   exit 0
 fi
 

package/templates/hooks/session-end.sh

@@ -7,7 +7,20 @@ set -euo pipefail
 
 PROJECT_DIR="${CLAUDE_PROJECT_DIR:-${FACTORY_PROJECT_DIR:-${CURSOR_PROJECT_DIR:-.}}}"
 DB_PATH="${PROJECT_DIR}/agents/data/memory/short_term.db"
-COORD_DB="${PROJECT_DIR}/agents/data/coordination/coordination.db"
+
+# Coordination DB is SHARED across all worktrees (see session-start.sh).
+_GCD="$(git -C "$PROJECT_DIR" rev-parse --git-common-dir 2>/dev/null || true)"
+case "$_GCD" in
+  /*) : ;;
+  "") _GCD="" ;;
+  *) _GCD="$PROJECT_DIR/$_GCD" ;;
+esac
+if [ -n "$_GCD" ]; then
+  COORD_ROOT="$(cd "$(dirname "$_GCD")" 2>/dev/null && pwd || echo "$PROJECT_DIR")"
+else
+  COORD_ROOT="$PROJECT_DIR"
+fi
+COORD_DB="${COORD_ROOT}/agents/data/coordination/coordination.db"
 TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 
 # Store session end marker
@@ -18,14 +31,24 @@ if [ -f "$DB_PATH" ]; then
   " 2>/dev/null || true
 fi
 
-# Clean up all active agents and work claims
+# Reap STALE coordination state only. The coordination DB is shared across all
+# worktrees, so this hook must NOT mark every agent completed or complete every
+# announcement — that would wipe other LIVE agents' state. Instead, complete the
+# state of agents whose heartbeat has gone stale (>5 min), which covers this
+# ending session (its heartbeat stops) without touching active peers.
+STALE_SECS="${UAP_COORD_REAP_SECONDS:-300}"
 if [ -f "$COORD_DB" ]; then
   sqlite3 "$COORD_DB" "
-    UPDATE work_announcements SET completed_at = '$TIMESTAMP'
-    WHERE completed_at IS NULL;
-    DELETE FROM work_claims;
     UPDATE agent_registry SET status = 'completed'
-    WHERE status IN ('active', 'idle');
+    WHERE status IN ('active', 'idle')
+      AND (strftime('%s','now') - strftime('%s', last_heartbeat)) >= $STALE_SECS;
+    UPDATE work_announcements SET completed_at = '$TIMESTAMP'
+    WHERE completed_at IS NULL
+      AND agent_id IN (
+        SELECT id FROM agent_registry
+        WHERE status = 'completed'
+           OR (strftime('%s','now') - strftime('%s', last_heartbeat)) >= $STALE_SECS
+      );
   " 2>/dev/null || true
 fi
 

package/templates/hooks/session-start.sh

@@ -6,7 +6,23 @@ set -euo pipefail
 
 PROJECT_DIR="${CLAUDE_PROJECT_DIR:-${FACTORY_PROJECT_DIR:-${CURSOR_PROJECT_DIR:-.}}}"
 DB_PATH="${PROJECT_DIR}/agents/data/memory/short_term.db"
-COORD_DB="${PROJECT_DIR}/agents/data/coordination/coordination.db"
+
+# Coordination DB is SHARED across all worktrees: resolve it to the MAIN
+# worktree (git-common-dir points at the shared .git even from a linked
+# worktree) so agents in different .worktrees/ register into one registry and
+# can see each other's file announcements. Falls back to PROJECT_DIR.
+_GCD="$(git -C "$PROJECT_DIR" rev-parse --git-common-dir 2>/dev/null || true)"
+case "$_GCD" in
+  /*) : ;;
+  "") _GCD="" ;;
+  *) _GCD="$PROJECT_DIR/$_GCD" ;;
+esac
+if [ -n "$_GCD" ]; then
+  COORD_ROOT="$(cd "$(dirname "$_GCD")" 2>/dev/null && pwd || echo "$PROJECT_DIR")"
+else
+  COORD_ROOT="$PROJECT_DIR"
+fi
+COORD_DB="${COORD_ROOT}/agents/data/coordination/coordination.db"
 
 if [ ! -f "$DB_PATH" ]; then
   exit 0