ai-consultants 2.10.1

package/scripts/preflight_check.sh

@@ -0,0 +1,452 @@
+#!/bin/bash
+# preflight_check.sh - Health check for AI Consultants v2.0
+#
+# Verifies that all consultants are available and functioning
+# before starting a consultation.
+#
+# Usage: ./preflight_check.sh [--quick] [--json] [--suggest-config]
+#
+# Options:
+#   --quick           Only check commands, no API tests
+#   --json            Output in JSON format
+#   --suggest-config  Output recommended ENABLE_* configuration
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/lib/common.sh"
+
+# --- Parameters ---
+QUICK_MODE=false
+JSON_OUTPUT=false
+SUGGEST_CONFIG=false
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --quick)
+            QUICK_MODE=true
+            shift
+            ;;
+        --json)
+            JSON_OUTPUT=true
+            shift
+            ;;
+        --suggest-config)
+            SUGGEST_CONFIG=true
+            shift
+            ;;
+        *)
+            shift
+            ;;
+    esac
+done
+
+# --- State variables ---
+# Using map_* functions from common.sh for bash 3.2 compatibility
+# Maps: CLI_STATUS, API_STATUS, VERSIONS
+ERRORS=0
+WARNINGS=0
+
+# =============================================================================
+# CHECK FUNCTIONS
+# =============================================================================
+
+check_cli_installed() {
+    local name="$1"
+    local cmd="$2"
+    local install_hint="$3"
+
+    if command -v "$cmd" &> /dev/null; then
+        map_set "CLI_STATUS" "$name" "installed"
+        # Try to get version
+        local version
+        version=$("$cmd" --version 2>/dev/null | head -1 || echo "unknown")
+        map_set "VERSIONS" "$name" "$version"
+        return 0
+    else
+        map_set "CLI_STATUS" "$name" "missing"
+        map_set "VERSIONS" "$name" "N/A"
+        ((ERRORS++))
+        return 1
+    fi
+}
+
+check_api_connectivity() {
+    local name="$1"
+    local cmd="$2"
+    shift 2
+    local test_args=("$@")
+
+    if [[ "$(map_get "CLI_STATUS" "$name")" != "installed" ]]; then
+        map_set "API_STATUS" "$name" "skipped"
+        return 1
+    fi
+
+    # Quick test with timeout - properly quoted to prevent injection
+    if timeout 15 "$cmd" "${test_args[@]}" &>/dev/null; then
+        map_set "API_STATUS" "$name" "connected"
+        return 0
+    else
+        map_set "API_STATUS" "$name" "failed"
+        ((WARNINGS++))
+        return 1
+    fi
+}
+
+# =============================================================================
+# SUGGEST CONFIGURATION
+# =============================================================================
+
+suggest_configuration() {
+    # Run quick checks first
+    check_cli_installed "Gemini" "$GEMINI_CMD" "npm install -g @google/gemini-cli" || true
+    check_cli_installed "Codex" "$CODEX_CMD" "npm install -g @openai/codex" || true
+    check_cli_installed "Mistral" "$MISTRAL_CMD" "pip install mistral-vibe" || true
+    check_cli_installed "Kilo" "$KILO_CMD" "npm install -g @kilocode/cli" || true
+    check_cli_installed "Cursor" "$CURSOR_CMD" "curl https://cursor.com/install -fsS | bash" || true
+    check_cli_installed "Aider" "$AIDER_CMD" "pip install aider-chat" || true
+
+    local gemini_enabled="false"
+    local codex_enabled="false"
+    local mistral_enabled="false"
+    local kilo_enabled="false"
+    local cursor_enabled="false"
+    local aider_enabled="false"
+    local available_count=0
+
+    [[ "$(map_get "CLI_STATUS" "Gemini")" == "installed" ]] && { gemini_enabled="true"; ((available_count++)); }
+    [[ "$(map_get "CLI_STATUS" "Codex")" == "installed" ]] && { codex_enabled="true"; ((available_count++)); }
+    [[ "$(map_get "CLI_STATUS" "Mistral")" == "installed" ]] && { mistral_enabled="true"; ((available_count++)); }
+    [[ "$(map_get "CLI_STATUS" "Kilo")" == "installed" ]] && { kilo_enabled="true"; ((available_count++)); }
+    [[ "$(map_get "CLI_STATUS" "Cursor")" == "installed" ]] && { cursor_enabled="true"; ((available_count++)); }
+    [[ "$(map_get "CLI_STATUS" "Aider")" == "installed" ]] && { aider_enabled="true"; ((available_count++)); }
+
+    echo "# Recommended configuration based on detected CLIs"
+    echo "# Generated by: ./preflight_check.sh --suggest-config"
+    echo "# Available consultants: $available_count/6"
+    echo ""
+    echo "ENABLE_GEMINI=$gemini_enabled"
+    echo "ENABLE_CODEX=$codex_enabled"
+    echo "ENABLE_MISTRAL=$mistral_enabled"
+    echo "ENABLE_KILO=$kilo_enabled"
+    echo "ENABLE_CURSOR=$cursor_enabled"
+    echo "ENABLE_AIDER=$aider_enabled"
+
+    if [[ $available_count -lt 2 ]]; then
+        echo ""
+        echo "# WARNING: Less than 2 consultants available."
+        echo "# AI Consultants requires at least 2 consultants."
+        echo "# Install more CLIs or run ./scripts/setup_wizard.sh"
+    fi
+}
+
+# =============================================================================
+# MAIN CHECKS
+# =============================================================================
+
+run_preflight() {
+    if [[ "$JSON_OUTPUT" != "true" ]]; then
+        echo ""
+        echo "╔══════════════════════════════════════════════════════════════╗"
+        echo "║           AI Consultants v2.0 - Pre-flight Check             ║"
+        echo "╚══════════════════════════════════════════════════════════════╝"
+        echo ""
+    fi
+
+    # --- Check CLI Installation ---
+    if [[ "$JSON_OUTPUT" != "true" ]]; then
+        echo "Checking CLI installations..."
+        echo ""
+    fi
+
+    check_cli_installed "Gemini" "$GEMINI_CMD" "npm install -g @google/gemini-cli"
+    check_cli_installed "Codex" "$CODEX_CMD" "npm install -g @openai/codex"
+    check_cli_installed "Mistral" "$MISTRAL_CMD" "pip install mistral-vibe"
+    check_cli_installed "Kilo" "$KILO_CMD" "npm install -g @kilocode/cli"
+    check_cli_installed "Cursor" "$CURSOR_CMD" "curl https://cursor.com/install -fsS | bash"
+    check_cli_installed "Aider" "$AIDER_CMD" "pip install aider-chat"
+
+    # Check API-based consultants (API key validation)
+    if [[ "$ENABLE_QWEN3" == "true" ]]; then
+        if [[ -z "${QWEN3_API_KEY:-}" ]]; then
+            map_set "CLI_STATUS" "Qwen3" "missing_key"
+            ((WARNINGS++))
+        else
+            map_set "CLI_STATUS" "Qwen3" "configured"
+            map_set "VERSIONS" "Qwen3" "API"
+        fi
+    fi
+
+    if [[ "$ENABLE_GLM" == "true" ]]; then
+        if [[ -z "${GLM_API_KEY:-}" ]]; then
+            map_set "CLI_STATUS" "GLM" "missing_key"
+            ((WARNINGS++))
+        else
+            map_set "CLI_STATUS" "GLM" "configured"
+            map_set "VERSIONS" "GLM" "API"
+        fi
+    fi
+
+    if [[ "$ENABLE_GROK" == "true" ]]; then
+        if [[ -z "${GROK_API_KEY:-}" ]]; then
+            map_set "CLI_STATUS" "Grok" "missing_key"
+            ((WARNINGS++))
+        else
+            map_set "CLI_STATUS" "Grok" "configured"
+            map_set "VERSIONS" "Grok" "API"
+        fi
+    fi
+
+    if [[ "$ENABLE_DEEPSEEK" == "true" ]]; then
+        if [[ -z "${DEEPSEEK_API_KEY:-}" ]]; then
+            map_set "CLI_STATUS" "DeepSeek" "missing_key"
+            ((WARNINGS++))
+        else
+            map_set "CLI_STATUS" "DeepSeek" "configured"
+            map_set "VERSIONS" "DeepSeek" "API"
+        fi
+    fi
+
+    # Check for jq (required for JSON processing)
+    if command -v jq &> /dev/null; then
+        map_set "CLI_STATUS" "jq" "installed"
+        map_set "VERSIONS" "jq" "$(jq --version 2>/dev/null || echo "unknown")"
+    else
+        map_set "CLI_STATUS" "jq" "missing"
+        map_set "VERSIONS" "jq" "N/A"
+        ((ERRORS++))
+    fi
+
+    # Check for bc (required for floating-point math in cost calculations)
+    if command -v bc &> /dev/null; then
+        map_set "CLI_STATUS" "bc" "installed"
+        map_set "VERSIONS" "bc" "$(bc --version 2>/dev/null | head -1 || echo "unknown")"
+    else
+        map_set "CLI_STATUS" "bc" "missing"
+        map_set "VERSIONS" "bc" "N/A"
+        ((ERRORS++))
+    fi
+
+    # Check for claude CLI (optional but recommended for synthesis)
+    if command -v claude &> /dev/null; then
+        map_set "CLI_STATUS" "claude" "installed"
+        map_set "VERSIONS" "claude" "$(claude --version 2>/dev/null | head -1 || echo "unknown")"
+    else
+        map_set "CLI_STATUS" "claude" "missing"
+        map_set "VERSIONS" "claude" "N/A"
+        ((WARNINGS++))  # Warning, not error - fallback available
+    fi
+
+    if [[ "$JSON_OUTPUT" != "true" ]]; then
+        # CLI-based consultants
+        for name in Gemini Codex Mistral Kilo Cursor jq bc claude; do
+            local status version
+            status=$(map_get "CLI_STATUS" "$name")
+            version=$(map_get "VERSIONS" "$name")
+            status="${status:-unknown}"
+            version="${version:-N/A}"
+            if [[ "$status" == "installed" ]]; then
+                echo "  [OK] $name: $version"
+            elif [[ "$name" == "claude" ]]; then
+                echo "  [WARN] $name: not installed (optional)"
+            else
+                echo "  [FAIL] $name: NOT FOUND"
+            fi
+        done
+        # API-based consultants
+        for name in Qwen3 GLM Grok DeepSeek; do
+            local status
+            status=$(map_get "CLI_STATUS" "$name")
+            status="${status:-unknown}"
+            if [[ "$status" == "configured" ]]; then
+                echo "  [OK] $name: API key configured"
+            elif [[ "$status" == "missing_key" ]]; then
+                echo "  [WARN] $name: API key not set"
+            fi
+        done
+        echo ""
+    fi
+
+    # --- Check API Connectivity (unless quick mode) ---
+    if [[ "$QUICK_MODE" != "true" ]]; then
+        if [[ "$JSON_OUTPUT" != "true" ]]; then
+            echo "Testing API connectivity..."
+            echo ""
+        fi
+
+        # Gemini - test with version check
+        check_api_connectivity "Gemini" "$GEMINI_CMD" "--version" || true
+
+        # Codex - test with help
+        check_api_connectivity "Codex" "$CODEX_CMD" "--help" || true
+
+        # Mistral - test with help
+        check_api_connectivity "Mistral" "$MISTRAL_CMD" "--help" || true
+
+        # Kilo - test with version
+        check_api_connectivity "Kilo" "$KILO_CMD" "--version" || true
+
+        # Cursor - test with help
+        check_api_connectivity "Cursor" "$CURSOR_CMD" "--help" || true
+
+        # Aider - test with version
+        check_api_connectivity "Aider" "$AIDER_CMD" "--version" || true
+
+        if [[ "$JSON_OUTPUT" != "true" ]]; then
+            for name in Gemini Codex Mistral Kilo Cursor Aider; do
+                local status
+                status=$(map_get "API_STATUS" "$name")
+                status="${status:-skipped}"
+                case "$status" in
+                    connected)
+                        echo "  [OK] $name: API reachable"
+                        ;;
+                    failed)
+                        echo "  [WARN] $name: API connection failed"
+                        ;;
+                    skipped)
+                        echo "  [SKIP] $name: skipped (CLI not installed)"
+                        ;;
+                esac
+            done
+            echo ""
+        fi
+    fi
+
+    # --- Check enabled consultants ---
+    local enabled_count=0
+    # CLI-based consultants
+    [[ "$ENABLE_GEMINI" == "true" && "$(map_get "CLI_STATUS" "Gemini")" == "installed" ]] && ((enabled_count++))
+    [[ "$ENABLE_CODEX" == "true" && "$(map_get "CLI_STATUS" "Codex")" == "installed" ]] && ((enabled_count++))
+    [[ "$ENABLE_MISTRAL" == "true" && "$(map_get "CLI_STATUS" "Mistral")" == "installed" ]] && ((enabled_count++))
+    [[ "$ENABLE_KILO" == "true" && "$(map_get "CLI_STATUS" "Kilo")" == "installed" ]] && ((enabled_count++))
+    [[ "$ENABLE_CURSOR" == "true" && "$(map_get "CLI_STATUS" "Cursor")" == "installed" ]] && ((enabled_count++))
+    # API-based consultants
+    [[ "$ENABLE_QWEN3" == "true" && "$(map_get "CLI_STATUS" "Qwen3")" == "configured" ]] && ((enabled_count++))
+    [[ "$ENABLE_GLM" == "true" && "$(map_get "CLI_STATUS" "GLM")" == "configured" ]] && ((enabled_count++))
+    [[ "$ENABLE_GROK" == "true" && "$(map_get "CLI_STATUS" "Grok")" == "configured" ]] && ((enabled_count++))
+    [[ "$ENABLE_DEEPSEEK" == "true" && "$(map_get "CLI_STATUS" "DeepSeek")" == "configured" ]] && ((enabled_count++))
+
+    # --- Summary ---
+    if [[ "$JSON_OUTPUT" == "true" ]]; then
+        # Helper to get map value with default
+        get_or_default() {
+            local val
+            val=$(map_get "$1" "$2")
+            echo "${val:-$3}"
+        }
+
+        # JSON output using jq
+        jq -n \
+            --argjson errors "$ERRORS" \
+            --argjson warnings "$WARNINGS" \
+            --argjson enabled "$enabled_count" \
+            --arg gemini_cli "$(get_or_default CLI_STATUS Gemini unknown)" \
+            --arg codex_cli "$(get_or_default CLI_STATUS Codex unknown)" \
+            --arg mistral_cli "$(get_or_default CLI_STATUS Mistral unknown)" \
+            --arg kilo_cli "$(get_or_default CLI_STATUS Kilo unknown)" \
+            --arg cursor_cli "$(get_or_default CLI_STATUS Cursor unknown)" \
+            --arg jq_cli "$(get_or_default CLI_STATUS jq unknown)" \
+            --arg claude_cli "$(get_or_default CLI_STATUS claude unknown)" \
+            --arg gemini_api "$(get_or_default API_STATUS Gemini skipped)" \
+            --arg codex_api "$(get_or_default API_STATUS Codex skipped)" \
+            --arg mistral_api "$(get_or_default API_STATUS Mistral skipped)" \
+            --arg kilo_api "$(get_or_default API_STATUS Kilo skipped)" \
+            --arg cursor_api "$(get_or_default API_STATUS Cursor skipped)" \
+            --arg gemini_ver "$(get_or_default VERSIONS Gemini N/A)" \
+            --arg codex_ver "$(get_or_default VERSIONS Codex N/A)" \
+            --arg mistral_ver "$(get_or_default VERSIONS Mistral N/A)" \
+            --arg kilo_ver "$(get_or_default VERSIONS Kilo N/A)" \
+            --arg cursor_ver "$(get_or_default VERSIONS Cursor N/A)" \
+            '{
+                preflight: {
+                    status: (if $errors > 0 then "failed" elif $warnings > 0 then "warning" else "ok" end),
+                    errors: $errors,
+                    warnings: $warnings,
+                    enabled_consultants: $enabled
+                },
+                cli: {
+                    Gemini: { status: $gemini_cli, version: $gemini_ver },
+                    Codex: { status: $codex_cli, version: $codex_ver },
+                    Mistral: { status: $mistral_cli, version: $mistral_ver },
+                    Kilo: { status: $kilo_cli, version: $kilo_ver },
+                    Cursor: { status: $cursor_cli, version: $cursor_ver },
+                    jq: { status: $jq_cli },
+                    claude: { status: $claude_cli }
+                },
+                api: {
+                    Gemini: $gemini_api,
+                    Codex: $codex_api,
+                    Mistral: $mistral_api,
+                    Kilo: $kilo_api,
+                    Cursor: $cursor_api
+                }
+            }'
+    else
+        echo "╔══════════════════════════════════════════════════════════════╗"
+        echo "║                         Summary                              ║"
+        echo "╚══════════════════════════════════════════════════════════════╝"
+        echo ""
+        echo "  Enabled consultants: $enabled_count"
+        echo "  Errors: $ERRORS"
+        echo "  Warnings: $WARNINGS"
+        echo ""
+
+        if [[ $ERRORS -gt 0 ]]; then
+            echo "  [FAIL] Pre-flight FAILED - fix errors before proceeding"
+            echo ""
+            echo "  Installation hints:"
+            [[ "$(map_get "CLI_STATUS" "Gemini")" == "missing" ]] && echo "    npm install -g @google/gemini-cli"
+            [[ "$(map_get "CLI_STATUS" "Codex")" == "missing" ]] && echo "    npm install -g @openai/codex"
+            [[ "$(map_get "CLI_STATUS" "Mistral")" == "missing" ]] && echo "    pip install mistral-vibe"
+            [[ "$(map_get "CLI_STATUS" "Kilo")" == "missing" ]] && echo "    npm install -g @kilocode/cli"
+            [[ "$(map_get "CLI_STATUS" "Cursor")" == "missing" ]] && echo "    curl https://cursor.com/install -fsS | bash"
+            [[ "$(map_get "CLI_STATUS" "jq")" == "missing" ]] && echo "    brew install jq  # or apt install jq"
+            [[ "$(map_get "CLI_STATUS" "bc")" == "missing" ]] && echo "    brew install bc  # or apt install bc"
+            echo ""
+            exit 1
+        elif [[ $WARNINGS -gt 0 ]]; then
+            echo "  [WARN] Pre-flight PASSED with warnings"
+            echo ""
+            exit 0
+        else
+            echo "  [OK] Pre-flight PASSED - all systems go!"
+            echo ""
+            exit 0
+        fi
+    fi
+}
+
+# =============================================================================
+# RUN
+# =============================================================================
+
+# --- Run Unit Tests (optional) ---
+run_unit_tests() {
+    if [[ -f "$SCRIPT_DIR/test_functions.sh" ]]; then
+        if [[ "$JSON_OUTPUT" != "true" ]]; then
+            echo "Running unit tests..."
+            echo ""
+        fi
+        
+        if "$SCRIPT_DIR/test_functions.sh"; then
+            if [[ "$JSON_OUTPUT" != "true" ]]; then
+                echo "  [OK] Unit tests: PASSED"
+                echo ""
+            fi
+        else
+            if [[ "$JSON_OUTPUT" != "true" ]]; then
+                echo "  [WARN] Unit tests: FAILED"
+                echo ""
+            fi
+            ((WARNINGS++))
+        fi
+    fi
+}
+
+if [[ "$SUGGEST_CONFIG" == "true" ]]; then
+    suggest_configuration
+else
+    run_preflight
+    run_unit_tests
+fi

