@zachjxyz/moxie 0.4.5 → 0.4.9

package/bin/moxie

@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.4.5"
+MOXIE_VERSION="0.4.9"
 # 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

@@ -246,29 +246,18 @@ _select_agents() {
         [ "$len" -gt "$max_label_len" ] && max_label_len=$len
     done
 
-    # Separator
+    # Separator + gateway search
     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")
-        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_labels+=("+ Search gateway models...")
+    item_meta+=("browse all available models")
     item_types+=("custom_add")
     item_sources+=("-1")
-    local len=${#item_labels[-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
@@ -335,10 +324,10 @@ _select_agents() {
             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 · enter submit/search\\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). Search gateway models to add more:\\n\\n" >&2
     printf "\\033[?25l" >&2
     _agent_render
 
@@ -390,70 +379,297 @@ _select_agents() {
                 done
                 [ "$sel_count" -ge 2 ] && break
             elif [ "${item_types[$cursor]}" = "custom_add" ]; then
-                # Prompt for custom model string
+                # Live search picker — fetch models from gateway, filter interactively
+                stty "$old_stty" < /dev/tty 2>/dev/null
                 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)
+                # 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}"
+                done
+
+                # Interactive search sub-TUI
+                local _search=""
+                local _scursor=0
+                local _sselected=()
+                for (( _si = 0; _si < ${#_all_model_ids[@]}; _si++ )); do
+                    _sselected+=(0)
+                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
-                        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[@]}")
+                    local _fcount=${#_filtered[@]}
 
-                    custom_gateway_names+=("$custom_slug")
-                    custom_gateway_models+=("$custom_model")
+                    # Clamp cursor
+                    [ "$_scursor" -ge "$_fcount" ] && _scursor=$(( _fcount > 0 ? _fcount - 1 : 0 ))
+                    [ "$_scursor" -lt 0 ] && _scursor=0
 
-                    count=${#item_labels[@]}
-                    jump_back=$(( count + 3 ))
+                    # 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
 
-                    # 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
+                    # 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
                 fi
-                # Erase the prompt lines and re-render
-                printf "\\033[2A" >&2
+
+                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
@@ -781,13 +997,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() {
@@ -1124,6 +1340,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.5",
+  "version": "0.4.9",
   "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"