cascade-ai 0.2.0 → 0.2.1

package/dist/cli.js

@@ -4,7 +4,7 @@ import { GoogleGenAI, HarmBlockThreshold, HarmCategory } from '@google/genai';
 import axios2 from 'axios';
 import { render, useApp, useStdout, useInput, Box, Text } from 'ink';
 import { Command } from 'commander';
-import React5, { useState, useReducer, useRef, useCallback, useEffect } from 'react';
+import React5, { useState, useReducer, useRef, useCallback, useEffect, useMemo } from 'react';
 import chalk8 from 'chalk';
 import dotenv from 'dotenv';
 import fs7 from 'fs/promises';
@@ -26,9 +26,9 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { createContext, runInContext } from 'vm';
 import Spinner from 'ink-spinner';
-import SelectInput from 'ink-select-input';
 import wrapAnsi from 'wrap-ansi';
 import ora from 'ora';
+import SelectInput from 'ink-select-input';
 import { createServer } from 'http';
 import { fileURLToPath } from 'url';
 import express from 'express';
@@ -82,7 +82,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var CASCADE_VERSION, CASCADE_CONFIG_FILE, CASCADE_DB_FILE, CASCADE_DASHBOARD_SECRET_FILE, GLOBAL_CONFIG_DIR, GLOBAL_DB_FILE, GLOBAL_KEYSTORE_FILE, GLOBAL_RUNTIME_DB_FILE, DEFAULT_DASHBOARD_PORT, DEFAULT_CONTEXT_LIMIT, DEFAULT_AUTO_SUMMARIZE_AT, MODELS, T1_MODEL_PRIORITY, T2_MODEL_PRIORITY, T3_MODEL_PRIORITY, VISION_MODEL_PRIORITY, COMPLEXITY_T2_COUNT, THEME_NAMES, DEFAULT_THEME, OLLAMA_BASE_URL, LM_STUDIO_BASE_URL, AZURE_BASE_URL_TEMPLATE, TOOL_NAMES, DEFAULT_APPROVAL_REQUIRED;
 var init_constants = __esm({
   "src/constants.ts"() {
-    CASCADE_VERSION = "0.1.2";
+    CASCADE_VERSION = "0.2.0";
     CASCADE_CONFIG_FILE = ".cascade/config.json";
     CASCADE_DB_FILE = ".cascade/memory.db";
     CASCADE_DASHBOARD_SECRET_FILE = ".cascade/dashboard-secret";
@@ -2780,6 +2780,15 @@ var ModelSelector = class {
   markProviderUnavailable(provider) {
     this.availableProviders.delete(provider);
   }
+  /**
+   * Re-add a provider to the available set after it has recovered (e.g. after
+   * a failover timeout expires or a successful call confirms recovery). Only
+   * re-enables providers that were originally configured — callers should
+   * guard against enabling providers that were never configured.
+   */
+  markProviderAvailable(provider) {
+    this.availableProviders.add(provider);
+  }
   resolveDynamicModel(overrideModelId) {
     let providerStr = null;
     let actualId = overrideModelId;
@@ -2849,10 +2858,23 @@ var FailoverManager = class {
     if (!failure) return true;
     if (Date.now() - failure.failedAt >= failure.retryAfterMs) {
       this.failures.delete(provider);
+      this.selector.markProviderAvailable(provider);
       return true;
     }
     return false;
   }
+  /**
+   * Call after a successful generation to immediately re-enable a provider
+   * that had previously been marked unavailable. This allows fast recovery
+   * when a transient rate-limit clears before the backoff window expires,
+   * preventing unnecessary routing to more expensive fallback models.
+   */
+  recordSuccess(provider) {
+    if (this.failures.has(provider)) {
+      this.failures.delete(provider);
+      this.selector.markProviderAvailable(provider);
+    }
+  }
   getFallbackModel(currentModel, tier) {
     return this.selector.getNextFallback(currentModel.id, tier);
   }
@@ -2869,6 +2891,7 @@ var FailoverManager = class {
   }
   clearFailure(provider) {
     this.failures.delete(provider);
+    this.selector.markProviderAvailable(provider);
   }
 };
 
@@ -3084,6 +3107,7 @@ var CascadeRouter = class _CascadeRouter extends EventEmitter {
         throw new Error(`Provider ${model.provider}:${model.id} returned an invalid generation result.`);
       }
       this.recordStats(tier, model, result.usage);
+      this.failover.recordSuccess(model.provider);
       return result;
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
@@ -7303,12 +7327,17 @@ var SlashCommandRegistry = class {
     });
     this.register({
       command: "/model",
+      description: "Pick a provider and model for a tier (interactive)",
+      handler: (_args, ctx) => ({ output: ctx.onModelPicker(), handled: true })
+    });
+    this.register({
+      command: "/model-info",
       description: "Show active models per tier",
       handler: (_args, ctx) => ({ output: ctx.onModelInfo(), handled: true })
     });
     this.register({
       command: "/models",
-      description: "List available models by provider",
+      description: "Browse available models by provider",
       handler: (_args, ctx) => ({ output: ctx.onModelsInfo(), handled: true })
     });
     this.register({
@@ -7611,55 +7640,140 @@ function ApprovalPrompt({ request, theme, onDecision }) {
     }
   );
 }
-var ModelsDisplay = ({ providers, modelsByProvider, onClose }) => {
-  const [selectedProvider, setSelectedProvider] = useState(null);
-  useInput((_input, key) => {
+var TIERS = [
+  { id: "T1", label: "T1 \u2014 Administrator", hint: "complex reasoning \xB7 runs once per task" },
+  { id: "T2", label: "T2 \u2014 Manager", hint: "per-section planning \xB7 a few calls per task" },
+  { id: "T3", label: "T3 \u2014 Worker", hint: "high volume \xB7 many parallel runs" }
+];
+var ModelsDisplay = ({
+  providers,
+  modelsByProvider,
+  onSelect,
+  onClose
+}) => {
+  const [step, setStep] = useState("PROVIDER");
+  const [cursor, setCursor] = useState(0);
+  const [picked, setPicked] = useState({});
+  const providerItems = useMemo(() => {
+    const base = [
+      { label: "\u25C7 Auto", sublabel: "let Cascade pick per tier \u2014 recommended", value: "auto" }
+    ];
+    for (const p of providers) {
+      const count = modelsByProvider.get(p)?.length ?? 0;
+      base.push({ label: p, sublabel: `${count} model${count === 1 ? "" : "s"} discovered`, value: p });
+    }
+    return base;
+  }, [providers, modelsByProvider]);
+  const tierItems = useMemo(
+    () => TIERS.map((t) => ({ label: t.label, sublabel: t.hint, value: t.id })),
+    []
+  );
+  const modelItems = useMemo(() => {
+    if (!picked.provider || picked.provider === "auto") return [];
+    const list = (modelsByProvider.get(picked.provider) ?? []).slice().sort((a, b) => a.id.localeCompare(b.id));
+    const items = [
+      { label: "\u25C7 Auto", sublabel: "best available from this provider", value: "__auto__" }
+    ];
+    for (const m of list) {
+      const ctx = m.contextWindow >= 1e6 ? `${(m.contextWindow / 1e6).toFixed(1)}M ctx` : m.contextWindow >= 1e3 ? `${Math.round(m.contextWindow / 1e3)}K ctx` : `${m.contextWindow} ctx`;
+      items.push({ label: m.name, sublabel: `${m.id}  \xB7  ${ctx}`, value: m.id });
+    }
+    return items;
+  }, [picked.provider, modelsByProvider]);
+  const currentItems = step === "PROVIDER" ? providerItems : step === "TIER" ? tierItems : modelItems;
+  useInput((input, key) => {
     if (key.escape) {
-      if (selectedProvider) {
-        setSelectedProvider(null);
-      } else {
-        onClose();
+      if (step === "MODEL") {
+        setStep("TIER");
+        setCursor(0);
+        return;
+      }
+      if (step === "TIER") {
+        setStep("PROVIDER");
+        setCursor(0);
+        return;
       }
+      onClose();
+      return;
     }
-  });
-  const providerItems = providers.map((p) => ({ label: p, value: p }));
-  const modelItems = selectedProvider ? (modelsByProvider.get(selectedProvider) ?? []).sort((a, b) => a.id.localeCompare(b.id)).map((m) => ({
-    label: `${m.id.padEnd(24)} \u2014 ${m.name}`,
-    value: m.id
-  })) : [];
-  if (!selectedProvider) {
-    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
-      /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
-        /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: "\u25C8 SELECT PROVIDER" }),
-        /* @__PURE__ */ jsx(Text, { color: "muted", children: " (ESC to Exit)" })
-      ] }),
-      /* @__PURE__ */ jsx(
-        SelectInput,
-        {
-          items: providerItems,
-          onSelect: (item) => setSelectedProvider(item.value)
+    if (key.upArrow || input === "k") {
+      setCursor((c) => currentItems.length === 0 ? 0 : (c - 1 + currentItems.length) % currentItems.length);
+      return;
+    }
+    if (key.downArrow || key.tab || input === "j") {
+      setCursor((c) => currentItems.length === 0 ? 0 : (c + 1) % currentItems.length);
+      return;
+    }
+    if (/^[1-9]$/.test(input)) {
+      const idx = parseInt(input, 10) - 1;
+      if (idx < currentItems.length) setCursor(idx);
+      return;
+    }
+    if (key.return) {
+      const selected = currentItems[cursor];
+      if (!selected) return;
+      if (step === "PROVIDER") {
+        if (selected.value === "auto") {
+          setPicked({ provider: "auto" });
+          setStep("TIER");
+          setCursor(0);
+          return;
         }
-      )
-    ] });
-  }
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs(Box, { justifyContent: "space-between", marginBottom: 1, children: [
-      /* @__PURE__ */ jsxs(Text, { bold: true, color: "green", children: [
-        "\u25C8 ",
-        selectedProvider.toUpperCase(),
-        " \u2014 MODELS"
-      ] }),
-      /* @__PURE__ */ jsx(Text, { color: "muted", children: "[ESC to Back]" })
-    ] }),
-    modelItems.length === 0 ? /* @__PURE__ */ jsx(Text, { italic: true, color: "yellow", children: "No supported models discovered for this provider." }) : /* @__PURE__ */ jsx(
-      SelectInput,
-      {
-        items: modelItems,
-        limit: 10,
-        onSelect: () => {
+        setPicked({ provider: selected.value });
+        setStep("TIER");
+        setCursor(0);
+        return;
+      }
+      if (step === "TIER") {
+        const tier = selected.value;
+        if (picked.provider === "auto") {
+          onSelect?.({ kind: "auto", tier });
+          onClose();
+          return;
         }
+        setPicked((p) => ({ ...p, tier }));
+        setStep("MODEL");
+        setCursor(0);
+        return;
       }
-    )
+      if (!picked.tier || !picked.provider || picked.provider === "auto") {
+        onClose();
+        return;
+      }
+      if (selected.value === "__auto__") {
+        onSelect?.({ kind: "auto", tier: picked.tier });
+      } else {
+        onSelect?.({
+          kind: "pick",
+          tier: picked.tier,
+          provider: picked.provider,
+          modelId: selected.value
+        });
+      }
+      onClose();
+    }
+  });
+  const title = step === "PROVIDER" ? "\u25C8 SELECT PROVIDER" : step === "TIER" ? `\u25C8 APPLY ${picked.provider === "auto" ? "AUTO" : String(picked.provider).toUpperCase()} TO WHICH TIER?` : `\u25C8 ${String(picked.provider).toUpperCase()} \u2192 SELECT MODEL FOR ${picked.tier}`;
+  const breadcrumb = step === "PROVIDER" ? "Step 1 / 3" : step === "TIER" ? `Step 2 / 3  \xB7  provider: ${picked.provider}` : `Step 3 / 3  \xB7  ${picked.provider} \u2192 ${picked.tier}`;
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
+    /* @__PURE__ */ jsxs(Box, { justifyContent: "space-between", children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: title }),
+      /* @__PURE__ */ jsx(Text, { color: "gray", children: "[Esc back  \xB7  Enter select]" })
+    ] }),
+    /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+      breadcrumb,
+      "  \xB7  \u2191/\u2193 navigate  \xB7  1\u20139 jump"
+    ] }) }),
+    currentItems.length === 0 ? /* @__PURE__ */ jsx(Text, { italic: true, color: "yellow", children: "No items to show." }) : /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: currentItems.map((item, i) => {
+      const focused = i === cursor;
+      return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
+        /* @__PURE__ */ jsx(Text, { color: focused ? "green" : "gray", children: focused ? "\u276F " : "  " }),
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+          /* @__PURE__ */ jsx(Text, { color: focused ? "white" : "gray", bold: focused, children: item.label }),
+          item.sublabel && /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: `    ${item.sublabel}` })
+        ] })
+      ] }, `${step}-${item.value}-${i}`);
+    }) })
   ] });
 };
 function CostTracker({
@@ -7924,6 +8038,40 @@ function Repl({ config, workspacePath, themeName, initialPrompt, identityName })
   const persistMessage = useCallback((role, content, timestamp) => {
     storeRef.current?.addMessage({ id: randomUUID(), sessionId: sessionIdRef.current, role, content, timestamp });
   }, []);
+  const applyModelPick = useCallback(async (sel) => {
+    const tierKey = sel.tier.toLowerCase();
+    const tierLabel = sel.tier;
+    if (sel.kind === "auto") {
+      delete config.models[tierKey];
+    } else {
+      config.models[tierKey] = sel.modelId;
+    }
+    try {
+      const router = cascadeRef.current?.getRouter();
+      if (router && sel.kind === "pick") {
+        const candidate = (cachedModels.get(sel.provider) ?? []).find((m) => m.id === sel.modelId);
+        if (candidate) router.overrideTierModel(tierLabel, candidate);
+      }
+    } catch {
+    }
+    const configPath = path17.join(workspacePath, ".cascade", "config.json");
+    try {
+      await fs7.mkdir(path17.dirname(configPath), { recursive: true });
+      await fs7.writeFile(configPath, JSON.stringify(config, null, 2), "utf-8");
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      dispatch({
+        type: "ADD_MESSAGE",
+        message: { id: randomUUID(), role: "error", content: `Failed to persist model selection: ${msg}`, timestamp: (/* @__PURE__ */ new Date()).toISOString() }
+      });
+      return;
+    }
+    const summary = sel.kind === "auto" ? `${tierLabel} \u2192 Auto (Cascade will pick best available).` : `${tierLabel} \u2192 ${sel.modelId}  (provider: ${sel.provider}).`;
+    dispatch({
+      type: "ADD_MESSAGE",
+      message: { id: randomUUID(), role: "system", content: `\u2714 Model updated \u2014 ${summary}`, timestamp: (/* @__PURE__ */ new Date()).toISOString() }
+    });
+  }, [config, workspacePath, cachedModels]);
   const globalStoreRef = useRef(null);
   const persistRuntimeSession = useCallback((status, latestPrompt) => {
     const runtimeSession = { sessionId: sessionIdRef.current, title: sessionTitle, workspacePath, status, startedAt: startedAtRef.current, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), latestPrompt, isGlobal: false };
@@ -8070,6 +8218,10 @@ ${msg.content}`).join("\n\n");
           return `${t}: ${m?.name ?? "none"} (${m?.provider ?? "\u2014"})${configured ? ` | configured: ${configured}` : ""}`;
         }).join("\n");
       },
+      onModelPicker: async () => {
+        setIsShowingModels(true);
+        return "Opening model picker \u2014 choose provider \u2192 tier \u2192 model (ESC to exit).";
+      },
       onModelsInfo: async () => {
         setIsShowingModels(true);
         return "Opening interactive models explorer... (ESC to exit)";
@@ -8352,6 +8504,16 @@ Use /identity <name|id> to switch.`;
     }
   }, [handleSlashCommand, persistMessage, state.messages, workspacePath, rebuildTree, recordNodeEvent, slashCompletions, slashIndex, state.isExecuting]);
   useInput((_input, key) => {
+    if (isShowingModels) {
+      if (key.ctrl && _input === "c") {
+        if (quitAttempted) {
+          exit();
+          return;
+        }
+        setQuitAttempted(true);
+      }
+      return;
+    }
     if (key.ctrl && _input === "c") {
       if (quitAttempted) {
         exit();
@@ -8520,7 +8682,17 @@ Use /identity <name|id> to switch.`;
     ] }) }),
     /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 1, children: [
       state.messages.length === 0 && !state.isStreaming && /* @__PURE__ */ jsx(WelcomeBanner, { theme, config, workspacePath, sessionId: sessionIdRef.current }),
-      isShowingModels && /* @__PURE__ */ jsx(ModelsDisplay, { providers: config.providers.map((p) => p.type), modelsByProvider: cachedModels, onClose: () => setIsShowingModels(false) })
+      isShowingModels && /* @__PURE__ */ jsx(
+        ModelsDisplay,
+        {
+          providers: config.providers.map((p) => p.type),
+          modelsByProvider: cachedModels,
+          onSelect: (sel) => {
+            void applyModelPick(sel);
+          },
+          onClose: () => setIsShowingModels(false)
+        }
+      )
     ] }),
     /* @__PURE__ */ jsx(AgentTree, { root: state.agentTree, theme }),
     state.showDetails && /* @__PURE__ */ jsx(TimelinePanel, { nodes: [...treeNodesRef.current.values()], theme, currentIndex: timelineIndex, onChangeIndex: setTimelineIndex }),
@@ -8572,7 +8744,7 @@ Use /identity <name|id> to switch.`;
         /* @__PURE__ */ jsx(
           SafeTextInput,
           {
-            focus: !state.approvalRequest,
+            focus: !state.approvalRequest && !isShowingModels,
             value: input,
             manageMouseReporting: false,
             onChange: (val) => {
@@ -8765,6 +8937,7 @@ var PROVIDER_LABELS = {
   ollama: "Ollama (local)",
   "openai-compatible": "OpenAI-Compatible"
 };
+var providerOrder = ["anthropic", "openai", "gemini", "azure", "ollama", "openai-compatible"];
 function buildInitialEntries(types) {
   return [...types].map((type) => ({
     id: randomUUID(),
@@ -8780,6 +8953,17 @@ function wizardReducer(state, action) {
       else next.add(action.provider);
       return { ...state, selectedTypes: next };
     }
+    case "TOGGLE_ALL": {
+      const allSelected = state.selectedTypes.size === providerOrder.length;
+      return { ...state, selectedTypes: allSelected ? /* @__PURE__ */ new Set() : new Set(providerOrder) };
+    }
+    case "INVERT_SELECTION": {
+      const next = /* @__PURE__ */ new Set();
+      providerOrder.forEach((p) => {
+        if (!state.selectedTypes.has(p)) next.add(p);
+      });
+      return { ...state, selectedTypes: next };
+    }
     case "CONFIRM_PROVIDERS": {
       const entries = buildInitialEntries(state.selectedTypes);
       return { ...state, entries, currentEntryIdx: 0, step: "API_KEYS" };
@@ -8867,7 +9051,6 @@ function SetupWizard({ workspacePath, onComplete }) {
     tierSelectFocus: "T1",
     error: null
   });
-  const providerOrder = ["anthropic", "openai", "gemini", "azure", "ollama", "openai-compatible"];
   const [providerCursor, setProviderCursor] = useState(0);
   const [fieldBuffer, setFieldBuffer] = useState("");
   const [fieldStage, setFieldStage] = useState("apiKey");
@@ -8960,6 +9143,8 @@ function SetupWizard({ workspacePath, onComplete }) {
       if (key.upArrow) setProviderCursor((p) => Math.max(0, p - 1));
       if (key.downArrow) setProviderCursor((p) => Math.min(providerOrder.length - 1, p + 1));
       if (_input === " ") dispatch({ type: "TOGGLE_PROVIDER", provider: providerOrder[providerCursor] });
+      if (_input === "a") dispatch({ type: "TOGGLE_ALL" });
+      if (_input === "i") dispatch({ type: "INVERT_SELECTION" });
       if (key.return) {
         if (state.selectedTypes.size === 0) return;
         dispatch({ type: "CONFIRM_PROVIDERS" });
@@ -9021,21 +9206,23 @@ function SetupWizard({ workspacePath, onComplete }) {
   }, [currentEntry, fieldStage]);
   if (state.step === "PROVIDER_SELECT") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Setup" }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Which providers do you want to configure?" }) }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Space to toggle \xB7 Enter to confirm" }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, flexDirection: "column", children: providerOrder.map((p, i) => {
+      /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
+        /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "? " }),
+        /* @__PURE__ */ jsx(Text, { bold: true, children: "Which providers do you want to configure?" })
+      ] }),
+      /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: providerOrder.map((p, i) => {
         const selected = state.selectedTypes.has(p);
         const focused = i === providerCursor;
         return /* @__PURE__ */ jsxs(Box, { children: [
-          /* @__PURE__ */ jsx(Text, { color: focused ? "green" : "white", children: focused ? "\u276F " : "  " }),
-          /* @__PURE__ */ jsx(Text, { color: selected ? "green" : "white", children: selected ? "\u25C9 " : "\u25CB " }),
-          /* @__PURE__ */ jsx(Text, { color: focused ? "white" : "gray", children: PROVIDER_LABELS[p] }),
+          /* @__PURE__ */ jsx(Text, { color: focused ? "magenta" : "white", children: focused ? "\u276F " : "  " }),
+          /* @__PURE__ */ jsx(Text, { color: selected ? "green" : "white", children: selected ? "\u25C9 " : "\u25EF " }),
+          /* @__PURE__ */ jsx(Text, { color: focused ? "magenta" : selected ? "white" : "gray", children: PROVIDER_LABELS[p] }),
           p === "azure" && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  \u2014 multiple deployments supported" }),
           p === "openai-compatible" && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  \u2014 Groq, Together, custom" }),
           p === "ollama" && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  \u2014 no API key needed" })
         ] }, p);
       }) }),
+      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "(Press <space> to select, <a> to toggle all, <i> to invert selection, and <enter> to proceed)" }) }),
       state.error && /* @__PURE__ */ jsx(Text, { color: "red", children: state.error })
     ] });
   }
