gitbasher 5.0.1 → 5.2.0

package/dist/gitb

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o pipefail
-GITBASHER_VERSION="5.0.1"
+GITBASHER_VERSION="5.2.0"
 if [ "$1" == "init" ] || [ "$1" == "i" ]; then
     git init
 fi
@@ -839,29 +839,7 @@ function config_source_tag {
         default) echo -e "${GRAY}(default)${ENDCOLOR}" ;;
     esac
 }
-function print_configuration {
-    echo -e "${YELLOW}Current configuration:${ENDCOLOR}"
-    local user_name=$(get_config_value user.name)
-    if [ -n "$user_name" ]; then
-        echo -e "\tuser.name:\t${YELLOW}$user_name${ENDCOLOR} $(config_source_tag user.name)"
-    else
-        echo -e "\tuser.name:\t${RED}not set${ENDCOLOR}"
-    fi
-    local user_email=$(get_config_value user.email)
-    if [ -n "$user_email" ]; then
-        echo -e "\tuser.email:\t${YELLOW}$user_email${ENDCOLOR} $(config_source_tag user.email)"
-    else
-        echo -e "\tuser.email:\t${RED}not set${ENDCOLOR}"
-    fi
-    echo -e "\tdefault:\t${YELLOW}$main_branch${ENDCOLOR} $(config_source_tag gitbasher.branch)"
-    echo -e "\tseparator:\t${YELLOW}$sep${ENDCOLOR} $(config_source_tag gitbasher.sep)"
-    echo -e "\teditor:\t\t${YELLOW}$editor${ENDCOLOR} $(config_source_tag core.editor)"
-    if [ "$ticket_name" != "" ]; then
-        echo -e "\tticket:\t\t${YELLOW}$ticket_name${ENDCOLOR} $(config_source_tag gitbasher.ticket)"
-    fi
-    if [ "$scopes" != "" ]; then
-        echo -e "\tscopes:\t\t${YELLOW}$scopes${ENDCOLOR} $(config_source_tag gitbasher.scopes)"
-    fi
+function print_ai_configuration {
     local ai_provider=$(get_ai_provider)
     echo -e "\tAI provider:\t${GREEN}$ai_provider${ENDCOLOR} $(config_source_tag gitbasher.ai-provider)"
     local ai_base_url=$(get_ai_base_url)
@@ -897,12 +875,48 @@ function print_configuration {
     fi
     local ai_model=$(get_ai_model)
     if [ -n "$ai_model" ]; then
-        echo -e "\tAI model:\t${GREEN}$ai_model${ENDCOLOR} ${GRAY}(all tasks)${ENDCOLOR} $(config_source_tag gitbasher.ai-model)"
+        local model_key="gitbasher.ai-model-${ai_provider}"
+        if [ "$(config_source "$model_key")" = "default" ]; then
+            model_key="gitbasher.ai-model"
+        fi
+        echo -e "\tAI model:\t${GREEN}$ai_model${ENDCOLOR} $(config_source_tag "$model_key")"
     else
-        echo -e "\tAI models:\t${GREEN}$(get_ai_model_for simple)${ENDCOLOR} ${GRAY}(simple/subject)${ENDCOLOR} $(config_source_tag gitbasher.ai-model-simple)"
-        echo -e "\t\t\t${GREEN}$(get_ai_model_for full)${ENDCOLOR} ${GRAY}(full)${ENDCOLOR} $(config_source_tag gitbasher.ai-model-full)"
-        echo -e "\t\t\t${GREEN}$(get_ai_model_for grouping)${ENDCOLOR} ${GRAY}(grouping)${ENDCOLOR} $(config_source_tag gitbasher.ai-model-grouping)"
+        echo -e "\tAI model:\t${GREEN}$(get_ai_default_model)${ENDCOLOR} ${GRAY}(default)${ENDCOLOR}"
     fi
+    local other_models=""
+    while IFS= read -r prov; do
+        [ -z "$prov" ] && continue
+        [ "$prov" = "$ai_provider" ] && continue
+        other_models="${other_models:+${other_models}, }${prov}"
+    done < <(list_providers_with_model)
+    if [ -n "$other_models" ]; then
+        echo -e "\t\t\t${GRAY}also set for: ${other_models}${ENDCOLOR}"
+    fi
+}
+function print_configuration {
+    echo -e "${YELLOW}Current configuration:${ENDCOLOR}"
+    local user_name=$(get_config_value user.name)
+    if [ -n "$user_name" ]; then
+        echo -e "\tuser.name:\t${YELLOW}$user_name${ENDCOLOR} $(config_source_tag user.name)"
+    else
+        echo -e "\tuser.name:\t${RED}not set${ENDCOLOR}"
+    fi
+    local user_email=$(get_config_value user.email)
+    if [ -n "$user_email" ]; then
+        echo -e "\tuser.email:\t${YELLOW}$user_email${ENDCOLOR} $(config_source_tag user.email)"
+    else
+        echo -e "\tuser.email:\t${RED}not set${ENDCOLOR}"
+    fi
+    echo -e "\tdefault:\t${YELLOW}$main_branch${ENDCOLOR} $(config_source_tag gitbasher.branch)"
+    echo -e "\tseparator:\t${YELLOW}$sep${ENDCOLOR} $(config_source_tag gitbasher.sep)"
+    echo -e "\teditor:\t\t${YELLOW}$editor${ENDCOLOR} $(config_source_tag core.editor)"
+    if [ "$ticket_name" != "" ]; then
+        echo -e "\tticket:\t\t${YELLOW}$ticket_name${ENDCOLOR} $(config_source_tag gitbasher.ticket)"
+    fi
+    if [ "$scopes" != "" ]; then
+        echo -e "\tscopes:\t\t${YELLOW}$scopes${ENDCOLOR} $(config_source_tag gitbasher.scopes)"
+    fi
+    print_ai_configuration
     local ai_proxy=$(get_ai_proxy)
     if [ -n "$ai_proxy" ]; then
         echo -e "\tAI proxy:\t${GREEN}$ai_proxy${ENDCOLOR} $(config_source_tag gitbasher.ai-proxy)"
@@ -1548,6 +1562,9 @@ function set_config_value {
         git config --local "$1" "$2"
     else
         git config --global "$1" "$2"
+        if [ "$GITBASHER_NO_REPO" != "true" ]; then
+            git config --local --unset "$1" 2>/dev/null || true
+        fi
     fi
     printf '%s\n' "$2"
 }
@@ -1561,7 +1578,7 @@ function unset_config_value {
     if [ -n "$global_config" ]; then
         echo
         echo -e "${YELLOW}Global $1 is also configured: ${BLUE}$global_config${ENDCOLOR}"
-        echo -e "Do you want to clear it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+        echo -e "Do you want to clear it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
         local _unset_key=""
         read_key _unset_key || _unset_key="n"
         if is_yes "$_unset_key"; then
@@ -1693,9 +1710,9 @@ readonly OPENAI_API_URL="https://api.openai.com/v1/chat/completions"
 readonly AI_DEFAULT_OLLAMA_HOST="http://localhost:11434"
 readonly AI_DEFAULT_PROVIDER="openrouter"
 readonly AI_TEMPERATURE="0.3"
-readonly AI_MAX_TOKENS_SUBJECT=256
-readonly AI_MAX_TOKENS_SIMPLE=512
-readonly AI_MAX_TOKENS_FULL=1024
+readonly AI_MAX_TOKENS_SUBJECT=512
+readonly AI_MAX_TOKENS_SIMPLE=1024
+readonly AI_MAX_TOKENS_FULL=2048
 function get_ai_api_key {
     local provider=$(get_ai_provider)
     local provider_upper
@@ -1826,74 +1843,74 @@ function is_valid_model_id {
 }
 function ai_provider_requires_api_key {
     case "$(get_ai_provider)" in
-        ollama) return 1 ;;
-        *)      return 0 ;;
+        ollama|claude) return 1 ;;
+        *)             return 0 ;;
     esac
 }
 function get_ai_model {
+    local provider=$(get_ai_provider)
+    local provider_model
+    provider_model=$(get_config_value "gitbasher.ai-model-${provider}" "")
+    if [ -n "$provider_model" ]; then
+        echo "$provider_model"
+        return
+    fi
     get_config_value gitbasher.ai-model ""
 }
 function set_ai_model {
-    set_config_value gitbasher.ai-model "$1"
-}
-readonly AI_DEFAULT_MODEL_SIMPLE="google/gemini-3.1-flash-lite-preview"
-readonly AI_DEFAULT_MODEL_SUBJECT="google/gemini-3.1-flash-lite-preview"
-readonly AI_DEFAULT_MODEL_FULL="google/gemini-3-flash-preview"
-readonly AI_DEFAULT_MODEL_GROUPING="anthropic/claude-haiku-4.5"
-readonly AI_DEFAULT_MODEL_SIMPLE_OPENAI="gpt-5.4-nano"
-readonly AI_DEFAULT_MODEL_SUBJECT_OPENAI="gpt-5.4-nano"
-readonly AI_DEFAULT_MODEL_FULL_OPENAI="gpt-5.4-mini"
-readonly AI_DEFAULT_MODEL_GROUPING_OPENAI="gpt-5.4-mini"
-readonly AI_DEFAULT_MODEL_SIMPLE_OLLAMA="qwen3:8b"
-readonly AI_DEFAULT_MODEL_SUBJECT_OLLAMA="qwen3:8b"
-readonly AI_DEFAULT_MODEL_FULL_OLLAMA="qwen3:8b"
-readonly AI_DEFAULT_MODEL_GROUPING_OLLAMA="qwen3:8b"
-function get_ai_model_for {
-    local task="$1"
-    local task_model
-    task_model=$(get_config_value "gitbasher.ai-model-$task" "")
-    if [ -n "$task_model" ]; then
-        echo "$task_model"
-        return
+    local provider=$(get_ai_provider)
+    set_config_value "gitbasher.ai-model-${provider}" "$1" "$2"
+}
+function migrate_legacy_ai_model_to {
+    local target_provider="$1"
+    local migrated=""
+    local local_legacy=$(git config --local --get gitbasher.ai-model 2>/dev/null)
+    if [ -n "$local_legacy" ]; then
+        if ! git config --local --get "gitbasher.ai-model-${target_provider}" >/dev/null 2>&1; then
+            git config --local "gitbasher.ai-model-${target_provider}" "$local_legacy"
+            migrated="local"
+        fi
+        git config --local --unset gitbasher.ai-model 2>/dev/null || true
     fi
-    local global_model
-    global_model=$(get_ai_model)
-    if [ -n "$global_model" ]; then
-        echo "$global_model"
-        return
+    local global_legacy=$(git config --global --get gitbasher.ai-model 2>/dev/null)
+    if [ -n "$global_legacy" ]; then
+        if ! git config --global --get "gitbasher.ai-model-${target_provider}" >/dev/null 2>&1; then
+            git config --global "gitbasher.ai-model-${target_provider}" "$global_legacy"
+            migrated="${migrated:+$migrated, }global"
+        fi
+        git config --global --unset gitbasher.ai-model 2>/dev/null || true
+    fi
+    if [ -n "$migrated" ]; then
+        echo -e "${GRAY}↻ Kept model for provider '${target_provider}' (${migrated})${ENDCOLOR}" >&2
     fi
+}
+function list_providers_with_model {
+    {
+        git config --local --get-regexp '^gitbasher\.ai-model-' 2>/dev/null
+        git config --global --get-regexp '^gitbasher\.ai-model-' 2>/dev/null
+    } | awk '{print $1}' | sed 's/^gitbasher\.ai-model-//' \
+      | grep -E '^(openrouter|openai|ollama|claude)$' | sort -u
+}
+readonly AI_DEFAULT_MODEL_OPENROUTER="google/gemini-3.5-flash"
+readonly AI_DEFAULT_MODEL_OPENAI="gpt-5.4-mini"
+readonly AI_DEFAULT_MODEL_OLLAMA="qwen3:8b"
+readonly AI_DEFAULT_MODEL_CLAUDE="haiku"
+function get_ai_default_model {
     case "$(get_ai_provider)" in
-        openai)
-            case "$task" in
-                simple)   echo "$AI_DEFAULT_MODEL_SIMPLE_OPENAI" ;;
-                subject)  echo "$AI_DEFAULT_MODEL_SUBJECT_OPENAI" ;;
-                full)     echo "$AI_DEFAULT_MODEL_FULL_OPENAI" ;;
-                grouping) echo "$AI_DEFAULT_MODEL_GROUPING_OPENAI" ;;
-                *)        echo "$AI_DEFAULT_MODEL_SIMPLE_OPENAI" ;;
-            esac
-            ;;
-        ollama)
-            case "$task" in
-                simple)   echo "$AI_DEFAULT_MODEL_SIMPLE_OLLAMA" ;;
-                subject)  echo "$AI_DEFAULT_MODEL_SUBJECT_OLLAMA" ;;
-                full)     echo "$AI_DEFAULT_MODEL_FULL_OLLAMA" ;;
-                grouping) echo "$AI_DEFAULT_MODEL_GROUPING_OLLAMA" ;;
-                *)        echo "$AI_DEFAULT_MODEL_SIMPLE_OLLAMA" ;;
-            esac
-            ;;
-        *)
-            case "$task" in
-                simple)   echo "$AI_DEFAULT_MODEL_SIMPLE" ;;
-                subject)  echo "$AI_DEFAULT_MODEL_SUBJECT" ;;
-                full)     echo "$AI_DEFAULT_MODEL_FULL" ;;
-                grouping) echo "$AI_DEFAULT_MODEL_GROUPING" ;;
-                *)        echo "$AI_DEFAULT_MODEL_SIMPLE" ;;
-            esac
-            ;;
+        openai) echo "$AI_DEFAULT_MODEL_OPENAI" ;;
+        ollama) echo "$AI_DEFAULT_MODEL_OLLAMA" ;;
+        claude) echo "$AI_DEFAULT_MODEL_CLAUDE" ;;
+        *)      echo "$AI_DEFAULT_MODEL_OPENROUTER" ;;
     esac
 }
