eagle-mem 4.9.7 → 4.9.8

package/hooks/session-start.sh

@@ -37,6 +37,12 @@ project=$(eagle_project_from_hook_input "$input")
 [ -z "$project" ] && exit 0
 
 p_esc=$(eagle_sql_escape "$project")
+recall_scope=$(eagle_recall_project_scope_from_cwd "$cwd" "$project")
+[ -z "$recall_scope" ] && recall_scope="$project"
+recall_scope_label=$(eagle_project_scope_label "$recall_scope")
+recall_project_filter=$(eagle_sql_project_scope_condition "project" "$recall_scope")
+recall_memory_filter=$(eagle_sql_project_scope_condition "m.project" "$recall_scope")
+recall_lane_filter=$(eagle_sql_project_scope_condition "l.project" "$recall_scope")
 
 eagle_log "INFO" "SessionStart: session=$session_id project=$project source=$source_type agent=$agent"
 
@@ -96,7 +102,7 @@ while IFS='|' read -r key val; do
         last_active)     stat_last_active="$val" ;;
         last_summary)    stat_last_summary="$val" ;;
     esac
-done <<< "$(eagle_get_project_stats "$project")"
+done <<< "$(eagle_get_project_stats "$recall_scope")"
 
 # ─── Build compressed banner (elide zero-value lines) ────
 
@@ -119,6 +125,10 @@ eagle_banner="======================================
  Project      | $project
  Agent        | $agent_label
  Sessions     | $stat_sessions ($stat_with_summaries with summaries)"
+if [ "$recall_scope_label" != "$project" ]; then
+    eagle_banner+="
+ Recall Scope | $recall_scope_label"
+fi
 if [ "$stat_sessions_codex" -gt 0 ] || [ "$stat_sessions_claude" -gt 0 ]; then
     eagle_banner+="
  Sources      | Claude $stat_sessions_claude, Codex $stat_sessions_codex"
@@ -137,12 +147,18 @@ eagle_banner+="
 ======================================"
 
 context="$eagle_banner
+Eagle Mem recalls: use the project memory below before making design or implementation claims. If it affects your answer, mention the recall in one short attribution line.
 "
 
 if [ "$codex_compact" -eq 1 ]; then
     codex_context="Eagle Mem Recall Ready
 Project: $project | Agent: $agent_label
 Memory: $stat_sessions sessions"
+    if [ "$recall_scope_label" != "$project" ]; then
+        codex_context="Eagle Mem Recall Ready
+Project: $project | Recall: $recall_scope_label | Agent: $agent_label
+Memory: $stat_sessions sessions"
+    fi
     [ "$stat_with_summaries" -gt 0 ] && codex_context+=", $stat_with_summaries summarized"
     [ "$stat_memories" -gt 0 ] && codex_context+=", $stat_memories memories"
     [ "$stat_chunks" -gt 0 ] && codex_context+=", $stat_chunks code chunks"
@@ -172,7 +188,7 @@ Project brief: no overview yet; background scan is running.
 "
     fi
 
-    recent=$(eagle_get_recent_summaries "$project" 1)
+    recent=$(eagle_get_recent_summaries "$recall_scope" 1)
     if [ -n "$recent" ]; then
         codex_context+="
 Relevant now:
