add both modelid and model infor in conversation state

Author: evanliu048

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

@@ -222,7 +222,7 @@ impl ContextSubcommand {
                         execute!(session.stderr, style::Print(format!("{}\n\n", "▔".repeat(3))),)?;
                     }
 
-                    let context_files_max_size = calc_max_context_files_size(session.conversation.model.as_ref());
+                    let context_files_max_size = calc_max_context_files_size(session.conversation.model_info.as_ref());
                     let mut files_as_vec = profile_context_files
                         .iter()
                         .map(|(path, content, _)| (path.clone(), content.clone()))

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

@@ -154,7 +154,7 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
         return Ok(None);
     }
 
-    let active_model_id = session.conversation.model.as_ref().map(|m| m.model_id.as_str());
+    let active_model_id = session.conversation.model_info.as_ref().map(|m| m.model_id.as_str());
 
     let labels: Vec<String> = models
         .iter()
@@ -190,7 +190,7 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
 
     if let Some(index) = selection {
         let selected = models[index].clone();
-        session.conversation.model = Some(selected.clone());
+        session.conversation.model_info = Some(selected.clone());
         let display_name = selected.display_name();
 
         queue!(

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

@@ -62,7 +62,7 @@ impl UsageArgs {
         // set a max width for the progress bar for better aesthetic
         let progress_bar_width = std::cmp::min(window_width, 80);
 
-        let context_window_size = context_window_tokens(session.conversation.model.as_ref());
+        let context_window_size = context_window_tokens(session.conversation.model_info.as_ref());
         let context_width =
             ((context_token_count.value() as f64 / context_window_size as f64) * progress_bar_width as f64) as usize;
         let assistant_width =

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

@@ -112,9 +112,13 @@ pub struct ConversationState {
     latest_summary: Option<(String, RequestMetadata)>,
     #[serde(skip)]
     pub agents: Agents,
+    /// Legacy, unused
     /// Model explicitly selected by the user in this conversation state via `/model`.
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub model: Option<ModelInfo>,
+    pub model: Option<String>,
+    /// Model explicitly selected by the user in this conversation state via `/model`.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub model_info: Option<ModelInfo>,
     /// Used to track agent vs user updates to file modifications.
     ///
     /// Maps from a file path to [FileLineTracker]
@@ -173,7 +177,8 @@ impl ConversationState {
             context_message_length: None,
             latest_summary: None,
             agents,
-            model,
+            model: None,
+            model_info: model,
             file_line_tracker: HashMap::new(),
         }
     }
@@ -457,7 +462,7 @@ impl ConversationState {
             context_messages,
             dropped_context_files,
             tools: &self.tools,
-            model_id: self.model.as_ref().map(|m| m.model_id.as_str()),
+            model_id: self.model_info.as_ref().map(|m| m.model_id.as_str()),
         })
     }
 
@@ -555,7 +560,7 @@ impl ConversationState {
             conversation_id: Some(self.conversation_id.clone()),
             user_input_message: summary_message
                 .unwrap_or(UserMessage::new_prompt(summary_content, None)) // should not happen
-                .into_user_input_message(self.model.as_ref().map(|m| m.model_id.clone()), &tools),
+                .into_user_input_message(self.model_info.as_ref().map(|m| m.model_id.clone()), &tools),
             history: Some(flatten_history(history.iter())),
         })
     }
@@ -668,7 +673,7 @@ impl ConversationState {
     /// Get the current token warning level
     pub async fn get_token_warning_level(&mut self, os: &Os) -> Result<TokenWarningLevel, ChatError> {
         let total_chars = self.calculate_char_count(os).await?;
-        let max_chars = TokenCounter::token_to_chars(context_window_tokens(self.model.as_ref()));
+        let max_chars = TokenCounter::token_to_chars(context_window_tokens(self.model_info.as_ref()));
 
         Ok(if *total_chars >= max_chars {
             TokenWarningLevel::Critical

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

@@ -1184,7 +1184,7 @@ impl ChatSession {
         }
         self.stderr.flush()?;
 
-        if let Some(ref model_info) = self.conversation.model {
+        if let Some(ref model_info) = self.conversation.model_info {
             let (models, _default_model) = get_available_models(os).await?;
             if let Some(model_option) = models.iter().find(|option| option.model_id == model_info.model_id) {
                 let display_name = model_option.model_name.as_deref().unwrap_or(&model_option.model_id);
@@ -2377,7 +2377,7 @@ impl ChatSession {
             let mut tool_telemetry = ToolUseEventBuilder::new(
                 conv_id.clone(),
                 tool_use.id.clone(),
-                self.conversation.model.as_ref().map(|m| m.model_id.clone()),
+                self.conversation.model_info.as_ref().map(|m| m.model_id.clone()),
             )
             .set_tool_use_id(tool_use_id.clone())
             .set_tool_name(tool_use.name.clone())