eagle-mem 4.6.1 → 4.7.0

package/lib/db-mirrors.sh

@@ -9,6 +9,7 @@ eagle_capture_claude_memory() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
+    local agent="${4:-$(eagle_agent_source)}"
 
     [ ! -f "$file_path" ] && return 0
 
@@ -28,7 +29,7 @@ eagle_capture_claude_memory() {
     morigin=$(_fm_field "originSessionId")
     [ -z "$morigin" ] && morigin="$session_id"
 
-    local fp_sql proj_sql name_sql desc_sql type_sql content_sql hash_sql origin_sql
+    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")
     name_sql=$(eagle_sql_escape "$mname")
@@ -37,10 +38,11 @@ eagle_capture_claude_memory() {
     content_sql=$(eagle_sql_escape "$body")
     hash_sql=$(eagle_sql_escape "$chash")
     origin_sql=$(eagle_sql_escape "$morigin")
+    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)
-VALUES ('$proj_sql', '$fp_sql', '$name_sql', '$desc_sql', '$type_sql', '$content_sql', '$hash_sql', '$origin_sql')
+INSERT INTO claude_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,
     description     = excluded.description,
@@ -48,6 +50,7 @@ ON CONFLICT(file_path) DO UPDATE SET
     content         = excluded.content,
     content_hash    = excluded.content_hash,
     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;
 SQL
@@ -71,7 +74,7 @@ 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.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'
@@ -90,7 +93,7 @@ eagle_list_claude_memories() {
         where_clause="WHERE project = '$project'"
     fi
 
-    eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at
+    eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at, origin_agent
               FROM claude_memories
               $where_clause
               ORDER BY updated_at DESC
@@ -101,6 +104,7 @@ eagle_capture_claude_plan() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
+    local agent="${4:-$(eagle_agent_source)}"
 
     [ ! -f "$file_path" ] && return 0
 
@@ -111,22 +115,24 @@ eagle_capture_claude_plan() {
     title=$(awk '/^# /{print; exit}' "$file_path" | sed 's/^# //')
     content=$(cat "$file_path")
 
-    local fp_sql proj_sql title_sql content_sql hash_sql origin_sql
+    local fp_sql proj_sql title_sql content_sql hash_sql origin_sql agent_sql
     fp_sql=$(eagle_sql_escape "$file_path")
     proj_sql=$(eagle_sql_escape "$project")
     title_sql=$(eagle_sql_escape "$title")
     content_sql=$(eagle_sql_escape "$content")
     hash_sql=$(eagle_sql_escape "$chash")
     origin_sql=$(eagle_sql_escape "$session_id")
+    agent_sql=$(eagle_sql_escape "$agent")
 
     eagle_db_pipe <<SQL
-INSERT INTO claude_plans (project, file_path, title, content, content_hash, origin_session_id)
-VALUES ('$proj_sql', '$fp_sql', '$title_sql', '$content_sql', '$hash_sql', '$origin_sql')
+INSERT INTO claude_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,
     updated_at      = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
 WHERE claude_plans.content_hash != excluded.content_hash;
@@ -151,7 +157,7 @@ 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.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'
@@ -170,7 +176,7 @@ eagle_list_claude_plans() {
         where_clause="WHERE project = '$project'"
     fi
 
-    eagle_db "SELECT title, project, file_path, updated_at
+    eagle_db "SELECT title, project, file_path, updated_at, origin_agent
               FROM claude_plans
               $where_clause
               ORDER BY updated_at DESC
@@ -181,6 +187,7 @@ eagle_capture_claude_task() {
     local file_path="$1"
     local session_id="${2:-}"
     local project="${3:-}"
+    local agent="${4:-$(eagle_agent_source)}"
 
     [ ! -f "$file_path" ] && return 0
 
@@ -201,7 +208,7 @@ eagle_capture_claude_task() {
 
     [ -z "$task_id" ] && return 0
 
-    local fp_sql proj_sql sid_sql tid_sql subj_sql desc_sql af_sql status_sql blocks_sql bb_sql hash_sql
+    local fp_sql proj_sql sid_sql tid_sql subj_sql desc_sql af_sql status_sql blocks_sql bb_sql hash_sql agent_sql
     fp_sql=$(eagle_sql_escape "$file_path")
     proj_sql=$(eagle_sql_escape "$project")
     sid_sql=$(eagle_sql_escape "$session_id")
@@ -213,10 +220,11 @@ eagle_capture_claude_task() {
     blocks_sql=$(eagle_sql_escape "$blocks")
     bb_sql=$(eagle_sql_escape "$blocked_by")
     hash_sql=$(eagle_sql_escape "$chash")
+    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)
-VALUES ('$proj_sql', '$sid_sql', '$tid_sql', '$fp_sql', '$subj_sql', '$desc_sql', '$af_sql', '$status_sql', '$blocks_sql', '$bb_sql', '$hash_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)
+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,
     description     = excluded.description,
@@ -225,6 +233,7 @@ ON CONFLICT(file_path) DO UPDATE SET
     blocks          = excluded.blocks,
     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,
     updated_at      = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
 WHERE claude_tasks.content_hash != excluded.content_hash;
@@ -241,7 +250,7 @@ eagle_list_claude_tasks() {
         where_clause="WHERE project = '$project'"
     fi
 
-    eagle_db "SELECT subject, status, source_session_id, source_task_id, updated_at
+    eagle_db "SELECT subject, status, source_session_id, source_task_id, updated_at, origin_agent
               FROM claude_tasks
               $where_clause
               ORDER BY updated_at DESC
@@ -266,7 +275,7 @@ 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.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'

package/lib/db-observations.sh

@@ -15,6 +15,7 @@ eagle_insert_observation() {
     local output_bytes="${7:-}"
     local output_lines="${8:-}"
     local command_category; command_category=$(eagle_sql_escape "${9:-}")
+    local agent; agent=$(eagle_sql_escape "${10:-$(eagle_agent_source)}")
 
     local extra_cols=""
     local extra_vals=""
@@ -23,8 +24,8 @@ eagle_insert_observation() {
         extra_vals=", $(eagle_sql_int "$output_bytes"), $(eagle_sql_int "$output_lines"), '$command_category'"
     fi
 
-    eagle_db "INSERT INTO observations (session_id, project, tool_name, tool_input_summary, files_read, files_modified${extra_cols})
-              SELECT '$session_id', '$project', '$tool_name', '$tool_input_summary', '$files_read', '$files_modified'${extra_vals}
+    eagle_db "INSERT INTO observations (session_id, project, agent, tool_name, tool_input_summary, files_read, files_modified${extra_cols})
+              SELECT '$session_id', '$project', '$agent', '$tool_name', '$tool_input_summary', '$files_read', '$files_modified'${extra_vals}
               WHERE NOT EXISTS (
                   SELECT 1 FROM observations
                   WHERE session_id = '$session_id'

package/lib/db-sessions.sh

@@ -11,13 +11,15 @@ eagle_upsert_session() {
     local cwd; cwd=$(eagle_sql_escape "${3:-}")
     local model; model=$(eagle_sql_escape "${4:-}")
     local source; source=$(eagle_sql_escape "${5:-}")
+    local agent; agent=$(eagle_sql_escape "${6:-$(eagle_agent_source)}")
 
-    eagle_db "INSERT INTO sessions (id, project, cwd, model, source, last_activity_at)
-              VALUES ('$session_id', '$project', '$cwd', '$model', '$source', strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
+    eagle_db "INSERT INTO sessions (id, project, cwd, model, source, agent, last_activity_at)
+              VALUES ('$session_id', '$project', '$cwd', '$model', '$source', '$agent', strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
               ON CONFLICT(id) DO UPDATE SET
                   cwd = COALESCE(NULLIF(excluded.cwd, ''), sessions.cwd),
                   model = COALESCE(NULLIF(excluded.model, ''), sessions.model),
                   source = COALESCE(NULLIF(excluded.source, ''), sessions.source),
+                  agent = COALESCE(NULLIF(excluded.agent, ''), sessions.agent),
                   status = 'active',
                   last_activity_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now');"
 }
@@ -43,6 +45,8 @@ eagle_get_project_stats() {
     local project; project=$(eagle_sql_escape "$1")
     eagle_db_pipe <<SQL
 SELECT 'sessions|' || COUNT(*) FROM sessions WHERE project = '$project';
+SELECT 'sessions_claude|' || COUNT(*) FROM sessions WHERE project = '$project' AND agent = 'claude-code';
+SELECT 'sessions_codex|' || COUNT(*) FROM sessions WHERE project = '$project' AND agent = 'codex';
 SELECT 'summaries|' || COUNT(*) FROM summaries WHERE project = '$project';
 SELECT 'with_summaries|' || COUNT(*) FROM summaries WHERE project = '$project' AND request IS NOT NULL AND request != '';
 SELECT 'memories|' || COUNT(*) FROM claude_memories WHERE project = '$project';

package/lib/db-summaries.sh

@@ -19,12 +19,14 @@ eagle_insert_summary() {
     local decisions; decisions=$(eagle_sql_escape "${11:-}")
     local gotchas; gotchas=$(eagle_sql_escape "${12:-}")
     local key_files; key_files=$(eagle_sql_escape "${13:-}")
+    local agent; agent=$(eagle_sql_escape "${14:-$(eagle_agent_source)}")
 
     eagle_db_pipe <<SQL
-INSERT INTO summaries (session_id, project, request, investigated, learned, completed, next_steps, files_read, files_modified, notes, decisions, gotchas, key_files)
+INSERT INTO summaries (session_id, project, agent, request, investigated, learned, completed, next_steps, files_read, files_modified, notes, decisions, gotchas, key_files)
 VALUES (
     '$session_id',
     '$project',
+    '$agent',
     '$request',
     '$investigated',
     '$learned',
@@ -39,6 +41,7 @@ VALUES (
 )
 ON CONFLICT(session_id) DO UPDATE SET
     project        = excluded.project,
+    agent          = COALESCE(NULLIF(excluded.agent, ''), summaries.agent),
     request        = COALESCE(NULLIF(excluded.request, ''), summaries.request),
     investigated   = COALESCE(NULLIF(excluded.investigated, ''), summaries.investigated),
     learned        = COALESCE(NULLIF(excluded.learned, ''), summaries.learned),
@@ -57,7 +60,7 @@ eagle_get_recent_summaries() {
     local project; project=$(eagle_sql_escape "$1")
     local limit; limit=$(eagle_sql_int "${2:-5}")
 
-    eagle_db "SELECT s.request, s.completed, s.learned, s.next_steps, s.created_at, s.decisions, s.gotchas, s.key_files
+    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>%'
@@ -77,7 +80,7 @@ eagle_search_summaries() {
         where_clause="AND s.project = '$project'"
     fi
 
-    eagle_db "SELECT s.request, s.completed, s.learned, s.next_steps, s.created_at, s.project, s.decisions, s.gotchas, s.key_files
+    eagle_db "SELECT s.request, s.completed, s.learned, s.next_steps, s.created_at, s.project, s.decisions, s.gotchas, s.key_files, s.agent
               FROM summaries s
               JOIN summaries_fts f ON f.rowid = s.id
               WHERE summaries_fts MATCH '$query'

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_claude_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_claude_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_claude_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_claude_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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eagle-mem",
-  "version": "4.6.1",
-  "description": "Context that survives /compact for Claude Code — SQLite + FTS5, no daemon, no bloat",
+  "version": "4.7.0",
+  "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/curate.sh

@@ -398,46 +398,56 @@ if [ -n "$co_edit_data" ]; then
         eagle_info "  Co-edit pairs found:"
     fi
 
-    co_edit_count=0
-    declare -A co_map
-
-    while IFS='|' read -r f1 f2 co_sessions; do
-        [ -z "$f1" ] || [ -z "$f2" ] && continue
-
-        # Build comma-separated partner list per file (both directions)
-        if [ -n "${co_map[$f1]+x}" ]; then
-            co_map[$f1]="${co_map[$f1]},$f2"
-        else
-            co_map[$f1]="$f2"
-        fi
-        if [ -n "${co_map[$f2]+x}" ]; then
-            co_map[$f2]="${co_map[$f2]},$f1"
-        else
-            co_map[$f2]="$f1"
-        fi
-        co_edit_count=$((co_edit_count + 1))
-    done <<< "$co_edit_data"
+    # Use awk for associative map (Bash 3.2 compatible)
+    co_map_output=$(printf '%s\n' "$co_edit_data" | awk -F'|' '
+        $1 && $2 {
+            m[$1] = (m[$1] ? m[$1] "," : "") $2
+            m[$2] = (m[$2] ? m[$2] "," : "") $1
+            n++
+        }
+        END {
+            for (f in m) print f "|" m[f]
+            print "__co_edit_count__|" n "|" length(m) > "/dev/stderr"
+        }
+    ' 2>&1 1>/dev/null)
+    # stderr has the count line, stdout has the map lines — reverse:
+    co_map_output=$(printf '%s\n' "$co_edit_data" | awk -F'|' '
+        $1 && $2 {
+            m[$1] = (m[$1] ? m[$1] "," : "") $2
+            m[$2] = (m[$2] ? m[$2] "," : "") $1
+            n++
+        }
+        END {
+            for (f in m) print f "|" m[f]
+            printf "%s\n", "__META__|" n "|" length(m) > "/dev/stderr"
+        }
+    ' 2>/tmp/eagle_co_edit_meta)
+    co_edit_count=$(awk -F'|' '{print $2}' /tmp/eagle_co_edit_meta)
+    co_map_file_count=$(awk -F'|' '{print $3}' /tmp/eagle_co_edit_meta)
+    rm -f /tmp/eagle_co_edit_meta
 
     if [ "$DRY_RUN" -eq 1 ]; then
-        for f in "${!co_map[@]}"; do
-            eagle_info "    $(basename "$f") → ${co_map[$f]}"
+        printf '%s\n' "$co_map_output" | while IFS='|' read -r f partners; do
+            [ -z "$f" ] && continue
+            eagle_info "    $(basename "$f") → $partners"
         done
     else
         {
             echo "BEGIN;"
             echo "DELETE FROM file_hints WHERE project = '$(eagle_sql_escape "$project")' AND hint_type = 'co_edit';"
-            for f in "${!co_map[@]}"; do
+            printf '%s\n' "$co_map_output" | while IFS='|' read -r f partners; do
+                [ -z "$f" ] && continue
                 local_f=$(eagle_sql_escape "$f")
-                local_v=$(eagle_sql_escape "${co_map[$f]}")
+                local_v=$(eagle_sql_escape "$partners")
                 echo "INSERT INTO file_hints (project, hint_type, file_path, hint_value) VALUES ('$(eagle_sql_escape "$project")', 'co_edit', '$local_f', '$local_v') ON CONFLICT(project, hint_type, file_path) DO UPDATE SET hint_value = excluded.hint_value, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now');"
             done
             echo "COMMIT;"
         } | eagle_db_pipe
         _proj_hash=$(printf '%s' "$project" | shasum | cut -c1-8)
         touch "$EAGLE_MEM_DIR/.co-edit-active.${_proj_hash}"
-        eagle_log "INFO" "Curator: stored ${#co_map[@]} co-edit hints from $co_edit_count pairs"
+        eagle_log "INFO" "Curator: stored $co_map_file_count co-edit hints from $co_edit_count pairs"
     fi
-    eagle_ok "$co_edit_count co-edit pairs found (${#co_map[@]} files)"
+    eagle_ok "$co_edit_count co-edit pairs found ($co_map_file_count files)"
 else
     if [ "$DRY_RUN" -eq 0 ]; then
         eagle_delete_file_hints "$project" "co_edit"

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/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"
@@ -27,7 +27,7 @@ echo -e "    ${CYAN}overview${RESET}    Build or view project overview"
 echo -e "    ${CYAN}memories${RESET}    View/sync Claude Code 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,6 +39,11 @@ 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}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 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"