eagle-mem 4.7.0 → 4.8.0

package/lib/db-mirrors.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 # ═══════════════════════════════════════════════════════════
-# Eagle Mem — Claude Code memory/plan/task mirror helpers
+# Eagle Mem — Agent memory/plan/task mirror helpers
 # ═══════════════════════════════════════════════════════════
 [ -n "${_EAGLE_DB_MIRRORS_LOADED:-}" ] && return 0
 _EAGLE_DB_MIRRORS_LOADED=1
 
-eagle_capture_claude_memory() {
+eagle_capture_agent_memory() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
@@ -19,6 +19,9 @@ eagle_capture_claude_memory() {
     local fm body
     fm=$(awk '/^---$/{c++; next} c==1' "$file_path")
     body=$(awk '/^---$/{c++; next} c>=2' "$file_path")
+    if [ -z "$body" ] && [ -z "$fm" ]; then
+        body=$(cat "$file_path")
+    fi
 
     _fm_field() { printf '%s\n' "$fm" | awk -F': *' -v k="$1" '$1==k{sub(/^[^:]+: */,""); gsub(/^"|"$/,""); print; exit}'; }
 
@@ -29,6 +32,18 @@ eagle_capture_claude_memory() {
     morigin=$(_fm_field "originSessionId")
     [ -z "$morigin" ] && morigin="$session_id"
 
+    if [ -z "$mname" ]; then
+        case "$(basename "$file_path")" in
+            MEMORY.md) mname="Codex Memory Registry" ;;
+            memory_summary.md) mname="Codex Memory Summary" ;;
+            *) mname=$(basename "$file_path" .md) ;;
+        esac
+    fi
+    [ -z "$mtype" ] && mtype="$agent"
+    if [ -z "$mdesc" ]; then
+        mdesc=$(printf '%s\n' "$body" | sed '/^[[:space:]]*$/d' | head -1 | cut -c1-200)
+    fi
+
     local fp_sql proj_sql name_sql desc_sql type_sql content_sql hash_sql origin_sql agent_sql
     fp_sql=$(eagle_sql_escape "$file_path")
     proj_sql=$(eagle_sql_escape "$project")
@@ -41,7 +56,7 @@ eagle_capture_claude_memory() {
     agent_sql=$(eagle_sql_escape "$agent")
 
     eagle_db_pipe <<SQL
-INSERT INTO claude_memories (project, file_path, memory_name, description, memory_type, content, content_hash, origin_session_id, origin_agent)
+INSERT INTO agent_memories (project, file_path, memory_name, description, memory_type, content, content_hash, origin_session_id, origin_agent)
 VALUES ('$proj_sql', '$fp_sql', '$name_sql', '$desc_sql', '$type_sql', '$content_sql', '$hash_sql', '$origin_sql', '$agent_sql')
 ON CONFLICT(file_path) DO UPDATE SET
     memory_name     = excluded.memory_name,
@@ -52,11 +67,11 @@ ON CONFLICT(file_path) DO UPDATE SET
     origin_session_id = excluded.origin_session_id,
     origin_agent    = excluded.origin_agent,
     updated_at      = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
-WHERE claude_memories.content_hash != excluded.content_hash;
+WHERE agent_memories.content_hash != excluded.content_hash;
 SQL
 }
 
