eagle-mem 4.6.1 → 4.7.0

package/hooks/session-start.sh

@@ -24,6 +24,8 @@ session_id=$(echo "$input" | jq -r '.session_id // empty')
 cwd=$(echo "$input" | jq -r '.cwd // empty')
 source_type=$(echo "$input" | jq -r '.source // empty')
 model=$(echo "$input" | jq -r '.model // empty')
+agent=$(eagle_agent_source_from_json "$input")
+agent_label=$(eagle_agent_label "$agent")
 
 [ -z "$session_id" ] && exit 0
 
@@ -32,9 +34,9 @@ project=$(eagle_project_from_cwd "$cwd")
 
 p_esc=$(eagle_sql_escape "$project")
 
-eagle_log "INFO" "SessionStart: session=$session_id project=$project source=$source_type"
+eagle_log "INFO" "SessionStart: session=$session_id project=$project source=$source_type agent=$agent"
 
-eagle_upsert_session "$session_id" "$project" "$cwd" "$model" "$source_type"
+eagle_upsert_session "$session_id" "$project" "$cwd" "$model" "$source_type" "$agent"
 eagle_abandon_stale_sessions "$session_id"
 
 # ─── Reset turn counter on compact/clear ─────────────────
@@ -90,7 +92,8 @@ fi
 
 # ─── Gather stats ────────────────────────────────────────
 
-stat_sessions=0; stat_summaries=0; stat_with_summaries=0; stat_memories=0
+stat_sessions=0; stat_sessions_claude=0; stat_sessions_codex=0
+stat_summaries=0; stat_with_summaries=0; stat_memories=0
 stat_tasks_pending=0; stat_tasks_progress=0; stat_tasks_done=0
 stat_chunks=0; stat_observations=0; stat_plans=0
 stat_last_active="never"; stat_last_summary=""
@@ -98,6 +101,8 @@ stat_last_active="never"; stat_last_summary=""
 while IFS='|' read -r key val; do
     case "$key" in
         sessions)        stat_sessions="$val" ;;
+        sessions_claude) stat_sessions_claude="$val" ;;
+        sessions_codex)  stat_sessions_codex="$val" ;;
         summaries)       stat_summaries="$val" ;;
         with_summaries)  stat_with_summaries="$val" ;;
         memories)        stat_memories="$val" ;;
@@ -132,7 +137,12 @@ eagle_banner="======================================
        Eagle Mem Recall Ready
 ======================================
  Project      | $project
+ Agent        | $agent_label
  Sessions     | $stat_sessions ($stat_with_summaries with summaries)"
+if [ "$stat_sessions_codex" -gt 0 ] || [ "$stat_sessions_claude" -gt 0 ]; then
+    eagle_banner+="
+ Sources      | Claude $stat_sessions_claude, Codex $stat_sessions_codex"
+fi
 [ "$stat_memories" -gt 0 ] && eagle_banner+="
  Memories     | $stat_memories stored"
 [ "$stat_plans" -gt 0 ] && eagle_banner+="
@@ -188,10 +198,13 @@ if [ -n "$recent" ]; then
     context+="
 === Eagle Mem: Recent Recall ===
 "
-    while IFS='|' read -r request completed learned next_steps created_at decisions gotchas key_files; do
+    while IFS='|' read -r request completed learned next_steps created_at decisions gotchas key_files summary_agent; do
         [ -z "$request" ] && [ -z "$completed" ] && continue
+        summary_agent_label=$(eagle_agent_label "$summary_agent")
         context+="
 --- $created_at ---"
+        [ -n "$summary_agent" ] && context+="
+Source: $summary_agent_label"
         [ -n "$request" ] && context+="
 Request: $request"
         [ -n "$completed" ] && context+="
@@ -213,7 +226,7 @@ fi
 
 # ─── Memories (skip if none) ─────────────────────────────
 
