eagle-mem 4.9.6 → 4.9.8

package/scripts/statusline-em.sh

@@ -1,35 +1,80 @@
 #!/usr/bin/env bash
-# Eagle Mem statusline section — outputs a single formatted section
-# Called by the user's statusline command to append Eagle Mem stats.
-# Usage: source this script OR call eagle_mem_statusline "$project_dir"
+# Eagle Mem statusline renderers.
+# Usage:
+#   source this file and call eagle_mem_statusline "$project_dir" "$session_id" "$input"
+#   printf '%s' "$input" | bash ~/.eagle-mem/scripts/statusline-em.sh --hud
 
-eagle_mem_statusline() {
+_eagle_statusline_load_common() {
+    local script_dir
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    . "$script_dir/../lib/common.sh"
+}
+
+_eagle_statusline_relative_time() {
+    local raw="${1:-}"
+    [ -n "$raw" ] && [ "$raw" != "never" ] || { printf 'never\n'; return; }
+
+    local last_epoch now_epoch diff_sec
+    last_epoch=$(date -j -u -f "%Y-%m-%dT%H:%M:%S" "${raw%%.*}" "+%s" 2>/dev/null \
+        || date -u -d "$raw" "+%s" 2>/dev/null \
+        || true)
+    now_epoch=$(date "+%s" 2>/dev/null || true)
+    if [ -z "$last_epoch" ] || [ -z "$now_epoch" ]; then
+        printf '%s\n' "$raw"
+        return
+    fi
+
+    diff_sec=$((now_epoch - last_epoch))
+    if [ "$diff_sec" -lt 60 ]; then
+        printf 'just now\n'
+    elif [ "$diff_sec" -lt 3600 ]; then
+        printf '%sm ago\n' "$((diff_sec / 60))"
+    elif [ "$diff_sec" -lt 86400 ]; then
+        printf '%sh ago\n' "$((diff_sec / 3600))"
+    else
+        printf '%sd ago\n' "$((diff_sec / 86400))"
+    fi
+}
+
+eagle_mem_statusline_stats() {
     local project_dir="${1:-}"
     local session_id="${2:-}"
     local statusline_input="${3:-}"
+    local current_dir="${4:-}"
     local em_db="$HOME/.eagle-mem/memory.db"
     [ -f "$em_db" ] || return
 
-    local SCRIPT_DIR; SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-    . "$SCRIPT_DIR/../lib/common.sh"
+    _eagle_statusline_load_common
+
     local sqlite_bin
     sqlite_bin=$(eagle_sqlite_path)
     [ -n "$sqlite_bin" ] || return
 
-    local proj
+    if [ -n "$statusline_input" ]; then
+        [ -z "$session_id" ] && session_id=$(printf '%s' "$statusline_input" | jq -r '.session_id // .session.id // empty' 2>/dev/null)
+        [ -z "$project_dir" ] && project_dir=$(printf '%s' "$statusline_input" | jq -r '.workspace.project_dir // .workspace.current_dir // .cwd // empty' 2>/dev/null)
+        [ -z "$current_dir" ] && current_dir=$(printf '%s' "$statusline_input" | jq -r '.workspace.current_dir // .cwd // empty' 2>/dev/null)
+    fi
     [ -z "$project_dir" ] && project_dir="$(pwd)"
-    proj=$(eagle_project_from_statusline_input "$statusline_input" "$project_dir" "$project_dir" "$session_id")
-    [ -z "$proj" ] && return
+    [ -z "$current_dir" ] && current_dir="$project_dir"
 
-    proj=$(eagle_sql_escape "$proj")
+    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_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_condition) || '|' ||
+        COALESCE(MAX(COALESCE(last_activity_at, started_at)), 'never')
+        FROM sessions
+        WHERE $project_condition;" 2>/dev/null)
+    IFS='|' read -r sessions memories last_raw <<< "${stats:-0|0|never}"
+    sessions=${sessions:-0}
+    memories=${memories:-0}
+    last_raw=${last_raw:-never}
 
-    local version cnt mem turns
-    version=$(tr -d '[:space:]' < "$HOME/.eagle-mem/.version" 2>/dev/null)
-    [ -z "$version" ] && version="?"
-    cnt=$(echo ".headers off
-SELECT COUNT(*) FROM sessions WHERE project = '${proj}';" | "$sqlite_bin" "$em_db" 2>/dev/null | tr -d '[:space:]')
-    mem=$(echo ".headers off
-SELECT COUNT(*) FROM agent_memories WHERE project = '${proj}';" | "$sqlite_bin" "$em_db" 2>/dev/null | tr -d '[:space:]')
     if [ -n "$session_id" ] && [ -f "$HOME/.eagle-mem/.turn-counter.${session_id}" ]; then
         turns=$(tr -d '[:space:]' < "$HOME/.eagle-mem/.turn-counter.${session_id}" 2>/dev/null)
     else
@@ -40,26 +85,85 @@ SELECT COUNT(*) FROM agent_memories WHERE project = '${proj}';" | "$sqlite_bin"
             done \
             | awk '($1+0)>max{max=$1+0} END{print max+0}')
     fi
-    cnt=${cnt:-0}; mem=${mem:-0}
     turns=${turns:-0}
 
+    version=$(tr -d '[:space:]' < "$HOME/.eagle-mem/.version" 2>/dev/null)
+    latest=$(tr -d '[:space:]' < "$HOME/.eagle-mem/.latest-version" 2>/dev/null)
+    [ -z "$version" ] && version="?"
+    [ -z "$latest" ] && latest="$version"
+
+    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\n' "$project_key" "$version" "$latest" "$sessions" "$memories" "$turns" "$last_raw"
+}
+
+eagle_mem_statusline() {
+    local stats project_key version latest sessions memories turns last_raw
+    stats=$(eagle_mem_statusline_stats "${1:-}" "${2:-}" "${3:-}" "${4:-}") || return
+    IFS=$'\t' read -r project_key version latest sessions memories turns last_raw <<< "$stats"
+
     local R='\033[0m' CYAN='\033[96m' WHT='\033[97m' DIM='\033[2m'
-    printf "%bEM%b %bv%s%b ses %b%s%b mem %b%s%b turns %b%s%b" \
+    printf "%bEagle%b %bv%s%b | %b%s%b sessions | %b%s%b memories | turn %b%s%b" \
         "$CYAN" "$R" \
         "$WHT" "$version" "$DIM" \
-        "$WHT" "$cnt" "$DIM" \
-        "$WHT" "$mem" "$DIM" \
-        "$WHT" "$turns" "$R"
+        "$WHT" "${sessions:-0}" "$DIM" \
+        "$WHT" "${memories:-0}" "$DIM" \
+        "$WHT" "${turns:-0}" "$R"
+}
+
+eagle_mem_statusline_hud() {
+    local stats project_key version latest sessions memories turns last_raw last_label
+    stats=$(eagle_mem_statusline_stats "${1:-}" "${2:-}" "${3:-}" "${4:-}") || return
+    IFS=$'\t' read -r project_key version latest sessions memories turns last_raw <<< "$stats"
+    last_label=$(_eagle_statusline_relative_time "$last_raw")
+
+    local R='\033[0m' CYAN='\033[96m' WHT='\033[97m' DIM='\033[2m'
+    local GRN='\033[92m' ORG='\033[38;5;214m' RED='\033[91m'
+    local turn_color pressure_label em_ver newest
+
+    turns=${turns:-0}
+    if [ "$turns" -ge 30 ] 2>/dev/null; then
+        turn_color="$RED"; pressure_label="CRITICAL"
+    elif [ "$turns" -ge 20 ] 2>/dev/null; then
+        turn_color="$ORG"; pressure_label="HIGH"
+    else
+        turn_color="$GRN"; pressure_label="OK"
+    fi
+
+    em_ver="v${version:-?}"
+    newest=$(printf '%s\n' "${version:-}" "${latest:-}" | sort -V 2>/dev/null | tail -1 || true)
+    if [ -n "$latest" ] && [ -n "$newest" ] && [ "$newest" != "$version" ]; then
+        em_ver="${em_ver} ${ORG}↑${latest}${R}"
+    elif [ -n "$latest" ] && [ "$latest" = "$version" ]; then
+        em_ver="${em_ver} ${GRN}✓${R}"
+    fi
+
+    printf "%bEagle Mem%b %b %b│%b %bSessions:%b %b%s%b %b│%b %bMemories:%b %b%s%b %b│%b %bTurns:%b %b%s/30%b %b(%s)%b %b│%b %bUpdated:%b %b%s%b" \
+        "$CYAN" "$R" "$em_ver" \
+        "$DIM" "$R" "$DIM" "$R" "$WHT" "${sessions:-0}" "$R" "$DIM" "$R" \
+        "$DIM" "$R" "$WHT" "${memories:-0}" "$R" "$DIM" "$R" \
+        "$DIM" "$R" "$turn_color" "$turns" "$R" "$turn_color" "$pressure_label" "$R" "$DIM" "$R" \
+        "$DIM" "$R" "$WHT" "$last_label" "$R"
 }
 
-# When run directly, read project_dir from stdin JSON (statusline format)
 if [ "${BASH_SOURCE[0]}" = "$0" ]; then
+    mode="${1:-compact}"
     if [ -t 0 ]; then
         input=""
     else
         input=$(cat)
     fi
-    project_dir=$(echo "$input" | jq -r '.workspace.project_dir // .workspace.current_dir // .cwd // empty' 2>/dev/null)
-    session_id=$(echo "$input" | jq -r '.session_id // .session.id // empty' 2>/dev/null)
-    eagle_mem_statusline "${project_dir:-$(pwd)}" "$session_id" "$input"
+    project_dir=$(printf '%s' "$input" | jq -r '.workspace.project_dir // .workspace.current_dir // .cwd // empty' 2>/dev/null)
+    current_dir=$(printf '%s' "$input" | jq -r '.workspace.current_dir // .cwd // empty' 2>/dev/null)
+    session_id=$(printf '%s' "$input" | jq -r '.session_id // .session.id // empty' 2>/dev/null)
+
+    case "$mode" in
+        --hud|hud)
+            eagle_mem_statusline_hud "${project_dir:-$(pwd)}" "$session_id" "$input" "$current_dir"
+            ;;
+        --stats|stats)
+            eagle_mem_statusline_stats "${project_dir:-$(pwd)}" "$session_id" "$input" "$current_dir"
+            ;;
+        *)
+            eagle_mem_statusline "${project_dir:-$(pwd)}" "$session_id" "$input" "$current_dir"
+            ;;
+    esac
 fi

