Merge pull request #194 from BBuf/codex/disable-nested-codex-hooks

Lyken17 · web-flow · commit e045999eca10 · 2026-06-05T00:53:03.000+08:00
Disable hooks for nested Codex helpers
diff --git a/hooks/loop-codex-stop-hook.sh b/hooks/loop-codex-stop-hook.sh
@@ -1174,19 +1174,31 @@ mkdir -p "$CACHE_DIR"
 # portable-timeout.sh already sourced above
 
 # Disable native hooks for nested Codex reviewer calls to prevent Stop-hook recursion.
-# Probe whether the installed Codex CLI supports --disable; cache the result per loop
-# so older builds do not fail with an unknown-argument error.
+# Codex has used different hook feature names across releases. Probe each name
+# before disabling it so older CLIs that validate feature names still work.
 CODEX_DISABLE_HOOKS_ARGS=()
-_CODEX_FEATURE_CACHE="$CACHE_DIR/.codex-disable-hooks-supported"
+_CODEX_FEATURE_CACHE="$CACHE_DIR/.codex-disable-hooks-features"
 if [[ -f "$_CODEX_FEATURE_CACHE" ]]; then
-    [[ "$(cat "$_CODEX_FEATURE_CACHE")" == "yes" ]] && CODEX_DISABLE_HOOKS_ARGS=(--disable hooks)
+    while IFS= read -r feature_name; do
+        case "$feature_name" in
+            hooks|plugin_hooks|codex_hooks)
+                CODEX_DISABLE_HOOKS_ARGS+=("--disable" "$feature_name")
+                ;;
+        esac
+    done < "$_CODEX_FEATURE_CACHE"
 else
     CODEX_HELP_OUTPUT="$(codex --help </dev/null 2>&1 || true)"
     if grep -q -- '--disable' <<< "$CODEX_HELP_OUTPUT"; then
-        CODEX_DISABLE_HOOKS_ARGS=(--disable hooks)
-        echo "yes" > "$_CODEX_FEATURE_CACHE" 2>/dev/null
+        _CODEX_DISABLE_HOOK_FEATURES=()
+        for feature_name in hooks plugin_hooks codex_hooks; do
+            if codex --disable "$feature_name" --help </dev/null >/dev/null 2>&1; then
+                CODEX_DISABLE_HOOKS_ARGS+=("--disable" "$feature_name")
+                _CODEX_DISABLE_HOOK_FEATURES+=("$feature_name")
+            fi
+        done
+        printf '%s\n' ${_CODEX_DISABLE_HOOK_FEATURES[@]+"${_CODEX_DISABLE_HOOK_FEATURES[@]}"} > "$_CODEX_FEATURE_CACHE" 2>/dev/null || true
     else
-        echo "no" > "$_CODEX_FEATURE_CACHE" 2>/dev/null
+        : > "$_CODEX_FEATURE_CACHE" 2>/dev/null || true
     fi
 fi
 
diff --git a/scripts/ask-codex.sh b/scripts/ask-codex.sh
@@ -241,20 +241,31 @@ EOF
 # Build Codex Command
 # ========================================
 
-# Probe whether the installed Codex CLI supports --disable hooks to prevent
-# nested hook recursion when ask-codex.sh is called from inside a running loop.
-# Cache the probe result in the skill directory to avoid repeated probes.
+# Probe supported hook feature names before disabling them. Codex has used
+# different names across releases, and older CLIs reject unknown feature names.
 CODEX_DISABLE_HOOKS_ARGS=()
-_CODEX_DISABLE_HOOKS_CACHE="$SKILL_DIR/.codex-disable-hooks-supported"
+_CODEX_DISABLE_HOOKS_CACHE="$SKILL_DIR/.codex-disable-hooks-features"
 if [[ -f "$_CODEX_DISABLE_HOOKS_CACHE" ]]; then
-    [[ "$(cat "$_CODEX_DISABLE_HOOKS_CACHE")" == "yes" ]] && CODEX_DISABLE_HOOKS_ARGS=(--disable hooks)
+    while IFS= read -r feature_name; do
+        case "$feature_name" in
+            hooks|plugin_hooks|codex_hooks)
+                CODEX_DISABLE_HOOKS_ARGS+=("--disable" "$feature_name")
+                ;;
+        esac
+    done < "$_CODEX_DISABLE_HOOKS_CACHE"
 else
     CODEX_HELP_OUTPUT="$(codex --help </dev/null 2>&1 || true)"
     if grep -q -- '--disable' <<< "$CODEX_HELP_OUTPUT"; then
