eagle-mem 4.7.0 → 4.8.0

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"
@@ -26,6 +27,8 @@ 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")
+codex_compact=0
+[ "$agent" = "codex" ] && codex_compact=1
 
 [ -z "$session_id" ] && exit 0
 
@@ -130,8 +133,7 @@ if [ "$stat_tasks_done" -gt 0 ]; then
     task_parts+="${stat_tasks_done} completed"
 fi
 
-stat_last_display="${stat_last_summary:0:60}"
-[ ${#stat_last_summary} -gt 60 ] && stat_last_display+="..."
+stat_last_display=$(eagle_trim_text "$stat_last_summary" 60)
 
 eagle_banner="======================================
        Eagle Mem Recall Ready
@@ -166,13 +168,20 @@ $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")
 if [ -n "$overview" ]; then
-    if [ ${#overview} -gt 500 ]; then
-        overview="${overview:0:497}..."
-    fi
+    overview_limit=500
+    [ "$codex_compact" -eq 1 ] && overview_limit=320
+    overview=$(eagle_trim_text "$overview" "$overview_limit")
     context+="
 === Eagle Mem: Project Overview ===
 $overview
@@ -188,8 +197,10 @@ fi
 
 if [ "$source_type" = "compact" ] || [ "$source_type" = "clear" ]; then
     _summary_limit=1
+elif [ "$codex_compact" -eq 1 ]; then
+    _summary_limit=1
 else
-    _summary_limit=3
+    _summary_limit=2
 fi
 
 recent=$(eagle_get_recent_summaries "$project" "$_summary_limit")
@@ -201,6 +212,21 @@ if [ -n "$recent" ]; then
     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")
+        request=$(eagle_trim_text "$request" 160)
+        completed=$(eagle_trim_text "$completed" 220)
+        learned=$(eagle_trim_text "$learned" 180)
+        decisions=$(eagle_trim_text "$decisions" 160)
+        gotchas=$(eagle_trim_text "$gotchas" 160)
+        key_files=$(eagle_trim_text "$key_files" 160)
+        next_steps=$(eagle_trim_text "$next_steps" 160)
+        if [ "$codex_compact" -eq 1 ]; then
+            request=$(eagle_trim_text "$request" 120)
+            completed=$(eagle_trim_text "$completed" 160)
+            learned=$(eagle_trim_text "$learned" 120)
+            decisions=""
+            key_files=""
+            next_steps=""
+        fi
         context+="
 --- $created_at ---"
         [ -n "$summary_agent" ] && context+="
@@ -226,12 +252,14 @@ fi
 
 # ─── Memories (skip if none) ─────────────────────────────
 
+memory_limit=3
+[ "$codex_compact" -eq 1 ] && memory_limit=2
 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;")
+    LIMIT $memory_limit;")
 if [ -n "$memories" ]; then
     context+="
 === Eagle Mem: Stored Memories ===
@@ -239,6 +267,7 @@ if [ -n "$memories" ]; then
     while IFS='|' read -r mname mtype mdesc _fpath _updated morigin days_ago; do
         [ -z "$mname" ] && continue
         origin_label=$(eagle_agent_label "$morigin")
+        mdesc=$(eagle_trim_text "$mdesc" 180)
         age_label=""
         if [ -n "$days_ago" ] && [ "$days_ago" -gt 0 ] 2>/dev/null; then
             if [ "$days_ago" -eq 1 ]; then
@@ -256,7 +285,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,14 +300,17 @@ fi
 
 # ─── Tasks (skip if none) ────────────────────────────────
 
-synced_tasks=$(eagle_db "SELECT subject, status, blocked_by, origin_agent FROM claude_tasks
+task_limit=5
+[ "$codex_compact" -eq 1 ] && task_limit=3
+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 source_session_id != 'orchestration'
     AND updated_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now', '-7 days')
     ORDER BY
         CASE status WHEN 'in_progress' THEN 0 ELSE 1 END,
         updated_at DESC
-    LIMIT 10;")
+    LIMIT $task_limit;")
 if [ -n "$synced_tasks" ]; then
     context+="
 === Eagle Mem: Tasks ===
@@ -295,10 +327,54 @@ if [ -n "$synced_tasks" ]; then
     done <<< "$synced_tasks"
 fi
 
+# ─── Orchestration lanes (skip if none) ───────────────────
+
+lane_limit=8
+[ "$codex_compact" -eq 1 ] && lane_limit=4
+orchestration_lanes=$(eagle_db "SELECT o.name, o.goal, l.lane_key, l.title,
+        COALESCE(REPLACE(REPLACE(l.description, char(10), ' '), '|', '/'), ''),
+        l.agent, l.status, l.validation, l.worktree_path, l.notes
+    FROM orchestration_lanes l
+    JOIN orchestrations o ON o.id = l.orchestration_id
+    WHERE l.project = '$p_esc'
+      AND o.status = 'active'
+      AND l.status IN ('in_progress', 'pending', 'blocked')
+    ORDER BY
+        CASE l.status WHEN 'in_progress' THEN 0 WHEN 'blocked' THEN 1 ELSE 2 END,
+        l.updated_at DESC
+    LIMIT $lane_limit;" 2>/dev/null)
+if [ -n "$orchestration_lanes" ]; then
+    context+="
+=== Eagle Mem: Orchestration Lanes ===
+"
+    while IFS='|' read -r oname ogoal lkey ltitle ldesc lagent lstatus lvalidation lworktree lnotes; do
+        [ -z "$lkey" ] && continue
+        origin_label=$(eagle_agent_label "$lagent")
+        context+="  - [$lstatus][$origin_label] $lkey: $ltitle"
+        if [ -n "$ldesc" ]; then
+            desc_limit=220
+            [ "$codex_compact" -eq 1 ] && desc_limit=120
+            context+=" | scope: $(eagle_trim_text "$ldesc" "$desc_limit")"
+        fi
+        [ -n "$oname" ] && context+=" | plan: $oname"
+        [ -n "$lvalidation" ] && context+=" | validate: $lvalidation"
+        [ -n "$lworktree" ] && context+=" | worktree: $lworktree"
+        [ -n "$lnotes" ] && context+=" | notes: $lnotes"
+        context+="
+"
+    done <<< "$orchestration_lanes"
+    context+="You, the active agent, must run 'eagle-mem orchestrate' before taking lane work. Do not ask the user to run these commands. Update lane status when work starts, blocks, or completes.
+"
+fi
+
 # ─── Pending feature verifications ───────────────────────
 
-pending_features=$(eagle_list_pending_feature_verifications "$project" 10 2>/dev/null)
+pending_limit=5
+[ "$codex_compact" -eq 1 ] && pending_limit=3
+pending_features=$(eagle_list_pending_feature_verifications "$project" "$pending_limit" 2>/dev/null)
 if [ -n "$pending_features" ]; then
+    pending_total=$(eagle_db "SELECT COUNT(*) FROM pending_feature_verifications WHERE project = '$p_esc' AND status = 'pending';" 2>/dev/null)
+    pending_total=${pending_total:-0}
     context+="
 === Eagle Mem: Pending Feature Verification ===
 Release-boundary commands are blocked until these are verified or waived.
@@ -313,6 +389,10 @@ Release-boundary commands are blocked until these are verified or waived.
         context+="
 "
     done <<< "$pending_features"
+    if [ "$pending_total" -gt "$pending_limit" ] 2>/dev/null; then
+        context+="  - ... $((pending_total - pending_limit)) more pending; run: eagle-mem feature pending
+"
+    fi
     context+="Resolve with: eagle-mem feature verify <name> --notes \"what passed\"; or eagle-mem feature waive <id> --reason \"why safe\".
 "
 fi
@@ -326,9 +406,14 @@ if [ -n "$hot_files" ]; then
 Frequently read — re-read sparingly if unchanged.
 "
     IFS=',' read -ra hf_arr <<< "$hot_files"
+    hf_count=0
+    hot_file_limit=8
+    [ "$codex_compact" -eq 1 ] && hot_file_limit=5
     for hf in "${hf_arr[@]}"; do
+        [ "$hf_count" -ge "$hot_file_limit" ] && break
         [ -n "$hf" ] && context+="  - $(basename "$hf")
 "
+        hf_count=$((hf_count + 1))
     done
 fi
 
@@ -351,7 +436,12 @@ fi
 
 # ─── Instructions (compressed) ───────────────────────────
 
-if [ "$source_type" = "compact" ] || [ "$source_type" = "clear" ]; then
+if [ "$agent" = "codex" ]; then
+    context+="
+=== Eagle Mem: Active ===
+Memory active for '$project'. Emit <eagle-summary> in final responses with request, completed, learned, decisions, gotchas, next_steps, key_files, files_read, files_modified, affected_features, verified_features, and regression_risks.
+"
+elif [ "$source_type" = "compact" ] || [ "$source_type" = "clear" ]; then
     context+="
 === Eagle Mem: Active ===
 Memory active. Attribute recalled context to Eagle Mem. Do not revert PostToolUse-surfaced decisions without asking. Emit <eagle-summary> before final response.

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"
@@ -56,14 +57,22 @@ 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>' \
+eagle_clean_request_candidates() {
+    grep -v '<local-command-caveat>' \
         | grep -v '<system-reminder>' \
         | grep -v '<command-name>' \
         | grep -v '<command-message>' \
         | grep -v '^\[{' \
-        | head -1 | cut -c1-500)
+        | grep -v '^# AGENTS.md instructions' \
+        | grep -v '^<environment_context>' \
+        | awk 'NF' \
+        | tail -1 \
+        | cut -c1-500
+}
+
+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 \
+        | eagle_clean_request_candidates)
 
     if [ -z "$request" ]; then
         request=$(jq -r '
@@ -73,19 +82,12 @@ if [ -n "$transcript_path" ] && [ -f "$transcript_path" ]; 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)
+            | eagle_clean_request_candidates)
     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)
+            | eagle_clean_request_candidates)
     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)

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"
@@ -25,6 +26,8 @@ agent=$(eagle_agent_source_from_json "$input")
 [ -z "$user_prompt" ] && exit 0
 
 project=$(eagle_project_from_cwd "$cwd")
