Sort folders alphabetically; let users pick the merge model directly

Folders now list alphabetically (case-insensitive) everywhere they're shown — sidebar, advanced conversation list, and the "Move to Folder" menu — rather than creation order. listFolders() does the sort at the DB layer; in-memory folder arrays are re-sorted after local create/rename so newly added or renamed folders don't fall out of order until the next reload. Combine Conversations' AI-Assisted Merge no longer silently assumes settings.defaultModel — added a model picker (reusing ModelSelectorView, defaulting to the current default model/provider) so users can pick which model performs the merge per-combine. ConversationMergeService.merge takes optional mergeModelId/mergeProvider overrides.
2026-07-28 14:39:18 +02:00
parent 8dee77541f
commit e898d4b6db
6 changed files with 75 additions and 17 deletions
@@ -25,6 +25,7 @@ import SwiftUI

 struct CombineConversationsSheet: View {
    @Environment(\.dismiss) var dismiss
+    @Environment(ChatViewModel.self) private var chatViewModel

    let conversations: [Conversation]
    var onCompleted: (Conversation) -> Void
@@ -34,6 +35,9 @@ struct CombineConversationsSheet: View {
    @State private var deleteOriginals = false
    @State private var isProcessing = false
    @State private var errorMessage: String?
+    @State private var mergeModel: ModelInfo?
+    @State private var mergeProvider: Settings.Provider
+    @State private var showModelPicker = false

    private let settings = SettingsService.shared

@@ -42,9 +46,13 @@ struct CombineConversationsSheet: View {
        self.onCompleted = onCompleted
        let joined = conversations.map(\.name).joined(separator: " + ")
        _name = State(initialValue: String(joined.prefix(80)))
+        _mergeProvider = State(initialValue: SettingsService.shared.defaultProvider)
    }

-    private var defaultModelLabel: String? {
+    private var mergeModelLabel: String? {
+        if let mergeModel {
+            return "\(mergeProvider.displayName) / \(mergeModel.name)"
+        }
        guard let model = settings.defaultModel, !model.isEmpty else { return nil }
        return "\(settings.defaultProvider.displayName) / \(model)"
    }
@@ -52,7 +60,7 @@ struct CombineConversationsSheet: View {
    private var isValid: Bool {
        !name.trimmingCharacters(in: .whitespaces).isEmpty
            && conversations.count >= 2
-            && (mode == .simple || defaultModelLabel != nil)
+            && (mode == .simple || mergeModelLabel != nil)
    }

    var body: some View {
@@ -109,12 +117,20 @@ struct CombineConversationsSheet: View {
                        } else {
                            Text("A model reads all the source messages and rewrites them into one coherent, de-duplicated conversation.")
                                .font(.caption).foregroundStyle(.secondary)
-                            if let label = defaultModelLabel {
-                                Label("Uses your default model: \(label)", systemImage: "cpu")
-                                    .font(.caption).foregroundStyle(.secondary)
-                            } else {
-                                Label("No default model configured — set one in Settings → General.", systemImage: "exclamationmark.triangle.fill")
-                                    .font(.caption).foregroundStyle(.orange)
+                            HStack(spacing: 8) {
+                                if let label = mergeModelLabel {
+                                    Label(label, systemImage: "cpu")
+                                        .font(.caption).foregroundStyle(.secondary)
+                                } else {
+                                    Label("No model selected", systemImage: "exclamationmark.triangle.fill")
+                                        .font(.caption).foregroundStyle(.orange)
+                                }
+                                Button("Change…") {
+                                    showModelPicker = true
+                                }
+                                .buttonStyle(.link)
+                                .font(.caption)
+                                .disabled(isProcessing)
                            }
                        }
                    }
@@ -156,6 +172,25 @@ struct CombineConversationsSheet: View {
            .padding(.horizontal, 24).padding(.vertical, 12)
        }
        .frame(minWidth: 520, idealWidth: 560, minHeight: 460, idealHeight: 520)
+        .task {
+            if chatViewModel.availableModels.count <= 10 {
+                await chatViewModel.loadAvailableModels()
+            }
+            if mergeModel == nil, let defaultModel = settings.defaultModel {
+                mergeModel = chatViewModel.availableModels.first(where: { $0.id == defaultModel })
+            }
+        }
+        .sheet(isPresented: $showModelPicker) {
+            ModelSelectorView(
+                models: chatViewModel.availableModels,
+                selectedModel: mergeModel,
+                onSelect: { model in
+                    mergeModel = model
+                    mergeProvider = chatViewModel.inferProviderPublic(from: model.id) ?? mergeProvider
+                    showModelPicker = false
+                }
+            )
+        }
    }

    private func combine() {
@@ -165,6 +200,8 @@ struct CombineConversationsSheet: View {
        let trimmedName = name.trimmingCharacters(in: .whitespaces)
        let selectedMode = mode
        let shouldDeleteOriginals = deleteOriginals
+        let selectedModelId = mergeModel?.id
+        let selectedProvider = mergeModel != nil ? mergeProvider : nil

        Task {
            do {
@@ -172,6 +209,8 @@ struct CombineConversationsSheet: View {
                    conversationIds: ids,
                    name: trimmedName,
                    mode: selectedMode,
+                    mergeModelId: selectedModelId,
+                    mergeProvider: selectedProvider,
                    deleteOriginals: shouldDeleteOriginals
                )
                await MainActor.run {