-        CODEX_DISABLE_HOOKS_ARGS=(--disable hooks)
-        echo "yes" > "$_CODEX_DISABLE_HOOKS_CACHE" 2>/dev/null || true
+        _CODEX_DISABLE_HOOK_FEATURES=()
+        for feature_name in hooks plugin_hooks codex_hooks; do
+            if codex --disable "$feature_name" --help </dev/null >/dev/null 2>&1; then
+                CODEX_DISABLE_HOOKS_ARGS+=("--disable" "$feature_name")
+                _CODEX_DISABLE_HOOK_FEATURES+=("$feature_name")
+            fi
+        done
+        printf '%s\n' ${_CODEX_DISABLE_HOOK_FEATURES[@]+"${_CODEX_DISABLE_HOOK_FEATURES[@]}"} > "$_CODEX_DISABLE_HOOKS_CACHE" 2>/dev/null || true
     else
-        echo "no" > "$_CODEX_DISABLE_HOOKS_CACHE" 2>/dev/null || true
+        : > "$_CODEX_DISABLE_HOOKS_CACHE" 2>/dev/null || true
     fi
 fi
 
diff --git a/scripts/bitlesson-select.sh b/scripts/bitlesson-select.sh
@@ -193,11 +193,17 @@ run_selector() {
         # Capture help output first to avoid pipefail+SIGPIPE interaction when
         # grep exits early (after finding a match) before codex finishes writing.
         local codex_help_output codex_exec_help_output
-        codex_help_output=$(codex --help 2>&1) || true
-        codex_exec_help_output=$(codex exec --help 2>&1) || true
-        # Probe whether the installed Codex CLI supports --disable flag
+        codex_help_output=$(codex --help </dev/null 2>&1) || true
+        codex_exec_help_output=$(codex exec --help </dev/null 2>&1) || true
+        # Probe supported hook feature names before disabling them. Older Codex
+        # CLIs reject unknown feature names even when --disable exists.
         if grep -q -- '--disable' <<< "$codex_help_output"; then
-            codex_exec_args+=("--disable" "hooks")
+            local feature_name
+            for feature_name in hooks plugin_hooks codex_hooks; do
+                if codex --disable "$feature_name" --help </dev/null >/dev/null 2>&1; then
+                    codex_exec_args+=("--disable" "$feature_name")
+                fi
+            done
         fi
         # Probe for --skip-git-repo-check and --ephemeral support
         if grep -q -- '--skip-git-repo-check' <<< "$codex_exec_help_output"; then
diff --git a/tests/test-ask-codex.sh b/tests/test-ask-codex.sh
@@ -7,6 +7,8 @@
 #   MOCK_CODEX_EXIT_CODE - exit code the mock returns (default: 0)
 #   MOCK_CODEX_STDOUT    - text the mock writes to stdout
 #   MOCK_CODEX_STDERR    - text the mock writes to stderr
+#   MOCK_CODEX_HELP_OUTPUT - text the mock writes for `codex --help`
+#   MOCK_CODEX_ARGS_FILE - optional file where non-help argv is captured
 #
 
 set -euo pipefail
@@ -40,6 +42,23 @@ cat > "$MOCK_BIN_DIR/codex" << 'MOCK_EOF'
 #!/usr/bin/env bash
 # Mock codex binary for testing ask-codex.sh
 # Controlled via environment variables.
+if printf '%s\n' "$@" | grep -qx -- '--help'; then
+    if [[ "${1:-}" == "--disable" ]]; then
+        feature="${2:-}"
+        supported_features=" ${MOCK_CODEX_SUPPORTED_FEATURES:-hooks plugin_hooks codex_hooks} "
+        if [[ "$supported_features" != *" $feature "* ]]; then
+            echo "unknown feature: $feature" >&2
+            exit 2
+        fi
+    fi
+    if [[ -n "${MOCK_CODEX_HELP_OUTPUT:-}" ]]; then
+        echo "$MOCK_CODEX_HELP_OUTPUT"
+    fi
+    exit 0
+fi
+if [[ -n "${MOCK_CODEX_ARGS_FILE:-}" ]]; then
+    printf '%s\n' "$@" > "$MOCK_CODEX_ARGS_FILE"
+fi
 if [[ -n "${MOCK_CODEX_STDERR:-}" ]]; then
     echo "$MOCK_CODEX_STDERR" >&2
 fi
@@ -63,6 +82,9 @@ reset_mock() {
     export MOCK_CODEX_EXIT_CODE="0"
     export MOCK_CODEX_STDOUT=""
     export MOCK_CODEX_STDERR=""
+    export MOCK_CODEX_HELP_OUTPUT=""
+    export MOCK_CODEX_ARGS_FILE=""
+    export MOCK_CODEX_SUPPORTED_FEATURES="hooks plugin_hooks codex_hooks"
     rm -rf "$MOCK_PROJECT/.humanize/skill" 2>/dev/null || true
 }
 
@@ -86,6 +108,7 @@ run_ask_codex_capturing_dir() {
         cd "$MOCK_PROJECT"
         export CLAUDE_PROJECT_DIR="$MOCK_PROJECT"
         export XDG_CACHE_HOME="$RUN_XDG_CACHE_HOME"
+        export XDG_CONFIG_HOME="$TEST_DIR/no-user-config"
         PATH="$MOCK_BIN_DIR:$PATH" bash "$ASK_CODEX_SCRIPT" "$@" 2>&1 >/dev/null
     ) || RUN_EXIT_CODE=$?
     output_path=$(printf '%s\n' "$run_stderr" | grep "^ask-codex: response saved to " | sed 's/^ask-codex: response saved to //')
@@ -114,6 +137,7 @@ run_ask_codex() {
         cd "$MOCK_PROJECT"
         export CLAUDE_PROJECT_DIR="$MOCK_PROJECT"
         export XDG_CACHE_HOME="$TEST_DIR/cache"
+        export XDG_CONFIG_HOME="$TEST_DIR/no-user-config"
         PATH="$MOCK_BIN_DIR:$PATH" bash "$ASK_CODEX_SCRIPT" "$@"
     )
 }