+codex_compact=0
+[ "$agent" = "codex" ] && codex_compact=1
 
 # ─── Context pressure detection (turn counter since last compact) ──
 # Must run before any early exits so every prompt is counted
@@ -84,8 +87,37 @@ if [ -z "$fts_query" ]; then
     exit 0
 fi
 
+# ─── Agent-run orchestration nudge ────────────────────────
+
+lower_prompt=$(printf '%s' "$user_prompt" | tr '[:upper:]' '[:lower:]')
+if printf '%s\n' "$lower_prompt" | grep -Eq '(orchestrat|worker|parallel|multi-agent|multi agent|split|lane|scope out|plan and get started|broad|full codebase|release|publish|ship)'; then
+    if [ "$codex_compact" -eq 1 ]; then
+        context+="=== Eagle Mem: Orchestration Protocol ===
+For broad work, you run eagle-mem orchestrate yourself. Use durable lanes, opposite-agent workers, and concise user-visible status.
+"
+    else
+        context+="=== Eagle Mem: Orchestration Protocol ===
+If this request is broad enough to split into worker lanes, YOU run the orchestration commands. Do not ask the user to run them.
+
+Use:
+  eagle-mem orchestrate init \"<goal>\"
+  eagle-mem orchestrate lane add <key> --agent codex|claude-code --desc \"<self-contained scope>\" --validate \"<command>\"
+  eagle-mem orchestrate lane start|block|complete <key>
+
+Keep this mostly invisible to the user; surface only concise status or handoff when useful.
+"
+    fi
+fi
+
 # Search for relevant past summaries (cross-session)
