eagle-mem 4.9.7 → 4.9.9

package/lib/db-sessions.sh

@@ -167,24 +167,31 @@ eagle_abandon_stale_sessions() {
 }
 
 eagle_get_project_stats() {
-    local project; project=$(eagle_sql_escape "$1")
+    local project_scope="${1:-}"
+    local session_filter memory_filter plan_filter task_filter chunk_filter observation_filter
+    session_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    memory_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    plan_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    task_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    chunk_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    observation_filter=$(eagle_sql_project_scope_condition "project" "$project_scope")
     eagle_db_pipe <<SQL
-SELECT 'sessions|' || COUNT(*) FROM sessions WHERE project = '$project';
-SELECT 'sessions_claude|' || COUNT(*) FROM sessions WHERE project = '$project' AND agent = 'claude-code';
-SELECT 'sessions_codex|' || COUNT(*) FROM sessions WHERE project = '$project' AND agent = 'codex';
-SELECT 'summaries|' || COUNT(*) FROM summaries WHERE project = '$project';
-SELECT 'with_summaries|' || COUNT(*) FROM summaries WHERE project = '$project' AND request IS NOT NULL AND request != '';
-SELECT 'memories|' || COUNT(*) FROM agent_memories WHERE project = '$project';
-SELECT 'plans|' || COUNT(*) FROM agent_plans WHERE project = '$project';
-SELECT 'tasks_pending|' || COUNT(*) FROM agent_tasks WHERE project = '$project' AND status = 'pending';
-SELECT 'tasks_progress|' || COUNT(*) FROM agent_tasks WHERE project = '$project' AND status = 'in_progress';
-SELECT 'tasks_done|' || COUNT(*) FROM agent_tasks WHERE project = '$project' AND status = 'completed';
-SELECT 'chunks|' || COUNT(*) FROM code_chunks WHERE project = '$project';
-SELECT 'observations|' || COUNT(*) FROM observations WHERE session_id IN (SELECT id FROM sessions WHERE project = '$project');
-SELECT 'last_active|' || COALESCE(MAX(date(COALESCE(last_activity_at, started_at))), 'never') FROM sessions WHERE project = '$project';
+SELECT 'sessions|' || COUNT(*) FROM sessions WHERE $session_filter;
+SELECT 'sessions_claude|' || COUNT(*) FROM sessions WHERE $session_filter AND agent = 'claude-code';
+SELECT 'sessions_codex|' || COUNT(*) FROM sessions WHERE $session_filter AND agent = 'codex';
+SELECT 'summaries|' || COUNT(*) FROM summaries WHERE $session_filter;
+SELECT 'with_summaries|' || COUNT(*) FROM summaries WHERE $session_filter AND request IS NOT NULL AND request != '';
+SELECT 'memories|' || COUNT(*) FROM agent_memories WHERE $memory_filter;
+SELECT 'plans|' || COUNT(*) FROM agent_plans WHERE $plan_filter;
+SELECT 'tasks_pending|' || COUNT(*) FROM agent_tasks WHERE $task_filter AND status = 'pending';
+SELECT 'tasks_progress|' || COUNT(*) FROM agent_tasks WHERE $task_filter AND status = 'in_progress';
+SELECT 'tasks_done|' || COUNT(*) FROM agent_tasks WHERE $task_filter AND status = 'completed';
+SELECT 'chunks|' || COUNT(*) FROM code_chunks WHERE $chunk_filter;
+SELECT 'observations|' || COUNT(*) FROM observations WHERE $observation_filter;
+SELECT 'last_active|' || COALESCE(MAX(date(COALESCE(last_activity_at, started_at))), 'never') FROM sessions WHERE $session_filter;
 SELECT 'last_summary|' || COALESCE((SELECT substr(request, 1, 60)
     FROM summaries
-    WHERE project = '$project'
+    WHERE $session_filter
     AND COALESCE(request, '') NOT LIKE '# AGENTS.md instructions%'
     AND COALESCE(request, '') NOT LIKE '<environment_context>%'
     ORDER BY created_at DESC

package/lib/db-summaries.sh

@@ -57,12 +57,16 @@ SQL
 }
 
 eagle_get_recent_summaries() {
-    local project; project=$(eagle_sql_escape "$1")
+    local project_scope="${1:-}"
     local limit; limit=$(eagle_sql_int "${2:-5}")
+    local project_filter="1 = 1"
+    if [ -n "$project_scope" ]; then
+        project_filter=$(eagle_sql_project_scope_condition "s.project" "$project_scope")
+    fi
 
     eagle_db "SELECT s.request, s.completed, s.learned, s.next_steps, s.created_at, s.decisions, s.gotchas, s.key_files, s.agent
               FROM summaries s
-              WHERE s.project = '$project'
+              WHERE $project_filter
               AND COALESCE(s.request, '') NOT LIKE '%<local-command-caveat>%'
               AND COALESCE(s.request, '') NOT LIKE '# AGENTS.md instructions%'
               AND COALESCE(s.request, '') NOT LIKE '<environment_context>%'
@@ -73,13 +77,12 @@ eagle_get_recent_summaries() {
 eagle_search_summaries() {
     local query; query=$(eagle_fts_sanitize "$1")
     query=$(eagle_sql_escape "$query")
-    local project="${2:-}"
+    local project_scope="${2:-}"
     local limit; limit=$(eagle_sql_int "${3:-10}")
 
     local where_clause=""
-    if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="AND s.project = '$project'"
+    if [ -n "$project_scope" ]; then
+        where_clause="AND $(eagle_sql_project_scope_condition "s.project" "$project_scope")"
     fi
 
     eagle_db "SELECT s.request, s.completed, s.learned, s.next_steps, s.created_at, s.project, s.decisions, s.gotchas, s.key_files, s.agent

package/lib/hooks-posttool.sh

@@ -33,31 +33,6 @@ eagle_posttool_mirror_writes() {
     esac
 }
 
-eagle_posttool_mirror_tasks() {
-    local tool_name="$1" session_id="$2" project="$3" input="$4"
-    local agent="${5:-$(eagle_agent_source)}"
-
-    case "$tool_name" in
-        TaskCreate|TaskUpdate)
-            if eagle_validate_session_id "$session_id"; then
-                local task_dir="$EAGLE_CLAUDE_TASKS_DIR/$session_id"
-                if [ -d "$task_dir" ]; then
-                    local task_id
-                    task_id=$(echo "$input" | jq -r '.tool_input.id // empty')
-                    if [ -z "$task_id" ]; then
-                        local newest
-                        newest=$(ls -t "$task_dir"/*.json 2>/dev/null | head -1)
-                        [ -n "$newest" ] && [ -f "$newest" ] && eagle_capture_agent_task "$newest" "$session_id" "$project" "$agent"
-                    elif eagle_validate_session_id "$task_id"; then
-                        local task_json="$task_dir/$task_id.json"
-                        [ -f "$task_json" ] && eagle_capture_agent_task "$task_json" "$session_id" "$project" "$agent"
-                    fi
-                fi
-            fi
-            ;;
-    esac
-}
-
 eagle_posttool_stale_hint() {
     local tool_name="$1" fp="$2" project="$3"
     local agent="${4:-$(eagle_agent_source)}"

package/lib/hooks.sh

@@ -4,6 +4,18 @@
 # Shared by install.sh and update.sh
 # ═══════════════════════════════════════════════════════════
 
+eagle_clean_hook_entries() {
+    local settings="$1"
+    local event="$2"
+    local command="$3"
+
+    local tmp
+    tmp=$(mktemp)
+    jq --arg cmd "$command" \
+        ".hooks.${event} = ((.hooks.${event} // []) | map(select(.hooks | all(.command != \$cmd))))" \
+        "$settings" > "$tmp" && mv "$tmp" "$settings"
+}
+
 eagle_patch_hook() {
     local settings="$1"
     local event="$2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eagle-mem",
-  "version": "4.9.7",
+  "version": "4.9.9",
   "description": "Shared memory, release guardrails, RTK token protection, and worker lanes for Claude Code and Codex",
   "bin": {
     "eagle-mem": "bin/eagle-mem"

package/scripts/feature.sh

@@ -125,13 +125,7 @@ case "$subcommand" in
 
     waive)
         id="${1:-}"
-        [ -z "$id" ] && { eagle_err "Usage: eagle-mem feature waive <id> --reason <text>"; exit 1; }
-        case "$id" in
-            *[!0-9]*)
-                eagle_err "Invalid ID: '$id' (must be numeric)"
-                exit 1
-                ;;
-        esac
+        [ -z "$id" ] && { eagle_err "Usage: eagle-mem feature waive <id|name> --reason <text>"; exit 1; }
         shift
         reason=""
         while [ $# -gt 0 ]; do
@@ -147,14 +141,27 @@ case "$subcommand" in
                 *) reason="$1"; shift ;;
             esac
         done
-        [ -z "$reason" ] && { eagle_err "Usage: eagle-mem feature waive <id> --reason <text>"; exit 1; }
-        waived=$(eagle_waive_pending_feature_verification "$project" "$id" "$reason" | tail -1)
-        if [ "${waived:-0}" -gt 0 ] 2>/dev/null; then
-            eagle_ok "Pending verification #$id waived"
-        else
-            eagle_err "No pending verification found with ID $id"
-            exit 1
-        fi
+        [ -z "$reason" ] && { eagle_err "Usage: eagle-mem feature waive <id|name> --reason <text>"; exit 1; }
+        case "$id" in
+            *[!0-9]*)
+                waived=$(eagle_resolve_pending_feature_verifications "$project" "$id" "waived" "$reason" | tail -1)
+                if [ "${waived:-0}" -gt 0 ] 2>/dev/null; then
+                    eagle_ok "Waived $waived pending verification(s) for '$id'"
+                else
+                    eagle_err "No pending verifications found for feature '$id'"
+                    exit 1
+                fi
+                ;;
+            *)
+                waived=$(eagle_waive_pending_feature_verification "$project" "$id" "$reason" | tail -1)
+                if [ "${waived:-0}" -gt 0 ] 2>/dev/null; then
+                    eagle_ok "Pending verification #$id waived"
+                else
+                    eagle_err "No pending verification found with ID $id"
+                    exit 1
+                fi
+                ;;
+        esac
         ;;
 
     add)

package/scripts/install.sh

@@ -226,7 +226,11 @@ if [ "$claude_found" = true ]; then
         "$EAGLE_MEM_DIR/hooks/stop.sh" \
         "Stop hook"
 
-    eagle_patch_hook "$SETTINGS" "PostToolUse" "Read|Write|Edit|Bash|TaskCreate|TaskUpdate" \
+    # Clean old registrations before re-registering (handles matcher changes across versions)
+    eagle_clean_hook_entries "$SETTINGS" "PostToolUse" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
+    eagle_clean_hook_entries "$SETTINGS" "PreToolUse" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
+
+    eagle_patch_hook "$SETTINGS" "PostToolUse" "Read|Write|Edit|Bash|TaskUpdate" \
         "$EAGLE_MEM_DIR/hooks/post-tool-use.sh" \
         "PostToolUse hook"
 
@@ -246,21 +250,9 @@ if [ "$claude_found" = true ]; then
         "$EAGLE_MEM_DIR/hooks/user-prompt-submit.sh" \
         "UserPromptSubmit hook"
 
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Bash" \
-        "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh" \
-        "PreToolUse hook (Bash)"
-
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Read" \
-        "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh" \
-        "PreToolUse hook (Read)"
-
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Edit" \
-        "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh" \
-        "PreToolUse hook (Edit)"
-
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Write" \
+    eagle_patch_hook "$SETTINGS" "PreToolUse" "Bash|Read|Edit|Write" \
         "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh" \
-        "PreToolUse hook (Write)"
+        "PreToolUse hook"
 else
     eagle_info "Claude hooks skipped ${DIM}(Claude Code not detected)${RESET}"
 fi

package/scripts/memories.sh

@@ -24,6 +24,7 @@ case "${1:-}" in
 esac
 
 project=""
+project_was_explicit=false
 limit=20
 query=""
 raw_output=false
@@ -76,7 +77,7 @@ esac
 
 while [ $# -gt 0 ]; do
     case "$1" in
-        --project|-p)   project="$2"; shift 2 ;;
+        --project|-p)   project="$2"; project_was_explicit=true; shift 2 ;;
         --limit|-l)     limit="$2"; shift 2 ;;
         --all|-a)       cross_project=true; shift ;;
         --raw|--debug)  raw_output=true; shift ;;
@@ -95,6 +96,9 @@ done
 if [ -z "$project" ] && [ "$cross_project" = false ]; then
     project=$(eagle_project_from_cwd "$(pwd)")
 fi
+if [ "$cross_project" = false ] && [ "$project_was_explicit" = false ]; then
+    project=$(eagle_recall_project_scope_from_cwd "$(pwd)" "$project")
+fi
 
 eagle_age_label() {
     local updated="${1:-}"
@@ -230,7 +234,7 @@ memories_show() {
     query_sql=$(eagle_sql_escape "$query")
     project_filter=""
     if [ -n "$project" ]; then
-        project_filter="AND project = '$(eagle_sql_escape "$project")'"
+        project_filter="AND $(eagle_sql_project_scope_condition "project" "$project")"
     fi
 
     meta_json=$(eagle_db_json "SELECT memory_name, memory_type, description, content, file_path, updated_at, origin_session_id, origin_agent
@@ -370,7 +374,7 @@ plans_show() {
     query_sql=$(eagle_sql_escape "$query")
     project_filter=""
     if [ -n "$project" ]; then
-        project_filter="AND project = '$(eagle_sql_escape "$project")'"
+        project_filter="AND $(eagle_sql_project_scope_condition "project" "$project")"
     fi
     meta_json=$(eagle_db_json "SELECT title, project, content, file_path, updated_at, origin_session_id, origin_agent
                      FROM agent_plans
@@ -517,7 +521,7 @@ tasks_show() {
     query_sql=$(eagle_sql_escape "$query")
     project_filter=""
     if [ -n "$project" ]; then
-        project_filter="AND project = '$(eagle_sql_escape "$project")'"
+        project_filter="AND $(eagle_sql_project_scope_condition "project" "$project")"
     fi
     meta_json=$(eagle_db_json "SELECT subject, status, description, active_form, source_session_id, source_task_id, file_path, updated_at, origin_agent
                      FROM agent_tasks
@@ -575,6 +579,33 @@ tasks_show() {
 memories_sync() {
     eagle_header "Memory, Plan & Task Sync"
 
+    local lock_root="$EAGLE_MEM_DIR/locks"
+    local lock_dir="$lock_root/memories-sync.lock"
+    mkdir -p "$lock_root" 2>/dev/null || true
+    if mkdir "$lock_dir" 2>/dev/null; then
+        printf '%s\n' "$$" > "$lock_dir/pid" 2>/dev/null || true
+        _EAGLE_MEMORIES_SYNC_LOCK_DIR="$lock_dir"
+        trap 'rm -rf "${_EAGLE_MEMORIES_SYNC_LOCK_DIR:-}" 2>/dev/null || true' EXIT
+    else
+        local lock_pid=""
+        [ -f "$lock_dir/pid" ] && lock_pid=$(cat "$lock_dir/pid" 2>/dev/null | tr -cd '0-9')
+        if [ -n "$lock_pid" ] && kill -0 "$lock_pid" 2>/dev/null; then
+            eagle_info "Sync already running (pid $lock_pid). Skipping this duplicate run."
+            echo ""
+            eagle_footer "Sync skipped."
+            return 0
+        fi
+        rm -rf "$lock_dir" 2>/dev/null || true
+        if mkdir "$lock_dir" 2>/dev/null; then
+            printf '%s\n' "$$" > "$lock_dir/pid" 2>/dev/null || true
+            _EAGLE_MEMORIES_SYNC_LOCK_DIR="$lock_dir"
+            trap 'rm -rf "${_EAGLE_MEMORIES_SYNC_LOCK_DIR:-}" 2>/dev/null || true' EXIT
+        else
+            eagle_err "Could not acquire memories sync lock."
+            return 1
+        fi
+    fi
+
     # ─── Sync memories ───────────────────────────────────
     eagle_info "Scanning for agent memory files..."
     echo ""
@@ -583,15 +614,21 @@ memories_sync() {
     local mem_synced=0
     local mem_skipped=0
 
-    if [ -d "$claude_mem_root" ]; then
-        while IFS= read -r -d '' memfile; do
+    sync_one_memory_file() {
+        local memfile="$1"
+        [ -f "$memfile" ] || return 0
+
             local base
             base=$(basename "$memfile")
-            [ "$base" = "MEMORY.md" ] && continue
+            [ "$base" = "MEMORY.md" ] && return 0
 
             local mem_project mem_project_dir existing_row existing_hash existing_project
             mem_project_dir="${memfile%/memory/*}"
             mem_project=$(eagle_project_from_claude_project_dir "$mem_project_dir" 2>/dev/null || true)
+            if [ "$cross_project" = false ] && [ -n "$project" ]; then
+                eagle_project_scope_contains "$project" "$mem_project" || return 0
+            fi
+
             existing_row=$(eagle_db "SELECT content_hash, project FROM agent_memories WHERE file_path = '$(eagle_sql_escape "$memfile")';")
             IFS='|' read -r existing_hash existing_project <<< "$existing_row"
             local new_hash
@@ -605,7 +642,25 @@ memories_sync() {
             eagle_capture_agent_memory "$memfile" "" "$mem_project" "claude-code"
             mem_synced=$((mem_synced + 1))
             eagle_ok "Memory: $base"
-        done < <(find "$claude_mem_root" -path "*/memory/*.md" -print0 2>/dev/null)
+    }
+
+    if [ -d "$claude_mem_root" ]; then
+        if [ "$cross_project" = true ] || [ -z "$project" ]; then
+            while IFS= read -r -d '' memfile; do
+                sync_one_memory_file "$memfile"
+            done < <(find "$claude_mem_root" -path "*/memory/*.md" -print0 2>/dev/null)
+        else
+            while IFS= read -r scope_project; do
+                [ -z "$scope_project" ] && continue
+                scope_dir=$(eagle_claude_project_dir_for_key "$scope_project")
+                [ -d "$scope_dir/memory" ] || continue
+                while IFS= read -r -d '' memfile; do
+                    sync_one_memory_file "$memfile"
+                done < <(find "$scope_dir/memory" -maxdepth 1 -type f -name "*.md" -print0 2>/dev/null)
+            done <<EOF
+$(printf '%s' "$project" | tr '|' '\n')
+EOF
+        fi
     fi
 
     local codex_mem_root="$EAGLE_CODEX_MEMORIES_DIR"
@@ -710,12 +765,16 @@ memories_sync() {
     # ─── Backfill project names ──────────────────────────
     eagle_info "Resolving project names from agent transcripts..."
 
-    local backfilled
-    backfilled=$(eagle_backfill_projects)
-    if [ "${backfilled:-0}" -gt 0 ]; then
-        eagle_ok "$backfilled rows updated with correct project names"
+    if [ "$cross_project" = true ]; then
+        local backfilled
+        backfilled=$(eagle_backfill_projects)
+        if [ "${backfilled:-0}" -gt 0 ]; then
+            eagle_ok "$backfilled rows updated with correct project names"
+        else
+            eagle_ok "All project names up to date"
+        fi
     else
-        eagle_ok "All project names up to date"
+        eagle_ok "Scoped sync complete; use --all for global transcript backfill"
     fi
 
     eagle_footer "Sync complete."

package/scripts/search.sh

@@ -43,6 +43,9 @@ show_help() {
 
 mode="keyword"
 project=""
+project_was_explicit=false
+project_scope=""
+project_label=""
 limit=10
 session_id=""
 json_output=false
@@ -59,7 +62,7 @@ while [ $# -gt 0 ]; do
         --overview|-o)       mode="overview"; shift ;;
         --memories|-m)       mode="memories"; shift ;;
         --tasks)             mode="tasks"; shift ;;
-        --project|-p)        project="$2"; shift 2 ;;
+        --project|-p)        project="$2"; project_was_explicit=true; shift 2 ;;
         --limit|-n)          limit="$2"; shift 2 ;;
         --all|-a)            cross_project=true; shift ;;
         --json|-j)           json_output=true; shift ;;
@@ -75,6 +78,12 @@ while [ $# -gt 0 ]; do
 done
 
 [ -z "$project" ] && project=$(eagle_project_from_cwd "$(pwd)")
+project_scope="$project"
+if [ "$cross_project" = false ] && [ "$project_was_explicit" = false ]; then
+    project_scope=$(eagle_recall_project_scope_from_cwd "$(pwd)" "$project")
+fi
+project_label=$(eagle_project_scope_label "$project_scope")
+[ -z "$project_label" ] && project_label="$project"
 limit=$(eagle_sql_int "$limit")
 [ "$limit" -eq 0 ] && limit=10
 
@@ -88,11 +97,12 @@ search_keyword() {
         exit 1
     fi
     local q; q=$(eagle_sql_escape "$sanitized_q")
-    local p; p=$(eagle_sql_escape "$project")
+    local project_condition
+    project_condition=$(eagle_sql_project_scope_condition "s.project" "$project_scope")
 
     local where_project=""
     if [ "$cross_project" = false ]; then
-        where_project="AND s.project = '$p'"
+        where_project="AND $project_condition"
     fi
 
     if [ "$json_output" = true ]; then
@@ -173,12 +183,13 @@ search_keyword() {
 # ─── Timeline ────────────────────────────────────────────
 
 search_timeline() {
-    local p; p=$(eagle_sql_escape "$project")
+    local project_condition
+    project_condition=$(eagle_sql_project_scope_condition "s.project" "$project_scope")
 
     if [ "$json_output" = true ]; then
         eagle_db_json "SELECT s.id, s.agent, s.request, s.completed, s.learned, s.next_steps, s.created_at
                        FROM summaries s
-                       WHERE s.project = '$p'
+                       WHERE $project_condition
                        ORDER BY s.created_at DESC
                        LIMIT $limit;"
         return
@@ -187,7 +198,7 @@ search_timeline() {
     local results
     results=$(eagle_db "SELECT s.id, s.agent, s.request, s.completed, s.learned, s.next_steps, s.created_at
                         FROM summaries s
-                        WHERE s.project = '$p'
+                        WHERE $project_condition
                         ORDER BY s.created_at DESC
                         LIMIT $limit;")
 
@@ -197,7 +208,7 @@ search_timeline() {
     fi
 
     echo ""
-    echo -e "  ${BOLD}Recent sessions${RESET} ${DIM}($project)${RESET}"
+    echo -e "  ${BOLD}Recent sessions${RESET} ${DIM}($project_label)${RESET}"
     echo -e "  ${DIM}─────────────────────────────────────${RESET}"
     echo ""
 
@@ -401,20 +412,25 @@ search_files() {
 # ─── Stats ────────────────────────────────────────────────
 
 search_stats() {
-    local p; p=$(eagle_sql_escape "$project")
+    local sessions_condition summaries_condition observations_condition tasks_condition chunks_condition
+    sessions_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    summaries_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    observations_condition=$(eagle_sql_project_scope_condition "s.project" "$project_scope")
+    tasks_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    chunks_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
 
     local sessions sessions_claude sessions_codex summaries observations tasks
-    sessions=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE project = '$p';")
-    sessions_claude=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE project = '$p' AND agent = 'claude-code';")
-    sessions_codex=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE project = '$p' AND agent = 'codex';")
-    summaries=$(eagle_db "SELECT COUNT(*) FROM summaries WHERE project = '$p';")
-    observations=$(eagle_db "SELECT COUNT(*) FROM observations o JOIN sessions s ON s.id = o.session_id WHERE s.project = '$p';")
-    tasks=$(eagle_db "SELECT COUNT(*) FROM agent_tasks WHERE project = '$p';")
+    sessions=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE $sessions_condition;")
+    sessions_claude=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE $sessions_condition AND agent = 'claude-code';")
+    sessions_codex=$(eagle_db "SELECT COUNT(*) FROM sessions WHERE $sessions_condition AND agent = 'codex';")
+    summaries=$(eagle_db "SELECT COUNT(*) FROM summaries WHERE $summaries_condition;")
+    observations=$(eagle_db "SELECT COUNT(*) FROM observations o JOIN sessions s ON s.id = o.session_id WHERE $observations_condition;")
+    tasks=$(eagle_db "SELECT COUNT(*) FROM agent_tasks WHERE $tasks_condition;")
     local chunks
-    chunks=$(eagle_db "SELECT COUNT(*) FROM code_chunks WHERE project = '$p';")
+    chunks=$(eagle_db "SELECT COUNT(*) FROM code_chunks WHERE $chunks_condition;")
 
     if [ "$json_output" = true ]; then
-        jq -nc --arg project "$project" \
+        jq -nc --arg project "$project_label" \
             --argjson sessions "${sessions:-0}" \
             --argjson sessions_claude "${sessions_claude:-0}" \
             --argjson sessions_codex "${sessions_codex:-0}" \
@@ -427,7 +443,7 @@ search_stats() {
     fi
 
     echo ""
-    echo -e "  ${BOLD}Stats${RESET} ${DIM}($project)${RESET}"
+    echo -e "  ${BOLD}Stats${RESET} ${DIM}($project_label)${RESET}"
     echo -e "  ${DIM}─────────────────────────────────────${RESET}"
     echo ""
     eagle_kv "Sessions:" "${sessions:-0}"
@@ -474,11 +490,13 @@ search_overview() {
 # ─── Memories ────────────────────────────────────────────
 
 search_memories() {
-    local p; p=$(eagle_sql_escape "$project")
+    local project_condition memory_condition
+    project_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
+    memory_condition=$(eagle_sql_project_scope_condition "m.project" "$project_scope")
 
     local where_project=""
     if [ "$cross_project" = false ]; then
-        where_project="WHERE project = '$p'"
+        where_project="WHERE $project_condition"
     fi
 
     if [ -n "$query" ]; then
@@ -491,7 +509,7 @@ search_memories() {
         local q; q=$(eagle_sql_escape "$sanitized_mq")
         local where_match="WHERE agent_memories_fts MATCH '$q'"
         if [ "$cross_project" = false ]; then
-            where_match="$where_match AND m.project = '$p'"
+            where_match="$where_match AND $memory_condition"
         fi
 
         if [ "$json_output" = true ]; then
@@ -570,7 +588,7 @@ search_memories() {
     fi
 
     echo ""
-    echo -e "  ${BOLD}Memories${RESET} ${DIM}($project)${RESET}"
+    echo -e "  ${BOLD}Memories${RESET} ${DIM}($project_label)${RESET}"
     echo -e "  ${DIM}─────────────────────────────────────${RESET}"
     echo ""
 
@@ -585,13 +603,15 @@ search_memories() {
 # ─── Tasks ───────────────────────────────────────────────
 
 search_tasks() {
-    local p; p=$(eagle_sql_escape "$project")
+    local task_condition bare_task_condition
+    task_condition=$(eagle_sql_project_scope_condition "t.project" "$project_scope")
+    bare_task_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
 
     local where_project=""
     local where_task_project=""
     if [ "$cross_project" = false ]; then
-        where_project="AND project = '$p'"
-        where_task_project="AND t.project = '$p'"
+        where_project="AND $bare_task_condition"
+        where_task_project="AND $task_condition"
     fi
 
     if [ -n "$query" ]; then
@@ -662,7 +682,7 @@ search_tasks() {
                         LIMIT $limit;")
 
     if [ -z "$results" ]; then
-        eagle_dim "No active tasks for project '$project'"
+        eagle_dim "No active tasks for project '$project_label'"
         return
     fi
 

package/scripts/statusline-em.sh

@@ -58,17 +58,18 @@ eagle_mem_statusline_stats() {
     [ -z "$project_dir" ] && project_dir="$(pwd)"
     [ -z "$current_dir" ] && current_dir="$project_dir"
 
-    local project_key project_sql stats sessions memories last_raw turns version latest
+    local project_key project_scope project_condition stats sessions memories last_raw turns version latest
     project_key=$(eagle_project_from_statusline_input "$statusline_input" "$project_dir" "$current_dir" "$session_id")
     [ -n "$project_key" ] || return
-    project_sql=$(eagle_sql_escape "$project_key")
+    project_scope=$(eagle_recall_project_scope_from_cwd "${current_dir:-$project_dir}" "$project_key")
+    project_condition=$(eagle_sql_project_scope_condition "project" "$project_scope")
 
     stats=$("$sqlite_bin" "$em_db" "SELECT
         COUNT(*) || '|' ||
-        (SELECT COUNT(*) FROM agent_memories WHERE project = '$project_sql') || '|' ||
+        (SELECT COUNT(*) FROM agent_memories WHERE $project_condition) || '|' ||
         COALESCE(MAX(COALESCE(last_activity_at, started_at)), 'never')
         FROM sessions
-        WHERE project = '$project_sql';" 2>/dev/null)
+        WHERE $project_condition;" 2>/dev/null)
     IFS='|' read -r sessions memories last_raw <<< "${stats:-0|0|never}"
     sessions=${sessions:-0}
     memories=${memories:-0}

package/scripts/update.sh

@@ -76,23 +76,18 @@ fi
 # ─── Re-register hooks (idempotent) ───────────────────────
 
 if [ "$claude_found" = true ] && [ -f "$SETTINGS" ] && command -v jq &>/dev/null; then
-    # Update PostToolUse matcher if it has the old value (pre-v1.3.0)
-    if jq -e '.hooks.PostToolUse[]? | select(.matcher == "Read|Write|Edit|Bash")' "$SETTINGS" &>/dev/null; then
-        _tmp=$(mktemp)
-        jq '(.hooks.PostToolUse[] | select(.matcher == "Read|Write|Edit|Bash")).matcher = "Read|Write|Edit|Bash|TaskCreate|TaskUpdate"' "$SETTINGS" > "$_tmp" && mv "$_tmp" "$SETTINGS"
-    fi
+    # Clean old registrations before re-registering (handles matcher changes across versions)
+    eagle_clean_hook_entries "$SETTINGS" "PostToolUse" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
+    eagle_clean_hook_entries "$SETTINGS" "PreToolUse" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
 
     eagle_patch_hook "$SETTINGS" "SessionStart" "" "$EAGLE_MEM_DIR/hooks/session-start.sh"
     eagle_patch_hook "$SETTINGS" "Stop" "" "$EAGLE_MEM_DIR/hooks/stop.sh"
-    eagle_patch_hook "$SETTINGS" "PostToolUse" "Read|Write|Edit|Bash|TaskCreate|TaskUpdate" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
+    eagle_patch_hook "$SETTINGS" "PostToolUse" "Read|Write|Edit|Bash|TaskUpdate" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
     eagle_patch_hook "$SETTINGS" "TaskCreated" "" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
     eagle_patch_hook "$SETTINGS" "TaskCompleted" "" "$EAGLE_MEM_DIR/hooks/post-tool-use.sh"
     eagle_patch_hook "$SETTINGS" "SessionEnd" "" "$EAGLE_MEM_DIR/hooks/session-end.sh"
     eagle_patch_hook "$SETTINGS" "UserPromptSubmit" "" "$EAGLE_MEM_DIR/hooks/user-prompt-submit.sh"
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Bash" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Read" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Edit" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
-    eagle_patch_hook "$SETTINGS" "PreToolUse" "Write" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
+    eagle_patch_hook "$SETTINGS" "PreToolUse" "Bash|Read|Edit|Write" "$EAGLE_MEM_DIR/hooks/pre-tool-use.sh"
 
     eagle_ok "Hooks registered"
 fi