prizmkit 1.1.57 → 1.1.60

package/bundled/dev-pipeline/lib/common.sh

@@ -120,12 +120,141 @@ prizm_log_bootstrap_prompt() {
 
 # Detect AI CLI + platform.
 # Priority:
-#   AI_CLI env > .prizmkit/config.json > CODEBUDDY_CLI > auto-detect(cbc/claude) > error
+#   AI_CLI env > .prizmkit/config.json ai_cli > manifest/config platform > CODEBUDDY_CLI
+#   > installed PrizmKit platform artifacts > PATH auto-detect > error
 #
 # Exports:
 #   CLI_CMD
 #   PLATFORM
 #   PRIZMKIT_PLATFORM
+_prizm_json_value() {
+    local json_file="$1"
+    local key="$2"
+    [[ -f "$json_file" ]] || return 0
+    JSON_FILE="$json_file" JSON_KEY="$key" python3 - <<'PY' 2>/dev/null || true
+import json
+import os
+
+try:
+    with open(os.environ["JSON_FILE"], encoding="utf-8") as fh:
+        data = json.load(fh)
+    value = data.get(os.environ["JSON_KEY"], "")
+    if value is not None and value != "":
+        print(value)
+except Exception:
+    pass
+PY
+}
+
+_prizm_normalize_platform() {
+    printf '%s' "$1" | tr '[:upper:]' '[:lower:]'
+}
+
+_prizm_concrete_platform() {
+    case "$(_prizm_normalize_platform "$1")" in
+        codex|claude|codebuddy) printf '%s\n' "$(_prizm_normalize_platform "$1")" ;;
+    esac
+}
+
+_prizm_cli_names_for_platform() {
+    case "$(_prizm_normalize_platform "$1")" in
+        codex) printf '%s\n' codex ;;
+        claude) printf '%s\n' claude ;;
+        codebuddy) printf '%s\n' cbc ;;
+        both) printf '%s\n' claude cbc ;;
+        all) printf '%s\n' codex claude cbc ;;
+    esac
+}
+
+_prizm_expected_cli_text() {
+    _prizm_cli_names_for_platform "$1" | awk 'BEGIN { sep="" } { printf "%s%s", sep, $0; sep=", " } END { if (sep != "") print "" }'
+}
+
+_prizm_resolve_cli_name() {
+    local cli_name="$1"
+    if [[ "$cli_name" == "cbc" && -n "${CODEBUDDY_CLI:-}" ]]; then
+        printf '%s\n' "$CODEBUDDY_CLI"
+        return 0
+    fi
+    if command -v "$cli_name" &>/dev/null; then
+        printf '%s\n' "$cli_name"
+        return 0
+    fi
+    return 1
+}
+
+_prizm_cli_for_platform() {
+    local platform="$1"
+    local cli_name cli_cmd
+    while IFS= read -r cli_name; do
+        [[ -n "$cli_name" ]] || continue
+        cli_cmd="$(_prizm_resolve_cli_name "$cli_name" || true)"
+        if [[ -n "$cli_cmd" ]]; then
+            printf '%s\n' "$cli_cmd"
+            return 0
+        fi
+    done < <(_prizm_cli_names_for_platform "$platform")
+    return 1
+}
+
+_prizm_known_platform_from_cli() {
+    local cli_cmd="$1"
+    local cli_token="${cli_cmd%%[[:space:]]*}"
+    cli_token="${cli_token#\"}" ; cli_token="${cli_token%\"}"
+    cli_token="${cli_token#\'}" ; cli_token="${cli_token%\'}"
+    local cli_name="${cli_token##*/}"
+    if [[ "$cli_name" == *"claude"* ]]; then
+        printf '%s\n' claude
+    elif [[ "$cli_name" == *"codex"* ]]; then
+        printf '%s\n' codex
+    elif [[ "$cli_name" == *"cbc"* || "$cli_name" == *"codebuddy"* ]]; then
+        printf '%s\n' codebuddy
+    else
+        return 1
+    fi
+}
+
+_prizm_platform_from_cli() {
+    local cli_cmd="$1"
+    if ! _prizm_known_platform_from_cli "$cli_cmd"; then
+        printf '%s\n' codebuddy
+    fi
+}
+
+_prizm_session_platform() {
+    local cli_platform
+    cli_platform="$(_prizm_known_platform_from_cli "$CLI_CMD" || true)"
+    if [[ -n "$cli_platform" ]]; then
+        printf '%s\n' "$cli_platform"
+        return 0
+    fi
+
+    local platform="${PRIZMKIT_PLATFORM:-${PLATFORM:-}}"
+    case "$(_prizm_normalize_platform "$platform")" in
+        codex|claude|codebuddy) printf '%s\n' "$(_prizm_normalize_platform "$platform")" ;;
+        *) _prizm_platform_from_cli "$CLI_CMD" ;;
+    esac
+}
+
+_prizm_project_platform_for_cli() {
+    local cli_cmd="$1"
+    local manifest_platform="$2"
+    local config_platform="$3"
+    local cli_platform
+    cli_platform="$(_prizm_known_platform_from_cli "$cli_cmd" || true)"
+    if [[ -n "$cli_platform" ]]; then
+        printf '%s\n' "$cli_platform"
+    elif [[ -n "${PRIZMKIT_PLATFORM:-}" ]]; then
+        printf '%s\n' "$PRIZMKIT_PLATFORM"
+    elif [[ -n "$(_prizm_concrete_platform "$manifest_platform")" ]]; then
+        _prizm_concrete_platform "$manifest_platform"
+    elif [[ -n "$(_prizm_concrete_platform "$config_platform")" ]]; then
+        _prizm_concrete_platform "$config_platform"
+    else
+        printf '%s\n' codebuddy
+    fi
+}
+
 prizm_detect_cli_and_platform() {
     # Load .env from .prizmkit/.env if it exists (does not override existing env vars)
     if [[ -n "${PRIZMKIT_DIR:-}" ]]; then
@@ -133,61 +262,173 @@ prizm_detect_cli_and_platform() {
     fi
 
     local _raw_cli=""
+    local _config_ai_cli=""
+    local _config_platform=""
+    local _manifest_platform=""
+    local _installed_cli=""
+    local _platform_cli=""
+    local _platform_cli_names=""
+
+    if [[ -n "${PRIZMKIT_DIR:-}" ]]; then
+        _config_ai_cli="$(_prizm_json_value "$PRIZMKIT_DIR/config.json" ai_cli)"
+        _config_platform="$(_prizm_json_value "$PRIZMKIT_DIR/config.json" platform)"
+        _manifest_platform="$(_prizm_json_value "$PRIZMKIT_DIR/manifest.json" platform)"
+    fi
+
+    _detect_installed_platform_cli() {
+        if [[ -f "$PROJECT_ROOT/.codex/agents/prizm-dev-team-dev.toml" || -f "$PROJECT_ROOT/.agents/skills/prizm-kit/SKILL.md" ]] && command -v codex &>/dev/null; then
+            echo "codex"
+        elif [[ -f "$PROJECT_ROOT/.claude/commands/prizm-kit.md" ]] && command -v claude &>/dev/null; then
+            echo "claude"
+        elif [[ -f "$PROJECT_ROOT/.codebuddy/agents/prizm-dev-team-dev.md" || -f "$PROJECT_ROOT/.codebuddy/skills/prizm-kit/SKILL.md" ]]; then
+            _prizm_resolve_cli_name cbc || true
+        fi
+    }
 
     if [[ -n "${AI_CLI:-}" ]]; then
         _raw_cli="$AI_CLI"
-    elif [[ -f "$PRIZMKIT_DIR/config.json" ]]; then
-        _config_ai_cli=$(python3 -c "
-import json, sys
-try:
-    with open('$PRIZMKIT_DIR/config.json') as f:
-        d = json.load(f)
-    v = d.get('ai_cli', '')
-    if not v:
-        p = d.get('platform', '')
-        if p == 'claude': v = 'claude'
-        elif p == 'codebuddy': v = 'cbc'
-    if v: print(v)
-except: pass
-" 2>/dev/null || true)
-        if [[ -n "$_config_ai_cli" ]]; then
-            _raw_cli="$_config_ai_cli"
-        elif [[ -n "${CODEBUDDY_CLI:-}" ]]; then
-            _raw_cli="$CODEBUDDY_CLI"
-        elif command -v claude &>/dev/null; then
-            _raw_cli="claude"
-        elif command -v cbc &>/dev/null; then
-            _raw_cli="cbc"
-        else
-            echo "ERROR: No AI CLI found. Install CodeBuddy (cbc) or Claude Code (claude)." >&2
+    elif [[ -n "$_config_ai_cli" ]]; then
+        _raw_cli="$_config_ai_cli"
+    elif [[ -n "$_manifest_platform" ]]; then
+        _platform_cli="$(_prizm_cli_for_platform "$_manifest_platform" || true)"
+        _platform_cli_names="$(_prizm_cli_names_for_platform "$_manifest_platform")"
+        if [[ -n "$_platform_cli" ]]; then
+            _raw_cli="$_platform_cli"
+        elif [[ -n "$_platform_cli_names" ]]; then
+            echo "ERROR: Installed PrizmKit platform '$_manifest_platform' requires one of: $(_prizm_expected_cli_text "$_manifest_platform"). Install it or set AI_CLI." >&2
             exit 1
         fi
-    elif [[ -n "${CODEBUDDY_CLI:-}" ]]; then
+    elif [[ -n "$_config_platform" ]]; then
+        _platform_cli="$(_prizm_cli_for_platform "$_config_platform" || true)"
+        _platform_cli_names="$(_prizm_cli_names_for_platform "$_config_platform")"
+        if [[ -n "$_platform_cli" ]]; then
+            _raw_cli="$_platform_cli"
+        elif [[ -n "$_platform_cli_names" ]]; then
+            echo "ERROR: Configured PrizmKit platform '$_config_platform' requires one of: $(_prizm_expected_cli_text "$_config_platform"). Install it or set AI_CLI." >&2
+            exit 1
+        fi
+    fi
+
+    if [[ -z "$_raw_cli" && -n "${CODEBUDDY_CLI:-}" ]]; then
         _raw_cli="$CODEBUDDY_CLI"
-    elif command -v claude &>/dev/null; then
+    fi
+    if [[ -z "$_raw_cli" ]]; then
+        _installed_cli="$(_detect_installed_platform_cli || true)"
+        if [[ -n "$_installed_cli" ]]; then
+            _raw_cli="$_installed_cli"
+        fi
+    fi
+    if [[ -z "$_raw_cli" ]] && command -v claude &>/dev/null; then
         _raw_cli="claude"
-    elif command -v cbc &>/dev/null; then
+    elif [[ -z "$_raw_cli" ]] && command -v cbc &>/dev/null; then
         _raw_cli="cbc"
-    else
-        echo "ERROR: No AI CLI found. Install CodeBuddy (cbc) or Claude Code (claude)." >&2
+    elif [[ -z "$_raw_cli" ]] && command -v codex &>/dev/null; then
+        _raw_cli="codex"
+    elif [[ -z "$_raw_cli" ]]; then
+        echo "ERROR: No AI CLI found. Install CodeBuddy (cbc), Claude Code (claude), or Codex (codex)." >&2
         exit 1
     fi
 
     CLI_CMD="$_raw_cli"
 
-    if [[ -n "${PRIZMKIT_PLATFORM:-}" ]]; then
-        PLATFORM="$PRIZMKIT_PLATFORM"
-    elif [[ "$_raw_cli" == *"claude"* ]]; then
-        PLATFORM="claude"
-    else
-        PLATFORM="codebuddy"
-    fi
+    PLATFORM="$(_prizm_project_platform_for_cli "$_raw_cli" "$_manifest_platform" "$_config_platform")"
 
     export CLI_CMD
     export PLATFORM
     export PRIZMKIT_PLATFORM="$PLATFORM"
 }
 
+# Start an AI CLI session in the background.
+# Usage: prizm_start_ai_session <prompt_path> <log_path> <model>
+# Sets PRIZM_AI_PID to the spawned process PID. Do not call this function via
+# command substitution; the background process must remain a child of the
+# runner shell so wait/heartbeat/trap handling works correctly.
+PRIZM_AI_PID=""
+prizm_start_ai_session() {
+    local prompt_path="$1"
+    local log_path="$2"
+    local model="${3:-}"
+
+    unset CLAUDECODE 2>/dev/null || true
+
+    local session_platform
+    session_platform="$(_prizm_session_platform)"
+
+    case "$session_platform" in
+        claude)
+            local claude_args=(-p "$(cat "$prompt_path")" --dangerously-skip-permissions)
+            if [[ "$VERBOSE" == "1" || "$USE_STREAM_JSON" == "true" ]]; then
+                claude_args+=(--verbose)
+            fi
+            if [[ "$USE_STREAM_JSON" == "true" ]]; then
+                claude_args+=(--output-format stream-json)
+            fi
+            if [[ -n "$model" ]]; then
+                claude_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${claude_args[@]}" > "$log_path" 2>&1 &
+            ;;
+        codex)
+            local codex_args=(--ask-for-approval never --sandbox danger-full-access exec --cd "$PROJECT_ROOT" --skip-git-repo-check)
+            if [[ -n "$model" ]]; then
+                codex_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${codex_args[@]}" - < "$prompt_path" > "$log_path" 2>&1 &
+            ;;
+        *)
+            local cb_args=(--print -y)
+            if [[ "$VERBOSE" == "1" ]]; then
+                cb_args+=(--verbose)
+            fi
+            if [[ "$USE_STREAM_JSON" == "true" ]]; then
+                cb_args+=(--output-format stream-json)
+            fi
+            if [[ -n "$model" ]]; then
+                cb_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${cb_args[@]}" < "$prompt_path" > "$log_path" 2>&1 &
+            ;;
+    esac
+    PRIZM_AI_PID=$!
+}
+
+# Run an AI CLI session synchronously.
+# Usage: prizm_run_ai_session <prompt_path> <log_path> <model>
+prizm_run_ai_session() {
+    local prompt_path="$1"
+    local log_path="$2"
+    local model="${3:-}"
+
+    unset CLAUDECODE 2>/dev/null || true
+
+    local session_platform
+    session_platform="$(_prizm_session_platform)"
+
+    case "$session_platform" in
+        claude)
+            local claude_args=(-p "$(cat "$prompt_path")" --dangerously-skip-permissions)
+            if [[ -n "$model" ]]; then
+                claude_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${claude_args[@]}" > "$log_path" 2>&1
+            ;;
+        codex)
+            local codex_args=(--ask-for-approval never --sandbox danger-full-access exec --cd "$PROJECT_ROOT" --skip-git-repo-check)
+            if [[ -n "$model" ]]; then
+                codex_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${codex_args[@]}" - < "$prompt_path" > "$log_path" 2>&1
+            ;;
+        *)
+            local cb_args=(--print -y)
+            if [[ -n "$model" ]]; then
+                cb_args+=(--model "$model")
+            fi
+            "$CLI_CMD" "${cb_args[@]}" < "$prompt_path" > "$log_path" 2>&1
+            ;;
+    esac
+}
+
 # prizm_detect_subagents <session_log>
 #
 # Scan session log for subagent spawns, count them, and log the result.