@@ -9045,15 +9232,19 @@ function SetupWizard({ workspacePath, onComplete }) {
     const isOllama = currentEntry.type === "ollama";
     if (fieldStage === "askMore") {
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-        /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Setup" }),
-        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { children: isAzure ? "Add another Azure deployment? (y/n)" : "Add another custom endpoint? (y/n)" }) }),
-        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
+          /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "? " }),
+          /* @__PURE__ */ jsx(Text, { bold: true, children: isAzure ? "Add another Azure deployment? (y/n)" : "Add another custom endpoint? (y/n)" })
+        ] }),
+        /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(
           SelectInput,
           {
             items: [
               { label: "Yes \u2014 add another", value: "yes" },
               { label: "No \u2014 continue", value: "no" }
             ],
+            indicatorComponent: ({ isSelected }) => /* @__PURE__ */ jsx(Text, { color: "magenta", children: isSelected ? "\u276F " : "  " }),
+            itemComponent: ({ isSelected, label }) => /* @__PURE__ */ jsx(Text, { color: isSelected ? "magenta" : "white", children: label }),
             onSelect: (item) => {
               if (item.value === "yes") {
                 if (isAzure) dispatch({ type: "ADD_AZURE" });
@@ -9070,21 +9261,15 @@ function SetupWizard({ workspacePath, onComplete }) {
         ) })
       ] });
     }
