diff --git a/internal/command/web.go b/internal/command/web.go
index 807889d..3baa967 100644
--- a/internal/command/web.go
+++ b/internal/command/web.go
@@ -51,10 +51,21 @@ func NewWebCmd() *cobra.Command {
 }
 
 func runWebServer(port int, host string, openBrowser bool) error {
+	// Check if we need setup (no providers configured).
+	needsSetup := config.NeedsSetup()
 
-	cfg, err := config.LoadConfig()
-	if err != nil {
-		return fmt.Errorf("config error: %w", err)
+	var cfg *config.Config
+	if !needsSetup {
+		var err error
+		cfg, err = config.LoadConfig()
+		if err != nil {
+			return fmt.Errorf("config error: %w", err)
+		}
+	} else {
+		// Create a minimal config for setup mode.
+		cfg = &config.Config{
+			MaxIterations: 1000,
+		}
 	}
 
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
@@ -68,12 +79,15 @@ func runWebServer(port int, host string, openBrowser bool) error {
 	skillLoader.ScanProjectSkills(pwd)
 
 	systemPrompt := prompts.GetSystemPrompt(platform, pwd, "local", envInfo, skillLoader.Descriptions())
-	providerName, modelName := cfg.GetProviderModel()
 
-	providers := cfg.GetProviders()
-	providerCfg := providers[providerName]
-	if providerCfg == nil {
-		return fmt.Errorf("provider %q not found in config", providerName)
+	var providerName, modelName string
+	if !needsSetup {
+		providerName, modelName = cfg.GetProviderModel()
+		providers := cfg.GetProviders()
+		providerCfg := providers[providerName]
+		if providerCfg == nil {
+			return fmt.Errorf("provider %q not found in config", providerName)
+		}
 	}
 
 	registry := internalmodel.NewModelRegistry()
@@ -171,7 +185,12 @@ func runWebServer(port int, host string, openBrowser bool) error {
 
 	createAgent := func(prov, mod string) (*adk.ChatModelAgent, error) {
 		// Resolve provider config.
-		provCfg := providers[prov]
+		// Reload config to pick up any new providers added via setup.
+		currentCfg, err := config.LoadConfig()
+		if err != nil {
+			return nil, fmt.Errorf("config error: %w", err)
+		}
+		provCfg := currentCfg.GetProviders()[prov]
 		if provCfg == nil {
 			return nil, fmt.Errorf("provider %q not configured", prov)
 		}
@@ -240,9 +259,13 @@ func runWebServer(port int, host string, openBrowser bool) error {
 		return agent.NewAgent(ctx, cm, tools, systemPrompt, approvalState.RequestApproval, middlewares, handlers)
 	}
 
-	ag, err := createAgent(providerName, modelName)
-	if err != nil {
-		return fmt.Errorf("error creating agent: %w", err)
+	var ag *adk.ChatModelAgent
+	var agentErr error
+	if !needsSetup {
+		ag, agentErr = createAgent(providerName, modelName)
+		if agentErr != nil {
+			return fmt.Errorf("error creating agent: %w", agentErr)
+		}
 	}
 
 	switchProject := func(newPwd string) (*adk.ChatModelAgent, *session.Recorder, error) {
@@ -301,6 +324,7 @@ func runWebServer(port int, host string, openBrowser bool) error {
 		WechatClient:  wechatClient,
 		WebHandler:    webHandler,
 		EventHandler:  finalHandler,
+		NeedsSetup:    needsSetup,
 	})
 
 	// Set handler for approval routing.
diff --git a/internal/config/model_state.go b/internal/config/model_state.go
new file mode 100644
index 0000000..4afd916
--- /dev/null
+++ b/internal/config/model_state.go
@@ -0,0 +1,161 @@
+package config
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"sync"
+)
+
+const modelStateFile = "model_state.json"
+
+// ModelState tracks recent, favorite, and visibility settings for models.
+type ModelState struct {
+	Recent   []ModelRef `json:"recent,omitempty"`
+	Favorite []ModelRef `json:"favorite,omitempty"`
+	// EnabledModels lists models explicitly enabled by the user (shown in model selector).
+	// If nil/empty, default-enabled models from the registry are used.
+	EnabledModels []ModelRef `json:"enabled_models,omitempty"`
+	// DisabledModels lists models explicitly disabled by the user (hidden from model selector).
+	DisabledModels []ModelRef `json:"disabled_models,omitempty"`
+}
+
+// ModelRef uniquely identifies a model in "provider/model" format.
+type ModelRef struct {
+	Provider string `json:"provider"`
+	Model    string `json:"model"`
+}
+
+var (
+	modelStateMu sync.Mutex
+)
+
+// modelStatePath returns the path to the model state file.
+func modelStatePath() (string, error) {
+	return filepath.Join(ConfigDir(), modelStateFile), nil
+}
+
+// LoadModelState loads the model state from disk.
+func LoadModelState() (*ModelState, error) {
+	modelStateMu.Lock()
+	defer modelStateMu.Unlock()
+
+	p, err := modelStatePath()
+	if err != nil {
+		return &ModelState{}, nil
+	}
+
+	data, err := os.ReadFile(p)
+	if err != nil {
+		return &ModelState{}, nil
+	}
+
+	var state ModelState
+	if err := json.Unmarshal(data, &state); err != nil {
+		return &ModelState{}, nil
+	}
+	return &state, nil
+}
+
+// SaveModelState writes the model state to disk.
+func SaveModelState(state *ModelState) error {
+	modelStateMu.Lock()
+	defer modelStateMu.Unlock()
+
+	p, err := modelStatePath()
+	if err != nil {
+		return err
+	}
+
+	dir := filepath.Dir(p)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return err
+	}
+
+	data, err := json.MarshalIndent(state, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(p, data, 0644)
+}
+
+// AddRecent adds a model to the recent list (deduped, max 10).
+func (s *ModelState) AddRecent(ref ModelRef) {
+	// Remove if already present
+	filtered := make([]ModelRef, 0, len(s.Recent))
+	for _, r := range s.Recent {
+		if r.Provider != ref.Provider || r.Model != ref.Model {
+			filtered = append(filtered, r)
+		}
+	}
+	// Prepend
+	s.Recent = append([]ModelRef{ref}, filtered...)
+	// Cap at 10
+	if len(s.Recent) > 10 {
+		s.Recent = s.Recent[:10]
+	}
+}
+
+// ToggleFavorite adds or removes a model from favorites. Returns true if now favorite.
+func (s *ModelState) ToggleFavorite(ref ModelRef) bool {
+	for i, r := range s.Favorite {
+		if r.Provider == ref.Provider && r.Model == ref.Model {
+			s.Favorite = append(s.Favorite[:i], s.Favorite[i+1:]...)
+			return false
+		}
+	}
+	s.Favorite = append(s.Favorite, ref)
+	return true
+}
+
+// IsFavorite returns whether the given model is in the favorites list.
+func (s *ModelState) IsFavorite(ref ModelRef) bool {
+	for _, r := range s.Favorite {
+		if r.Provider == ref.Provider && r.Model == ref.Model {
+			return true
+		}
+	}
+	return false
+}
+
+// IsModelEnabled returns whether the given model should be shown in the model selector.
+// Logic: if the model is in EnabledModels, it's enabled.
+// If the model is in DisabledModels, it's disabled.
+// Otherwise, fallback to the defaultEnabled parameter (from registry).
+func (s *ModelState) IsModelEnabled(ref ModelRef, defaultEnabled bool) bool {
+	for _, r := range s.DisabledModels {
+		if r.Provider == ref.Provider && r.Model == ref.Model {
+			return false
+		}
+	}
+	for _, r := range s.EnabledModels {
+		if r.Provider == ref.Provider && r.Model == ref.Model {
+			return true
+		}
+	}
+	return defaultEnabled
+}
+
+// SetModelEnabled explicitly enables or disables a model in the model selector.
+func (s *ModelState) SetModelEnabled(ref ModelRef, enabled bool) {
+	// Remove from both lists first
+	s.EnabledModels = removeModelRef(s.EnabledModels, ref)
+	s.DisabledModels = removeModelRef(s.DisabledModels, ref)
+
+	if enabled {
+		s.EnabledModels = append(s.EnabledModels, ref)
+	} else {
+		s.DisabledModels = append(s.DisabledModels, ref)
+	}
+}
+
+// removeModelRef removes a model ref from a slice.
+func removeModelRef(refs []ModelRef, ref ModelRef) []ModelRef {
+	result := make([]ModelRef, 0, len(refs))
+	for _, r := range refs {
+		if r.Provider != ref.Provider || r.Model != ref.Model {
+			result = append(result, r)
+		}
+	}
+	return result
+}
diff --git a/internal/model/registry.go b/internal/model/registry.go
index 05258fe..9b71e01 100644
--- a/internal/model/registry.go
+++ b/internal/model/registry.go
@@ -34,6 +34,8 @@ type RegistryModel struct {
 	Cost             *ModelCost       `json:"cost,omitempty"`
 	Limit            *ModelLimit      `json:"limit,omitempty"`
 	Status           string           `json:"status,omitempty"`
+	Recommended      bool             `json:"recommended,omitempty"`
+	DefaultEnabled   bool             `json:"default_enabled,omitempty"`
 }
 
 // ModelModalities describes input/output modalities.
@@ -151,8 +153,8 @@ func (r *ModelRegistry) ListProviderModels(providerID string, toolCallOnly bool)
 		}
 		models = append(models, m)
 	}
-	// Sort by ID for consistent ordering
-	sortModelsByID(models)
+	// Sort: recommended first, then by ID
+	sortModels(models)
 	return models
 }
 
@@ -183,3 +185,80 @@ func sortModelsByID(models []*RegistryModel) {
 		}
 	}
 }
+
+// sortModels sorts models: recommended first, then by ID.
+func sortModels(models []*RegistryModel) {
+	for i := 0; i < len(models); i++ {
+		for j := i + 1; j < len(models); j++ {
+			iRec := models[i].Recommended
+			jRec := models[j].Recommended
+			if (!iRec && jRec) || (iRec == jRec && models[i].ID > models[j].ID) {
+				models[i], models[j] = models[j], models[i]
+			}
+		}
+	}
+}
+
+// recommendedModels defines recommended and default-enabled models per provider.
+// Key: provider ID, Value: map of model ID → true (recommended + default enabled).
+var recommendedModels = map[string]map[string]bool{
+	"zhipuai": {
+		"glm-5.1": true,
+		"glm-5":   true,
+	},
+	"zhipuai-coding-plan": {
+		"glm-5.1": true,
+		"glm-5":   true,
+	},
+	"deepseek": {
+		"deepseek-v4-pro": true,
+	},
+	"alibaba-cn": {
+		"qwen3.6-plus":         true,
+		"MiniMax/MiniMax-M2.7": true,
+		"deepseek-v3-2-exp":    true,
+		"kimi-k2.6":            true,
+	},
+	"alibaba-coding-plan-cn": {
+		"qwen3.6-plus": true,
+	},
+	"moonshotai": {
+		"kimi-k2.6": true,
+	},
+	"minimax": {
+		"MiniMax-M2.7": true,
+	},
+	"minimax-coding-plan": {
+		"MiniMax-M2.7": true,
+	},
+	"openai": {
+		"gpt-4.1": true,
+		"o4-mini": true,
+	},
+	"anthropic": {
+		"claude-sonnet-4-20250514": true,
+	},
+	"google": {
+		"gemini-2.5-pro": true,
+	},
+}
+
+func init() {
+	applyRecommendedModels()
+}
+
+// applyRecommendedModels sets Recommended and DefaultEnabled on models in the generated registry.
+func applyRecommendedModels() {
+	for provID, models := range recommendedModels {
+		prov, ok := generatedProviders[provID]
+		if !ok {
+			continue
+		}
+		for modelID := range models {
+			if m, ok := prov.Models[modelID]; ok {
+				m.Recommended = true
+				m.DefaultEnabled = true
+			}
+		}
+	}
+}
diff --git a/internal/model/validate.go b/internal/model/validate.go
new file mode 100644
index 0000000..8d012b6
--- /dev/null
+++ b/internal/model/validate.go
@@ -0,0 +1,44 @@
+package model
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+)
+
+// ValidateProvider tests connectivity to a provider by making a lightweight
+// GET /models request. Returns nil on success, or a descriptive error.
+func ValidateProvider(ctx context.Context, apiKey, baseURL string) error {
+	if baseURL == "" {
+		return fmt.Errorf("base URL is empty")
+	}
+
+	client := &http.Client{Timeout: 10 * time.Second}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, baseURL+"/models", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+	if apiKey != "" {
+		req.Header.Set("Authorization", "Bearer "+apiKey)
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return fmt.Errorf("connection failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusUnauthorized {
+		return fmt.Errorf("invalid API key (401 Unauthorized)")
+	}
+	if resp.StatusCode == http.StatusForbidden {
+		return fmt.Errorf("access denied (403 Forbidden) — check API key permissions")
+	}
+	if resp.StatusCode >= 400 {
+		return fmt.Errorf("server returned %d %s", resp.StatusCode, resp.Status)
+	}
+
+	return nil
+}
diff --git a/internal/tui/input_views.go b/internal/tui/input_views.go
index 5c2d306..a4da453 100644
--- a/internal/tui/input_views.go
+++ b/internal/tui/input_views.go
@@ -200,7 +200,8 @@ func (m Model) channelStateDesc(channelID string) string {
 func (m Model) handleSettingInput(cmds []tea.Cmd) (tea.Model, tea.Cmd) {
 	items := []list.Item{
 		settingItem{title: "🔀 Switch Model", desc: "Switch to a different configured model", key: "switch_model"},
-		settingItem{title: "➕ Add New Model", desc: "Add a new model provider via setup wizard", key: "add_model"},
+		settingItem{title: "⚙  Manage Models", desc: "Choose which models appear in the model selector", key: "manage_models"},
+		settingItem{title: "➕ Add New Provider", desc: "Add a new model provider via setup wizard", key: "add_model"},
 		settingItem{title: "📝 Edit Config File", desc: "Manually edit " + config.ConfigPath(), key: "edit_config"},
 	}
 	m.settingMenu.SetItems(items)
diff --git a/internal/tui/manage_models.go b/internal/tui/manage_models.go
new file mode 100644
index 0000000..6aa8219
--- /dev/null
+++ b/internal/tui/manage_models.go
@@ -0,0 +1,249 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+
+	"charm.land/bubbles/v2/list"
+	tea "charm.land/bubbletea/v2"
+	"charm.land/lipgloss/v2"
+	"github.com/cnjack/jcode/internal/config"
+	"github.com/cnjack/jcode/internal/model"
+)
+
+// manageModelItem represents a model in the manage models view with a toggle state.
+type manageModelItem struct {
+	provider     string
+	providerName string
+	model        string
+	modelName    string
+	enabled      bool
+	recommended  bool
+	isHeader     bool // provider group header
+}
+
+func (i manageModelItem) Title() string {
+	if i.isHeader {
+		return i.providerName
+	}
+	toggle := "  "
+	if i.enabled {
+		toggle = "✓ "
+	}
+	title := toggle + i.modelName
+	if i.recommended {
+		title += " [recommended]"
+	}
+	return title
+}
+
+func (i manageModelItem) Description() string {
+	if i.isHeader {
+		return ""
+	}
+	return ""
+}
+
+func (i manageModelItem) FilterValue() string {
+	if i.isHeader {
+		return ""
+	}
+	return i.modelName + " " + i.model
+}
+
+// openManageModels transitions to the manage models view.
+func (m Model) openManageModels(cmds []tea.Cmd) (tea.Model, tea.Cmd) {
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		m.lines = append(m.lines, textLine(toolErrorStyle.Render("✗ Failed to load config: "+err.Error())))
+		return m, tea.Batch(cmds...)
+	}
+
+	configuredProviders := cfg.GetProviders()
+	registry := model.NewModelRegistry()
+	modelState, _ := config.LoadModelState()
+
+	var items []list.Item
+
+	for _, rp := range registry.ListProviders() {
+		// Only show providers that the user has configured.
+		if _, configured := configuredProviders[rp.ID]; !configured {
+			continue
+		}
+
+		models := registry.ListProviderModels(rp.ID, false)
+		if len(models) == 0 {
+			continue
+		}
+
+		// Add provider header
+		items = append(items, manageModelItem{
+			provider:     rp.ID,
+			providerName: "━━━ " + strings.ToUpper(rp.Name) + " ━━━",
+			model:        "",
+			modelName:    "",
+			enabled:      false,
+			recommended:  false,
+			isHeader:     true,
+		})
+
+		for _, rm := range models {
+			ref := config.ModelRef{Provider: rp.ID, Model: rm.ID}
+			enabled := modelState.IsModelEnabled(ref, rm.DefaultEnabled)
+
+			items = append(items, manageModelItem{
+				provider:     rp.ID,
+				providerName: rp.Name,
+				model:        rm.ID,
+				modelName:    rm.Name,
+				enabled:      enabled,
+				recommended:  rm.Recommended,
+				isHeader:     false,
+			})
+		}
+	}
+
+	del := list.NewDefaultDelegate()
+	del.SetSpacing(0)
+	m.manageModelsPicker = list.New(items, del, 60, 15)
+	m.manageModelsPicker.Title = "Space toggle · Enter done · Esc cancel"
+	m.manageModelsPicker.SetShowHelp(false)
+	m.manageModelsPicker.SetShowStatusBar(true)
+	m.manageModelsPicker.SetShowPagination(true)
+	m.manageModelsPicker.SetFilteringEnabled(true)
+	m.managingModels = true
+	m.textarea.Blur()
+	return m, tea.Batch(cmds...)
+}
+
+// handleManageModelsKey processes key input in the manage models view.
+func (m Model) handleManageModelsKey(msg tea.KeyPressMsg, cmds []tea.Cmd) (tea.Model, tea.Cmd) {
+	// When the list is actively filtering, let all keys pass through to the list
+	if m.manageModelsPicker.FilterState() == list.Filtering {
+		var cmd tea.Cmd
+		m.manageModelsPicker, cmd = m.manageModelsPicker.Update(msg)
+		cmds = append(cmds, cmd)
+		return m, tea.Batch(cmds...)
+	}
+	switch msg.String() {
+	case " ", "space":
+		// Toggle the selected model's visibility
+		selected := m.manageModelsPicker.SelectedItem()
+		if selected != nil {
+			item := selected.(manageModelItem)
+			// Skip headers
+			if item.isHeader {
+				return m, tea.Batch(cmds...)
+			}
+			newEnabled := !item.enabled
+
+			// Update the model state
+			modelState, _ := config.LoadModelState()
+			ref := config.ModelRef{Provider: item.provider, Model: item.model}
+			modelState.SetModelEnabled(ref, newEnabled)
+			_ = config.SaveModelState(modelState)
+
+			// Update the item in the list
+			idx := m.manageModelsPicker.Index()
+			items := m.manageModelsPicker.Items()
+			if idx < len(items) {
+				updatedItem := items[idx].(manageModelItem)
+				updatedItem.enabled = newEnabled
+				items[idx] = updatedItem
+				// Force list to update by setting items again
+				cmd := m.manageModelsPicker.SetItems(items)
+				cmds = append(cmds, cmd)
+			}
+		}
+		return m, tea.Batch(cmds...)
+
+	case "enter":
+		// Done — close manage models and return to model picker
+		m.manageModelsPicker.ResetFilter()
+		m.managingModels = false
+		return m.handleModelInput(cmds)
+
+	case "ctrl+c", "esc":
+		// Cancel — close manage models and return to model picker
+		m.manageModelsPicker.ResetFilter()
+		m.managingModels = false
+		return m.handleModelInput(cmds)
+	}
+
+	var cmd tea.Cmd
+	m.manageModelsPicker, cmd = m.manageModelsPicker.Update(msg)
+	cmds = append(cmds, cmd)
+
+	// Skip provider headers when navigating with arrow keys
+	if msg.String() == "up" || msg.String() == "down" {
+		if selected := m.manageModelsPicker.SelectedItem(); selected != nil {
+			if item, ok := selected.(manageModelItem); ok && item.isHeader {
+				// Item is a header, move again in the same direction
+				m.manageModelsPicker, cmd = m.manageModelsPicker.Update(msg)
+				cmds = append(cmds, cmd)
+				// Check again in case there are consecutive headers
+				if selected := m.manageModelsPicker.SelectedItem(); selected != nil {
+					if item, ok := selected.(manageModelItem); ok && item.isHeader {
+						m.manageModelsPicker, cmd = m.manageModelsPicker.Update(msg)
+						cmds = append(cmds, cmd)
+					}
+				}
+			}
+		}
+	}
+
+	return m, tea.Batch(cmds...)
+}
+
+// manageModelsView renders the manage models screen.
+func (m Model) manageModelsView() string {
+	w, h := m.width, m.height
+	if w <= 0 {
+		w = 80
+	}
+	if h <= 0 {
+		h = 24
+	}
+
+	contentW := w - 12
+	if contentW > 80 {
+		contentW = 80
+	}
+	if contentW < 30 {
+		contentW = 30
+	}
+	listH := h - 10
+	if listH < 4 {
+		listH = 4
+	}
+
+	boxStyle := dialogBoxStyle.Width(contentW)
+
+	headerText := lipgloss.NewStyle().Bold(true).Foreground(colorPrimary).
+		Render("⚙  Manage Models")
+
+	subtitle := lipgloss.NewStyle().Foreground(colorDimText).
+		Render("Toggle which models appear in the model selector")
+
+	m.manageModelsPicker.SetSize(contentW-4, listH)
+	m.manageModelsPicker.SetShowHelp(false)
+	m.manageModelsPicker.SetShowPagination(true)
+
+	var contentParts []string
+	contentParts = append(contentParts, headerText)
+	contentParts = append(contentParts, subtitle)
+	contentParts = append(contentParts, "")
+	contentParts = append(contentParts, m.manageModelsPicker.View())
+
+	// Footer with key hints
+	footer := lipgloss.NewStyle().Foreground(colorDimText).
+		Render(fmt.Sprintf("  %s toggle · %s done · %s cancel",
+			strings.ToUpper("space"),
+			strings.ToUpper("enter"),
+			strings.ToUpper("esc")))
+	contentParts = append(contentParts, footer)
+
+	content := lipgloss.JoinVertical(lipgloss.Left, contentParts...)
+
+	return lipgloss.Place(w, h, lipgloss.Center, lipgloss.Center, boxStyle.Render(content))
+}
diff --git a/internal/tui/pickers.go b/internal/tui/pickers.go
index 08187b9..fa0ab62 100644
--- a/internal/tui/pickers.go
+++ b/internal/tui/pickers.go
@@ -2,7 +2,6 @@ package tui
 
 import (
 	"fmt"
-	"sort"
 	"strings"
 
 	"charm.land/bubbles/v2/list"
@@ -23,24 +22,89 @@ func (m Model) handleModelInput(cmds []tea.Cmd) (tea.Model, tea.Cmd) {
 	currentProvider, currentModel := cfg.GetProviderModel()
 	registry := model.NewModelRegistry()
 
-	// Collect providers and sort them for stable ordering
-	providers := cfg.GetProviders()
-	providerNames := make([]string, 0, len(providers))
-	for name := range providers {
-		providerNames = append(providerNames, name)
-	}
-	sort.Strings(providerNames)
+	// Configured providers (have API key)
+	configuredProviders := cfg.GetProviders()
 
 	var items []list.Item
 
-	for _, provider := range providerNames {
-		models := registry.ListProviderModels(provider, false)
-		if len(models) > 0 {
-			for _, rm := range models {
-				isCurrent := provider == currentProvider && rm.ID == currentModel
+	// Load model state for favorites, recent, and visibility.
+	modelState, _ := config.LoadModelState()
+	favSet := make(map[string]bool)
+	for _, r := range modelState.Favorite {
+		favSet[r.Provider+"/"+r.Model] = true
+	}
+
+	// Track already-shown models to avoid duplicates.
+	shownSet := make(map[string]bool)
+
+	// Add current model section (only the current model).
+	currentKey := currentProvider + "/" + currentModel
+	items = append(items, modelItem{
+		title:            "━━━ CURRENT MODEL ━━━",
+		desc:             "",
+		isProviderHeader: true,
+	})
 
-				// Build rich description with metadata
+	// Get current model info from registry
+	reg := model.NewModelRegistry()
+	if _, rm, ok := reg.LookupModel(currentProvider, currentModel); ok && rm != nil {
+		var tags []string
+		if rm.Recommended {
+			tags = append(tags, "recommended")
+		}
+		if rm.Limit != nil && rm.Limit.Context > 0 {
+			tags = append(tags, fmt.Sprintf("%dk ctx", rm.Limit.Context/1000))
+		}
+		if rm.ToolCall {
+			tags = append(tags, "tools")
+		}
+		if rm.Reasoning {
+			tags = append(tags, "reasoning")
+		}
+		desc := ""
+		if len(tags) > 0 {
+			desc = strings.Join(tags, " · ")
+		}
+		items = append(items, modelItem{
+			provider:  currentProvider,
+			model:     currentModel,
+			title:     "● " + rm.Name,
+			desc:      desc,
+			isCurrent: true,
+		})
+	} else {
+		// Fallback if not in registry
+		items = append(items, modelItem{
+			provider:  currentProvider,
+			model:     currentModel,
+			title:     "● " + currentModel,
+			desc:      currentProvider,
+			isCurrent: true,
+		})
+	}
+	shownSet[currentKey] = true
+
+	// Add favorites section if any exist.
+	if len(modelState.Favorite) > 0 {
+		items = append(items, modelItem{
+			title:            "━━━ ★ FAVORITES ━━━",
+			desc:             "",
+			isProviderHeader: true,
+		})
+		for _, r := range modelState.Favorite {
+			key := r.Provider + "/" + r.Model
+			if shownSet[key] {
+				continue // Skip if it's the current model (already shown above)
+			}
+			shownSet[key] = true
+
+			// Get model info for tags
+			var desc string
+			if _, rm, ok := reg.LookupModel(r.Provider, r.Model); ok && rm != nil {
 				var tags []string
+				if rm.Recommended {
+					tags = append(tags, "recommended")
+				}
 				if rm.Limit != nil && rm.Limit.Context > 0 {
 					tags = append(tags, fmt.Sprintf("%dk ctx", rm.Limit.Context/1000))
 				}
@@ -50,41 +114,108 @@ func (m Model) handleModelInput(cmds []tea.Cmd) (tea.Model, tea.Cmd) {
 				if rm.Reasoning {
 					tags = append(tags, "reasoning")
 				}
-				desc := provider
 				if len(tags) > 0 {
-					desc += " · " + strings.Join(tags, " · ")
+					desc = strings.Join(tags, " · ")
 				}
+			}
+
+			items = append(items, modelItem{
+				provider:  r.Provider,
+				model:     r.Model,
+				title:     "★ " + r.Model,
+				desc:      desc,
+				isCurrent: false,
+			})
+		}
+	}
+
+	// Add models grouped by provider (in registry order), only showing enabled models.
+	for _, rp := range registry.ListProviders() {
+		// Only show providers that the user has configured (has API key).
+		if _, configured := configuredProviders[rp.ID]; !configured {
+			continue
+		}
+
+		models := registry.ListProviderModels(rp.ID, false)
 
-				title := rm.ID
-				if isCurrent {
-					title = "★ " + title
+		// Filter to only enabled models not already shown
+		var providerModels []*model.RegistryModel
+		for _, rm := range models {
+			key := rp.ID + "/" + rm.ID
+			if shownSet[key] {
+				continue
+			}
+			ref := config.ModelRef{Provider: rp.ID, Model: rm.ID}
+			if !modelState.IsModelEnabled(ref, rm.DefaultEnabled) {
+				continue
+			}
+			providerModels = append(providerModels, rm)
+		}
+
+		// Only add provider header if there are models to show
+		if len(providerModels) > 0 {
+			items = append(items, modelItem{
+				title:            "━━━ " + strings.ToUpper(rp.Name) + " ━━━",
+				desc:             "",
+				isProviderHeader: true,
+			})
+
+			for _, rm := range providerModels {
+				key := rp.ID + "/" + rm.ID
+				shownSet[key] = true
+
+				// Build description with tags only (no provider name)
+				var tags []string
+				if rm.Recommended {
+					tags = append(tags, "recommended")
+				}
+				if rm.Limit != nil && rm.Limit.Context > 0 {
+					tags = append(tags, fmt.Sprintf("%dk ctx", rm.Limit.Context/1000))
+				}
+				if rm.ToolCall {
+					tags = append(tags, "tools")
+				}
+				if rm.Reasoning {
+					tags = append(tags, "reasoning")
+				}
+				desc := ""
+				if len(tags) > 0 {
+					desc = strings.Join(tags, " · ")
 				}
 
 				items = append(items, modelItem{
-					provider:  provider,
+					provider:  rp.ID,
 					model:     rm.ID,
-					title:     title,
+					title:     rm.Name,
 					desc:      desc,
-					isCurrent: isCurrent,
+					isCurrent: false,
 				})
 			}
-		} else if provider == currentProvider {
-			// Provider not in registry — show configured model only
-			items = append(items, modelItem{
-				provider:  provider,
-				model:     currentModel,
-				title:     "★ " + currentModel,
-				desc:      provider,
-				isCurrent: true,
-			})
 		}
 	}
 
-	// Add "Add New Model" option at the end
+	// Handle configured providers not in registry (custom OpenAI-compatible, etc.)
+	for provID := range configuredProviders {
+		if registry.HasProvider(provID) {
+			continue
+		}
+		// Only show if not already shown (e.g., as current model)
+		// For custom providers, we only have the current model
+		// which was already shown in the CURRENT MODEL section
+	}
+
+	// Add action items at the end
+	items = append(items, modelItem{
+		title:    "⚙  Manage Models…",
+		desc:     "Choose which models appear in this list",
+		isAction: true,
+		actionID: "manage_models",
+	})
 	items = append(items, modelItem{
-		title:    "➕ Add New Model…",
+		title:    "➕ Add New Provider…",
 		desc:     "Configure a new provider and model",
 		isAction: true,
+		actionID: "add_model",
 	})
 
 	m.modelPicker.SetItems(items)
diff --git a/internal/tui/setup.go b/internal/tui/setup.go
index cf996a5..8f37c90 100644
--- a/internal/tui/setup.go
+++ b/internal/tui/setup.go
@@ -230,6 +230,13 @@ func (m SetupModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		switch m.state {
 		case StateProvider:
+			// When filtering, let keys pass through to the list
+			if m.providerList.FilterState() == list.Filtering {
+				var cmd tea.Cmd
+				m.providerList, cmd = m.providerList.Update(msg)
+				cmds = append(cmds, cmd)
+				return m, tea.Batch(cmds...)
+			}
 			if msg.String() == "enter" {
 				sel := m.providerList.SelectedItem()
 				if sel != nil {
@@ -260,6 +267,13 @@ func (m SetupModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmds = append(cmds, cmd)
 
 		case StateModel:
+			// When filtering, let keys pass through to the list
+			if m.modelList.FilterState() == list.Filtering {
+				var cmd tea.Cmd
+				m.modelList, cmd = m.modelList.Update(msg)
+				cmds = append(cmds, cmd)
+				return m, tea.Batch(cmds...)
+			}
 			if msg.String() == "enter" {
 				sel := m.modelList.SelectedItem()
 				if sel != nil {
@@ -352,6 +366,22 @@ func (m SetupModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.modelList.SetSize(msg.Width-4, 15)
 	}
 
+	// Forward non-key/non-mouse messages (e.g. list.FilterMatchesMsg) to active list
+	if _, isKey := msg.(tea.KeyPressMsg); !isKey {
+		if _, isMouse := msg.(tea.MouseMsg); !isMouse {
+			switch m.state {
+			case StateProvider:
+				var cmd tea.Cmd
+				m.providerList, cmd = m.providerList.Update(msg)
+				cmds = append(cmds, cmd)
+			case StateModel:
+				var cmd tea.Cmd
+				m.modelList, cmd = m.modelList.Update(msg)
+				cmds = append(cmds, cmd)
+			}
+		}
+	}
+
 	return m, tea.Batch(cmds...)
 }
 
diff --git a/internal/tui/tui.go b/internal/tui/tui.go
index 771e5f7..757261a 100644
--- a/internal/tui/tui.go
+++ b/internal/tui/tui.go
@@ -183,6 +183,11 @@ type Model struct {
 	showSidebar         bool // whether sidebar is currently visible
 	sidebarScrollOffset int  // scroll offset for todo list in sidebar
 	sidebarComp         *SidebarComponent
+
+	// ─── Manage models state ───
+	managingModels       bool
+	manageModelsPicker   list.Model
+	manageModelsProvider string // currently selected provider ID for filtering
 }
 
 // --- Content line types for resize-aware rendering ---
@@ -191,7 +196,7 @@ type Model struct {
 // Most lines are plain rendered text; tool results are stored as structured
 // data so they can be re-rendered when the terminal width changes.
 type contentLine struct {
-	text string         // plain rendered text (default)
+	text string          // plain rendered text (default)
 	tool *toolResultData // non-nil for tool results that need dynamic rendering
 }
 
@@ -253,17 +258,25 @@ func (i dirItem) Description() string { return i.desc }
 func (i dirItem) FilterValue() string { return i.title }
 
 type modelItem struct {
-	provider  string
-	model     string
-	title     string
-	desc      string
-	isCurrent bool // currently active model
-	isAction  bool // action item (e.g. "Add New Model")
+	provider         string
+	model            string
+	title            string
+	desc             string
+	isCurrent        bool   // currently active model
+	isAction         bool   // action item (e.g. "Add New Model")
+	actionID         string // action identifier (e.g. "add_model", "manage_models")
+	isProviderHeader bool   // provider group header
 }
 
 func (i modelItem) Title() string       { return i.title }
 func (i modelItem) Description() string { return i.desc }
-func (i modelItem) FilterValue() string { return i.provider + "/" + i.model + " " + i.title }
+func (i modelItem) FilterValue() string {
+	// Provider headers should not be filterable individually, but should match if any of their models match
+	if i.isProviderHeader {
+		return ""
+	}
+	return i.model + " " + i.title
+}
 
 // settingItem is used for the /setting menu
 type settingItem struct {
@@ -379,6 +392,7 @@ func NewModel(hasPrompt bool, pwd string, todoStore *tools.TodoStore) Model {
 	ml := list.New([]list.Item{}, modelDel, 0, 0)
 	ml.Title = "Select Model"
 	ml.SetShowHelp(false)
+	ml.SetFilteringEnabled(true)
 
 	// Setting menu list
 	settingDel := list.NewDefaultDelegate()
@@ -514,7 +528,7 @@ func (m *Model) confirmCancelAgent() {
 }
 
 func (m Model) inputActive() bool {
-	return (m.mode == ModeAgent || m.sshStep > 0 || m.sshSavePrompt) && !m.pickingModel && !m.showingSetting && !m.showingHelp && !m.pickingSSHAlias && !m.pickingSession && !m.approvalPending && !m.planReviewActive && !m.askUserActive
+	return (m.mode == ModeAgent || m.sshStep > 0 || m.sshSavePrompt) && !m.pickingModel && !m.managingModels && !m.showingSetting && !m.showingHelp && !m.pickingSSHAlias && !m.pickingSession && !m.approvalPending && !m.planReviewActive && !m.askUserActive
 }
 
 func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
@@ -882,6 +896,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 					case "switch_model":
 						m.showingSetting = false
 						return m.handleModelInput(cmds)
+					case "manage_models":
+						m.showingSetting = false
+						return m.openManageModels(cmds)
 					case "add_model":
 						m.showingSetting = false
 						m.textarea.Focus()
@@ -991,23 +1008,46 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 			return m, tea.Batch(cmds...)
 		}
 
+		if m.managingModels {
+			return m.handleManageModelsKey(msg, cmds)
+		}
+
 		if m.pickingModel {
+			// When the list is actively filtering, let all keys pass through to the list
+			if m.modelPicker.FilterState() == list.Filtering {
+				var cmd tea.Cmd
+				m.modelPicker, cmd = m.modelPicker.Update(msg)
+				cmds = append(cmds, cmd)
+				return m, tea.Batch(cmds...)
+			}
 			switch msg.String() {
 			case "enter":
 				selected := m.modelPicker.SelectedItem()
 				if selected != nil {
 					selItem := selected.(modelItem)
+					// Skip provider headers
+					if selItem.isProviderHeader {
+						return m, tea.Batch(cmds...)
+					}
 					if selItem.isAction {
-						// "Add New Model" — launch setup wizard
+						m.modelPicker.ResetFilter()
 						m.pickingModel = false
 						m.textarea.Focus()
-						cmds = append(cmds, func() tea.Msg {
-							return AddModelMsg{}
-						})
+						switch selItem.actionID {
+						case "manage_models":
+							// Open model management view
+							return m.openManageModels(cmds)
+						default:
+							// "Add New Provider" — launch setup wizard
+							cmds = append(cmds, func() tea.Msg {
+								return AddModelMsg{}
+							})
+						}
 						return m, tea.Batch(cmds...)
 					}
 					if selItem.isCurrent {
 						// Already active — just close picker
+						m.modelPicker.ResetFilter()
 						m.pickingModel = false
 						m.textarea.Focus()
 						m.refreshViewport()
@@ -1019,11 +1059,17 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 						_ = config.SaveConfig(cfg)
 						m.activeProvider = selItem.provider
 						m.activeModel = selItem.model
+						// Track in recent models.
+						if state, err := config.LoadModelState(); err == nil {
+							state.AddRecent(config.ModelRef{Provider: selItem.provider, Model: selItem.model})
+							_ = config.SaveModelState(state)
+						}
 						select {
 						case configCh <- cfg:
 						default:
 						}
 					}
+					m.modelPicker.ResetFilter()
 					m.pickingModel = false
 					m.lines = append(m.lines, textLine(fmt.Sprintf("  %s Switched to %s",
 						toolSuccessStyle.Render("✓"),
@@ -1033,6 +1079,8 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 					return m, tea.Batch(cmds...)
 				}
 			case "ctrl+c", "esc":
+				// Reset filter state before closing
+				m.modelPicker.ResetFilter()
 				m.pickingModel = false
 				m.textarea.Focus()
 				m.refreshViewport()
@@ -1041,6 +1089,25 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 			var cmd tea.Cmd
 			m.modelPicker, cmd = m.modelPicker.Update(msg)
 			cmds = append(cmds, cmd)
+
+			// Skip provider headers when navigating with arrow keys
+			if msg.String() == "up" || msg.String() == "down" {
+				if selected := m.modelPicker.SelectedItem(); selected != nil {
+					if selItem, ok := selected.(modelItem); ok && selItem.isProviderHeader {
+						// Item is a header, move again in the same direction
+						m.modelPicker, cmd = m.modelPicker.Update(msg)
+						cmds = append(cmds, cmd)
+						// Check again in case there are consecutive headers
+						if selected := m.modelPicker.SelectedItem(); selected != nil {
+							if selItem, ok := selected.(modelItem); ok && selItem.isProviderHeader {
+								m.modelPicker, cmd = m.modelPicker.Update(msg)
+								cmds = append(cmds, cmd)
+							}
+						}
+					}
+				}
+			}
+
 			return m, tea.Batch(cmds...)
 		}
 
@@ -2340,6 +2407,26 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:funlen
 
 	}
 
+	// Forward non-key/non-mouse messages (e.g. list.FilterMatchesMsg) to active pickers
+	if _, isKey := msg.(tea.KeyPressMsg); !isKey {
+		if _, isMouse := msg.(tea.MouseMsg); !isMouse {
+			switch {
+			case m.managingModels:
+				var cmd tea.Cmd
+				m.manageModelsPicker, cmd = m.manageModelsPicker.Update(msg)
+				cmds = append(cmds, cmd)
+			case m.pickingModel:
+				var cmd tea.Cmd
+				m.modelPicker, cmd = m.modelPicker.Update(msg)
+				cmds = append(cmds, cmd)
+			case m.pickingSession:
+				var cmd tea.Cmd
+				m.sessionPicker, cmd = m.sessionPicker.Update(msg)
+				cmds = append(cmds, cmd)
+			}
+		}
+	}
+
 	if m.ready && m.mode == ModeAgent {
 		var cmd tea.Cmd
 		m.viewport, cmd = m.viewport.Update(msg)
@@ -2454,6 +2541,10 @@ func (m Model) View() tea.View {
 		return m.newView(m.modelPickerView())
 	}
 
+	if m.managingModels {
+		return m.newView(m.manageModelsView())
+	}
+
 	if m.pickingSession {
 		return m.newView(m.sessionPickerView())
 	}
diff --git a/internal/web/server.go b/internal/web/server.go
index 80acc42..c42e6bc 100644
--- a/internal/web/server.go
+++ b/internal/web/server.go
@@ -39,9 +39,9 @@ type Server struct {
 	host        string
 	openBrowser bool
 	pwd         string
-	handler  *handler.WebHandler
-	broker   *SSEBroker
-	wsBroker *WSBroker
+	handler     *handler.WebHandler
+	broker      *SSEBroker
+	wsBroker    *WSBroker
 
 	mu      sync.RWMutex
 	agent   *adk.ChatModelAgent
@@ -96,6 +96,10 @@ type Server struct {
 	// eventHandler is the handler passed to the runner — may be a NotifyingHandler
 	// wrapping the WebHandler, or the WebHandler itself.
 	eventHandler handler.AgentEventHandler
+
+	// needsSetup is true when no providers are configured. The server starts in
+	// setup mode and exposes setup API endpoints while blocking chat operations.
+	needsSetup bool
 }
 
 // ServerConfig holds the configuration for creating a new Server.
@@ -120,6 +124,7 @@ type ServerConfig struct {
 	WechatClient  channel.Channel           // optional WeChat channel
 	WebHandler    *handler.WebHandler       // optional: pre-created handler for sharing with tools
 	EventHandler  handler.AgentEventHandler // optional: handler for runner (e.g. NotifyingHandler)
+	NeedsSetup    bool                      // true when no providers are configured (setup mode)
 }
 
 // NewServer creates a new web server.
@@ -158,6 +163,7 @@ func NewServer(cfg *ServerConfig) *Server {
 		disabledMCP:   make(map[string]bool),
 		wechatClient:  cfg.WechatClient,
 		eventHandler:  eh,
+		needsSetup:    cfg.NeedsSetup,
 	}
 
 	// Wire TodoStore → session recording.
@@ -232,6 +238,23 @@ func (s *Server) Start(ctx context.Context) error {
 	mux.HandleFunc("POST /api/channel/enable", s.handleChannelEnable)
 	mux.HandleFunc("POST /api/channel/disable", s.handleChannelDisable)
 
+	// Setup API — available in setup mode (no provider configured yet).
+	mux.HandleFunc("GET /api/setup/providers", s.handleSetupProviders)
+	mux.HandleFunc("GET /api/setup/providers/{id}/models", s.handleSetupProviderModels)
+	mux.HandleFunc("POST /api/setup/complete", s.handleSetupComplete)
+	mux.HandleFunc("GET /api/setup/status", s.handleSetupStatus)
+	mux.HandleFunc("POST /api/setup/validate", s.handleSetupValidate)
+
+	// Provider management API — add/remove providers after initial setup.
+	mux.HandleFunc("GET /api/providers", s.handleListProviders)
+	mux.HandleFunc("POST /api/providers", s.handleAddProvider)
+	mux.HandleFunc("DELETE /api/providers/{id}", s.handleDeleteProvider)
+
+	// Model state API — favorites & recent.
+	mux.HandleFunc("GET /api/model-state", s.handleGetModelState)
+	mux.HandleFunc("POST /api/model-state/favorite", s.handleToggleFavorite)
+	mux.HandleFunc("POST /api/model-state/enabled", s.handleToggleModelEnabled)
+
 	// Serve embedded frontend (SPA with fallback to index.html)
 	mux.Handle("GET /", newSPAHandler())
 
@@ -304,6 +327,21 @@ func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
 	}
 	s.mu.RUnlock()
 
+	if s.needsSetup {
+		writeJSON(w, http.StatusOK, map[string]any{
+			"status":      "needs_setup",
+			"version":     "0.2.0",
+			"pwd":         s.pwd,
+			"provider":    "",
+			"model":       "",
+			"mode":        "build",
+			"session_id":  "",
+			"running":     false,
+			"needs_setup": true,
+		})
+		return
+	}
+
 	writeJSON(w, http.StatusOK, map[string]any{
 		"status":     "ok",
 		"version":    "0.2.0",
@@ -335,6 +373,11 @@ func (s *Server) handleEvents(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Server) handleChat(w http.ResponseWriter, r *http.Request) {
+	if s.needsSetup {
+		writeJSON(w, http.StatusServiceUnavailable, map[string]string{"error": "setup required: please configure a provider first"})
+		return
+	}
+
 	// Use CompareAndSwap to atomically check and set running, preventing
 	// two concurrent requests from both entering submitMessage.
 	if !s.running.CompareAndSwap(false, true) {
@@ -630,10 +673,14 @@ func (s *Server) handleListModels(w http.ResponseWriter, r *http.Request) {
 	}
 
 	type modelInfo struct {
-		ID           string `json:"id"`
-		Name         string `json:"name"`
-		ToolCall     bool   `json:"tool_call"`
-		ContextLimit int    `json:"context_limit,omitempty"`
+		ID             string `json:"id"`
+		Name           string `json:"name"`
+		ToolCall       bool   `json:"tool_call"`
+		ContextLimit   int    `json:"context_limit,omitempty"`
+		Reasoning      bool   `json:"reasoning,omitempty"`
+		Recommended    bool   `json:"recommended,omitempty"`
+		DefaultEnabled bool   `json:"default_enabled,omitempty"`
+		Enabled        bool   `json:"enabled"`
 	}
 	type providerInfo struct {
 		ID     string      `json:"id"`
@@ -641,26 +688,34 @@ func (s *Server) handleListModels(w http.ResponseWriter, r *http.Request) {
 		Models []modelInfo `json:"models"`
 	}
 
+	modelState, _ := config.LoadModelState()
+
 	var result []providerInfo
-	providers := s.cfg.GetProviders()
-	for name := range providers {
-		models := s.registry.ListProviderModels(name, true)
+	configuredProviders := s.cfg.GetProviders()
+	for _, rp := range s.registry.ListProviders() {
+		if _, configured := configuredProviders[rp.ID]; !configured {
+			continue
+		}
+		models := s.registry.ListProviderModels(rp.ID, true)
 		if len(models) == 0 {
 			continue
 		}
-		pi := providerInfo{ID: name, Name: name}
+		pi := providerInfo{ID: rp.ID, Name: rp.Name}
 		for _, m := range models {
 			ctx := 0
 			if m.Limit != nil {
 				ctx = m.Limit.Context
 			}
+			ref := config.ModelRef{Provider: rp.ID, Model: m.ID}
+			enabled := modelState.IsModelEnabled(ref, m.DefaultEnabled)
 			pi.Models = append(pi.Models, modelInfo{
 				ID: m.ID, Name: m.Name, ToolCall: m.ToolCall, ContextLimit: ctx,
+				Reasoning: m.Reasoning, Recommended: m.Recommended,
+				DefaultEnabled: m.DefaultEnabled, Enabled: enabled,
 			})
 		}
 		result = append(result, pi)
 	}
-	sort.Slice(result, func(i, j int) bool { return result[i].ID < result[j].ID })
 
 	writeJSON(w, http.StatusOK, map[string]any{
 		"current":   map[string]string{"provider": s.providerName, "model": s.modelName},
@@ -700,6 +755,12 @@ func (s *Server) handleSwitchModel(w http.ResponseWriter, r *http.Request) {
 	// Keep history — allow continuing the conversation with a different model.
 	s.mu.Unlock()
 
+	// Track in recent models.
+	if state, err := config.LoadModelState(); err == nil {
+		state.AddRecent(config.ModelRef{Provider: req.Provider, Model: req.Model})
+		_ = config.SaveModelState(state)
+	}
+
 	// Notify clients.
 	s.broker.Broadcast(SSEEvent{Event: "model_changed", Data: map[string]string{
 		"provider": req.Provider,
@@ -1473,6 +1534,444 @@ func (s *Server) handleListSkills(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, items)
 }
 
+// --- Setup & Provider Management Handlers ---
+
+// handleSetupStatus returns whether the server is in setup mode.
+func (s *Server) handleSetupStatus(w http.ResponseWriter, r *http.Request) {
+	writeJSON(w, http.StatusOK, map[string]any{
+		"needs_setup": s.needsSetup,
+	})
+}
+
+// handleSetupValidate tests connectivity to a provider with the given API key.
+func (s *Server) handleSetupValidate(w http.ResponseWriter, r *http.Request) {
+	var req struct {
+		Provider string `json:"provider"`
+		APIKey   string `json:"api_key"`
+		BaseURL  string `json:"base_url,omitempty"`
+	}
+	if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid request"})
+		return
+	}
+	if req.APIKey == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "api_key is required"})
+		return
+	}
+
+	baseURL := req.BaseURL
+	if baseURL == "" && s.registry != nil {
+		baseURL = s.registry.GetProviderAPI(req.Provider)
+	}
+	if baseURL == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "no base URL available for this provider"})
+		return
+	}
+
+	if err := model.ValidateProvider(r.Context(), req.APIKey, baseURL); err != nil {
+		writeJSON(w, http.StatusOK, map[string]any{
+			"valid": false,
+			"error": err.Error(),
+		})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"valid": true,
+	})
+}
+
+// handleSetupProviders returns all available providers from the registry.
+func (s *Server) handleSetupProviders(w http.ResponseWriter, r *http.Request) {
+	if s.registry == nil {
+		writeJSON(w, http.StatusOK, []any{})
+		return
+	}
+
+	type providerItem struct {
+		ID         string   `json:"id"`
+		Name       string   `json:"name"`
+		Doc        string   `json:"doc,omitempty"`
+		API        string   `json:"api,omitempty"`
+		Env        []string `json:"env,omitempty"`
+		Configured bool     `json:"configured"`
+		Tag        string   `json:"tag,omitempty"` // "recommended", "free", "local"
+	}
+
+	providers := s.registry.ListProviders()
+	cfg, _ := config.LoadConfig()
+	configured := map[string]bool{}
+	if cfg != nil {
+		for k := range cfg.GetProviders() {
+			configured[k] = true
+		}
+	}
+
+	// Provider tags for recommendation.
+	tags := map[string]string{
+		"openai":    "recommended",
+		"anthropic": "recommended",
+		"ollama":    "local",
+	}
+
+	result := make([]providerItem, 0, len(providers))
+	for _, p := range providers {
+		result = append(result, providerItem{
+			ID:         p.ID,
+			Name:       p.Name,
+			Doc:        p.Doc,
+			API:        p.API,
+			Env:        p.Env,
+			Configured: configured[p.ID],
+			Tag:        tags[p.ID],
+		})
+	}
+
+	// Sort: configured first, then by tag (recommended > local > ""), then by name.
+	sort.SliceStable(result, func(i, j int) bool {
+		ri, rj := result[i], result[j]
+		if ri.Configured != rj.Configured {
+			return ri.Configured
+		}
+		tagOrder := map[string]int{"recommended": 0, "local": 1, "": 2}
+		oi, _ := tagOrder[ri.Tag]
+		oj, _ := tagOrder[rj.Tag]
+		if oi != oj {
+			return oi < oj
+		}
+		return ri.Name < rj.Name
+	})
+
+	writeJSON(w, http.StatusOK, result)
+}
+
+// handleSetupProviderModels returns models for a specific provider from the registry.
+func (s *Server) handleSetupProviderModels(w http.ResponseWriter, r *http.Request) {
+	providerID := r.PathValue("id")
+	if providerID == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "provider id is required"})
+		return
+	}
+
+	if s.registry == nil {
+		writeJSON(w, http.StatusOK, []any{})
+		return
+	}
+
+	models := s.registry.ListProviderModels(providerID, true)
+	type modelItem struct {
+		ID           string `json:"id"`
+		Name         string `json:"name"`
+		ToolCall     bool   `json:"tool_call"`
+		ContextLimit int    `json:"context_limit,omitempty"`
+		Reasoning    bool   `json:"reasoning,omitempty"`
+	}
+
+	result := make([]modelItem, 0, len(models))
+	for _, m := range models {
+		ctx := 0
+		if m.Limit != nil {
+			ctx = m.Limit.Context
+		}
+		result = append(result, modelItem{
+			ID:           m.ID,
+			Name:         m.Name,
+			ToolCall:     m.ToolCall,
+			ContextLimit: ctx,
+			Reasoning:    m.Reasoning,
+		})
+	}
+
+	writeJSON(w, http.StatusOK, result)
+}
+
+// handleSetupComplete handles the initial setup submission.
+// It saves the provider config and creates the agent.
+func (s *Server) handleSetupComplete(w http.ResponseWriter, r *http.Request) {
+	var req struct {
+		Provider string `json:"provider"`
+		Model    string `json:"model"`
+		APIKey   string `json:"api_key"`
+		BaseURL  string `json:"base_url,omitempty"`
+	}
+	if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid request"})
+		return
+	}
+	if req.Provider == "" || req.Model == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "provider and model are required"})
+		return
+	}
+
+	// Build or update config.
+	var cfg *config.Config
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		// First time — create fresh config.
+		cfg = &config.Config{
+			MaxIterations: 1000,
+		}
+	}
+
+	if cfg.Providers == nil {
+		cfg.Providers = make(map[string]*config.ProviderConfig)
+	}
+	cfg.Providers[req.Provider] = &config.ProviderConfig{
+		APIKey:  req.APIKey,
+		BaseURL: req.BaseURL,
+	}
+	cfg.Model = req.Provider + "/" + req.Model
+
+	if err := config.SaveConfig(cfg); err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to save config: " + err.Error()})
+		return
+	}
+
+	// Create the agent with the new config.
+	ag, err := s.createAgent(req.Provider, req.Model)
+	if err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to create agent: " + err.Error()})
+		return
+	}
+
+	s.mu.Lock()
+	s.agent = ag
+	s.providerName = req.Provider
+	s.modelName = req.Model
+	s.needsSetup = false
+	s.mu.Unlock()
+
+	// Notify clients that setup is complete.
+	s.broker.Broadcast(SSEEvent{Event: "model_changed", Data: map[string]string{
+		"provider": req.Provider,
+		"model":    req.Model,
+	}})
+	s.wsBroker.Broadcast(WSEvent{Type: "model_changed", Data: map[string]string{
+		"provider": req.Provider,
+		"model":    req.Model,
+	}})
+
+	writeJSON(w, http.StatusOK, map[string]string{
+		"status":   "ok",
+		"provider": req.Provider,
+		"model":    req.Model,
+	})
+}
+
+// handleListProviders returns all configured providers (key masked).
+func (s *Server) handleListProviders(w http.ResponseWriter, r *http.Request) {
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		writeJSON(w, http.StatusOK, []any{})
+		return
+	}
+
+	type providerDetail struct {
+		ID        string `json:"id"`
+		APIKeySet bool   `json:"api_key_set"`
+		APIKey    string `json:"api_key,omitempty"` // masked
+		BaseURL   string `json:"base_url,omitempty"`
+	}
+
+	result := make([]providerDetail, 0)
+	for id, pc := range cfg.GetProviders() {
+		detail := providerDetail{
+			ID:        id,
+			APIKeySet: pc.APIKey != "",
+			BaseURL:   pc.BaseURL,
+		}
+		if pc.APIKey != "" {
+			// Mask API key: show first 4 and last 4 chars.
+			key := pc.APIKey
+			if len(key) > 8 {
+				detail.APIKey = key[:4] + "..." + key[len(key)-4:]
+			} else {
+				detail.APIKey = "****"
+			}
+		}
+		result = append(result, detail)
+	}
+	sort.Slice(result, func(i, j int) bool { return result[i].ID < result[j].ID })
+
+	writeJSON(w, http.StatusOK, result)
+}
+
+// handleAddProvider adds a new provider to the config.
+func (s *Server) handleAddProvider(w http.ResponseWriter, r *http.Request) {
+	var req struct {
+		ID      string `json:"id"`
+		APIKey  string `json:"api_key"`
+		BaseURL string `json:"base_url,omitempty"`
+	}
+	if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid request"})
+		return
+	}
+	if req.ID == "" || req.APIKey == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "id and api_key are required"})
+		return
+	}
+
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		cfg = &config.Config{MaxIterations: 1000}
+	}
+	if cfg.Providers == nil {
+		cfg.Providers = make(map[string]*config.ProviderConfig)
+	}
+	cfg.Providers[req.ID] = &config.ProviderConfig{
+		APIKey:  req.APIKey,
+		BaseURL: req.BaseURL,
+	}
+	if err := config.SaveConfig(cfg); err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to save config: " + err.Error()})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
+}
+
+// handleDeleteProvider removes a provider from the config.
+func (s *Server) handleDeleteProvider(w http.ResponseWriter, r *http.Request) {
+	providerID := r.PathValue("id")
+	if providerID == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "provider id is required"})
+		return
+	}
+
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
+		return
+	}
+
+	providers := cfg.GetProviders()
+	if providers == nil || providers[providerID] == nil {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": "provider not found"})
+		return
+	}
+
+	// Don't allow deleting the active provider.
+	activeProvider, _ := cfg.GetProviderModel()
+	if activeProvider == providerID {
+		remaining := 0
+		for k := range providers {
+			if k != providerID {
+				remaining++
+			}
+		}
+		if remaining == 0 {
+			writeJSON(w, http.StatusBadRequest, map[string]string{"error": "cannot delete the only provider"})
+			return
+		}
+	}
+
+	delete(cfg.Providers, providerID)
+	if err := config.SaveConfig(cfg); err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to save config: " + err.Error()})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
+}
+
+// handleGetModelState returns the recent, favorite, and visibility settings.
+func (s *Server) handleGetModelState(w http.ResponseWriter, r *http.Request) {
+	state, err := config.LoadModelState()
+	if err != nil {
+		state = &config.ModelState{}
+	}
+	type modelRefJSON struct {
+		Provider string `json:"provider"`
+		Model    string `json:"model"`
+	}
+
+	recent := make([]modelRefJSON, 0, len(state.Recent))
+	for _, r := range state.Recent {
+		recent = append(recent, modelRefJSON{Provider: r.Provider, Model: r.Model})
+	}
+	favorites := make([]modelRefJSON, 0, len(state.Favorite))
+	for _, r := range state.Favorite {
+		favorites = append(favorites, modelRefJSON{Provider: r.Provider, Model: r.Model})
+	}
+	enabledModels := make([]modelRefJSON, 0, len(state.EnabledModels))
+	for _, r := range state.EnabledModels {
+		enabledModels = append(enabledModels, modelRefJSON{Provider: r.Provider, Model: r.Model})
+	}
+	disabledModels := make([]modelRefJSON, 0, len(state.DisabledModels))
+	for _, r := range state.DisabledModels {
+		disabledModels = append(disabledModels, modelRefJSON{Provider: r.Provider, Model: r.Model})
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"recent":          recent,
+		"favorite":        favorites,
+		"enabled_models":  enabledModels,
+		"disabled_models": disabledModels,
+	})
+}
+
+// handleToggleFavorite toggles a model in the favorites list.
+func (s *Server) handleToggleFavorite(w http.ResponseWriter, r *http.Request) {
+	var req struct {
+		Provider string `json:"provider"`
+		Model    string `json:"model"`
+	}
+	if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid request"})
+		return
+	}
+	if req.Provider == "" || req.Model == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "provider and model are required"})
+		return
+	}
+
+	state, err := config.LoadModelState()
+	if err != nil {
+		state = &config.ModelState{}
+	}
+	nowFavorite := state.ToggleFavorite(config.ModelRef{Provider: req.Provider, Model: req.Model})
+	if err := config.SaveModelState(state); err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to save"})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"favorite": nowFavorite,
+	})
+}
+
+// handleToggleModelEnabled toggles whether a model is shown in the model selector.
+func (s *Server) handleToggleModelEnabled(w http.ResponseWriter, r *http.Request) {
+	var req struct {
+		Provider string `json:"provider"`
+		Model    string `json:"model"`
+		Enabled  bool   `json:"enabled"`
+	}
+	if err := json.NewDecoder(io.LimitReader(r.Body, 1<<16)).Decode(&req); err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "invalid request"})
+		return
+	}
+	if req.Provider == "" || req.Model == "" {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "provider and model are required"})
+		return
+	}
+
+	state, err := config.LoadModelState()
+	if err != nil {
+		state = &config.ModelState{}
+	}
+	state.SetModelEnabled(config.ModelRef{Provider: req.Provider, Model: req.Model}, req.Enabled)
+	if err := config.SaveModelState(state); err != nil {
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "failed to save"})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, map[string]any{
+		"enabled": req.Enabled,
+	})
+}
+
 // --- Helpers ---
 
 func writeJSON(w http.ResponseWriter, status int, data any) {
diff --git a/web/src/App.vue b/web/src/App.vue
index d92d214..31a64c2 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -15,6 +15,7 @@ import SettingsDialog from '@/components/SettingsDialog.vue'
 import ProjectSwitcher from '@/components/ProjectSwitcher.vue'
 import TerminalPanel from '@/components/TerminalPanel.vue'
 import DiffViewer from '@/components/DiffViewer.vue'
+import SetupView from '@/components/SetupView.vue'
 
 const store = useChatStore()
 const projectStore = useProjectStore()
@@ -26,6 +27,7 @@ const fileViewerOpen = ref(false)
 const fileViewerPath = ref('')
 const fileViewerContent = ref('')
 const sidebarCollapsed = ref(false)
+const needsSetup = ref(false)
 
 const bottomPanel = ref<'none' | 'terminal' | 'diff'>('none')
 const bottomPanelHeight = ref(260)
@@ -124,10 +126,16 @@ function handleGlobalKeydown(e: KeyboardEvent) {
 
 onMounted(async () => {
   document.addEventListener('keydown', handleGlobalKeydown)
-  await store.fetchHealth()
+  const health = await store.fetchHealth()
+  // Check if setup is needed — health returns needs_setup status
+  if ((health as any)?.needs_setup) {
+    needsSetup.value = true
+    return
+  }
   store.fetchConfig()
   store.fetchTodos()
   store.fetchModels()
+  store.fetchModelState()
   store.fetchSessions()
   store.fetchApprovalMode()
   store.fetchChannelState()
@@ -161,6 +169,21 @@ async function onProjectSwitched() {
   await store.restoreCurrentSession()
 }
 
+function onSetupComplete() {
+  needsSetup.value = false
+  // Now load everything
+  store.fetchConfig()
+  store.fetchTodos()
+  store.fetchModels()
+  store.fetchModelState()
+  store.fetchSessions()
+  store.fetchApprovalMode()
+  store.fetchChannelState()
+  if (store.pwd) {
+    projectStore.ensureCurrentProject(store.pwd)
+  }
+}
+
 // Panel resize
 function startResize(e: MouseEvent) {
   e.preventDefault()
@@ -342,5 +365,8 @@ function startResize(e: MouseEvent) {
 
     <SettingsDialog :open="settingsOpen" @close="settingsOpen = false" />
     <ProjectSwitcher :open="projectsOpen" @close="projectsOpen = false" @project-switched="onProjectSwitched" />
+
+    <!-- Setup overlay — shown when no providers are configured -->
+    <SetupView v-if="needsSetup" @complete="onSetupComplete" />
   </div>
 </template>
diff --git a/web/src/components/ChatInput.vue b/web/src/components/ChatInput.vue
index bc7549b..e19022a 100644
--- a/web/src/components/ChatInput.vue
+++ b/web/src/components/ChatInput.vue
@@ -9,6 +9,8 @@ const input = ref('')
 const textarea = ref<HTMLTextAreaElement | null>(null)
 const showModelPicker = ref(false)
 const showModePicker = ref(false)
+const showManageModels = ref(false)
+const modelFilter = ref('')
 const containerRef = ref<HTMLDivElement | null>(null)
 
 const skills = ref<SkillInfo[]>([])
@@ -28,6 +30,32 @@ const filteredSlashCommands = computed(() => {
   )
 })
 
+const filteredProviders = computed(() => {
+  const filter = modelFilter.value.toLowerCase()
+  if (!filter) return store.providers
+
+  return store.providers
+    .map(p => ({
+      ...p,
+      models: p.models.filter(m =>
+        (m.name || m.id).toLowerCase().includes(filter) ||
+        p.name.toLowerCase().includes(filter)
+      )
+    }))
+    .filter(p => p.models.length > 0)
+})
+
+// Get full display name for a model (e.g., "DeepSeek V4 Pro")
+function getModelDisplayName(providerId: string, modelId: string): string {
+  for (const p of store.providers) {
+    if (p.id === providerId) {
+      const m = p.models.find(model => model.id === modelId)
+      return m?.name || modelId
+    }
+  }
+  return modelId
+}
+
 function autoResize() {
   const el = textarea.value
   if (!el) return
@@ -36,6 +64,26 @@ function autoResize() {
 }
 
 function handleKeyDown(e: KeyboardEvent) {
+  // Handle ESC key for dialogs
+  if (e.key === 'Escape') {
+    if (showManageModels.value) {
+      e.preventDefault()
+      showManageModels.value = false
+      modelFilter.value = ''
+      return
+    }
+    if (showModelPicker.value) {
+      e.preventDefault()
+      showModelPicker.value = false
+      return
+    }
+    if (showSlashMenu.value) {
+      e.preventDefault()
+      showSlashMenu.value = false
+      return
+    }
+  }
+
   if (showSlashMenu.value) {
     if (e.key === 'ArrowDown') {
       e.preventDefault()
@@ -111,6 +159,10 @@ function handleClickOutside(e: MouseEvent) {
     showModelPicker.value = false
     showModePicker.value = false
     showSlashMenu.value = false
+    if (showManageModels.value) {
+      showManageModels.value = false
+      modelFilter.value = ''
+    }
   }
 }
 
@@ -119,6 +171,20 @@ function handleGlobalKey(e: KeyboardEvent) {
     e.preventDefault()
     textarea.value?.focus()
   }
+  // Global ESC handler for dialogs
+  if (e.key === 'Escape') {
+    if (showManageModels.value) {
+      e.preventDefault()
+      showManageModels.value = false
+      modelFilter.value = ''
+      return
+    }
+    if (showModelPicker.value) {
+      e.preventDefault()
+      showModelPicker.value = false
+      return
+    }
+  }
 }
 
 onMounted(async () => {
@@ -220,28 +286,124 @@ watch(() => store.isRunning, (running) => {
                 v-if="showModelPicker"
                 class="absolute bottom-full mb-1 left-0 z-20 bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-md shadow-lg dark:shadow-2xl py-1.5 max-h-72 overflow-y-auto min-w-56"
               >
-                <template v-for="p in store.providers" :key="p.id">
-                  <div class="px-3 py-1 text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider font-semibold sticky top-0 bg-white dark:bg-zinc-800">
+                <!-- Favorites section -->
+                <template v-if="store.recentModels.length > 0 && store.favoriteModels.size > 0">
+                  <div class="px-3 py-1 text-[10px] text-amber-500 dark:text-amber-400 uppercase tracking-wider font-semibold sticky top-0 bg-white dark:bg-zinc-800 flex items-center gap-1">
+                    <span>★</span> Favorites
+                  </div>
+                  <button
+                    v-for="r in store.recentModels.filter(r => store.favoriteModels.has(`${r.provider}/${r.model}`) && !(store.providerName === r.provider && store.modelName === r.model))"
+                    :key="'fav-'+r.provider+'-'+r.model"
+                    class="w-full px-3 py-1.5 text-xs text-left cursor-pointer select-none truncate transition-colors text-zinc-500 dark:text-zinc-400 hover:bg-zinc-50 dark:hover:bg-zinc-700/50 hover:text-zinc-700 dark:hover:text-zinc-200"
+                    @click="selectModel(r.provider, r.model)"
+                  >
+                    <span class="text-amber-400 mr-1">★</span>{{ getModelDisplayName(r.provider, r.model) }}
+                  </button>
+                </template>
+
+                <!-- Current Model section -->
+                <template v-if="store.providerName && store.modelName">
+                  <div class="px-3 py-1 text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider font-semibold sticky top-0 bg-white dark:bg-zinc-800 border-t border-zinc-100 dark:border-zinc-700/50">
+                    Current Model
+                  </div>
+                  <button
+                    class="w-full px-3 py-1.5 text-xs text-left cursor-pointer select-none truncate transition-colors text-emerald-600 dark:text-emerald-400 bg-emerald-50 dark:bg-emerald-500/10"
+                    @click="selectModel(store.providerName, store.modelName)"
+                  >
+                    ● {{ getModelDisplayName(store.providerName, store.modelName) }}
+                  </button>
+                </template>
+
+                <!-- All providers section (only enabled models) -->
+                <template v-for="p in store.enabledProviders" :key="p.id">
+                  <div class="px-3 py-1 text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider font-semibold sticky top-0 bg-white dark:bg-zinc-800 border-t border-zinc-100 dark:border-zinc-700/50">
                     {{ p.name }}
                   </div>
                   <button
                     v-for="m in p.models"
                     :key="m.id"
-                    class="w-full px-3 py-1.5 text-xs text-left cursor-pointer select-none truncate transition-colors"
+                    class="w-full px-3 py-1.5 text-xs text-left cursor-pointer select-none transition-colors group"
                     :class="store.providerName === p.id && store.modelName === m.id
                       ? 'text-emerald-600 dark:text-emerald-400 bg-emerald-50 dark:bg-emerald-500/10'
                       : 'text-zinc-500 dark:text-zinc-400 hover:bg-zinc-50 dark:hover:bg-zinc-700/50 hover:text-zinc-700 dark:hover:text-zinc-200'"
                     @click="selectModel(p.id, m.id)"
                   >
-                    {{ m.name || m.id }}
+                    <span class="truncate">{{ m.name || m.id }}</span>
+                    <span v-if="m.recommended" class="ml-1 text-[9px] text-emerald-500 dark:text-emerald-400">recommended</span>
+                    <button
+                      class="ml-1 opacity-0 group-hover:opacity-100 transition-opacity cursor-pointer inline"
+                      :class="store.isFavorite(p.id, m.id) ? 'text-amber-400 opacity-100' : 'text-zinc-300 dark:text-zinc-600'"
+                      @click.stop="store.toggleFavorite(p.id, m.id)"
+                      :title="store.isFavorite(p.id, m.id) ? 'Remove from favorites' : 'Add to favorites'"
+                    >★</button>
                   </button>
                 </template>
-                <div v-if="store.providers.length === 0" class="px-3 py-2 text-xs text-zinc-400 dark:text-zinc-500">
+                <div v-if="store.enabledProviders.length === 0" class="px-3 py-2 text-xs text-zinc-400 dark:text-zinc-500">
                   No models available
                 </div>
+                <!-- Manage models link -->
+                <div class="border-t border-zinc-100 dark:border-zinc-700/50 px-3 py-1.5">
+                  <button
+                    class="w-full text-xs text-left text-zinc-400 dark:text-zinc-500 hover:text-zinc-600 dark:hover:text-zinc-300 cursor-pointer transition-colors"
+                    @click.stop="showModelPicker = false; showManageModels = true"
+                  >
+                    ⚙ Manage models…
+                  </button>
+                </div>
               </div>
             </div>
 
+            <!-- Manage Models Dialog (teleported to body for proper centering) -->
+            <Teleport to="body">
+              <div
+                v-if="showManageModels"
+                class="fixed inset-0 z-50 flex items-center justify-center bg-black/30 dark:bg-black/50"
+                @click="showManageModels = false; modelFilter = ''"
+              >
+                <div class="bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg shadow-xl dark:shadow-2xl w-full max-w-lg max-h-[70vh] flex flex-col mx-4" @click.stop>
+                  <div class="px-4 py-3 border-b border-zinc-200 dark:border-zinc-700">
+                    <div class="flex items-center justify-between mb-2">
+                      <div>
+                        <h3 class="text-sm font-semibold text-zinc-800 dark:text-zinc-100">Manage Models</h3>
+                        <p class="text-[11px] text-zinc-400 dark:text-zinc-500">Toggle which models appear in the model selector</p>
+                      </div>
+                      <button
+                        class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-200 cursor-pointer"
+                        @click="showManageModels = false; modelFilter = ''; store.fetchModels()"
+                      >✕</button>
+                    </div>
+                    <input
+                      v-model="modelFilter"
+                      type="text"
+                      placeholder="Filter models..."
+                      class="w-full px-2 py-1.5 text-xs border border-zinc-200 dark:border-zinc-600 rounded bg-white dark:bg-zinc-700 text-zinc-800 dark:text-zinc-100 placeholder-zinc-400 dark:placeholder-zinc-500 focus:outline-none focus:ring-1 focus:ring-emerald-500"
+                    />
+                  </div>
+                  <div class="overflow-y-auto flex-1 py-2">
+                    <template v-for="p in filteredProviders" :key="'mgr-'+p.id">
+                      <div class="px-4 py-1.5 text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider font-semibold sticky top-0 bg-white dark:bg-zinc-800">
+                        {{ p.name }}
+                      </div>
+                      <label
+                        v-for="m in p.models"
+                        :key="'mgr-'+p.id+'-'+m.id"
+                        class="flex items-center gap-2.5 px-4 py-2 hover:bg-zinc-50 dark:hover:bg-zinc-700/30 cursor-pointer transition-colors"
+                      >
+                        <input
+                          type="checkbox"
+                          :checked="m.enabled !== false"
+                          class="w-4 h-4 rounded border-2 border-zinc-300 dark:border-zinc-600 text-emerald-500 focus:ring-2 focus:ring-emerald-500 focus:ring-offset-0 cursor-pointer transition-all"
+                          @change="store.toggleModelEnabled(p.id, m.id, ($event.target as HTMLInputElement).checked)"
+                        />
+                        <span class="text-xs text-zinc-700 dark:text-zinc-300 flex-1 truncate">{{ m.name || m.id }}</span>
+                        <span v-if="m.recommended" class="text-[9px] px-1.5 py-0.5 rounded bg-emerald-50 dark:bg-emerald-500/10 text-emerald-600 dark:text-emerald-400 font-medium shrink-0">recommended</span>
+                      </label>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </Teleport>
+
             <!-- Auto-approve toggle -->
             <button
               class="flex items-center gap-1 px-2 py-0.5 text-[11px] rounded transition-colors cursor-pointer"
diff --git a/web/src/components/SettingsDialog.vue b/web/src/components/SettingsDialog.vue
index 9c32364..dc8c187 100644
--- a/web/src/components/SettingsDialog.vue
+++ b/web/src/components/SettingsDialog.vue
@@ -2,7 +2,7 @@
 import { ref, watch, nextTick } from 'vue'
 import { useChatStore } from '@/stores/chat'
 import { api } from '@/composables/api'
-import type { MCPServerInfo, SSHAlias } from '@/types/api'
+import type { MCPServerInfo, SSHAlias, SetupProvider, SetupModel, ProviderDetail } from '@/types/api'
 import QRCode from 'qrcode'
 import {
   Dialog,
@@ -21,7 +21,7 @@ const emit = defineEmits<{
 }>()
 
 const store = useChatStore()
-const activeTab = ref<'general' | 'mcp' | 'ssh' | 'channels' | 'shortcuts'>('general')
+const activeTab = ref<'general' | 'providers' | 'mcp' | 'ssh' | 'channels' | 'shortcuts'>('general')
 const mcpServers = ref<Record<string, MCPServerInfo>>({})
 const sshAliases = ref<SSHAlias[]>([])
 const sshCurrent = ref('local')
@@ -34,6 +34,21 @@ const channelQRContent = ref('')
 const channelLoginReminder = ref(false)
 const qrCanvas = ref<HTMLCanvasElement | null>(null)
 
+// Provider management state
+const configuredProviders = ref<ProviderDetail[]>([])
+const showAddProvider = ref(false)
+const addProviderStep = ref<'select' | 'model' | 'apikey'>('select')
+const addProviderList = ref<SetupProvider[]>([])
+const addProviderModels = ref<SetupModel[]>([])
+const addSelectedProvider = ref('')
+const addSelectedModel = ref('')
+const addApiKey = ref('')
+const addBaseURL = ref('')
+const addShowApiKey = ref(false)
+const addLoading = ref(false)
+const addError = ref('')
+const deleteConfirmId = ref('')
+
 watch(() => props.open, async (isOpen) => {
   if (isOpen) {
     mcpLoading.value = true
@@ -54,8 +69,16 @@ watch(() => props.open, async (isOpen) => {
       channelAvailable.value = ch.available
       channelState.value = ch.state ?? 'none'
     } catch { /* ignore */ }
+
+    // Load configured providers
+    try {
+      configuredProviders.value = await api.listProviders()
+    } catch { /* ignore */ }
   } else {
     channelQRContent.value = ''
+    showAddProvider.value = false
+    addError.value = ''
+    deleteConfirmId.value = ''
   }
 })
 
@@ -146,11 +169,78 @@ function pollChannelState() {
 
 const tabLabel: Record<string, string> = {
   general: 'General',
+  providers: 'Providers',
   mcp: 'MCP Servers',
   ssh: 'SSH',
   channels: 'Channels',
   shortcuts: 'Shortcuts',
 }
+
+async function startAddProvider() {
+  showAddProvider.value = true
+  addProviderStep.value = 'select'
+  addSelectedProvider.value = ''
+  addSelectedModel.value = ''
+  addApiKey.value = ''
+  addBaseURL.value = ''
+  addError.value = ''
+  addLoading.value = true
+  try {
+    addProviderList.value = await api.setupProviders()
+  } catch { /* ignore */ }
+  addLoading.value = false
+}
+
+async function selectAddProvider(id: string) {
+  addSelectedProvider.value = id
+  addLoading.value = true
+  addError.value = ''
+  try {
+    addProviderModels.value = await api.setupProviderModels(id)
+    addProviderStep.value = 'model'
+  } catch {
+    addError.value = 'Failed to load models'
+  }
+  addLoading.value = false
+}
+
+function selectAddModel(id: string) {
+  addSelectedModel.value = id
+  addProviderStep.value = 'apikey'
+}
+
+async function submitAddProvider() {
+  addLoading.value = true
+  addError.value = ''
+  try {
+    await api.addProvider({
+      id: addSelectedProvider.value,
+      api_key: addApiKey.value,
+      base_url: addBaseURL.value || undefined,
+    })
+    // Refresh provider list
+    configuredProviders.value = await api.listProviders()
+    showAddProvider.value = false
+    // Also refresh models in the chat store
+    store.fetchModels()
+  } catch (err: unknown) {
+    addError.value = err instanceof Error ? err.message : 'Failed to add provider'
+  }
+  addLoading.value = false
+}
+
+async function deleteProvider(id: string) {
+  try {
+    await api.deleteProvider(id)
+    configuredProviders.value = configuredProviders.value.filter(p => p.id !== id)
+    deleteConfirmId.value = ''
+    store.fetchModels()
+  } catch (err: unknown) {
+    console.error('Failed to delete provider:', err)
+  }
+}
+
+const addProviderInfo = () => addProviderList.value.find(p => p.id === addSelectedProvider.value)
 </script>
 
 <template>
@@ -183,7 +273,7 @@ const tabLabel: Record<string, string> = {
               <!-- Left sidebar -->
               <nav class="w-40 border-r border-zinc-200 dark:border-zinc-800 py-2 shrink-0">
                 <button
-                  v-for="tab in (['general', 'mcp', 'ssh', 'channels', 'shortcuts'] as const)"
+                  v-for="tab in (['general', 'providers', 'mcp', 'ssh', 'channels', 'shortcuts'] as const)"
                   :key="tab"
                   class="w-full px-4 py-2 text-left text-xs transition-colors cursor-pointer"
                   :class="activeTab === tab
@@ -251,6 +341,126 @@ const tabLabel: Record<string, string> = {
                   </div>
                 </div>
 
+                <!-- Providers tab -->
+                <div v-if="activeTab === 'providers'">
+                  <div class="flex items-center justify-between mb-3">
+                    <div class="text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider font-medium">Providers</div>
+                    <button
+                      class="px-2 py-1 text-[10px] bg-emerald-500 hover:bg-emerald-600 text-white rounded-md cursor-pointer transition-colors font-medium"
+                      @click="startAddProvider"
+                    >
+                      + Add Provider
+                    </button>
+                  </div>
+
+                  <!-- Add provider flow -->
+                  <div v-if="showAddProvider" class="mb-4 border border-zinc-200 dark:border-zinc-700 rounded-md overflow-hidden">
+                    <div class="px-3 py-2 bg-zinc-50 dark:bg-zinc-800/60 border-b border-zinc-200 dark:border-zinc-700 flex items-center justify-between">
+                      <span class="text-[10px] text-zinc-500 dark:text-zinc-400 font-medium uppercase tracking-wider">
+                        {{ addProviderStep === 'select' ? 'Select Provider' : addProviderStep === 'model' ? 'Select Model' : 'Enter API Key' }}
+                      </span>
+                      <button class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 cursor-pointer text-xs" @click="showAddProvider = false">✕</button>
+                    </div>
+                    <div class="p-3 max-h-48 overflow-y-auto">
+                      <!-- Select provider -->
+                      <div v-if="addProviderStep === 'select'">
+                        <div v-if="addLoading" class="text-center py-4 text-xs text-zinc-400 animate-pulse">Loading...</div>
+                        <div v-else class="space-y-1">
+                          <button
+                            v-for="p in addProviderList.filter(x => !configuredProviders.some(c => c.id === x.id))"
+                            :key="p.id"
+                            class="w-full px-2.5 py-2 text-left rounded-md text-xs cursor-pointer transition-colors hover:bg-emerald-50 dark:hover:bg-emerald-500/10"
+                            @click="selectAddProvider(p.id)"
+                          >
+                            <span class="font-medium text-zinc-700 dark:text-zinc-200">{{ p.name }}</span>
+                            <span class="text-zinc-400 dark:text-zinc-500 ml-1.5 font-mono">{{ p.id }}</span>
+                          </button>
+                          <div v-if="addProviderList.filter(x => !configuredProviders.some(c => c.id === x.id)).length === 0" class="text-center py-3 text-[10px] text-zinc-400">
+                            All providers configured
+                          </div>
+                        </div>
+                      </div>
+                      <!-- Select model -->
+                      <div v-if="addProviderStep === 'model'">
+                        <div class="flex items-center gap-1 mb-2">
+                          <button class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 cursor-pointer" @click="addProviderStep = 'select'">
+                            <svg class="w-3.5 h-3.5" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" /></svg>
+                          </button>
+                          <span class="text-[10px] text-zinc-500">{{ addProviderInfo()?.name }}</span>
+                        </div>
+                        <div v-if="addLoading" class="text-center py-4 text-xs text-zinc-400 animate-pulse">Loading...</div>
+                        <div v-else class="space-y-1">
+                          <button
+                            v-for="m in addProviderModels"
+                            :key="m.id"
+                            class="w-full px-2.5 py-1.5 text-left rounded-md text-xs cursor-pointer transition-colors hover:bg-emerald-50 dark:hover:bg-emerald-500/10 font-mono"
+                            @click="selectAddModel(m.id)"
+                          >
+                            {{ m.id }}
+                          </button>
+                        </div>
+                      </div>
+                      <!-- Enter API key -->
+                      <div v-if="addProviderStep === 'apikey'" class="space-y-2">
+                        <div class="flex items-center gap-1 mb-1">
+                          <button class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 cursor-pointer" @click="addProviderStep = 'model'">
+                            <svg class="w-3.5 h-3.5" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" /></svg>
+                          </button>
+                          <span class="text-[10px] text-zinc-500 font-mono">{{ addSelectedProvider }} / {{ addSelectedModel }}</span>
+                        </div>
+                        <input v-model="addApiKey" type="password" placeholder="API Key" class="w-full px-2.5 py-1.5 text-xs font-mono bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-md outline-none focus:border-emerald-400" @keydown.enter="submitAddProvider" />
+                        <input v-model="addBaseURL" type="text" placeholder="Base URL (optional)" class="w-full px-2.5 py-1.5 text-xs font-mono bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-md outline-none focus:border-emerald-400" @keydown.enter="submitAddProvider" />
+                        <div v-if="addError" class="text-[10px] text-red-500">{{ addError }}</div>
+                        <button :disabled="addLoading || !addApiKey" class="w-full px-2.5 py-1.5 text-xs bg-emerald-500 hover:bg-emerald-600 disabled:opacity-50 text-white rounded-md cursor-pointer transition-colors font-medium" @click="submitAddProvider">
+                          {{ addLoading ? 'Saving...' : 'Add' }}
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- Provider list -->
+                  <div v-if="configuredProviders.length === 0" class="text-center py-6">
+                    <div class="text-xs text-zinc-400 dark:text-zinc-500 mb-1">No providers configured</div>
+                    <div class="text-[10px] text-zinc-400 dark:text-zinc-600">
+                      Click "Add Provider" above to get started.
+                    </div>
+                  </div>
+                  <div v-else class="space-y-2">
+                    <div
+                      v-for="p in configuredProviders"
+                      :key="p.id"
+                      class="flex items-center gap-3 px-3 py-2.5 rounded-md border border-zinc-200 dark:border-zinc-700/60 bg-white dark:bg-zinc-800/60"
+                    >
+                      <span class="text-sm">🔑</span>
+                      <div class="flex-1 min-w-0">
+                        <div class="text-xs font-medium text-zinc-700 dark:text-zinc-200 font-mono">{{ p.id }}</div>
+                        <div class="text-[10px] text-zinc-400 dark:text-zinc-500 font-mono truncate">
+                          {{ p.api_key || '—' }}
+                          <template v-if="p.base_url"> · {{ p.base_url }}</template>
+                        </div>
+                      </div>
+                      <span
+                        v-if="store.providerName === p.id"
+                        class="text-[10px] px-1.5 py-0.5 rounded-full bg-emerald-100 dark:bg-emerald-500/15 text-emerald-700 dark:text-emerald-400"
+                      >
+                        active
+                      </span>
+                      <button
+                        v-if="deleteConfirmId !== p.id"
+                        class="text-zinc-300 dark:text-zinc-600 hover:text-red-400 dark:hover:text-red-400 cursor-pointer transition-colors"
+                        title="Remove provider"
+                        @click="deleteConfirmId = p.id"
+                      >
+                        <svg class="w-3.5 h-3.5" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M8.75 1A2.75 2.75 0 006 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 10.23 1.482l.149-.022.841 10.518A2.75 2.75 0 007.596 19h4.807a2.75 2.75 0 002.742-2.53l.841-10.519.149.023a.75.75 0 00.23-1.482A41.03 41.03 0 0014 4.193V3.75A2.75 2.75 0 0011.25 1h-2.5zM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4zM8.58 7.72a.75.75 0 00-1.5.06l.3 7.5a.75.75 0 101.5-.06l-.3-7.5zm4.34.06a.75.75 0 10-1.5-.06l-.3 7.5a.75.75 0 101.5.06l.3-7.5z" clip-rule="evenodd" /></svg>
+                      </button>
+                      <div v-else class="flex items-center gap-1">
+                        <button class="text-[10px] px-1.5 py-0.5 bg-red-500 text-white rounded cursor-pointer" @click="deleteProvider(p.id)">Delete</button>
+                        <button class="text-[10px] px-1.5 py-0.5 text-zinc-400 hover:text-zinc-600 cursor-pointer" @click="deleteConfirmId = ''">Cancel</button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
                 <!-- MCP Servers tab -->
                 <div v-if="activeTab === 'mcp'">
                   <div class="text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider mb-3 font-medium">MCP Servers</div>
diff --git a/web/src/components/SetupView.vue b/web/src/components/SetupView.vue
new file mode 100644
index 0000000..82ed271
--- /dev/null
+++ b/web/src/components/SetupView.vue
@@ -0,0 +1,378 @@
+<script setup lang="ts">
+import { ref, computed, onMounted, nextTick } from 'vue'
+import { useChatStore } from '@/stores/chat'
+import { api } from '@/composables/api'
+import type { SetupProvider, SetupModel } from '@/types/api'
+
+const emit = defineEmits<{
+  complete: []
+}>()
+
+const store = useChatStore()
+
+type Step = 'provider' | 'model' | 'apikey' | 'done'
+const step = ref<Step>('provider')
+const loading = ref(false)
+const error = ref('')
+
+// Step 1: Provider selection
+const providers = ref<SetupProvider[]>([])
+const selectedProvider = ref('')
+const providerSearch = ref('')
+
+// Step 2: Model selection
+const models = ref<SetupModel[]>([])
+const selectedModel = ref('')
+const modelSearch = ref('')
+
+// Step 3: API Key
+const apiKey = ref('')
+const baseURL = ref('')
+const showApiKey = ref(false)
+const validating = ref(false)
+const validationResult = ref<{ valid: boolean; error?: string } | null>(null)
+
+const filteredProviders = computed(() => {
+  const q = providerSearch.value.toLowerCase()
+  return providers.value.filter(p =>
+    p.name.toLowerCase().includes(q) || p.id.toLowerCase().includes(q)
+  )
+})
+
+const filteredModels = computed(() => {
+  const q = modelSearch.value.toLowerCase()
+  return models.value.filter(m =>
+    m.name.toLowerCase().includes(q) || m.id.toLowerCase().includes(q)
+  )
+})
+
+const selectedProviderInfo = computed(() =>
+  providers.value.find(p => p.id === selectedProvider.value)
+)
+
+onMounted(async () => {
+  loading.value = true
+  try {
+    providers.value = await api.setupProviders()
+  } catch (err) {
+    error.value = 'Failed to load providers'
+  }
+  loading.value = false
+})
+
+async function selectProvider(id: string) {
+  selectedProvider.value = id
+  loading.value = true
+  error.value = ''
+  try {
+    models.value = await api.setupProviderModels(id)
+    step.value = 'model'
+    modelSearch.value = ''
+  } catch (err) {
+    error.value = 'Failed to load models'
+  }
+  loading.value = false
+}
+
+function selectModel(id: string) {
+  selectedModel.value = id
+  step.value = 'apikey'
+  // Auto-fill base URL from provider info if available
+  const prov = selectedProviderInfo.value
+  if (prov?.api && !baseURL.value) {
+    baseURL.value = ''
+    // Don't auto-fill, the backend will use the default
+  }
+}
+
+function goBack() {
+  error.value = ''
+  validationResult.value = null
+  if (step.value === 'model') {
+    step.value = 'provider'
+    selectedProvider.value = ''
+    models.value = []
+  } else if (step.value === 'apikey') {
+    step.value = 'model'
+    selectedModel.value = ''
+  }
+}
+
+async function validateConnection() {
+  if (!apiKey.value.trim()) return
+  validating.value = true
+  validationResult.value = null
+  try {
+    validationResult.value = await api.setupValidate({
+      provider: selectedProvider.value,
+      api_key: apiKey.value.trim(),
+      base_url: baseURL.value.trim() || undefined,
+    })
+  } catch (err: unknown) {
+    validationResult.value = { valid: false, error: err instanceof Error ? err.message : 'Validation failed' }
+  }
+  validating.value = false
+}
+
+async function submitSetup() {
+  if (!apiKey.value.trim()) {
+    error.value = 'API Key is required'
+    return
+  }
+  loading.value = true
+  error.value = ''
+  try {
+    await api.setupComplete({
+      provider: selectedProvider.value,
+      model: selectedModel.value,
+      api_key: apiKey.value.trim(),
+      base_url: baseURL.value.trim() || undefined,
+    })
+    step.value = 'done'
+    // Update store state
+    store.providerName = selectedProvider.value
+    store.modelName = selectedModel.value
+    // Refresh models list
+    store.fetchModels()
+  } catch (err: unknown) {
+    error.value = err instanceof Error ? err.message : 'Setup failed'
+  }
+  loading.value = false
+}
+
+function finish() {
+  emit('complete')
+}
+</script>
+
+<template>
+  <div class="fixed inset-0 bg-zinc-50 dark:bg-zinc-950 flex items-center justify-center z-50">
+    <div class="w-full max-w-lg mx-auto px-6">
+      <!-- Logo -->
+      <div class="flex items-center justify-center gap-0 mb-8 select-none" style="font-family: 'JetBrains Mono', ui-monospace, SFMono-Regular, 'Roboto Mono', Menlo, Monaco, monospace; font-size: 32px; font-weight: 700;">
+        <span class="text-zinc-400 dark:text-zinc-500">[</span><span style="color: #FF8400;">J</span><span class="text-zinc-900 dark:text-zinc-300">CODE</span><span class="text-zinc-400 dark:text-zinc-500">]</span>
+      </div>
+
+      <!-- Done state -->
+      <div v-if="step === 'done'" class="text-center animate-fade-in">
+        <div class="w-16 h-16 rounded-full bg-emerald-100 dark:bg-emerald-500/15 flex items-center justify-center mx-auto mb-5">
+          <svg class="w-8 h-8 text-emerald-600 dark:text-emerald-400" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round">
+            <path d="M5 13l4 4L19 7" />
+          </svg>
+        </div>
+        <h2 class="text-xl font-semibold text-zinc-800 dark:text-zinc-100 mb-2" style="font-family: var(--font-sans)">You're all set!</h2>
+        <p class="text-sm text-zinc-500 dark:text-zinc-400 mb-6">
+          Using <span class="font-mono text-zinc-700 dark:text-zinc-300">{{ selectedModel }}</span> via <span class="font-mono text-zinc-700 dark:text-zinc-300">{{ selectedProviderInfo?.name || selectedProvider }}</span>
+        </p>
+        <button
+          class="px-6 py-2.5 bg-emerald-500 hover:bg-emerald-600 text-white rounded-lg text-sm font-medium transition-colors cursor-pointer shadow-sm"
+          @click="finish"
+        >
+          Start coding
+        </button>
+      </div>
+
+      <!-- Setup steps -->
+      <div v-else class="bg-white dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-700 rounded-xl shadow-sm overflow-hidden">
+        <!-- Step indicator -->
+        <div class="flex items-center gap-2 px-6 pt-5 pb-3">
+          <div class="flex items-center gap-1.5">
+            <div
+              v-for="s in (['provider', 'model', 'apikey'] as const)"
+              :key="s"
+              class="w-2 h-2 rounded-full transition-colors"
+              :class="step === s ? 'bg-emerald-500' : ['provider', 'model', 'apikey'].indexOf(step) > ['provider', 'model', 'apikey'].indexOf(s) ? 'bg-emerald-400' : 'bg-zinc-300 dark:bg-zinc-600'"
+            />
+          </div>
+          <span class="text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider ml-auto">
+            {{ step === 'provider' ? 'Step 1: Choose Provider' : step === 'model' ? 'Step 2: Choose Model' : 'Step 3: API Key' }}
+          </span>
+        </div>
+
+        <!-- Provider selection -->
+        <div v-if="step === 'provider'" class="px-6 pb-5">
+          <h2 class="text-base font-semibold text-zinc-800 dark:text-zinc-100 mb-1" style="font-family: var(--font-sans)">Choose a Provider</h2>
+          <p class="text-xs text-zinc-500 dark:text-zinc-400 mb-3">Select the AI provider you'd like to use.</p>
+
+          <input
+            v-model="providerSearch"
+            type="text"
+            placeholder="Search providers..."
+            class="w-full px-3 py-2 text-sm bg-zinc-50 dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg mb-3 outline-none focus:border-emerald-400 dark:focus:border-emerald-500 transition-colors"
+          />
+
+          <div v-if="loading" class="text-center py-8 text-sm text-zinc-400 animate-pulse">Loading providers...</div>
+          <div v-else-if="filteredProviders.length === 0" class="text-center py-8 text-sm text-zinc-400">No providers found</div>
+          <div v-else class="space-y-1.5 max-h-72 overflow-y-auto pr-1">
+            <button
+              v-for="p in filteredProviders"
+              :key="p.id"
+              class="w-full px-4 py-3 text-left rounded-lg border transition-all cursor-pointer group"
+              :class="selectedProvider === p.id
+                ? 'border-emerald-400 dark:border-emerald-500 bg-emerald-50 dark:bg-emerald-500/10'
+                : 'border-zinc-200 dark:border-zinc-700 hover:border-emerald-300 dark:hover:border-emerald-600 hover:bg-zinc-50 dark:hover:bg-zinc-800'"
+              @click="selectProvider(p.id)"
+            >
+              <div class="flex items-center justify-between">
+                <div>
+                  <div class="text-sm font-medium text-zinc-800 dark:text-zinc-100">{{ p.name }}</div>
+                  <div v-if="p.doc" class="text-[10px] text-zinc-400 dark:text-zinc-500 mt-0.5">{{ p.doc }}</div>
+                </div>
+                <div class="flex items-center gap-2">
+                  <span v-if="p.tag === 'recommended'" class="text-[10px] px-1.5 py-0.5 rounded-full bg-amber-100 dark:bg-amber-500/15 text-amber-600 dark:text-amber-400 font-medium">Recommended</span>
+                  <span v-if="p.tag === 'local'" class="text-[10px] px-1.5 py-0.5 rounded-full bg-blue-100 dark:bg-blue-500/15 text-blue-600 dark:text-blue-400 font-medium">Local</span>
+                  <span v-if="p.configured" class="text-[10px] px-1.5 py-0.5 rounded-full bg-emerald-100 dark:bg-emerald-500/15 text-emerald-600 dark:text-emerald-400 font-medium">configured</span>
+                  <svg class="w-4 h-4 text-zinc-300 dark:text-zinc-600 group-hover:text-emerald-400 transition-colors" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
+                  </svg>
+                </div>
+              </div>
+            </button>
+          </div>
+        </div>
+
+        <!-- Model selection -->
+        <div v-if="step === 'model'" class="px-6 pb-5">
+          <div class="flex items-center gap-2 mb-1">
+            <button class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 transition-colors cursor-pointer" @click="goBack">
+              <svg class="w-4 h-4" viewBox="0 0 20 20" fill="currentColor">
+                <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
+              </svg>
+            </button>
+            <h2 class="text-base font-semibold text-zinc-800 dark:text-zinc-100" style="font-family: var(--font-sans)">Choose a Model</h2>
+          </div>
+          <p class="text-xs text-zinc-500 dark:text-zinc-400 mb-3 ml-6">For <span class="font-mono">{{ selectedProviderInfo?.name }}</span></p>
+
+          <input
+            v-model="modelSearch"
+            type="text"
+            placeholder="Search models..."
+            class="w-full px-3 py-2 text-sm bg-zinc-50 dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg mb-3 outline-none focus:border-emerald-400 dark:focus:border-emerald-500 transition-colors"
+          />
+
+          <div v-if="loading" class="text-center py-8 text-sm text-zinc-400 animate-pulse">Loading models...</div>
+          <div v-else-if="filteredModels.length === 0" class="text-center py-8 text-sm text-zinc-400">No models found</div>
+          <div v-else class="space-y-1 max-h-72 overflow-y-auto pr-1">
+            <button
+              v-for="m in filteredModels"
+              :key="m.id"
+              class="w-full px-4 py-2.5 text-left rounded-lg border transition-all cursor-pointer"
+              :class="selectedModel === m.id
+                ? 'border-emerald-400 dark:border-emerald-500 bg-emerald-50 dark:bg-emerald-500/10'
+                : 'border-zinc-200 dark:border-zinc-700 hover:border-emerald-300 dark:hover:border-emerald-600 hover:bg-zinc-50 dark:hover:bg-zinc-800'"
+              @click="selectModel(m.id)"
+            >
+              <div class="flex items-center justify-between">
+                <div>
+                  <div class="text-sm font-medium text-zinc-800 dark:text-zinc-100 font-mono">{{ m.id }}</div>
+                  <div v-if="m.name && m.name !== m.id" class="text-[10px] text-zinc-400 dark:text-zinc-500 mt-0.5">{{ m.name }}</div>
+                </div>
+                <div class="flex items-center gap-2">
+                  <span v-if="m.context_limit" class="text-[10px] text-zinc-400 dark:text-zinc-500">{{ (m.context_limit / 1000).toFixed(0) }}k ctx</span>
+                  <span v-if="m.reasoning" class="text-[10px] px-1.5 py-0.5 rounded-full bg-blue-100 dark:bg-blue-500/15 text-blue-600 dark:text-blue-400">reasoning</span>
+                  <svg class="w-4 h-4 text-zinc-300 dark:text-zinc-600" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
+                  </svg>
+                </div>
+              </div>
+            </button>
+          </div>
+        </div>
+
+        <!-- API Key input -->
+        <div v-if="step === 'apikey'" class="px-6 pb-5">
+          <div class="flex items-center gap-2 mb-1">
+            <button class="text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 transition-colors cursor-pointer" @click="goBack">
+              <svg class="w-4 h-4" viewBox="0 0 20 20" fill="currentColor">
+                <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
+              </svg>
+            </button>
+            <h2 class="text-base font-semibold text-zinc-800 dark:text-zinc-100" style="font-family: var(--font-sans)">Enter API Key</h2>
+          </div>
+          <p class="text-xs text-zinc-500 dark:text-zinc-400 mb-4 ml-6">
+            For <span class="font-mono">{{ selectedProviderInfo?.name }}</span> · <span class="font-mono">{{ selectedModel }}</span>
+          </p>
+
+          <div class="space-y-3 ml-6">
+            <div v-if="selectedProviderInfo?.env?.length" class="px-3 py-2 rounded-md bg-zinc-50 dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700">
+              <div class="text-[10px] text-zinc-400 dark:text-zinc-500 mb-1">Environment variable</div>
+              <div class="text-xs font-mono text-zinc-600 dark:text-zinc-300">{{ selectedProviderInfo.env[0] }}</div>
+            </div>
+
+            <div>
+              <label class="block text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider mb-1 font-medium">API Key</label>
+              <div class="relative">
+                <input
+                  v-model="apiKey"
+                  :type="showApiKey ? 'text' : 'password'"
+                  placeholder="sk-..."
+                  class="w-full px-3 py-2 text-sm font-mono bg-zinc-50 dark:bg-zinc-800 border rounded-lg outline-none transition-colors pr-10"
+                  :class="validationResult?.valid ? 'border-emerald-400 dark:border-emerald-500' : validationResult?.valid === false ? 'border-red-300 dark:border-red-500' : 'border-zinc-200 dark:border-zinc-700 focus:border-emerald-400 dark:focus:border-emerald-500'"
+                  @keydown.enter="submitSetup"
+                />
+                <button
+                  class="absolute right-2 top-1/2 -translate-y-1/2 text-zinc-400 hover:text-zinc-600 dark:hover:text-zinc-300 cursor-pointer"
+                  @click="showApiKey = !showApiKey"
+                >
+                  <svg v-if="!showApiKey" class="w-4 h-4" viewBox="0 0 20 20" fill="currentColor">
+                    <path d="M10 12.5a2.5 2.5 0 100-5 2.5 2.5 0 000 5z" />
+                    <path fill-rule="evenodd" d="M.664 10.59a1.651 1.651 0 010-1.186A10.004 10.004 0 0110 3c4.257 0 7.893 2.66 9.336 6.41.147.381.146.804 0 1.186A10.004 10.004 0 0110 17c-4.257 0-7.893-2.66-9.336-6.41zM14 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd" />
+                  </svg>
+                  <svg v-else class="w-4 h-4" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M3.28 2.22a.75.75 0 00-1.06 1.06l14.5 14.5a.75.75 0 101.06-1.06l-14.5-14.5z" clip-rule="evenodd" />
+                    <path d="M4.262 6.49A8.97 8.97 0 002.175 10.3a1.655 1.655 0 000 .4 10.004 10.004 0 007.548 5.953 8.97 8.97 0 004.988-.628l-1.446-1.446a4.003 4.003 0 01-5.54-5.54L4.262 6.49z" />
+                  </svg>
+                </button>
+              </div>
+            </div>
+
+            <div>
+              <label class="block text-[10px] text-zinc-400 dark:text-zinc-500 uppercase tracking-wider mb-1 font-medium">Base URL <span class="normal-case">(optional)</span></label>
+              <input
+                v-model="baseURL"
+                type="text"
+                :placeholder="selectedProviderInfo?.api || 'https://api.example.com/v1'"
+                class="w-full px-3 py-2 text-sm font-mono bg-zinc-50 dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 rounded-lg outline-none focus:border-emerald-400 dark:focus:border-emerald-500 transition-colors"
+                @keydown.enter="submitSetup"
+              />
+            </div>
+
+            <!-- Validate connection -->
+            <div class="flex items-center gap-2">
+              <button
+                :disabled="validating || !apiKey.trim()"
+                class="px-3 py-1.5 text-xs border border-zinc-200 dark:border-zinc-700 rounded-lg hover:bg-zinc-50 dark:hover:bg-zinc-800 disabled:opacity-50 cursor-pointer transition-colors text-zinc-600 dark:text-zinc-300"
+                @click="validateConnection"
+              >
+                {{ validating ? 'Checking...' : 'Test Connection' }}
+              </button>
+              <span v-if="validationResult?.valid" class="text-xs text-emerald-600 dark:text-emerald-400 flex items-center gap-1">
+                <svg class="w-3.5 h-3.5" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z" clip-rule="evenodd" /></svg>
+                Connected
+              </span>
+              <span v-if="validationResult?.valid === false" class="text-xs text-red-500">{{ validationResult.error }}</span>
+            </div>
+
+            <!-- Error -->
+            <div v-if="error" class="px-3 py-2 rounded-md bg-red-50 dark:bg-red-500/10 border border-red-200 dark:border-red-500/30">
+              <span class="text-xs text-red-600 dark:text-red-400">{{ error }}</span>
+            </div>
+
+            <button
+              :disabled="loading || !apiKey.trim()"
+              class="w-full px-4 py-2.5 bg-emerald-500 hover:bg-emerald-600 disabled:opacity-50 disabled:cursor-not-allowed text-white rounded-lg text-sm font-medium transition-colors cursor-pointer shadow-sm"
+              @click="submitSetup"
+            >
+              {{ loading ? 'Setting up...' : 'Complete Setup' }}
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- Footer hint -->
+      <p v-if="step !== 'done'" class="text-center text-[10px] text-zinc-400 dark:text-zinc-600 mt-4">
+        Configuration saved to <span class="font-mono">~/.jcode/config.json</span>
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/web/src/composables/api.ts b/web/src/composables/api.ts
index a5ea313..372a63d 100644
--- a/web/src/composables/api.ts
+++ b/web/src/composables/api.ts
@@ -1,5 +1,5 @@
 // API client for jcode backend
-import type { ModelsResponse, AgentMode, ExecResponse, DiffResponse, MCPListResponse, BrowseResponse, SSHListResponse, SkillInfo, TodoItem, SessionItem, SessionEntry, FileItem } from '@/types/api'
+import type { ModelsResponse, AgentMode, ExecResponse, DiffResponse, MCPListResponse, BrowseResponse, SSHListResponse, SkillInfo, TodoItem, SessionItem, SessionEntry, FileItem, SetupProvider, SetupModel, ProviderDetail, ModelStateResponse } from '@/types/api'
 
 const BASE = ''
 
@@ -123,4 +123,47 @@ export const api = {
     request<{ status: string; state: string }>('/api/channel/enable', { method: 'POST' }),
   channelDisable: () =>
     request<{ status: string; state: string }>('/api/channel/disable', { method: 'POST' }),
+
+  // Setup API
+  setupProviders: () =>
+    request<SetupProvider[]>('/api/setup/providers'),
+  setupProviderModels: (providerId: string) =>
+    request<SetupModel[]>(`/api/setup/providers/${encodeURIComponent(providerId)}/models`),
+  setupComplete: (data: { provider: string; model: string; api_key: string; base_url?: string }) =>
+    request<{ status: string; provider: string; model: string }>('/api/setup/complete', {
+      method: 'POST',
+      body: JSON.stringify(data),
+    }),
+  setupStatus: () =>
+    request<{ needs_setup: boolean }>('/api/setup/status'),
+  setupValidate: (data: { provider: string; api_key: string; base_url?: string }) =>
+    request<{ valid: boolean; error?: string }>('/api/setup/validate', {
+      method: 'POST',
+      body: JSON.stringify(data),
+    }),
+
+  // Provider management
+  listProviders: () =>
+    request<ProviderDetail[]>('/api/providers'),
+  addProvider: (data: { id: string; api_key: string; base_url?: string }) =>
+    request<{ status: string }>('/api/providers', {
+      method: 'POST',
+      body: JSON.stringify(data),
+    }),
+  deleteProvider: (id: string) =>
+    request<{ status: string }>(`/api/providers/${encodeURIComponent(id)}`, { method: 'DELETE' }),
+
+  // Model state
+  modelState: () =>
+    request<ModelStateResponse>('/api/model-state'),
+  toggleFavorite: (provider: string, model: string) =>
+    request<{ favorite: boolean }>('/api/model-state/favorite', {
+      method: 'POST',
+      body: JSON.stringify({ provider, model }),
+    }),
+  toggleModelEnabled: (provider: string, model: string, enabled: boolean) =>
+    request<{ enabled: boolean }>('/api/model-state/enabled', {
+      method: 'POST',
+      body: JSON.stringify({ provider, model, enabled }),
+    }),
 }
diff --git a/web/src/stores/chat.ts b/web/src/stores/chat.ts
index e1b1cc3..4d13b2d 100644
--- a/web/src/stores/chat.ts
+++ b/web/src/stores/chat.ts
@@ -11,6 +11,7 @@ import type {
   AgentMode,
   ProviderInfo,
   ToolDisplayInfo,
+  ModelRef,
 } from '@/types/api'
 import { api } from '@/composables/api'
 import { extractToolDisplayInfo } from '@/composables/toolInfo'
@@ -54,6 +55,10 @@ export const useChatStore = defineStore('chat', () => {
   const channelAvailable = ref(false)
   const channelEnabled = ref(false)
 
+  // Model favorites & recent
+  const favoriteModels = ref<Set<string>>(new Set())
+  const recentModels = ref<ModelRef[]>([])
+
   // Current session tracking
   const currentSessionId = ref('')
 
@@ -314,6 +319,7 @@ export const useChatStore = defineStore('chat', () => {
       mode.value = m === 'build' ? 'agent' : (m as AgentMode)
       currentSessionId.value = h.session_id || ''
       isRunning.value = h.running || false
+      return h
     } catch (err) {
       console.error('Failed to fetch health:', err)
     }
@@ -400,6 +406,67 @@ export const useChatStore = defineStore('chat', () => {
     }
   }
 
+  async function fetchModelState() {
+    try {
+      const data = await api.modelState()
+      recentModels.value = data.recent || []
+      const favs = new Set<string>()
+      for (const r of data.favorite || []) {
+        favs.add(`${r.provider}/${r.model}`)
+      }
+      favoriteModels.value = favs
+    } catch {
+      /* ignore */
+    }
+  }
+
+  async function toggleFavorite(provider: string, model: string) {
+    try {
+      const data = await api.toggleFavorite(provider, model)
+      const key = `${provider}/${model}`
+      const favs = new Set(favoriteModels.value)
+      if (data.favorite) {
+        favs.add(key)
+      } else {
+        favs.delete(key)
+      }
+      favoriteModels.value = favs
+    } catch {
+      /* ignore */
+    }
+  }
+
+  async function toggleModelEnabled(provider: string, model: string, enabled: boolean) {
+    try {
+      await api.toggleModelEnabled(provider, model, enabled)
+      // Update the local providers list to reflect the change
+      for (const p of providers.value) {
+        if (p.id === provider) {
+          const m = p.models.find(m => m.id === model)
+          if (m) {
+            m.enabled = enabled
+          }
+        }
+      }
+    } catch {
+      /* ignore */
+    }
+  }
+
+  function isFavorite(provider: string, model: string): boolean {
+    return favoriteModels.value.has(`${provider}/${model}`)
+  }
+
+  // Providers with only enabled models (for model picker)
+  const enabledProviders = computed(() => {
+    return providers.value
+      .map(p => ({
+        ...p,
+        models: p.models.filter(m => m.enabled !== false),
+      }))
+      .filter(p => p.models.length > 0)
+  })
+
   /** Restore the current session content if available (called on page load). */
   async function restoreCurrentSession() {
     if (!currentSessionId.value) return
@@ -582,5 +649,12 @@ export const useChatStore = defineStore('chat', () => {
     fetchChannelState,
     toggleChannel,
     restoreCurrentSession,
+    fetchModelState,
+    toggleFavorite,
+    toggleModelEnabled,
+    isFavorite,
+    recentModels,
+    favoriteModels,
+    enabledProviders,
   }
 })
diff --git a/web/src/types/api.ts b/web/src/types/api.ts
index 0f75549..24c9853 100644
--- a/web/src/types/api.ts
+++ b/web/src/types/api.ts
@@ -90,6 +90,10 @@ export interface ModelInfo {
   name: string
   tool_call: boolean
   context_limit?: number
+  reasoning?: boolean
+  recommended?: boolean
+  default_enabled?: boolean
+  enabled?: boolean
 }
 
 export interface ProviderInfo {
@@ -272,3 +276,42 @@ export interface BrowseResponse {
   current: string
   folders: BrowseFolder[]
 }
+
+// Setup types
+export interface SetupProvider {
+  id: string
+  name: string
+  doc?: string
+  api?: string
+  env?: string[]
+  configured: boolean
+  tag?: string // "recommended", "local", etc.
+}
+
+export interface SetupModel {
+  id: string
+  name: string
+  tool_call: boolean
+  context_limit?: number
+  reasoning?: boolean
+}
+
+export interface ProviderDetail {
+  id: string
+  api_key_set: boolean
+  api_key?: string
+  base_url?: string
+}
+
+// Model state types
+export interface ModelRef {
+  provider: string
+  model: string
+}
+
+export interface ModelStateResponse {
+  recent: ModelRef[]
+  favorite: ModelRef[]
+  enabled_models: ModelRef[]
+  disabled_models: ModelRef[]
+}