@zachjxyz/moxie 0.4.9 → 0.5.0

package/bin/moxie

@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.4.9"
+MOXIE_VERSION="0.5.0"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do

package/lib/phases.sh

@@ -211,125 +211,203 @@ _select_context_docs() {
 
 # ---- Agent selection TUI ----
 # Populates SELECTED_AGENT_INDICES (CLI) and SELECTED_GATEWAY_INDICES (gateway).
-# Shows CLI agents found on PATH + gateway models. Requires minimum 2 total.
+# Shows CLI agents found on PATH + inline gateway model search.
+# Typing filters gateway models live (fzf-style). Requires minimum 2 total.
 
 _select_agents() {
     SELECTED_AGENT_INDICES=()
     SELECTED_GATEWAY_INDICES=()
     SELECTED_CUSTOM_GATEWAY_INDICES=()
 
-    # Build unified item list: CLI agents, separator, gateway models
-    local item_labels=()
-    local item_meta=()
-    local item_types=()    # "cli", "separator", "gateway"
-    local item_sources=()  # index into KNOWN_AGENT_* or KNOWN_GATEWAY_*
+    # ---- CLI agent items ----
+    local cli_labels=()
+    local cli_meta=()
+    local cli_sources=()
+    local cli_selected=()
     local max_label_len=0
 
-    # CLI agents header
-    item_labels+=("--- Detected CLI agents ---")
-    item_meta+=("")
-    item_types+=("separator")
-    item_sources+=("-1")
-
-    # CLI agents on PATH
     for idx in "${AVAILABLE_AGENT_INDICES[@]}"; do
         local label="${KNOWN_AGENT_LABELS[$idx]}"
         local binary="${KNOWN_AGENT_BINARIES[$idx]}"
-        item_labels+=("$label")
+        cli_labels+=("$label")
         local ver
         ver=$("$binary" --version 2>&1 | head -1 | grep -oE '[0-9]+\.[0-9]+[0-9.]*' | head -1) || ver=""
         [ -z "$ver" ] && ver="installed"
-        item_meta+=("$ver")
-        item_types+=("cli")
-        item_sources+=("$idx")
+        cli_meta+=("$ver")
+        cli_sources+=("$idx")
+        cli_selected+=(1)
         local len=${#label}
         [ "$len" -gt "$max_label_len" ] && max_label_len=$len
     done
 
-    # Separator + gateway search
-    item_labels+=("--- Vercel AI Gateway ---")
-    item_meta+=("")
-    item_types+=("separator")
-    item_sources+=("-1")
-
-    item_labels+=("+ Search gateway models...")
-    item_meta+=("browse all available models")
-    item_types+=("custom_add")
-    item_sources+=("-1")
-    local _custom_label="+ Search gateway models..."
-    local len=${#_custom_label}
-    [ "$len" -gt "$max_label_len" ] && max_label_len=$len
-
-    # Track custom models added during this session
-    local custom_gateway_names=()
-    local custom_gateway_models=()
-
-    local count=${#item_labels[@]}
-
-    # State: pre-select CLI agents, gateway unselected
-    local cursor=0
-    local selected=()
-    for (( i = 0; i < count; i++ )); do
-        if [ "${item_types[$i]}" = "cli" ]; then
-            selected+=(1)
-        else
-            selected+=(0)
+    local cli_count=${#cli_labels[@]}
+
+    # ---- Gateway model catalog ----
+    local gw_ids=()
+    local gw_labels=()
+    local gw_selected=()
+    local gw_loaded=0
+    local gw_error=""
+
+    # Try to fetch gateway models eagerly if key exists
+    if command -v node &>/dev/null && gateway_has_key "vercel-ai-gateway"; then
+        local _gw_key=""
+        _gw_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || true
+        if [ -n "$_gw_key" ]; then
+            printf "Fetching gateway models..." >&2
+            local _mj=""
+            _mj=$(GATEWAY_API_KEY="$_gw_key" node "$MOXIE_LIB/gateway-models.mjs" "https://ai-gateway.vercel.sh" "" 2>/dev/null) || true
+            printf "\\r\\033[K" >&2
+            if [ -n "$_mj" ]; then
+                eval "$(python3 -c "
+import json, sys, shlex
+data = json.loads(sys.stdin.read())
+models = data.get('models', [])
+ids = [m['id'] for m in models]
+labels = [m.get('name', m['id']) for m in models]
+print('gw_ids=(' + ' '.join(shlex.quote(x) for x in ids) + ')')
+print('gw_labels=(' + ' '.join(shlex.quote(x) for x in labels) + ')')
+" <<< "$_mj" 2>/dev/null)" && gw_loaded=1
+            else
+                gw_error="Failed to fetch models. Check API key or network."
+            fi
         fi
-    done
+    fi
 
-    # Skip separators for initial cursor position
-    while [ "$cursor" -lt "$count" ] && [ "${item_types[$cursor]}" = "separator" ]; do
-        cursor=$((cursor + 1))
+    local gw_count=${#gw_ids[@]}
+    for (( i = 0; i < gw_count; i++ )); do
+        gw_selected+=(0)
     done
 
+    # ---- Layout constants ----
+    local gw_search=""
+    local gw_cursor=0           # cursor within filtered gateway results
+    local MAX_GW_VISIBLE=10     # fixed-height gateway results area
+
+    # Cursor zones: "cli" (index 0..cli_count-1), "gw" (filtered results), "submit"
+    local zone="cli"
+    local cli_cursor=0
+    # Skip to first CLI agent if available
+    [ "$cli_count" -eq 0 ] && zone="gw"
+
     local sep=""
-    for (( i = 0; i < max_label_len + 40; i++ )); do sep="${sep}-"; done
+    for (( i = 0; i < max_label_len + 50; i++ )); do sep="${sep}-"; done
+
+    # Fixed total lines: header(1) + cli(cli_count) + sep(1) + search(1) + gw_area(MAX_GW_VISIBLE) + scroll(1) + sep(1) + submit(1) + blank(1) + hint(1)
+    local total_lines=$(( 1 + cli_count + 1 + 1 + MAX_GW_VISIBLE + 1 + 1 + 1 + 1 + 1 ))
+
+    _build_gw_filtered() {
+        # Populates gw_filtered array with indices matching gw_search
+        gw_filtered=()
+        local lc_search
+        lc_search=$(echo "$gw_search" | tr '[:upper:]' '[:lower:]')
+        for (( i = 0; i < gw_count; i++ )); do
+            if [ -z "$gw_search" ]; then
+                gw_filtered+=("$i")
+            else
+                local lc_id
+                lc_id=$(echo "${gw_ids[$i]}" | tr '[:upper:]' '[:lower:]')
+                if [[ "$lc_id" == *"$lc_search"* ]]; then
+                    gw_filtered+=("$i")
+                fi
+            fi
+        done
+    }
 
-    # submit row is at index $count
-    local jump_back=$(( count + 3 ))
+    local gw_filtered=()
+    _build_gw_filtered
 
-    _agent_render() {
+    _sa_render() {
+        # Count total selected
         local sel_count=0
-        for (( i = 0; i < count; i++ )); do
-            [ "${selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
+        for (( i = 0; i < cli_count; i++ )); do
+            [ "${cli_selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
+        done
+        for (( i = 0; i < gw_count; i++ )); do
+            [ "${gw_selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
         done
 
-        for (( i = 0; i < count; i++ )); do
-            if [ "${item_types[$i]}" = "separator" ]; then
-                printf "\\r\\033[K  \\033[2m%s\\033[0m\\n" "${item_labels[$i]}" >&2
-                continue
-            fi
+        # CLI header
+        printf "\\r\\033[K  \\033[2m--- Detected CLI agents ---\\033[0m\\n" >&2
+
+        # CLI agents
+        for (( i = 0; i < cli_count; i++ )); do
             local marker="  "
-            [ "$cursor" -eq "$i" ] && marker="> "
-            if [ "${item_types[$i]}" = "custom_add" ]; then
-                printf "\\r\\033[K  %s    \\033[36m%s\\033[0m  \\033[2m(%s)\\033[0m\\n" "$marker" "${item_labels[$i]}" "${item_meta[$i]}" >&2
-                continue
-            fi
+            [ "$zone" = "cli" ] && [ "$cli_cursor" -eq "$i" ] && marker="> "
             local check="[ ]"
-            [ "${selected[$i]}" = "1" ] && check="[x]"
-            if [ -n "${item_meta[$i]}" ]; then
-                printf "\\r\\033[K  %s%s %-${max_label_len}s  (%s)\\n" "$marker" "$check" "${item_labels[$i]}" "${item_meta[$i]}" >&2
+            [ "${cli_selected[$i]}" = "1" ] && check="[x]"
+            printf "\\r\\033[K  %s%s %-${max_label_len}s  (%s)\\n" "$marker" "$check" "${cli_labels[$i]}" "${cli_meta[$i]}" >&2
+        done
+
+        # Gateway header + search
+        printf "\\r\\033[K  \\033[2m--- Vercel AI Gateway ---\\033[0m\\n" >&2
+
+        if [ "$gw_loaded" = "1" ]; then
+            printf "\\r\\033[K    Search: \\033[36m%s\\033[0m\\033[2m|\\033[0m  \\033[2m(%d of %d)\\033[0m\\n" "$gw_search" "${#gw_filtered[@]}" "$gw_count" >&2
+
+            # Clamp gw_cursor
+            local fcount=${#gw_filtered[@]}
+            [ "$gw_cursor" -ge "$fcount" ] && gw_cursor=$(( fcount > 0 ? fcount - 1 : 0 ))
+            [ "$gw_cursor" -lt 0 ] && gw_cursor=0
+
+            # Scroll window
+            local vstart=0
+            if [ "$gw_cursor" -ge "$MAX_GW_VISIBLE" ]; then
+                vstart=$(( gw_cursor - MAX_GW_VISIBLE + 1 ))
+            fi
+            local vend=$(( vstart + MAX_GW_VISIBLE ))
+            [ "$vend" -gt "$fcount" ] && vend=$fcount
+
+            local rendered=0
+            for (( vi = vstart; vi < vend; vi++ )); do
+                local ri=${gw_filtered[$vi]}
+                local marker="  "
+                [ "$zone" = "gw" ] && [ "$vi" -eq "$gw_cursor" ] && marker="> "
+                local check="[ ]"
+                [ "${gw_selected[$ri]}" = "1" ] && check="[x]"
+                printf "\\r\\033[K  %s%s %s\\n" "$marker" "$check" "${gw_ids[$ri]}" >&2
+                rendered=$(( rendered + 1 ))
+            done
+
+            # Pad to fixed height
+            while [ "$rendered" -lt "$MAX_GW_VISIBLE" ]; do
+                printf "\\r\\033[K\\n" >&2
+                rendered=$(( rendered + 1 ))
+            done
+
+            # Scroll indicator
+            if [ "$fcount" -gt "$MAX_GW_VISIBLE" ]; then
+                printf "\\r\\033[K    \\033[2m(%d-%d of %d · ↑↓ to scroll)\\033[0m\\n" "$(( vstart + 1 ))" "$vend" "$fcount" >&2
             else
-                printf "\\r\\033[K  %s%s %s\\n" "$marker" "$check" "${item_labels[$i]}" >&2
+                printf "\\r\\033[K\\n" >&2
             fi
-        done
+        elif [ -n "$gw_error" ]; then
+            printf "\\r\\033[K    \\033[31m%s\\033[0m\\n" "$gw_error" >&2
+            for (( i = 0; i < MAX_GW_VISIBLE; i++ )); do printf "\\r\\033[K\\n" >&2; done
+            printf "\\r\\033[K\\n" >&2
+        else
+            printf "\\r\\033[K    \\033[2mNo API key configured. Select CLI agents or set up a key with 'moxie init'.\\033[0m\\n" >&2
+            for (( i = 0; i < MAX_GW_VISIBLE; i++ )); do printf "\\r\\033[K\\n" >&2; done
+            printf "\\r\\033[K\\n" >&2
+        fi
 
+        # Separator + submit
         printf "\\r\\033[K  %s\\n" "$sep" >&2
 
         local submit_marker="  "
-        [ "$cursor" -eq "$count" ] && submit_marker="> "
+        [ "$zone" = "submit" ] && submit_marker="> "
         if [ "$sel_count" -ge 2 ]; then
             printf "\\r\\033[K  %s%s\\n" "$submit_marker" "Submit ($sel_count selected)" >&2
         else
             printf "\\r\\033[K  %s\\033[2m%s\\033[0m\\n" "$submit_marker" "Submit (need at least 2)" >&2
         fi
 
-        printf "\\r\\033[K\\n\\033[K  \\033[2m↑↓ navigate · space toggle · enter submit/search\\033[0m" >&2
+        printf "\\r\\033[K\\n\\033[K  \\033[2m↑↓ navigate · space toggle · type to search · enter submit\\033[0m" >&2
     }
 
-    printf "Select agents (at least 2). Search gateway models to add more:\\n\\n" >&2
+    printf "Select agents (at least 2):\\n\\n" >&2
     printf "\\033[?25l" >&2
-    _agent_render
+    _sa_render
 
     local old_stty
     old_stty=$(stty -g < /dev/tty 2>/dev/null)
@@ -350,361 +428,130 @@ _select_agents() {
             dir=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || true
             if [ "$bracket" = "[" ]; then
                 case "$dir" in
-                    A)  # Up: skip separators
-                        local new_cursor=$((cursor - 1))
-                        while [ "$new_cursor" -ge 0 ] && [ "${item_types[$new_cursor]}" = "separator" ]; do
-                            new_cursor=$((new_cursor - 1))
-                        done
-                        [ "$new_cursor" -ge 0 ] && cursor=$new_cursor
+                    A)  # Up
+                        if [ "$zone" = "submit" ]; then
+                            if [ "$gw_loaded" = "1" ] && [ ${#gw_filtered[@]} -gt 0 ]; then
+                                zone="gw"
+                                gw_cursor=$(( ${#gw_filtered[@]} - 1 ))
+                            elif [ "$cli_count" -gt 0 ]; then
+                                zone="cli"
+                                cli_cursor=$(( cli_count - 1 ))
+                            fi
+                        elif [ "$zone" = "gw" ]; then
+                            if [ "$gw_cursor" -gt 0 ]; then
+                                gw_cursor=$(( gw_cursor - 1 ))
+                            elif [ "$cli_count" -gt 0 ]; then
+                                zone="cli"
+                                cli_cursor=$(( cli_count - 1 ))
+                            fi
+                        elif [ "$zone" = "cli" ]; then
+                            [ "$cli_cursor" -gt 0 ] && cli_cursor=$(( cli_cursor - 1 ))
+                        fi
                         ;;
-                    B)  # Down: skip separators
-                        local new_cursor=$((cursor + 1))
-                        while [ "$new_cursor" -lt "$count" ] && [ "${item_types[$new_cursor]}" = "separator" ]; do
-                            new_cursor=$((new_cursor + 1))
-                        done
-                        [ "$new_cursor" -le "$count" ] && cursor=$new_cursor
+                    B)  # Down
+                        if [ "$zone" = "cli" ]; then
+                            if [ "$cli_cursor" -lt $(( cli_count - 1 )) ]; then
+                                cli_cursor=$(( cli_cursor + 1 ))
+                            elif [ "$gw_loaded" = "1" ] && [ ${#gw_filtered[@]} -gt 0 ]; then
+                                zone="gw"
+                                gw_cursor=0
+                            else
+                                zone="submit"
+                            fi
+                        elif [ "$zone" = "gw" ]; then
+                            if [ "$gw_cursor" -lt $(( ${#gw_filtered[@]} - 1 )) ]; then
+                                gw_cursor=$(( gw_cursor + 1 ))
+                            else
+                                zone="submit"
+                            fi
+                        fi
                         ;;
                 esac
             fi
         elif [ "$key" = " " ]; then
-            if [ "$cursor" -lt "$count" ] && [ "${item_types[$cursor]}" != "separator" ] && [ "${item_types[$cursor]}" != "custom_add" ]; then
-                [ "${selected[$cursor]}" = "0" ] && selected[$cursor]=1 || selected[$cursor]=0
+            # Toggle selection
+            if [ "$zone" = "cli" ]; then
+                [ "${cli_selected[$cli_cursor]}" = "0" ] && cli_selected[$cli_cursor]=1 || cli_selected[$cli_cursor]=0
+            elif [ "$zone" = "gw" ] && [ ${#gw_filtered[@]} -gt 0 ]; then
+                local ri=${gw_filtered[$gw_cursor]}
+                [ "${gw_selected[$ri]}" = "0" ] && gw_selected[$ri]=1 || gw_selected[$ri]=0
             fi
         elif [ "$key" = "" ]; then
-            if [ "$cursor" -eq "$count" ]; then
-                # Submit
+            # Enter — submit if on submit row, else toggle
+            if [ "$zone" = "submit" ]; then
                 local sel_count=0
-                for (( i = 0; i < count; i++ )); do
-                    [ "${selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
-                done
-                [ "$sel_count" -ge 2 ] && break
-            elif [ "${item_types[$cursor]}" = "custom_add" ]; then
-                # Live search picker — fetch models from gateway, filter interactively
-                stty "$old_stty" < /dev/tty 2>/dev/null
-                printf "\\033[?25h" >&2
-
-                # Ensure we have an API key
-                local _gw_key=""
-                if gateway_has_key "vercel-ai-gateway"; then
-                    _gw_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || true
-                fi
-                if [ -z "$_gw_key" ]; then
-                    printf "\\n  Gateway API key needed to search models.\\n\\n" >&2
-                    gateway_store_key "vercel-ai-gateway" || {
-                        printf "  \\033[31mFailed to store key. Skipping search.\\033[0m\\n" >&2
-                        sleep 1
-                        stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-                        printf "\\033[?25l" >&2
-                        printf "\\033[%dA" "$jump_back" >&2
-                        _agent_render
-                        continue
-                    }
-                    _gw_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || true
-                fi
-
-                # Fetch model list
-                printf "\\n  Fetching models from AI Gateway..." >&2
-                local _models_json=""
-                _models_json=$(GATEWAY_API_KEY="$_gw_key" node "$MOXIE_LIB/gateway-models.mjs" "https://ai-gateway.vercel.sh" "" 2>/dev/null) || true
-                printf "\\r\\033[K" >&2
-
-                if [ -z "$_models_json" ]; then
-                    printf "  \\033[31mFailed to fetch models. Check your API key or network.\\033[0m\\n" >&2
-                    sleep 2
-                    stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-                    printf "\\033[?25l" >&2
-                    printf "\\033[%dA" "$((jump_back + 2))" >&2
-                    _agent_render
-                    continue
-                fi
-
-                # Parse into arrays using python3
-                local _all_model_ids=()
-                local _all_model_labels=()
-                eval "$(python3 -c "
-import json, sys, shlex
-data = json.loads(sys.stdin.read())
-models = data.get('models', [])
-ids = []
-labels = []
-for m in models:
-    mid = m['id']
-    ids.append(mid)
-    labels.append(m.get('name', mid))
-# Output as bash array assignments
-print('_all_model_ids=(' + ' '.join(shlex.quote(x) for x in ids) + ')')
-print('_all_model_labels=(' + ' '.join(shlex.quote(x) for x in labels) + ')')
-" <<< "$_models_json" 2>/dev/null)"
-
-                if [ ${#_all_model_ids[@]} -eq 0 ]; then
-                    printf "  \\033[31mNo models returned from gateway.\\033[0m\\n" >&2
-                    sleep 1
-                    stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-                    printf "\\033[?25l" >&2
-                    printf "\\033[%dA" "$((jump_back + 2))" >&2
-                    _agent_render
-                    continue
-                fi
-
-                # Build set of already-selected model IDs
-                local _existing_ids=""
-                for _eid in "${custom_gateway_models[@]}"; do
-                    _existing_ids="${_existing_ids}|${_eid}"
+                for (( i = 0; i < cli_count; i++ )); do
+                    [ "${cli_selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
                 done
-
-                # Interactive search sub-TUI
-                local _search=""
-                local _scursor=0
-                local _sselected=()
-                for (( _si = 0; _si < ${#_all_model_ids[@]}; _si++ )); do
-                    _sselected+=(0)
+                for (( i = 0; i < gw_count; i++ )); do
+                    [ "${gw_selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
                 done
-
-                local _max_visible=15
-
-                _search_render() {
-                    # Build filtered index list
-                    local _filtered=()
-                    local _lc_search
-                    _lc_search=$(echo "$_search" | tr '[:upper:]' '[:lower:]')
-                    for (( _si = 0; _si < ${#_all_model_ids[@]}; _si++ )); do
-                        if [ -z "$_search" ]; then
-                            _filtered+=("$_si")
-                        else
-                            local _lc_id
-                            _lc_id=$(echo "${_all_model_ids[$_si]}" | tr '[:upper:]' '[:lower:]')
-                            if [[ "$_lc_id" == *"$_lc_search"* ]]; then
-                                _filtered+=("$_si")
-                            fi
-                        fi
-                    done
-
-                    local _fcount=${#_filtered[@]}
-
-                    # Clamp cursor
-                    [ "$_scursor" -ge "$_fcount" ] && _scursor=$(( _fcount > 0 ? _fcount - 1 : 0 ))
-                    [ "$_scursor" -lt 0 ] && _scursor=0
-
-                    # Visible window
-                    local _vstart=0
-                    if [ "$_scursor" -ge "$_max_visible" ]; then
-                        _vstart=$(( _scursor - _max_visible + 1 ))
-                    fi
-                    local _vend=$(( _vstart + _max_visible ))
-                    [ "$_vend" -gt "$_fcount" ] && _vend=$_fcount
-
-                    # Count selected
-                    local _sel_count=0
-                    for (( _si = 0; _si < ${#_sselected[@]}; _si++ )); do
-                        [ "${_sselected[$_si]}" = "1" ] && _sel_count=$(( _sel_count + 1 ))
-                    done
-
-                    # Render
-                    printf "\\r\\033[K  \\033[1mSearch gateway models\\033[0m (%d available, %d selected)\\n" "$_fcount" "$_sel_count" >&2
-                    printf "\\r\\033[K  Search: \\033[36m%s\\033[0m\\033[2m|\\033[0m\\n\\n" "$_search" >&2
-
-                    local _rendered=0
-                    for (( _vi = _vstart; _vi < _vend; _vi++ )); do
-                        local _ri=${_filtered[$_vi]}
-                        local _mid="${_all_model_ids[$_ri]}"
-                        local _marker="  "
-                        [ "$_vi" -eq "$_scursor" ] && _marker="> "
-                        local _check="[ ]"
-                        [ "${_sselected[$_ri]}" = "1" ] && _check="[x]"
-                        local _exists_marker=""
-                        if [[ "$_existing_ids" == *"|${_mid}"* ]]; then
-                            _exists_marker=" \\033[2m(added)\\033[0m"
-                        fi
-                        printf "\\r\\033[K  %s%s %s%b\\n" "$_marker" "$_check" "$_mid" "$_exists_marker" >&2
-                        _rendered=$(( _rendered + 1 ))
-                    done
-
-                    # Pad remaining lines
-                    while [ "$_rendered" -lt "$_max_visible" ]; do
-                        printf "\\r\\033[K\\n" >&2
-                        _rendered=$(( _rendered + 1 ))
-                    done
-
-                    if [ "$_vstart" -gt 0 ] || [ "$_vend" -lt "$_fcount" ]; then
-                        printf "\\r\\033[K  \\033[2m(%d-%d of %d · scroll for more)\\033[0m\\n" "$(( _vstart + 1 ))" "$_vend" "$_fcount" >&2
-                    else
-                        printf "\\r\\033[K\\n" >&2
-                    fi
-
-                    printf "\\r\\033[K  \\033[2m↑↓ navigate · space select · enter confirm · esc cancel · type to filter\\033[0m" >&2
-                }
-
-                # Total lines rendered by _search_render: 3 header + _max_visible + 1 scroll + 1 hint = _max_visible + 5
-                local _search_lines=$(( _max_visible + 5 ))
-
-                printf "\\033[?25l" >&2
-                stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-
-                printf "\\n" >&2
-                _search_render
-
-                local _search_done=0
-                local _search_cancelled=0
-                while [ "$_search_done" = "0" ]; do
-                    local _skey
-                    _skey=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || break
-
-                    if [ "$_skey" = $'\033' ]; then
-                        local _sbracket _sdir
-                        _sbracket=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || true
-                        _sdir=$(dd bs=1 count=1 2>/dev/null < /dev/tty) || true
-                        if [ "$_sbracket" = "[" ]; then
-                            case "$_sdir" in
-                                A) _scursor=$(( _scursor - 1 )); [ "$_scursor" -lt 0 ] && _scursor=0 ;;
-                                B) _scursor=$(( _scursor + 1 )) ;;
-                            esac
-                        else
-                            # Bare escape — cancel
-                            _search_cancelled=1
-                            _search_done=1
-                        fi
-                    elif [ "$_skey" = " " ]; then
-                        # Toggle selection at cursor
-                        local _filtered_for_toggle=()
-                        local _lc_s2
-                        _lc_s2=$(echo "$_search" | tr '[:upper:]' '[:lower:]')
-                        for (( _si = 0; _si < ${#_all_model_ids[@]}; _si++ )); do
-                            if [ -z "$_search" ]; then
-                                _filtered_for_toggle+=("$_si")
-                            else
-                                local _lc2
-                                _lc2=$(echo "${_all_model_ids[$_si]}" | tr '[:upper:]' '[:lower:]')
-                                [[ "$_lc2" == *"$_lc_s2"* ]] && _filtered_for_toggle+=("$_si")
-                            fi
-                        done
-                        if [ "$_scursor" -lt "${#_filtered_for_toggle[@]}" ]; then
-                            local _tidx=${_filtered_for_toggle[$_scursor]}
-                            [ "${_sselected[$_tidx]}" = "0" ] && _sselected[$_tidx]=1 || _sselected[$_tidx]=0
-                        fi
-                    elif [ "$_skey" = "" ]; then
-                        # Confirm
-                        _search_done=1
-                    elif [ "$_skey" = $'\177' ] || [ "$_skey" = $'\010' ]; then
-                        # Backspace
-                        if [ -n "$_search" ]; then
-                            _search="${_search%?}"
-                            _scursor=0
-                        fi
-                    else
-                        # Printable character — append to search
-                        if [[ "$_skey" =~ [[:print:]] ]]; then
-                            _search="${_search}${_skey}"
-                            _scursor=0
-                        fi
-                    fi
-
-                    printf "\\033[%dA" "$_search_lines" >&2
-                    _search_render
-                done
-
-                # Clear the search sub-TUI
-                printf "\\033[%dA" "$_search_lines" >&2
-                for (( _ci = 0; _ci <= _search_lines; _ci++ )); do
-                    printf "\\r\\033[K\\n" >&2
-                done
-                printf "\\033[%dA" "$(( _search_lines + 1 ))" >&2
-
-                # Insert selected models into the main list
-                if [ "$_search_cancelled" = "0" ]; then
-                    for (( _si = 0; _si < ${#_sselected[@]}; _si++ )); do
-                        [ "${_sselected[$_si]}" != "1" ] && continue
-                        local _new_model="${_all_model_ids[$_si]}"
-                        local _new_label="${_all_model_labels[$_si]}"
-
-                        # Skip if already in list
-                        if [[ "$_existing_ids" == *"|${_new_model}"* ]]; then
-                            continue
-                        fi
-                        _existing_ids="${_existing_ids}|${_new_model}"
-
-                        # Derive slug for TOML key
-                        local _cprov="${_new_model%%/*}"
-                        local _cname="${_new_model#*/}"
-                        local _cslug
-                        _cslug=$(echo "${_cprov}-${_cname}" | tr '[:upper:]' '[:lower:]' | tr ' .' '-' | tr -cd 'a-z0-9-')
-                        _cslug="${_cslug}-gw"
-
-                        # Insert before the custom_add row
-                        local _ins=$cursor
-                        local new_labels=() new_meta=() new_types=() new_sources=() new_selected=()
-                        for (( _ii = 0; _ii < count; _ii++ )); do
-                            if [ "$_ii" -eq "$_ins" ]; then
-                                new_labels+=("$_new_label")
-                                new_meta+=("$_new_model")
-                                new_types+=("custom_gateway")
-                                new_sources+=("${#custom_gateway_names[@]}")
-                                new_selected+=(1)
-                            fi
-                            new_labels+=("${item_labels[$_ii]}")
-                            new_meta+=("${item_meta[$_ii]}")
-                            new_types+=("${item_types[$_ii]}")
-                            new_sources+=("${item_sources[$_ii]}")
-                            new_selected+=("${selected[$_ii]}")
-                        done
-
-                        item_labels=("${new_labels[@]}")
-                        item_meta=("${new_meta[@]}")
-                        item_types=("${new_types[@]}")
-                        item_sources=("${new_sources[@]}")
-                        selected=("${new_selected[@]}")
-
-                        custom_gateway_names+=("$_cslug")
-                        custom_gateway_models+=("$_new_model")
-
-                        count=${#item_labels[@]}
-                        cursor=$(( cursor + 1 ))
-
-                        local _ll=${#_new_label}
-                        [ "$_ll" -gt "$max_label_len" ] && max_label_len=$_ll
-                    done
-
-                    jump_back=$(( count + 3 ))
-                    sep=""
-                    for (( _si = 0; _si < max_label_len + 40; _si++ )); do sep="${sep}-"; done
+                [ "$sel_count" -ge 2 ] && break
+            elif [ "$zone" = "cli" ]; then
+                [ "${cli_selected[$cli_cursor]}" = "0" ] && cli_selected[$cli_cursor]=1 || cli_selected[$cli_cursor]=0
+            elif [ "$zone" = "gw" ] && [ ${#gw_filtered[@]} -gt 0 ]; then
+                local ri=${gw_filtered[$gw_cursor]}
+                [ "${gw_selected[$ri]}" = "0" ] && gw_selected[$ri]=1 || gw_selected[$ri]=0
+            fi
+        elif [ "$key" = $'\177' ] || [ "$key" = $'\010' ]; then
+            # Backspace — remove from search
+            if [ -n "$gw_search" ]; then
+                gw_search="${gw_search%?}"
+                gw_cursor=0
+                _build_gw_filtered
+                # Jump to gateway zone if we have results
+                if [ ${#gw_filtered[@]} -gt 0 ]; then
+                    zone="gw"
                 fi
-
-                stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-                printf "\\033[?25l" >&2
-            elif [ "${item_types[$cursor]}" != "separator" ]; then
-                [ "${selected[$cursor]}" = "0" ] && selected[$cursor]=1 || selected[$cursor]=0
             fi
-        elif [ "$key" = "q" ]; then
-            for (( i = 0; i < count; i++ )); do selected[$i]=0; done
+        elif [ "$key" = "q" ] && [ -z "$gw_search" ]; then
+            # Quit only when search is empty (otherwise 'q' is a search char)
+            for (( i = 0; i < cli_count; i++ )); do cli_selected[$i]=0; done
+            for (( i = 0; i < gw_count; i++ )); do gw_selected[$i]=0; done
             break
+        elif [[ "$key" =~ [[:print:]] ]] && [ "$gw_loaded" = "1" ]; then
+            # Printable char — append to gateway search
+            gw_search="${gw_search}${key}"
+            gw_cursor=0
+            _build_gw_filtered
+            # Auto-switch to gateway zone
+            if [ ${#gw_filtered[@]} -gt 0 ]; then
+                zone="gw"
+            fi
         fi
 
-        printf "\\033[%dA" "$jump_back" >&2
-        _agent_render
+        printf "\\033[%dA" "$total_lines" >&2
+        _sa_render
     done
 
     _agent_cleanup
     trap - INT TERM
     printf "\\n\\n" >&2
 
-    # Export custom models for config writer
-    CUSTOM_GATEWAY_NAMES=("${custom_gateway_names[@]}")
-    CUSTOM_GATEWAY_MODELS=("${custom_gateway_models[@]}")
+    # ---- Collect selections ----
+    for (( i = 0; i < cli_count; i++ )); do
+        [ "${cli_selected[$i]}" = "1" ] && SELECTED_AGENT_INDICES+=("${cli_sources[$i]}")
+    done
 
-    # Collect selections by type
+    # Build custom gateway selections
+    CUSTOM_GATEWAY_NAMES=()
+    CUSTOM_GATEWAY_MODELS=()
+    SELECTED_CUSTOM_GATEWAY_INDICES=()
     local has_gateway=0
-    for (( i = 0; i < count; i++ )); do
-        [ "${selected[$i]}" != "1" ] && continue
-        case "${item_types[$i]}" in
-            cli) SELECTED_AGENT_INDICES+=("${item_sources[$i]}") ;;
-            gateway)
-                SELECTED_GATEWAY_INDICES+=("${item_sources[$i]}")
-                has_gateway=1
-                ;;
-            custom_gateway)
-                SELECTED_CUSTOM_GATEWAY_INDICES+=("${item_sources[$i]}")
-                has_gateway=1
-                ;;
-        esac
+    local gw_order=0
+    for (( i = 0; i < gw_count; i++ )); do
+        [ "${gw_selected[$i]}" != "1" ] && continue
+        has_gateway=1
+        local mid="${gw_ids[$i]}"
+        local prov="${mid%%/*}"
+        local mname="${mid#*/}"
+        local slug
+        slug=$(echo "${prov}-${mname}" | tr '[:upper:]' '[:lower:]' | tr ' .' '-' | tr -cd 'a-z0-9-')
+        slug="${slug}-gw"
+        CUSTOM_GATEWAY_NAMES+=("$slug")
+        CUSTOM_GATEWAY_MODELS+=("$mid")
+        SELECTED_CUSTOM_GATEWAY_INDICES+=("$gw_order")
+        gw_order=$(( gw_order + 1 ))
     done
 
     # If gateway models selected, ensure API key is stored
@@ -712,8 +559,9 @@ print('_all_model_labels=(' + ' '.join(shlex.quote(x) for x in labels) + ')')
         printf "Gateway models selected. Setting up API key...\\n\\n" >&2
         gateway_store_key "vercel-ai-gateway" || {
             echo "ERROR: Failed to store gateway key. Gateway models will not work." >&2
-            SELECTED_GATEWAY_INDICES=()
             SELECTED_CUSTOM_GATEWAY_INDICES=()
+            CUSTOM_GATEWAY_NAMES=()
+            CUSTOM_GATEWAY_MODELS=()
         }
     fi
 }
@@ -896,11 +744,15 @@ cmd_init() {
         # Non-interactive: auto-select all available CLI agents
         SELECTED_AGENT_INDICES=("${AVAILABLE_AGENT_INDICES[@]}")
         SELECTED_GATEWAY_INDICES=()
+        SELECTED_CUSTOM_GATEWAY_INDICES=()
+        CUSTOM_GATEWAY_NAMES=()
+        CUSTOM_GATEWAY_MODELS=()
     fi
 
     local _cli_count=${#SELECTED_AGENT_INDICES[@]}
     local _gw_count=${#SELECTED_GATEWAY_INDICES[@]}
-    local total_selected=$(( _cli_count + _gw_count ))
+    local _cgw_count=${#SELECTED_CUSTOM_GATEWAY_INDICES[@]}
+    local total_selected=$(( _cli_count + _gw_count + _cgw_count ))
     if [ "$total_selected" -lt 2 ]; then
         echo "ERROR: At least 2 agents must be selected." >&2
         echo "moxie requires at least 2 agents for cross-model verification." >&2
@@ -931,6 +783,9 @@ cmd_init() {
     for idx in "${SELECTED_GATEWAY_INDICES[@]}"; do
         echo "    - ${KNOWN_GATEWAY_LABELS[$idx]} (${KNOWN_GATEWAY_MODELS[$idx]}, AI Gateway)"
     done
+    for idx in "${SELECTED_CUSTOM_GATEWAY_INDICES[@]}"; do
+        echo "    - ${CUSTOM_GATEWAY_MODELS[$idx]} (AI Gateway)"
+    done
     echo ""
 
     # Create directory structure

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.4.9",
+  "version": "0.5.0",
   "description": "Run multiple AI coding agents through spec-driven phases with quorum convergence. Supports CLI agents (Claude, Codex, Qwen, Aider, Goose, Amp, Cline, Roo) and Vercel AI Gateway models.",
   "bin": {
     "moxie": "bin/moxie"