@zachjxyz/moxie 0.4.6 → 0.5.0

package/bin/moxie

@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.4.6"
+MOXIE_VERSION="0.5.0"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do
@@ -66,7 +66,7 @@ Commands:
   cost     Token usage breakdown by phase and agent
   logs     Tail or view logs for a phase
   models   List available AI Gateway models
-  agents   List configured agents
+  agents   List configured agents (agents swap to change models)
   doctor   Check agent CLIs, auth, and project health
   version  Print version
   help     Show this help
@@ -85,6 +85,7 @@ Usage:
   moxie cost                         Show token usage summary
   moxie models                       List all AI Gateway models
   moxie models -f anthropic          Filter models by provider/name
+  moxie agents swap                  Add/remove/swap gateway models
   moxie doctor                       Check agents and dependencies
 
 Pipeline: rfc → audit → fix → plan → build

package/lib/agents.sh

@@ -537,9 +537,121 @@ dispatch_logged() {
     _record_turn_health "$agent" "$logfile" || return $?
 }
 
+# ---- Rewrite agents section of config.toml ----
+# Preserves [spec], [gateway], [settings] etc. Replaces all [agents.*] blocks.
+
+_rewrite_config_agents() {
+    # Reads from caller's arrays: cli_agents, cli_cmds, new_gw_names, new_gw_models
+    # Use python3 to surgically rewrite just the agents section
+    python3 -c "
+import sys, re
+
+config_path = sys.argv[1]
+cli_names = sys.argv[2].split('|') if sys.argv[2] else []
+cli_cmds = sys.argv[3].split('|') if sys.argv[3] else []
+gw_names = sys.argv[4].split('|') if sys.argv[4] else []
+gw_models = sys.argv[5].split('|') if sys.argv[5] else []
+
+with open(config_path, 'r') as f:
+    content = f.read()
+
+# Remove all [agents.*] blocks (including their content up to the next section)
+cleaned = re.sub(r'\[agents\.[^\]]+\]\n(?:[^\[]*\n)*', '', content)
+
+# Remove old agent comment headers (may span 1-3 lines)
+cleaned = re.sub(r'# Agent definitions[^\n]*\n(?:#[^\n]*\n)*', '', cleaned)
+
+# Collapse excessive blank lines
+cleaned = re.sub(r'\n{3,}', '\n\n', cleaned)
+
+# Ensure gateway section exists if we have gateway models
+if gw_names and '[gateway]' not in cleaned:
+    import datetime, os
+    run_id = f'run-{datetime.datetime.now().strftime(\"%Y%m%d-%H%M%S\")}-{os.getpid()}'
+    gw_section = f'''[gateway]
+endpoint = \"https://ai-gateway.vercel.sh\"
+run_id = \"{run_id}\"
+
+'''
+    # Insert before [settings] or at end
+    if '[settings]' in cleaned:
+        cleaned = cleaned.replace('[settings]', gw_section + '[settings]')
+    else:
+        cleaned = cleaned.rstrip() + '\n\n' + gw_section
+
+# Build new agents section
+agents_lines = []
+agents_lines.append('# Agent definitions — order is the default rotation sequence.')
+agents_lines.append('')
+
+order = 1
+for name, cmd in zip(cli_names, cli_cmds):
+    if not name:
+        continue
+    agents_lines.append(f'[agents.{name}]')
+    agents_lines.append(f\"command = '{cmd}'\")
+    agents_lines.append(f'order = {order}')
+    agents_lines.append('')
+    order += 1
+
+for name, model in zip(gw_names, gw_models):
+    if not name:
+        continue
+    agents_lines.append(f'[agents.{name}]')
+    agents_lines.append('type = \"gateway\"')
+    agents_lines.append(f'model = \"{model}\"')
+    agents_lines.append(f'order = {order}')
+    agents_lines.append('')
+    order += 1
+
+agents_block = '\n'.join(agents_lines)
+
+# Insert agents block before [settings] or at end
+if '[settings]' in cleaned:
+    cleaned = cleaned.replace('[settings]', agents_block + '\n[settings]')
+else:
+    cleaned = cleaned.rstrip() + '\n\n' + agents_block
+
+with open(config_path, 'w') as f:
+    f.write(cleaned)
+" "$MOXIE_CONFIG" \
+    "$(IFS='|'; echo "${cli_agents[*]}")" \
+    "$(IFS='|'; echo "${cli_cmds[*]}")" \
+    "$(IFS='|'; echo "${new_gw_names[*]}")" \
+    "$(IFS='|'; echo "${new_gw_models[*]}")"
+}
+
 # ---- List agents ----
 
 cmd_agents() {
+    local subcmd="${1:-list}"
+    shift 2>/dev/null || true
+
+    case "$subcmd" in
+        list|ls)  _cmd_agents_list "$@" ;;
+        swap)     _cmd_agents_swap "$@" ;;
+        help|--help|-h)
+            cat <<'EOF'
+Usage: moxie agents [subcommand]
+
+Subcommands:
+  list     List configured agents (default)
+  swap     Add, remove, or replace gateway models
+
+Examples:
+  moxie agents              Show current agent lineup
+  moxie agents swap         Interactively swap gateway models
+EOF
+            ;;
+        *)
+            echo "Unknown subcommand: $subcmd" >&2
+            echo "Run 'moxie agents help' for usage." >&2
+            return 1
+            ;;
+    esac
+}
+
+_cmd_agents_list() {
     require_moxie_project
     load_agents
 
@@ -552,6 +664,297 @@ cmd_agents() {
         echo "  $((i + 1)). $name"
         echo "     $cmd"
     done
+    echo ""
+    echo "Swap gateway models anytime: moxie agents swap"
+}
+
+# ---- Swap gateway models interactively ----
+
+_cmd_agents_swap() {
+    require_moxie_project
+    load_agents
+
+    if ! command -v node &>/dev/null; then
+        echo "ERROR: node not found on PATH. Required for gateway API calls." >&2
+        return 1
+    fi
+
+    # Collect current gateway models from config
+    local current_gw_names=()
+    local current_gw_models=()
+    local cli_agents=()
+    local cli_cmds=()
+    for i in "${!AGENT_NAMES[@]}"; do
+        local name="${AGENT_NAMES[$i]}"
+        if _is_gateway_agent "$name"; then
+            local model
+            model=$(_agent_model "$name")
+            current_gw_names+=("$name")
+            current_gw_models+=("$model")
+        else
+            local cmd
+            cmd=$(_agent_cmd "$name")
+            cli_agents+=("$name")
+            cli_cmds+=("$cmd")
+        fi
+    done
+
+    echo "Current gateway models:"
+    if [ ${#current_gw_names[@]} -eq 0 ]; then
+        echo "  (none)"
+    else
+        for i in "${!current_gw_names[@]}"; do
+            echo "  ${current_gw_names[$i]} — ${current_gw_models[$i]}"
+        done
+    fi
+    echo ""
+
+    # Ensure we have an API key
+    local api_key=""
+    if gateway_has_key "vercel-ai-gateway"; then
+        api_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || true
+    fi
+    if [ -z "$api_key" ]; then
+        printf "Gateway API key needed to search models.\\n\\n" >&2
+        gateway_store_key "vercel-ai-gateway" || {
+            echo "ERROR: Failed to store key." >&2
+            return 1
+        }
+        api_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || {
+            echo "ERROR: Failed to retrieve key." >&2
+            return 1
+        }
+    fi
+
+    local endpoint="https://ai-gateway.vercel.sh"
+    if [ -f "$MOXIE_CONFIG" ]; then
+        local cfg_ep
+        cfg_ep=$(toml_get "$MOXIE_CONFIG" "gateway.endpoint" "") || true
+        [ -n "$cfg_ep" ] && endpoint="$cfg_ep"
+    fi
+
+    # Fetch model catalog
+    printf "Fetching models from AI Gateway..." >&2
+    local models_json=""
+    models_json=$(GATEWAY_API_KEY="$api_key" node "$MOXIE_LIB/gateway-models.mjs" "$endpoint" "" 2>/dev/null) || true
+    printf "\\r\\033[K" >&2
+
+    if [ -z "$models_json" ]; then
+        echo "ERROR: Failed to fetch models. Check your API key or network." >&2
+        return 1
+    fi
+
+    # Parse into arrays
+    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 = [m['id'] for m in models]
+labels = [m.get('name', m['id']) for m in models]
+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
+        echo "ERROR: No models returned from gateway." >&2
+        return 1
+    fi
+
+    # Pre-select currently configured models
+    local sselected=()
+    for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
+        local _matched=0
+        for cm in "${current_gw_models[@]}"; do
+            if [ "${all_model_ids[$i]}" = "$cm" ]; then
+                _matched=1
+                break
+            fi
+        done
+        sselected+=("$_matched")
+    done
+
+    # Interactive search TUI (same as init picker)
+    local search=""
+    local scursor=0
+    local max_visible=15
+
+    _swap_render() {
+        local filtered=()
+        local lc_search
+        lc_search=$(echo "$search" | tr '[:upper:]' '[:lower:]')
+        for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
+            if [ -z "$search" ]; then
+                filtered+=("$i")
+            else
+                local lc_id
+                lc_id=$(echo "${all_model_ids[$i]}" | tr '[:upper:]' '[:lower:]')
+                [[ "$lc_id" == *"$lc_search"* ]] && filtered+=("$i")
+            fi
+        done
+
+        local fcount=${#filtered[@]}
+        [ "$scursor" -ge "$fcount" ] && scursor=$(( fcount > 0 ? fcount - 1 : 0 ))
+        [ "$scursor" -lt 0 ] && scursor=0
+
+        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
+
+        local sel_count=0
+        for (( i = 0; i < ${#sselected[@]}; i++ )); do
+            [ "${sselected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
+        done
+
+        printf "\\r\\033[K  \\033[1mSwap 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]"
+            printf "\\r\\033[K  %s%s %s\\n" "$marker" "$check" "$mid" >&2
+            rendered=$(( rendered + 1 ))
+        done
+
+        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
+    }
+
+    local swap_lines=$(( max_visible + 5 ))
+
+    printf "\\033[?25l" >&2
+    local old_stty
+    old_stty=$(stty -g < /dev/tty 2>/dev/null)
+    stty -echo -icanon min 1 < /dev/tty 2>/dev/null
+
+    _swap_cleanup() {
+        printf "\\033[?25h" >&2
+        stty "$old_stty" < /dev/tty 2>/dev/null
+    }
+    trap '_swap_cleanup' INT TERM
+
+    _swap_render
+
+    local swap_done=0
+    local swap_cancelled=0
+    while [ "$swap_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
+                swap_cancelled=1
+                swap_done=1
+            fi
+        elif [ "$skey" = " " ]; then
+            local ft=()
+            local lcs
+            lcs=$(echo "$search" | tr '[:upper:]' '[:lower:]')
+            for (( i = 0; i < ${#all_model_ids[@]}; i++ )); do
+                if [ -z "$search" ]; then
+                    ft+=("$i")
+                else
+                    local lci
+                    lci=$(echo "${all_model_ids[$i]}" | tr '[:upper:]' '[:lower:]')
+                    [[ "$lci" == *"$lcs"* ]] && ft+=("$i")
+                fi
+            done
+            if [ "$scursor" -lt "${#ft[@]}" ]; then
+                local tidx=${ft[$scursor]}
+                [ "${sselected[$tidx]}" = "0" ] && sselected[$tidx]=1 || sselected[$tidx]=0
+            fi
+        elif [ "$skey" = "" ]; then
+            swap_done=1
+        elif [ "$skey" = $'\177' ] || [ "$skey" = $'\010' ]; then
+            if [ -n "$search" ]; then
+                search="${search%?}"
+                scursor=0
+            fi
+        else
+            if [[ "$skey" =~ [[:print:]] ]]; then
+                search="${search}${skey}"
+                scursor=0
+            fi
+        fi
+
+        printf "\\033[%dA" "$swap_lines" >&2
+        _swap_render
+    done
+
+    _swap_cleanup
+    trap - INT TERM
+    printf "\\n\\n" >&2
+
+    if [ "$swap_cancelled" = "1" ]; then
+        echo "Cancelled — no changes made."
+        return 0
+    fi
+
+    # Collect selected models
+    local new_gw_names=()
+    local new_gw_models=()
+    for (( i = 0; i < ${#sselected[@]}; i++ )); do
+        [ "${sselected[$i]}" != "1" ] && continue
+        local mid="${all_model_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"
+        new_gw_names+=("$slug")
+        new_gw_models+=("$mid")
+    done
+
+    local total_agents=$(( ${#cli_agents[@]} + ${#new_gw_names[@]} ))
+    if [ "$total_agents" -lt 2 ]; then
+        echo "ERROR: Need at least 2 agents total (${#cli_agents[@]} CLI + ${#new_gw_names[@]} gateway = $total_agents)." >&2
+        echo "Select more gateway models or install additional CLI agents." >&2
+        return 1
+    fi
+
+    # Rewrite config.toml — preserve everything before [agents.*], rewrite agents
+    _rewrite_config_agents
+
+    echo "Updated .moxie/config.toml:"
+    echo ""
+    local order=1
+    for i in "${!cli_agents[@]}"; do
+        echo "  $order. ${cli_agents[$i]} (CLI)"
+        order=$((order + 1))
+    done
+    for i in "${!new_gw_names[@]}"; do
+        echo "  $order. ${new_gw_names[$i]} — ${new_gw_models[$i]} (gateway)"
+        order=$((order + 1))
+    done
+    echo ""
+    echo "Total: $total_agents agents. Run 'moxie run' or 'moxie start' to go."
 }
 
 # ---- List available gateway models ----
@@ -631,9 +1034,6 @@ for m in models:
     p = m['provider']
     providers.setdefault(p, []).append(m)
 
-# Hardcoded models for marking
-hardcoded = set('''$(printf '%s\n' "${KNOWN_GATEWAY_MODELS[@]}")'''.strip().split('\n'))
-
 total = len(models)
 filter_note = ' matching \"$filter\"' if '$filter' else ''
 print(f'Available gateway models ({total}{filter_note}):')
@@ -643,13 +1043,10 @@ for provider in sorted(providers.keys()):
     pmodels = providers[provider]
     print(f'  \033[1m{provider}\033[0m ({len(pmodels)} models)')
     for m in pmodels:
-        marker = ' \033[32m●\033[0m' if m['id'] in hardcoded else '  '
-        print(f'   {marker} {m[\"id\"]}')
+        print(f'    {m[\"id\"]}')
     print()
 
-print('\033[32m●\033[0m = currently in moxie defaults')
-print()
-print('To use any model, add it to .moxie/config.toml:')
+print('Use any model with moxie init (search picker) or add to .moxie/config.toml:')
 print('  [agents.my-model]')
 print('  type = \"gateway\"')
 print('  model = \"provider/model-name\"')

package/lib/phases.sh

@@ -211,137 +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")
-        local len=${#label}
-        [ "$len" -gt "$max_label_len" ] && max_label_len=$len
-    done
-
-    # Separator
-    item_labels+=("--- Vercel AI Gateway ---")
-    item_meta+=("")
-    item_types+=("separator")
-    item_sources+=("-1")
-
-    # Gateway models (always shown)
-    for idx in "${!KNOWN_GATEWAY_NAMES[@]}"; do
-        local label="${KNOWN_GATEWAY_LABELS[$idx]}"
-        item_labels+=("$label")
-        item_meta+=("${KNOWN_GATEWAY_MODELS[$idx]}")
-        item_types+=("gateway")
-        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
 
-    # Custom model entry point
-    item_labels+=("+ Add custom model...")
-    item_meta+=("type provider/model-name")
-    item_types+=("custom_add")
-    item_sources+=("-1")
-    local _custom_label="+ Add custom model..."
-    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/add · 'moxie models' to browse\\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). CLI agents pre-selected, gateway models available below:\\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)
@@ -362,134 +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 ))
+                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
                 [ "$sel_count" -ge 2 ] && break
-            elif [ "${item_types[$cursor]}" = "custom_add" ]; then
-                # Prompt for custom model string
-                printf "\\033[?25h" >&2
-                stty echo icanon < /dev/tty 2>/dev/null
-                printf "\\n\\r\\033[K  Model ID (provider/model-name): " >&2
-                local custom_model=""
-                read -r custom_model < /dev/tty
-                stty -echo -icanon min 1 < /dev/tty 2>/dev/null
-                printf "\\033[?25l" >&2
-
-                if [ -n "$custom_model" ] && [[ "$custom_model" == */* ]]; then
-                    # Derive a short name from the model ID: provider-modelbase
-                    local custom_provider="${custom_model%%/*}"
-                    local custom_name_part="${custom_model#*/}"
-                    local custom_slug="${custom_provider}-${custom_name_part}"
-                    # Sanitize slug for TOML key
-                    custom_slug=$(echo "$custom_slug" | tr '[:upper:]' '[:lower:]' | tr ' .' '-' | tr -cd 'a-z0-9-')
-                    custom_slug="${custom_slug}-gw"
-
-                    # Insert before the custom_add row (which is at current cursor)
-                    local insert_at=$cursor
-
-                    # Shift arrays to insert new item
-                    local new_labels=() new_meta=() new_types=() new_sources=() new_selected=()
-                    for (( i = 0; i < count; i++ )); do
-                        if [ "$i" -eq "$insert_at" ]; then
-                            new_labels+=("$custom_name_part")
-                            new_meta+=("$custom_model")
-                            new_types+=("custom_gateway")
-                            new_sources+=("${#custom_gateway_names[@]}")
-                            new_selected+=(1)
-                        fi
-                        new_labels+=("${item_labels[$i]}")
-                        new_meta+=("${item_meta[$i]}")
-                        new_types+=("${item_types[$i]}")
-                        new_sources+=("${item_sources[$i]}")
-                        new_selected+=("${selected[$i]}")
-                    done
-
-                    item_labels=("${new_labels[@]}")
-                    item_meta=("${new_meta[@]}")
-                    item_types=("${new_types[@]}")
-                    item_sources=("${new_sources[@]}")
-                    selected=("${new_selected[@]}")
-
-                    custom_gateway_names+=("$custom_slug")
-                    custom_gateway_models+=("$custom_model")
-
-                    count=${#item_labels[@]}
-                    jump_back=$(( count + 3 ))
-
-                    # Update max_label_len if needed
-                    local len=${#custom_name_part}
-                    [ "$len" -gt "$max_label_len" ] && max_label_len=$len
-                    sep=""
-                    for (( i = 0; i < max_label_len + 40; i++ )); do sep="${sep}-"; done
-                else
-                    # Invalid — erase the prompt line
-                    if [ -n "$custom_model" ]; then
-                        printf "\\r\\033[K  \\033[31mInvalid format. Use provider/model-name (e.g. anthropic/claude-sonnet-4-6)\\033[0m" >&2
-                        sleep 1
-                    fi
+            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
-                # Erase the prompt lines and re-render
-                printf "\\033[2A" >&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
@@ -497,8 +559,9 @@ _select_agents() {
         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
 }
@@ -681,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
@@ -716,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
@@ -782,13 +852,13 @@ SEED
 
     echo ""
     echo "Next steps:"
-    echo "  1. Run: moxie doctor   (verify dependencies and environment)"
-    echo "  2. Review .moxie/config.toml (agent commands, timeouts)"
+    echo "  1. Run: moxie doctor       (verify dependencies and environment)"
+    echo "  2. Run: moxie agents swap  (add or change gateway models anytime)"
     if [ ! -d "$MOXIE_DIR/context" ] || [ -z "$(ls -A "$MOXIE_DIR/context" 2>/dev/null)" ]; then
         echo "     Tip: add context docs to .moxie/context/ (roadmaps, PRDs, etc.)"
     fi
-    echo "  3. Run: moxie start    (background)"
-    echo "     Or:  moxie run      (foreground)"
+    echo "  3. Run: moxie start        (background)"
+    echo "     Or:  moxie run          (foreground)"
 }
 
 _init_ledger() {
@@ -1125,6 +1195,7 @@ _print_run_banner() {
     printf "║  Agents: %-51s║\n" "$(IFS=', '; echo "${AGENT_NAMES[*]}")"
     echo "║  Quorum: unanimous (all agents must sign off)               ║"
     echo "║  Rotation: randomized per phase                             ║"
+    echo "║  Swap models: moxie agents swap                             ║"
     echo "╚══════════════════════════════════════════════════════════════╝"
     echo ""
     echo "Started: $(date)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.4.6",
+  "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"