@hitechclaw/clawspark 2.0.0

package/v2/lib/common.sh

@@ -0,0 +1,285 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CLAWSPARK_DIR="${CLAWSPARK_DIR:-${HOME}/.clawspark-v2}"
+CLAWSPARK_LOG="${CLAWSPARK_LOG:-${CLAWSPARK_DIR}/install.log}"
+CLAWSPARK_V2_DIR="${CLAWSPARK_DIR}"
+CLAWSPARK_V2_LOG="${CLAWSPARK_LOG}"
+CLAWSPARK_DEFAULTS="${CLAWSPARK_DEFAULTS:-false}"
+
+if [[ -t 1 ]] && command -v tput &>/dev/null && [[ "$(tput colors 2>/dev/null || echo 0)" -ge 8 ]]; then
+    RED=$(tput setaf 1)
+    GREEN=$(tput setaf 2)
+    YELLOW=$(tput setaf 3)
+    BLUE=$(tput setaf 4)
+    CYAN=$(tput setaf 6)
+    BOLD=$(tput bold)
+    RESET=$(tput sgr0)
+else
+    RED=$'\033[0;31m'
+    GREEN=$'\033[0;32m'
+    YELLOW=$'\033[0;33m'
+    BLUE=$'\033[0;34m'
+    CYAN=$'\033[0;36m'
+    BOLD=$'\033[1m'
+    RESET=$'\033[0m'
+fi
+
+to_lower() { echo "$1" | tr '[:upper:]' '[:lower:]'; }
+
+_ts() { date '+%H:%M:%S'; }
+
+_log_to_file() {
+    local level="$1"; shift
+    mkdir -p "${CLAWSPARK_DIR}"
+    printf '[%s] [%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "${level}" "$*" >> "${CLAWSPARK_LOG}" 2>/dev/null || true
+}
+
+log_info() {
+    printf '%s[%s]%s %s\n' "${BLUE}" "$(_ts)" "${RESET}" "$*"
+    _log_to_file "INFO" "$*"
+}
+
+log_warn() {
+    printf '%s[%s] WARNING:%s %s\n' "${YELLOW}" "$(_ts)" "${RESET}" "$*" >&2
+    _log_to_file "WARN" "$*"
+}
+
+log_error() {
+    printf '%s[%s] ERROR:%s %s\n' "${RED}" "$(_ts)" "${RESET}" "$*" >&2
+    _log_to_file "ERROR" "$*"
+}
+
+log_success() {
+    printf '%s[%s] OK:%s %s\n' "${GREEN}" "$(_ts)" "${RESET}" "$*"
+    _log_to_file "OK" "$*"
+}
+
+check_command() {
+    command -v "$1" &>/dev/null
+}
+
+prompt_choice() {
+    local question="$1"
+    local options_name="$2"
+    local default_idx="${3:-0}"
+    local count
+    eval "count=\${#${options_name}[@]}"
+
+    if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+        eval "printf '%s' \"\${${options_name}[${default_idx}]}\""
+        return 0
+    fi
+
+    printf '\n%s%s%s\n' "${BOLD}" "${question}" "${RESET}" >/dev/tty
+    local i opt marker
+    for i in $(seq 0 $(( count - 1 ))); do
+        marker=""
+        if [[ "${i}" -eq "${default_idx}" ]]; then
+            marker=" ${CYAN}(default)${RESET}"
+        fi
+        eval "opt=\${${options_name}[${i}]}"
+        printf '  %s%d)%s %s%s\n' "${GREEN}" $(( i + 1 )) "${RESET}" "${opt}" "${marker}" >/dev/tty
+    done
+
+    local selection
+    while true; do
+        printf '%s> %s' "${BOLD}" "${RESET}" >/dev/tty
+        read -r selection </dev/tty || selection=""
+        if [[ -z "${selection}" ]]; then
+            eval "printf '%s' \"\${${options_name}[${default_idx}]}\""
+            return 0
+        fi
+        if [[ "${selection}" =~ ^[0-9]+$ ]] && (( selection >= 1 && selection <= count )); then
+            eval "printf '%s' \"\${${options_name}[$(( selection - 1 ))]}\""
+            return 0
+        fi
+        printf '  %sPlease enter a number between 1 and %d%s\n' "${YELLOW}" "${count}" "${RESET}" >/dev/tty
+    done
+}
+
+prompt_input() {
+    local question="$1"
+    local default_value="${2:-}"
+
+    if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+        printf '%s' "${default_value}"
+        return 0
+    fi
+
+    if [[ -n "${default_value}" ]]; then
+        printf '\n%s%s%s [%s]: ' "${BOLD}" "${question}" "${RESET}" "${default_value}" >/dev/tty
+    else
+        printf '\n%s%s%s: ' "${BOLD}" "${question}" "${RESET}" >/dev/tty
+    fi
+
+    local value
+    read -r value </dev/tty || value=""
+    if [[ -z "${value}" ]]; then
+        value="${default_value}"
+    fi
+    printf '%s' "${value}"
+}
+
+prompt_secret() {
+    local question="$1"
+
+    if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+        printf '%s' "${FLAG_API_KEY:-}"
+        return 0
+    fi
+
+    printf '\n%s%s%s: ' "${BOLD}" "${question}" "${RESET}" >/dev/tty
+    local value=""
+    stty -echo </dev/tty
+    read -r value </dev/tty || value=""
+    stty echo </dev/tty
+    printf '\n' >/dev/tty
+    printf '%s' "${value}"
+}
+
+prompt_yn() {
+    local question="$1"
+    local default="${2:-y}"
+
+    if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+        [[ "${default}" == "y" ]] && return 0 || return 1
+    fi
+
+    local hint="[y/N]"
+    [[ "${default}" == "y" ]] && hint="[Y/n]"
+    printf '\n%s%s %s%s ' "${BOLD}" "${question}" "${hint}" "${RESET}" >/dev/tty
+
+    local answer
+    read -r answer </dev/tty || answer=""
+    answer=$(to_lower "${answer}")
+    if [[ -z "${answer}" ]]; then
+        [[ "${default}" == "y" ]] && return 0 || return 1
+    fi
+    [[ "${answer}" =~ ^y(es)?$ ]]
+}
+
+spinner() {
+    local pid="$1"
+    local msg="${2:-Working...}"
+    local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
+    local frame_count=${#frames[@]}
+    local i=0
+
+    if [[ ! -t 1 ]]; then
+        wait "${pid}" 2>/dev/null || true
+        return 0
+    fi
+
+    printf '  '
+    while kill -0 "${pid}" 2>/dev/null; do
+        printf '\r  %s%s%s %s' "${CYAN}" "${frames[i % frame_count]}" "${RESET}" "${msg}"
+        i=$(( i + 1 ))
+        sleep 0.08
+    done
+
+    wait "${pid}" 2>/dev/null
+    local exit_code=$?
+    if [[ ${exit_code} -eq 0 ]]; then
+        printf '\r  %s✓%s %s\n' "${GREEN}" "${RESET}" "${msg}"
+    else
+        printf '\r  %s✗%s %s\n' "${RED}" "${RESET}" "${msg}"
+    fi
+    return 0
+}
+
+hr() {
+    local cols
+    cols=$(tput cols 2>/dev/null || echo 60)
+    printf '%s%*s%s\n' "${BLUE}" "${cols}" '' "${RESET}" | tr ' ' '─'
+}
+
+print_box() {
+    local lines=("$@")
+    local max_len=0
+    local line
+
+    for line in "${lines[@]}"; do
+        local stripped
+        stripped=$(printf '%s' "${line}" | sed 's/\x1b\[[0-9;]*m//g')
+        (( ${#stripped} > max_len )) && max_len=${#stripped}
+    done
+
+    local pad=$(( max_len + 2 ))
+    printf '%s┌%s┐%s\n' "${BLUE}" "$(printf '─%.0s' $(seq 1 "${pad}"))" "${RESET}"
+    for line in "${lines[@]}"; do
+        local stripped
+        stripped=$(printf '%s' "${line}" | sed 's/\x1b\[[0-9;]*m//g')
+        local spaces=$(( max_len - ${#stripped} ))
+        printf '%s│%s %s%*s %s│%s\n' "${BLUE}" "${RESET}" "${line}" "${spaces}" '' "${BLUE}" "${RESET}"
+    done
+    printf '%s└%s┘%s\n' "${BLUE}" "$(printf '─%.0s' $(seq 1 "${pad}"))" "${RESET}"
+}
+
+mask_value() {
+    local value="$1"
+    if [[ -z "${value}" ]]; then
+        printf '(empty)'
+    elif [[ ${#value} -le 8 ]]; then
+        printf '********'
+    else
+        printf '%s****%s' "${value:0:4}" "${value: -4}"
+    fi
+}
+
+write_key_value() {
+    local file="$1"
+    local key="$2"
+    local value="$3"
+    touch "${file}"
+    if grep -q "^${key}=" "${file}" 2>/dev/null; then
+        python3 - "$file" "$key" "$value" <<'PY'
+import sys
+path, key, value = sys.argv[1:4]
+with open(path, 'r', encoding='utf-8') as fh:
+    lines = fh.readlines()
+with open(path, 'w', encoding='utf-8') as fh:
+    for line in lines:
+        if line.startswith(f"{key}="):
+            fh.write(f"{key}={value}\n")
+        else:
+            fh.write(line)
+PY
+    else
+        printf '%s=%s\n' "${key}" "${value}" >> "${file}"
+    fi
+}
+
+_parse_enabled_skills() {
+    local skills_file="$1"
+    [[ -f "${skills_file}" && -r "${skills_file}" ]] || return 1
+    local in_enabled=false
+
+    while IFS= read -r line; do
+        [[ "${line}" =~ ^[[:space:]]*# ]] && continue
+        [[ -z "${line// }" ]] && continue
+
+        if [[ "${line}" =~ enabled:[[:space:]]*$ ]]; then
+            in_enabled=true
+            continue
+        fi
+        if ${in_enabled} && [[ "${line}" =~ ^[[:space:]]{0,3}[a-zA-Z] ]] && [[ ! "${line}" =~ ^[[:space:]]*- ]]; then
+            in_enabled=false
+            continue
+        fi
+        if ${in_enabled} && [[ "${line}" =~ ^[[:space:]]*-[[:space:]]+name:[[:space:]]+(.*) ]]; then
+            local slug="${BASH_REMATCH[1]}"
+            slug="${slug## }"
+            slug="${slug%% }"
+            echo "${slug}"
+            continue
+        fi
+        if ${in_enabled} && [[ "${line}" =~ ^[[:space:]]*-[[:space:]]+(.*) ]]; then
+            local slug="${BASH_REMATCH[1]}"
+            slug="${slug## }"
+            slug="${slug%% }"
+            [[ "${slug}" =~ ^[a-zA-Z]+: ]] && continue
+            echo "${slug}"
+        fi
+    done < "${skills_file}"
+}

package/v2/lib/detect-hardware.sh

@@ -0,0 +1,119 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+detect_hardware_v2() {
+    log_info "Detecting hardware profile for v2..."
+
+    HW_CPU_ARCH=$(uname -m)
+    if [[ -f /proc/cpuinfo ]]; then
+        HW_CPU_CORES=$(grep -c '^processor' /proc/cpuinfo 2>/dev/null || echo 1)
+    elif check_command sysctl; then
+        HW_CPU_CORES=$(sysctl -n hw.ncpu 2>/dev/null || echo 1)
+    else
+        HW_CPU_CORES=1
+    fi
+
+    if [[ -f /proc/meminfo ]]; then
+        local mem_kb
+        mem_kb=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo 2>/dev/null || echo 0)
+        HW_TOTAL_RAM_MB=$(( mem_kb / 1024 ))
+    elif check_command sysctl; then
+        local mem_bytes
+        mem_bytes=$(sysctl -n hw.memsize 2>/dev/null || echo 0)
+        HW_TOTAL_RAM_MB=$(( mem_bytes / 1024 / 1024 ))
+    else
+        HW_TOTAL_RAM_MB=0
+    fi
+
+    HW_GPU_NAME="none"
+    HW_GPU_VRAM_MB=0
+    HW_DRIVER_VERSION="n/a"
+    HW_ACCELERATION="cpu"
+    HW_PLATFORM="cpu-generic"
+
+    if [[ -f /etc/nv_tegra_release ]] || uname -r 2>/dev/null | grep -qi tegra; then
+        HW_PLATFORM="jetson"
+        HW_GPU_NAME="NVIDIA Jetson (Tegra)"
+        HW_GPU_VRAM_MB="${HW_TOTAL_RAM_MB}"
+        HW_ACCELERATION="gpu"
+    fi
+
+    if [[ -f /sys/devices/virtual/dmi/id/product_name ]]; then
+        local product_name
+        product_name=$(cat /sys/devices/virtual/dmi/id/product_name 2>/dev/null || echo "")
+        if echo "${product_name}" | grep -qiE "DGX.Spark|DGX_Spark"; then
+            HW_PLATFORM="dgx-spark"
+            HW_GPU_NAME="NVIDIA GB10 / DGX Spark"
+            HW_GPU_VRAM_MB=131072
+            HW_TOTAL_RAM_MB=131072
+            HW_ACCELERATION="gpu"
+        fi
+    fi
+
+    if check_command nvidia-smi; then
+        local gpu_info
+        gpu_info=$(nvidia-smi --query-gpu=name,memory.total,driver_version --format=csv,noheader,nounits 2>/dev/null || echo "")
+        if [[ -n "${gpu_info}" ]]; then
+            local first_gpu
+            first_gpu=$(echo "${gpu_info}" | head -n1)
+            HW_GPU_NAME=$(echo "${first_gpu}" | cut -d',' -f1 | xargs)
+            local vram_str
+            vram_str=$(echo "${first_gpu}" | cut -d',' -f2 | xargs)
+            if [[ "${vram_str}" =~ ^[0-9]+ ]]; then
+                HW_GPU_VRAM_MB="${vram_str%%.*}"
+            fi
+            HW_DRIVER_VERSION=$(echo "${first_gpu}" | cut -d',' -f3 | xargs)
+            HW_ACCELERATION="gpu"
+            if [[ "${HW_PLATFORM}" == "cpu-generic" ]]; then
+                if echo "${HW_GPU_NAME}" | grep -qiE "RTX|GeForce|Quadro"; then
+                    HW_PLATFORM="rtx"
+                else
+                    HW_PLATFORM="gpu-generic"
+                fi
+            fi
+        fi
+    fi
+
+    if [[ "${HW_PLATFORM}" == "cpu-generic" && "$(uname)" == "Darwin" ]]; then
+        local chip_info
+        chip_info=$(sysctl -n machdep.cpu.brand_string 2>/dev/null || echo "")
+        if echo "${chip_info}" | grep -qi "Apple"; then
+            HW_PLATFORM="mac"
+            HW_GPU_NAME="Apple Silicon (${chip_info})"
+            HW_GPU_VRAM_MB="${HW_TOTAL_RAM_MB}"
+            HW_DRIVER_VERSION="Metal"
+            HW_ACCELERATION="gpu"
+        fi
+    fi
+
+    if [[ "${HW_ACCELERATION}" == "cpu" ]]; then
+        if (( HW_TOTAL_RAM_MB >= 32768 )); then
+            HW_CPU_PROFILE="cpu-large"
+        elif (( HW_TOTAL_RAM_MB >= 16384 )); then
+            HW_CPU_PROFILE="cpu-medium"
+        else
+            HW_CPU_PROFILE="cpu-small"
+        fi
+    else
+        HW_CPU_PROFILE="with-gpu"
+    fi
+
+    export HW_CPU_ARCH HW_CPU_CORES HW_TOTAL_RAM_MB HW_GPU_NAME HW_GPU_VRAM_MB
+    export HW_DRIVER_VERSION HW_ACCELERATION HW_PLATFORM HW_CPU_PROFILE
+
+    local ram_gb=$(( HW_TOTAL_RAM_MB / 1024 ))
+    local vram_gb=$(( HW_GPU_VRAM_MB / 1024 ))
+    print_box \
+        "${BOLD}v2 Hardware Summary${RESET}" \
+        "" \
+        "Platform      : ${CYAN}${HW_PLATFORM}${RESET}" \
+        "Acceleration  : ${HW_ACCELERATION}" \
+        "GPU           : ${HW_GPU_NAME}" \
+        "VRAM          : ${vram_gb} GB" \
+        "System RAM    : ${ram_gb} GB" \
+        "CPU Cores     : ${HW_CPU_CORES} (${HW_CPU_ARCH})" \
+        "CPU Profile   : ${HW_CPU_PROFILE}" \
+        "Driver        : ${HW_DRIVER_VERSION}"
+
+    log_success "Hardware profile ready: ${HW_PLATFORM} / ${HW_ACCELERATION}"
+}

package/v2/lib/select-runtime.sh

@@ -0,0 +1,273 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+select_runtime_v2() {
+    log_info "Selecting runtime mode for v2..."
+
+    local runtime_options=()
+    local default_idx=0
+
+    if [[ "${HW_ACCELERATION:-cpu}" == "gpu" ]]; then
+        runtime_options=("local-gpu" "local-cpu" "hybrid" "api-only")
+        default_idx=0
+    else
+        runtime_options=("local-cpu" "api-only" "hybrid")
+        default_idx=0
+    fi
+
+    if [[ -n "${FLAG_RUNTIME_MODE:-}" ]]; then
+        RUNTIME_MODE="${FLAG_RUNTIME_MODE}"
+    else
+        RUNTIME_MODE=$(prompt_choice "Choose deployment mode" runtime_options "${default_idx}")
+    fi
+
+    RUNTIME_MODE=$(to_lower "${RUNTIME_MODE}")
+    export RUNTIME_MODE
+    log_success "Runtime mode: ${RUNTIME_MODE}"
+}
+
+select_provider_v2() {
+    log_info "Selecting inference provider..."
+
+    local provider_options=()
+    local default_idx=0
+
+    case "${RUNTIME_MODE}" in
+        local-gpu|local-cpu)
+            provider_options=("ollama")
+            default_idx=0
+            ;;
+        api-only|hybrid)
+            provider_options=("openai" "anthropic" "openrouter" "google" "custom")
+            default_idx=0
+            ;;
+        *)
+            provider_options=("ollama")
+            default_idx=0
+            ;;
+    esac
+
+    if [[ -n "${FLAG_PROVIDER:-}" ]]; then
+        PRIMARY_PROVIDER="${FLAG_PROVIDER}"
+    else
+        PRIMARY_PROVIDER=$(prompt_choice "Choose primary provider" provider_options "${default_idx}")
+    fi
+
+    PRIMARY_PROVIDER=$(to_lower "${PRIMARY_PROVIDER}")
+    export PRIMARY_PROVIDER
+    log_success "Primary provider: ${PRIMARY_PROVIDER}"
+}
+
+select_model_v2() {
+    log_info "Selecting default model..."
+
+    local model_options=()
+    local model_ids=()
+    local default_idx=0
+
+    case "${PRIMARY_PROVIDER}" in
+        ollama)
+            if [[ "${RUNTIME_MODE}" == "local-cpu" ]]; then
+                if [[ "${HW_CPU_PROFILE}" == "cpu-large" ]]; then
+                    model_ids=("qwen2.5:14b-instruct-q4_K_M" "qwen2.5:7b-instruct-q4_K_M" "llama3.1:8b-instruct-q4_K_M")
+                    model_options=(
+                        "qwen2.5:14b-instruct-q4_K_M - best CPU quality for 32GB+ RAM"
+                        "qwen2.5:7b-instruct-q4_K_M - balanced CPU default"
+                        "llama3.1:8b-instruct-q4_K_M - stable general assistant"
+                    )
+                    default_idx=1
+                elif [[ "${HW_CPU_PROFILE}" == "cpu-medium" ]]; then
+                    model_ids=("qwen2.5:7b-instruct-q4_K_M" "llama3.1:8b-instruct-q4_K_M" "phi4-mini")
+                    model_options=(
+                        "qwen2.5:7b-instruct-q4_K_M - recommended for 16GB CPUs"
+                        "llama3.1:8b-instruct-q4_K_M - general purpose CPU model"
+                        "phi4-mini - lightweight and responsive"
+                    )
+                    default_idx=0
+                else
+                    model_ids=("phi4-mini" "qwen2.5:3b-instruct-q4_K_M" "llama3.2:3b")
+                    model_options=(
+                        "phi4-mini - lowest RAM recommendation"
+                        "qwen2.5:3b-instruct-q4_K_M - compact instruct model"
+                        "llama3.2:3b - small local fallback"
+                    )
+                    default_idx=0
+                fi
+            else
+                model_ids=("qwen3.5:35b-a3b" "qwen3-coder:30b" "glm-4.7-flash")
+                model_options=(
+                    "qwen3.5:35b-a3b - default GPU local model"
+                    "qwen3-coder:30b - coding focused"
+                    "glm-4.7-flash - faster compact option"
+                )
+                default_idx=0
+            fi
+            ;;
+        openai)
+            model_ids=("gpt-4.1" "gpt-4.1-mini" "gpt-5-mini")
+            model_options=(
+                "gpt-4.1 - strong general purpose API model"
+                "gpt-4.1-mini - cheaper fast default"
+                "gpt-5-mini - compact next-gen option"
+            )
+            default_idx=1
+            ;;
+        anthropic)
+            model_ids=("claude-sonnet-4-20250514" "claude-3-5-haiku-latest")
+            model_options=(
+                "claude-sonnet-4-20250514 - balanced reasoning"
+                "claude-3-5-haiku-latest - fast and lower cost"
+            )
+            default_idx=0
+            ;;
+        openrouter)
+            model_ids=("openai/gpt-4.1-mini" "anthropic/claude-3.5-haiku" "google/gemini-2.0-flash-001")
+            model_options=(
+                "openai/gpt-4.1-mini - interoperable default"
+                "anthropic/claude-3.5-haiku - Anthropic via OpenRouter"
+                "google/gemini-2.0-flash-001 - fast multimodal route"
+            )
+            default_idx=0
+            ;;
+        google)
+            model_ids=("gemini-2.0-flash" "gemini-1.5-pro")
+            model_options=(
+                "gemini-2.0-flash - default fast API model"
+                "gemini-1.5-pro - higher reasoning quality"
+            )
+            default_idx=0
+            ;;
+        custom)
+            if [[ -n "${FLAG_MODEL:-}" ]]; then
+                SELECTED_MODEL_ID="${FLAG_MODEL}"
+                SELECTED_MODEL_NAME="${FLAG_MODEL}"
+                export SELECTED_MODEL_ID SELECTED_MODEL_NAME
+                log_success "Selected model: ${SELECTED_MODEL_ID}"
+                return 0
+            fi
+
+            local custom_model_default="custom-model"
+            if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+                if [[ -z "${FLAG_MODEL:-}" ]]; then
+                    log_error "Custom provider requires --model when --defaults is used."
+                    return 1
+                fi
+            fi
+
+            SELECTED_MODEL_ID=$(prompt_input "Enter custom model ID" "${custom_model_default}")
+            SELECTED_MODEL_NAME="${SELECTED_MODEL_ID}"
+            export SELECTED_MODEL_ID SELECTED_MODEL_NAME
+            log_success "Selected model: ${SELECTED_MODEL_ID}"
+            return 0
+            ;;
+        *)
+            model_ids=("qwen2.5:7b-instruct-q4_K_M")
+            model_options=("qwen2.5:7b-instruct-q4_K_M - safe default")
+            default_idx=0
+            ;;
+    esac
+
+    local choice_label
+    choice_label=$(prompt_choice "Choose default model" model_options "${default_idx}")
+
+    local idx=0
+    for idx in $(seq 0 $(( ${#model_options[@]} - 1 ))); do
+        if [[ "${model_options[${idx}]}" == "${choice_label}" ]]; then
+            SELECTED_MODEL_ID="${model_ids[${idx}]}"
+            SELECTED_MODEL_NAME="${model_ids[${idx}]}"
+            break
+        fi
+    done
+
+    if [[ -z "${SELECTED_MODEL_ID:-}" ]]; then
+        SELECTED_MODEL_ID="${model_ids[${default_idx}]}"
+        SELECTED_MODEL_NAME="${model_ids[${default_idx}]}"
+    fi
+
+    export SELECTED_MODEL_ID SELECTED_MODEL_NAME
+    log_success "Selected model: ${SELECTED_MODEL_ID}"
+}
+
+collect_provider_credentials_v2() {
+    API_BASE_URL=""
+    API_KEY=""
+    CUSTOM_PROVIDER_NAME=""
+    FALLBACK_PROVIDER=""
+    FALLBACK_MODEL_ID=""
+
+    case "${PRIMARY_PROVIDER}" in
+        openai)
+            API_KEY=$(prompt_secret "Enter OPENAI_API_KEY")
+            API_BASE_URL=$(prompt_input "OpenAI base URL" "${FLAG_BASE_URL:-https://api.openai.com/v1}")
+            ;;
+        anthropic)
+            API_KEY=$(prompt_secret "Enter ANTHROPIC_API_KEY")
+            API_BASE_URL=$(prompt_input "Anthropic base URL" "${FLAG_BASE_URL:-https://api.anthropic.com}")
+            ;;
+        openrouter)
+            API_KEY=$(prompt_secret "Enter OPENROUTER_API_KEY")
+            API_BASE_URL=$(prompt_input "OpenRouter base URL" "${FLAG_BASE_URL:-https://openrouter.ai/api/v1}")
+            ;;
+        google)
+            API_KEY=$(prompt_secret "Enter GOOGLE_API_KEY")
+            API_BASE_URL=$(prompt_input "Google AI Studio base URL" "${FLAG_BASE_URL:-https://generativelanguage.googleapis.com/v1beta/openai}")
+            ;;
+        custom)
+            CUSTOM_PROVIDER_NAME="${FLAG_PROVIDER_NAME:-}"
+            if [[ -z "${CUSTOM_PROVIDER_NAME}" ]]; then
+                if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+                    log_error "Custom provider requires --provider-name when --defaults is used."
+                    return 1
+                fi
+                CUSTOM_PROVIDER_NAME=$(prompt_input "Custom provider label" "Custom AI")
+            fi
+
+            if [[ -n "${FLAG_API_KEY:-}" ]]; then
+                API_KEY="${FLAG_API_KEY}"
+            else
+                API_KEY=$(prompt_secret "Enter custom provider API key")
+            fi
+
+            if [[ -z "${FLAG_BASE_URL:-}" ]]; then
+                if [[ "${CLAWSPARK_DEFAULTS}" == "true" ]]; then
+                    log_error "Custom provider requires --base-url when --defaults is used."
+                    return 1
+                fi
+                API_BASE_URL=$(prompt_input "Custom provider base URL" "https://your-provider.example.com/v1")
+            else
+                API_BASE_URL="${FLAG_BASE_URL}"
+            fi
+            ;;
+        ollama)
+            API_KEY="ollama"
+            API_BASE_URL=$(prompt_input "Ollama base URL" "${FLAG_BASE_URL:-http://127.0.0.1:11434/v1}")
+            ;;
+    esac
+
+    if [[ "${PRIMARY_PROVIDER}" != "ollama" && -n "${FLAG_API_KEY:-}" ]]; then
+        API_KEY="${FLAG_API_KEY}"
+    fi
+
+    if [[ "${PRIMARY_PROVIDER}" != "ollama" && -z "${API_KEY}" ]]; then
+        log_error "API key is required for provider ${PRIMARY_PROVIDER}."
+        return 1
+    fi
+
+    if [[ -z "${API_BASE_URL}" ]]; then
+        log_error "Base URL is required for provider ${PRIMARY_PROVIDER}."
+        return 1
+    fi
+
+    if [[ "${RUNTIME_MODE}" == "hybrid" ]]; then
+        if [[ "${PRIMARY_PROVIDER}" == "ollama" ]]; then
+            FALLBACK_PROVIDER="openai"
+            FALLBACK_MODEL_ID="gpt-4.1-mini"
+        else
+            FALLBACK_PROVIDER="ollama"
+            FALLBACK_MODEL_ID="qwen2.5:7b-instruct-q4_K_M"
+        fi
+    fi
+
+    export API_BASE_URL API_KEY CUSTOM_PROVIDER_NAME FALLBACK_PROVIDER FALLBACK_MODEL_ID
+    log_info "Credential collection finished for ${PRIMARY_PROVIDER}"
+}