package/scripts/query_aider.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+# query_aider.sh - Query Aider CLI
+#
+# Usage: ./query_aider.sh "question" [context_file] [output_file]
+#
+# Environment variables:
+#   AIDER_MODEL - Model to use (default: uses aider's default)
+#   AIDER_TIMEOUT - Timeout in seconds (default: 180)
+#   ENABLE_PERSONA - Enable "The Pair Programmer" persona (default: true)
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/lib/common.sh"
+source "$SCRIPT_DIR/lib/personas.sh"
+
+# --- Parameters ---
+QUERY="${1:-}"
+CONTEXT_FILE="${2:-}"
+OUTPUT_FILE="${3:-/tmp/aider_response.json}"
+
+# --- Configuration ---
+ENABLE_PERSONA="${ENABLE_PERSONA:-true}"
+CONSULTANT_NAME="Aider"
+
+# --- Check prerequisites ---
+check_command "$AIDER_CMD" "Aider CLI" "pip install aider-chat" || exit 1
+
+# --- Build query ---
+FULL_QUERY=$(build_full_query "$QUERY" "$CONTEXT_FILE")
+validate_query "$FULL_QUERY" "Aider" || exit 1
+
+# --- Add persona if enabled ---
+if [[ "$ENABLE_PERSONA" == "true" ]]; then
+    FULL_QUERY=$(build_query_with_persona "$CONSULTANT_NAME" "$FULL_QUERY")
+fi
+
+# --- Timestamp for metadata ---
+START_TIME=$(get_timestamp_ms)
+
+# --- Execution ---
+TEMP_OUTPUT=$(mktemp)
+
+# Aider flags:
+# --no-git: Don't use git
+# --message: Send message and exit
+# --yes: Answer yes to all prompts
+# --no-check-update: Don't check for updates
+# --no-suggest-shell-commands: Don't suggest shell commands
+run_query \
+    "Aider" \
+    "$TEMP_OUTPUT" \
+    "$AIDER_TIMEOUT_SECONDS" \
+    "$AIDER_CMD" --no-git --no-check-update --no-suggest-shell-commands --yes --message "$FULL_QUERY"
+
+exit_code=$?
+
+# --- Calculate latency ---
+END_TIME=$(get_timestamp_ms)
+LATENCY_MS=$((END_TIME - START_TIME))
+
+# --- Configuration for response building ---
+MODEL_USED="${AIDER_MODEL:-gpt-5.3-codex}"
+PERSONA_NAME=$(get_persona_name "$CONSULTANT_NAME")
+
+# --- Post-processing: wrap in full schema using shared helpers ---
+if [[ $exit_code -eq 0 && -f "$TEMP_OUTPUT" && -s "$TEMP_OUTPUT" ]]; then
+    RAW_RESPONSE=$(cat "$TEMP_OUTPUT")
+    rm -f "$TEMP_OUTPUT"
+
+    # Try to parse as structured JSON
+    if echo "$RAW_RESPONSE" | jq -e '.response.summary' > /dev/null 2>&1; then
+        build_structured_response "$CONSULTANT_NAME" "$MODEL_USED" "$PERSONA_NAME" "$RAW_RESPONSE" "$LATENCY_MS" > "$OUTPUT_FILE"
+    else
+        build_fallback_response "$CONSULTANT_NAME" "$MODEL_USED" "$PERSONA_NAME" "$RAW_RESPONSE" "$LATENCY_MS" > "$OUTPUT_FILE"
+    fi
+else
+    rm -f "$TEMP_OUTPUT"
+    build_error_response "$CONSULTANT_NAME" "$MODEL_USED" "$PERSONA_NAME" "Query failed with exit code $exit_code" "$LATENCY_MS" > "$OUTPUT_FILE"
+fi
+
+cat "$OUTPUT_FILE"
+exit $exit_code