package/scripts/uninstall.sh

@@ -13,12 +13,32 @@ LIB_DIR="$SCRIPTS_DIR/../lib"
 . "$LIB_DIR/codex-hooks.sh"
 
 SETTINGS="$EAGLE_SETTINGS"
+dry_run=false
+
+for arg in "$@"; do
+    case "$arg" in
+        --dry-run|--check)
+            dry_run=true
+            ;;
+        --help|-h)
+            echo "Usage: eagle-mem uninstall [--dry-run]"
+            exit 0
+            ;;
+    esac
+done
 
 eagle_header "Uninstall"
+eagle_uninstall_change_plan
+
+if [ "$dry_run" = true ]; then
+    eagle_footer "Dry run complete. No files changed."
+    exit 0
+fi
 
 # ─── Remove hooks from settings.json ──────────────────────
 
 if [ -f "$SETTINGS" ] && command -v jq &>/dev/null; then
+    settings_backup=$(eagle_backup_user_file "$SETTINGS" 2>/dev/null || true)
     for event in SessionStart Stop PostToolUse PreToolUse SessionEnd UserPromptSubmit; do
         if jq -e ".hooks.${event}" "$SETTINGS" &>/dev/null; then
             tmp=$(mktemp)
@@ -30,16 +50,55 @@ if [ -f "$SETTINGS" ] && command -v jq &>/dev/null; then
     tmp=$(mktemp)
     jq 'if .hooks == {} then del(.hooks) else . end' "$SETTINGS" > "$tmp" && mv "$tmp" "$SETTINGS"
     eagle_ok "Hooks removed from settings.json"
