add modelid in cs strucutr and setting about default model

Author: evanliu048

crates/chat-cli/src/api_client/clients/streaming_client.rs

@@ -126,6 +126,7 @@ impl StreamingClient {
         })
     }
 
+    //todo yifan generate response
     pub async fn send_message(
         &self,
         conversation_state: ConversationState,

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

@@ -105,6 +105,9 @@ pub struct ConversationState {
     latest_summary: Option<String>,
     #[serde(skip)]
     pub updates: Option<SharedWriter>,
+    /// Model explicitly selected by the user in this conversation state via `/model`. (`None` == auto)
+    #[serde(skip)]
+    pub current_model_id: Option<String>,
 }
 
 impl ConversationState {
@@ -115,6 +118,7 @@ impl ConversationState {
         profile: Option<String>,
         updates: Option<SharedWriter>,
         tool_manager: ToolManager,
+        curren_model_id: Option<String>,
     ) -> Self {
         // Initialize context manager
         let context_manager = match ContextManager::new(ctx, None).await {
@@ -157,6 +161,7 @@ impl ConversationState {
             context_message_length: None,
             latest_summary: None,
             updates,
+            current_model_id: curren_model_id,
         }
     }
 
@@ -1059,6 +1064,7 @@ mod tests {
             None,
             None,
             tool_manager,
+            None,
         )
         .await;
 
@@ -1089,6 +1095,7 @@ mod tests {
             None,
             None,
             tool_manager.clone(),
+            None,
         )
         .await;
         conversation_state.set_next_user_message("start".to_string()).await;
@@ -1120,6 +1127,7 @@ mod tests {
             None,
             None,
             tool_manager.clone(),
+            None,
         )
         .await;
         conversation_state.set_next_user_message("start".to_string()).await;
@@ -1165,6 +1173,7 @@ mod tests {
             None,
             None,
             tool_manager,
+            None,
         )
         .await;
 
@@ -1235,6 +1244,7 @@ mod tests {
             None,
             Some(SharedWriter::stdout()),
             tool_manager,
+            None,
         )
         .await;
 

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

@@ -562,6 +562,7 @@ impl ChatContext {
         let output_clone = output.clone();
 
         let mut existing_conversation = false;
+        let model_id = Some(database.settings.get_string(Setting::UserDefaultModel).unwrap());
         let conversation_state = if resume_conversation {
             let prior = std::env::current_dir()
                 .ok()
@@ -588,6 +589,7 @@ impl ChatContext {
                     profile,
                     Some(output_clone),
                     tool_manager,
+                    model_id
                 )
                 .await
             }
@@ -599,6 +601,7 @@ impl ChatContext {
                 profile,
                 Some(output_clone),
                 tool_manager,
+                model_id
             )
             .await
         };
@@ -3014,21 +3017,14 @@ impl ChatContext {
                 queue!(self.output, style::Print("\n"))?;
                 let labels: Vec<&str> = MODEL_OPTIONS.iter().map(|(l, _)| *l).collect();
                 let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
-                    .with_prompt("choose your model")
+                    .with_prompt("Select the model you want to use for chat")
                     .items(&labels)
                     .default(0)
                     .interact_on_opt(&dialoguer::console::Term::stdout())
                 {
                     Ok(sel) => sel,
                     // Ctrl‑C -> Err(Interrupted)
-                    Err(DError::IO(ref e)) if e.kind() == io::ErrorKind::Interrupted => {
-                        queue!(
-                            self.output,
-                            style::Print("\n"),
-                            style::Print("⚠️ User cancelled selection\n\n")
-                        )?;
-                        None
-                    },
+                    Err(DError::IO(ref e)) if e.kind() == io::ErrorKind::Interrupted => None,
                     Err(e) => return Err(ChatError::Custom(format!("Failed to choose model: {e}").into())),
                 };
 
@@ -3039,7 +3035,7 @@ impl ChatContext {
                         queue,
                         style,
                     };
-                    queue!(self.output, style::Print(format!("\n✅ change to : {}\n\n", label)))?;
+                    queue!(self.output, style::Print("\n"), style::Print(format!(" Swtiched model to {}\n\n", label)))?;
                 }
 
                 ChatState::PromptUser {
@@ -3729,6 +3725,8 @@ impl ChatContext {
 
         Ok(())
     }
+
+    
 }
 
 /// Prints hook configuration grouped by trigger: conversation session start or per user message

crates/chat-cli/src/database/settings.rs

@@ -31,6 +31,7 @@ pub enum Setting {
     McpInitTimeout,
     McpNoInteractiveTimeout,
     McpLoadedBefore,
+    UserDefaultModel,
 }
 
 impl AsRef<str> for Setting {
@@ -50,6 +51,7 @@ impl AsRef<str> for Setting {
             Self::McpInitTimeout => "mcp.initTimeout",
             Self::McpNoInteractiveTimeout => "mcp.noInteractiveTimeout",
             Self::McpLoadedBefore => "mcp.loadedBefore",
+            Self::UserDefaultModel => "chat.userDefaultModel",
         }
     }
 }
@@ -79,6 +81,7 @@ impl TryFrom<&str> for Setting {
             "mcp.initTimeout" => Ok(Self::McpInitTimeout),
             "mcp.noInteractiveTimeout" => Ok(Self::McpNoInteractiveTimeout),
             "mcp.loadedBefore" => Ok(Self::McpLoadedBefore),
+            "chat.userDefaultModel" => Ok(Self::UserDefaultModel),
             _ => Err(DatabaseError::InvalidSetting(value.to_string())),
         }
     }
@@ -197,11 +200,15 @@ mod test {
         assert_eq!(settings.get(Setting::OldClientId), None);
         assert_eq!(settings.get(Setting::ShareCodeWhispererContent), None);
         assert_eq!(settings.get(Setting::McpLoadedBefore), None);
+        assert_eq!(settings.get(Setting::UserDefaultModel), None);
+
 
         settings.set(Setting::TelemetryEnabled, true).await.unwrap();
         settings.set(Setting::OldClientId, "test").await.unwrap();
         settings.set(Setting::ShareCodeWhispererContent, false).await.unwrap();
         settings.set(Setting::McpLoadedBefore, true).await.unwrap();
+        settings.set(Setting::UserDefaultModel, "model 1").await.unwrap();
+
 
         assert_eq!(settings.get(Setting::TelemetryEnabled), Some(&Value::Bool(true)));
         assert_eq!(
@@ -213,6 +220,10 @@ mod test {
             Some(&Value::Bool(false))
         );
         assert_eq!(settings.get(Setting::McpLoadedBefore), Some(&Value::Bool(true)));
+        assert_eq!(
+            settings.get(Setting::UserDefaultModel),
+            Some(&Value::String("model 1".to_string()))
+        );
 
         settings.remove(Setting::TelemetryEnabled).await.unwrap();
         settings.remove(Setting::OldClientId).await.unwrap();