-results=$(eagle_search_summaries "$fts_query" "$project" 3)
+summary_limit=2
+code_limit=3
+if [ "$codex_compact" -eq 1 ]; then
+    summary_limit=1
+    code_limit=2
+fi
+
+results=$(eagle_search_summaries "$fts_query" "$project" "$summary_limit")
 
 if [ -n "$results" ]; then
     context+="=== Eagle Mem: Relevant Recall ===
@@ -93,25 +125,46 @@ if [ -n "$results" ]; then
     while IFS='|' read -r req completed learned _next_steps created_at _proj decisions gotchas key_files summary_agent; do
         [ -z "$req" ] && [ -z "$completed" ] && continue
         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)"
-        [ -n "$decisions" ] && context+="
+        if [ "$codex_compact" -eq 1 ]; then
+            req=$(eagle_trim_text "$req" 90)
+            completed=$(eagle_trim_text "$completed" 150)
+            learned=$(eagle_trim_text "$learned" 110)
+            context+="- [$origin_label] "
+            if [ -n "$completed" ]; then
+                context+="$completed"
+            else
+                context+="$req"
+            fi
+            [ -n "$learned" ] && context+=" | learned: $learned"
+            context+="
+"
+        else
+            req=$(eagle_trim_text "$req" 160)
+            completed=$(eagle_trim_text "$completed" 220)
+            learned=$(eagle_trim_text "$learned" 180)
+            decisions=$(eagle_trim_text "$decisions" 160)
+            gotchas=$(eagle_trim_text "$gotchas" 160)
+            key_files=$(eagle_trim_text "$key_files" 160)
+            context+="[$created_at][$origin_label] "
+            [ -n "$req" ] && context+="$req"
+            [ -n "$completed" ] && context+=" → $completed"
+            [ -n "$learned" ] && context+=" (Learned: $learned)"
+            [ -n "$decisions" ] && context+="
   Decisions: $decisions"