+    [ -n "${settings_backup:-}" ] && eagle_dim "  Backup: $settings_backup"
 else
     eagle_warn "Could not patch settings.json (jq not found or file missing)"
 fi
 
+codex_hooks_backup=""
+if [ -f "$EAGLE_CODEX_HOOKS" ]; then
+    codex_hooks_backup=$(eagle_backup_user_file "$EAGLE_CODEX_HOOKS" 2>/dev/null || true)
+fi
 if eagle_remove_codex_hooks; then
     eagle_ok "Hooks removed from Codex hooks.json"
+    [ -n "$codex_hooks_backup" ] && eagle_dim "  Backup: $codex_hooks_backup"
 else
     eagle_warn "Could not patch Codex hooks.json (jq not found or file missing)"
 fi
 
+# ─── Remove instruction blocks and statusline integration ───
+
+claude_md="$HOME/.claude/CLAUDE.md"
+if [ -f "$claude_md" ] && grep -qF "## Eagle Mem — Persistent Memory" "$claude_md" 2>/dev/null; then
+    claude_md_backup=$(eagle_backup_user_file "$claude_md" 2>/dev/null || true)
+    if eagle_remove_marked_markdown_section "$claude_md"; then
+        eagle_ok "Eagle Mem block removed from Claude CLAUDE.md"
+        [ -n "${claude_md_backup:-}" ] && eagle_dim "  Backup: $claude_md_backup"
+    else
+        eagle_warn "Could not remove Eagle Mem block from Claude CLAUDE.md"
+    fi
+else
+    eagle_info "Claude CLAUDE.md block not present"
+fi
+
+if [ -f "$EAGLE_CODEX_AGENTS_MD" ] && grep -qF "## Eagle Mem — Persistent Memory" "$EAGLE_CODEX_AGENTS_MD" 2>/dev/null; then
+    codex_agents_backup=$(eagle_backup_user_file "$EAGLE_CODEX_AGENTS_MD" 2>/dev/null || true)
+    if eagle_remove_marked_markdown_section "$EAGLE_CODEX_AGENTS_MD"; then
+        eagle_ok "Eagle Mem block removed from Codex AGENTS.md"
+        [ -n "${codex_agents_backup:-}" ] && eagle_dim "  Backup: $codex_agents_backup"
+    else
+        eagle_warn "Could not remove Eagle Mem block from Codex AGENTS.md"
+    fi
+else
+    eagle_info "Codex AGENTS.md block not present"
+fi
+
+if eagle_remove_statusline_integration "$SETTINGS"; then
+    eagle_ok "Eagle Mem statusline integration removed"
+else
+    eagle_info "Statusline integration not present or not auto-removable"
+fi
+
 # ─── Remove skill symlinks ────────────────────────────────
 
 if [ -d "$EAGLE_SKILLS_DIR" ]; then
