feat(commands): consolidate /model into /models and persist model selection

echobt · echobt · commit 939bdb89046b · 2026-02-04T13:45:44.000Z
- Remove /model command, update /models to accept optional arg
- /models [name] now either switches model or lists available models
- Add 'm' alias to /models (was previously on /model)
- Persist model selection to config when using /models &lt;name&gt;
- Update all help text, tests, and mock content
diff --git a/src/cortex-engine/src/commands/mod.rs b/src/cortex-engine/src/commands/mod.rs
@@ -13,7 +13,7 @@
 //! - /compact - Compact conversation context
 //! - /undo - Undo last action
 //! - /config - Show/edit configuration
-//! - /model - Change model
+//! - /models - List or switch models
 //! - /cost - Show token usage and cost
 
 mod configuration;
diff --git a/src/cortex-engine/src/commands/navigation.rs b/src/cortex-engine/src/commands/navigation.rs
@@ -39,7 +39,7 @@ Navigation & Control:
 Information:
   /skills           - List available skills
   /plugins          - List installed plugins
-  /model [name]     - Show or change current model
+  /models [name]    - Show or change current model
   /cost             - Show token usage and estimated cost
   /config           - Show configuration
 
diff --git a/src/cortex-tui-capture/src/screenshot_generator/mocks/input.rs b/src/cortex-tui-capture/src/screenshot_generator/mocks/input.rs
@@ -87,8 +87,7 @@ fn mock_input_command() -> String {
 │ > /mod_                                                                     │
 │                                                                             │
 │   ┌─ Commands ──────────────────────────────────────────────────────────┐   │
-│   │ > /model     - Switch to a model                                    │   │
-│   │   /models    - List available models                                │   │
+│   │ > /models    - List available models or switch to a model           │   │
 │   └─────────────────────────────────────────────────────────────────────┘   │
 ├─────────────────────────────────────────────────────────────────────────────┤
 │ Tab to complete · Enter to select                                           │
diff --git a/src/cortex-tui-capture/src/screenshot_generator/mocks/widgets.rs b/src/cortex-tui-capture/src/screenshot_generator/mocks/widgets.rs
@@ -38,8 +38,7 @@ fn mock_autocomplete_commands() -> String {
 ╭─────────────────────────────────────────────────────────────────────────────╮
 │ ┌─ Commands ──────────────────────────────────────────────────────┐         │
 │ │ > /help      - Show help information                            │         │
-│ │   /model     - Switch to a model                                │         │
-│ │   /models    - List available models                            │         │
+│ │   /models    - List available models or switch to a model       │         │
 │ │   /new       - Start a new session                              │         │
 │ │   /clear     - Clear current conversation                       │         │
 │ │   /session   - Show current session info                        │         │
@@ -57,14 +56,13 @@ fn mock_autocomplete_filtered() -> String {
     r#"
 ╭─────────────────────────────────────────────────────────────────────────────╮
 │ ┌─ Commands ──────────────────────────────────────────────────────┐         │
-│ │ > /model     - Switch to a model                                │         │
-│ │   /models    - List available models                            │         │
+│ │ > /models    - List available models or switch to a model       │         │
 │ └─────────────────────────────────────────────────────────────────┘         │
 ├─────────────────────────────────────────────────────────────────────────────┤
 │ > /mod_                                                                     │
 ╰─────────────────────────────────────────────────────────────────────────────╯
 
-Filtering: "mod" matches 2 commands
+Filtering: "mod" matches 1 command
 "#
     .to_string()
 }
@@ -93,8 +91,7 @@ fn mock_autocomplete_scroll() -> String {
 ╭─────────────────────────────────────────────────────────────────────────────╮
 │ ┌─ Commands ──────────────────────────────────────────────────────┐         │
 │ │ > /help      - Show help information                           │█│       │
-│ │   /model     - Switch to a model                               │ │       │
-│ │   /models    - List available models                           │ │       │
+│ │   /models    - List available models or switch to a model      │ │       │
 │ │   /new       - Start a new session                             │ │       │
 │ │   /clear     - Clear current conversation                      │ │       │
 │ │   /session   - Show current session info                       │ │       │
@@ -114,8 +111,7 @@ fn mock_autocomplete_selected() -> String {
 ╭─────────────────────────────────────────────────────────────────────────────╮
 │ ┌─ Commands ──────────────────────────────────────────────────────┐         │
 │ │   /help      - Show help information                            │         │
-│ │   /model     - Switch to a model                                │         │
-│ │ █ /models    - List available models                 [SELECTED] │         │
+│ │ █ /models    - List available models or switch       [SELECTED] │         │
 │ │   /new       - Start a new session                              │         │
 │ │   /clear     - Clear current conversation                       │         │
 │ └─────────────────────────────────────────────────────────────────┘         │
@@ -162,14 +158,14 @@ fn mock_command_palette() -> String {
 │                  │  > _                                  │                  │
 │                  │                                       │                  │
 │                  │  Recent:                              │                  │
-│                  │    /model gpt-4                       │                  │
+│                  │    /models gpt-4                      │                  │
 │                  │    /clear                             │                  │
 │                  │    /help commands                     │                  │
 │                  │                                       │                  │
 │                  │  All Commands:                        │                  │
 │                  │    /help       Show help              │                  │
 │                  │    /new        New session            │                  │
-│                  │    /model      Switch model           │                  │
+│                  │    /models     Switch model           │                  │
 │                  │    /export     Export session         │                  │
 │                  │    ...                                │                  │
 │                  │                                       │                  │
diff --git a/src/cortex-tui/src/cards/help.rs b/src/cortex-tui/src/cards/help.rs
@@ -120,7 +120,7 @@ impl HelpCard {
             HelpSection::new(
                 "Slash Commands",
                 vec![
-                    HelpItem::new("/model", "Change AI model"),
+                    HelpItem::new("/models", "List or switch AI models"),
                     HelpItem::new("/mcp", "Manage MCP servers"),
                     HelpItem::new("/sessions", "View sessions"),
                     HelpItem::new("/settings", "Open settings"),
diff --git a/src/cortex-tui/src/commands/executor/dispatch.rs b/src/cortex-tui/src/commands/executor/dispatch.rs
@@ -84,10 +84,7 @@ impl CommandExecutor {
             "context" | "ctx" => CommandResult::Async("context".to_string()),
 
             // ============ MODEL ============
-            "model" | "m" => self.cmd_model(cmd),
-            "models" | "lm" | "list-models" => {
-                CommandResult::Async("models:fetch-and-pick".to_string())
-            }
+            "models" | "m" | "lm" | "list-models" => self.cmd_models(cmd),
             "approval" | "approve" => self.cmd_approval(cmd),
             "sandbox" | "sb" => self.cmd_sandbox(cmd),
             "auto" | "autopilot" => self.cmd_auto(cmd),
diff --git a/src/cortex-tui/src/commands/executor/model.rs b/src/cortex-tui/src/commands/executor/model.rs
@@ -4,10 +4,10 @@ use super::CommandExecutor;
 use crate::commands::types::{CommandResult, ModalType, ParsedCommand};
 
 impl CommandExecutor {
-    pub(super) fn cmd_model(&self, cmd: &ParsedCommand) -> CommandResult {
+    pub(super) fn cmd_models(&self, cmd: &ParsedCommand) -> CommandResult {
         match cmd.first_arg() {
             Some(model) => CommandResult::SetValue("model".to_string(), model.to_string()),
-            None => CommandResult::OpenModal(ModalType::ModelPicker),
+            None => CommandResult::Async("models:fetch-and-pick".to_string()),
         }
     }
 
@@ -61,7 +61,7 @@ impl CommandExecutor {
         CommandResult::Message(
             "Warning: The /provider command is deprecated.\n\n\
              Cortex is now a unified platform - all model access goes through the Cortex backend.\n\
-             Use /model to switch between available models instead."
+             Use /models to switch between available models instead."
                 .to_string(),
         )
     }
diff --git a/src/cortex-tui/src/commands/executor/tests.rs b/src/cortex-tui/src/commands/executor/tests.rs
@@ -76,24 +76,24 @@ fn test_execute_str_invalid() {
 }
 
 #[test]
-fn test_model_with_arg() {
+fn test_models_with_arg() {
     let executor = CommandExecutor::new();
-    let result = executor.execute_str("/model gpt-4");
+    let result = executor.execute_str("/models gpt-4");
     if let CommandResult::SetValue(key, value) = result {
         assert_eq!(key, "model");
         assert_eq!(value, "gpt-4");
     } else {
-        panic!("Expected SetValue");
+        panic!("Expected SetValue, got {:?}", result);
     }
 }
 
 #[test]
-fn test_model_without_arg() {
+fn test_models_without_arg() {
     let executor = CommandExecutor::new();
-    let result = executor.execute_str("/model");
+    let result = executor.execute_str("/models");
     assert!(matches!(
         result,
-        CommandResult::OpenModal(ModalType::ModelPicker)
+        CommandResult::Async(ref s) if s == "models:fetch-and-pick"
     ));
 }
 
diff --git a/src/cortex-tui/src/commands/forms.rs b/src/cortex-tui/src/commands/forms.rs
@@ -245,9 +245,9 @@ impl FormRegistry {
                 ],
             )),
 
-            "model" => Some(FormState::new(
+            "models" => Some(FormState::new(
                 "Set Model",
-                "model",
+                "models",
                 vec![
                     FormField::text("model", "Model Name")
                         .required()
@@ -434,7 +434,7 @@ impl FormRegistry {
             "sandbox",
             "auto",
             "provider",
-            "model",
+            "models",
             "theme",
             // MCP commands
             "mcp",
@@ -497,7 +497,7 @@ mod tests {
         assert!(registry.has_form("sandbox"));
         assert!(registry.has_form("auto"));
         assert!(registry.has_form("provider"));
-        assert!(registry.has_form("model"));
+        assert!(registry.has_form("models"));
         assert!(registry.has_form("theme"));
     }
 
diff --git a/src/cortex-tui/src/commands/mod.rs b/src/cortex-tui/src/commands/mod.rs
@@ -10,7 +10,7 @@
 //!
 //! Commands are entered with a leading `/` character:
 //! - `/help` - Show help
-//! - `/model claude-sonnet-4-20250514` - Switch model
+//! - `/models claude-sonnet-4-20250514` - Switch model
 //! - `/search "hello world"` - Search with quoted argument
 //!
 //! # Example
diff --git a/src/cortex-tui/src/commands/registry/builtin.rs b/src/cortex-tui/src/commands/registry/builtin.rs
@@ -505,22 +505,13 @@ pub fn register_builtin_commands(registry: &mut CommandRegistry) {
     // MODEL COMMANDS
     // ========================================
 
-    registry.register(CommandDef::new(
-        "model",
-        &["m"],
-        "Switch to a model",
-        "/model <name>",
-        CommandCategory::Model,
-        true,
-    ));
-
     registry.register(CommandDef::new(
         "models",
-        &["lm", "list-models"],
-        "List available models",
-        "/models",
+        &["m", "lm", "list-models"],
+        "List available models or switch to a model",
+        "/models [name]",
         CommandCategory::Model,
-        false,
+        true,
     ));
 
     registry.register(CommandDef::new(
diff --git a/src/cortex-tui/src/commands/registry/mod.rs b/src/cortex-tui/src/commands/registry/mod.rs
@@ -184,8 +184,8 @@ mod tests {
         assert!(registry.exists("mention"));
         assert!(registry.exists("images"));
 
-        // Model
-        assert!(registry.exists("model"));
+        // Model (note: "model" command was removed, use "models" instead)
+        assert!(!registry.exists("model"));
         assert!(registry.exists("models"));
         assert!(registry.exists("approval"));
         assert!(registry.exists("sandbox"));
diff --git a/src/cortex-tui/src/modal/help.rs b/src/cortex-tui/src/modal/help.rs
@@ -129,7 +129,7 @@ impl HelpModal {
             "commands" | "slash" => vec![HelpSection::new(
                 "Slash Commands",
                 vec![
-                    HelpItem::new("/model", "Change AI model"),
+                    HelpItem::new("/models", "List or switch AI models"),
                     HelpItem::new("/mcp", "Manage MCP servers"),
                     HelpItem::new("/sessions", "View sessions"),
                     HelpItem::new("/settings", "Open settings"),
@@ -173,7 +173,7 @@ impl HelpModal {
             HelpSection::new(
                 "Slash Commands",
                 vec![
-                    HelpItem::new("/model", "Change AI model"),
+                    HelpItem::new("/models", "List or switch AI models"),
                     HelpItem::new("/mcp", "Manage MCP servers"),
                     HelpItem::new("/sessions", "View sessions"),
                     HelpItem::new("/settings", "Open settings"),
diff --git a/src/cortex-tui/src/runner/event_loop/commands.rs b/src/cortex-tui/src/runner/event_loop/commands.rs
@@ -588,6 +588,11 @@ impl EventLoop {
                 self.app_state.model = value.to_string();
                 self.update_session_model(value);
                 self.add_system_message(&format!("Model set to: {}", value));
+
+                // Persist model selection to config
+                if let Ok(mut config) = crate::providers::config::CortexConfig::load() {
+                    let _ = config.save_last_model(&self.app_state.provider, value);
+                }
             }
             "provider" => {
                 // Check validation result first, storing any error and new model
diff --git a/src/cortex-tui/src/runner/event_loop/modal.rs b/src/cortex-tui/src/runner/event_loop/modal.rs
@@ -168,7 +168,7 @@ impl EventLoop {
             "model" => {
                 let name = get("model");
                 if !name.is_empty() {
-                    format!("/model {}", name)
+                    format!("/models {}", name)
                 } else {
                     return;
                 }
diff --git a/src/cortex-tui/src/runner/handlers/command.rs b/src/cortex-tui/src/runner/handlers/command.rs
@@ -12,7 +12,7 @@ impl<'a> ActionHandler<'a> {
     /// Supported commands:
     /// - `/help` - Show help
     /// - `/clear` - Clear messages
-    /// - `/model <name>` - Switch model
+    /// - `/models <name>` - Switch model
     /// - `/quit` - Quit application
     pub(crate) async fn handle_slash_command(&mut self, cmd: &str) -> Result<bool> {
         tracing::debug!("Slash command: {}", cmd);
diff --git a/src/cortex-tui/src/widgets/command_palette/state.rs b/src/cortex-tui/src/widgets/command_palette/state.rs
@@ -13,7 +13,7 @@ fn get_command_shortcut(name: &str) -> Option<String> {
     match name {
         "help" => Some("[?]".to_string()),
         "settings" => Some("[Ctrl+,]".to_string()),
-        "model" => Some("[Ctrl+M]".to_string()),
+        "models" => Some("[Ctrl+M]".to_string()),
         "palette" => Some("[Ctrl+P]".to_string()),
         "quit" => Some("[Ctrl+Q]".to_string()),
         "new" => Some("[Ctrl+N]".to_string()),
@@ -420,8 +420,8 @@ mod tests {
                 category: CommandCategory::General,
             },
             PaletteItem::Command {
-                name: "model".to_string(),
-                description: "Model".to_string(),
+                name: "models".to_string(),
+                description: "Models".to_string(),
                 shortcut: None,
                 category: CommandCategory::Model,
             },
@@ -465,7 +465,7 @@ mod tests {
                 category: CommandCategory::Navigation,
             },
             PaletteItem::Command {
-                name: "model".to_string(),
+                name: "models".to_string(),
                 description: "Switch model".to_string(),
                 shortcut: None,
                 category: CommandCategory::Model,
@@ -572,7 +572,7 @@ mod tests {
             get_command_shortcut("settings"),
             Some("[Ctrl+,]".to_string())
         );
-        assert_eq!(get_command_shortcut("model"), Some("[Ctrl+M]".to_string()));
+        assert_eq!(get_command_shortcut("models"), Some("[Ctrl+M]".to_string()));
         assert_eq!(get_command_shortcut("unknown"), None);
     }
 }
diff --git a/src/cortex-tui/src/widgets/help_browser/content.rs b/src/cortex-tui/src/widgets/help_browser/content.rs
@@ -206,21 +206,16 @@ pub fn get_help_sections() -> Vec<HelpSection> {
             },
             HelpContent::Separator,
             HelpContent::Title("Model Commands".to_string()),
-            HelpContent::Command {
-                name: "/model".to_string(),
-                description: "Switch model".to_string(),
-                usage: "/model <name>".to_string(),
-            },
             HelpContent::Command {
                 name: "/models".to_string(),
-                description: "List models".to_string(),
-                usage: "/models".to_string(),
+                description: "List available models or switch model".to_string(),
+                usage: "/models [name]".to_string(),
             },
         ]),
         HelpSection::new("models", "Models").with_content(vec![
             HelpContent::Title("Available Models".to_string()),
             HelpContent::Paragraph(
-                "Use /models to see available models or /model <name> to switch.".to_string(),
+                "Use /models to see available models or /models <name> to switch.".to_string(),
             ),
             HelpContent::Separator,
             HelpContent::Title("Anthropic".to_string()),
@@ -303,7 +298,7 @@ pub fn get_help_sections() -> Vec<HelpSection> {
             HelpContent::Separator,
             HelpContent::Title("How do I switch models?".to_string()),
             HelpContent::Paragraph(
-                "Use /model <name> or press Ctrl+M to open the model picker.".to_string(),
+                "Use /models <name> or press Ctrl+M to open the model picker.".to_string(),
             ),
             HelpContent::Separator,
             HelpContent::Title("How do I save my session?".to_string()),

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ use super::CommandExecutor;`
`4`	`4`	`use crate::commands::types::{CommandResult, ModalType, ParsedCommand};`
`5`	`5`
`6`	`6`	`impl CommandExecutor {`
`7`		`- pub(super) fn cmd_model(&self, cmd: &ParsedCommand) -> CommandResult {`
	`7`	`+ pub(super) fn cmd_models(&self, cmd: &ParsedCommand) -> CommandResult {`
`8`	`8`	`match cmd.first_arg() {`
`9`	`9`	`Some(model) => CommandResult::SetValue("model".to_string(), model.to_string()),`
`10`		`- None => CommandResult::OpenModal(ModalType::ModelPicker),`
	`10`	`+ None => CommandResult::Async("models:fetch-and-pick".to_string()),`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`@@ -61,7 +61,7 @@ impl CommandExecutor {`
`61`	`61`	`CommandResult::Message(`
`62`	`62`	`"Warning: The /provider command is deprecated.\n\n\`
`63`	`63`	`Cortex is now a unified platform - all model access goes through the Cortex backend.\n\`
`64`		`- Use /model to switch between available models instead."`
	`64`	`+ Use /models to switch between available models instead."`
`65`	`65`	`.to_string(),`
`66`	`66`	`)`
`67`	`67`	`}`