eagle-mem 4.6.2 → 4.7.1

package/lib/hooks-posttool.sh

@@ -8,9 +8,10 @@ _EAGLE_HOOKS_POSTTOOL_LOADED=1
 
 eagle_posttool_mirror_writes() {
     local tool_name="$1" fp="$2" session_id="$3" project="$4"
+    local agent="${5:-$(eagle_agent_source)}"
 
     case "$tool_name" in
-        Write|Edit)
+        Write|Edit|apply_patch)
             if [ -n "$fp" ]; then
                 case "$fp" in
                     *..*) ;; # path traversal — skip
@@ -18,12 +19,12 @@ eagle_posttool_mirror_writes() {
                         local mem_base
                         mem_base=$(basename "$fp")
                         if [ "$mem_base" != "MEMORY.md" ] && [ -f "$fp" ]; then
-                            eagle_capture_claude_memory "$fp" "$session_id" "$project"
+                            eagle_capture_agent_memory "$fp" "$session_id" "$project" "$agent"
                         fi
                         ;;
                     "$EAGLE_CLAUDE_PLANS_DIR/"*.md)
                         if [ -f "$fp" ]; then
-                            eagle_capture_claude_plan "$fp" "$session_id" "$project"
+                            eagle_capture_agent_plan "$fp" "$session_id" "$project" "$agent"
                         fi
                         ;;
                 esac
@@ -34,6 +35,7 @@ eagle_posttool_mirror_writes() {
 
 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)