-function set_ai_model_for {
-    set_config_value "gitbasher.ai-model-$1" "$2"
+function resolve_ai_model {
+    local model
+    model=$(get_ai_model)
+    if [ -n "$model" ]; then
+        echo "$model"
+        return
+    fi
+    get_ai_default_model
 }
 function get_ai_proxy {
     get_config_value gitbasher.ai-proxy ""
@@ -2148,11 +2165,89 @@ function ollama_list_models {
     local base resp names
     base=$(ollama_api_base)
     resp=$(curl -s --max-time 5 "${base}/api/tags" 2>/dev/null)
-    [ -z "$resp" ] && return 1
     names=$(printf '%s' "$resp" | _parse_ollama_model_names)
+    if [ -z "$names" ] && command -v ollama >/dev/null 2>&1; then
+        names=$(OLLAMA_HOST="$base" ollama list 2>/dev/null \
+            | LC_ALL=C awk 'NR>1 && $1 != "" {print $1}')
+    fi
     [ -z "$names" ] && return 1
     printf '%s\n' "$names"
 }
+function secure_curl_get {
+    local proxy_url="$1"
+    local api_key="$2"
+    local url="$3"
+    (
+        { set +x; } 2>/dev/null
+        unset HISTFILE
+        local curl_cmd=(
+            curl -s
+            --connect-timeout 10
+            --max-time 20
+        )
+        [ -n "$proxy_url" ] && curl_cmd+=(--proxy "$proxy_url")
+        curl_cmd+=("$url")
+        if [ -n "$api_key" ]; then
+            local escaped_key="${api_key//\\/\\\\}"
+            escaped_key="${escaped_key//\"/\\\"}"
+            "${curl_cmd[@]}" --config - <<EOF 2>/dev/null
+header = "Authorization: Bearer ${escaped_key}"
+EOF
+        else
+            "${curl_cmd[@]}" 2>/dev/null
+        fi
+    )
+}
+function _parse_model_ids_json {
+    if command -v jq &>/dev/null; then
+        jq -r '.data[]?.id // empty' 2>/dev/null
+    else
+        LC_ALL=C grep -o '"id"[[:space:]]*:[[:space:]]*"[^"]*"' \
+            | LC_ALL=C sed 's/.*"\([^"]*\)"$/\1/'
+    fi
+}
+function openrouter_list_models {
+    local sort_key="${1:-top-weekly}"
+    local models_url resp ids
+    models_url="${OPENROUTER_API_URL/chat\/completions/models}?sort=${sort_key}"
+    resp=$(secure_curl_get "$(get_ai_proxy)" "" "$models_url")
+    [ -z "$resp" ] && return 1
+    ids=$(printf '%s' "$resp" | _parse_model_ids_json)
+    [ -z "$ids" ] && return 1
+    printf '%s\n' "$ids"
+}
+function openai_list_models {
+    local api_key resp ids
+    api_key=$(get_ai_api_key)
+    [ -z "$api_key" ] && return 1
+    local models_url="${OPENAI_API_URL/chat\/completions/models}"
+    resp=$(secure_curl_get "$(get_ai_proxy)" "$api_key" "$models_url")
+    [ -z "$resp" ] && return 1
+    if command -v jq &>/dev/null; then
+        ids=$(printf '%s' "$resp" | jq -r '.data // [] | sort_by(-(.created // 0)) | .[].id // empty' 2>/dev/null)
+    else
+        ids=$(printf '%s' "$resp" | _parse_model_ids_json)
+    fi
+    ids=$(printf '%s\n' "$ids" \
+        | LC_ALL=C grep -E '^(gpt-|o[0-9]|chatgpt-)' \
+        | LC_ALL=C grep -vE 'embedding|tts|whisper|audio|realtime|dall-e|image|moderation|transcribe|search|instruct')
+    [ -z "$ids" ] && return 1
+    printf '%s\n' "$ids"
+}
+function ai_model_smoke_check {
+    local model out rc
+    model=$(resolve_ai_model)
+    echo -e "${YELLOW}Testing model '${model}' with a live request...${ENDCOLOR}"
+    out=$(call_ai_api "Reply with exactly: OK" "ping" 64 "$model" 2>&1)
+    rc=$?
+    if [ "$rc" -eq 0 ] && [ -n "$out" ]; then
+        echo -e "${GREEN}✓ Model '${model}' responded${ENDCOLOR}"
+        return 0
+    fi
+    echo -e "${RED}✗ Model '${model}' did not respond${ENDCOLOR}" >&2
+    [ -n "$out" ] && printf '%s\n' "$out" | head -4 >&2
+    return 1
+}
 function ai_smoke_check {
     local provider
     provider=$(get_ai_provider)
@@ -2176,6 +2271,17 @@ function ai_smoke_check {
         echo -e "${GREEN}✓ Ollama reachable at ${base} (${count} model(s))${ENDCOLOR}"
         return 0
     fi
+    if [ "$provider" = "claude" ]; then
+        if ! command -v claude >/dev/null 2>&1; then
+            echo -e "${RED}✗ claude CLI not found on PATH.${ENDCOLOR}" >&2
+            echo -e "${CYAN}💡 Install it with ${BLUE}npm install -g @anthropic-ai/claude-code${ENDCOLOR}${CYAN}, then sign in once.${ENDCOLOR}" >&2
+            return 1
+        fi
+        local claude_version
+        claude_version=$(claude --version 2>/dev/null | head -1)
+        echo -e "${GREEN}✓ claude CLI available${claude_version:+ (}${claude_version}${claude_version:+)}${ENDCOLOR}"
+        return 0
+    fi
     local api_key
     api_key=$(get_ai_api_key)
     if [ -z "$api_key" ]; then
@@ -2230,18 +2336,49 @@ function get_ai_timeout {
         printf '%s\n' "$t"
         return
     fi
-    if [ "$(get_ai_provider)" = "ollama" ]; then
-        printf '300\n'
+    case "$(get_ai_provider)" in
+        ollama|claude) printf '300\n' ;;
+        *)             printf '60\n' ;;
+    esac
+}
+function _call_claude_cli {
+    local system_prompt="$1"
+    local user_prompt="$2"
+    local model="$3"
+    local timeout_s output rc
+    timeout_s=$(get_ai_timeout)
+    local -a claude_args=(-p --model "$model" --output-format text
+        --strict-mcp-config --mcp-config '{"mcpServers":{}}'
+        --setting-sources "")
+    if command -v perl >/dev/null 2>&1; then
+        output=$(printf '%s\n\n%s' "$system_prompt" "$user_prompt" \
+            | MAX_THINKING_TOKENS=0 perl -e 'alarm shift; exec @ARGV' "$timeout_s" \
+                claude "${claude_args[@]}" 2>/dev/null)
+        rc=$?
     else
-        printf '60\n'
+        output=$(printf '%s\n\n%s' "$system_prompt" "$user_prompt" \
+            | MAX_THINKING_TOKENS=0 claude "${claude_args[@]}" 2>/dev/null)
+        rc=$?
+    fi
+    if [ "$rc" -eq 142 ]; then
+        echo -e "${RED}✗ claude timed out after ${timeout_s}s.${ENDCOLOR}" >&2
+        echo -e "${YELLOW}Raise the limit with:${ENDCOLOR} ${GREEN}git config gitbasher.ai-timeout <seconds>${ENDCOLOR}" >&2
+        return 1
     fi
+    if [ "$rc" -ne 0 ] || [ -z "$output" ]; then
+        echo -e "${RED}✗ claude CLI failed (exit ${rc}).${ENDCOLOR}" >&2
+        echo -e "${CYAN}💡 Check it works: ${BLUE}echo hi | claude -p${ENDCOLOR}${CYAN} — you may need to sign in first.${ENDCOLOR}" >&2
+        return 1
+    fi
+    printf '%s\n' "$output"
 }
 function call_ai_api {
     local system_prompt="$1"
     local user_prompt="$2"
     local max_tokens="${3:-$AI_MAX_TOKENS_FULL}"
-    local model="${4:-$(get_ai_model_for simple)}"
+    local model="${4:-$(resolve_ai_model)}"
     local response_format="${5:-}"
+    local reasoning_effort="${6:-}"
     local provider=$(get_ai_provider)
     local api_url=$(get_ai_api_url)
     local api_key=$(get_ai_api_key)
@@ -2253,6 +2390,17 @@ function call_ai_api {
         clear_sensitive_vars
         return 1
     fi
+    if [ "$provider" = "claude" ]; then
+        local claude_out
+        claude_out=$(_call_claude_cli "$system_prompt" "$user_prompt" "$model")
+        if [ $? -ne 0 ] || [ -z "$claude_out" ]; then
+            clear_sensitive_vars
+            return 1
+        fi
+        clear_sensitive_vars
+        echo "$claude_out"
+        return 0
+    fi
     local tokens_field="max_tokens"
     if [ "$provider" = "openai" ]; then
         tokens_field="max_completion_tokens"
@@ -2263,6 +2411,21 @@ function call_ai_api {
             gpt-5*|o[0-9]*) include_temperature="" ;;
         esac
     fi
+    case "$reasoning_effort" in
+        low|medium|high|"") : ;;
+        *) reasoning_effort="" ;;   # unknown value → provider floor
+    esac
+    local or_reasoning="" oa_reasoning=""
+    if [ -n "$(get_ai_base_url)" ]; then
+        : # custom endpoint — send nothing
+    elif [ "$provider" = "openrouter" ]; then
+        or_reasoning="${reasoning_effort:-minimal}"
+    elif [ "$provider" = "openai" ]; then
+        case "$model" in
+            gpt-5*chat*|chatgpt-*) : ;;
+            gpt-5*|o[0-9]*) oa_reasoning="${reasoning_effort:-none}" ;;
+        esac
+    fi
     local json_payload
     if command -v jq &>/dev/null; then
         json_payload=$(jq -nc \
@@ -2284,6 +2447,17 @@ function call_ai_api {
                 --argjson rf "$response_format" \
                 '$base + {response_format: $rf}')
         fi
+        if [ -n "$or_reasoning" ]; then
+            json_payload=$(jq -nc \
+                --argjson base "$json_payload" \
+                --arg effort "$or_reasoning" \
+                '$base + {reasoning: {effort: $effort}}')
+        elif [ -n "$oa_reasoning" ]; then
+            json_payload=$(jq -nc \
+                --argjson base "$json_payload" \
+                --arg effort "$oa_reasoning" \
+                '$base + {reasoning_effort: $effort}')
+        fi
     else
         local system_escaped=$(_json_escape_for_payload "$system_prompt")
         local user_escaped=$(_json_escape_for_payload "$user_prompt")
@@ -2296,7 +2470,13 @@ function call_ai_api {
         if [ -n "$include_temperature" ]; then
             temp_field=",\"temperature\":$AI_TEMPERATURE"
         fi
-        json_payload="{\"model\":\"$model_escaped\",\"messages\":[{\"role\":\"system\",\"content\":\"$system_escaped\"},{\"role\":\"user\",\"content\":\"$user_escaped\"}]${temp_field},\"${tokens_field}\":$max_tokens${rf_field}}"
+        local reasoning_field=""
+        if [ -n "$or_reasoning" ]; then
+            reasoning_field=",\"reasoning\":{\"effort\":\"$or_reasoning\"}"
+        elif [ -n "$oa_reasoning" ]; then
+            reasoning_field=",\"reasoning_effort\":\"$oa_reasoning\""
+        fi
+        json_payload="{\"model\":\"$model_escaped\",\"messages\":[{\"role\":\"system\",\"content\":\"$system_escaped\"},{\"role\":\"user\",\"content\":\"$user_escaped\"}]${temp_field},\"${tokens_field}\":$max_tokens${rf_field}${reasoning_field}}"
     fi
     local proxy_url=$(get_ai_proxy)
     local safe_proxy_url=""
@@ -2492,11 +2672,34 @@ function call_ai_api {
         clear_sensitive_vars
         return 1
     fi
+    local finish_reason=""
+    if command -v jq &>/dev/null; then
+        finish_reason=$(echo "$response" | jq -r '.choices[0].finish_reason // empty' 2>/dev/null)
+    else
+        case "$response" in
+            *'"finish_reason":"length"'*|*'"finish_reason": "length"'*) finish_reason="length" ;;
+        esac
+    fi
+    if [ "$finish_reason" = "length" ]; then
+        echo -e "${RED}✗ AI response was cut off by the output-token limit.${ENDCOLOR}" >&2
+        echo -e "${CYAN}💡 The model likely spent the budget on internal reasoning — pick a faster model with ${GREEN}gitb cfg model${ENDCOLOR}${CYAN}, or retry.${ENDCOLOR}" >&2
+        clear_sensitive_vars
+        return 1
+    fi
     clear_sensitive_vars
     echo "$ai_response"
 }
 function check_ai_available {
-    if ! command -v curl >/dev/null 2>&1; then
+    local active_provider
+    active_provider=$(get_ai_provider)
+    if [ "$active_provider" = "claude" ]; then
+        if ! command -v claude >/dev/null 2>&1; then
+            echo -e "${RED}✗ claude CLI not found on PATH.${ENDCOLOR}" >&2
+            echo -e "${YELLOW}Install it with:${ENDCOLOR} ${GREEN}npm install -g @anthropic-ai/claude-code${ENDCOLOR}" >&2
+            echo -e "${YELLOW}Or switch provider with:${ENDCOLOR} ${GREEN}gitb cfg provider${ENDCOLOR}" >&2
+            return 1
+        fi
+    elif ! command -v curl >/dev/null 2>&1; then
         echo -e "${RED}curl is required for AI functionality but not installed${ENDCOLOR}" >&2
         return 1
     fi
@@ -2692,13 +2895,13 @@ function generate_ai_commit_message {
     local system_prompt user_prompt
     system_prompt=$(build_ai_commit_system_prompt "$mode" "$commit_prefix")
     user_prompt=$(build_ai_commit_user_prompt "$mode" "$detected_scopes" "$provided_scopes" "$rejected_messages")
-    local max_tokens model
+    local max_tokens
     case "$mode" in
-        subject) max_tokens="$AI_MAX_TOKENS_SUBJECT"; model=$(get_ai_model_for subject) ;;
-        full)    max_tokens="$AI_MAX_TOKENS_FULL";    model=$(get_ai_model_for full) ;;
-        *)       max_tokens="$AI_MAX_TOKENS_SIMPLE";  model=$(get_ai_model_for simple) ;;
+        subject) max_tokens="$AI_MAX_TOKENS_SUBJECT" ;;
+        full)    max_tokens="$AI_MAX_TOKENS_FULL" ;;
+        *)       max_tokens="$AI_MAX_TOKENS_SIMPLE" ;;
     esac
