README.md

@@ -297,13 +297,12 @@ Background subagents that run alongside your main session. Each one is a separat
 
 ### `/settings`
 
-Opens a dialog with every persistent setting. `up`/`down` to navigate, `enter` or `space` to change the selected row, `esc` to close (rows that open a sub-view, like model shortcuts, use `esc` to go back one level first). Changes are written to `$ZOT_HOME/config.json` and take effect on the next turn (no restart needed). Current settings:
+Opens a dialog with every persistent setting. `up`/`down` to navigate, `enter` or `space` to change the selected row, `esc` to close. Changes are written to `$ZOT_HOME/config.json` and take effect on the next turn (no restart needed). Current settings:
 
 - **render images when supported** — draw screenshots / `read`-returned images inline using the terminal's image protocol, or fall back to a text placeholder. Auto-detected from `TERM_PROGRAM`; the toggle overrides the detection. The row is greyed out and forced off on terminals that don't speak any image protocol.
 - **auto-swarm** — let the main agent spawn background sub-agents in parallel via a built-in `swarm_spawn` tool. Off by default. When on, the tool is registered with the running agent, the system prompt gains a short addendum telling the model to delegate independent sub-tasks proactively, and zot watches every sub-agent the main agent spawns. As soon as the last sub-agent in a batch finishes its initial task, an `[auto-swarm update]` message is injected back into the chat with each agent's status / task / transcript tail, so the main agent can summarise the collective outcome. Flipping off mid-session removes the tool from the live agent and strips the addendum on the next turn — the model stops trying to delegate. See `/swarm` for the dashboard that lets you monitor, message, kill, or remove the spawned agents.
 - **thinking level** — choose reasoning for supported models: off (default; no reasoning), minimum (~1k tokens), low (~2k), medium (~8k), high (~16k), maximum (~32k). The change is persisted to `config.json` and applied to the running agent's next model call.
 - **color theme** — choose the built-in auto/dark/light theme or any JSON theme discovered under `$ZOT_HOME/themes` or a loaded extension. Theme files can override any subset of UI colors, syntax colors, and spinner frames/messages. Changes apply immediately; if a selected theme file is deleted, zot resets to auto. See [docs/themes.md](docs/themes.md).
-- **model shortcuts** — opens a sub-view with nine slots (`model 1` ... `model 9`). `enter` on a slot opens the same `/model` selector and binds the chosen provider/model to that slot; `backspace` clears a slot. Once assigned, press `Ctrl+1` ... `Ctrl+9` from the editor to switch the active model instantly (the same cross-provider swap `/model` performs, transcript and cost carried over). Assigning a shortcut does not change the current model. Shortcuts are skipped while a turn is running.
 
 ### `/skills`
 