@@ -50,6 +109,14 @@ if [ -d "$EAGLE_SKILLS_DIR" ]; then
     done
 fi
 
+if [ -d "$EAGLE_CODEX_SKILLS_DIR" ]; then
+    for target in "$EAGLE_CODEX_SKILLS_DIR"/eagle-mem-*; do
+        [ -L "$target" ] || [ -d "$target" ] || continue
+        rm -rf "$target"
+        eagle_ok "Codex skill removed: $(basename "$target")"
+    done
+fi
+
 # ─── Optionally wipe data ─────────────────────────────────
 
 if [ -d "$EAGLE_MEM_DIR" ]; then

package/scripts/update.sh

@@ -40,6 +40,8 @@ if [ -d "$EAGLE_CODEX_DIR" ] || command -v codex &>/dev/null; then
     codex_found=true
 fi
 
+eagle_runtime_change_plan "update" "$PACKAGE_DIR" "$claude_found" "$codex_found"
+
 # ─── Update files ──────────────────────────────────────────
 
 mkdir -p "$EAGLE_MEM_DIR"/{hooks,lib,db,scripts}
@@ -195,7 +197,7 @@ eagle_ok "Auto-updates ${DIM}(mode=$(eagle_update_config_mode), allow=$(eagle_up
 
 if [ "$claude_found" = true ]; then
     if eagle_patch_claude_md; then
-        eagle_ok "CLAUDE.md updated ${DIM}(eagle-summary instructions added)${RESET}"
+  eagle_ok "CLAUDE.md updated ${DIM}(Eagle Mem guidance refreshed)${RESET}"
     else
         eagle_ok "CLAUDE.md up to date"
     fi
@@ -214,5 +216,10 @@ fi
 version=$(jq -r .version "$PACKAGE_DIR/package.json" 2>/dev/null || echo "unknown")
 echo "$version" > "$EAGLE_MEM_DIR/.version"
 echo "$version" > "$EAGLE_MEM_DIR/.latest-version"
+if eagle_runtime_manifest_write "$PACKAGE_DIR" "update"; then
+    eagle_ok "Install manifest refreshed"
+else
+    eagle_warn "Install manifest could not be refreshed"
+fi
 
 eagle_footer "Eagle Mem updated to v${version}."