-memories=$(eagle_db "SELECT memory_name, memory_type, description, file_path, updated_at,
+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
     WHERE project = '$p_esc'
@@ -223,8 +236,9 @@ if [ -n "$memories" ]; then
     context+="
 === Eagle Mem: Stored Memories ===
 "
-    while IFS='|' read -r mname mtype mdesc _fpath _updated days_ago; do
+    while IFS='|' read -r mname mtype mdesc _fpath _updated morigin days_ago; do
         [ -z "$mname" ] && continue
+        origin_label=$(eagle_agent_label "$morigin")
         age_label=""
         if [ -n "$days_ago" ] && [ "$days_ago" -gt 0 ] 2>/dev/null; then
             if [ "$days_ago" -eq 1 ]; then
@@ -235,7 +249,7 @@ if [ -n "$memories" ]; then
         else
             age_label=" (today)"
         fi
-        context+="  - [$mtype] $mname: $mdesc$age_label
+        context+="  - [$mtype][$origin_label] $mname: $mdesc$age_label
 "
     done <<< "$memories"
 fi
@@ -247,16 +261,17 @@ if [ -n "$plans" ]; then
     context+="
 === Eagle Mem: Plans ===
 "
-    while IFS='|' read -r ptitle _pproj _fpath _updated; do
+    while IFS='|' read -r ptitle _pproj _fpath _updated porigin; do
         [ -z "$ptitle" ] && continue
-        context+="  - $ptitle
+        origin_label=$(eagle_agent_label "$porigin")
+        context+="  - [$origin_label] $ptitle
 "
     done <<< "$plans"
 fi
 
 # ─── Tasks (skip if none) ────────────────────────────────
 
-synced_tasks=$(eagle_db "SELECT subject, status, blocked_by FROM claude_tasks
+synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM claude_tasks
     WHERE project = '$p_esc'
     AND status IN ('in_progress', 'pending')
     AND updated_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now', '-7 days')
@@ -268,17 +283,40 @@ if [ -n "$synced_tasks" ]; then
     context+="
 === Eagle Mem: Tasks ===
 "
-    while IFS='|' read -r tsubject tstatus tblocked; do
+    while IFS='|' read -r tsubject tstatus tblocked torigin; do
         [ -z "$tsubject" ] && continue
+        origin_label=$(eagle_agent_label "$torigin")
         block_marker=""
         if [ "$tblocked" != "[]" ] && [ -n "$tblocked" ]; then
             block_marker=" (blocked)"
         fi
-        context+="  - [$tstatus] $tsubject$block_marker
+        context+="  - [$tstatus][$origin_label] $tsubject$block_marker
 "
     done <<< "$synced_tasks"
 fi
 
+# ─── Pending feature verifications ───────────────────────
+
+pending_features=$(eagle_list_pending_feature_verifications "$project" 10 2>/dev/null)
+if [ -n "$pending_features" ]; then
+    context+="
+=== Eagle Mem: Pending Feature Verification ===
+Release-boundary commands are blocked until these are verified or waived.
+"
+    while IFS='|' read -r pf_id pf_name pf_file pf_reason _pf_trigger _pf_created pf_smoke pfingerprint; do
+        [ -z "$pf_id" ] && continue
+        context+="  - #${pf_id} ${pf_name}"
+        [ -n "$pf_file" ] && context+=" (${pf_file})"
+        [ -n "$pf_reason" ] && context+=" — ${pf_reason}"
+        [ -n "$pf_smoke" ] && context+=" | smoke: ${pf_smoke}"
+        [ -n "$pfingerprint" ] && context+=" | diff: ${pfingerprint}"
+        context+="
+"
+    done <<< "$pending_features"
+    context+="Resolve with: eagle-mem feature verify <name> --notes \"what passed\"; or eagle-mem feature waive <id> --reason \"why safe\".
+"
+fi
+
 # ─── Core files (hot file hints from curator) ───────────
 
 hot_files=$(eagle_get_hot_files "$project")
@@ -334,12 +372,15 @@ next_steps: [concrete actions]
 key_files: [path — role]
 files_read: [path, ...]
 files_modified: [path, ...]
+affected_features: [feature, ...]
+verified_features: [feature, ...]
+regression_risks: [risk, ...]
 </eagle-summary>
 "
 fi
 
 if [ -n "$context" ]; then
-    echo "$context"
+    eagle_emit_context_for_agent "$agent" "SessionStart" "$context"
 fi
 
 exit 0

package/hooks/stop.sh

@@ -23,6 +23,8 @@ input=$(eagle_read_stdin)
 session_id=$(echo "$input" | jq -r '.session_id // empty')
 cwd=$(echo "$input" | jq -r '.cwd // empty')
 transcript_path=$(echo "$input" | jq -r '.transcript_path // empty')
+last_assistant_message=$(echo "$input" | jq -r '.last_assistant_message // empty')
+agent=$(eagle_agent_source_from_json "$input")
 
 [ -z "$session_id" ] && exit 0
 
@@ -33,25 +35,62 @@ agent_type=$(echo "$input" | jq -r '.agent_type // empty')
 project=$(eagle_project_from_cwd "$cwd")
 [ -z "$project" ] && exit 0
 
-eagle_log "INFO" "Stop: session=$session_id project=$project transcript=$transcript_path"
+eagle_log "INFO" "Stop: session=$session_id project=$project transcript=$transcript_path agent=$agent"
 
 # Ensure session exists (may not if SessionStart didn't fire)
-eagle_upsert_session "$session_id" "$project" "$cwd" "" ""
-
-[ -z "$transcript_path" ] || [ ! -f "$transcript_path" ] && exit 0
+eagle_upsert_session "$session_id" "$project" "$cwd" "" "" "$agent"
+
+# Reconcile from git diff, not only from edit-tool hooks. This keeps
+# anti-regression agent-agnostic: Claude, Codex, manual edits, and script edits
+# all become visible before a release boundary.
+if [ -n "$cwd" ] && [ -d "$cwd" ]; then
+    changed_files=$(eagle_changed_files_for_release "$cwd")
+    if [ -n "$changed_files" ]; then
+        eagle_reconcile_current_feature_verifications "$project" "$cwd" "$session_id" "Stop" "Repository diff detected at turn end" "$changed_files" >/dev/null
+    fi
+fi
 
 # ─── Primary: heuristic extraction from transcript ───────────
 
-request=$(jq -r 'select(.type == "user") | .message.content | if type == "string" then . elif type == "array" then [.[] | select(.type == "text") | .text] | join(" ") else "" end' "$transcript_path" 2>/dev/null \
-    | grep -v '<local-command-caveat>' \
-    | grep -v '<system-reminder>' \
-    | grep -v '<command-name>' \
-    | grep -v '<command-message>' \
-    | grep -v '^\[{' \
-    | head -1 | cut -c1-500)
+request=""
+heuristic_reads=""
+heuristic_writes=""
+
+if [ -n "$transcript_path" ] && [ -f "$transcript_path" ]; then
+    request=$(jq -r 'select(.type == "user") | .message.content | if type == "string" then . elif type == "array" then [.[] | select(.type == "text") | .text] | join(" ") else "" end' "$transcript_path" 2>/dev/null \
+        | grep -v '<local-command-caveat>' \
+        | grep -v '<system-reminder>' \
+        | grep -v '<command-name>' \
+        | grep -v '<command-message>' \
+        | grep -v '^\[{' \
+        | head -1 | cut -c1-500)
+
+    if [ -z "$request" ]; then
+        request=$(jq -r '
+            select(.type == "response_item" and .payload.role == "user")
+            | .payload.content
+            | if type == "string" then .
+              elif type == "array" then [.[]? | select(.type == "input_text" or .type == "text") | .text] | join(" ")
+              else "" end
+        ' "$transcript_path" 2>/dev/null \
+            | grep -v '<local-command-caveat>' \
+            | grep -v '<system-reminder>' \
+            | grep -v '<command-name>' \
+            | grep -v '<command-message>' \
+            | grep -v '^\[{' \
+            | head -1 | cut -c1-500)
+    fi
+
+    if [ -z "$request" ]; then
+        request=$(jq -r 'select(.type == "event_msg" and .payload.type == "user_message") | .payload.message // empty' "$transcript_path" 2>/dev/null \
+            | grep -v '<local-command-caveat>' \
+            | grep -v '<system-reminder>' \
+            | head -1 | cut -c1-500)
+    fi
 
-heuristic_reads=$(jq -r 'select(.type == "assistant") | .message.content[]? | select(.type == "tool_use") | select(.name == "Read") | .input.file_path // empty' "$transcript_path" 2>/dev/null | sort -u | head -20)
-heuristic_writes=$(jq -r 'select(.type == "assistant") | .message.content[]? | select(.type == "tool_use") | select(.name == "Write" or .name == "Edit") | .input.file_path // empty' "$transcript_path" 2>/dev/null | sort -u | head -20)
+    heuristic_reads=$(jq -r 'select(.type == "assistant") | .message.content[]? | select(.type == "tool_use") | select(.name == "Read") | .input.file_path // empty' "$transcript_path" 2>/dev/null | sort -u | head -20)
+    heuristic_writes=$(jq -r 'select(.type == "assistant") | .message.content[]? | select(.type == "tool_use") | select(.name == "Write" or .name == "Edit") | .input.file_path // empty' "$transcript_path" 2>/dev/null | sort -u | head -20)
+fi
 
 files_read="[]"
 files_modified="[]"
@@ -70,17 +109,46 @@ notes=""
 decisions=""
 gotchas=""
 key_files=""
+affected_features=""
+verified_features=""
+regression_risks=""
 
 eagle_log "INFO" "Stop: heuristic extraction complete"
 
 # ─── Bonus: eagle-summary block overrides where present ──────
 
-text_content=$(jq -rs '
-    [.[] | select(.type == "assistant")] | last |
-    if . then
-        [.message.content[]? | select(.type == "text") | .text] | join("\n")
-    else "" end
-' "$transcript_path" 2>/dev/null)
+if [ -n "$transcript_path" ] && [ -f "$transcript_path" ]; then
+    text_content=$(jq -r -s '
+        [.[] | select(.type == "assistant")] | last |
+        if . then
+            [.message.content[]? | select(.type == "text") | .text] | join("\n")
+        else "" end
+    ' "$transcript_path" 2>/dev/null)
+
+    if [ -z "$text_content" ]; then
+        text_content=$(jq -r -s '
+            def content_text:
+                if type == "string" then .
+                elif type == "array" then
+                    [.[]? | select(.type == "output_text" or .type == "text") | (.text // empty)] | join("\n")
+                else "" end;
+
+            (
+                [.[] | select(.type == "response_item" and .payload.role == "assistant") | (.payload.content | content_text)]
+                | map(select(. != ""))
+                | last
+            ) // (
+                [.[] | select(.type == "event_msg" and .payload.type == "agent_message") | (.payload.message // "")]
+                | map(select(. != ""))
+                | last
+            ) // ""
+        ' "$transcript_path" 2>/dev/null)
+    fi
+fi
+
+if [ -z "$text_content" ]; then
+    text_content="$last_assistant_message"
+fi
 
 # Strip <private>...</private> blocks
 text_content=$(echo "$text_content" | sed -E '/<[Pp][Rr][Ii][Vv][Aa][Tt][Ee][^>]*>/,/<\/[Pp][Rr][Ii][Vv][Aa][Tt][Ee][[:space:]]*>/d')
@@ -99,7 +167,7 @@ if [ -n "$summary_block" ]; then
             $0 ~ "^"f":" {
                 sub("^"f":[[:space:]]*", ""); found=1; val=$0; next
             }
-            found && /^(request|investigated|learned|completed|next_steps|files_read|files_modified|notes|decisions|gotchas|key_files):/ { exit }
+            found && /^(request|investigated|learned|completed|next_steps|files_read|files_modified|notes|decisions|gotchas|key_files|affected_features|verified_features|regression_risks):/ { exit }
             found { val = val " " $0 }
             END { if (found) print val }
         '
@@ -114,6 +182,9 @@ if [ -n "$summary_block" ]; then
     _val=$(parse_field "$summary_block" "decisions");     [ -n "$_val" ] && decisions="$_val"
     _val=$(parse_field "$summary_block" "gotchas");       [ -n "$_val" ] && gotchas="$_val"
     _val=$(parse_field "$summary_block" "key_files");     [ -n "$_val" ] && key_files="$_val"
+    _val=$(parse_field "$summary_block" "affected_features"); [ -n "$_val" ] && affected_features="$_val"
+    _val=$(parse_field "$summary_block" "verified_features"); [ -n "$_val" ] && verified_features="$_val"
+    _val=$(parse_field "$summary_block" "regression_risks");  [ -n "$_val" ] && regression_risks="$_val"
 
     # Convert bracket-list to JSON array
     to_json_array() {
@@ -295,11 +366,33 @@ next_steps=$(echo "$next_steps" | eagle_redact)
 decisions=$(echo "$decisions" | eagle_redact)
 gotchas=$(echo "$gotchas" | eagle_redact)
 key_files=$(echo "$key_files" | eagle_redact)
+notes=$(echo "$notes" | eagle_redact)
+affected_features=$(echo "$affected_features" | eagle_redact)
+verified_features=$(echo "$verified_features" | eagle_redact)
+regression_risks=$(echo "$regression_risks" | eagle_redact)
+
+regression_notes=""
+[ -n "$affected_features" ] && regression_notes+="affected_features: $affected_features"
+if [ -n "$verified_features" ]; then
+    [ -n "$regression_notes" ] && regression_notes+="; "
+    regression_notes+="verified_features: $verified_features"
+fi
+if [ -n "$regression_risks" ]; then
+    [ -n "$regression_notes" ] && regression_notes+="; "
+    regression_notes+="regression_risks: $regression_risks"
+fi
+if [ -n "$regression_notes" ]; then
+    if [ -n "$notes" ]; then
+        notes="${notes}; ${regression_notes}"
+    else
+        notes="$regression_notes"
+    fi
+fi
 
 # ─── Write to database ─────────────────────────────────────
 
 if [ -n "$request" ] || [ -n "$completed" ] || [ -n "$learned" ]; then
-    if eagle_insert_summary "$session_id" "$project" "$request" "$investigated" "$learned" "$completed" "$next_steps" "$files_read" "$files_modified" "$notes" "$decisions" "$gotchas" "$key_files"; then
+    if eagle_insert_summary "$session_id" "$project" "$request" "$investigated" "$learned" "$completed" "$next_steps" "$files_read" "$files_modified" "$notes" "$decisions" "$gotchas" "$key_files" "$agent"; then
         eagle_log "INFO" "Stop: summary saved for session=$session_id"
     else
         eagle_log "ERROR" "Stop: summary insert FAILED for session=$session_id — check DB constraints"

package/hooks/user-prompt-submit.sh

@@ -20,6 +20,7 @@ input=$(eagle_read_stdin)
 session_id=$(echo "$input" | jq -r '.session_id // empty')
 cwd=$(echo "$input" | jq -r '.cwd // empty')
 user_prompt=$(echo "$input" | jq -r '.prompt // empty')
+agent=$(eagle_agent_source_from_json "$input")
 
 [ -z "$user_prompt" ] && exit 0
 
@@ -60,7 +61,10 @@ fi
 
 # Skip short prompts — not enough signal for meaningful search
 word_count=$(echo "$user_prompt" | wc -w | tr -d ' ')
-[ "$word_count" -lt 3 ] && { [ -n "$context" ] && echo "$context"; exit 0; }
+if [ "$word_count" -lt 3 ]; then
+    eagle_emit_context_for_agent "$agent" "UserPromptSubmit" "$context"
+    exit 0
+fi
 
 # Build FTS5 query from significant words (drop stop words, take first 6)
 fts_query=$(echo "$user_prompt" | tr -cs '[:alnum:]' ' ' | tr '[:upper:]' '[:lower:]' | \
@@ -75,7 +79,10 @@ fts_query=$(echo "$user_prompt" | tr -cs '[:alnum:]' ' ' | tr '[:upper:]' '[:low
         }
     }')
 
-[ -z "$fts_query" ] && { [ -n "$context" ] && echo "$context"; exit 0; }
+if [ -z "$fts_query" ]; then
+    eagle_emit_context_for_agent "$agent" "UserPromptSubmit" "$context"
+    exit 0
+fi
 
 # Search for relevant past summaries (cross-session)
 results=$(eagle_search_summaries "$fts_query" "$project" 3)
@@ -83,9 +90,10 @@ results=$(eagle_search_summaries "$fts_query" "$project" 3)
 if [ -n "$results" ]; then
     context+="=== Eagle Mem: Relevant Recall ===
 "
-    while IFS='|' read -r req completed learned _next_steps created_at _proj decisions gotchas key_files; do
+    while IFS='|' read -r req completed learned _next_steps created_at _proj decisions gotchas key_files summary_agent; do
         [ -z "$req" ] && [ -z "$completed" ] && continue
-        context+="[$created_at] "
+        origin_label=$(eagle_agent_label "$summary_agent")
+        context+="[$created_at][$origin_label] "
         [ -n "$req" ] && context+="$req"
         [ -n "$completed" ] && context+=" → $completed"
         [ -n "$learned" ] && context+=" (Learned: $learned)"
@@ -126,5 +134,5 @@ IMPORTANT: When Eagle Mem finds relevant memories or code for the user's prompt,
 === Eagle Mem: Persistent Memory ===
 "
 
-echo "$context"
+eagle_emit_context_for_agent "$agent" "UserPromptSubmit" "$context"
 exit 0

package/lib/codex-hooks.sh

@@ -0,0 +1,194 @@
+#!/usr/bin/env bash
+# ═══════════════════════════════════════════════════════════
+# Eagle Mem — Codex hook registration helpers
+# Shared by install.sh, update.sh, and uninstall.sh
+# ═══════════════════════════════════════════════════════════
+[ -n "${_EAGLE_CODEX_HOOKS_LOADED:-}" ] && return 0
+_EAGLE_CODEX_HOOKS_LOADED=1
+
+eagle_enable_codex_hooks() {
+    local config="$EAGLE_CODEX_CONFIG"
+    mkdir -p "$(dirname "$config")"
+
+    if [ ! -f "$config" ]; then
+        cat > "$config" << 'TOML'
+[features]
+codex_hooks = true
+TOML
+        chmod 600 "$config" 2>/dev/null || true
+        return 0
+    fi
+
+    local tmp
+    tmp=$(mktemp)
+    awk '
+        BEGIN { in_features=0; saw_features=0; saw_flag=0; inserted=0 }
+        /^[[:space:]]*\[features\][[:space:]]*$/ {
+            saw_features=1
+            in_features=1
+            print
+            next
+        }
+        /^[[:space:]]*\[/ && in_features {
+            if (!saw_flag && !inserted) {
+                print "codex_hooks = true"
+                inserted=1
+            }
+            in_features=0
+        }
+        in_features && /^[[:space:]]*codex_hooks[[:space:]]*=/ {
+            print "codex_hooks = true"
+            saw_flag=1
+            next
+        }
+        { print }
+        END {
+            if (in_features && !saw_flag && !inserted) {
+                print "codex_hooks = true"
+                inserted=1
+            }
+            if (!saw_features) {
+                print ""
+                print "[features]"
+                print "codex_hooks = true"
+            }
+        }
+    ' "$config" > "$tmp" && mv "$tmp" "$config"
+    chmod 600 "$config" 2>/dev/null || true
+}
+
+eagle_patch_codex_hook() {
+    local hooks_file="$1"
+    local event="$2"
+    local matcher="$3"
+    local command="$4"
+    local description="${5:-}"
+    local status_message="${6:-}"
+    local timeout="${7:-}"
+    local script_path="$command"
+    script_path="${script_path#EAGLE_AGENT_SOURCE=codex bash \"}"
+    script_path="${script_path#bash \"}"
+    script_path="${script_path%\"}"
+
+    mkdir -p "$(dirname "$hooks_file")"
+    if [ ! -f "$hooks_file" ]; then
+        printf '{"hooks":{}}\n' > "$hooks_file"
+        chmod 600 "$hooks_file" 2>/dev/null || true
+    fi
+
+    local match_query
+    if [ -n "$matcher" ]; then
+        match_query='.hooks[$event][]? | select(.matcher == $matcher and (.hooks[]?.command == $command))'
+    else
+        match_query='.hooks[$event][]? | select((.matcher == null or .matcher == "") and (.hooks[]?.command == $command))'
+    fi
+    if jq -e --arg event "$event" --arg matcher "$matcher" --arg command "$command" "$match_query" "$hooks_file" &>/dev/null; then
+        [ -n "$description" ] && eagle_ok "$description ${DIM}(already registered)${RESET}"
+        return 0
+    fi
+
+    if jq -e --arg event "$event" --arg matcher "$matcher" --arg script "$script_path" '
+        .hooks[$event][]?
+        | select((($matcher == "" and (.matcher == null or .matcher == "")) or .matcher == $matcher)
+                 and any(.hooks[]?; (.command // "") | contains($script)))
+    ' "$hooks_file" &>/dev/null; then
+        local tmp_existing
+        tmp_existing=$(mktemp)
+        jq --arg event "$event" --arg matcher "$matcher" --arg script "$script_path" --arg command "$command" '
+            .hooks[$event] |= map(
+                if ((($matcher == "" and (.matcher == null or .matcher == "")) or .matcher == $matcher)
+                    and any(.hooks[]?; (.command // "") | contains($script)))
+                then .hooks |= map(if ((.command // "") | contains($script)) then .command = $command else . end)
+                else .
+                end
+            )
+        ' "$hooks_file" > "$tmp_existing" && mv "$tmp_existing" "$hooks_file"
+        [ -n "$description" ] && eagle_ok "$description ${DIM}(updated)${RESET}"
+        return 0
+    fi
+
+    local entry
+    entry=$(jq -nc \
+        --arg m "$matcher" \
+        --arg c "$command" \
+        --arg s "$status_message" \
+        --arg timeout "$timeout" '
+        {
+            hooks: [
+                {
+                    type: "command",
+                    command: $c
+                }
+                + (if $s == "" then {} else {statusMessage: $s} end)
+                + (if $timeout == "" then {} else {timeout: ($timeout | tonumber)} end)
+            ]
+        }
+        + (if $m == "" then {} else {matcher: $m} end)')
+
+    local tmp
+    tmp=$(mktemp)
+    jq --argjson entry "$entry" ".hooks.${event} = ((.hooks.${event} // []) + [\$entry])" "$hooks_file" > "$tmp" && mv "$tmp" "$hooks_file"
+    chmod 600 "$hooks_file" 2>/dev/null || true
+    [ -n "$description" ] && eagle_ok "$description"
+}
+
+eagle_register_codex_hooks() {
+    eagle_enable_codex_hooks
+
+    eagle_patch_codex_hook "$EAGLE_CODEX_HOOKS" "SessionStart" "startup|resume|clear" \
+        "EAGLE_AGENT_SOURCE=codex bash \"$EAGLE_MEM_DIR/hooks/session-start.sh\"" \
+        "Codex SessionStart hook" \
+        "Loading Eagle Mem recall" \
+        "30"
+
+    eagle_patch_codex_hook "$EAGLE_CODEX_HOOKS" "UserPromptSubmit" "" \
+        "EAGLE_AGENT_SOURCE=codex bash \"$EAGLE_MEM_DIR/hooks/user-prompt-submit.sh\"" \
+        "Codex UserPromptSubmit hook" \
+        "Searching Eagle Mem" \
+        "30"
+
+    eagle_patch_codex_hook "$EAGLE_CODEX_HOOKS" "PreToolUse" "^(Bash|exec_command|shell_command|unified_exec|apply_patch|Edit|Write)$" \
+        "EAGLE_AGENT_SOURCE=codex bash \"$EAGLE_MEM_DIR/hooks/pre-tool-use.sh\"" \
+        "Codex PreToolUse hook" \
+        "Checking Eagle Mem guardrails" \
+        "30"
+
+    eagle_patch_codex_hook "$EAGLE_CODEX_HOOKS" "PostToolUse" "^(Bash|exec_command|shell_command|unified_exec|apply_patch|Edit|Write)$" \
+        "EAGLE_AGENT_SOURCE=codex bash \"$EAGLE_MEM_DIR/hooks/post-tool-use.sh\"" \
+        "Codex PostToolUse hook" \
+        "Recording Eagle Mem observation" \
+        "30"
+
+    eagle_patch_codex_hook "$EAGLE_CODEX_HOOKS" "Stop" "" \
+        "EAGLE_AGENT_SOURCE=codex bash \"$EAGLE_MEM_DIR/hooks/stop.sh\"" \
+        "Codex Stop hook" \
+        "Saving Eagle Mem summary" \
+        "30"
+}
+
+eagle_remove_codex_hooks() {
+    local hooks_file="$EAGLE_CODEX_HOOKS"
+    [ -f "$hooks_file" ] || return 1
+    command -v jq &>/dev/null || return 1
+
+    local tmp
+    tmp=$(mktemp)
+    jq '
+        def without_eagle_mem_handlers:
+            .hooks = ((.hooks // [])
+                | map(select(((.command // "") | contains(".eagle-mem/hooks/")) | not)));
+
+        if .hooks then
+            .hooks |= with_entries(
+                .value = [
+                    .value[]?
+                    | without_eagle_mem_handlers
+                    | select((.hooks // []) | length > 0)
+                ]
+                | select(.value != [])
+            )
+        else . end
+        | if .hooks == {} then del(.hooks) else . end
+    ' "$hooks_file" > "$tmp" && mv "$tmp" "$hooks_file"
+    chmod 600 "$hooks_file" 2>/dev/null || true
+}