package/bundled/dev-pipeline/run-bugfix.sh

@@ -16,9 +16,9 @@ set -euo pipefail
 # Environment Variables:
 #   MAX_RETRIES           Max retries per bug (default: 3)
 #   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
-#   AI_CLI                AI CLI command name (auto-detected: cbc or claude)
+#   AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)
 #   CODEBUDDY_CLI         Legacy alias for AI_CLI (deprecated, use AI_CLI instead)
-#   PRIZMKIT_PLATFORM     Force platform: 'codebuddy' or 'claude' (auto-detected)
+#   PRIZMKIT_PLATFORM     Platform hint for custom AI_CLI wrappers: codebuddy, claude, or codex
 #   VERBOSE               Set to 1 to enable --verbose on AI CLI
 #   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
 #   STALE_KILL_THRESHOLD   Auto-kill session after N seconds of no progress (default: 900)
@@ -92,56 +92,19 @@ spawn_and_wait_session() {
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
 
-    local verbose_flag=""
-    if [[ "$VERBOSE" == "1" ]]; then
-        verbose_flag="--verbose"
-    fi
-
-    local stream_json_flag=""
-    if [[ "$USE_STREAM_JSON" == "true" ]]; then
-        stream_json_flag="--output-format stream-json"
-        # claude-internal requires --verbose when using stream-json with -p/--print
-        verbose_flag="--verbose"
-    fi
-
-    local model_flag=""
+    local effective_model=""
     if [[ -n "$item_model" ]]; then
-        model_flag="--model $item_model"
+        effective_model="$item_model"
     elif [[ -n "${MODEL:-}" ]]; then
-        model_flag="--model $MODEL"
+        effective_model="$MODEL"
     fi
 
-    # Unset CLAUDECODE to prevent "nested session" error when launched from
-    # within an existing Claude Code session (e.g. via launch-bugfix-daemon.sh).
-    unset CLAUDECODE 2>/dev/null || true
-
     # Log bootstrap prompt in test mode
     prizm_log_bootstrap_prompt "$bootstrap_prompt" "$bug_id"
 
-    case "$CLI_CMD" in
-        *claude*)
-            # Claude Code: prompt via -p, --dangerously-skip-permissions for auto-accept
-            "$CLI_CMD" \
-                -p "$(cat "$bootstrap_prompt")" \
-                --dangerously-skip-permissions \
-                $verbose_flag \
-                $stream_json_flag \
-                $model_flag \
-                > "$session_log" 2>&1 &
-            ;;
-        *)
-            # CodeBuddy (cbc) and others: prompt via stdin, -y for auto-accept
-            "$CLI_CMD" \
-                --print \
-                -y \
-                $verbose_flag \
-                $stream_json_flag \
-                $model_flag \
-                < "$bootstrap_prompt" \
-                > "$session_log" 2>&1 &
-            ;;
-    esac
-    local cli_pid=$!
+    local cli_pid
+    prizm_start_ai_session "$bootstrap_prompt" "$session_log" "$effective_model"
+    cli_pid="$PRIZM_AI_PID"
 
     # Start progress parser (no-op if stream-json not supported)
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
@@ -1004,21 +967,7 @@ DEPLOY_PROMPT_EOF
                     log_info "Deploy prompt: $deploy_prompt"
                     log_info "Deploy log: $deploy_session_dir/logs/session.log"
 