-    const prompt = isAzure && fieldStage === "deploymentName" ? `Azure deployment name (${currentEntry.label}):` : isAzure && fieldStage === "baseUrl" ? `Azure endpoint URL:` : isCompat && fieldStage === "label" ? `Name for this endpoint (e.g. Groq):` : isCompat && fieldStage === "baseUrl" ? `Base URL (e.g. https://api.groq.com/openai/v1):` : isOllama ? `Ollama URL (Enter for http://localhost:11434):` : `${currentEntry.label} API Key:`;
+    const prompt = isAzure && fieldStage === "deploymentName" ? `Azure deployment name (${currentEntry.label})` : isAzure && fieldStage === "baseUrl" ? `Azure endpoint URL` : isCompat && fieldStage === "label" ? `Name for this endpoint (e.g. Groq)` : isCompat && fieldStage === "baseUrl" ? `Base URL (e.g. https://api.groq.com/openai/v1)` : isOllama ? `Ollama URL (Enter for http://localhost:11434)` : `${currentEntry.label} API Key`;
     const isMasked = fieldStage === "apiKey";
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Setup" }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        "Provider ",
-        state.currentEntryIdx + 1,
-        " of ",
-        state.entries.length,
-        ": ",
-        currentEntry.label
-      ] }) }),
-      /* @__PURE__ */ jsx(Text, { children: prompt }),
-      /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx(Text, { color: "green", children: "> " }),
+      /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
+        /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "? " }),
+        /* @__PURE__ */ jsx(Text, { bold: true, children: prompt })
+      ] }),
+      /* @__PURE__ */ jsxs(Box, { children: [
+        /* @__PURE__ */ jsx(Text, { color: "magenta", children: "\u276F " }),
         /* @__PURE__ */ jsx(
           SafeTextInput,
           {
@@ -9102,13 +9287,13 @@ function SetupWizard({ workspacePath, onComplete }) {
   }
   if (state.step === "FETCH_MODELS") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Fetching Models" }),
-      /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
+        /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "? " }),
+        /* @__PURE__ */ jsx(Text, { bold: true, children: "Connecting to providers and fetching models..." })
+      ] }),
+      /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
         state.fetchLog.map((line, i) => /* @__PURE__ */ jsx(Text, { children: line }, i)),
