bugbash

Author: evanliu048

crates/chat-cli/src/cli/chat/mod.rs

@@ -281,10 +281,10 @@ impl ChatArgs {
         // If modelId is specified, verify it exists before starting the chat
         let model_id: Option<String> = if let Some(model_name) = self.model {
             let model_name_lower = model_name.to_lowercase();
-            match MODEL_OPTIONS.iter().find(|(_, name, _)| name == &model_name_lower) {
-                Some((_, _, id)) => Some((*id).to_string()),
+            match MODEL_OPTIONS.iter().find(|(name, _)| name == &model_name_lower) {
+                Some((_, id)) => Some((*id).to_string()),
                 None => {
-                    let available_names: Vec<&str> = MODEL_OPTIONS.iter().map(|(_, name, _)| *name).collect();
+                    let available_names: Vec<&str> = MODEL_OPTIONS.iter().map(|(name, _)| *name).collect();
                     bail!(
                         "Model '{}' does not exist. Available models: {}",
                         model_name,
@@ -436,19 +436,11 @@ const ROTATING_TIPS: [&str; 14] = [
     color_print::cstr! {"Customize your current chat session by choosing a model with <green!>/model</green!>"},
 ];
 
-pub const MODEL_OPTIONS: [(&str, &str, &str); 3] = [
+pub const MODEL_OPTIONS: [(&str, &str); 3] = [
     // ("Auto", ""),
-    (
-        "Claude Sonnet 3.5",
-        "claude-3.5-sonnet",
-        "CLAUDE_3_5_SONNET_20241022_V2_0",
-    ),
-    (
-        "Claude Sonnet 3.7",
-        "claude-3.7-sonnet",
-        "CLAUDE_3_7_SONNET_20250219_V1_0",
-    ),
-    ("Claude Sonnet 4.0", "claude-4-sonnet", "CLAUDE_SONNET_4_20250514_V1_0"),
+    ("claude-3.5-sonnet", "CLAUDE_3_5_SONNET_20241022_V2_0"),
+    ("claude-3.7-sonnet", "CLAUDE_3_7_SONNET_20250219_V1_0"),
+    ("claude-4-sonnet", "CLAUDE_SONNET_4_20250514_V1_0"),
 ];
 
 pub const DEFAULT_MODEL_ID: &str = "CLAUDE_3_7_SONNET_20250219_V1_0";
@@ -617,8 +609,8 @@ impl ChatContext {
                 .and_then(|model_name| {
                     MODEL_OPTIONS
                         .iter()
-                        .find(|(_, name, _)| *name == model_name)
-                        .map(|(_, _, id)| (*id).to_owned())
+                        .find(|(name, _)| *name == model_name)
+                        .map(|(_, id)| (*id).to_owned())
                 })
                 .or_else(|| Some(DEFAULT_MODEL_ID.to_owned())),
         };
@@ -3124,7 +3116,7 @@ impl ChatContext {
                 let active_model_id = self.conversation_state.current_model_id.as_deref();
                 let labels: Vec<String> = MODEL_OPTIONS
                     .iter()
-                    .map(|(label, _, model_id)| {
+                    .map(|(label, model_id)| {
                         if (model_id.is_empty() && active_model_id.is_none()) || Some(*model_id) == active_model_id {
                             format!("{} (active)", label)
                         } else {
@@ -3134,7 +3126,7 @@ impl ChatContext {
                     .collect();
                 let default_index = MODEL_OPTIONS
                     .iter()
-                    .position(|(_, _, model_id)| Some(*model_id) == active_model_id)
+                    .position(|(_, model_id)| Some(*model_id) == active_model_id)
                     .unwrap_or(0);
                 let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
                     .with_prompt("Select a model for this chat session")
@@ -3157,7 +3149,7 @@ impl ChatContext {
                 queue!(self.output, style::ResetColor)?;
 
                 if let Some(index) = selection {
-                    let (label, _, model_id) = MODEL_OPTIONS[index];
+                    let (label, model_id) = MODEL_OPTIONS[index];
                     let model_id_str = model_id.to_string();
                     self.conversation_state.current_model_id = Some(model_id_str.clone());
                     telemetry.update_model_id(Some(model_id_str.clone()));

crates/chat-cli/src/cli/chat/prompt.rs

@@ -50,6 +50,7 @@ pub const COMMANDS: &[&str] = &[
     "/tools untrust",
     "/tools trustall",
     "/tools reset",
+    "/model",
     "/profile",
     "/profile help",
     "/profile list",

crates/chat-cli/src/telemetry/mod.rs

@@ -161,8 +161,8 @@ impl TelemetryThread {
             .and_then(|model_name| {
                 MODEL_OPTIONS
                     .iter()
-                    .find(|(_, name, _)| *name == model_name)
-                    .map(|(_, _, id)| (*id).to_owned())
+                    .find(|(name, _)| *name == model_name)
+                    .map(|(_, id)| (*id).to_owned())
             })
             .or_else(|| Some(DEFAULT_MODEL_ID.to_owned()));
         let current_model_id = Arc::new(RwLock::new(model_id));