-                    case "$CLI_CMD" in
-                        *claude*)
-                            "$CLI_CMD" \
-                                -p "$(cat "$deploy_prompt")" \
-                                --dangerously-skip-permissions \
-                                > "$deploy_session_dir/logs/session.log" 2>&1
-                            ;;
-                        *)
-                            "$CLI_CMD" \
-                                --print \
-                                -y \
-                                < "$deploy_prompt" \
-                                > "$deploy_session_dir/logs/session.log" 2>&1
-                            ;;
-                    esac
+                    prizm_run_ai_session "$deploy_prompt" "$deploy_session_dir/logs/session.log"
                     local deploy_exit=$?
 
                     if [[ $deploy_exit -eq 0 ]]; then
@@ -1252,7 +1201,7 @@ show_help() {
     echo "  MODEL                 Default AI model (overridden by per-bug model in bug list)"
     echo "  PIPELINE_MODE         Default pipeline mode: lite|standard|full (overridden by --mode)"
     echo "  ENABLE_CRITIC         Enable/disable critic: true|false|1|0 (overridden by --critic/--no-critic)"
-    echo "  AI_CLI                AI CLI command name (auto-detected: cbc or claude)"
+    echo "  AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)"
     echo "  VERBOSE               Set to 1 for verbose AI CLI output"
     echo "  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)"
     echo "  STALE_KILL_THRESHOLD  Auto-kill session after N seconds of no progress (default: 900)"

package/bundled/dev-pipeline/run-feature.sh

@@ -19,7 +19,7 @@ set -euo pipefail
 #   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
 #   AI_CLI                AI CLI command name (override; also readable from .prizmkit/config.json)
 #   CODEBUDDY_CLI         Legacy alias for AI_CLI (deprecated, use AI_CLI instead)
-#   PRIZMKIT_PLATFORM     Force platform: 'codebuddy' or 'claude' (auto-detected)
+#   PRIZMKIT_PLATFORM     Platform hint for custom AI_CLI wrappers: codebuddy, claude, or codex
 #   MODEL                 AI model to use (e.g. claude-opus-4.6, claude-sonnet-4.6, claude-haiku-4.5)
 #   VERBOSE               Set to 1 to enable --verbose on AI CLI (shows subagent output)
 #   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
@@ -105,53 +105,10 @@ spawn_and_wait_session() {
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
 
-    # Spawn AI CLI session
-    local verbose_flag=""
-    if [[ "$VERBOSE" == "1" ]]; then
-        verbose_flag="--verbose"
-    fi
-
-    local stream_json_flag=""
-    if [[ "$USE_STREAM_JSON" == "true" ]]; then
-        stream_json_flag="--output-format stream-json"
-        # claude-internal requires --verbose when using stream-json with -p/--print
-        verbose_flag="--verbose"
-    fi
-
-    local model_flag=""
     local effective_model="${feature_model:-$MODEL}"
-    if [[ -n "$effective_model" ]]; then
-        model_flag="--model $effective_model"
-    fi
-
-    # Unset CLAUDECODE to prevent "nested session" error when launched from
-    # within an existing Claude Code session (e.g. via launch-feature-daemon.sh).
-    unset CLAUDECODE 2>/dev/null || true
-
-    case "$CLI_CMD" in
-        *claude*)
-            # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
-            "$CLI_CMD" \
-                -p "$(cat "$bootstrap_prompt")" \
-                --dangerously-skip-permissions \
-                $verbose_flag \
-                $stream_json_flag \
-                $model_flag \
-                > "$session_log" 2>&1 &
-            ;;
-        *)
-            # CodeBuddy (cbc) and others: prompt via stdin
-            "$CLI_CMD" \
-                --print \
-                -y \
-                $verbose_flag \
-                $stream_json_flag \
-                $model_flag \
-                < "$bootstrap_prompt" \
-                > "$session_log" 2>&1 &
-            ;;
-    esac
-    local cbc_pid=$!
+    local cbc_pid
+    prizm_start_ai_session "$bootstrap_prompt" "$session_log" "$effective_model"
+    cbc_pid="$PRIZM_AI_PID"
 
     # Start progress parser (no-op if stream-json not supported)
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
@@ -1231,21 +1188,7 @@ DEPLOY_PROMPT_EOF
                     log_info "Deploy prompt: $deploy_prompt"
                     log_info "Deploy log: $deploy_session_dir/logs/session.log"
 
