Added skills, shortcuts, and bugifixes++

oAI/Services/DatabaseService.swift

@@ -463,7 +463,7 @@ final class DatabaseService: Sendable {
                     .filter(Column("conversationId") == record.id)
                     .fetchCount(db)) ?? 0
 
-                // Get last message date
+                // Get last message (for date + model fallback)
                 let lastMsg = try? MessageRecord
                     .filter(Column("conversationId") == record.id)
                     .order(Column("sortOrder").desc)
@@ -471,15 +471,18 @@ final class DatabaseService: Sendable {
 
                 let lastDate = lastMsg.flatMap { self.isoFormatter.date(from: $0.timestamp) } ?? updatedAt
 
+                // Derive primary model: prefer the stored field, fall back to last message's modelId
+                let primaryModel = record.primaryModel ?? lastMsg?.modelId
+
                 // Create conversation with empty messages array but correct metadata
                 var conv = Conversation(
                     id: id,
                     name: record.name,
                     messages: Array(repeating: Message(role: .user, content: ""), count: messageCount),
                     createdAt: createdAt,
-                    updatedAt: lastDate
+                    updatedAt: lastDate,
+                    primaryModel: primaryModel
                 )
-                // We store placeholder messages just for the count; lastMessageDate uses updatedAt
                 conv.updatedAt = lastDate
                 return conv
             }