@@ -253,6 +277,54 @@ else
     fail "successful run exits 0" "exit 0" "exit=$EXIT_CODE"
 fi
 
+# Test: supported Codex --disable flag disables all known hook features
+reset_mock
+export MOCK_CODEX_STDOUT="hook-disable-test"
+export MOCK_CODEX_HELP_OUTPUT="  --disable <feature>   Disable a feature"
+export MOCK_CODEX_SUPPORTED_FEATURES="hooks plugin_hooks codex_hooks"
+ASK_CODEX_ARGS_FILE="$TEST_DIR/ask-codex-args.txt"
+export MOCK_CODEX_ARGS_FILE="$ASK_CODEX_ARGS_FILE"
+EXIT_CODE=0
+run_ask_codex "hook disable test" > /dev/null 2>&1 || EXIT_CODE=$?
+CAPTURED_ARGS="$(cat "$ASK_CODEX_ARGS_FILE" 2>/dev/null || true)"
+if [[ $EXIT_CODE -eq 0 ]] \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'exec' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- '--disable' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'hooks' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'plugin_hooks' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'codex_hooks'; then
+    pass "successful run disables all known hook features for nested codex exec"
+else
+    fail "successful run disables all known hook features for nested codex exec" \
+        "exec args include hooks, plugin_hooks, codex_hooks" \
+        "exit=$EXIT_CODE, args=$CAPTURED_ARGS"
+fi
+reset_mock
+
+# Test: older Codex builds only receive supported hook feature names
+reset_mock
+export MOCK_CODEX_STDOUT="legacy-hook-disable-test"
+export MOCK_CODEX_HELP_OUTPUT="  --disable <feature>   Disable a feature"
+export MOCK_CODEX_SUPPORTED_FEATURES="codex_hooks"
+ASK_CODEX_ARGS_FILE="$TEST_DIR/ask-codex-legacy-args.txt"
+export MOCK_CODEX_ARGS_FILE="$ASK_CODEX_ARGS_FILE"
+EXIT_CODE=0
+run_ask_codex "legacy hook disable test" > /dev/null 2>&1 || EXIT_CODE=$?
+CAPTURED_ARGS="$(cat "$ASK_CODEX_ARGS_FILE" 2>/dev/null || true)"
+if [[ $EXIT_CODE -eq 0 ]] \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'exec' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- '--disable' \
+    && echo "$CAPTURED_ARGS" | grep -qx -- 'codex_hooks' \
+    && ! echo "$CAPTURED_ARGS" | grep -qx -- 'hooks' \
+    && ! echo "$CAPTURED_ARGS" | grep -qx -- 'plugin_hooks'; then
+    pass "successful run disables only supported hook features for older codex"
+else
+    fail "successful run disables only supported hook features for older codex" \
+        "exec args include only codex_hooks" \
+        "exit=$EXIT_CODE, args=$CAPTURED_ARGS"
+fi
+reset_mock
+
 # ========================================
 # Error Handling Tests
 # ========================================