-eagle_search_claude_memories() {
+eagle_search_agent_memories() {
     local query; query=$(eagle_fts_sanitize "$1")
     if [ -z "$query" ]; then
         echo "Search query is empty after sanitization. Try a different search term." >&2
@@ -75,15 +90,15 @@ eagle_search_claude_memories() {
     eagle_db "SELECT m.memory_name, m.memory_type, m.description,
                      replace(substr(m.content, 1, 200), char(10), ' '),
                      m.file_path, m.updated_at, m.origin_agent
-              FROM claude_memories m
-              JOIN claude_memories_fts f ON f.rowid = m.id
-              WHERE claude_memories_fts MATCH '$query'
+              FROM agent_memories m
+              JOIN agent_memories_fts f ON f.rowid = m.id
+              WHERE agent_memories_fts MATCH '$query'
               $where_clause
               ORDER BY rank
               LIMIT $limit;"
 }
 
-eagle_list_claude_memories() {
+eagle_list_agent_memories() {
     local project="${1:-}"
     local limit; limit=$(eagle_sql_int "${2:-20}")
 
@@ -94,13 +109,13 @@ eagle_list_claude_memories() {
     fi
 
     eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at, origin_agent
-              FROM claude_memories
+              FROM agent_memories
               $where_clause
               ORDER BY updated_at DESC
               LIMIT $limit;"
 }
 
-eagle_capture_claude_plan() {
+eagle_capture_agent_plan() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
@@ -125,21 +140,21 @@ eagle_capture_claude_plan() {
     agent_sql=$(eagle_sql_escape "$agent")
 
     eagle_db_pipe <<SQL
-INSERT INTO claude_plans (project, file_path, title, content, content_hash, origin_session_id, origin_agent)
+INSERT INTO agent_plans (project, file_path, title, content, content_hash, origin_session_id, origin_agent)
 VALUES ('$proj_sql', '$fp_sql', '$title_sql', '$content_sql', '$hash_sql', '$origin_sql', '$agent_sql')
 ON CONFLICT(file_path) DO UPDATE SET
     title           = excluded.title,
     content         = excluded.content,
     content_hash    = excluded.content_hash,
-    origin_session_id = COALESCE(NULLIF(excluded.origin_session_id, ''), claude_plans.origin_session_id),
-    origin_agent    = COALESCE(NULLIF(excluded.origin_agent, ''), claude_plans.origin_agent),
-    project         = CASE WHEN excluded.project != '' THEN excluded.project ELSE claude_plans.project END,
+    origin_session_id = COALESCE(NULLIF(excluded.origin_session_id, ''), agent_plans.origin_session_id),
+    origin_agent    = COALESCE(NULLIF(excluded.origin_agent, ''), agent_plans.origin_agent),
+    project         = CASE WHEN excluded.project != '' THEN excluded.project ELSE agent_plans.project END,
     updated_at      = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
-WHERE claude_plans.content_hash != excluded.content_hash;
+WHERE agent_plans.content_hash != excluded.content_hash;
 SQL
 }
 
-eagle_search_claude_plans() {
+eagle_search_agent_plans() {
     local query; query=$(eagle_fts_sanitize "$1")
     if [ -z "$query" ]; then
         echo "Search query is empty after sanitization. Try a different search term." >&2
@@ -158,15 +173,15 @@ eagle_search_claude_plans() {
     eagle_db "SELECT p.title, p.project,
                      replace(substr(p.content, 1, 200), char(10), ' '),
                      p.file_path, p.updated_at, p.origin_agent
-              FROM claude_plans p
-              JOIN claude_plans_fts f ON f.rowid = p.id
-              WHERE claude_plans_fts MATCH '$query'
+              FROM agent_plans p
+              JOIN agent_plans_fts f ON f.rowid = p.id
+              WHERE agent_plans_fts MATCH '$query'
               $where_clause
               ORDER BY rank
               LIMIT $limit;"
 }
 
-eagle_list_claude_plans() {
+eagle_list_agent_plans() {
     local project="${1:-}"
     local limit; limit=$(eagle_sql_int "${2:-20}")
 
@@ -177,13 +192,13 @@ eagle_list_claude_plans() {
     fi
 
     eagle_db "SELECT title, project, file_path, updated_at, origin_agent
-              FROM claude_plans
+              FROM agent_plans
               $where_clause
               ORDER BY updated_at DESC
               LIMIT $limit;"
 }
 
-eagle_capture_claude_task() {
+eagle_capture_agent_task() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
@@ -223,7 +238,7 @@ eagle_capture_claude_task() {
     agent_sql=$(eagle_sql_escape "$agent")
 
     eagle_db_pipe <<SQL
-INSERT INTO claude_tasks (project, source_session_id, source_task_id, file_path, subject, description, active_form, status, blocks, blocked_by, content_hash, origin_agent)
+INSERT INTO agent_tasks (project, source_session_id, source_task_id, file_path, subject, description, active_form, status, blocks, blocked_by, content_hash, origin_agent)
 VALUES ('$proj_sql', '$sid_sql', '$tid_sql', '$fp_sql', '$subj_sql', '$desc_sql', '$af_sql', '$status_sql', '$blocks_sql', '$bb_sql', '$hash_sql', '$agent_sql')
 ON CONFLICT(file_path) DO UPDATE SET
     subject         = excluded.subject,
@@ -234,13 +249,13 @@ ON CONFLICT(file_path) DO UPDATE SET
     blocked_by      = excluded.blocked_by,
     content_hash    = excluded.content_hash,
     origin_agent    = excluded.origin_agent,
-    project         = CASE WHEN excluded.project != '' THEN excluded.project ELSE claude_tasks.project END,
+    project         = CASE WHEN excluded.project != '' THEN excluded.project ELSE agent_tasks.project END,
     updated_at      = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
-WHERE claude_tasks.content_hash != excluded.content_hash;
+WHERE agent_tasks.content_hash != excluded.content_hash;
 SQL
 }
 
-eagle_list_claude_tasks() {
+eagle_list_agent_tasks() {
     local project="${1:-}"
     local limit; limit=$(eagle_sql_int "${2:-20}")
 
@@ -251,13 +266,13 @@ eagle_list_claude_tasks() {
     fi
 
     eagle_db "SELECT subject, status, source_session_id, source_task_id, updated_at, origin_agent
-              FROM claude_tasks
+              FROM agent_tasks
               $where_clause
               ORDER BY updated_at DESC
               LIMIT $limit;"
 }
 
-eagle_search_claude_tasks() {
+eagle_search_agent_tasks() {
     local query; query=$(eagle_fts_sanitize "$1")
     if [ -z "$query" ]; then
         echo "Search query is empty after sanitization. Try a different search term." >&2
@@ -276,10 +291,22 @@ eagle_search_claude_tasks() {
     eagle_db "SELECT t.subject, t.status,
                      replace(substr(t.description, 1, 200), char(10), ' '),
                      t.source_session_id, t.source_task_id, t.updated_at, t.origin_agent
-              FROM claude_tasks t
-              JOIN claude_tasks_fts f ON f.rowid = t.id
-              WHERE claude_tasks_fts MATCH '$query'
+              FROM agent_tasks t
+              JOIN agent_tasks_fts f ON f.rowid = t.id
+              WHERE agent_tasks_fts MATCH '$query'
               $where_clause
               ORDER BY rank
               LIMIT $limit;"
 }
+
+# Backward-compatible helper names for older installed hooks/scripts that source
+# this library during an update window. Runtime code should use agent_* helpers.
+eagle_capture_claude_memory() { eagle_capture_agent_memory "$@"; }
+eagle_search_claude_memories() { eagle_search_agent_memories "$@"; }
+eagle_list_claude_memories() { eagle_list_agent_memories "$@"; }
+eagle_capture_claude_plan() { eagle_capture_agent_plan "$@"; }
+eagle_search_claude_plans() { eagle_search_agent_plans "$@"; }
+eagle_list_claude_plans() { eagle_list_agent_plans "$@"; }
+eagle_capture_claude_task() { eagle_capture_agent_task "$@"; }
+eagle_list_claude_tasks() { eagle_list_agent_tasks "$@"; }
+eagle_search_claude_tasks() { eagle_search_agent_tasks "$@"; }

package/lib/db-observations.sh

@@ -70,6 +70,13 @@ eagle_search_code_chunks() {
               JOIN code_chunks_fts f ON f.rowid = c.id
               WHERE code_chunks_fts MATCH '$query'
               AND c.project = '$project'
+              AND c.file_path NOT LIKE '.playwright-mcp/%'
+              AND c.file_path NOT LIKE '.eagle-worktrees/%'
+              AND c.file_path NOT LIKE '.git/%'
+              AND c.file_path NOT LIKE 'node_modules/%'
+              AND c.file_path NOT LIKE 'dist/%'
+              AND c.file_path NOT LIKE 'build/%'
+              AND c.file_path NOT LIKE 'coverage/%'
               ORDER BY rank
               LIMIT $limit;"
 }

package/lib/db-sessions.sh

@@ -49,15 +49,21 @@ SELECT 'sessions_claude|' || COUNT(*) FROM sessions WHERE project = '$project' A
 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 claude_memories WHERE project = '$project';
-SELECT 'plans|' || COUNT(*) FROM claude_plans WHERE project = '$project';
-SELECT 'tasks_pending|' || COUNT(*) FROM claude_tasks WHERE project = '$project' AND status = 'pending';
-SELECT 'tasks_progress|' || COUNT(*) FROM claude_tasks WHERE project = '$project' AND status = 'in_progress';
-SELECT 'tasks_done|' || COUNT(*) FROM claude_tasks WHERE project = '$project' AND status = 'completed';
+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 'last_summary|' || COALESCE((SELECT substr(request, 1, 60) FROM summaries WHERE project = '$project' ORDER BY created_at DESC LIMIT 1), '');
+SELECT 'last_summary|' || COALESCE((SELECT substr(request, 1, 60)
+    FROM summaries
+    WHERE project = '$project'
+    AND COALESCE(request, '') NOT LIKE '# AGENTS.md instructions%'
+    AND COALESCE(request, '') NOT LIKE '<environment_context>%'
+    ORDER BY created_at DESC
+    LIMIT 1), '');
 SQL
 }
 

package/lib/db-summaries.sh

@@ -63,7 +63,9 @@ eagle_get_recent_summaries() {
     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'
-              AND s.request NOT LIKE '%<local-command-caveat>%'
+              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>%'
               ORDER BY s.created_at DESC
               LIMIT $limit;"
 }
@@ -84,7 +86,9 @@ eagle_search_summaries() {
               FROM summaries s
               JOIN summaries_fts f ON f.rowid = s.id
               WHERE summaries_fts MATCH '$query'
-              AND s.request NOT LIKE '%<local-command-caveat>%'
+              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>%'
               $where_clause
               ORDER BY rank
               LIMIT $limit;"
@@ -163,9 +167,9 @@ eagle_search_stale_memories() {
     local project; project=$(eagle_sql_escape "$1")
     local fts_query; fts_query=$(eagle_sql_escape "$2")
     eagle_db "SELECT m.memory_name
-        FROM claude_memories m
-        JOIN claude_memories_fts f ON f.rowid = m.id
-        WHERE claude_memories_fts MATCH '$fts_query'
+        FROM agent_memories m
+        JOIN agent_memories_fts f ON f.rowid = m.id
+        WHERE agent_memories_fts MATCH '$fts_query'
         AND m.project = '$project'
         LIMIT 1;"
 }

package/lib/hooks-posttool.sh

@@ -19,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" "$agent"
+                            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" "$agent"
+                            eagle_capture_agent_plan "$fp" "$session_id" "$project" "$agent"
                         fi
                         ;;
                 esac
@@ -47,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" "$agent"
+                        [ -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" "$agent"
+                        [ -f "$task_json" ] && eagle_capture_agent_task "$task_json" "$session_id" "$project" "$agent"
                     fi
                 fi
             fi

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"
@@ -138,18 +143,38 @@ eagle_config_init() {
     # Create config with restrictive permissions from the start (no TOCTOU window)
     (
         umask 077
+        mkdir -p "$EAGLE_MEM_DIR"
         cat > "$EAGLE_CONFIG_FILE" << TOML
 # Eagle Mem configuration
 # Docs: https://github.com/eagleisbatman/eagle-mem
 
 [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 = ""
+
+[orchestration]
+# route = "opposite" means Codex coordinates Claude workers and Claude
+# coordinates Codex workers by default.
+route = "opposite"
+auto_worktree = "true"
+worktree_root = ""
+codex_worker_model = "gpt-5.5"
+codex_worker_effort = "xhigh"
+claude_worker_model = "claude-opus-4-7"
+claude_worker_effort = "xhigh"
 
 [anthropic]
 # Uses ANTHROPIC_API_KEY env var for authentication
@@ -164,11 +189,20 @@ model = "gpt-4o-mini"
 schedule = "auto"
 min_sessions = 5
 
+[token_guard]
+# rtk: "off" disables RTK help, "auto" uses RTK when found,
+# "enforce" blocks known raw-output shell commands when RTK is unavailable.
+rtk = "auto"
+# raw_bash: "block" blocks raw Codex shell output when an RTK rewrite exists.
+# "allow" keeps RTK advisory only.
+raw_bash = "block"
+
 [redaction]
 # Additional secret patterns (regex) beyond built-in defaults
 # extra_patterns = ["MY_CUSTOM_SECRET_.*"]
 TOML
     )
+    chmod 700 "$EAGLE_MEM_DIR" 2>/dev/null || true
     eagle_log "INFO" "Config initialized: provider=$provider model=$model"
 }
 
@@ -184,6 +218,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 +270,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 +531,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,8 +552,25 @@ 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 ""
+    echo "Orchestration:"
+    echo "  Route:      $(eagle_config_get "orchestration" "route" "opposite")"
+    echo "  Worktrees:  $(eagle_config_get "orchestration" "auto_worktree" "true")"
+    echo "  Codex:      $(eagle_config_get "orchestration" "codex_worker_model" "gpt-5.5") / $(eagle_config_get "orchestration" "codex_worker_effort" "xhigh")"
+    echo "  Claude:     $(eagle_config_get "orchestration" "claude_worker_model" "claude-opus-4-7") / $(eagle_config_get "orchestration" "claude_worker_effort" "xhigh")"
+
+    echo ""
+    echo "Token guard:"
+    echo "  RTK mode:  $(eagle_config_get "token_guard" "rtk" "auto")"
+    echo "  Raw bash:  $(eagle_config_get "token_guard" "raw_bash" "block")"
+    echo "  RTK bin:   $(command -v rtk 2>/dev/null || echo "not found")"
+
     echo ""
     echo "Config:   $EAGLE_CONFIG_FILE"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eagle-mem",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Context that survives /compact for Claude Code and Codex — SQLite + FTS5, no daemon, no bloat",
   "bin": {
     "eagle-mem": "bin/eagle-mem"
@@ -20,6 +20,8 @@
     "sqlite",
     "fts5",
     "hooks",
+    "orchestration",
+    "rtk",
     "persistent-memory"
   ],
   "author": "eagleisbatman",