@@ -45,10 +47,10 @@ eagle_posttool_mirror_tasks() {
                     if [ -z "$task_id" ]; then
                         local newest
                         newest=$(ls -t "$task_dir"/*.json 2>/dev/null | head -1)
-                        [ -n "$newest" ] && [ -f "$newest" ] && eagle_capture_claude_task "$newest" "$session_id" "$project"
+                        [ -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_claude_task "$task_json" "$session_id" "$project"
+                        [ -f "$task_json" ] && eagle_capture_agent_task "$task_json" "$session_id" "$project" "$agent"
                     fi
                 fi
             fi
@@ -60,7 +62,7 @@ eagle_posttool_stale_hint() {
     local tool_name="$1" fp="$2" project="$3"
 
     case "$tool_name" in
-        Write|Edit)
+        Write|Edit|apply_patch)
             if [ -n "$fp" ]; then
                 local fname fname_stem
                 fname=$(basename "$fp")

package/lib/provider.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ═══════════════════════════════════════════════════════════
 # Eagle Mem — LLM Provider Abstraction
-# Config parsing + unified eagle_llm_call for Ollama/Anthropic/OpenAI
+# Config parsing + unified eagle_llm_call for Ollama/agent CLI/API providers
 # ═══════════════════════════════════════════════════════════
 
 EAGLE_CONFIG_FILE="${EAGLE_MEM_DIR}/config.toml"
@@ -121,12 +121,17 @@ eagle_config_init() {
     local ollama_url="$EAGLE_DEFAULT_OLLAMA_URL"
     local provider="none"
     local model=""
+    local ollama_model="mistral"
 
     local ollama_response
     ollama_response=$(eagle_detect_ollama "$ollama_url")
     if [ -n "$ollama_response" ]; then
         provider="ollama"
         model=$(eagle_ollama_best_model "$ollama_url")
+        ollama_model="$model"
+    elif command -v codex &>/dev/null || command -v claude &>/dev/null; then
+        provider="agent_cli"
+        model="native"
     elif [ -n "${ANTHROPIC_API_KEY:-}" ]; then
         provider="anthropic"
         model="claude-haiku-4-5-20251001"
@@ -144,12 +149,20 @@ eagle_config_init() {
 
 [provider]
 # Which LLM provider to use for the curator and analysis features
-# Options: "ollama" (free, local), "anthropic", "openai"
+# Options: "ollama" (free, local), "agent_cli" (Codex/Claude CLI auth), "anthropic", "openai"
 type = "$provider"
 
 [ollama]
 url = "$ollama_url"
-model = "${model:-mistral}"
+model = "$ollama_model"
+
+[agent_cli]
+# Uses the already-installed Codex/Claude CLI instead of direct API keys.
+# preferred = "current" uses EAGLE_AGENT_SOURCE when hooks invoke Eagle Mem.
+# If run manually with no agent source, it prefers Codex when available.
+preferred = "current"
+codex_model = ""
+claude_model = ""
 
 [anthropic]
 # Uses ANTHROPIC_API_KEY env var for authentication
@@ -184,6 +197,7 @@ eagle_llm_call() {
 
     case "$provider" in
         ollama)   _eagle_call_ollama "$prompt" "$system_prompt" "$max_tokens" ;;
+        agent_cli) _eagle_call_agent_cli "$prompt" "$system_prompt" "$max_tokens" ;;
         anthropic) _eagle_call_anthropic "$prompt" "$system_prompt" "$max_tokens" ;;
         openai)   _eagle_call_openai "$prompt" "$system_prompt" "$max_tokens" ;;
         none)
@@ -235,6 +249,170 @@ _eagle_call_ollama() {
     echo "$response" | jq -r '.message.content // empty'
 }
 
+_eagle_agent_cli_target() {
+    local preferred
+    preferred=$(eagle_config_get "agent_cli" "preferred" "current")
+
+    case "$preferred" in
+        codex|openai-codex) echo "codex"; return 0 ;;
+        claude|claude-code|cloud-code) echo "claude-code"; return 0 ;;
+        auto)
+            if [ -n "${EAGLE_AGENT_SOURCE:-${EAGLE_AGENT:-}}" ]; then
+                eagle_agent_source
+            elif command -v codex &>/dev/null; then
+                echo "codex"
+            elif command -v claude &>/dev/null; then
+                echo "claude-code"
+            else
+                echo "none"
+            fi
+            ;;
+        current|*)
+            if [ -n "${EAGLE_AGENT_SOURCE:-${EAGLE_AGENT:-}}" ]; then
+                eagle_agent_source
+            elif command -v codex &>/dev/null; then
+                echo "codex"
+            elif command -v claude &>/dev/null; then
+                echo "claude-code"
+            else
+                echo "none"
+            fi
+            ;;
+    esac
+}
+
+_eagle_agent_cli_prompt_file() {
+    local prompt="$1" system="$2" max_tokens="$3" file="$4"
+    {
+        printf 'System instruction:\n%s\n\n' "$system"
+        printf 'Task:\n%s\n\n' "$prompt"
+        printf 'Output contract:\n'
+        printf -- '- Return only the requested curator text.\n'
+        printf -- '- Do not use markdown fences unless the task explicitly asks for them.\n'
+        printf -- '- Do not edit files, run project commands, or inspect the repository; all needed data is in this prompt.\n'
+        printf -- '- Keep the response within roughly %s tokens.\n' "$max_tokens"
+    } > "$file"
+}
+
+_eagle_call_agent_cli() {
+    local prompt="$1" system="$2" max_tokens="$3"
+    local target
+    target=$(_eagle_agent_cli_target)
+
+    case "$target" in
+        codex) _eagle_call_codex_cli "$prompt" "$system" "$max_tokens" ;;
+        claude-code) _eagle_call_claude_cli "$prompt" "$system" "$max_tokens" ;;
+        *)
+            eagle_log "ERROR" "agent_cli provider unavailable: no Codex or Claude CLI found"
+            return 1
+            ;;
+    esac
+}
+
+_eagle_call_codex_cli() {
+    local prompt="$1" system="$2" max_tokens="$3"
+    command -v codex &>/dev/null || {
+        eagle_log "ERROR" "agent_cli provider selected Codex, but codex command was not found"
+        return 1
+    }
+
+    mkdir -p "$EAGLE_MEM_DIR/tmp"
+    local prompt_file out_file
+    prompt_file=$(mktemp "$EAGLE_MEM_DIR/tmp/codex-provider-prompt.XXXXXX")
+    out_file=$(mktemp "$EAGLE_MEM_DIR/tmp/codex-provider-output.XXXXXX")
+    _eagle_agent_cli_prompt_file "$prompt" "$system" "$max_tokens" "$prompt_file"
+
+    local model
+    model=$(eagle_config_get "agent_cli" "codex_model" "")
+
+    local rc _had_errexit=0
+    case "$-" in *e*) _had_errexit=1; set +e ;; esac
+    if [ -n "$model" ]; then
+        EAGLE_MEM_DISABLE_HOOKS=1 codex exec \
+            --ephemeral \
+            --skip-git-repo-check \
+            --ignore-rules \
+            -c features.codex_hooks=false \
+            --sandbox read-only \
+            --cd "${EAGLE_AGENT_CWD:-$(pwd)}" \
+            --model "$model" \
+            --output-last-message "$out_file" \
+            - < "$prompt_file" >> "$EAGLE_MEM_LOG" 2>&1
+        rc=$?
+    else
+        EAGLE_MEM_DISABLE_HOOKS=1 codex exec \
+            --ephemeral \
+            --skip-git-repo-check \
+            --ignore-rules \
+            -c features.codex_hooks=false \
+            --sandbox read-only \
+            --cd "${EAGLE_AGENT_CWD:-$(pwd)}" \
+            --output-last-message "$out_file" \
+            - < "$prompt_file" >> "$EAGLE_MEM_LOG" 2>&1
+        rc=$?
+    fi
+    [ "$_had_errexit" -eq 1 ] && set -e
+
+    rm -f "$prompt_file"
+    if [ "$rc" -ne 0 ] || [ ! -s "$out_file" ]; then
+        rm -f "$out_file"
+        eagle_log "ERROR" "Codex agent_cli provider call failed"
+        return 1
+    fi
+
+    cat "$out_file"
+    rm -f "$out_file"
+}
+
+_eagle_call_claude_cli() {
+    local prompt="$1" system="$2" max_tokens="$3"
+    command -v claude &>/dev/null || {
+        eagle_log "ERROR" "agent_cli provider selected Claude Code, but claude command was not found"
+        return 1
+    }
+
+    mkdir -p "$EAGLE_MEM_DIR/tmp"
+    local prompt_file out_file model rc
+    prompt_file=$(mktemp "$EAGLE_MEM_DIR/tmp/claude-provider-prompt.XXXXXX")
+    out_file=$(mktemp "$EAGLE_MEM_DIR/tmp/claude-provider-output.XXXXXX")
+    _eagle_agent_cli_prompt_file "$prompt" "$system" "$max_tokens" "$prompt_file"
+    model=$(eagle_config_get "agent_cli" "claude_model" "")
+
+    local _had_errexit=0
+    case "$-" in *e*) _had_errexit=1; set +e ;; esac
+    if [ -n "$model" ]; then
+        EAGLE_MEM_DISABLE_HOOKS=1 CLAUDE_CODE_DISABLE_BACKGROUND_TASKS=1 claude -p \
+            --no-session-persistence \
+            --disable-slash-commands \
+            --permission-mode dontAsk \
+            --tools "" \
+            --output-format text \
+            --model "$model" \
+            "$(cat "$prompt_file")" > "$out_file" 2>> "$EAGLE_MEM_LOG"
+        rc=$?
+    else
+        EAGLE_MEM_DISABLE_HOOKS=1 CLAUDE_CODE_DISABLE_BACKGROUND_TASKS=1 claude -p \
+            --no-session-persistence \
+            --disable-slash-commands \
+            --permission-mode dontAsk \
+            --tools "" \
+            --output-format text \
+            "$(cat "$prompt_file")" > "$out_file" 2>> "$EAGLE_MEM_LOG"
+        rc=$?
+    fi
+    [ "$_had_errexit" -eq 1 ] && set -e
+
+    rm -f "$prompt_file"
+    if [ "$rc" -ne 0 ] || [ ! -s "$out_file" ]; then
+        rm -f "$out_file"
+        eagle_log "ERROR" "Claude agent_cli provider call failed"
+        return 1
+    fi
+
+    cat "$out_file"
+    rm -f "$out_file"
+}
+
 _eagle_call_anthropic() {
     local prompt="$1" system="$2" max_tokens="$3"
     local model api_key
@@ -332,7 +510,11 @@ eagle_show_config() {
 
     local provider model
     provider=$(eagle_config_get "provider" "type" "none")
-    model=$(eagle_config_get "$provider" "model" "unknown")
+    if [ "$provider" = "agent_cli" ]; then
+        model=$(_eagle_agent_cli_target)
+    else
+        model=$(eagle_config_get "$provider" "model" "unknown")
+    fi
 
     echo "Provider: $provider"
     echo "Model:    $model"
@@ -349,6 +531,10 @@ eagle_show_config() {
         else
             echo "Status:   not running"
         fi
+    elif [ "$provider" = "agent_cli" ]; then
+        echo "Preferred: $(eagle_config_get "agent_cli" "preferred" "current")"
+        echo "Codex:     $(command -v codex 2>/dev/null || echo "not found")"
+        echo "Claude:    $(command -v claude 2>/dev/null || echo "not found")"
     fi
 
     echo ""

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eagle-mem",
-  "version": "4.6.2",
-  "description": "Context that survives /compact for Claude Code — SQLite + FTS5, no daemon, no bloat",
+  "version": "4.7.1",
+  "description": "Context that survives /compact for Claude Code and Codex — SQLite + FTS5, no daemon, no bloat",
   "bin": {
     "eagle-mem": "bin/eagle-mem"
   },
@@ -15,6 +15,7 @@
   ],
   "keywords": [
     "claude-code",
+    "codex",
     "memory",
     "sqlite",
     "fts5",
@@ -27,5 +28,8 @@
     "type": "git",
     "url": "git+https://github.com/eagleisbatman/eagle-mem.git"
   },
-  "homepage": "https://github.com/eagleisbatman/eagle-mem#readme"
+  "homepage": "https://eagleisbatman.github.io/eagle-mem/",
+  "bugs": {
+    "url": "https://github.com/eagleisbatman/eagle-mem/issues"
+  }
 }

package/scripts/config.sh

@@ -36,6 +36,8 @@ case "$subcommand" in
             eagle_err "Usage: eagle-mem config set <section.key> <value>"
             eagle_info "Examples:"
             eagle_info "  eagle-mem config set provider.type ollama"
+            eagle_info "  eagle-mem config set provider.type agent_cli"
+            eagle_info "  eagle-mem config set agent_cli.preferred current"
             eagle_info "  eagle-mem config set ollama.model mistral"
             eagle_info "  eagle-mem config set anthropic.model claude-haiku-4-5-20251001"
             exit 1

package/scripts/feature.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ═══════════════════════════════════════════════════════════
 # Eagle Mem — Feature management
-# eagle-mem feature [list|show|verify|add]
+# eagle-mem feature [list|show|verify|pending|waive|add]
 # ═══════════════════════════════════════════════════════════
 set -euo pipefail
 
@@ -59,8 +59,76 @@ case "$subcommand" in
                 *) notes="$1"; shift ;;
             esac
         done
+        fid=$(eagle_get_feature_id "$project" "$name")
+        if [ -z "$fid" ]; then
+            eagle_err "Feature not found: $name"
+            exit 1
+        fi
         eagle_verify_feature "$project" "$name" "$notes"
+        resolved=$(eagle_resolve_pending_feature_verifications "$project" "$name" "verified" "$notes" | tail -1)
         eagle_ok "Feature '$name' marked as verified"
+        if [ "${resolved:-0}" -gt 0 ] 2>/dev/null; then
+            eagle_info "Resolved pending verification records: $resolved"
+        fi
+        ;;
+
+    pending)
+        results=$(eagle_list_pending_feature_verifications "$project" 50)
+        if [ -z "$results" ]; then
+            eagle_ok "No pending feature verifications for '$project'"
+            exit 0
+        fi
+
+        echo -e "  ${BOLD}ID   Feature                        File                         Trigger   Diff${RESET}"
+        echo -e "  ${DIM}──── ────────────────────────────── ──────────────────────────── ───────── ────────────${RESET}"
+        while IFS='|' read -r id feat file reason trigger created smoke fingerprint; do
+            [ -z "$id" ] && continue
+            feat_display="${feat:0:30}"
+            file_display="${file:0:28}"
+            trigger_display="${trigger:-hook}"
+            fingerprint_display="${fingerprint:-unknown}"
+            printf "  %-4s %-30s %-28s %-9s %-12s\n" "$id" "$feat_display" "$file_display" "$trigger_display" "$fingerprint_display"
+            [ -n "$reason" ] && echo -e "       ${DIM}${reason}${RESET}"
+            [ -n "$smoke" ] && echo -e "       ${CYAN}smoke:${RESET} $smoke"
+            [ -n "$created" ] && echo -e "       ${DIM}created: $created${RESET}"
+        done <<< "$results"
+        echo ""
+        eagle_info "Verify after testing: eagle-mem feature verify <name> --notes \"what passed\""
+        eagle_info "Waive intentionally: eagle-mem feature waive <id> --reason \"why safe\""
+        ;;
+
+    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
+        shift
+        reason=""
+        while [ $# -gt 0 ]; do
+            case "$1" in
+                --reason|--notes)
+                    if [ $# -lt 2 ] || [ -z "${2:-}" ]; then
+                        eagle_err "$1 requires a value"
+                        exit 1
+                    fi
+                    reason="$2"
+                    shift 2
+                    ;;
+                *) 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
         ;;
 
     add)
@@ -104,7 +172,7 @@ case "$subcommand" in
 
     *)
         eagle_err "Unknown feature command: $subcommand"
-        eagle_info "Usage: eagle-mem feature [list|show|verify|add]"
+        eagle_info "Usage: eagle-mem feature [list|show|verify|pending|waive|add]"
         exit 1
         ;;
 esac

package/scripts/guard.sh

@@ -55,7 +55,10 @@ case "$subcommand" in
             esac
         done
 
-        eagle_add_guardrail "$project" "$rule" "$file_pattern" "manual"
+        if ! eagle_add_guardrail "$project" "$rule" "$file_pattern" "manual"; then
+            eagle_err "Failed to add guardrail. Check $EAGLE_MEM_LOG for SQLite details."
+            exit 1
+        fi
         eagle_ok "Guardrail added for project: $project"
         if [ -n "$file_pattern" ]; then
             eagle_info "File pattern: $file_pattern"

package/scripts/health.sh

@@ -133,7 +133,11 @@ max_score=$((max_score + 15))
 
 provider=$(eagle_config_get "provider" "type" "none")
 if [ "$provider" != "none" ]; then
-    model=$(eagle_config_get "$provider" "model" "default")
+    if [ "$provider" = "agent_cli" ]; then
+        model=$(_eagle_agent_cli_target)
+    else
+        model=$(eagle_config_get "$provider" "model" "default")
+    fi
     eagle_ok "Provider: ${provider} (${model})"
     score=$((score + 15))
 else

package/scripts/help.sh

@@ -13,7 +13,7 @@ version=$(jq -r .version "$PACKAGE_DIR/package.json" 2>/dev/null || echo "unknow
 eagle_banner
 
 echo -e "  ${BOLD}Eagle Mem${RESET} ${DIM}v${version}${RESET}"
-echo -e "  ${DIM}Context that survives /compact for Claude Code${RESET}"
+echo -e "  ${DIM}Context that survives /compact for Claude Code and Codex${RESET}"
 echo ""
 echo -e "  ${BOLD}Commands:${RESET}"
 echo -e "    ${CYAN}install${RESET}     First-time setup: hooks, database, skills"
@@ -24,10 +24,10 @@ echo -e "    ${CYAN}health${RESET}      Diagnose pipeline health and background
 echo -e "    ${CYAN}config${RESET}      View or change LLM provider settings"
 echo -e "    ${CYAN}guard${RESET}       Manage regression guardrails for files"
 echo -e "    ${CYAN}overview${RESET}    Build or view project overview"
-echo -e "    ${CYAN}memories${RESET}    View/sync Claude Code memories"
+echo -e "    ${CYAN}memories${RESET}    View/sync agent memories"
 echo -e "    ${CYAN}tasks${RESET}       View mirrored tasks"
 echo -e "    ${CYAN}curate${RESET}      Run curator (co-edits, hot files, guardrails)"
-echo -e "    ${CYAN}feature${RESET}     Track and verify features"
+echo -e "    ${CYAN}feature${RESET}     Track, verify, and unblock features"
 echo -e "    ${CYAN}prune${RESET}       Clean old sessions and stale data"
 echo ""
 echo -e "  ${BOLD}Search modes:${RESET}"
@@ -39,11 +39,16 @@ echo -e "    ${DIM}\$${RESET} eagle-mem search --tasks        ${DIM}# in-flight
 echo -e "    ${DIM}\$${RESET} eagle-mem search --files        ${DIM}# hot files${RESET}"
 echo -e "    ${DIM}\$${RESET} eagle-mem search --stats        ${DIM}# project stats${RESET}"
 echo ""
-echo -e "  ${BOLD}Skills${RESET} ${DIM}(inside Claude Code sessions):${RESET}"
-echo -e "    ${CYAN}/eagle-mem-search${RESET}      Search memory and past sessions"
-echo -e "    ${CYAN}/eagle-mem-overview${RESET}    Build or update project overview"
-echo -e "    ${CYAN}/eagle-mem-memories${RESET}    View/sync Claude Code memories"
-echo -e "    ${CYAN}/eagle-mem-tasks${RESET}       TaskAware Compact Loop for multi-step work"
+echo -e "  ${BOLD}Anti-regression:${RESET}"
+echo -e "    ${DIM}\$${RESET} eagle-mem feature pending       ${DIM}# pending release blockers${RESET}"
+echo -e "    ${DIM}\$${RESET} eagle-mem feature verify NAME   ${DIM}# verify current diff after testing${RESET}"
+echo -e "    ${DIM}\$${RESET} eagle-mem feature waive ID      ${DIM}# intentional exception${RESET}"
+echo ""
+echo -e "  ${BOLD}Skills${RESET} ${DIM}(inside Claude Code and Codex sessions):${RESET}"
+echo -e "    ${CYAN}eagle-mem-search${RESET}       Search memory and past sessions"
+echo -e "    ${CYAN}eagle-mem-overview${RESET}     Build or update project overview"
+echo -e "    ${CYAN}eagle-mem-memories${RESET}     View/sync agent memories"
+echo -e "    ${CYAN}eagle-mem-tasks${RESET}        TaskAware Compact Loop for multi-step work"
 echo ""
 echo -e "  ${DIM}Everything else is automatic — scan, index, prune, and${RESET}"
 echo -e "  ${DIM}curator all run in the background via hooks.${RESET}"