@@ -519,6 +591,7 @@ run_ask_codex_probe() {
         cd "$PROBE_PROJECT"
         export CLAUDE_PROJECT_DIR="$PROBE_PROJECT"
         export XDG_CACHE_HOME="$TEST_DIR/cache-probe"
+        export XDG_CONFIG_HOME="$TEST_DIR/no-user-config"
         PATH="$PROBE_BIN_DIR:$PATH" bash "$ASK_CODEX_SCRIPT" "$@"
     )
 }
@@ -545,14 +618,17 @@ reset_mock
 export MOCK_CODEX_STDOUT="probe-test-supports"
 run_ask_codex_probe "probe disable test" > /dev/null 2>&1 || true
 
-# Check that the cached probe result is "yes" in the skill dir
+# Check that the cached probe result lists the supported hook features.
 PROBE_SKILL_DIR=$(find "$PROBE_PROJECT/.humanize/skill" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sort | tail -1)
-if [[ -n "$PROBE_SKILL_DIR" ]] && [[ -f "$PROBE_SKILL_DIR/.codex-disable-hooks-supported" ]]; then
-    PROBE_RESULT=$(cat "$PROBE_SKILL_DIR/.codex-disable-hooks-supported")
-    if [[ "$PROBE_RESULT" == "yes" ]]; then
-        pass "auto-probe: cached 'yes' when codex supports --disable"
+if [[ -n "$PROBE_SKILL_DIR" ]] && [[ -f "$PROBE_SKILL_DIR/.codex-disable-hooks-features" ]]; then
+    PROBE_RESULT=$(cat "$PROBE_SKILL_DIR/.codex-disable-hooks-features")
+    if echo "$PROBE_RESULT" | grep -qx -- 'hooks' \
+        && echo "$PROBE_RESULT" | grep -qx -- 'plugin_hooks' \
+        && echo "$PROBE_RESULT" | grep -qx -- 'codex_hooks'; then
+        pass "auto-probe: cached supported hook features when codex supports --disable"
     else
-        fail "auto-probe: cached 'yes' when codex supports --disable" "yes" "$PROBE_RESULT"
+        fail "auto-probe: cached supported hook features when codex supports --disable" \
+            "hooks, plugin_hooks, codex_hooks" "$PROBE_RESULT"
     fi
 else
     fail "auto-probe: probe cache file created" "cache file exists" "not found"
@@ -583,6 +659,7 @@ run_ask_codex_probe_no() {
         cd "$PROBE_PROJECT_NO"
         export CLAUDE_PROJECT_DIR="$PROBE_PROJECT_NO"
         export XDG_CACHE_HOME="$TEST_DIR/cache-probe-no"
+        export XDG_CONFIG_HOME="$TEST_DIR/no-user-config"
         PATH="$PROBE_BIN_NO_DIR:$PATH" bash "$ASK_CODEX_SCRIPT" "$@"
     )
 }
@@ -592,23 +669,25 @@ export MOCK_CODEX_STDOUT="probe-test-no-support"
 run_ask_codex_probe_no "probe no-support test" > /dev/null 2>&1 || true
 
 PROBE_NO_SKILL_DIR=$(find "$PROBE_PROJECT_NO/.humanize/skill" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sort | tail -1)