package/scripts/query_amp.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# query_amp.sh - Query Amp CLI (v2.8)
+#
+# Usage: ./query_amp.sh "question" [context_file] [output_file]
+#
+# Environment variables:
+#   AMP_MODEL     - Model identifier (default: amp)
+#   AMP_TIMEOUT   - Timeout in seconds (default: 180)
+#   AMP_API_KEY   - API key for authentication (required)
+#   ENABLE_PERSONA - Enable "The Systems Thinker" persona (default: true)
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/lib/common.sh"
+source "$SCRIPT_DIR/lib/personas.sh"
+
+# --- Parameters ---
+QUERY="${1:-}"
+CONTEXT_FILE="${2:-}"
+OUTPUT_FILE="${3:-/tmp/amp_response.json}"
+
+# --- Configuration ---
+ENABLE_PERSONA="${ENABLE_PERSONA:-true}"
+CONSULTANT_NAME="Amp"
+
+# --- Build query ---
+FULL_QUERY=$(build_full_query "$QUERY" "$CONTEXT_FILE")
+validate_query "$FULL_QUERY" "Amp" || exit 1
+
+# --- Add persona if enabled ---
+if [[ "$ENABLE_PERSONA" == "true" ]]; then
+    FULL_QUERY=$(build_query_with_persona "$CONSULTANT_NAME" "$FULL_QUERY")
+fi
+
+# --- Timestamp for metadata ---
+START_TIME=$(get_timestamp_ms)
+
+# --- Execution ---
+TEMP_OUTPUT=$(mktemp)
+
+# Check CLI prerequisite
+check_command "$AMP_CMD" "Amp CLI" "curl -fsSL https://ampcode.com/install.sh | bash" || exit 1
+
+# Amp CLI uses -x (execute mode) for non-interactive usage
+echo "$FULL_QUERY" | run_query \
+    "Amp" \
+    "$TEMP_OUTPUT" \
+    "$AMP_TIMEOUT_SECONDS" \
+    "$AMP_CMD" -x
+
+exit_code=$?
+
+# --- Calculate latency ---
+END_TIME=$(get_timestamp_ms)
+LATENCY_MS=$((END_TIME - START_TIME))
+
+# --- Configuration for response building ---
+MODEL_USED="${AMP_MODEL:-amp}"
+PERSONA_NAME=$(get_persona_name "$CONSULTANT_NAME")
+
+# --- Post-processing: use shared helper ---
+process_consultant_response "$CONSULTANT_NAME" "$MODEL_USED" "$PERSONA_NAME" \
+    "$TEMP_OUTPUT" "$OUTPUT_FILE" "$exit_code" "$LATENCY_MS"
+
+cat "$OUTPUT_FILE"
+exit $exit_code