-        [ -n "$gotchas" ] && context+="
+            [ -n "$gotchas" ] && context+="
   Gotchas: $gotchas"
-        [ -n "$key_files" ] && context+="
+            [ -n "$key_files" ] && context+="
   Key files: $key_files"
-        context+="
+            context+="
 "
+        fi
     done <<< "$results"
 fi
 
 # Search indexed code chunks (if any exist for this project)
 has_chunks=$(eagle_count_code_chunks "$project")
 if [ "${has_chunks:-0}" -gt 0 ]; then
-    code_results=$(eagle_search_code_chunks "$fts_query" "$project" 5)
+    code_results=$(eagle_search_code_chunks "$fts_query" "$project" "$code_limit")
 
     if [ -n "$code_results" ]; then
         context+="=== Eagle Mem: Relevant Code ===
@@ -128,11 +181,17 @@ fi
 
 [ -z "$context" ] && exit 0
 
-context+="
-IMPORTANT: When Eagle Mem finds relevant memories or code for the user's prompt, briefly mention it at the start of your response: \"Eagle Mem recalled N relevant sessions\" or \"Eagle Mem found related code in [files]\". One line max — then proceed with the answer.
+if [ "$codex_compact" -eq 1 ]; then
+    context+="
+Use only if directly useful. If you mention it to the user, keep Eagle Mem attribution to one short line.
+"
+else
+    context+="
+IMPORTANT: If directly useful, start with one short Eagle Mem attribution line, then proceed.
 
 === Eagle Mem: Persistent Memory ===
 "
+fi
 
 eagle_emit_context_for_agent "$agent" "UserPromptSubmit" "$context"
 exit 0

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() {
@@ -29,6 +31,11 @@ eagle_log() {
 }
 
 eagle_project_from_cwd() {
+    if [ -n "${EAGLE_MEM_PROJECT:-}" ]; then
+        echo "$EAGLE_MEM_PROJECT"
+        return
+    fi
+
     local cwd="${1:-$(pwd)}"
     local resolved="$cwd"
 
@@ -111,7 +118,13 @@ eagle_agent_source() {
     case "$agent" in
         codex|openai-codex) echo "codex" ;;
         claude|claude-code|cloud-code) echo "claude-code" ;;
-        *) echo "claude-code" ;;
+        *)
+            if [ -n "${CODEX_THREAD_ID:-}" ] || [ -n "${CODEX_CI:-}" ] || [ -n "${CODEX_MANAGED_BY_NPM:-}" ]; then
+                echo "codex"
+            else
+                echo "claude-code"
+            fi
+            ;;
     esac
 }
 