-        state.fetchedModels.length === 0 && /* @__PURE__ */ jsxs(Box, { children: [
-          /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-          /* @__PURE__ */ jsx(Text, { children: " Connecting to providers..." })
-        ] })
+        state.fetchedModels.length === 0 && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Spinner, { type: "dots" }) })
       ] })
     ] });
   }
@@ -9123,41 +9308,55 @@ function SetupWizard({ workspacePath, onComplete }) {
     const tierLabel = (tier, hint) => {
       const isFocused = state.tierSelectFocus === tier;
       const current = tier === "T1" ? state.tierT1 : tier === "T2" ? state.tierT2 : state.tierT3;
+      if (!isFocused) {
+        return /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Text, { color: "green", bold: true, children: "\u2714 " }),
+          /* @__PURE__ */ jsxs(Text, { bold: true, children: [
+            tier,
+            " ",
+            hint,
+            ": "
+          ] }),
+          /* @__PURE__ */ jsx(Text, { color: "magenta", children: current === "auto" ? "Auto \u2014 let Cascade choose best available" : state.fetchedModels.find((m) => m.id === current)?.name || current })
+        ] }, tier);
+      }
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ jsxs(Text, { bold: true, color: isFocused ? "green" : "white", children: [
-          tier,
-          " ",
-          hint,
-          ":"
-        ] }),
-        /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-          "  currently: ",
-          current === "auto" ? "Auto" : current
+        /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "? " }),
+          /* @__PURE__ */ jsxs(Text, { bold: true, children: [
+            tier,
+            " ",
+            hint,
+            ": "
+          ] })
         ] }),
