Merge PolyArch/dev into Horacehxw/dev to resolve conflicts

# Conflicts:
#	hooks/loop-codex-stop-hook.sh
#	tests/test-disable-nested-codex-hooks.sh
#	tests/test-finalize-phase.sh

Author: SihaoLiu

hooks/loop-codex-stop-hook.sh

@@ -1238,6 +1238,8 @@ run_codex_code_review() {
     local prompt_fallback="# Code Review Phase - Round ${round}
 
 This file documents the code review invocation for audit purposes.
+Compatibility note: Codex 0.130.0 rejects [PROMPT] input, including - stdin, when --base is used.
+Humanize must not pass prompt input when --base is used; this file is audit-only.
 Provider: codex
 
 ## Review Configuration

prompt-template/codex/code-review-phase.md

@@ -1,7 +1,7 @@
 # Code Review Phase - Round {{REVIEW_ROUND}}
 
 This file documents the code review invocation for audit purposes.
-Note: `codex review` does not accept prompt input; it performs automated code review based on git diff.
+Compatibility note: Codex 0.130.0 rejects `[PROMPT]` input, including `-` stdin, when `--base` is used. Humanize must not pass prompt input when `--base` is used; this file is audit-only.
 
 ## Review Configuration
 

tests/test-disable-nested-codex-hooks.sh

@@ -99,6 +99,24 @@ if [[ "\$subcommand" == "exec" ]]; then
 fi
 
 if [[ "\$subcommand" == "review" ]]; then
+    saw_base=false
+    saw_prompt=false
+    for arg in "\$@"; do
+        if [[ "\$arg" == "--base" ]]; then
+            saw_base=true
+        elif [[ "\$arg" == "-" ]]; then
+            saw_prompt=true
+        fi
+    done
+    if [[ "\$saw_base" == "true" && "\$saw_prompt" == "true" ]]; then
+        echo "codex 0.130.0 rejects --base with prompt input" >&2
+        exit 64
+    fi
+    if IFS= read -r stdin_line || [[ -n "\$stdin_line" ]]; then
+        printf 'STDIN:%s\n' "\$stdin_line" >> "$args_file"
+        echo "codex review must not receive stdin when --base is used" >&2
+        exit 65
+    fi
     echo "No issues found."
     exit 0
 fi
@@ -214,6 +232,24 @@ else
         "pipeline still present"
 fi
 
+if grep -q -- ' --base ' "$TEST_DIR/review.args" && ! grep -q -- ' -$' "$TEST_DIR/review.args" && ! grep -q '^STDIN:' "$TEST_DIR/review.args"; then
+    pass "review-phase codex review uses --base without prompt input"
+else
+    fail "review-phase codex review avoids --base plus prompt input" \
+        "--base arguments with no trailing '-' and no stdin" "$(cat "$TEST_DIR/review.args" 2>/dev/null || echo missing)"
+fi
+
+REVIEW_PROMPT=""
+if [[ -d "$REPO_REVIEW/.humanize/rlcr" ]]; then
+    REVIEW_PROMPT=$(find "$REPO_REVIEW/.humanize/rlcr" -mindepth 2 -maxdepth 2 -type f -name 'round-*-review-prompt.md' -print | sort | tail -n 1)
+fi
+if [[ -f "$REVIEW_PROMPT" ]] && grep -q -- 'must not pass prompt input when `--base` is used' "$REVIEW_PROMPT"; then
+    pass "review audit prompt documents --base prompt incompatibility"
+else
+    fail "review audit prompt documents --base prompt incompatibility" \
+        'must not pass prompt input when `--base` is used' "$(cat "$REVIEW_PROMPT" 2>/dev/null || echo missing)"
+fi
+
 echo ""
 echo "========================================"
 echo "Disable Nested Codex Hooks Tests"