eagle-mem 4.7.0 → 4.7.1

package/README.md

@@ -9,7 +9,7 @@
 
 **Context that survives `/compact`.**
 
-**v4.7.0 adds first-class Codex support and enforced anti-regression checks.**
+**v4.7.1 hardens first-class Codex support and enforced anti-regression checks.**
 Claude Code and Codex can now share the same local Eagle Mem database, while every captured row records which agent created it.
 
 ## The Problem
@@ -48,7 +48,7 @@ That's it. Open Claude Code or Codex in any project directory. Eagle Mem activat
 
 Everything is automatic from here. Eagle Mem scans your codebase, indexes source files, captures session summaries, mirrors Claude's memories and tasks, learns which commands are noisy, and prunes stale data — all in the background via hooks.
 
-For Codex, the installer enables `codex_hooks` in `~/.codex/config.toml`, registers hooks in `~/.codex/hooks.json`, and patches `~/.codex/AGENTS.md` with the Eagle Mem summary contract. For Claude Code, it keeps using `~/.claude/settings.json`, `CLAUDE.md`, and the existing Claude memory/task locations.
+For Codex, the installer enables `codex_hooks` in `~/.codex/config.toml`, registers hooks in `~/.codex/hooks.json`, symlinks Eagle Mem skills into `~/.codex/skills`, and patches `~/.codex/AGENTS.md` with the Eagle Mem summary contract. For Claude Code, it keeps using `~/.claude/settings.json`, `CLAUDE.md`, `~/.claude/skills`, and the existing Claude memory/task locations.
 
 ### Prerequisites
 
@@ -116,7 +116,7 @@ Eagle Mem prevents Claude from repeating past mistakes:
 | `eagle-mem config` | View or change LLM provider settings |
 | `eagle-mem guard` | Manage regression guardrails for files |
 | `eagle-mem overview` | Build or view project overview |
-| `eagle-mem memories` | View/sync Claude Code memories |
+| `eagle-mem memories` | View/sync agent memories |
 | `eagle-mem tasks` | View mirrored tasks |
 | `eagle-mem curate` | Run curator (co-edits, hot files, guardrails) |
 | `eagle-mem feature` | Track and verify features |
@@ -130,7 +130,7 @@ Eagle Mem prevents Claude from repeating past mistakes:
 eagle-mem search "auth bug"        # keyword search across summaries
 eagle-mem search --timeline        # recent sessions in chronological order
 eagle-mem search --overview        # project overview
-eagle-mem search --memories        # mirrored Claude Code memories
+eagle-mem search --memories        # mirrored agent memories
 eagle-mem search --tasks           # in-flight tasks (pending/in-progress)
 eagle-mem search --files           # most frequently modified files
 eagle-mem search --stats           # project statistics
@@ -166,7 +166,7 @@ That means opening the same project in Claude Code and Codex does not create two
 |-------|-------------|
 | `/eagle-mem-search` | Search memory and past sessions — Claude interprets results in context |
 | `/eagle-mem-overview` | Build a rich project briefing from README, entry points, and git history |
-| `/eagle-mem-memories` | View and search mirrored Claude Code memories and plans |
+| `/eagle-mem-memories` | View and search mirrored agent memories and plans |
 | `/eagle-mem-tasks` | TaskAware Compact Loop — break complex work into tasks that survive `/compact` |
 
 ## Data