@@ -579,7 +578,6 @@ Slash commands also work while the agent is busy. Read-only ones (`/help`, `/jum
 | `ctrl+l` | Redraw the screen. |
 | `ctrl+v` | Paste an image from the system clipboard through zot on macOS. Images are saved as temporary PNGs and attached to the next prompt. Other platforms currently use a no-op stub. Use your terminal/OS paste shortcut for text. |
 | `ctrl+o` | Expand or collapse long tool results (read, write, edit, bash outputs over ~12 lines). |
-| `ctrl+1` ... `ctrl+9` | Switch to the model bound to that quick-model slot (configured in `/settings` -> model shortcuts). No-op while a turn is running. |
 | `@` | Open the file picker. Browse files and directories in the working directory. |
 
 ### File picker (`@`)

packages/agent/args.go

@@ -340,7 +340,7 @@ func PrintHelp(version string) {
 	if useColor {
 		headline = th.AccentBar(th.Assistant) + assistant(tui.Bold("i'm zot. yet another coding agent harness."))
 	} else {
-		headline = "zot. yet another coding agent harness."
+		headline = "i'm zot. yet another coding agent harness."
 	}
 	fmt.Fprintln(os.Stderr, headline)
 	fmt.Fprintln(os.Stderr, muted("ask anything, or type /help inside the tui to see commands."))

packages/agent/cli.go

@@ -484,11 +484,9 @@ func runInteractive(ctx context.Context, args Args, version string) error {
 			return reg
 		}
 		reg["swarm_spawn"] = &tools.SwarmSpawnTool{
-			Swarm:           swarmMgr,
-			Enabled:         AutoSwarmEnabled,
-			DefaultModel:    func() string { return r.Model },
-			DefaultProvider: func() string { return r.Provider },
-			OnSpawned:       onSpawnedSwarm,
+			Swarm:     swarmMgr,
+			Enabled:   AutoSwarmEnabled,
+			OnSpawned: onSpawnedSwarm,
 		}
 		return reg
 	}
@@ -931,10 +929,6 @@ func runInteractive(ctx context.Context, args Args, version string) error {
 	}()
 
 	initialCfg, _ := LoadConfig()
-	quickModelShortcuts := make([]modes.QuickModelShortcut, len(initialCfg.QuickModelShortcuts))
-	for idx, s := range initialCfg.QuickModelShortcuts {
-		quickModelShortcuts[idx] = modes.QuickModelShortcut{Provider: s.Provider, Model: s.Model}
-	}
 	theme, _, themeErr := tui.DetectThemeWithCustom(ZotHome(), initialCfg.Theme, 80*time.Millisecond)
 	if themeErr != nil {
 		fmt.Fprintln(os.Stderr, "theme load:", themeErr)
@@ -962,7 +956,6 @@ func runInteractive(ctx context.Context, args Args, version string) error {
 		Theme:                      theme,
 		InlineImagesEnabled:        initialCfg.InlineImagesEnabled,
 		AutoSwarmEnabled:           initialCfg.AutoSwarmEnabled,
-		QuickModelShortcuts:        quickModelShortcuts,
 		RecursiveFileSuggest:       initialCfg.RecursiveFileSuggest,
 		RespectGitignore:           initialCfg.RespectGitignore,
 		ThemeName:                  initialCfg.Theme,

packages/agent/config.go

@@ -15,12 +15,6 @@ import (
 	"github.com/patriceckhart/zot/packages/provider/auth"
 )
 
-// QuickModelShortcut is one configured keyboard shortcut slot.
-type QuickModelShortcut struct {
-	Provider string `json:"provider"`
-	Model    string `json:"model"`
-}
-
 // Config is the persisted user configuration.
 type Config struct {
 	Provider    string   `json:"provider"`
@@ -29,10 +23,6 @@ type Config struct {
 	Temperature *float32 `json:"temperature,omitempty"`
 	Theme       string   `json:"theme"`
 
-	// QuickModelShortcuts maps slots 1-9 to provider/model pairs used by
-	// Ctrl+1..9. Cmd+1..9 may also work on terminals that forward Super.
-	QuickModelShortcuts []QuickModelShortcut `json:"quick_model_shortcuts,omitempty"`
-
 	// InlineImagesEnabled controls whether zot draws screenshots inline
 	// when the terminal supports an image protocol. nil/missing means
 	// auto (enabled when supported); false disables; true forces the

packages/agent/modes/interactive.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -60,12 +58,6 @@ type InteractiveConfig struct {
 
 	// ThemeName mirrors the persisted config theme value. Empty means auto.
 	ThemeName string
-
-	// QuickModelShortcuts maps slots 1-9 to provider/model pairs. The
-	// shortcuts are Ctrl+1..9. Cmd+1..9 may also work when the terminal
-	// forwards Command/Super keypresses, but Ctrl is the displayed chord.
-	QuickModelShortcuts []QuickModelShortcut
-
 	// ExtensionThemes returns themes bundled with loaded extensions.
 	ExtensionThemes func() []tui.ThemeOption
 
@@ -242,15 +234,8 @@ type chatCacheKey struct {
 	tailLimit       int
 }
 
-// QuickModelShortcut is one configured quick model switch slot.
-type QuickModelShortcut struct {
-	Provider string
-	Model    string
-}
-
 // SettingsStore persists user-toggleable settings surfaced by /settings.
 type SettingsStore interface {
-	SetQuickModelShortcut(slot int, providerName, model string) error
 	SetInlineImages(enabled bool) error
 	SetAutoSwarm(enabled bool) error
 	SetRecursiveFileSuggest(enabled bool) error
@@ -368,7 +353,6 @@ type Interactive struct {
 	logoutDialog      *logoutDialog
 	telegramDialog    *telegramDialog
 	settingsDialog    *settingsDialog
-	quickModelAssign  int
 	telegramBridge    *telegram.Bridge
 	sessionOpsDialog  *sessionOpsDialog
 	sessionTreeDialog *sessionTreeDialog
@@ -524,9 +508,6 @@ func NewInteractive(cfg InteractiveConfig) *Interactive {
 			i.view.TailLimit = initialResumeTailLimit
 		}
 	}
-	if cfg.AutoSwarmEnabled != nil && *cfg.AutoSwarmEnabled {
-		i.applyAutoSwarmTool(true)
-	}
 	return i
 }
 
@@ -1747,20 +1728,11 @@ func (i *Interactive) handleKey(ctx context.Context, k tui.Key) (done bool) {
 	if i.modelDialog.Active() {
 		if k.Kind == tui.KeyCtrlC {
 			i.modelDialog.Close()
-			i.quickModelAssign = 0
 			return false
 		}
 		act := i.modelDialog.HandleKey(k)
-		if act.Close {
-			i.quickModelAssign = 0
-		}
 		if act.Select {
-			if i.quickModelAssign > 0 {
-				i.applyQuickModelSelection(i.quickModelAssign, act.Provider, act.Model)
-				i.quickModelAssign = 0
-			} else {
-				i.applyModelSelection(act.Provider, act.Model)
-			}
+			i.applyModelSelection(act.Provider, act.Model)
 		}
 		return false
 	}
@@ -1843,9 +1815,6 @@ func (i *Interactive) handleKey(ctx context.Context, k tui.Key) (done bool) {
 			return false
 		}
 		act := i.settingsDialog.HandleKey(k)
-		if act.ModelShortcutSlot > 0 {
-			i.openQuickModelPicker(act.ModelShortcutSlot)
-		}
 		if act.Toggle {
 			i.applySettingChange(act)
 		}
@@ -1945,11 +1914,6 @@ func (i *Interactive) handleKey(ctx context.Context, k tui.Key) (done bool) {
 		return false
 	}
 
-	if slot := quickModelShortcutSlot(k); slot > 0 {
-		i.applyQuickModelShortcut(slot)
-		return false
-	}
-
 	// Global keys.
 	switch k.Kind {
 	case tui.KeyCtrlC:
@@ -2806,7 +2770,6 @@ func (i *Interactive) openSettingsDialog() {
 
 	recursiveFiles := i.cfg.RecursiveFileSuggest != nil && *i.cfg.RecursiveFileSuggest
 	respectGitignore := i.cfg.RespectGitignore == nil || *i.cfg.RespectGitignore
-	quickItems := i.quickModelSettingItems()
 
 	reasoningOptions := []settingsOption{
 		{value: "", label: "off", desc: "no reasoning"},
@@ -2854,7 +2817,7 @@ func (i *Interactive) openSettingsDialog() {
 		}
 	}
 
-	items := []settingsItem{
+	i.settingsDialog.Open([]settingsItem{
 		{
 			key:      "inline_images_enabled",
 			label:    "render images when supported",
@@ -2898,193 +2861,20 @@ func (i *Interactive) openSettingsDialog() {
 			options: themeOptions,
 			choice:  themeChoice,
 		},
-	}
-	if len(quickItems) > 0 {
-		items = append(items, settingsItem{
-			key:      "quick_models",
-			label:    "model shortcuts",
-			desc:     "configure " + quickModelShortcutPrefix() + "+1 through " + quickModelShortcutPrefix() + "+9 quick model switches",
-			children: quickItems,
-		})
-	}
-	i.settingsDialog.Open(items)
+	})
 }
 
 func (i *Interactive) applySettingChange(act settingsAction) {
-	switch {
-	case strings.HasPrefix(act.Key, "quick_model_"):
-		i.applyQuickModelSetting(act.Key, act.StringValue)
-	case act.Key == "reasoning":
+	switch act.Key {
+	case "reasoning":
 		i.applyReasoningSetting(act.StringValue)
-	case act.Key == "theme":
+	case "theme":
 		i.applyThemeSetting(act.StringValue)
 	default:
 		i.applySettingToggle(act.Key, act.Value)
 	}
 }
 
-func (i *Interactive) quickModelSettingItems() []settingsItem {
-	if len(i.cfg.QuickModelShortcuts) < 9 {
-		next := make([]QuickModelShortcut, 9)
-		copy(next, i.cfg.QuickModelShortcuts)
-		i.cfg.QuickModelShortcuts = next
-	}
-	items := make([]settingsItem, 0, 9)
-	for slot := 1; slot <= 9; slot++ {
-		items = append(items, i.quickModelSettingItem(slot))
-	}
-	return items
-}
-
-func (i *Interactive) quickModelSettingItem(slot int) settingsItem {
-	current := QuickModelShortcut{}
-	if slot >= 1 && len(i.cfg.QuickModelShortcuts) >= slot {
-		current = i.cfg.QuickModelShortcuts[slot-1]
-	}
-	hint := "not assigned"
-	if current.Provider != "" && current.Model != "" {
-		hint = current.Provider + " / " + current.Model
-	}
-	return settingsItem{
-		key:    "quick_model_" + strconv.Itoa(slot),
-		label:  "model " + strconv.Itoa(slot),
-		desc:   quickModelShortcutLabel(slot) + " switches to this model. Enter opens the /model selector, Backspace clears.",
-		picker: true,
-		hint:   hint,
-	}
-}
-
-func quickModelShortcutSlot(k tui.Key) int {
-	if k.Kind != tui.KeyRune || k.Rune < '1' || k.Rune > '9' {
-		return 0
-	}
-	if runtime.GOOS == "darwin" {
-		if !k.Super && !k.Ctrl {
-			return 0
-		}
-	} else if !k.Ctrl {
-		return 0
-	}
-	return int(k.Rune - '0')
-}
-
-func quickModelShortcutPrefix() string {
-	return "Ctrl"
-}
-
-func quickModelShortcutLabel(slot int) string {
-	return quickModelShortcutPrefix() + "+" + strconv.Itoa(slot)
-}
-
-func (i *Interactive) openQuickModelPicker(slot int) {
-	if slot < 1 || slot > 9 {
-		return
-	}
-	i.quickModelAssign = slot
-	current := i.cfg.Model
-	if len(i.cfg.QuickModelShortcuts) >= slot && i.cfg.QuickModelShortcuts[slot-1].Model != "" {
-		current = i.cfg.QuickModelShortcuts[slot-1].Model
-	}
-	var loggedIn []string
-	if i.cfg.LoggedInProviders != nil {
-		loggedIn = i.cfg.LoggedInProviders()
-	}
-	i.modelDialog.Open(current, loggedIn)
-}
-
-func (i *Interactive) applyQuickModelSelection(slot int, providerName, model string) {
-	i.setQuickModelShortcut(slot, providerName, model)
-}
-
-func (i *Interactive) applyQuickModelShortcut(slot int) {
-	if slot < 1 || slot > 9 {
-		return
-	}
-	if i.busy {
-		i.mu.Lock()
-		i.statusErr = "cannot switch model while a turn is running"
-		i.statusOK = ""
-		i.mu.Unlock()
-		i.invalidate()
-		return
-	}
-	if len(i.cfg.QuickModelShortcuts) < slot {
-		i.mu.Lock()
-		i.statusErr = quickModelShortcutLabel(slot) + " is not assigned"
-		i.statusOK = ""
-		i.mu.Unlock()
-		i.invalidate()
-		return
-	}
-	shortcut := i.cfg.QuickModelShortcuts[slot-1]
-	if shortcut.Provider == "" || shortcut.Model == "" {
-		i.mu.Lock()
-		i.statusErr = quickModelShortcutLabel(slot) + " is not assigned"
-		i.statusOK = ""
-		i.mu.Unlock()
-		i.invalidate()
-		return
-	}
-	i.swapModel(shortcut.Provider, shortcut.Model, i.cfg.BuildAgentFor, false)
-	i.invalidate()
-}
-
-func (i *Interactive) applyQuickModelSetting(key, value string) {
-	slotText := strings.TrimPrefix(key, "quick_model_")
-	slot, err := strconv.Atoi(slotText)
-	if err != nil || slot < 1 || slot > 9 {
-		return
-	}
-	providerName, model := "", ""
-	if value != "" {
-		parts := strings.SplitN(value, "\t", 2)
-		if len(parts) == 2 {
-			providerName, model = parts[0], parts[1]
-		}
-	}
-	i.setQuickModelShortcut(slot, providerName, model)
-}
-
-func (i *Interactive) setQuickModelShortcut(slot int, providerName, model string) {
-	if len(i.cfg.QuickModelShortcuts) < slot {
-		next := make([]QuickModelShortcut, slot)
-		copy(next, i.cfg.QuickModelShortcuts)
-		i.cfg.QuickModelShortcuts = next
-	}
-	i.cfg.QuickModelShortcuts[slot-1] = QuickModelShortcut{Provider: providerName, Model: model}
-	if i.cfg.SettingsStore != nil {
-		if err := i.cfg.SettingsStore.SetQuickModelShortcut(slot, providerName, model); err != nil {
-			i.mu.Lock()
-			i.statusErr = "settings: " + err.Error()
-			i.mu.Unlock()
-			return
-		}
-	}
-	i.mu.Lock()
-	if model == "" {
-		i.statusOK = quickModelShortcutLabel(slot) + " cleared"
-	} else {
-		i.statusOK = quickModelShortcutLabel(slot) + " set to " + providerName + " / " + model
-	}
-	i.statusErr = ""
-	i.mu.Unlock()
-	i.refreshQuickModelSettingsItem(slot)
-	i.invalidate()
-}
-
-func (i *Interactive) refreshQuickModelSettingsItem(slot int) {
-	if i.settingsDialog == nil || !i.settingsDialog.Active() || len(i.settingsDialog.items) == 0 {
-		return
-	}
-	key := "quick_model_" + strconv.Itoa(slot)
-	for idx, it := range i.settingsDialog.items {
-		if it.key == key {
-			i.settingsDialog.items[idx] = i.quickModelSettingItem(slot)
-			return
-		}
-	}
-}
-
 func (i *Interactive) applySettingToggle(key string, value bool) {
 	// Every setting toggle forces a full repaint at the end — same
 	// effect as the user pressing Ctrl+L — so any per-setting visual
@@ -4385,10 +4175,9 @@ func (i *Interactive) swapModel(prov, model string, builder func(string, string)
 	// to invalidate.
 	i.mu.Unlock()
 	// The new agent was built off the base tool registry, so any
-	// dynamically-registered tools need to be reattached. The apply
-	// helpers are no-ops when their feature is inactive, so the
-	// cross-provider path still works on a vanilla setup.
-	i.applyAutoSwarmTool(i.autoSwarmEnabled())
+	// dynamically-registered tools (telegram_send_*) need to be
+	// reattached. applyTelegramTools is a no-op when the bridge is
+	// idle so the cross-provider path still works on a vanilla setup.
 	i.applyTelegramTools(i.telegramBridge != nil && i.telegramBridge.Active())
 	if i.cfg.PersistModel != nil {
 		i.cfg.PersistModel(p, md)
@@ -4417,7 +4206,6 @@ func (i *Interactive) handleAuthEvent(ev auth.Event) {
 		i.statusErr = ""
 		i.statusOK = "logged in to " + ev.Provider + " via " + ev.Method
 		i.mu.Unlock()
-		i.applyAutoSwarmTool(i.autoSwarmEnabled())
 		i.applyTelegramTools(i.telegramBridge != nil && i.telegramBridge.Active())
 		i.dialog.ShowResult(true, "")
 	}
@@ -5481,10 +5269,6 @@ func (i *Interactive) applyAutoSwarmSystemPrompt(active bool) {
 // when /settings -> auto-swarm is enabled. Mirrors applyTelegramTools'
 // snapshot+mutate pattern so extension tools and /reload-ext additions
 // survive a toggle.
-func (i *Interactive) autoSwarmEnabled() bool {
-	return i.cfg.AutoSwarmEnabled != nil && *i.cfg.AutoSwarmEnabled
-}
-
 func (i *Interactive) applyAutoSwarmTool(active bool) {
 	if i.agent == nil {
 		return
@@ -5499,11 +5283,9 @@ func (i *Interactive) applyAutoSwarmTool(active bool) {
 	}
 	if active && i.cfg.Swarm != nil {
 		next["swarm_spawn"] = &tools.SwarmSpawnTool{
-			Swarm:           i.cfg.Swarm,
-			Enabled:         func() bool { return true },
-			DefaultModel:    func() string { return i.cfg.Model },
-			DefaultProvider: func() string { return i.cfg.Provider },
-			OnSpawned:       i.trackSwarmAgent,
+			Swarm:     i.cfg.Swarm,
+			Enabled:   func() bool { return true },
+			OnSpawned: i.trackSwarmAgent,
 		}
 	}
 	i.agent.SetTools(next)

packages/agent/modes/settings_dialog.go

@@ -10,13 +10,10 @@ import (
 
 type settingsDialog struct {
 	active       bool
-	title        string
 	items        []settingsItem
 	cursor       int
 	selecting    bool
 	optionCursor int
-	parentItems  []settingsItem
-	parentCursor int
 }
 
 type settingsItem struct {
@@ -25,8 +22,6 @@ type settingsItem struct {
 	desc     string
 	value    bool
 	options  []settingsOption
-	children []settingsItem
-	picker   bool
 	choice   int
 	disabled bool
 	hint     string
@@ -39,12 +34,11 @@ type settingsOption struct {
 }
 
 type settingsAction struct {
-	Toggle            bool
-	Key               string
-	Value             bool
-	StringValue       string
-	ModelShortcutSlot int
-	Close             bool
+	Toggle      bool
+	Key         string
+	Value       bool
+	StringValue string
+	Close       bool
 }
 
 func newSettingsDialog() *settingsDialog { return &settingsDialog{} }
@@ -53,13 +47,10 @@ func (d *settingsDialog) Open(items []settingsItem) bool {
 	if len(items) == 0 {
 		return false
 	}
-	d.title = "settings"
 	d.items = items
 	d.cursor = 0
 	d.selecting = false
 	d.optionCursor = 0
-	d.parentItems = nil
-	d.parentCursor = 0
 	d.active = true
 	return true
 }
@@ -67,7 +58,6 @@ func (d *settingsDialog) Open(items []settingsItem) bool {
 func (d *settingsDialog) Close() {
 	d.active = false
 	d.selecting = false
-	d.parentItems = nil
 }
 func (d *settingsDialog) Active() bool { return d != nil && d.active }
 
@@ -84,22 +74,7 @@ func (d *settingsDialog) HandleKey(k tui.Key) settingsAction {
 		if d.cursor < len(d.items)-1 {
 			d.cursor++
 		}
-	case tui.KeyBackspace:
-		if len(d.items) > 0 {
-			it := d.items[d.cursor]
-			if strings.HasPrefix(it.key, "quick_model_") {
-				return settingsAction{Toggle: true, Key: it.key, StringValue: ""}
-			}
-		}
 	case tui.KeyEsc:
-		if len(d.parentItems) > 0 {
-			d.items = d.parentItems
-			d.cursor = d.parentCursor
-			d.parentItems = nil
-			d.parentCursor = 0
-			d.title = "settings"
-			return settingsAction{}
-		}
 		d.Close()
 		return settingsAction{Close: true}
 	case tui.KeyEnter:
@@ -144,27 +119,6 @@ func (d *settingsDialog) toggleCurrent() settingsAction {
 	if it.disabled {
 		return settingsAction{}
 	}
-	if it.picker {
-		slotText := strings.TrimPrefix(it.key, "quick_model_")
-		slot := 0
-		for _, r := range slotText {
-			if r < '0' || r > '9' {
-				slot = 0
-				break
-			}
-			slot = slot*10 + int(r-'0')
-		}
-		return settingsAction{ModelShortcutSlot: slot}
-	}
-	if len(it.children) > 0 {
-		d.parentItems = d.items
-		d.parentCursor = d.cursor
-		d.items = it.children
-		d.cursor = 0
-		d.optionCursor = 0
-		d.title = "settings: " + it.label
-		return settingsAction{}
-	}
 	if len(it.options) > 0 {
 		d.optionCursor = it.choice
 		if d.optionCursor < 0 || d.optionCursor >= len(it.options) {
@@ -205,22 +159,15 @@ func (d *settingsDialog) Render(th tui.Theme, width int) []string {
 		return d.renderOptions(th, width)
 	}
 	var lines []string
-	lines = append(lines, frameHeader(th, d.title, width))
-	if len(d.parentItems) > 0 {
-		lines = append(lines, th.FG256(th.Muted, "change with enter/space, esc to go back:"))
-	} else {
-		lines = append(lines, th.FG256(th.Muted, "change with enter/space, esc to close:"))
-	}
+	lines = append(lines, frameHeader(th, "settings", width))
+	lines = append(lines, th.FG256(th.Muted, "change with enter/space, esc to close:"))
 	for i, it := range d.items {
 		box := "[ ]"
 		if it.value {
 			box = "[✓]"
 		}
 		plain := "  " + box + " " + it.label
-		if it.picker || len(it.children) > 0 {
-			box = "[→]"
-			plain = "  " + box + " " + it.label
-		} else if len(it.options) > 0 {
+		if len(it.options) > 0 {
 			box = "[→]"
 			if it.choice < 0 || it.choice >= len(it.options) {
 				it.choice = 0

packages/agent/modes/welcome.go

@@ -10,9 +10,9 @@ import "github.com/patriceckhart/zot/packages/tui"
 // the moment zot starts. After welcomeVersionDuration the caller
 // flips showVersion off and the headline reverts to plain text.
 func welcomeBanner(th tui.Theme, version string, showVersion bool) []string {
-	text := "zot. yet another coding agent harness."
+	text := "i'm zot. yet another coding agent harness."
 	if showVersion && version != "" {
-		text = "zot (" + version + "). yet another coding agent harness."
+		text = "i'm zot (" + version + "). yet another coding agent harness."
 	}
 	headline := th.AccentBar(th.Assistant) + th.FG256(th.Assistant, tui.Bold(text))
 	return []string{

packages/agent/settings_store.go

@@ -4,31 +4,6 @@ import "github.com/patriceckhart/zot/packages/provider"
 
 type configSettingsStore struct{}
 
-func (configSettingsStore) SetQuickModelShortcut(slot int, providerName, model string) error {
-	if slot < 1 || slot > 9 {
-		return nil
-	}
-	cfg, err := LoadConfig()
-	if err != nil {
-		return err
-	}
-	if len(cfg.QuickModelShortcuts) < slot {
-		next := make([]QuickModelShortcut, slot)
-		copy(next, cfg.QuickModelShortcuts)
-		cfg.QuickModelShortcuts = next
-	}
-	cfg.QuickModelShortcuts[slot-1] = QuickModelShortcut{Provider: providerName, Model: model}
-	// Trim trailing empty slots so config.json stays compact.
-	for len(cfg.QuickModelShortcuts) > 0 {
-		last := cfg.QuickModelShortcuts[len(cfg.QuickModelShortcuts)-1]
-		if last.Provider != "" || last.Model != "" {
-			break
-		}
-		cfg.QuickModelShortcuts = cfg.QuickModelShortcuts[:len(cfg.QuickModelShortcuts)-1]
-	}
-	return SaveConfig(cfg)
-}
-
 func (configSettingsStore) SetInlineImages(enabled bool) error {
 	cfg, err := LoadConfig()
 	if err != nil {

packages/agent/tools/swarm_spawn.go

@@ -31,13 +31,6 @@ type SwarmSpawnTool struct {
 	// is treated as disabled.
 	Enabled func() bool
 
-	// DefaultModel and DefaultProvider return the host agent's resolved
-	// model and provider. They are used when the tool call omits both
-	// fields, so auto-swarm follows the same auth route as the user sees
-	// in the parent session.
-	DefaultModel    func() string
-	DefaultProvider func() string
-
 	// OnSpawned, if set, is called after every successful spawn with
 	// the new agent + the task it was started with. Used by the
 	// interactive host to track agents and surface a summary back
@@ -60,11 +53,11 @@ const swarmSpawnSchema = `{
     },
     "model": {
       "type": "string",
-      "description": "Optional model id to pin the sub-agent to. Normally omit both model and provider so the sub-agent inherits the host session's resolved provider/model/auth route. Do not infer provider from model name. If you override this, also provide provider."
+      "description": "Optional model id to pin the sub-agent to (e.g. \"claude-sonnet-4-5\", \"gpt-5\"). Defaults to the host's current model."
     },
     "provider": {
       "type": "string",
-      "description": "Optional provider id. Normally omit both model and provider so the sub-agent inherits the host session. If you override this, also provide model. Note: openai means public OpenAI API-key auth; openai-codex means ChatGPT/Codex subscription auth."
+      "description": "Optional provider id (e.g. \"anthropic\", \"openai\"). Usually paired with model."
     }
   },
   "required": ["task"]
