Added a lot of functionality. Bugfixes and changes

oAI/Views/Main/ContentView.swift

@@ -41,9 +41,14 @@ struct ContentView: View {
                 models: chatViewModel.availableModels,
                 selectedModel: chatViewModel.selectedModel,
                 onSelect: { model in
+                    let oldModel = chatViewModel.selectedModel
                     chatViewModel.selectedModel = model
                     SettingsService.shared.defaultModel = model.id
                     chatViewModel.showModelSelector = false
+                    // Trigger auto-save on model switch
+                    Task {
+                        await chatViewModel.onModelSwitch(from: oldModel, to: model)
+                    }
                 }
             )
             .task {
@@ -88,22 +93,26 @@ struct ContentView: View {
     #if os(macOS)
     @ToolbarContentBuilder
     private var macOSToolbar: some ToolbarContent {
+        let settings = SettingsService.shared
+        let showLabels = settings.showToolbarLabels
+        let scale = iconScale(for: settings.toolbarIconSize)
+
         ToolbarItemGroup(placement: .automatic) {
             // New conversation
             Button(action: { chatViewModel.newConversation() }) {
-                Label("New Chat", systemImage: "square.and.pencil")
+                ToolbarLabel(title: "New Chat", systemImage: "square.and.pencil", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("n", modifiers: .command)
             .help("New conversation")
 
             Button(action: { chatViewModel.showConversations = true }) {
-                Label("Conversations", systemImage: "clock.arrow.circlepath")
+                ToolbarLabel(title: "Conversations", systemImage: "clock.arrow.circlepath", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("l", modifiers: .command)
             .help("Saved conversations (Cmd+L)")
 
             Button(action: { chatViewModel.showHistory = true }) {
-                Label("History", systemImage: "list.bullet")
+                ToolbarLabel(title: "History", systemImage: "list.bullet", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("h", modifiers: .command)
             .help("Command history (Cmd+H)")
@@ -111,7 +120,7 @@ struct ContentView: View {
             Spacer()
 
             Button(action: { chatViewModel.showModelSelector = true }) {
-                Label("Model", systemImage: "cpu")
+                ToolbarLabel(title: "Model", systemImage: "cpu", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("m", modifiers: .command)
             .help("Select AI model (Cmd+M)")
@@ -121,39 +130,68 @@ struct ContentView: View {
                     chatViewModel.modelInfoTarget = model
                 }
             }) {
-                Label("Model Info", systemImage: "info.circle")
+                ToolbarLabel(title: "Info", systemImage: "info.circle", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("i", modifiers: .command)
             .help("Model info (Cmd+I)")
             .disabled(chatViewModel.selectedModel == nil)
 
             Button(action: { chatViewModel.showStats = true }) {
-                Label("Stats", systemImage: "chart.bar")
+                ToolbarLabel(title: "Stats", systemImage: "chart.bar", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("s", modifiers: .command)
             .help("Session statistics (Cmd+S)")
 
             Button(action: { chatViewModel.showCredits = true }) {
-                Label("Credits", systemImage: "creditcard")
+                ToolbarLabel(title: "Credits", systemImage: "creditcard", showLabels: showLabels, scale: scale)
             }
             .help("Check API credits")
 
             Spacer()
 
             Button(action: { chatViewModel.showSettings = true }) {
-                Label("Settings", systemImage: "gearshape")
+                ToolbarLabel(title: "Settings", systemImage: "gearshape", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut(",", modifiers: .command)
             .help("Settings (Cmd+,)")
 
             Button(action: { chatViewModel.showHelp = true }) {
-                Label("Help", systemImage: "questionmark.circle")
+                ToolbarLabel(title: "Help", systemImage: "questionmark.circle", showLabels: showLabels, scale: scale)
             }
             .keyboardShortcut("/", modifiers: .command)
             .help("Help & commands (Cmd+/)")
         }
     }
     #endif
+
+    // Helper function to convert icon size to imageScale
+    private func iconScale(for size: Double) -> Image.Scale {
+        switch size {
+        case ...18: return .small
+        case 19...24: return .medium
+        default: return .large
+        }
+    }
+}
+
+// Helper view for toolbar labels
+struct ToolbarLabel: View {
+    let title: String
+    let systemImage: String
+    let showLabels: Bool
+    let scale: Image.Scale
+
+    var body: some View {
+        if showLabels {
+            Label(title, systemImage: systemImage)
+                .labelStyle(.titleAndIcon)
+                .imageScale(scale)
+        } else {
+            Label(title, systemImage: systemImage)
+                .labelStyle(.iconOnly)
+                .imageScale(scale)
+        }
+    }
 }
 
 #Preview {