-if [[ -n "$PROBE_NO_SKILL_DIR" ]] && [[ -f "$PROBE_NO_SKILL_DIR/.codex-disable-hooks-supported" ]]; then
-    PROBE_NO_RESULT=$(cat "$PROBE_NO_SKILL_DIR/.codex-disable-hooks-supported")
-    if [[ "$PROBE_NO_RESULT" == "no" ]]; then
-        pass "auto-probe: cached 'no' when codex does not support --disable"
+if [[ -n "$PROBE_NO_SKILL_DIR" ]] && [[ -f "$PROBE_NO_SKILL_DIR/.codex-disable-hooks-features" ]]; then
+    PROBE_NO_RESULT=$(cat "$PROBE_NO_SKILL_DIR/.codex-disable-hooks-features")
+    if [[ -z "$PROBE_NO_RESULT" ]]; then
+        pass "auto-probe: cached empty feature list when codex does not support --disable"
     else
-        fail "auto-probe: cached 'no' when codex does not support --disable" "no" "$PROBE_NO_RESULT"
+        fail "auto-probe: cached empty feature list when codex does not support --disable" \
+            "(empty)" "$PROBE_NO_RESULT"
     fi
 else
     fail "auto-probe: probe cache file created for no-support case" "cache file exists" "not found"
 fi
 
 # Test C: ask-codex.sh script contains the probe implementation
-if grep -q "CODEX_DISABLE_HOOKS_ARGS=(--disable hooks)" "$ASK_CODEX_SCRIPT" \
-    && grep -q "codex-disable-hooks-supported" "$ASK_CODEX_SCRIPT"; then
+if grep -q "for feature_name in hooks plugin_hooks codex_hooks" "$ASK_CODEX_SCRIPT" \
+    && grep -q "codex-disable-hooks-features" "$ASK_CODEX_SCRIPT"; then
     pass "ask-codex.sh contains nested hook disable auto-probe implementation"
 else
-    fail "ask-codex.sh contains nested hook disable auto-probe implementation" "hooks disable args + probe cache" "not found"
+    fail "ask-codex.sh contains nested hook disable auto-probe implementation" \
+        "feature loop + probe cache" "not found"
 fi
 
 # ========================================
diff --git a/tests/test-bitlesson-select-routing.sh b/tests/test-bitlesson-select-routing.sh
@@ -481,8 +481,10 @@ captured_args="$(cat "$CAPTURE_ARGS")"
 
 if [[ $exit_code -eq 0 ]] \
     && echo "$stdout_out" | grep -q "BL-20260315-tracker-drift" \
-    && echo "$captured_args" | grep -q -- '--disable' \
-    && echo "$captured_args" | grep -q -- 'hooks' \
+    && echo "$captured_args" | grep -qx -- '--disable' \
+    && echo "$captured_args" | grep -qx -- 'hooks' \
+    && echo "$captured_args" | grep -qx -- 'plugin_hooks' \
+    && echo "$captured_args" | grep -qx -- 'codex_hooks' \
     && echo "$captured_args" | grep -q -- '--skip-git-repo-check' \
     && echo "$captured_args" | grep -q -- '--ephemeral' \
     && echo "$captured_args" | grep -q -- 'read-only' \