@@ -92,24 +85,10 @@ func (t *SwarmSpawnTool) Execute(ctx context.Context, raw json.RawMessage, progr
 		return toolErr("swarm_spawn: task is required"), nil
 	}
 
-	model := strings.TrimSpace(a.Model)
-	providerID := strings.TrimSpace(a.Provider)
-	if (model == "") != (providerID == "") {
-		return toolErr("swarm_spawn: omit both model/provider to inherit the host, or provide both explicitly"), nil
-	}
-	if model == "" && providerID == "" {
-		if t.DefaultModel != nil {
-			model = strings.TrimSpace(t.DefaultModel())
-		}
-		if t.DefaultProvider != nil {
-			providerID = strings.TrimSpace(t.DefaultProvider())
-		}
-	}
-
 	agent, err := t.Swarm.SpawnReq(ctx, swarm.SpawnRequest{
 		Task:     task,
-		Model:    model,
-		Provider: providerID,
+		Model:    strings.TrimSpace(a.Model),
+		Provider: strings.TrimSpace(a.Provider),
 	})
 	if err != nil {
 		return core.ToolResult{}, fmt.Errorf("swarm_spawn: %w", err)
@@ -121,11 +100,11 @@ func (t *SwarmSpawnTool) Execute(ctx context.Context, raw json.RawMessage, progr
 	var sb strings.Builder
 	fmt.Fprintf(&sb, "spawned sub-agent %s\n", agent.ID)
 	fmt.Fprintf(&sb, "task: %s\n", truncateTask(task, 200))
-	if model != "" {
-		fmt.Fprintf(&sb, "model: %s\n", model)
+	if a.Model != "" {
+		fmt.Fprintf(&sb, "model: %s\n", a.Model)
 	}
-	if providerID != "" {
-		fmt.Fprintf(&sb, "provider: %s\n", providerID)
+	if a.Provider != "" {
+		fmt.Fprintf(&sb, "provider: %s\n", a.Provider)
 	}
 	sb.WriteString("\nThe sub-agent is running in the background. Use /swarm in the TUI to monitor it. ")
 	sb.WriteString("This conversation continues immediately; do not wait for the sub-agent to finish before working on the next thing.")
@@ -134,8 +113,8 @@ func (t *SwarmSpawnTool) Execute(ctx context.Context, raw json.RawMessage, progr
 		Details: map[string]any{
 			"agent_id": agent.ID,
 			"task":     task,
-			"model":    model,
-			"provider": providerID,
+			"model":    a.Model,
+			"provider": a.Provider,
 		},
 	}, nil
 }

packages/agent/tools/swarm_spawn_test.go

@@ -1,100 +0,0 @@
-package tools
-
-import (
-	"context"
-	"encoding/json"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/patriceckhart/zot/packages/agent/swarm"
-	"github.com/patriceckhart/zot/packages/provider"
-)
-
-type noopSwarmRunner struct{}
-
-func (noopSwarmRunner) Run(context.Context, swarm.Sink) error { return nil }
-
-func newTestSwarm(t *testing.T) *swarm.Swarm {
-	t.Helper()
-	root := t.TempDir()
-	return swarm.New(swarm.Config{
-		Root:     filepath.Join(root, "swarm"),
-		RepoRoot: root,
-		NewRunner: func(*swarm.Agent) swarm.Runner {
-			return noopSwarmRunner{}
-		},
-	})
-}
-
-func TestSwarmSpawnInheritsHostModelAndProviderWhenOmitted(t *testing.T) {
-	tool := &SwarmSpawnTool{
-		Swarm:           newTestSwarm(t),
-		Enabled:         func() bool { return true },
-		DefaultModel:    func() string { return "gpt-5" },
-		DefaultProvider: func() string { return "openai-codex" },
-	}
-
-	res, err := tool.Execute(context.Background(), json.RawMessage(`{"task":"research docs"}`), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if res.IsError {
-		t.Fatalf("unexpected tool error: %s", textResult(res.Content))
-	}
-	details, ok := res.Details.(map[string]any)
-	if !ok {
-		t.Fatalf("details type = %T, want map[string]any", res.Details)
-	}
-	if got := details["model"]; got != "gpt-5" {
-		t.Fatalf("model detail = %v, want gpt-5", got)
-	}
-	if got := details["provider"]; got != "openai-codex" {
-		t.Fatalf("provider detail = %v, want openai-codex", got)
-	}
-	text := textResult(res.Content)
-	if !strings.Contains(text, "model: gpt-5") || !strings.Contains(text, "provider: openai-codex") {
-		t.Fatalf("result text missing inherited model/provider:\n%s", text)
-	}
-
-	agents := tool.Swarm.List()
-	if len(agents) != 1 {
-		t.Fatalf("spawned agents = %d, want 1", len(agents))
-	}
-	if agents[0].Model != "gpt-5" || agents[0].Provider != "openai-codex" {
-		t.Fatalf("agent model/provider = %q/%q, want gpt-5/openai-codex", agents[0].Model, agents[0].Provider)
-	}
-}
-
-func TestSwarmSpawnRejectsPartialModelProviderOverride(t *testing.T) {
-	tool := &SwarmSpawnTool{
-		Swarm:           newTestSwarm(t),
-		Enabled:         func() bool { return true },
-		DefaultModel:    func() string { return "gpt-5" },
-		DefaultProvider: func() string { return "openai-codex" },
-	}
-
-	res, err := tool.Execute(context.Background(), json.RawMessage(`{"task":"research docs","provider":"openai"}`), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !res.IsError {
-		t.Fatalf("expected partial override to fail")
-	}
-	if got := textResult(res.Content); !strings.Contains(got, "omit both model/provider") {
-		t.Fatalf("error text = %q", got)
-	}
-	if got := len(tool.Swarm.List()); got != 0 {
-		t.Fatalf("spawned agents = %d, want 0", got)
-	}
-}
-
-func textResult(content []provider.Content) string {
-	if len(content) == 0 {
-		return ""
-	}
-	if tb, ok := content[0].(provider.TextBlock); ok {
-		return tb.Text
-	}
-	return ""
-}

packages/provider/catalog_builtin.go

@@ -310,7 +310,6 @@ var builtinCatalog = []Model{
 	{Provider: "opencode-go", ID: "minimax-m2.7", DisplayName: "MiniMax M2.7", ContextWindow: 204800, MaxOutput: 131072, Reasoning: true, PriceInput: 0.3, PriceOutput: 1.2, PriceCacheRead: 0.06, BaseURL: "https://opencode.ai/zen/go/v1"},
 	{Provider: "opencode-go", ID: "qwen3.5-plus", DisplayName: "Qwen3.5 Plus", ContextWindow: 262144, MaxOutput: 65536, Reasoning: true, PriceInput: 0.2, PriceOutput: 1.2, PriceCacheRead: 0.02, PriceCacheWrite: 0.25, BaseURL: "https://opencode.ai/zen/go/v1"},
 	{Provider: "opencode-go", ID: "qwen3.6-plus", DisplayName: "Qwen3.6 Plus", ContextWindow: 262144, MaxOutput: 65536, Reasoning: true, PriceInput: 0.5, PriceOutput: 3, PriceCacheRead: 0.05, PriceCacheWrite: 0.625, BaseURL: "https://opencode.ai/zen/go/v1"},
-	{Provider: "opencode-go", ID: "qwen3.7-plus", DisplayName: "Qwen3.7 Plus", ContextWindow: 1000000, MaxOutput: 65536, Reasoning: true, PriceInput: 0.32, PriceOutput: 1.28, PriceCacheRead: 0.064, PriceCacheWrite: 0.4, BaseURL: "https://opencode.ai/zen/go/v1"},
 	// openrouter: discovered live via DiscoverOpenRouter, none baked in.
 	// ----- together -----
 	{Provider: "together", ID: "MiniMaxAI/MiniMax-M2.5", DisplayName: "MiniMax-M2.5", ContextWindow: 204800, MaxOutput: 131072, Reasoning: true, PriceInput: 0.3, PriceOutput: 1.2, PriceCacheRead: 0.06, BaseURL: "https://api.together.ai/v1"},
@@ -678,5 +677,4 @@ var builtinCatalog = []Model{
 	{Provider: "opencode", ID: "nemotron-3-super-free", DisplayName: "Nemotron 3 Super Free", ContextWindow: 204800, MaxOutput: 128000, Reasoning: true, PriceInput: 0, PriceOutput: 0, PriceCacheRead: 0, BaseURL: "https://opencode.ai/zen/v1"},
 	{Provider: "opencode", ID: "qwen3.5-plus", DisplayName: "Qwen3.5 Plus", ContextWindow: 262144, MaxOutput: 65536, Reasoning: true, PriceInput: 0.2, PriceOutput: 1.2, PriceCacheRead: 0.02, PriceCacheWrite: 0.25, BaseURL: "https://opencode.ai/zen"},
 	{Provider: "opencode", ID: "qwen3.6-plus", DisplayName: "Qwen3.6 Plus", ContextWindow: 262144, MaxOutput: 65536, Reasoning: true, PriceInput: 0.5, PriceOutput: 3, PriceCacheRead: 0.05, PriceCacheWrite: 0.625, BaseURL: "https://opencode.ai/zen"},
-	{Provider: "opencode", ID: "qwen3.7-plus", DisplayName: "Qwen3.7 Plus", ContextWindow: 1000000, MaxOutput: 65536, Reasoning: true, PriceInput: 0.32, PriceOutput: 1.28, PriceCacheRead: 0.064, PriceCacheWrite: 0.4, BaseURL: "https://opencode.ai/zen"},
 }

packages/tui/input.go

@@ -14,7 +14,6 @@ type Key struct {
 	Ctrl  bool
 	Alt   bool
 	Shift bool
-	Super bool
 }
 
 type KeyKind int
@@ -246,7 +245,7 @@ func (r *Reader) dispatchCSI(params string, final byte) Key {
 		return Key{Kind: KeyUnknown}
 	}
 
-	shift, alt, super := parseCSIModifiers(params)
+	shift, alt := parseCSIModifiers(params)
 	if final == 'u' {
 		if key, ok := parseCSIU(params); ok {
 			return key
@@ -259,13 +258,13 @@ func (r *Reader) dispatchCSI(params string, final byte) Key {
 	}
 	switch final {
 	case 'A':
-		return Key{Kind: KeyUp, Alt: alt, Shift: shift, Super: super}
+		return Key{Kind: KeyUp, Alt: alt, Shift: shift}
 	case 'B':
-		return Key{Kind: KeyDown, Alt: alt, Shift: shift, Super: super}
+		return Key{Kind: KeyDown, Alt: alt, Shift: shift}
 	case 'C':
-		return Key{Kind: KeyRight, Alt: alt, Shift: shift, Super: super}
+		return Key{Kind: KeyRight, Alt: alt, Shift: shift}
 	case 'D':
-		return Key{Kind: KeyLeft, Alt: alt, Shift: shift, Super: super}
+		return Key{Kind: KeyLeft, Alt: alt, Shift: shift}
 	case 'H':
 		return Key{Kind: KeyHome}
 	case 'F':
@@ -288,20 +287,23 @@ func (r *Reader) dispatchCSI(params string, final byte) Key {
 	return Key{Kind: KeyUnknown}
 }
 
-func parseCSIModifiers(params string) (shift, alt, super bool) {
+func parseCSIModifiers(params string) (shift, alt bool) {
 	if params == "" {
-		return false, false, false
+		return false, false
 	}
 	i := strings.LastIndexByte(params, ';')
 	if i < 0 || i+1 >= len(params) {
-		return false, false, false
+		return false, false
 	}
-	mod, ok := parseModifierParam(params[i+1:])
-	if !ok {
-		return false, false, false
+	mod, err := strconv.Atoi(params[i+1:])
+	if err != nil {
+		return false, false
 	}
-	shift, alt, _, super = modifierBits(mod)
-	return shift, alt, super
+	// Xterm-style modifier values are 1 plus a bitmask:
+	// 2=Shift, 3=Alt, 4=Shift+Alt, 5=Ctrl, 6=Shift+Ctrl,
+	// 7=Alt+Ctrl, 8=Shift+Alt+Ctrl.
+	bits := mod - 1
+	return bits&1 != 0, bits&2 != 0
 }
 
 func parseCSIU(params string) (Key, bool) {
@@ -315,9 +317,7 @@ func parseCSIU(params string) (Key, bool) {
 	}
 	mod := 1
 	if len(parts) >= 2 {
-		var ok bool
-		mod, ok = parseModifierParam(parts[1])
-		if !ok {
+		if mod, err = strconv.Atoi(parts[1]); err != nil {
 			return Key{}, false
 		}
 	}
@@ -329,8 +329,8 @@ func parseModifyOtherKeys(params string) (Key, bool) {
 	if len(parts) != 3 || parts[0] != "27" {
 		return Key{}, false
 	}
-	mod, ok := parseModifierParam(parts[1])
-	if !ok {
+	mod, err := strconv.Atoi(parts[1])
+	if err != nil {
 		return Key{}, false
 	}
 	code, err := strconv.Atoi(parts[2])
@@ -340,40 +340,27 @@ func parseModifyOtherKeys(params string) (Key, bool) {
 	return keyFromModifiedCode(code, mod)
 }
 
-func parseModifierParam(s string) (int, bool) {
-	if i := strings.IndexByte(s, ':'); i >= 0 {
-		s = s[:i]
-	}
-	mod, err := strconv.Atoi(s)
-	if err != nil {
-		return 0, false
-	}
-	return mod, true
-}
-
-func modifierBits(mod int) (shift, alt, ctrl, super bool) {
-	bits := mod - 1
-	return bits&1 != 0, bits&2 != 0, bits&4 != 0, bits&8 != 0 || bits&32 != 0
-}
-
 func keyFromModifiedCode(code, mod int) (Key, bool) {
-	shift, alt, ctrl, super := modifierBits(mod)
+	bits := mod - 1
+	shift := bits&1 != 0
+	alt := bits&2 != 0
+	ctrl := bits&4 != 0
 	// Kitty keyboard protocol (CSI ... u) reports control keys as their
 	// codepoints: Esc=27, Enter=13, Tab=9, Backspace=127. Without the
 	// enhanced-mode handling these arrive as raw bytes; with it enabled
 	// they come through here, so map them back to their dedicated keys.
 	switch code {
 	case 13:
-		return Key{Kind: KeyEnter, Shift: shift, Alt: alt, Ctrl: ctrl, Super: super}, true
+		return Key{Kind: KeyEnter, Shift: shift, Alt: alt, Ctrl: ctrl}, true
 	case 27:
-		return Key{Kind: KeyEsc, Shift: shift, Alt: alt, Ctrl: ctrl, Super: super}, true
+		return Key{Kind: KeyEsc, Shift: shift, Alt: alt, Ctrl: ctrl}, true
 	case 9:
 		if shift {
-			return Key{Kind: KeyShiftTab, Alt: alt, Ctrl: ctrl, Super: super}, true
+			return Key{Kind: KeyShiftTab, Alt: alt, Ctrl: ctrl}, true
 		}
-		return Key{Kind: KeyTab, Shift: shift, Alt: alt, Ctrl: ctrl, Super: super}, true
+		return Key{Kind: KeyTab, Shift: shift, Alt: alt, Ctrl: ctrl}, true
 	case 127, 8:
-		return Key{Kind: KeyBackspace, Shift: shift, Alt: alt, Ctrl: ctrl, Super: super}, true
+		return Key{Kind: KeyBackspace, Shift: shift, Alt: alt, Ctrl: ctrl}, true
 	}
 	if ctrl {
 		switch code {
@@ -399,9 +386,6 @@ func keyFromModifiedCode(code, mod int) (Key, bool) {
 			return Key{Kind: KeyPasteClipboard, Shift: shift, Alt: alt, Ctrl: true}, true
 		}
 	}
-	if code >= '0' && code <= '9' {
-		return Key{Kind: KeyRune, Rune: rune(code), Shift: shift, Alt: alt, Ctrl: ctrl, Super: super}, true
-	}
 	return Key{}, false
 }
 

packages/tui/input_test.go

@@ -23,34 +23,6 @@ func TestReaderParsesCSIUCtrlC(t *testing.T) {
 	}
 }
 
-func TestReaderParsesCSIUCtrlNumber(t *testing.T) {
-	k := readKey(t, "\x1b[49;5u")
-	if k.Kind != KeyRune || k.Rune != '1' || !k.Ctrl {
-		t.Fatalf("Read kind=%v rune=%q ctrl=%v, want ctrl+1", k.Kind, k.Rune, k.Ctrl)
-	}
-}
-
-func TestReaderParsesCSIUSuperNumber(t *testing.T) {
-	k := readKey(t, "\x1b[50;9u")
-	if k.Kind != KeyRune || k.Rune != '2' || !k.Super {
-		t.Fatalf("Read kind=%v rune=%q super=%v, want super+2", k.Kind, k.Rune, k.Super)
-	}
-}
-
-func TestReaderParsesCSIUSuperNumberWithEventType(t *testing.T) {
-	k := readKey(t, "\x1b[51;9:3u")
-	if k.Kind != KeyRune || k.Rune != '3' || !k.Super {
-		t.Fatalf("Read kind=%v rune=%q super=%v, want super+3", k.Kind, k.Rune, k.Super)
-	}
-}
-
-func TestReaderParsesCSIUHyperNumberAsSuper(t *testing.T) {
-	k := readKey(t, "\x1b[52;33u")
-	if k.Kind != KeyRune || k.Rune != '4' || !k.Super {
-		t.Fatalf("Read kind=%v rune=%q super=%v, want hyper+4 as super", k.Kind, k.Rune, k.Super)
-	}
-}
-
 func TestReaderParsesRawCtrlVAsClipboardPaste(t *testing.T) {
 	k := readKey(t, "\x16")
 	if k.Kind != KeyPasteClipboard || !k.Ctrl {