-        isFocused && /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(
           SelectInput,
           {
             items: modelOptions,
-            onSelect: (item) => dispatch({ type: "SET_TIER", tier, value: item.value })
+            onSelect: (item) => dispatch({ type: "SET_TIER", tier, value: item.value }),
+            indicatorComponent: ({ isSelected }) => /* @__PURE__ */ jsx(Text, { color: "magenta", children: isSelected ? "\u276F " : "  " }),
+            itemComponent: ({ isSelected, label }) => /* @__PURE__ */ jsx(Text, { color: isSelected ? "magenta" : "white", children: label })
           }
-        )
+        ) })
       ] }, tier);
     };
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Tier Assignment" }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Tab to switch tier \xB7 Enter to confirm selection" }),
-      /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
         tierLabel("T1", "(Administrator \u2014 complex reasoning, runs once per task)"),
         tierLabel("T2", "(Manager \u2014 runs per section)"),
         tierLabel("T3", "(Worker \u2014 high volume, many parallel runs)")
       ] }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Press Enter on the last tier to finish setup" }) }),
+      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "(Tab/Arrow Down to skip tier, Enter to select or save)" }) }),
       state.error && /* @__PURE__ */ jsx(Text, { color: "red", children: state.error })
     ] });
   }
   if (state.step === "SAVE") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "green", children: "\u25C8 CASCADE AI \u2014 Saving Configuration" }),
+      /* @__PURE__ */ jsxs(Box, { children: [
+        /* @__PURE__ */ jsx(Text, { color: "green", bold: true, children: "\u2714 " }),
+        /* @__PURE__ */ jsx(Text, { bold: true, children: "Setup complete!" })
+      ] }),
       /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
         /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
         /* @__PURE__ */ jsx(Text, { children: " Writing .cascade/config.json..." })