-    call_ai_api "$system_prompt" "$user_prompt" "$max_tokens" "$model"
+    call_ai_api "$system_prompt" "$user_prompt" "$max_tokens"
 }
 function clear_sensitive_vars {
     api_key=""
@@ -2732,7 +2935,7 @@ function set_default_branch {
     echo -e "${GREEN}✓ Set '${branch_name}' as the default gitbasher branch in '${project_name}'${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet '${branch_name}' globally" "true"
     main_branch=$(set_config_value gitbasher.branch $branch_name "true")
 }
@@ -2770,7 +2973,7 @@ function set_sep {
     echo -e "${GREEN}✓ Set '${sep}' as the branch name separator in '${project_name}'${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet '${sep}' globally" "true"
     sep=$(set_config_value gitbasher.sep "$new_sep" "true")
 }
@@ -2800,7 +3003,7 @@ function set_editor {
     echo -e "${GREEN}✓ Using editor '$editor' (${which_output})${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet '${editor}' globally" "true"
     editor=$(set_config_value core.editor "$choice" "true")
 }
@@ -2833,12 +3036,15 @@ function set_ticket {
     echo -e "${GREEN}✓ Set '${ticket_name}' as the ticket prefix in '${project_name}'${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet '${ticket_name}' globally" "true"
     ticket_name=$(set_config_value gitbasher.ticket "$ticket_name" "true")
 }
 function configure_ai_key {
-    if [ -z "$(git config --get gitbasher.ai-provider 2>/dev/null)" ] \
+    local _chained=""
+    [ "$1" = "--chained" ] && _chained="true"
+    if [ -z "$_chained" ] \
+       && [ -z "$(git config --get gitbasher.ai-provider 2>/dev/null)" ] \
        && [ -z "$(git config --global --get gitbasher.ai-provider 2>/dev/null)" ]; then
         configure_ai_provider
         return
@@ -2848,9 +3054,10 @@ function configure_ai_key {
     provider_upper=$(echo "$provider" | tr '[:lower:]' '[:upper:]')
     echo -e "${YELLOW}Enter AI API key for provider '${provider}'${ENDCOLOR}"
     echo
-    if [ "$provider" = "ollama" ]; then
+    if ! ai_provider_requires_api_key; then
         echo -e "${YELLOW}Provider '${provider}' does not require an API key.${ENDCOLOR}"
         echo -e "Switch providers with ${GREEN}gitb cfg provider${ENDCOLOR} to set one."
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     ai_api_key=$(get_ai_api_key)
@@ -2858,6 +3065,24 @@ function configure_ai_key {
         echo -e "${YELLOW}No AI API key is set for '${provider}'.${ENDCOLOR}"
     else
         echo -e "AI API key for '${provider}' is ${GREEN}configured${ENDCOLOR}: ${BLUE}$(mask_api_key "$ai_api_key")${ENDCOLOR}"
+        echo
+        echo -e "Press ${YELLOW}Enter${ENDCOLOR} to keep it, ${YELLOW}r${ENDCOLOR} to replace, or ${YELLOW}0${ENDCOLOR} to remove"
+        local _key_action=""
+        read_key _key_action || { if [ -n "$_chained" ]; then return 130; fi; exit; }
+        if [ "$_key_action" = "0" ]; then
+            unset_ai_api_key
+            echo
+            echo -e "${GREEN}✓ Removed AI API key for '${provider}' from '${project_name}'${ENDCOLOR}"
+            if [ -n "$_chained" ]; then return 0; fi
+            exit
+        fi
+        normalize_key "$_key_action"
+        if [ "$normalized_key" != "r" ]; then
+            echo -e "Keeping the existing key."
+            if [ -n "$_chained" ]; then return 0; fi
+            exit
+        fi
+        echo
     fi
     case "$provider" in
         openai)
@@ -2882,7 +3107,8 @@ function configure_ai_key {
     echo -e "  ${GREEN}env var${ENDCOLOR}    — recommended; the key never touches disk via gitbasher"
     echo -e "  ${BLUE}git config${ENDCOLOR} — convenient, but stored in plaintext under .git/config (or ~/.gitconfig if global)"
     echo
-    read -n 1 -p "Use environment variable (recommended)? (y/n) " ai_storage_choice || ai_storage_choice="n"
+    read -n 1 -p "Use environment variable (recommended)? (Y/n) " ai_storage_choice \
+        || { if [ -n "$_chained" ]; then echo; return 130; fi; ai_storage_choice="n"; }
     echo
     if is_yes "$ai_storage_choice"; then
         echo
@@ -2892,6 +3118,7 @@ function configure_ai_key {
         echo -e "${CYAN}gitbasher checks env vars before git config every run, so this takes precedence.${ENDCOLOR}"
         echo -e "Append it now with:"
         echo -e "  ${GREEN}echo \"export GITB_AI_API_KEY_${provider_upper}='your-${provider}-key'\" >> $(printf '%q' "$rc_file")${ENDCOLOR}"
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     echo
@@ -2901,20 +3128,24 @@ function configure_ai_key {
     echo -e "${YELLOW}Input is hidden — type the key and press Enter.${ENDCOLOR}"
     read_silent_input ai_key_input "API Key: "
     if [ "$ai_key_input" == "" ]; then
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     if [ "$ai_key_input" == "0" ]; then
         unset_ai_api_key
         echo
         echo -e "${GREEN}✓ Removed AI API key for '${provider}' from '${project_name}'${ENDCOLOR}"
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     echo
     if [[ ! "$ai_key_input" =~ ^[a-zA-Z0-9._-]{20,}$ ]]; then
         echo -e "${YELLOW}⚠  API key format does not look like a valid ${provider} key.${ENDCOLOR}" >&2
-        read -n 1 -p "Continue anyway? (y/n) " -s choice || choice="n"
+        read -n 1 -p "Continue anyway? (Y/n) " -s choice \
+            || { if [ -n "$_chained" ]; then echo; return 130; fi; choice="n"; }
         echo
         if ! is_yes "$choice"; then
+            if [ -n "$_chained" ]; then return 1; fi
             exit 1
         fi
     fi
@@ -2923,14 +3154,24 @@ function configure_ai_key {
     echo
     ai_smoke_check || true
     echo
-    [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        if [ -n "$_chained" ]; then return 0; fi
+        exit
+    fi
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     echo -e "${RED}⚠  Global API keys are stored in plaintext in ~/.gitconfig.${ENDCOLOR}"
     echo -e "${CYAN}💡 For better security, set ${BLUE}GITB_AI_API_KEY_${provider_upper}${CYAN} as an environment variable instead.${ENDCOLOR}"
-    yes_no_choice "\nSet AI API key globally" "true"
-    ai_api_key=$(set_ai_api_key "$ai_key_input" "true")
+    local _key_global=""
+    read_key _key_global || { if [ -n "$_chained" ]; then return 130; fi; _key_global="n"; }
+    if is_yes "$_key_global"; then
+        echo -e "${YELLOW}Set AI API key globally${ENDCOLOR}"
+        ai_api_key=$(set_ai_api_key "$ai_key_input" "true")
+    fi
+    return 0
 }
 function configure_ai_provider {
+    local _chained=""
+    [ "$1" = "--chained" ] && _chained="true"
     echo -e "${YELLOW}Choose AI Provider${ENDCOLOR}"
     echo
     local current_provider=$(get_ai_provider)
@@ -2941,13 +3182,18 @@ function configure_ai_provider {
     fi
     echo
     echo -e "Options:"
-    echo -e "  1. ${BLUE}openrouter${ENDCOLOR}  Aggregator with hundreds of models — needs an API key"
-    echo -e "  2. ${BLUE}openai${ENDCOLOR}      OpenAI direct (GPT-5 family) — needs an API key"
-    echo -e "  3. ${BLUE}ollama${ENDCOLOR}      Local or remote models (you'll set the host) — no API key required"
+    echo -e "  1. ${BOLD}openrouter${ENDCOLOR}  Aggregator with hundreds of models — needs an API key"
+    echo -e "  2. ${BOLD}openai${ENDCOLOR}      OpenAI direct (GPT-5 family) — needs an API key"
+    echo -e "  3. ${BOLD}ollama${ENDCOLOR}      Local or remote models (you'll set the host) — no API key required"
+    echo -e "  4. ${BOLD}claude${ENDCOLOR}      Local Claude Code CLI (claude -p) — uses your Claude account, no API key"
     echo
     echo -e "Press Enter to keep the current provider, or enter 0 to reset to default (${AI_DEFAULT_PROVIDER})"
-    read_editable_input choice "Choice (1-3): "
+    if ! read_editable_input choice "Choice (1-4): "; then
+        if [ -n "$_chained" ]; then return 130; fi
+        exit
+    fi
     if [ "$choice" == "" ]; then
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     if [ "$choice" == "0" ]; then
@@ -2955,6 +3201,7 @@ function configure_ai_provider {
         git config --global --unset gitbasher.ai-provider 2>/dev/null
         echo
         echo -e "${GREEN}✓ Reset provider to default (${AI_DEFAULT_PROVIDER})${ENDCOLOR}"
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     local new_provider
@@ -2963,14 +3210,20 @@ function configure_ai_provider {
         1) new_provider="openrouter" ;;
         2) new_provider="openai" ;;
         3) new_provider="ollama" ;;
+        4) new_provider="claude" ;;
         *)
             echo -e "${RED}✗ Invalid choice.${ENDCOLOR}" >&2
+            if [ -n "$_chained" ]; then return 1; fi
             exit 1
             ;;
     esac
     migrate_legacy_ai_api_key_to "$current_provider"
+    migrate_legacy_ai_model_to "$current_provider"
+    local prev_local_provider
+    prev_local_provider=$(git config --local --get gitbasher.ai-provider 2>/dev/null)
     set_ai_provider "$new_provider"
     echo -e "${GREEN}✓ Set AI provider to '${new_provider}' for '${project_name}'${ENDCOLOR}"
+    local local_smoke_failed=""
     case "$new_provider" in
         ollama)
             local current_host
@@ -2987,6 +3240,7 @@ function configure_ai_provider {
                 host_input="${host_input%/}"
                 if ! validate_proxy_url "$host_input"; then
                     echo -e "${RED}✗ '$host_input' does not look like a valid host URL (expected http://host[:port]).${ENDCOLOR}"
+                    if [ -n "$_chained" ]; then return 1; fi
                     exit 1
                 fi
                 set_ai_ollama_host "$host_input" >/dev/null
@@ -2994,9 +3248,24 @@ function configure_ai_provider {
             fi
             echo
             echo -e "${CYAN}💡 Make sure the Ollama daemon is running (${BLUE}ollama serve${CYAN}) and a model is pulled (${BLUE}ollama pull qwen3:8b${CYAN}).${ENDCOLOR}"
-            echo -e "${CYAN}💡 Pick a model with ${GREEN}gitb cfg model${CYAN}.${ENDCOLOR}"
+            if [ -z "$_chained" ]; then
+                echo -e "${CYAN}💡 Pick a model with ${GREEN}gitb cfg model${CYAN}.${ENDCOLOR}"
+            fi
+            echo
+            ai_smoke_check || local_smoke_failed="true"
+            ;;
+        claude)
             echo
-            ai_smoke_check || true
+            if command -v claude >/dev/null 2>&1; then
+                ai_smoke_check || local_smoke_failed="true"
+            else
+                echo -e "${RED}✗ claude CLI not found on PATH.${ENDCOLOR}"
+                echo -e "${CYAN}💡 Install it with ${BLUE}npm install -g @anthropic-ai/claude-code${CYAN}, then sign in once.${ENDCOLOR}"
+                local_smoke_failed="true"
+            fi
+            if [ -z "$_chained" ]; then
+                echo -e "${CYAN}💡 Pick a model with ${GREEN}gitb cfg model${CYAN} (haiku, sonnet, opus).${ENDCOLOR}"
+            fi
             ;;
         *)
             if [ -n "$(get_ai_api_key)" ]; then
@@ -3006,10 +3275,29 @@ function configure_ai_provider {
             ;;
     esac
     echo
+    if [ -n "$local_smoke_failed" ]; then
+        echo -e "Keep '${new_provider}' as the AI provider anyway (y/N)?"
+        local _keep_rc=0
+        confirm_destructive || _keep_rc=$?
+        if [ "$_keep_rc" -ne 0 ]; then
+            if [ -n "$prev_local_provider" ]; then
+                git config --local gitbasher.ai-provider "$prev_local_provider"
+            else
+                git config --local --unset gitbasher.ai-provider 2>/dev/null || true
+            fi
+            echo -e "${YELLOW}Provider unchanged — still '$(get_ai_provider)'.${ENDCOLOR}"
+            if [ -n "$_chained" ]; then
+                if [ "$_keep_rc" -eq 2 ]; then return 130; fi
+                return 3
+            fi
+            exit 1
+        fi
+        echo
+    fi
     if [ "$GITBASHER_NO_REPO" != "true" ]; then
-        echo -e "Do you want to set this provider ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+        echo -e "Do you want to set this provider ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
         local _prov_key=""
-        read_key _prov_key || _prov_key="n"
+        read_key _prov_key || { if [ -n "$_chained" ]; then return 130; fi; _prov_key="n"; }
         if is_yes "$_prov_key"; then
             echo -e "${YELLOW}Set AI provider globally${ENDCOLOR}"
             set_config_value gitbasher.ai-provider "$new_provider" "true"
@@ -3018,12 +3306,12 @@ function configure_ai_provider {
             fi
         fi
     fi
-    if ai_provider_requires_api_key && [ -z "$(get_ai_api_key)" ]; then
+    if [ -z "$_chained" ] && ai_provider_requires_api_key && [ -z "$(get_ai_api_key)" ]; then
         echo
         echo -e "${YELLOW}No API key is set for '${new_provider}'.${ENDCOLOR}"
         echo -e "${CYAN}AI commands will be blocked until a key is configured.${ENDCOLOR}"
         echo
-        echo -e "Set one now? (y/n)"
+        echo -e "Set one now? (Y/n)"
         if read -n 1 -s key_choice && is_yes "$key_choice"; then
             echo
             configure_ai_key
@@ -3033,105 +3321,247 @@ function configure_ai_provider {
         fi
     fi
 }
+function _print_model_menu_entry {
+    local _desc=""
+    [ -n "$4" ] && _desc=" ${GRAY}- ${4}${ENDCOLOR}"
+    if [ "$1" = "$3" ]; then
+        echo -e "  ${GREEN}${2}. ${1}${ENDCOLOR}  (current)${_desc}"
+    else
+        echo -e "  ${2}. ${BOLD}${1}${ENDCOLOR}${_desc}"
+    fi
+}
 function configure_ai_model {
+    local _chained=""
+    [ "$1" = "--chained" ] && _chained="true"
     echo -e "${YELLOW}Configure AI Model${ENDCOLOR}"
     echo
     current_model=$(get_ai_model)
     if [ -n "$current_model" ]; then
-        echo -e "Current global override: ${GREEN}$current_model${ENDCOLOR}"
+        echo -e "Current model for provider '${GREEN}$(get_ai_provider)${ENDCOLOR}': ${GREEN}$current_model${ENDCOLOR}"
     else
-        echo -e "No global override set — each task uses its per-task default:"
-        echo -e "  • simple   → ${GREEN}$(get_ai_model_for simple)${ENDCOLOR}"
-        echo -e "  • subject  → ${GREEN}$(get_ai_model_for subject)${ENDCOLOR}"
-        echo -e "  • full     → ${GREEN}$(get_ai_model_for full)${ENDCOLOR}"
-        echo -e "  • grouping → ${GREEN}$(get_ai_model_for grouping)${ENDCOLOR}"
+        echo -e "Provider '${GREEN}$(get_ai_provider)${ENDCOLOR}' uses its default model: ${GREEN}$(get_ai_default_model)${ENDCOLOR}"
     fi
     echo
-    echo -e "Set a single model for all tasks (a global override), or leave empty to keep using the per-task defaults."
-    echo -e "Per-task overrides can be set directly with git config:"
-    echo -e "  ${BLUE}git config gitbasher.ai-model-simple <model_id>${ENDCOLOR}    (and -subject / -full / -grouping)"
-    echo
-    echo -e "Popular models for provider '${GREEN}$(get_ai_provider)${ENDCOLOR}':"
+    local -a model_menu=()
+    local model_catalog=""
+    local _m _i
+    local _resolved_model
+    _resolved_model=$(resolve_ai_model)
     case "$(get_ai_provider)" in
-        openai)
-            echo -e "  • ${BLUE}gpt-5.4-nano${ENDCOLOR} - Cheapest+fastest, ideal for one-line subjects (~\$0.20/\$1.25 per M)"
-            echo -e "  • ${BLUE}gpt-5.4-mini${ENDCOLOR} - Balanced for full-body prose and strict TSV output (~\$0.75/\$4.50 per M)"
-            echo -e "  • ${BLUE}gpt-5.4${ENDCOLOR} - Flagship, only worth it for the hardest grouping cases"
-            ;;
         ollama)
-            echo -e "  • ${BLUE}qwen3:8b${ENDCOLOR} - Best small instruction-follower; most stable structured output"
-            echo -e "  • ${BLUE}llama3.3:8b${ENDCOLOR} - Solid general-purpose alternative"
-            echo -e "  • ${BLUE}qwen2.5-coder:7b${ENDCOLOR} - Code-focused; good when most diffs are code"
-            echo -e "  Run ${BLUE}ollama list${ENDCOLOR} to see what you have pulled locally."
+            while IFS= read -r _m; do
+                [ -n "$_m" ] && model_menu+=("$_m")
+            done < <(ollama_list_models)
+            if [ ${#model_menu[@]} -gt 0 ]; then
+                echo -e "Installed models on ${BLUE}$(ollama_api_base)${ENDCOLOR}:"
+                _i=1
+                for _m in "${model_menu[@]}"; do
+                    _print_model_menu_entry "$_m" "$_i" "$_resolved_model"
+                    _i=$((_i + 1))
+                done
+            else
+                echo -e "${YELLOW}No models found on $(ollama_api_base) — is the daemon running?${ENDCOLOR}"
+            fi
             ;;
-        *)
-            echo -e "  • ${BLUE}openrouter/auto${ENDCOLOR} - Auto-select best available model"
-            echo -e "  • ${BLUE}google/gemini-3.1-flash-lite-preview${ENDCOLOR} - Fastest, cheapest"
-            echo -e "  • ${BLUE}google/gemini-3-flash-preview${ENDCOLOR} - Better body prose"
-            echo -e "  • ${BLUE}anthropic/claude-haiku-4.5${ENDCOLOR} - Strict instruction following"
-            echo -e "  • ${BLUE}openai/gpt-5.4-mini${ENDCOLOR} - Strong reasoning, low cost"
+        openrouter)
+            model_catalog=$(openrouter_list_models top-weekly 2>/dev/null)
+            if [ -n "$model_catalog" ]; then
+                _i=1
+                echo -e "Most used on OpenRouter this week:"
+                while IFS= read -r _m; do
+                    model_menu+=("$_m")
+                    _print_model_menu_entry "$_m" "$_i" "$_resolved_model"
+                    _i=$((_i + 1))
+                done < <(printf '%s\n' "$model_catalog" | head -8)
+                local _newest
+                _newest=$(openrouter_list_models newest 2>/dev/null | head -5)
+                if [ -n "$_newest" ]; then
+                    echo -e "Newest:"
+                    while IFS= read -r _m; do
+                        [ -z "$_m" ] && continue
+                        case " ${model_menu[*]} " in *" $_m "*) continue ;; esac
+                        model_menu+=("$_m")
+                        _print_model_menu_entry "$_m" "$_i" "$_resolved_model"
+                        _i=$((_i + 1))
+                    done <<< "$_newest"
+                fi
+            fi
+            ;;
+        openai)
+            model_catalog=$(openai_list_models 2>/dev/null)
+            if [ -n "$model_catalog" ]; then
+                echo -e "Newest chat models on your OpenAI account:"
+                _i=1
+                while IFS= read -r _m; do
+                    model_menu+=("$_m")
+                    _print_model_menu_entry "$_m" "$_i" "$_resolved_model"
+                    _i=$((_i + 1))
+                done < <(printf '%s\n' "$model_catalog" \
+                    | LC_ALL=C grep -vE -- '-[0-9]{4}-[0-9]{2}-[0-9]{2}$' | head -12)
+            fi
             ;;
     esac
+    if [ ${#model_menu[@]} -eq 0 ]; then
+        local -a _menu_desc=()
+        case "$(get_ai_provider)" in
+            openai)
+                echo -e "Popular OpenAI models:"
+                model_menu=("gpt-5.4-mini" "gpt-5.4-nano" "gpt-5.5")
+                _menu_desc=("Default: as fast as nano with better quality (~\$0.75/\$4.50 per M)"
+                            "Budget option for high volume (~\$0.20/\$1.25 per M)"
+                            "Flagship, only worth it for the hardest grouping cases")
+                ;;
+            ollama)
+                echo -e "Suggested models (pull first: ${BLUE}ollama pull <id>${ENDCOLOR}):"
+                model_menu=("qwen3:8b" "llama3.3:8b" "qwen2.5-coder:7b")
+                _menu_desc=("Default: best small instruction-follower; most stable structured output"
+                            "Solid general-purpose alternative"
+                            "Code-focused; good when most diffs are code")
+                ;;
+            claude)
+                echo -e "Model aliases (resolve to the current generation; full ids like ${BLUE}claude-haiku-4-5${ENDCOLOR} also work):"
+                model_menu=("haiku" "sonnet" "opus")
+                _menu_desc=("Default: fastest and cheapest"
+                            "Better prose, noticeably slower"
+                            "Strongest, for the hardest cases")
+                ;;
+            *)
+                echo -e "Popular OpenRouter models:"
+                model_menu=("google/gemini-3.5-flash" "google/gemini-3.1-flash-lite" "openrouter/auto" "anthropic/claude-haiku-4.5" "anthropic/claude-sonnet-5")
+                _menu_desc=("Default: current flash generation, fast with good prose"
+                            "Fastest, cheapest (~\$0.25/\$1.50 per M)"
+                            "Auto-select best available model"
+                            "Strict instruction following"
+                            "Premium quality for the hardest cases")
+                ;;
+        esac
+        _i=0
+        for _m in "${model_menu[@]}"; do
+            _print_model_menu_entry "$_m" "$((_i + 1))" "$_resolved_model" "${_menu_desc[$_i]}"
+            _i=$((_i + 1))
+        done
+    fi
+    echo -e "Enter a number to select, or type a model id."
     echo
-    local -a ollama_model_list=()
-    if [ "$(get_ai_provider)" = "ollama" ]; then
-        local _m _i
-        while IFS= read -r _m; do
-            [ -n "$_m" ] && ollama_model_list+=("$_m")
-        done < <(ollama_list_models)
-        if [ ${#ollama_model_list[@]} -gt 0 ]; then
-            echo -e "Installed models on ${BLUE}$(ollama_api_base)${ENDCOLOR}:"
-            _i=1
-            for _m in "${ollama_model_list[@]}"; do
-                if [ "$_m" = "$current_model" ]; then
-                    echo -e "  ${GREEN}${_i}. ${_m}${ENDCOLOR}  (current)"
-                else
-                    echo -e "  ${BLUE}${_i}.${ENDCOLOR} ${_m}"
-                fi
-                _i=$((_i + 1))
-            done
-            echo -e "Enter a number to select, or type a model id."
-        else
-            echo -e "${YELLOW}No models found on $(ollama_api_base) — is the daemon running?${ENDCOLOR}"
-            echo -e "Pull one with ${BLUE}ollama pull qwen3:8b${ENDCOLOR}, or type a model id below."
-        fi
-        echo
+    echo -e "Press Enter to keep the current model, or 0 to reset to the default (${GREEN}$(get_ai_default_model)${ENDCOLOR})"
+    if ! read_editable_input model_input "Model ID: "; then
+        if [ -n "$_chained" ]; then return 130; fi
+        exit
     fi
-    echo -e "Press Enter to exit without changes, or 0 to clear the override (use per-task defaults)"
-    read_editable_input model_input "Model ID: "
     if [ "$model_input" == "" ]; then
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     if [ "$model_input" == "0" ]; then
+        git config --unset "gitbasher.ai-model-$(get_ai_provider)" 2>/dev/null
+        git config --global --unset "gitbasher.ai-model-$(get_ai_provider)" 2>/dev/null
         git config --unset gitbasher.ai-model 2>/dev/null
         git config --global --unset gitbasher.ai-model 2>/dev/null
         echo
-        echo -e "${GREEN}✓ Cleared global model override — each task now uses its per-task default${ENDCOLOR}"
+        echo -e "${GREEN}✓ Cleared model override — provider '$(get_ai_provider)' now uses its default ($(get_ai_default_model))${ENDCOLOR}"
+        if [ -n "$_chained" ]; then return 0; fi
         exit
     fi
     echo
-    if [ ${#ollama_model_list[@]} -gt 0 ] && [[ "$model_input" =~ ^[0-9]+$ ]]; then
-        if [ "$model_input" -ge 1 ] && [ "$model_input" -le ${#ollama_model_list[@]} ]; then
-            model_input="${ollama_model_list[$((model_input - 1))]}"
+    local picked_from_menu=""
+    if [ ${#model_menu[@]} -gt 0 ] && [[ "$model_input" =~ ^[0-9]+$ ]]; then
+        if [ "$model_input" -ge 1 ] && [ "$model_input" -le ${#model_menu[@]} ]; then
+            model_input="${model_menu[$((model_input - 1))]}"
+            picked_from_menu="true"
         else
             echo -e "${RED}✗ Invalid selection: ${model_input}${ENDCOLOR}" >&2
+            if [ -n "$_chained" ]; then return 1; fi
             exit 1
         fi
     fi
     if ! is_valid_model_id "$model_input"; then
         echo -e "${RED}✗ Invalid model ID format.${ENDCOLOR}" >&2
         echo -e "${YELLOW}Use only letters, numbers, dots, dashes, underscores, colons, and slashes.${ENDCOLOR}" >&2
+        if [ -n "$_chained" ]; then return 1; fi
         exit 1
     fi
+    if [ -z "$picked_from_menu" ] && [ -n "$model_catalog" ]; then
+        if ! printf '%s\n' "$model_catalog" | LC_ALL=C grep -qxF "$model_input"; then
+            echo -e "${YELLOW}⚠ '$model_input' is not in $(get_ai_provider)'s current model list.${ENDCOLOR}"
+            echo -e "Save it anyway (y/N)?"
+            if ! confirm_destructive; then
+                echo -e "${YELLOW}Not saved. Pick a number from the list or re-check the id.${ENDCOLOR}"
+                if [ -n "$_chained" ]; then return 1; fi
+                exit 1
+            fi
+        fi
+    fi
+    local prev_model
+    prev_model=$(git config --local --get "gitbasher.ai-model-$(get_ai_provider)" 2>/dev/null)
     set_ai_model "$model_input"
-    echo -e "${GREEN}✓ Set AI model to '$model_input' for '${project_name}'${ENDCOLOR}"
+    echo -e "${GREEN}✓ Set AI model to '$model_input' for provider '$(get_ai_provider)' in '${project_name}'${ENDCOLOR}"
     echo
-    [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
-    yes_no_choice "\nSet AI model globally" "true"
-    set_config_value gitbasher.ai-model "$model_input" "true"
+    case "$(get_ai_provider)" in
+        openrouter|openai)
+            if ! ai_model_smoke_check; then
+                echo -e "Keep '$model_input' anyway (y/N)?"
+                if ! confirm_destructive; then
+                    if [ -n "$prev_model" ]; then
+                        git config "gitbasher.ai-model-$(get_ai_provider)" "$prev_model"
+                        echo -e "${YELLOW}Restored previous model '${prev_model}'.${ENDCOLOR}"
+                    else
+                        git config --unset "gitbasher.ai-model-$(get_ai_provider)" 2>/dev/null
+                        echo -e "${YELLOW}Removed it — provider '$(get_ai_provider)' uses its default ($(get_ai_default_model)).${ENDCOLOR}"
+                    fi
+                    if [ -n "$_chained" ]; then return 1; fi
+                    exit 1
+                fi
+            fi
+            echo
+            ;;
+    esac
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        if [ -n "$_chained" ]; then return 0; fi
+        exit
+    fi
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
+    local _model_global=""
+    read_key _model_global || { if [ -n "$_chained" ]; then return 130; fi; _model_global="n"; }
+    if is_yes "$_model_global"; then
+        echo -e "${YELLOW}Set AI model globally${ENDCOLOR}"
+        set_ai_model "$model_input" "true"
+    fi
+    return 0
 }
-function configure_ai_proxy {    
+function configure_ai_wizard {
+    local _rc
+    echo -e "${YELLOW}Step 1/3 — Provider${ENDCOLOR}"
+    echo
+    configure_ai_provider --chained
+    _rc=$?
+    if [ "$_rc" -eq 130 ]; then prompt_aborted; fi
+    if [ "$_rc" -eq 3 ]; then
+        echo
+        echo -e "${YELLOW}AI setup stopped — nothing changed.${ENDCOLOR}"
+        return 0
+    fi
+    echo
+    echo -e "${YELLOW}Step 2/3 — API key${ENDCOLOR}"
+    echo
+    if ai_provider_requires_api_key; then
+        configure_ai_key --chained
+        _rc=$?
+        if [ "$_rc" -eq 130 ]; then prompt_aborted; fi
+    else
+        echo -e "Provider '$(get_ai_provider)' does not require an API key — skipping."
+    fi
+    echo
+    echo -e "${YELLOW}Step 3/3 — Model${ENDCOLOR}"
+    echo
+    configure_ai_model --chained
+    _rc=$?
+    if [ "$_rc" -eq 130 ]; then prompt_aborted; fi
+    echo
+    echo -e "${GREEN}✓ AI setup complete${ENDCOLOR}"
+    echo
+    print_ai_configuration
+}
+function configure_ai_proxy {
     echo -e "${YELLOW}Configure AI HTTP/SOCKS Proxy${ENDCOLOR}"
     echo
     ai_proxy=$(get_ai_proxy)
@@ -3143,9 +3573,9 @@ function configure_ai_proxy {
     echo -e "Enter proxy URL to route AI requests through (useful for bypassing geo-restrictions)"
     echo -e ""
     echo -e "${BLUE}HTTP proxy formats:${ENDCOLOR}"
-    echo -e "  • ${BLUE}http://proxy.example.com:8080${ENDCOLOR}"
-    echo -e "  • ${BLUE}http://username:password@proxy.example.com:8080${ENDCOLOR}"
-    echo -e "  • ${BLUE}http://[2001:db8::1]:8080${ENDCOLOR} (IPv6)"
+    echo -e "  • ${BOLD}http://proxy.example.com:8080${ENDCOLOR}"
+    echo -e "  • ${BOLD}http://username:password@proxy.example.com:8080${ENDCOLOR}"
+    echo -e "  • ${BOLD}http://[2001:db8::1]:8080${ENDCOLOR} (IPv6)"
     echo -e ""
     echo -e "Press Enter to exit without changes, or 0 to remove the existing proxy"
     read_editable_input ai_proxy_input "Proxy URL: "
@@ -3175,7 +3605,7 @@ function configure_ai_proxy {
     echo -e "  ${BLUE}gitb commit aif${ENDCOLOR}   - Fast AI commit through proxy"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet AI proxy globally" "true"
     set_ai_proxy "$ai_proxy_input"
     git config --global gitbasher.ai-proxy "$ai_proxy_input"
@@ -3209,7 +3639,7 @@ function configure_ai_history {
         if [ "$limit_input" -gt 20 ]; then
             echo -e "${YELLOW}High values may exceed token limits and slow down AI responses.${ENDCOLOR}"
         fi
-        read -n 1 -p "Continue anyway? (y/n) " -s choice || choice="n"
+        read -n 1 -p "Continue anyway? (Y/n) " -s choice || choice="n"
         echo
         if ! is_yes "$choice"; then
             exit
@@ -3219,7 +3649,7 @@ function configure_ai_history {
     echo -e "${GREEN}✓ Set AI commit history limit to ${limit_input} for '${project_name}'${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet AI commit history limit globally" "true"
     git config --global gitbasher.ai-commit-history-limit "$limit_input"
 }
@@ -3257,7 +3687,7 @@ function configure_push_warn_size {
     fi
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet push size warning globally" "true"
     git config --global gitbasher.push-warn-size "$limit_input"
 }
@@ -3286,7 +3716,7 @@ function configure_ai_diff {
         lines_input="$validated_number"
         if [ "$lines_input" -lt 50 ] || [ "$lines_input" -gt 2000 ]; then
             echo -e "${YELLOW}⚠  Value is outside the recommended range (50-2000).${ENDCOLOR}"
-            read -n 1 -p "Continue anyway? (y/n) " -s choice || choice="n"
+            read -n 1 -p "Continue anyway? (Y/n) " -s choice || choice="n"
             echo
             if ! is_yes "$choice"; then
                 exit
@@ -3304,7 +3734,7 @@ function configure_ai_diff {
         chars_input="$validated_number"
         if [ "$chars_input" -lt 4000 ] || [ "$chars_input" -gt 100000 ]; then
             echo -e "${YELLOW}⚠  Value is outside the recommended range (4000-100000).${ENDCOLOR}"
-            read -n 1 -p "Continue anyway? (y/n) " -s choice || choice="n"
+            read -n 1 -p "Continue anyway? (Y/n) " -s choice || choice="n"
             echo
             if ! is_yes "$choice"; then
                 exit
@@ -3319,7 +3749,7 @@ function configure_ai_diff {
     fi
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to apply ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to apply ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nApply AI diff settings globally" "true"
     if [ -n "$lines_input" ]; then
         git config --global gitbasher.ai-diff-limit "$lines_input"
@@ -3367,7 +3797,7 @@ function set_scopes {
     echo -e "${GREEN}✓ Set '${scopes}' as the scopes list in '${project_name}'${ENDCOLOR}"
     echo
     [ "$GITBASHER_NO_REPO" = "true" ] && exit
-    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+    echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (Y/n)?"
     yes_no_choice "\nSet '${scopes}' globally" "true"
     git config --global --replace-all gitbasher.scopes "$scopes_raw"
 }
@@ -3400,11 +3830,11 @@ function delete_global {
     _delete_global_add "gitbasher.ai-ollama-host" "Ollama host" "$global_ollama_host" "$GREEN"
     local global_base_url=$(git config --global --get gitbasher.ai-base-url)
     _delete_global_add "gitbasher.ai-base-url" "AI base URL" "$global_base_url" "$GREEN"
-    local _task_models
-    _task_models=$(git config --global --get-regexp '^gitbasher\.ai-model-' 2>/dev/null | awk '{print $1}' | tr '\n' '+' | sed 's/+$//')
-    if [ -n "$_task_models" ]; then
-        labels+=("AI per-task models: ${GREEN}configured${ENDCOLOR}")
-        actions+=("${_task_models}|AI per-task models")
+    local _provider_models
+    _provider_models=$(git config --global --get-regexp '^gitbasher\.ai-model-' 2>/dev/null | awk '{print $1}' | tr '\n' '+' | sed 's/+$//')
+    if [ -n "$_provider_models" ]; then
+        labels+=("AI models (per provider): ${GREEN}configured${ENDCOLOR}")
+        actions+=("${_provider_models}|AI models (per provider)")
     fi
     while IFS=$'\t' read -r key_name; do
         [ -z "$key_name" ] && continue
@@ -3511,7 +3941,8 @@ function config_script {
         editor|ed|e)          set_editor_cfg="true";;
         ticket|jira|ti|t)     set_ticket_cfg="true";;
         scopes|scope|sc|s)    set_scopes_cfg="true";;
-        ai|llm|key)           set_ai_cfg="true";;
+        ai|llm)               set_ai_cfg="true";;
+        key)                  set_ai_key_cfg="true";;
         provider|prov)        set_ai_provider_cfg="true";;
         model|m)              set_ai_model_cfg="true";;
         proxy|prx|p)          set_proxy_cfg="true";;
@@ -3536,6 +3967,8 @@ function config_script {
     elif [ -n "${set_scopes_cfg}" ]; then
         header="$header SCOPES LIST"
     elif [ -n "${set_ai_cfg}" ]; then
+        header="$header AI SETUP"
+    elif [ -n "${set_ai_key_cfg}" ]; then
         header="$header AI API KEY"
     elif [ -n "${set_ai_provider_cfg}" ]; then
         header="$header AI PROVIDER"
@@ -3591,6 +4024,10 @@ function config_script {
         exit
     fi
     if [ "$set_ai_cfg" == "true" ]; then
+        configure_ai_wizard
+        exit
+    fi
+    if [ "$set_ai_key_cfg" == "true" ]; then
         configure_ai_key
         exit
     fi
@@ -3638,8 +4075,9 @@ function config_script {
         print_help_row $PAD "editor"    "ed, e"             "Set the editor for commit messages"
         print_help_row $PAD "ticket"    "ti, t, jira"       "Set the ticket prefix used in commits and branches"
         print_help_row $PAD "scopes"    "sc"                "Set the list of suggested commit scopes"
-        print_help_row $PAD "ai"        "llm, key"          "Set the AI API key"
-        print_help_row $PAD "provider"  "prov"              "Choose the AI provider (openrouter, openai, ollama)"
+        print_help_row $PAD "ai"        "llm"               "Set up AI: provider, API key, and model (wizard)"
+        print_help_row $PAD "key"       ""                  "Set the AI API key only"
+        print_help_row $PAD "provider"  "prov"              "Choose the AI provider (openrouter, openai, ollama, claude)"
         print_help_row $PAD "model"     "m"                 "Set the AI model override"
         print_help_row $PAD "proxy"     "prx, p"            "Set an HTTP/SOCKS proxy for AI requests"
         print_help_row $PAD "history"   "hist"              "Set how many recent commits to include in AI prompts"
@@ -3653,7 +4091,7 @@ function config_script {
         echo -e "  ${GREEN}gitb cfg${ENDCOLOR}            Show current configuration"
         echo -e "  ${GREEN}gitb cfg user${ENDCOLOR}       Set user.name and user.email"
         echo -e "  ${GREEN}gitb cfg default${ENDCOLOR}    Choose the default gitbasher branch"
-        echo -e "  ${GREEN}gitb cfg ai${ENDCOLOR}         Set the AI API key (per-repo or globally)"
+        echo -e "  ${GREEN}gitb cfg ai${ENDCOLOR}         Interactive AI setup (provider, key, model)"
         exit
     fi
     print_configuration
@@ -3718,7 +4156,7 @@ function merge_script {
         elif [ "$current_local_commit" != "$current_remote_commit" ]; then
             echo -e "${YELLOW}⚠  Remote changes detected on ${current_branch}.${ENDCOLOR}"
             echo
-            echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} first (y/n)?"
+            echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} first (Y/n)?"
             read -n 1 -s choice || prompt_aborted
             if is_yes "$choice"; then
                 echo
@@ -3772,7 +4210,7 @@ function merge_script {
         elif [ "$local_commit" != "$remote_commit" ]; then
             echo -e "${YELLOW}⚠  Remote changes detected.${ENDCOLOR}"
             echo
-            echo -e "Do you want to fetch ${YELLOW}${origin_name}/${merge_branch}${ENDCOLOR} before merge (y/n)?"
+            echo -e "Do you want to fetch ${YELLOW}${origin_name}/${merge_branch}${ENDCOLOR} before merge (Y/n)?"
             read -n 1 -s choice || prompt_aborted
             if is_yes "$choice"; then
                 echo
@@ -3901,7 +4339,7 @@ function resolve_conflicts {
         if [ "$choice" == "4" ]; then
             echo
             echo -e "${RED}⚠  This will discard your current changes for these files.${ENDCOLOR}"
-            echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/n)?"
+            echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/N)?"
             if confirm_destructive; then
                 echo -e "${YELLOW}Accepting all incoming changes...${ENDCOLOR}"
                 deleted_files=$(git --no-pager diff --name-only --diff-filter=D --relative 2>/dev/null)
@@ -3909,7 +4347,7 @@ function resolve_conflicts {
                     echo -e "${YELLOW}⚠  Some files were deleted in the incoming branch:${ENDCOLOR}"
                     echo "$deleted_files" | sed 's/^/\t/'
                     echo
-                    echo -e "Do you want to continue and accept the deletions (y/n)?"
+                    echo -e "Do you want to continue and accept the deletions (y/N)?"
                     if ! confirm_destructive; then
                         echo -e "${YELLOW}Cancelled. Continuing...${ENDCOLOR}"
                         continue
@@ -3967,7 +4405,7 @@ function resolve_conflicts {
         if [ "$choice" == "5" ]; then
             echo
             echo -e "${RED}⚠  This will discard the incoming changes for these files.${ENDCOLOR}"
-            echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/n)?"
+            echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/N)?"
             if confirm_destructive; then
                 echo -e "${YELLOW}Accepting all current changes...${ENDCOLOR}"
                 deleted_files=$(git --no-pager diff --name-only --diff-filter=D --relative 2>/dev/null)
@@ -3975,7 +4413,7 @@ function resolve_conflicts {
                     echo -e "${YELLOW}⚠  Some files were deleted in the current branch:${ENDCOLOR}"
                     echo "$deleted_files" | sed 's/^/\t/'
                     echo
-                    echo -e "Do you want to continue and accept the deletions (y/n)?"
+                    echo -e "Do you want to continue and accept the deletions (y/N)?"
                     if ! confirm_destructive; then
                         echo -e "${YELLOW}Cancelled. Continuing...${ENDCOLOR}"
                         continue
@@ -4094,7 +4532,7 @@ ${staged_with_tab}
             echo
             echo -e "${YELLOW}⚠  Merge commit message cannot be empty.${ENDCOLOR}"
             echo
-            read -n 1 -p "Do you want to try for one more time? (y/n) " -s -e choice || choice="n"
+            read -n 1 -p "Do you want to try for one more time? (Y/n) " -s -e choice || choice="n"
             if ! is_yes "$choice"; then
                 while IFS= read -r _cf; do
                     [ -n "$_cf" ] && git restore --staged -- ":(literal)$_cf" 2>/dev/null
@@ -4181,7 +4619,7 @@ function rebase_script {
         elif [ "$current_local_commit" != "$current_remote_commit" ]; then
             echo -e "${YELLOW}⚠  Remote changes detected on ${current_branch}.${ENDCOLOR}"
             echo
-            echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} first (y/n)?"
+            echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} first (Y/n)?"
             read -n 1 -s choice || prompt_aborted
             if is_yes "$choice"; then
                 echo
@@ -4340,7 +4778,7 @@ function rebase_branch {
         fixup_commits_with_dates=$(git log --format="${YELLOW}%h${ENDCOLOR} (${BLUE}%cr${ENDCOLOR}) ${BOLD}%s${ENDCOLOR}" --grep="^fixup!" $ref..HEAD 2>/dev/null || echo "")
         echo -e "$fixup_commits_with_dates" | sed 's/^/\t/'
         echo
-        echo -e "Proceed with fast autosquash rebase (y/n)?"
+        echo -e "Proceed with fast autosquash rebase (y/N)?"
         if ! confirm_destructive; then
             echo -e "${YELLOW}Rebase cancelled${ENDCOLOR}"
             exit
@@ -4526,7 +4964,7 @@ function rebase_conflicts {
             if [ "$force_skip" != "true" ]; then
                 echo
                 echo -e "${RED}⚠  Dropping this commit will permanently remove it from history.${ENDCOLOR}"
-            echo -e "Are you sure you want to ${RED}skip and discard${ENDCOLOR} this commit (y/n)?"
+            echo -e "Are you sure you want to ${RED}skip and discard${ENDCOLOR} this commit (y/N)?"
                 if ! confirm_destructive; then
                     echo -e "${YELLOW}Continuing...${ENDCOLOR}"
                     continue
@@ -4545,7 +4983,7 @@ function rebase_conflicts {
         fi
         if [ "$choice" == "4" ]; then
             echo
-            echo -e "Are you sure you want to ${YELLOW}abort rebase${ENDCOLOR} (y/n)?"
+            echo -e "Are you sure you want to ${YELLOW}abort rebase${ENDCOLOR} (y/N)?"
             if confirm_destructive; then
                 echo -e "${YELLOW}Aborting rebase...${ENDCOLOR}"
                 git rebase --abort
@@ -4558,7 +4996,7 @@ function rebase_conflicts {
         if [ "$choice" == "5" ]; then
             echo
             echo -e "${RED}⚠  This will discard your current changes for these files.${ENDCOLOR}"
-            echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/n)?"
+            echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/N)?"
             if confirm_destructive; then
                 echo -e "${YELLOW}Accepting all incoming changes...${ENDCOLOR}"
                 deleted_files=$(git --no-pager diff --name-only --diff-filter=D --relative 2>/dev/null)
@@ -4566,7 +5004,7 @@ function rebase_conflicts {
                     echo -e "${YELLOW}⚠  Some files were deleted in the incoming branch:${ENDCOLOR}"
                     echo "$deleted_files" | sed 's/^/\t/'
                     echo
-                    echo -e "Do you want to continue and accept the deletions (y/n)?"
+                    echo -e "Do you want to continue and accept the deletions (y/N)?"
                     if ! confirm_destructive; then
                         echo -e "${YELLOW}Cancelled. Continuing...${ENDCOLOR}"
                         continue
@@ -4626,7 +5064,7 @@ function rebase_conflicts {
         if [ "$choice" == "6" ]; then
             echo
             echo -e "${RED}⚠  This will discard the incoming changes for these files.${ENDCOLOR}"
-            echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/n)?"
+            echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/N)?"
             if confirm_destructive; then
                 echo -e "${YELLOW}Accepting all current changes...${ENDCOLOR}"
                 deleted_files=$(git --no-pager diff --name-only --diff-filter=D --relative 2>/dev/null)
@@ -4634,7 +5072,7 @@ function rebase_conflicts {
                     echo -e "${YELLOW}⚠  Some files were deleted in the current branch:${ENDCOLOR}"
                     echo "$deleted_files" | sed 's/^/\t/'
                     echo
-                    echo -e "Do you want to continue and accept the deletions (y/n)?"
+                    echo -e "Do you want to continue and accept the deletions (y/N)?"
                     if ! confirm_destructive; then
                         echo -e "${YELLOW}Cancelled. Continuing...${ENDCOLOR}"
                         continue
@@ -4928,7 +5366,7 @@ function handle_cherry_pick_conflicts {
                 ;;
             2)
                 echo
-                echo -e "Are you sure you want to ${RED}skip${ENDCOLOR} this commit (y/n)?"
+                echo -e "Are you sure you want to ${RED}skip${ENDCOLOR} this commit (y/N)?"
                 if confirm_destructive; then
                     echo -e "${YELLOW}Skipping commit ${commit_hash::7}${ENDCOLOR}"
                     git cherry-pick --skip 2>/dev/null
@@ -4940,7 +5378,7 @@ function handle_cherry_pick_conflicts {
                 ;;
             3)
                 echo
-                echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/n)?"
+                echo -e "Are you sure you want to ${GREEN}accept all incoming changes${ENDCOLOR} (y/N)?"
                 if confirm_destructive; then
                     echo -e "${YELLOW}Accepting all incoming changes...${ENDCOLOR}"
                     git checkout --theirs . 2>/dev/null
@@ -4961,7 +5399,7 @@ function handle_cherry_pick_conflicts {
                 ;;
             4)
                 echo
-                echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/n)?"
+                echo -e "Are you sure you want to ${GREEN}accept all current changes${ENDCOLOR} (y/N)?"
                 if confirm_destructive; then
                     echo -e "${YELLOW}Accepting all current changes...${ENDCOLOR}"
                     git checkout --ours . 2>/dev/null
@@ -4982,7 +5420,7 @@ function handle_cherry_pick_conflicts {
                 ;;
             5)
                 echo
-                echo -e "Are you sure you want to ${YELLOW}abort${ENDCOLOR} the pull operation (y/n)?"
+                echo -e "Are you sure you want to ${YELLOW}abort${ENDCOLOR} the pull operation (y/N)?"
                 if confirm_destructive; then
                     echo -e "${YELLOW}Aborting pull commits operation...${ENDCOLOR}"
                     git cherry-pick --abort 2>/dev/null
@@ -5158,7 +5596,7 @@ Re-do the grouping. Every input hash MUST appear in EXACTLY ONE \"commits\" arra
     local max_out=$(( commit_count * 120 ))
     [ "$max_out" -lt 2048 ] && max_out=2048
     [ "$max_out" -gt 16384 ] && max_out=16384
-    call_ai_api "$system_prompt" "$user_prompt" "$max_out" "$(get_ai_model_for grouping)" '{"type":"json_object"}'
+    call_ai_api "$system_prompt" "$user_prompt" "$max_out" "" '{"type":"json_object"}' "low"
 }
 function squash_parse_ai_plan {
     local response="$1"
@@ -5570,7 +6008,7 @@ function squash_script {
             size_warning=" ${RED}(large — model accuracy may degrade above ~${SQUASH_MAX_COMMITS} commits)${ENDCOLOR}"
         fi
         echo -e "${YELLOW}Will analyze ${BOLD}${commit_count}${NORMAL}${YELLOW} commits with AI.${ENDCOLOR}${size_warning}"
-        echo -e "Continue (y/n)?"
+        echo -e "Continue (Y/n)?"
         local pre_choice
         read -n 1 -s pre_choice || prompt_aborted
         if ! is_yes "$pre_choice"; then
@@ -5620,7 +6058,7 @@ function squash_script {
     if [ -z "$mode_yes" ]; then
         echo -e "${RED}⚠  Applying this plan rewrites your commit history.${ENDCOLOR}"
         echo -e "${CYAN}💡 Recover the original branch with ${BOLD}gitb undo rebase${NORMAL}${CYAN} if needed.${ENDCOLOR}"
-        echo -e "Are you sure you want to proceed (y/n)?"
+        echo -e "Are you sure you want to proceed (y/N)?"
         if ! confirm_destructive; then
             echo -e "${YELLOW}Cancelled.${ENDCOLOR}"
             exit 0
@@ -6166,7 +6604,7 @@ function push_script {
             echo -e "${BLUE}Branch ${YELLOW}${current_branch}${BLUE} does not exist on ${YELLOW}${origin_name}${BLUE} yet.${ENDCOLOR}"
             echo
             if [ -z "${fast}" ]; then
-                echo -e "Do you want to push the new branch to ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (y/n)?"
+                echo -e "Do you want to push the new branch to ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (Y/n)?"
                 yes_no_choice "Pushing..."
             else
                 echo -e "${YELLOW}Pushing...${ENDCOLOR}"
@@ -6229,7 +6667,7 @@ function push_script {
         if [ "${current_branch}" == "${main_branch}" ]; then
             echo -e "${RED}⚠  You are about to push directly to the default branch ${YELLOW}${main_branch}${RED}.${ENDCOLOR}"
         fi
-        echo -e "Do you want to push${RED}${force_label}${ENDCOLOR} these commits to ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (y/n)?"
+        echo -e "Do you want to push${RED}${force_label}${ENDCOLOR} these commits to ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (Y/n)?"
         yes_no_choice "Pushing..."
     else
         echo -e "${YELLOW}Pushing...${ENDCOLOR}"
@@ -6243,7 +6681,7 @@ function push_script {
         echo
         pull "$current_branch" "$origin_name" "$editor" "rebase"
     else
-        echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (y/n)?"
+        echo -e "Do you want to pull ${YELLOW}${origin_name}/${current_branch}${ENDCOLOR} (Y/n)?"
         yes_no_choice "Pulling..."
         pull "$current_branch" "$origin_name" "$editor"
     fi
@@ -6680,7 +7118,7 @@ A feature is defined by WHAT the change accomplishes, read from the actual code
 
 Input arrives in XML tags: a list of staged files, the actual diff, a diff summary, recent commit messages (for scope-naming conventions), and folder-derived candidate scope tokens.
 
-Task: assign EVERY staged file to exactly one feature group. Use 1 group only if all changes truly form a single feature; otherwise use 2 to ${max_groups} groups. Never exceed ${max_groups} groups — prefer a broader feature over several tiny ones. Name each group with a short lowercase conventional-commit scope describing the FEATURE, matching the style of <recent_commits>. <heuristic_candidates> are folder-derived hints — use one only if it happens to match a feature's purpose. Use \"misc\" only for unrelated incidental files with no feature (e.g., README, top-level config).
+Task: assign EVERY staged file to exactly one feature group. Use 1 group only if all changes truly form a single feature; otherwise use 2 to ${max_groups} groups. Never exceed ${max_groups} groups — prefer a broader feature over several tiny ones. Name each group with a short lowercase conventional-commit scope describing the FEATURE — the bare scope token only (e.g. \"auth\", never a full prefix like \"feat(auth)\" or a type like \"docs:\"), matching the scope-naming style of <recent_commits>. <heuristic_candidates> are folder-derived hints — use one only if it happens to match a feature's purpose. Use \"misc\" only for unrelated incidental files with no feature (e.g., README, top-level config).
 
 Output format: TSV only. One line per staged file in the form <scope><TAB><file_path>. No header, no prose, no markdown fences, no surrounding quotes. Every file from <staged_files> MUST appear exactly once. The file paths must be byte-identical to those in <staged_files>."
 
@@ -6706,7 +7144,7 @@ ${heuristic_hint}
 
 Read <diff> to decide which files implement the same feature. Output TSV (scope<TAB>file) for every staged file. No prose."
     local ai_response
-    ai_response=$(call_ai_api "$system_prompt" "$user_prompt" "$AI_MAX_TOKENS_FULL" "$(get_ai_model_for grouping)" 2>/dev/null)
+    ai_response=$(call_ai_api "$system_prompt" "$user_prompt" "$AI_MAX_TOKENS_FULL" "" "" "low" 2>/dev/null)
     if [ $? -ne 0 ] || [ -z "$ai_response" ]; then
         return 1
     fi
@@ -6726,6 +7164,11 @@ Read <diff> to decide which files implement the same feature. Output TSV (scope<
         [ "$tab_count" -ne 1 ] && continue
         scope="${line%%	*}"
         file="${line#*	}"
+        scope="${scope%:}"
+        local type_scope_re='^[a-zA-Z0-9._/-]+\(([a-zA-Z0-9._/-]+)\)$'
+        if [[ "$scope" =~ $type_scope_re ]]; then
+            scope="${BASH_REMATCH[1]}"
+        fi
         if ! [[ "$scope" =~ ^[a-zA-Z0-9._/-]+$ ]]; then
             continue
         fi
@@ -7225,6 +7668,19 @@ function handle_ai_commit_generation {
         if [ $? -ne 0 ] || [ -z "$ai_commit_message" ]; then
             echo
             echo -e "${RED}✗ Cannot generate AI commit message.${ENDCOLOR}"
+            echo
+            read_key choice "Continue with a manual commit message? (Y/n) " || choice="n"
+            echo
+            if is_yes "$choice"; then
+                if [ "$ai_mode" = "subject" ]; then
+                    echo
+                fi
+                echo -e "${YELLOW}Falling back to manual commit message creation...${ENDCOLOR}"
+                if [ "$ai_mode" = "subject" ]; then
+                    echo
+                fi
+                return
+            fi
             cleanup_on_exit "$git_add"
             exit 1
         fi
@@ -7289,7 +7745,7 @@ ${ai_commit_message}"
                 echo
                 echo -e "${YELLOW}⚠  Commit message cannot be empty.${ENDCOLOR}"
                 echo
-                read -n 1 -p "Try again? (y/n) " -s -e choice || choice="n"
+                read -n 1 -p "Try again? (Y/n) " -s -e choice || choice="n"
                 if ! is_yes "$choice"; then
                     cleanup_on_exit "$git_add"
                     rm -f "$commitmsg_file"
@@ -7696,7 +8152,7 @@ function commit_script {
         if [ -n "$saved_git_add" ]; then
             echo
             echo -e "${YELLOW}Found previous git add arguments:${ENDCOLOR} ${BOLD}$saved_git_add${ENDCOLOR}"
-            read_key choice "Use them? (y/n) " || choice="n"
+            read_key choice "Use them? (Y/n) " || choice="n"
             echo
             if is_yes "$choice"; then
                 git add $saved_git_add
@@ -8087,7 +8543,7 @@ ${staged_with_tab}
             echo
             echo -e "${YELLOW}⚠  Commit message cannot be empty.${ENDCOLOR}"
             echo
-            read -n 1 -p "Try again? (y/n) " -s -e choice || choice="n"
+            read -n 1 -p "Try again? (Y/n) " -s -e choice || choice="n"
             if ! is_yes "$choice"; then
                 cleanup_on_exit "$git_add"
                 rm -f "$commitmsg_file"
@@ -8293,7 +8749,7 @@ function edit_branch_name {
     if [ "$old_name" = "$main_branch" ]; then
         echo -e "${YELLOW}⚠  ${BOLD}${old_name}${NORMAL} is the configured main branch.${ENDCOLOR}"
         echo -e "Renaming it will leave ${YELLOW}gitbasher.branch${ENDCOLOR} pointing at the old name."
-        printf "Rename anyway? (y/n) "
+        printf "Rename anyway? (y/N) "
         yes_no_choice_strict
         echo
     fi
@@ -8316,7 +8772,7 @@ function edit_branch_name {
     echo
     echo -e "${YELLOW}${BOLD}${old_name}${NORMAL}${YELLOW} also exists on ${origin_name}.${ENDCOLOR}"
     echo -e "Push ${BOLD}${new_name}${NORMAL} and delete the old remote branch?"
-    printf "(y/n) "
+    printf "(y/N) "
     yes_no_choice_strict
     echo
     local push_out
@@ -8481,7 +8937,7 @@ function branch_script {
         done
         echo
         echo -e "${RED}⚠  These branches will be force-deleted (${BLUE}git branch -D${RED}).${ENDCOLOR}"
-        echo -e "Are you sure you want to delete them (y/n)?"
+        echo -e "Are you sure you want to delete them (y/N)?"
         yes_no_choice_strict "Deleting gone branches..."
         for branch in "${gone_branches[@]}"; do
             delete_output=$(git branch -D "$branch" 2>&1)
@@ -8501,7 +8957,7 @@ function branch_script {
     fi
     if [[ -n "${tag}" ]]; then
         echo -e "${YELLOW}Do you want to fetch remote tags first?${ENDCOLOR}"
-        read -n 1 -p "Fetch remote? (y/n) " choice || choice="n"
+        read -n 1 -p "Fetch remote? (Y/n) " choice || choice="n"
         echo
         if [ "$choice" = "y" ] || [ "$choice" = "Y" ]; then
             echo
@@ -8584,7 +9040,7 @@ function branch_script {
     elif [[ -z "$new" ]] && [[ -n "$delete" ]] && [[ -z "$tag" ]]; then
         echo -e "${YELLOW}Clean up local branches that no longer exist on the remote?${ENDCOLOR}"
         echo
-        printf "Continue (y/n)? "
+        printf "Continue (Y/n)? "
         while [ true ]; do
             read -n 1 -s choice || prompt_aborted
             if is_yes "$choice"; then
@@ -8614,7 +9070,7 @@ function branch_script {
                     done
                     echo
                     echo -e "${RED}⚠  These branches will be force-deleted (${BLUE}git branch -D${RED}).${ENDCOLOR}"
-                    printf "Are you sure you want to delete them (y/n)? "
+                    printf "Are you sure you want to delete them (y/N)? "
                     if confirm_destructive; then
                         echo
                         for branch in "${branches_to_delete[@]}"; do
@@ -8654,7 +9110,7 @@ function branch_script {
             do
                 printf "\t${merged_branches_without_main[index]}\n"
             done
-            printf "\nDelete these merged branches (y/n)? "
+            printf "\nDelete these merged branches (Y/n)? "
             while [ true ]; do
                 read -n 1 -s choice || prompt_aborted
                 if is_yes "$choice"; then
@@ -8722,7 +9178,7 @@ function branch_script {
             done
             echo
             echo -e "${RED}⚠  These will be force-deleted (${BLUE}git branch -D${RED}).${ENDCOLOR}"
-            printf "Are you sure (y/n)? "
+            printf "Are you sure (y/N)? "
             if confirm_destructive; then
                 echo
                 for branch in "${squash_merged_branches[@]}"; do
@@ -8750,7 +9206,7 @@ function branch_script {
         elif [[ ${delete_output} == *"is not fully merged"* ]]; then
             echo -e "${YELLOW}⚠  Branch '$branch_name' is not fully merged.${ENDCOLOR}"
             echo -e "${RED}⚠  Force-delete (${BLUE}git branch -D${RED}) will discard unmerged commits.${ENDCOLOR}"
-            printf "Force-delete this branch (y/n)? "
+            printf "Force-delete this branch (y/N)? "
             confirm_destructive
             case $? in
                 0)
@@ -8774,7 +9230,7 @@ function branch_script {
         fi
         if git rev-parse --verify --quiet "refs/remotes/$origin_name/$branch_name" >/dev/null 2>&1; then
             echo
-            printf "Also delete this branch on ${origin_name} (y/n)? "
+            printf "Also delete this branch on ${origin_name} (y/N)? "
             if confirm_destructive; then
                 echo
                 echo -e "${YELLOW}Deleting from remote...${ENDCOLOR}"
@@ -8945,7 +9401,7 @@ function branch_script {
         fi
         if [ -n "$origin_name" ]; then
             echo
-            echo -e "Do you want to push the new branch to ${YELLOW}${origin_name}/${branch_name}${ENDCOLOR} (y/n)?"
+            echo -e "Do you want to push the new branch to ${YELLOW}${origin_name}/${branch_name}${ENDCOLOR} (Y/n)?"
             yes_no_choice "Pushing..."
             current_branch="$branch_name"
             push -u
@@ -9184,7 +9640,7 @@ function tag_script {
     fi
     if [ -n "${delete}" ] && [ -z "$select" ]; then
         echo
-        echo -e "${YELLOW}Do you really want to delete all local tags (y/n)?${ENDCOLOR}"
+        echo -e "${YELLOW}Do you really want to delete all local tags (y/N)?${ENDCOLOR}"
         yes_no_choice_strict "\nDeleting all local tags..."
         local _da_failed=0
         while IFS= read -r _da_tag; do
@@ -9225,7 +9681,7 @@ function tag_script {
         check_code $? "$delete_result" "delete tag"
         echo -e "${GREEN}✓ Deleted tag '${tag_name}'${ENDCOLOR}"
         echo
-        echo -e "Also delete this tag on ${YELLOW}${origin_name}${ENDCOLOR} (y/n)?"
+        echo -e "Also delete this tag on ${YELLOW}${origin_name}${ENDCOLOR} (y/N)?"
         yes_no_choice_strict "\nDeleting..."
         push_tag $tag_name "true"
         exit
@@ -9286,7 +9742,7 @@ function tag_script {
             echo
             echo -e "${YELLOW}⚠  Tag message cannot be empty.${ENDCOLOR}"
             echo
-            read -n 1 -p "Try again? (y/n) " -s -e choice || choice="n"
+            read -n 1 -p "Try again? (Y/n) " -s -e choice || choice="n"
             if ! is_yes "$choice"; then
                 rm -f "$tag_file"
                 exit
@@ -9324,7 +9780,7 @@ function tag_script {
         echo -e "$tag_message"
     fi
     echo
-    echo -e "Do you want to push it to ${YELLOW}${origin_name}${ENDCOLOR} (y/n)?"
+    echo -e "Do you want to push it to ${YELLOW}${origin_name}${ENDCOLOR} (Y/n)?"
     yes_no_choice "\nPushing..."
     push_tag $tag_name
 }
@@ -9418,7 +9874,7 @@ function reset_script {
     else
         echo -e "${YELLOW}⚠  This will move HEAD; reset changes will be left unstaged.${ENDCOLOR}"
     fi
-    echo -e "Are you sure you want to continue (y/n)?"
+    echo -e "Are you sure you want to continue (y/N)?"
     yes_no_choice_strict "Resetting..."
     reset_output=$(git reset "$args" "$move_ref" 2>&1)
     check_code $? "$reset_output" "reset"
@@ -9714,7 +10170,7 @@ function stash_script {
         fi
         echo
         echo -e "${RED}⚠  Dropping stash $selected_stash cannot be undone.${ENDCOLOR}"
-        echo -e "Are you sure you want to drop it (y/n)?"
+        echo -e "Are you sure you want to drop it (y/N)?"
         yes_no_choice_strict "Dropping stash"
         drop_output=$(git stash drop "$selected_stash" 2>&1)
         drop_code=$?
@@ -9829,7 +10285,7 @@ function cherry_script {
             echo -e "Files with changes:"
             git status --porcelain | sed 's/^/  /'
             echo
-            echo -e "Continue with cherry-pick (may cause conflicts) (y/n)?"
+            echo -e "Continue with cherry-pick (may cause conflicts) (Y/n)?"
             yes_no_choice "Proceeding..."
             echo
         fi
@@ -9909,7 +10365,7 @@ function handle_cherry_pick_conflicts {
     fi
     if [[ $output == *"The previous cherry-pick is now empty"* ]]; then
         echo -e "${YELLOW}This commit is empty after cherry-pick (changes already applied).${ENDCOLOR}"
-        echo -e "Skip it (y/n)?"
+        echo -e "Skip it (y/N)?"
         yes_no_choice_strict "Skipping empty commit..."
         skip_output=$(git cherry-pick --skip 2>&1)
         if [ $? == 0 ]; then
@@ -10029,7 +10485,7 @@ function choose_commits_interactive {
         echo -e "  ${commit::7} - $message"
     done
     echo
-    echo -e "Proceed with cherry-pick? (y/n)"
+    echo -e "Proceed with cherry-pick? (Y/n)"
     yes_no_choice "Proceeding with cherry-pick..."
     local success_count=0
     local total_count=${#selected_commits[@]}
@@ -10272,7 +10728,7 @@ function undo_commit {
     echo -e "\t$cancelled_commit"
     echo
     echo -e "This will undo the last commit but ${GREEN}keep all changes staged${ENDCOLOR}"
-    echo -e "Do you want to continue (y/n)?"
+    echo -e "Do you want to continue (y/N)?"
     yes_no_choice_strict "Undoing commit..."
     reset_output=$(git reset --soft HEAD~1 2>&1)
     reset_code=$?
@@ -10321,7 +10777,7 @@ function undo_amend {
     echo -e "${YELLOW}Current (amended):${ENDCOLOR}\t$current_commit"
     echo -e "${GREEN}Restore to:${ENDCOLOR}\t\t$pre_amend_commit"
     echo
-    echo -e "Do you want to undo the amend (y/n)?"
+    echo -e "Do you want to undo the amend (y/N)?"
     yes_no_choice_strict "Undoing amend..."
     reset_output=$(git reset --soft "$pre_amend_ref" 2>&1)
     reset_code=$?
@@ -10341,7 +10797,7 @@ function undo_amend {
 function undo_merge {
     if [ -f "$(git rev-parse --git-dir)/MERGE_HEAD" ]; then
         echo -e "${YELLOW}⚠  A merge is in progress.${ENDCOLOR}"
-        echo -e "Abort the ongoing merge (y/n)?"
+        echo -e "Abort the ongoing merge (y/N)?"
         yes_no_choice_strict "Aborting merge..."
         abort_output=$(git merge --abort 2>&1)
         abort_code=$?
@@ -10370,7 +10826,7 @@ function undo_merge {
     echo -e "${GREEN}Restore to:${ENDCOLOR}\t$orig_commit"
     echo
     echo -e "${RED}⚠  This will discard the merge commit and all merge changes.${ENDCOLOR}"
-    echo -e "Are you sure you want to undo the merge (y/n)?"
+    echo -e "Are you sure you want to undo the merge (y/N)?"
     yes_no_choice_strict "Undoing merge..."
     reset_output=$(git reset --merge ORIG_HEAD 2>&1)
     reset_code=$?
@@ -10387,7 +10843,7 @@ function undo_merge {
 function undo_rebase {
     if [ -d "$(git rev-parse --git-dir)/rebase-merge" ] || [ -d "$(git rev-parse --git-dir)/rebase-apply" ]; then
         echo -e "${YELLOW}⚠  A rebase is in progress.${ENDCOLOR}"
-        echo -e "Abort the ongoing rebase (y/n)?"
+        echo -e "Abort the ongoing rebase (y/N)?"
         yes_no_choice_strict "Aborting rebase..."
         abort_output=$(git rebase --abort 2>&1)
         abort_code=$?
@@ -10418,7 +10874,7 @@ function undo_rebase {
         exit 1
     fi
     echo -e "${RED}⚠  This will discard all rebase changes and restore the original branch state.${ENDCOLOR}"
-    echo -e "Are you sure you want to undo the rebase (y/n)?"
+    echo -e "Are you sure you want to undo the rebase (y/N)?"
     yes_no_choice_strict "Undoing rebase..."
     reset_output=$(git reset --hard ORIG_HEAD 2>&1)
     reset_code=$?
@@ -10442,7 +10898,7 @@ function undo_stash {
     git_status
     echo
     echo -e "This will stash all current changes to undo the last stash pop/apply."
-    echo -e "Continue (y/n)?"
+    echo -e "Continue (y/N)?"
     yes_no_choice_strict "Re-stashing changes..."
     stash_output=$(git stash push -m "undo: re-stashed changes" --include-untracked 2>&1)
     stash_code=$?
@@ -11492,7 +11948,7 @@ function log_commit_actions {
                 choice=$((10#$choice))
                 local file="${files[choice - 1]}"
                 echo -e "${RED}This will overwrite '${file}' in your working tree with its state from ${hash}.${ENDCOLOR}"
-                printf "Restore it (y/n)? "
+                printf "Restore it (y/N)? "
                 if confirm_destructive; then
                     result=$(git checkout "$hash" -- "$file" 2>&1)
                     check_code $? "$result" "restore"
@@ -12709,7 +13165,7 @@ function _do_worktree_remove {
         echo -e "${RED}${rm_output}${ENDCOLOR}"
         echo
         echo -e "${YELLOW}Force remove this worktree? (uncommitted changes will be lost)${ENDCOLOR}"
-        echo -e "Do you want to continue (y/n)?"
+        echo -e "Do you want to continue (y/N)?"
         yes_no_choice_strict "Force removing worktree..."
         rm_output=$(LC_ALL=C git worktree remove --force --force "$selected_worktree_path" 2>&1)
         rm_code=$?
@@ -12742,7 +13198,7 @@ function worktree_prune {
     echo -e "${YELLOW}Records that would be removed:${ENDCOLOR}"
     echo "$dry_run"
     echo
-    echo -e "${YELLOW}Continue? (y/n)${ENDCOLOR}"
+    echo -e "${YELLOW}Continue? (Y/n)${ENDCOLOR}"
     yes_no_choice "Pruning..."
     local prune_output
     prune_output=$(git worktree prune --verbose 2>&1)
@@ -13422,7 +13878,7 @@ function create_hook {
     if [ -f "$hook_file" ]; then
         echo -e "${YELLOW}⚠  Hook '$hook_type' already exists.${ENDCOLOR}"
         echo -e "${RED}⚠  Overwriting will replace its contents.${ENDCOLOR}"
-        echo -e "Overwrite (y/n)?"
+        echo -e "Overwrite (y/N)?"
         if ! confirm_destructive; then
             echo -e "${YELLOW}Hook creation cancelled.${ENDCOLOR}"
             return 1
@@ -13468,7 +13924,7 @@ fi
 # lines for any binary blob that happens to be staged.
 if git diff --cached --name-only -z | xargs -0 grep -l --binary-files=without-match \"TODO\\|FIXME\" 2>/dev/null; then
     echo \"⚠️  Warning: Found TODO/FIXME comments in staged files\"
-    echo \"Continue anyway? (y/n)\"
+    echo \"Continue anyway? (y/N)\"
     read -n 1 answer
     echo
     if [ \"\$answer\" != \"y\" ] && [ \"\$answer\" != \"Y\" ]; then
@@ -13573,7 +14029,7 @@ exit 0"
     echo -e "${GREEN}✓ Created executable hook: $hook_type${ENDCOLOR}"
     echo -e "${YELLOW}Hook file: $hook_file${ENDCOLOR}"
     echo
-    echo -e "Do you want to ${BLUE}edit${ENDCOLOR} the hook now? (y/n)"
+    echo -e "Do you want to ${BLUE}edit${ENDCOLOR} the hook now? (Y/n)"
     read -n 1 -s choice || prompt_aborted
     echo
     if is_yes "$choice"; then
@@ -13644,7 +14100,7 @@ function remove_hook {
     fi
     echo -e "${RED}⚠  Deleting hook '$hook_type' cannot be undone.${ENDCOLOR}"
     echo -e "${GRAY}File: $hook_file${ENDCOLOR}"
-    echo -e "Are you sure you want to delete it (y/n)?"
+    echo -e "Are you sure you want to delete it (y/N)?"
     if confirm_destructive; then
         rm "$hook_file"
         echo -e "${GREEN}✓ Removed hook: $hook_type${ENDCOLOR}"
@@ -13685,7 +14141,7 @@ function remove_all_hooks {
     fi
     echo
     echo -e "${RED}⚠  This will permanently delete $hook_count hooks.${ENDCOLOR}"
-    echo -e "${YELLOW}Are you absolutely sure (y/n)?${ENDCOLOR}"
+    echo -e "${YELLOW}Are you absolutely sure (Y/n)?${ENDCOLOR}"
     read -n 1 -p "Your choice: " choice < /dev/tty || choice="0"
     echo
     echo
@@ -13816,7 +14272,7 @@ function install_samples {
     fi
     echo
     echo -e "${YELLOW}Ready to install $sample_count sample hooks.${ENDCOLOR}"
-    echo -e "Continue (y/n)?"
+    echo -e "Continue (Y/n)?"
     read -n 1 -p "Your choice: " choice < /dev/tty || choice="n"
     echo
     echo
@@ -14264,7 +14720,7 @@ function origin_remove {
     echo -e "URL: ${GRAY}$existing${ENDCOLOR}"
     echo
     echo -e "${RED}⚠  This will remove the remote (you can re-add it later).${ENDCOLOR}"
-    echo -e "Are you sure (y/n)?"
+    echo -e "Are you sure (y/N)?"
     yes_no_choice_strict "" "true"
     git remote remove "$target"
     echo
@@ -14423,7 +14879,7 @@ function clone_script {
     echo
     if [ -z "$GITBASHER_TEST_MODE" ] && [ -t 0 ]; then
         local clone_cd_choice
-        echo -e "${YELLOW}Enter the new repo now (y/n)?${ENDCOLOR}"
+        echo -e "${YELLOW}Enter the new repo now (Y/n)?${ENDCOLOR}"
         read -n 1 -s clone_cd_choice
         echo
         if is_yes "$clone_cd_choice"; then
@@ -14765,9 +15221,9 @@ function update_script {
     fi
     echo -e "Install location: ${BLUE}${install_path}${ENDCOLOR}"
     if [ $cmp -eq 2 ]; then
-        echo -e "Update ${YELLOW}${current_version}${ENDCOLOR} → ${GREEN}${latest_version}${ENDCOLOR}? (y/n)"
+        echo -e "Update ${YELLOW}${current_version}${ENDCOLOR} → ${GREEN}${latest_version}${ENDCOLOR}? (Y/n)"
     else
-        echo -e "Reinstall ${GREEN}${latest_version}${ENDCOLOR} over the current binary? (y/n)"
+        echo -e "Reinstall ${GREEN}${latest_version}${ENDCOLOR} over the current binary? (Y/n)"
     fi
     yes_no_choice "Updating..."
     local tmp_path
@@ -15321,7 +15777,7 @@ _gitb() {
                     _values 'tag mode' 'annotated[create annotated tag]' 'commit[tag a commit]' 'all[tag everything]' 'push[push tag]' 'push-all[push all tags]' 'delete[delete tag]' 'delete-all[delete all]' 'list[list tags]' 'remote[remote tags]' 'help[show help]'
                     ;;
                 config|cf|cfg|conf)
-                    _values 'config key' 'default[default branch]' 'separator[separator char]' 'editor[editor]' 'ticket[ticket prefix]' 'scopes[scope list]' 'ai[AI key]' 'provider[AI provider]' 'model[AI model]' 'proxy[AI proxy]' 'history[AI history]' 'diff[AI diff payload]' 'push-size[warn on large pushes]' 'delete[unset a key]' 'user[user name/email]' 'auto[manage tab completion]' 'help[show help]'
+                    _values 'config key' 'default[default branch]' 'separator[separator char]' 'editor[editor]' 'ticket[ticket prefix]' 'scopes[scope list]' 'ai[AI setup wizard]' 'key[AI API key]' 'provider[AI provider]' 'model[AI model]' 'proxy[AI proxy]' 'history[AI history]' 'diff[AI diff payload]' 'push-size[warn on large pushes]' 'delete[unset a key]' 'user[user name/email]' 'auto[manage tab completion]' 'help[show help]'
                     ;;
                 undo|un)
                     _values 'undo target' 'commit[undo last commit]' 'amend[undo amend]' 'merge[undo merge]' 'rebase[undo rebase]' 'stash[undo stash]' 'help[show help]'
@@ -15523,7 +15979,7 @@ complete -c gitb -n "$__gitb_branch" -a "list remote main new newd delete prev r
 set -l __gitb_tag "__gitb_using_cmd tag t tg; and __gitb_at_position 2"
 complete -c gitb -n "$__gitb_tag" -a "annotated commit all push push-all delete delete-all list remote help"
 set -l __gitb_config "__gitb_using_cmd config cf cfg conf; and __gitb_at_position 2"
-complete -c gitb -n "$__gitb_config" -a "default separator editor ticket scopes ai provider model proxy history diff push-size delete user auto help"
+complete -c gitb -n "$__gitb_config" -a "default separator editor ticket scopes ai key provider model proxy history diff push-size delete user auto help"
 set -l __gitb_undo "__gitb_using_cmd undo un; and __gitb_at_position 2"
 complete -c gitb -n "$__gitb_undo" -a "commit amend merge rebase stash help"
 set -l __gitb_reset "__gitb_using_cmd reset res; and __gitb_at_position 2"