eagle-mem 4.9.6 → 4.9.8

package/lib/db-mirrors.sh

@@ -82,8 +82,7 @@ WHERE file_path = '$fp_sql'
 UPDATE agent_memories
 SET origin_session_id = COALESCE(NULLIF('$origin_sql', ''), origin_session_id),
     origin_agent      = COALESCE(NULLIF('$agent_sql', ''), origin_agent),
-    project           = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END,
-    updated_at        = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+    project           = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END
 WHERE file_path = '$fp_sql'
   AND content_hash = '$hash_sql'
   AND (('$proj_sql' != '' AND project != '$proj_sql')
@@ -104,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,
@@ -125,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
@@ -178,8 +175,7 @@ WHERE file_path = '$fp_sql'
 UPDATE agent_plans
 SET origin_session_id = COALESCE(NULLIF('$origin_sql', ''), origin_session_id),
     origin_agent      = COALESCE(NULLIF('$agent_sql', ''), origin_agent),
-    project           = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END,
-    updated_at        = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+    project           = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END
 WHERE file_path = '$fp_sql'
   AND content_hash = '$hash_sql'
   AND (('$proj_sql' != '' AND project != '$proj_sql')
@@ -200,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,
@@ -221,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
@@ -291,8 +285,7 @@ WHERE file_path = '$fp_sql'
 
 UPDATE agent_tasks
 SET origin_agent  = COALESCE(NULLIF('$agent_sql', ''), origin_agent),
-    project       = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END,
-    updated_at    = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+    project       = CASE WHEN '$proj_sql' != '' THEN '$proj_sql' ELSE project END
 WHERE file_path = '$fp_sql'
   AND content_hash = '$hash_sql'
   AND (('$proj_sql' != '' AND project != '$proj_sql')
@@ -306,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
@@ -329,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
@@ -89,8 +92,17 @@ eagle_search_summaries() {
               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>%'
+              AND COALESCE(s.request, '') NOT LIKE '<subagent_notification>%'
+              AND COALESCE(s.request, '') NOT LIKE '</subagent_notification>%'
               $where_clause
-              ORDER BY rank
+              ORDER BY
+                CASE
+                  WHEN julianday('now') - julianday(s.created_at) <= 14 THEN 0
+                  WHEN julianday('now') - julianday(s.created_at) <= 45 THEN 1
+                  ELSE 2
+                END,
+                s.created_at DESC,
+                rank
               LIMIT $limit;"
 }
 

package/lib/hooks-posttool.sh

@@ -60,6 +60,7 @@ eagle_posttool_mirror_tasks() {
 
 eagle_posttool_stale_hint() {
     local tool_name="$1" fp="$2" project="$3"
+    local agent="${4:-$(eagle_agent_source)}"
 
     case "$tool_name" in
         Write|Edit|apply_patch)
@@ -77,9 +78,16 @@ eagle_posttool_stale_hint() {
                                 local stale_hit
                                 stale_hit=$(eagle_search_stale_memories "$project" "$fts_query")
                                 if [ -n "$stale_hit" ]; then
-                                    local stale_msg="=== Eagle Mem: Memory Check ===
+                                    local stale_msg
+                                    if [ "$agent" = "codex" ]; then
+                                        stale_msg="Eagle Mem memory check:
+- Memory '${stale_hit}' may reference '${fname}'.
+- If this edit contradicts that memory, update or correct the memory before relying on it."
+                                    else
+                                        stale_msg="=== Eagle Mem: Memory Check ===
 Memory '${stale_hit}' may reference '${fname}'. If your edit contradicts it, update the memory.
 ================"
+                                    fi
                                     jq -nc --arg ctx "$stale_msg" '{"hookSpecificOutput":{"hookEventName":"PostToolUse","additionalContext":$ctx}}'
                                 fi
                             fi
@@ -93,6 +101,7 @@ Memory '${stale_hit}' may reference '${fname}'. If your edit contradicts it, upd
 
 eagle_posttool_decision_surface() {
     local tool_name="$1" fp="$2" project="$3"
+    local agent="${4:-$(eagle_agent_source)}"
 
     case "$tool_name" in
         Read)
@@ -110,10 +119,17 @@ eagle_posttool_decision_surface() {
                                 local decision_hit
                                 decision_hit=$(eagle_search_decisions_for_file "$project" "$fts_query")
                                 if [ -n "$decision_hit" ]; then
-                                    read_context+="=== Eagle Mem: Decision Recall ===
+                                    if [ "$agent" = "codex" ]; then
+                                        read_context+="Eagle Mem decision recall:
+- ${fname}: ${decision_hit}
+- Do not revert without explicit user request.
+"
+                                    else
+                                        read_context+="=== Eagle Mem: Decision Recall ===
 ${fname}: ${decision_hit} — Do not revert without explicit user request.
 ================
 "
+                                    fi
                                 fi
                             fi
                         fi
@@ -123,17 +139,35 @@ ${fname}: ${decision_hit} — Do not revert without explicit user request.
                         if [ -n "$feature_hit" ]; then
                             while IFS='|' read -r feat_name feat_desc feat_verified _role feat_deps feat_other_files feat_smoke; do
                                 [ -z "$feat_name" ] && continue
-                                read_context+="=== Eagle Mem: Feature Guardrail ===
+                                if [ "$agent" = "codex" ]; then
+                                    read_context+="Eagle Mem feature guardrail:
+- '${fname}' is part of '${feat_name}'"
+                                    [ -n "$feat_desc" ] && read_context+=": ${feat_desc}"
+                                    read_context+=".
+"
+                                    [ -n "$feat_verified" ] && read_context+="- Last verified: ${feat_verified}.
+"
+                                    [ -n "$feat_deps" ] && read_context+="- Dependencies: ${feat_deps}.
+"
+                                    [ -n "$feat_other_files" ] && read_context+="- Related files: ${feat_other_files}.
+"
+                                    [ -n "$feat_smoke" ] && read_context+="- Smoke tests: ${feat_smoke}.
+"
+                                    read_context+="- Retest after changes before release.
+"
+                                else
+                                    read_context+="=== Eagle Mem: Feature Guardrail ===
 '${fname}' is part of feature '${feat_name}'"
-                                [ -n "$feat_desc" ] && read_context+=" ($feat_desc)"
-                                read_context+="."
-                                [ -n "$feat_verified" ] && read_context+=" Last verified: ${feat_verified}."
-                                [ -n "$feat_deps" ] && read_context+=" Dependencies: ${feat_deps}."
-                                [ -n "$feat_other_files" ] && read_context+=" Other files in pipeline: ${feat_other_files}."
-                                [ -n "$feat_smoke" ] && read_context+=" Smoke tests: ${feat_smoke}."
-                                read_context+=" Changes require re-testing after deploy.
+                                    [ -n "$feat_desc" ] && read_context+=" ($feat_desc)"
+                                    read_context+="."
+                                    [ -n "$feat_verified" ] && read_context+=" Last verified: ${feat_verified}."
+                                    [ -n "$feat_deps" ] && read_context+=" Dependencies: ${feat_deps}."
+                                    [ -n "$feat_other_files" ] && read_context+=" Other files in pipeline: ${feat_other_files}."
+                                    [ -n "$feat_smoke" ] && read_context+=" Smoke tests: ${feat_smoke}."
+                                    read_context+=" Changes require re-testing after deploy.
 ================
 "
+                                fi
                             done <<< "$feature_hit"
                         fi
 

package/lib/updater.sh

@@ -185,6 +185,12 @@ eagle_update_backup_runtime() {
         fi
     done
 
+    for item in .version .latest-version config.toml install-manifest.json .last-update.json; do
+        if [ -f "$EAGLE_MEM_DIR/$item" ]; then
+            cp "$EAGLE_MEM_DIR/$item" "$backup_dir/$item" 2>/dev/null || true
+        fi
+    done
+
     if [ -f "$EAGLE_MEM_DB" ]; then
         local sqlite_bin
         sqlite_bin=$(eagle_sqlite_path)
@@ -205,6 +211,12 @@ eagle_update_restore_runtime() {
         fi
     done
 
+    for item in .version .latest-version config.toml install-manifest.json .last-update.json; do
+        if [ -f "$backup_dir/$item" ]; then
+            cp "$backup_dir/$item" "$EAGLE_MEM_DIR/$item" 2>/dev/null || true
+        fi
+    done
+
     if [ -f "$backup_dir/memory.db" ]; then
         cp "$backup_dir/memory.db" "$EAGLE_MEM_DB" 2>/dev/null || true
     fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eagle-mem",
-  "version": "4.9.6",
+  "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"
@@ -11,7 +11,9 @@
     "hooks/",
     "lib/",
     "db/",
-    "skills/"
+    "skills/",
+    "docs/",
+    "architecture.html"
   ],
   "keywords": [
     "claude-code",

package/scripts/doctor.sh

@@ -0,0 +1,262 @@
+#!/usr/bin/env bash
+# ═══════════════════════════════════════════════════════════
+# Eagle Mem — Doctor
+# Read-only trust and install footprint checks.
+# ═══════════════════════════════════════════════════════════
+set -euo pipefail
+
+PACKAGE_DIR="${1:-.}"
+shift 2>/dev/null || true
+
+SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd)"
+LIB_DIR="$SCRIPTS_DIR/../lib"
+
+. "$SCRIPTS_DIR/style.sh"
+. "$LIB_DIR/common.sh"
+
+mode="install-footprint"
+json_output=false
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --json|-j) json_output=true; shift ;;
+        --help|-h)
+            echo -e "  ${BOLD}eagle-mem doctor${RESET} — Trust and install diagnostics"
+            echo ""
+            echo -e "  ${BOLD}Usage:${RESET}"
+            echo -e "    eagle-mem doctor"
+            echo -e "    eagle-mem doctor install-footprint"
+            echo ""
+            echo -e "  ${BOLD}Options:${RESET}"
+            echo -e "    ${CYAN}-j, --json${RESET}  Output structured JSON"
+            exit 0
+            ;;
+        install-footprint|footprint)
+            mode="$1"
+            shift
+            ;;
+        *) shift ;;
+    esac
+done
+
+case "$mode" in
+    install-footprint|footprint|"") ;;
+    *)
+        eagle_err "Unknown doctor check: $mode"
+        eagle_dim "Run: eagle-mem doctor --help"
+        exit 1
+        ;;
+esac
+
+package_version=$(jq -r .version "$PACKAGE_DIR/package.json" 2>/dev/null || echo "unknown")
+installed_version=$(tr -d '[:space:]' < "$EAGLE_MEM_DIR/.version" 2>/dev/null || true)
+[ -z "$installed_version" ] && installed_version="not installed"
+
+sqlite_bin=$(eagle_sqlite_path)
+sqlite_version=$(eagle_sqlite_version)
+sqlite_fts5=false
+if eagle_sqlite_supports_fts5; then
+    sqlite_fts5=true
+fi
+
+runtime_exists=false
+db_exists=false
+[ -d "$EAGLE_MEM_DIR" ] && runtime_exists=true
+[ -f "$EAGLE_MEM_DB" ] && db_exists=true
+
+doctor_compare_group() {
+    local group="$1"
+    local checked=0 missing=0 drift=0
+    local src dst
+    for src in "$PACKAGE_DIR/$group"/*; do
+        [ -f "$src" ] || continue
+        case "$group" in
+            db) ;;
+            *)
+                case "$src" in
+                    *.sh|*/eagle-mem) ;;
+                    *) continue ;;
+                esac
+                ;;
+        esac
+        checked=$((checked + 1))
+        dst="$EAGLE_MEM_DIR/$group/$(basename "$src")"
+        if [ ! -f "$dst" ]; then
+            missing=$((missing + 1))
+        elif ! cmp -s "$src" "$dst"; then
+            drift=$((drift + 1))
+        fi
+    done
+    printf '%s|%s|%s\n' "$checked" "$missing" "$drift"
+}
+
+hooks_cmp=$(doctor_compare_group hooks)
+lib_cmp=$(doctor_compare_group lib)
+db_cmp=$(doctor_compare_group db)
+scripts_cmp=$(doctor_compare_group scripts)
+manifest_path=$(eagle_runtime_manifest_path)
+manifest_check=$(eagle_runtime_manifest_check)
+manifest_status="${manifest_check%%|*}"
+manifest_checked=$(printf '%s' "$manifest_check" | cut -d'|' -f2)
+manifest_missing=$(printf '%s' "$manifest_check" | cut -d'|' -f3)
+manifest_drift=$(printf '%s' "$manifest_check" | cut -d'|' -f4)
+manifest_version=$(eagle_runtime_manifest_field '.package.version' 2>/dev/null || true)
+manifest_action=$(eagle_runtime_manifest_field '.action' 2>/dev/null || true)
+manifest_generated_at=$(eagle_runtime_manifest_field '.generated_at' 2>/dev/null || true)
+manifest_package_dir=$(eagle_runtime_manifest_field '.package.dir' 2>/dev/null || true)
+
+sum_missing=0
+sum_drift=0
+for row in "$hooks_cmp" "$lib_cmp" "$db_cmp" "$scripts_cmp"; do
+    IFS='|' read -r _checked missing drift <<< "$row"
+    sum_missing=$((sum_missing + missing))
+    sum_drift=$((sum_drift + drift))
+done
+
+claude_hooks="not found"
+if [ -f "$EAGLE_SETTINGS" ] && command -v jq >/dev/null 2>&1; then
+    if jq -e '.. | objects | .command? // empty | select(test("eagle-mem|\\.eagle-mem"))' "$EAGLE_SETTINGS" >/dev/null 2>&1; then
+        claude_hooks="registered"
+    else
+        claude_hooks="not registered"
+    fi
+fi
+
+codex_hooks="not found"
+if [ -f "$EAGLE_CODEX_HOOKS" ] && command -v jq >/dev/null 2>&1; then
+    if jq -e '.. | objects | .command? // empty | select(test("eagle-mem|\\.eagle-mem"))' "$EAGLE_CODEX_HOOKS" >/dev/null 2>&1; then
+        codex_hooks="registered"
+    else
+        codex_hooks="not registered"
+    fi
+fi
+
+statusline_state="not configured"
+statusline_command=""
+if [ -f "$EAGLE_SETTINGS" ] && command -v jq >/dev/null 2>&1; then
+    statusline_command=$(jq -r '.statusLine.command // .statusline.command // empty' "$EAGLE_SETTINGS" 2>/dev/null)
+    if [ -n "$statusline_command" ]; then
+        if printf '%s' "$statusline_command" | grep -qE 'eagle-mem|\.eagle-mem'; then
+            statusline_state="registered"
+        else
+            sl_file=$(eagle_statusline_script_from_command "$statusline_command" 2>/dev/null || true)
+            if [ -n "$sl_file" ] && grep -qE 'eagle_mem_statusline|\.eagle-mem/scripts/statusline-em' "$sl_file" 2>/dev/null; then
+                statusline_state="registered"
+            else
+                statusline_state="custom"
+            fi
+        fi
+    fi
+fi
+
+overall="Healthy"
+if [ "$runtime_exists" != true ] || [ "$db_exists" != true ]; then
+    overall="Not installed"
+elif [ "$sqlite_fts5" != true ] || [ "$sum_missing" -gt 0 ] || [ "$sum_drift" -gt 0 ] || [ "$manifest_status" != "ok" ]; then
+    overall="Needs attention"
+fi
+
+if [ "$json_output" = true ]; then
+    jq -nc \
+        --arg overall "$overall" \
+        --arg package_dir "$PACKAGE_DIR" \
+        --arg runtime_dir "$EAGLE_MEM_DIR" \
+        --arg db "$EAGLE_MEM_DB" \
+        --arg package_version "$package_version" \
+        --arg installed_version "$installed_version" \
+        --arg sqlite_bin "${sqlite_bin:-}" \
+        --arg sqlite_version "${sqlite_version:-}" \
+        --argjson sqlite_fts5 "$sqlite_fts5" \
+        --arg claude_hooks "$claude_hooks" \
+        --arg codex_hooks "$codex_hooks" \
+        --arg statusline "$statusline_state" \
+        --arg hooks_cmp "$hooks_cmp" \
+        --arg lib_cmp "$lib_cmp" \
+        --arg db_cmp "$db_cmp" \
+        --arg scripts_cmp "$scripts_cmp" \
+        --arg manifest_path "$manifest_path" \
+        --arg manifest_status "$manifest_status" \
+        --argjson manifest_checked "${manifest_checked:-0}" \
+        --argjson manifest_missing "${manifest_missing:-0}" \
+        --argjson manifest_drift "${manifest_drift:-0}" \
+        --arg manifest_version "${manifest_version:-}" \
+        --arg manifest_action "${manifest_action:-}" \
+        --arg manifest_generated_at "${manifest_generated_at:-}" \
+        --arg manifest_package_dir "${manifest_package_dir:-}" \
+        '{overall:$overall, package_dir:$package_dir, runtime_dir:$runtime_dir, db:$db,
+          versions:{package:$package_version, installed:$installed_version},
+          sqlite:{path:$sqlite_bin, version:$sqlite_version, fts5:$sqlite_fts5},
+          hooks:{claude:$claude_hooks, codex:$codex_hooks, statusline:$statusline},
+          runtime_drift:{hooks:$hooks_cmp, lib:$lib_cmp, db:$db_cmp, scripts:$scripts_cmp},
+          manifest:{path:$manifest_path, status:$manifest_status, checked:$manifest_checked,
+                    missing:$manifest_missing, drift:$manifest_drift, version:$manifest_version,
+                    action:$manifest_action, generated_at:$manifest_generated_at,
+                    package_dir:$manifest_package_dir}}'
+    exit 0
+fi
+
+eagle_header "Doctor"
+echo -e "  ${BOLD}Overall:${RESET} $overall"
+echo ""
+echo -e "  ${BOLD}Install footprint${RESET}"
+eagle_kv "Package:" "$PACKAGE_DIR"
+eagle_kv "Runtime:" "$EAGLE_MEM_DIR"
+eagle_kv "Database:" "$EAGLE_MEM_DB"
+eagle_kv "Version:" "package $package_version, installed $installed_version"
+echo ""
+
+echo -e "  ${BOLD}SQLite${RESET}"
+if [ -n "$sqlite_bin" ]; then
+    eagle_kv "Binary:" "$sqlite_bin"
+    eagle_kv "Version:" "${sqlite_version:-unknown}"
+    if [ "$sqlite_fts5" = true ]; then
+        eagle_ok "FTS5 available"
+    else
+        eagle_fail "FTS5 unavailable"
+    fi
+else
+    eagle_fail "SQLite not found"
+fi
+echo ""
+
+echo -e "  ${BOLD}Hooks${RESET}"
+eagle_kv "Claude Code:" "$claude_hooks"
+eagle_kv "Codex:" "$codex_hooks"
+eagle_kv "Statusline:" "$statusline_state"
+echo ""
+
+echo -e "  ${BOLD}Install manifest${RESET}"
+eagle_kv "Path:" "$manifest_path"
+if [ "$manifest_status" = "ok" ]; then
+    eagle_ok "${manifest_checked:-0} files match manifest"
+else
+    eagle_warn "status=$manifest_status, checked=${manifest_checked:-0}, missing=${manifest_missing:-0}, drift=${manifest_drift:-0}"
+fi
+[ -n "$manifest_version" ] && eagle_kv "Version:" "$manifest_version"
+[ -n "$manifest_action" ] && eagle_kv "Action:" "$manifest_action"
+[ -n "$manifest_generated_at" ] && eagle_kv "Generated:" "$manifest_generated_at"
+echo ""
+
+echo -e "  ${BOLD}Runtime drift${RESET}"
+for label_row in "hooks:$hooks_cmp" "lib:$lib_cmp" "db:$db_cmp" "scripts:$scripts_cmp"; do
+    label="${label_row%%:*}"
+    row="${label_row#*:}"
+    IFS='|' read -r checked missing drift <<< "$row"
+    if [ "$missing" -eq 0 ] && [ "$drift" -eq 0 ] 2>/dev/null; then
+        eagle_ok "$label: $checked checked, no drift"
+    else
+        eagle_warn "$label: $checked checked, $missing missing, $drift drifted"
+    fi
+done
+echo ""
+
+echo -e "  ${BOLD}Next${RESET}"
+if [ "$overall" = "Healthy" ]; then
+    eagle_ok "Installed runtime matches this package."
+else
+    [ "$runtime_exists" != true ] && eagle_info "Run: eagle-mem install"
+    [ "$manifest_status" != "ok" ] && eagle_info "Run: eagle-mem update to refresh the install manifest."
+    [ "$sum_missing" -gt 0 ] || [ "$sum_drift" -gt 0 ] && eagle_info "Run: eagle-mem update"
+    [ "$sqlite_fts5" != true ] && eagle_info "Set EAGLE_SQLITE_BIN to an FTS5-capable sqlite3."
+fi
+echo ""