Merge remote-tracking branch 'origin/main' into ai-refactoring

crates/ai/src/ai.rs

@@ -4,6 +4,7 @@ mod streaming_diff;
 
 use anyhow::{anyhow, Result};
 pub use assistant::AssistantPanel;
+use assistant_settings::OpenAIModel;
 use chrono::{DateTime, Local};
 use collections::HashMap;
 use fs::Fs;
@@ -65,7 +66,7 @@ struct SavedConversation {
     messages: Vec<SavedMessage>,
     message_metadata: HashMap<MessageId, MessageMetadata>,
     summary: String,
-    model: String,
+    model: OpenAIModel,
 }
 
 impl SavedConversation {