-                    case "$CLI_CMD" in
-                        *claude*)
-                            "$CLI_CMD" \
-                                -p "$(cat "$deploy_prompt")" \
-                                --dangerously-skip-permissions \
-                                > "$deploy_session_dir/logs/session.log" 2>&1
-                            ;;
-                        *)
-                            "$CLI_CMD" \
-                                --print \
-                                -y \
-                                < "$deploy_prompt" \
-                                > "$deploy_session_dir/logs/session.log" 2>&1
-                            ;;
-                    esac
+                    prizm_run_ai_session "$deploy_prompt" "$deploy_session_dir/logs/session.log"
                     local deploy_exit=$?
 
                     if [[ $deploy_exit -eq 0 ]]; then
@@ -1465,7 +1408,7 @@ show_help() {
     echo "Environment Variables:"
     echo "  MAX_RETRIES           Max retries per feature (default: 3)"
     echo "  SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)"
-    echo "  AI_CLI                AI CLI command name (auto-detected: cbc or claude)"
+    echo "  AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)"
     echo "  MODEL                 AI model ID (e.g. claude-opus-4.6, claude-sonnet-4.6, claude-haiku-4.5)"
     echo "  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)"
     echo "  STALE_KILL_THRESHOLD  Auto-kill session after N seconds of no progress (default: 900)"
@@ -1553,23 +1496,12 @@ case "${1:-run}" in
 
         test_prompt="What AI assistant/platform are you and what model are you running? Reply in one line, e.g. \"I'm Claude Code Claude Opnus x.x\".No extra text."
 
-        local_model_flag=""
-        if [[ -n "$MODEL" ]]; then
-            local_model_flag="--model $MODEL"
-        fi
-
         # Run headless query with 30s timeout (background + kill pattern for macOS)
         tmpfile=$(mktemp)
+        prompt_file=$(mktemp)
+        printf '%s\n' "$test_prompt" > "$prompt_file"
         (
-            unset CLAUDECODE
-            case "$CLI_CMD" in
-                *claude*)
-                    "$CLI_CMD" -p "$test_prompt" --dangerously-skip-permissions --no-session-persistence $local_model_flag > "$tmpfile" 2>/dev/null
-                    ;;
-                *)
-                    echo "$test_prompt" | "$CLI_CMD" --print -y $local_model_flag > "$tmpfile" 2>/dev/null
-                    ;;
-            esac
+            prizm_run_ai_session "$prompt_file" "$tmpfile" "$MODEL"
         ) &
         query_pid=$!
         ( sleep 30 && kill "$query_pid" 2>/dev/null ) &
@@ -1579,7 +1511,7 @@ case "${1:-run}" in
         wait "$timer_pid" 2>/dev/null || true
 
         model_reply=$(cat "$tmpfile" 2>/dev/null | head -3)
-        rm -f "$tmpfile"
+        rm -f "$tmpfile" "$prompt_file"
 
         if [[ -z "$model_reply" ]]; then
             model_reply="(no response — CLI may require auth or is unavailable)"