@@ -145,6 +158,22 @@ eagle_agent_label() {
     esac
 }
 
+eagle_trim_text() {
+    local text="${1:-}"
+    local max="${2:-240}"
+
+    text=$(printf '%s' "$text" | tr '\n' ' ' | sed -E 's/[[:space:]]+/ /g; s/^ //; s/ $//')
+    if [ "${#text}" -gt "$max" ] 2>/dev/null; then
+        if [ "$max" -gt 3 ] 2>/dev/null; then
+            printf '%s...' "${text:0:$((max - 3))}"
+        else
+            printf '%s' "${text:0:$max}"
+        fi
+    else
+        printf '%s' "$text"
+    fi
+}
+
 eagle_is_shell_tool() {
     case "${1:-}" in
         Bash|exec_command|shell_command|unified_exec) return 0 ;;
@@ -188,8 +217,124 @@ eagle_emit_context_for_agent() {
     printf '%s\n' "$context"
 }
 
+eagle_config_get_light() {
+    local section="$1"
+    local key="$2"
+    local default="${3:-}"
+    local cfg="${EAGLE_CONFIG_FILE:-$EAGLE_MEM_DIR/config.toml}"
+
+    if [ ! -f "$cfg" ]; then
+        echo "$default"
+        return
+    fi
+
+    local value
+    value=$(awk -v section="$section" -v key="$key" '
+        /^[[:space:]]*\[/ {
+            gsub(/[\[\][:space:]]/, "")
+            current = $0
+        }
+        current == section && /^[[:space:]]*[^#\[]/ {
+            split($0, parts, "=")
+            gsub(/^[[:space:]]+|[[:space:]]+$/, "", parts[1])
+            if (parts[1] == key) {
+                val = substr($0, index($0, "=") + 1)
+                gsub(/^[[:space:]]+|[[:space:]]+$/, "", val)
+                gsub(/^["'"'"']|["'"'"']$/, "", val)
+                print val
+                exit
+            }
+        }
+    ' "$cfg")
+
+    if [ -n "$value" ]; then
+        echo "$value"
+    else
+        echo "$default"
+    fi
+}
+
+eagle_token_guard_rtk_mode() {
+    if declare -F eagle_config_get >/dev/null 2>&1; then
+        eagle_config_get "token_guard" "rtk" "auto"
+    else
+        eagle_config_get_light "token_guard" "rtk" "auto"
+    fi
+}
+
+eagle_token_guard_raw_bash_mode() {
+    if declare -F eagle_config_get >/dev/null 2>&1; then
+        eagle_config_get "token_guard" "raw_bash" "block"
+    else
+        eagle_config_get_light "token_guard" "raw_bash" "block"
+    fi
+}
+
+eagle_raw_output_command_needs_guard() {
+    local cmd="$1"
+    local first
+    first=$(printf '%s\n' "$cmd" | awk 'NR == 1 {print $1}' | sed 's|.*/||')
+
+    case "$first" in
+        cat|head|tail|find|grep|rg|wc) return 0 ;;
+    esac
+
+    if printf '%s\n' "$cmd" \
+        | tr '\n' ';' \
+        | sed -E 's/(&&|[|][|]|;)/\
+/g' \
+        | awk '
+            {
+                for (i = 1; i <= NF; i++) {
+                    token = $i
+                    sub(/^.*\//, "", token)
+                    if (token ~ /^(cat|head|tail|find|grep|rg|wc)$/) found = 1
+                }
+            }
+            END { exit(found ? 0 : 1) }
+        '
+    then
+        return 0
+    fi
+
+    if printf '%s\n' "$cmd" \
+        | tr '\n' ';' \
+        | sed -E 's/(&&|[|][|]|;)/\
+/g' \
+        | awk '
+            {
+                for (i = 1; i <= NF; i++) {
+                    if ($i !~ /(^|\/)git$/) continue
+                    j = i + 1
+                    while (j <= NF && $j ~ /^-/) {
+                        opt = $j
+                        j++
+                        if (opt == "-C" || opt == "-c" ||
+                            opt == "--git-dir" || opt == "--work-tree" ||
+                            opt == "--namespace" || opt == "--exec-path" ||
+                            opt == "--config-env" || opt == "--super-prefix") {
+                            j++
+                        }
+                    }
+                    if ($j ~ /^(diff|show|log|blame|grep)$/) found = 1
+                }
+            }
+            END { exit(found ? 0 : 1) }
+        '
+    then
+        return 0
+    fi
+
+    if printf '%s\n' "$cmd" | grep -qE '\|\s*(head|tail|grep|rg|wc)\b'; then
+        return 0
+    fi
+
+    return 1
+}
+
 eagle_rtk_rewrite_command() {
     local cmd="$1"
+    [ "$(eagle_token_guard_rtk_mode)" = "off" ] && return 1
     command -v rtk >/dev/null 2>&1 || return 1
 
     case "$cmd" in
@@ -462,7 +607,7 @@ _eagle_claude_md_section() {
 
 ## Eagle Mem — Persistent Memory
 
-Eagle Mem hooks are active in every project. SessionStart injects context (overview, recent sessions, memories, tasks, core files). Stop captures session summaries. PostToolUse mirrors memories/plans/tasks.
+Eagle Mem hooks are active in every project. SessionStart injects context (overview, recent sessions, memories, tasks, orchestration lanes, core files). Stop captures session summaries. PostToolUse mirrors memories/plans/tasks.
 
 **Rule:** Before your final response in every session, emit an `<eagle-summary>` block so the Stop hook can capture a rich summary instead of just heuristics.
 
@@ -490,6 +635,7 @@ regression_risks: [risk, ...]
 - When Eagle Mem injects context at SessionStart, attribute it: "Eagle Mem recalls:"
 - Do not revert decisions surfaced by PostToolUse without asking the user
 - If Eagle Mem reports pending feature verification, verify or waive it before push/PR/publish
+- For broad multi-agent work, YOU run `eagle-mem orchestrate`; do not ask the user to run these commands
 - Never put raw secrets in the summary — Eagle Mem redacts but defense in depth
 - If you contradict a loaded memory, update the memory file
 EAGLE_MD
@@ -520,6 +666,17 @@ eagle_patch_claude_md() {
             _eagle_claude_md_section >> "$claude_md"
             return 0
         fi
+        if ! grep -qF 'eagle-mem orchestrate' "$claude_md" 2>/dev/null; then
+            local tmp_md
+            tmp_md=$(mktemp)
+            awk '
+                { print }
+                /pending feature verification/ {
+                    print "- For broad multi-agent work, YOU run `eagle-mem orchestrate`; do not ask the user to run these commands"
+                }
+            ' "$claude_md" > "$tmp_md" && mv "$tmp_md" "$claude_md"
+            return 0
+        fi
         return 1
     fi
 
@@ -556,6 +713,9 @@ 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`, `eagle-mem-tasks`, and `eagle-mem-orchestrate`
+- For broad multi-agent work, YOU run `eagle-mem orchestrate`; do not ask the user to run these commands
+- 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
@@ -569,6 +729,17 @@ eagle_patch_codex_agents_md() {
     mkdir -p "$(dirname "$agents_md")"
 
     if [ -f "$agents_md" ] && grep -qF "$marker" "$agents_md" 2>/dev/null; then
+        if ! grep -qF 'eagle-mem orchestrate' "$agents_md" 2>/dev/null; then
+            local tmp_md
+            tmp_md=$(mktemp)
+            awk '
+                { print }
+                /eagle-mem-tasks/ {
+                    print "- Use the `eagle-mem-orchestrate` skill for broad multi-agent work. YOU run `eagle-mem orchestrate`; do not ask the user to run these commands"
+                }
+            ' "$agents_md" > "$tmp_md" && mv "$tmp_md" "$agents_md"
+            return 0
+        fi
         return 1
     fi
 

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();