@@ -189,9 +189,9 @@ Single SQLite database at `~/.eagle-mem/memory.db` (WAL mode, FTS5 full-text sea
 | `feature_smoke_tests` | Smoke test definitions for feature verification |
 | `pending_feature_verifications` | Release blockers created when files tied to features change |
 | `eagle_meta` | Internal metadata (last scan, last curate, etc.) |
-| `claude_memories` | Mirror of Claude Code auto-memories |
-| `claude_plans` | Mirror of Claude Code plans |
-| `claude_tasks` | Mirror of Claude Code tasks |
+| `agent_memories` | Mirror of agent memory files, with source attribution |
+| `agent_plans` | Mirror of agent plan files, with source attribution |
+| `agent_tasks` | Mirror of agent task records, with source attribution |
 
 ### Project Identity
 
@@ -207,9 +207,11 @@ Some features (curator auto-enrichment, overview generation) can use an LLM for
 
 ```bash
 eagle-mem config
+eagle-mem config set provider.type agent_cli
+eagle-mem config set agent_cli.preferred current
 ```
 
-Supported providers: Ollama (auto-detected), Anthropic, OpenAI. Eagle Mem works fully without a provider — LLM features gracefully degrade to heuristic fallbacks.
+Provider preference is local-first: Ollama is auto-detected when running, then Eagle Mem can use the installed Codex/Claude CLI via `agent_cli` before falling back to explicit Anthropic/OpenAI API providers. Eagle Mem works fully without a provider — LLM features gracefully degrade to heuristic fallbacks.
 
 ## License
 

package/db/028_agent_artifact_tables.sql

@@ -0,0 +1,124 @@
+-- Migration 028: Promote mirrored artifact tables from Claude-specific names
+-- to agent-generic names. The original names were correct when Eagle Mem only
+-- mirrored Claude Code artifacts; Codex support made the stored data model
+-- multi-agent. Keep read-only legacy views so older ad-hoc SELECT queries do
+-- not break immediately.
+
+DROP TRIGGER IF EXISTS claude_memories_ai;
+DROP TRIGGER IF EXISTS claude_memories_ad;
+DROP TRIGGER IF EXISTS claude_memories_au;
+DROP TRIGGER IF EXISTS claude_plans_ai;
+DROP TRIGGER IF EXISTS claude_plans_ad;
+DROP TRIGGER IF EXISTS claude_plans_au;
+DROP TRIGGER IF EXISTS claude_tasks_ai;
+DROP TRIGGER IF EXISTS claude_tasks_ad;
+DROP TRIGGER IF EXISTS claude_tasks_au;
+
+DROP TABLE IF EXISTS claude_memories_fts;
+DROP TABLE IF EXISTS claude_plans_fts;
+DROP TABLE IF EXISTS claude_tasks_fts;
+
+ALTER TABLE claude_memories RENAME TO agent_memories;
+ALTER TABLE claude_plans RENAME TO agent_plans;
+ALTER TABLE claude_tasks RENAME TO agent_tasks;
+
+DROP INDEX IF EXISTS idx_claude_memories_project;
+DROP INDEX IF EXISTS idx_claude_memories_type;
+DROP INDEX IF EXISTS idx_claude_memories_origin_agent;
+DROP INDEX IF EXISTS idx_claude_plans_project;
+DROP INDEX IF EXISTS idx_claude_plans_origin_agent;
+DROP INDEX IF EXISTS idx_claude_tasks_project;
+DROP INDEX IF EXISTS idx_claude_tasks_session;
+DROP INDEX IF EXISTS idx_claude_tasks_status;
+DROP INDEX IF EXISTS idx_claude_tasks_origin_agent;
+
+CREATE INDEX IF NOT EXISTS idx_agent_memories_project ON agent_memories(project);
+CREATE INDEX IF NOT EXISTS idx_agent_memories_type ON agent_memories(memory_type);
+CREATE INDEX IF NOT EXISTS idx_agent_memories_origin_agent ON agent_memories(origin_agent);
+CREATE INDEX IF NOT EXISTS idx_agent_plans_project ON agent_plans(project);
+CREATE INDEX IF NOT EXISTS idx_agent_plans_origin_agent ON agent_plans(origin_agent);
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_project ON agent_tasks(project);
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_session ON agent_tasks(source_session_id);
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_status ON agent_tasks(status);
+CREATE INDEX IF NOT EXISTS idx_agent_tasks_origin_agent ON agent_tasks(origin_agent);
+
+CREATE VIRTUAL TABLE IF NOT EXISTS agent_memories_fts USING fts5(
+    memory_name,
+    description,
+    content,
+    content='agent_memories',
+    content_rowid='id'
+);
+
+CREATE VIRTUAL TABLE IF NOT EXISTS agent_plans_fts USING fts5(
+    title,
+    content,
+    content='agent_plans',
+    content_rowid='id'
+);
+
+CREATE VIRTUAL TABLE IF NOT EXISTS agent_tasks_fts USING fts5(
+    subject,
+    description,
+    content='agent_tasks',
+    content_rowid='id'
+);
+
+INSERT INTO agent_memories_fts(agent_memories_fts) VALUES('rebuild');
+INSERT INTO agent_plans_fts(agent_plans_fts) VALUES('rebuild');
+INSERT INTO agent_tasks_fts(agent_tasks_fts) VALUES('rebuild');
+
+CREATE TRIGGER IF NOT EXISTS agent_memories_ai AFTER INSERT ON agent_memories BEGIN
+    INSERT INTO agent_memories_fts(rowid, memory_name, description, content)
+    VALUES (new.id, new.memory_name, new.description, new.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_memories_ad AFTER DELETE ON agent_memories BEGIN
+    INSERT INTO agent_memories_fts(agent_memories_fts, rowid, memory_name, description, content)
+    VALUES ('delete', old.id, old.memory_name, old.description, old.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_memories_au AFTER UPDATE ON agent_memories BEGIN
+    INSERT INTO agent_memories_fts(agent_memories_fts, rowid, memory_name, description, content)
+    VALUES ('delete', old.id, old.memory_name, old.description, old.content);
+    INSERT INTO agent_memories_fts(rowid, memory_name, description, content)
+    VALUES (new.id, new.memory_name, new.description, new.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_plans_ai AFTER INSERT ON agent_plans BEGIN
+    INSERT INTO agent_plans_fts(rowid, title, content)
+    VALUES (new.id, new.title, new.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_plans_ad AFTER DELETE ON agent_plans BEGIN
+    INSERT INTO agent_plans_fts(agent_plans_fts, rowid, title, content)
+    VALUES ('delete', old.id, old.title, old.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_plans_au AFTER UPDATE ON agent_plans BEGIN
+    INSERT INTO agent_plans_fts(agent_plans_fts, rowid, title, content)
+    VALUES ('delete', old.id, old.title, old.content);
+    INSERT INTO agent_plans_fts(rowid, title, content)
+    VALUES (new.id, new.title, new.content);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_tasks_ai AFTER INSERT ON agent_tasks BEGIN
+    INSERT INTO agent_tasks_fts(rowid, subject, description)
+    VALUES (new.id, new.subject, new.description);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_tasks_ad AFTER DELETE ON agent_tasks BEGIN
+    INSERT INTO agent_tasks_fts(agent_tasks_fts, rowid, subject, description)
+    VALUES ('delete', old.id, old.subject, old.description);
+END;
+
+CREATE TRIGGER IF NOT EXISTS agent_tasks_au AFTER UPDATE ON agent_tasks BEGIN
+    INSERT INTO agent_tasks_fts(agent_tasks_fts, rowid, subject, description)
+    VALUES ('delete', old.id, old.subject, old.description);
+    INSERT INTO agent_tasks_fts(rowid, subject, description)
+    VALUES (new.id, new.subject, new.description);
+END;
+
+CREATE VIEW IF NOT EXISTS claude_memories AS SELECT * FROM agent_memories;
+CREATE VIEW IF NOT EXISTS claude_plans AS SELECT * FROM agent_plans;
+CREATE VIEW IF NOT EXISTS claude_tasks AS SELECT * FROM agent_tasks;

package/hooks/post-tool-use.sh

@@ -5,6 +5,7 @@
 # Captures observations + dispatches to extracted responsibilities
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"
@@ -54,7 +55,7 @@ case "$hook_event" in
             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, status, origin_agent)
+INSERT INTO agent_tasks (project, source_session_id, source_task_id, file_path, subject, description, status, origin_agent)
 VALUES ('$proj_sql', '$sid_sql', '$tid_sql', '$fp_sql', '$subj_sql', '$desc_sql', '$stat_sql', '$agent_sql')
 ON CONFLICT(file_path) DO UPDATE SET
     subject     = excluded.subject,

package/hooks/pre-tool-use.sh

@@ -10,6 +10,7 @@
 # 6. Stuck loop detection (repeated edits to same file)
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"

package/hooks/session-end.sh

@@ -5,6 +5,7 @@
 # Marks the session as completed
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"
@@ -31,7 +32,7 @@ if eagle_validate_session_id "$session_id"; then
     if [ -d "$task_dir" ]; then
         for task_file in "$task_dir"/*.json; do
             [ ! -f "$task_file" ] && continue
-            eagle_capture_claude_task "$task_file" "$session_id" "$project" "$agent"
+            eagle_capture_agent_task "$task_file" "$session_id" "$project" "$agent"
         done
         eagle_log "INFO" "SessionEnd: re-synced tasks from $task_dir"
     fi

package/hooks/session-start.sh

@@ -5,6 +5,7 @@
 # Injects project memory + pending tasks into Claude's context
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"
@@ -166,6 +167,13 @@ $update_notice
 "
 fi
 
+if [ "$agent" = "codex" ] && [ "${stat_with_summaries:-0}" -eq 0 ] 2>/dev/null; then
+    context+="
+=== Eagle Mem: Codex Capture Warming Up ===
+Codex hooks are active. End important turns with an <eagle-summary> block so future Claude Code and Codex sessions can recall decisions, gotchas, key files, and next steps from this project.
+"
+fi
+
 # ─── Project overview (capped at 500 chars) ──────────────
 
 overview=$(eagle_get_overview "$project")
@@ -228,7 +236,7 @@ fi
 
 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 claude_memories
+    FROM agent_memories
     WHERE project = '$p_esc'
     ORDER BY updated_at DESC
     LIMIT 5;")
@@ -256,7 +264,7 @@ fi
 
 # ─── Plans (skip if none) ────────────────────────────────
 
-plans=$(eagle_list_claude_plans "$project" 3)
+plans=$(eagle_list_agent_plans "$project" 3)
 if [ -n "$plans" ]; then
     context+="
 === Eagle Mem: Plans ===
@@ -271,7 +279,7 @@ fi
 
 # ─── Tasks (skip if none) ────────────────────────────────
 
-synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM claude_tasks
+synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM agent_tasks
     WHERE project = '$p_esc'
     AND status IN ('in_progress', 'pending')
     AND updated_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now', '-7 days')

package/hooks/stop.sh

@@ -7,6 +7,7 @@
 # LLM enrichment fills in decisions/gotchas/key_files
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"

package/hooks/user-prompt-submit.sh

@@ -5,6 +5,7 @@
 # Searches memory for relevant context and injects it
 # ═══════════════════════════════════════════════════════════
 set +e
+[ "${EAGLE_MEM_DISABLE_HOOKS:-}" = "1" ] && exit 0
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 LIB_DIR="$SCRIPT_DIR/../lib"

package/lib/common.sh

@@ -16,6 +16,8 @@ EAGLE_CODEX_DIR="${EAGLE_CODEX_DIR:-$HOME/.codex}"
 EAGLE_CODEX_CONFIG="${EAGLE_CODEX_CONFIG:-$EAGLE_CODEX_DIR/config.toml}"
 EAGLE_CODEX_HOOKS="${EAGLE_CODEX_HOOKS:-$EAGLE_CODEX_DIR/hooks.json}"
 EAGLE_CODEX_AGENTS_MD="${EAGLE_CODEX_AGENTS_MD:-$EAGLE_CODEX_DIR/AGENTS.md}"
+EAGLE_CODEX_SKILLS_DIR="${EAGLE_CODEX_SKILLS_DIR:-$EAGLE_CODEX_DIR/skills}"
+EAGLE_CODEX_MEMORIES_DIR="${EAGLE_CODEX_MEMORIES_DIR:-$EAGLE_CODEX_DIR/memories}"
 EAGLE_RAW_BASH_UNLOCK="${EAGLE_RAW_BASH_UNLOCK:-/tmp/eagle-mem-raw-bash-unlock}"
 
 eagle_log() {
@@ -556,6 +558,8 @@ regression_risks: [risk, ...]
 
 **How to apply:**
 - Attribute recalled context as "Eagle Mem recalls:" when it is injected
+- Use the Eagle Mem skills when relevant: `eagle-mem-search`, `eagle-mem-overview`, `eagle-mem-memories`, and `eagle-mem-tasks`
+- For important decisions, preferences, gotchas, or durable project facts, explicitly include them in the `<eagle-summary>` block so Codex-originated memories become available to future Claude Code and Codex sessions
 - Do not revert Eagle Mem-surfaced decisions without asking the user
 - If Eagle Mem reports pending feature verification, verify or waive it before push/PR/publish
 - Never put raw secrets in summaries

package/lib/db-backfill.sh

@@ -65,9 +65,9 @@ eagle_backfill_projects() {
         ch=$(eagle_db_pipe <<SQL
 BEGIN;
 UPDATE sessions SET project = '$proj_sql' WHERE id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
-UPDATE claude_tasks SET project = '$proj_sql' WHERE source_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
-UPDATE claude_memories SET project = '$proj_sql' WHERE origin_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
-UPDATE claude_plans SET project = '$proj_sql' WHERE origin_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
+UPDATE agent_tasks SET project = '$proj_sql' WHERE source_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
+UPDATE agent_memories SET project = '$proj_sql' WHERE origin_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
+UPDATE agent_plans SET project = '$proj_sql' WHERE origin_session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
 UPDATE summaries SET project = '$proj_sql' WHERE session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
 UPDATE observations SET project = '$proj_sql' WHERE session_id = '$sid_sql' AND (project = '' OR project != '$proj_sql');
 SELECT total_changes();

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-sessions.sh

@@ -49,11 +49,11 @@ 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';

package/lib/db-summaries.sh

@@ -163,9 +163,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