@@ -194,16 +210,18 @@ Relevant now:
     memories=$(eagle_db "SELECT memory_name, memory_type, description, origin_agent,
         CAST(julianday('now') - julianday(updated_at) AS INTEGER) as days_ago
         FROM agent_memories
-        WHERE project = '$p_esc'
+        WHERE $recall_project_filter
+        AND memory_name NOT IN ('Codex Memory Registry', 'Codex Memory Summary')
         ORDER BY
             CASE
                 WHEN lower(memory_name) LIKE 'current status%' THEN 4
-                WHEN memory_type IN ('feedback', 'user', 'reference') THEN 0
-                WHEN memory_type = 'project' THEN 1
-                ELSE 2
+                WHEN memory_type = 'project' THEN 0
+                WHEN memory_type = 'feedback' THEN 1
+                WHEN memory_type IN ('user', 'reference') THEN 2
+                ELSE 3
             END,
             updated_at DESC
-        LIMIT 2;")
+        LIMIT 4;")
     if [ -n "$memories" ]; then
         [ -z "$recent" ] && codex_context+="
 Relevant now:
@@ -225,7 +243,7 @@ Relevant now:
     fi
 
     synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM agent_tasks
-        WHERE project = '$p_esc'
+        WHERE $recall_project_filter
         AND status IN ('in_progress', 'pending')
         AND source_session_id != 'orchestration'
         AND updated_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now', '-7 days')
@@ -234,7 +252,7 @@ Relevant now:
     orchestration_lanes=$(eagle_db "SELECT o.name, l.lane_key, l.title, l.agent, l.status
         FROM orchestration_lanes l
         JOIN orchestrations o ON o.id = l.orchestration_id
-        WHERE l.project = '$p_esc'
+        WHERE $recall_lane_filter
           AND o.status = 'active'
           AND l.status IN ('in_progress', 'pending', 'blocked')
         ORDER BY CASE l.status WHEN 'in_progress' THEN 0 WHEN 'blocked' THEN 1 ELSE 2 END, l.updated_at DESC
@@ -361,7 +379,7 @@ else
     _summary_limit=2
 fi
 
-recent=$(eagle_get_recent_summaries "$project" "$_summary_limit")
+recent=$(eagle_get_recent_summaries "$recall_scope" "$_summary_limit")
 
 if [ -n "$recent" ]; then
     context+="
@@ -410,18 +428,20 @@ fi
 
 # ─── Memories (skip if none) ─────────────────────────────
 
-memory_limit=3
-[ "$codex_compact" -eq 1 ] && memory_limit=2
+memory_limit=5
+[ "$codex_compact" -eq 1 ] && memory_limit=3
 memories=$(eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at, origin_agent,
     CAST(julianday('now') - julianday(updated_at) AS INTEGER) as days_ago
     FROM agent_memories
-    WHERE project = '$p_esc'
+    WHERE $recall_project_filter
+    AND memory_name NOT IN ('Codex Memory Registry', 'Codex Memory Summary')
     ORDER BY
         CASE
             WHEN lower(memory_name) LIKE 'current status%' THEN 4
-            WHEN memory_type IN ('feedback', 'user', 'reference') THEN 0
-            WHEN memory_type = 'project' THEN 1
-            ELSE 2
+            WHEN memory_type = 'project' THEN 0
+            WHEN memory_type = 'feedback' THEN 1
+            WHEN memory_type IN ('user', 'reference') THEN 2
+            ELSE 3
         END,
         updated_at DESC
     LIMIT $memory_limit;")
@@ -450,7 +470,7 @@ fi
 
 # ─── Plans (skip if none) ────────────────────────────────
 
-plans=$(eagle_list_agent_plans "$project" 3)
+plans=$(eagle_list_agent_plans "$recall_scope" 3)
 if [ -n "$plans" ]; then
     context+="
 === Eagle Mem: Plans ===
@@ -468,7 +488,7 @@ fi
 task_limit=5
 [ "$codex_compact" -eq 1 ] && task_limit=3
 synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM agent_tasks
-    WHERE project = '$p_esc'
+    WHERE $recall_project_filter
     AND status IN ('in_progress', 'pending')
     AND source_session_id != 'orchestration'
     AND updated_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now', '-7 days')
@@ -501,7 +521,7 @@ orchestration_lanes=$(eagle_db "SELECT o.name, o.goal, l.lane_key, l.title,
         l.agent, l.status, l.validation, l.worktree_path, l.notes
     FROM orchestration_lanes l
     JOIN orchestrations o ON o.id = l.orchestration_id
-    WHERE l.project = '$p_esc'
+    WHERE $recall_lane_filter
       AND o.status = 'active'
       AND l.status IN ('in_progress', 'pending', 'blocked')
     ORDER BY

package/hooks/user-prompt-submit.sh

@@ -26,6 +26,8 @@ agent=$(eagle_agent_source_from_json "$input")
 [ -z "$user_prompt" ] && exit 0
 
 project=$(eagle_project_from_hook_input "$input")
+recall_scope=$(eagle_recall_project_scope_from_cwd "$cwd" "$project")
+[ -z "$recall_scope" ] && recall_scope="$project"
 codex_compact=0
 [ "$agent" = "codex" ] && codex_compact=1
 
@@ -93,8 +95,10 @@ fts_query=$(echo "$user_prompt" | tr -cs '[:alnum:]' ' ' | tr '[:upper:]' '[:low
         split("the a an is are was were be been being have has had do does did will would shall should may might can could of in to for on with at by from", sw, " ")
         for (i in sw) stop[sw[i]]=1
         n=0
+        split("ad ai ui ux db", keep, " ")
+        for (i in keep) short_keep[keep[i]]=1
         for (i=1; i<=NF && n<6; i++) {
-            if (length($i) > 2 && !($i in stop)) {
+            if ((length($i) > 2 || ($i in short_keep)) && !($i in stop)) {
                 printf "%s%s", (n>0?" OR ":""), $i; n++
             }
         }
@@ -137,15 +141,21 @@ if [ "$codex_compact" -eq 1 ]; then
     code_limit=2
 fi
 
-results=$(eagle_search_summaries "$fts_query" "$project" "$summary_limit")
+memory_limit=3
+[ "$codex_compact" -eq 1 ] && memory_limit=2
 
-if [ -n "$results" ]; then
+results=$(eagle_search_summaries "$fts_query" "$recall_scope" "$summary_limit")
+memory_results=$(eagle_search_agent_memories "$fts_query" "$recall_scope" "$memory_limit" 2>/dev/null || true)
+
+if [ -n "$results" ] || [ -n "$memory_results" ]; then
     if [ "$codex_compact" -eq 1 ]; then
         context+="
 Eagle Mem recalls:
 "
     else
-        context+="=== Eagle Mem: Relevant Recall ===
+        context+="Eagle Mem recalls: apply these retrieved project facts before answering. If they are relevant to the user's prompt, start with one short \"Eagle Mem recalls:\" attribution line.
+
+=== Eagle Mem: Relevant Recall ===
 "
     fi
     while IFS='|' read -r req completed learned _next_steps created_at _proj decisions gotchas key_files summary_agent; do
@@ -186,6 +196,30 @@ Eagle Mem recalls:
 "
         fi
     done <<< "$results"
+
+    while IFS='|' read -r mname mtype mdesc msnippet _mfile _mupdated morigin; do
+        [ -z "$mname" ] && continue
+        case "$mname" in
+            "Codex Memory Registry"|"Codex Memory Summary") continue ;;
+        esac
+        origin_label=$(eagle_agent_label "$morigin")
+        if [ "$codex_compact" -eq 1 ]; then
+            mdesc=$(eagle_trim_text "$mdesc" 120)
+            context+="- Memory [$mtype][$origin_label]: $mname"
+            [ -n "$mdesc" ] && context+=" — $mdesc"
+            context+="
+"
+        else
+            mdesc=$(eagle_trim_text "$mdesc" 180)
+            msnippet=$(eagle_trim_text "$msnippet" 220)
+            context+="[Memory][$origin_label][$mtype] $mname"
+            [ -n "$mdesc" ] && context+=" — $mdesc"
+            [ -n "$msnippet" ] && context+="
+  Snippet: $msnippet"
+            context+="
+"
+        fi
+    done <<< "$memory_results"
 fi
 
 # Search indexed code chunks (if any exist for this project)

package/lib/common.sh

@@ -362,6 +362,121 @@ eagle_project_from_existing_ancestor() {
     return 1
 }
 
+eagle_project_has_recall_rows() {
+    local project="${1:-}"
+    [ -n "$project" ] || return 1
+
+    eagle_project_has_table_row "agent_memories" "$project" \
+        || eagle_project_has_table_row "agent_plans" "$project" \
+        || eagle_project_has_table_row "agent_tasks" "$project" \
+        || eagle_project_has_table_row "summaries" "$project"
+}
+
+eagle_recall_ancestor_project_from_cwd() {
+    local path="${1:-$(pwd)}"
+    local current_project="${2:-}"
+    local current key
+
+    current=$(eagle_normalize_project_path "$path")
+    eagle_is_ephemeral_project_path "$current" && return 1
+
+    [ -d "$current" ] || current=$(dirname "$current")
+    current=$(dirname "$current")
+
+    while [ -n "$current" ] && [ "$current" != "/" ]; do
+        if [ "$current" = "$HOME" ]; then
+            break
+        fi
+
+        key=$(eagle_project_key_from_target_dir "$current")
+        if [ -n "$key" ] && [ "$key" != "$current_project" ]; then
+            if eagle_project_has_recall_rows "$key"; then
+                printf '%s\n' "$key"
+                return 0
+            fi
+        fi
+
+        current=$(dirname "$current")
+    done
+
+    return 1
+}
+
+eagle_recall_project_scope_from_cwd() {
+    local path="${1:-$(pwd)}"
+    local project="${2:-}"
+    local ancestor
+
+    [ -z "$project" ] && project=$(eagle_project_from_cwd "$path")
+    if ancestor=$(eagle_recall_ancestor_project_from_cwd "$path" "$project"); then
+        if [ -n "$project" ] && [ "$ancestor" != "$project" ]; then
+            printf '%s|%s\n' "$project" "$ancestor"
+            return 0
+        fi
+        printf '%s\n' "$ancestor"
+        return 0
+    fi
+
+    printf '%s\n' "$project"
+}
+
+eagle_sql_project_scope_condition() {
+    local column="${1:-project}"
+    local scope="${2:-}"
+    local values="" count=0 item escaped
+
+    while IFS= read -r item; do
+        [ -n "$item" ] || continue
+        escaped=$(eagle_sql_escape "$item")
+        values="${values},'${escaped}'"
+        count=$((count + 1))
+    done <<EOF
+$(printf '%s' "$scope" | tr '|' '\n')
+EOF
+
+    if [ "$count" -eq 0 ]; then
+        printf '1 = 0\n'
+    elif [ "$count" -eq 1 ]; then
+        printf "%s = %s\n" "$column" "${values#,}"
+    else
+        printf "%s IN (%s)\n" "$column" "${values#,}"
+    fi
+}
+
+eagle_project_scope_label() {
+    local scope="${1:-}"
+    printf '%s\n' "$scope" | tr '|' ','
+}
+
+eagle_project_scope_contains() {
+    local scope="${1:-}"
+    local target="${2:-}"
+    local item
+    [ -n "$target" ] || return 1
+
+    while IFS= read -r item; do
+        [ -z "$item" ] && continue
+        [ "$item" = "$target" ] && return 0
+    done <<EOF
+$(printf '%s' "$scope" | tr '|' '\n')
+EOF
+
+    return 1
+}
+
+eagle_claude_project_dir_for_key() {
+    local project="${1:-}"
+    [ -n "$project" ] || return 1
+
+    local abs slug
+    case "$project" in
+        /*) abs="$project" ;;
+        *)  abs="$HOME/$project" ;;
+    esac
+    slug=$(printf '%s' "$abs" | sed -E 's#[^[:alnum:].]+#-#g')
+    printf '%s/%s\n' "$EAGLE_CLAUDE_PROJECTS_DIR" "$slug"
+}
+
 eagle_project_from_workspace_path() {
     if [ -n "${EAGLE_MEM_PROJECT:-}" ]; then
         printf '%s\n' "$EAGLE_MEM_PROJECT"
@@ -728,20 +843,15 @@ eagle_emit_context_for_agent() {
 
     [ -z "$context" ] && return 0
 
-    if [ "$agent" = "codex" ]; then
-        jq -cn \
-            --arg event "$hook_event" \
-            --arg context "$context" \
-            '{
-                hookSpecificOutput: {
-                    hookEventName: $event,
-                    additionalContext: $context
-                }
-            }'
-        return 0
-    fi
-
-    printf '%s\n' "$context"
+    jq -cn \
+        --arg event "$hook_event" \
+        --arg context "$context" \
+        '{
+            hookSpecificOutput: {
+                hookEventName: $event,
+                additionalContext: $context
+            }
+        }'
 }
 
 eagle_config_get_light() {

package/lib/db-mirrors.sh

@@ -103,8 +103,7 @@ eagle_search_agent_memories() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="AND m.project = '$project'"
+        where_clause="AND $(eagle_sql_project_scope_condition "m.project" "$project")"
     fi
 
     eagle_db "SELECT m.memory_name, m.memory_type, m.description,
@@ -124,8 +123,7 @@ eagle_list_agent_memories() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="WHERE project = '$project'"
+        where_clause="WHERE $(eagle_sql_project_scope_condition "project" "$project")"
     fi
 
     eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at, origin_agent
@@ -198,8 +196,7 @@ eagle_search_agent_plans() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="AND p.project = '$project'"
+        where_clause="AND $(eagle_sql_project_scope_condition "p.project" "$project")"
     fi
 
     eagle_db "SELECT p.title, p.project,
@@ -219,8 +216,7 @@ eagle_list_agent_plans() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="WHERE project = '$project'"
+        where_clause="WHERE $(eagle_sql_project_scope_condition "project" "$project")"
     fi
 
     eagle_db "SELECT title, project, file_path, updated_at, origin_agent
@@ -303,8 +299,7 @@ eagle_list_agent_tasks() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="WHERE project = '$project'"
+        where_clause="WHERE $(eagle_sql_project_scope_condition "project" "$project")"
     fi
 
     eagle_db "SELECT subject, status, source_session_id, source_task_id, updated_at, origin_agent
@@ -326,8 +321,7 @@ eagle_search_agent_tasks() {
 
     local where_clause=""
     if [ -n "$project" ]; then
-        project=$(eagle_sql_escape "$project")
-        where_clause="AND t.project = '$project'"
+        where_clause="AND $(eagle_sql_project_scope_condition "t.project" "$project")"
     fi
 
     eagle_db "SELECT t.subject, t.status,

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/package.json

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

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}