diff --git a/tests/test-disable-nested-codex-hooks.sh b/tests/test-disable-nested-codex-hooks.sh
@@ -70,14 +70,22 @@ setup_mock_codex() {
     mkdir -p "$bin_dir"
     cat > "$bin_dir/codex" <<EOF
 #!/usr/bin/env bash
-# The stop hook probes feature support with \`codex --help\`; advertise
-# --disable so the nested invocation is expected to include it.
-if [[ "\$1" == "--help" ]]; then
+# The stop hook probes feature support with \`codex --help\` and validates each
+# known feature with \`codex --disable <feature> --help\`.
+if printf '%s\n' "\$@" | grep -qx -- '--help'; then
+    if [[ "\${1:-}" == "--disable" ]]; then
+        feature="\${2:-}"
+        supported_features=" \${MOCK_CODEX_SUPPORTED_FEATURES:-hooks plugin_hooks codex_hooks} "
+        if [[ "\$supported_features" != *" \$feature "* ]]; then
+            echo "unknown feature: \$feature" >&2
+            exit 2
+        fi
+    fi
     cat <<HELP
 Usage: codex [OPTIONS] <COMMAND>
 
 Options:
-  --disable <HOOK>         Disable a specific Codex hook (e.g. hooks)
+  --disable <HOOK>         Disable a specific Codex hook
   --skip-git-repo-check    Skip git repo validation
 HELP
     exit 0
@@ -186,13 +194,14 @@ run_loop_hook() {
     local repo_dir="$1"
     local args_file="$2"
     local review_started="$3"
+    local supported_features="${4:-hooks plugin_hooks codex_hooks}"
     local bin_dir="$TEST_DIR/bin-${review_started}"
 
     setup_mock_codex "$bin_dir" "$args_file"
     setup_loop_dir "$repo_dir" "$review_started"
 
     set +e
-    OUTPUT=$(echo '{}' | PATH="$bin_dir:$PATH" CLAUDE_PROJECT_DIR="$repo_dir" bash "$STOP_HOOK" 2>&1)
+    OUTPUT=$(echo '{}' | MOCK_CODEX_SUPPORTED_FEATURES="$supported_features" PATH="$bin_dir:$PATH" CLAUDE_PROJECT_DIR="$repo_dir" bash "$STOP_HOOK" 2>&1)
     EXIT_CODE=$?
     set -e
 
@@ -206,22 +215,22 @@ REPO_IMPL="$TEST_DIR/repo-impl"
 setup_repo "$REPO_IMPL"
 run_loop_hook "$REPO_IMPL" "$TEST_DIR/impl.args" "false"
 
-if grep -q -- 'exec --disable hooks' "$TEST_DIR/impl.args"; then
-    pass "implementation-phase stop hook disables hooks for codex exec"
+if grep -q -- 'exec --disable hooks --disable plugin_hooks --disable codex_hooks' "$TEST_DIR/impl.args"; then
+    pass "implementation-phase stop hook disables all known hook features for codex exec"
 else
-    fail "implementation-phase stop hook disables hooks for codex exec" \
-        "exec --disable hooks" "$(cat "$TEST_DIR/impl.args" 2>/dev/null || echo missing)"
+    fail "implementation-phase stop hook disables all known hook features for codex exec" \
+        "exec --disable hooks --disable plugin_hooks --disable codex_hooks" "$(cat "$TEST_DIR/impl.args" 2>/dev/null || echo missing)"
 fi
 
 REPO_REVIEW="$TEST_DIR/repo-review"
 setup_repo "$REPO_REVIEW"
 run_loop_hook "$REPO_REVIEW" "$TEST_DIR/review.args" "true"
 
-if grep -q -- 'review --disable hooks' "$TEST_DIR/review.args"; then
-    pass "review-phase stop hook disables hooks for codex review"
+if grep -q -- 'review --disable hooks --disable plugin_hooks --disable codex_hooks' "$TEST_DIR/review.args"; then
+    pass "review-phase stop hook disables all known hook features for codex review"
 else
-    fail "review-phase stop hook disables hooks for codex review" \
-        "review --disable hooks" "$(cat "$TEST_DIR/review.args" 2>/dev/null || echo missing)"
+    fail "review-phase stop hook disables all known hook features for codex review" \
+        "review --disable hooks --disable plugin_hooks --disable codex_hooks" "$(cat "$TEST_DIR/review.args" 2>/dev/null || echo missing)"
 fi
 
 if ! grep -q 'codex --help 2>&1 | grep -q' "$STOP_HOOK"; then
@@ -250,6 +259,19 @@ else
         'must not pass prompt input when `--base` is used' "$(cat "$REVIEW_PROMPT" 2>/dev/null || echo missing)"
 fi
 
+REPO_LEGACY="$TEST_DIR/repo-legacy"
+setup_repo "$REPO_LEGACY"
+run_loop_hook "$REPO_LEGACY" "$TEST_DIR/legacy.args" "false" "codex_hooks"
+
+if grep -q -- 'exec --disable codex_hooks' "$TEST_DIR/legacy.args" \
+    && ! grep -q -- '--disable hooks' "$TEST_DIR/legacy.args" \
+    && ! grep -q -- 'plugin_hooks' "$TEST_DIR/legacy.args"; then
+    pass "implementation-phase stop hook disables only supported legacy hook feature"
+else
+    fail "implementation-phase stop hook disables only supported legacy hook feature" \
+        "exec --disable codex_hooks only" "$(cat "$TEST_DIR/legacy.args" 2>/dev/null || echo missing)"
+fi
+
 echo ""
 echo "========================================"
 echo "Disable Nested Codex Hooks Tests"
