✨ Navigate threads via keyboard, store last used for models

Robdel12 · Robdel12 · commit 7d9b5c6eb34e · 2025-03-17T02:08:44.000-05:00
diff --git a/DraftPatch/Components/ChatBox.swift b/DraftPatch/Components/ChatBox.swift
@@ -10,7 +10,7 @@ import SwiftUI
 struct ChatBoxView: View {
   @Binding var userMessage: String
   @Binding var selectedDraftApp: DraftApp?
-  @FocusState.Binding var isTextFieldFocused: Bool
+  @Binding var isTextFieldFocused: Bool
 
   let thinking: Bool
   let onSubmit: () -> Void
diff --git a/DraftPatch/Components/ChatBoxEditor.swift b/DraftPatch/Components/ChatBoxEditor.swift
@@ -10,7 +10,7 @@ import SwiftUI
 
 struct ChatBoxEditor: View {
   @Binding var userMessage: String
-  @FocusState.Binding var isTextFieldFocused: Bool
+  @Binding var isTextFieldFocused: Bool
   @State private var textEditorHeight: CGFloat = 15
 
   let thinking: Bool
diff --git a/DraftPatch/Components/CustomTextEditor.swift b/DraftPatch/Components/CustomTextEditor.swift
@@ -10,7 +10,7 @@ import SwiftUI
 
 struct CustomTextEditor: NSViewRepresentable {
   @Binding var text: String
-  @FocusState.Binding var isFocused: Bool
+  @Binding var isFocused: Bool
 
   var isEditable: Bool = true
   var thinking: Bool = false
diff --git a/DraftPatch/Components/ModelPickerPopoverView.swift b/DraftPatch/Components/ModelPickerPopoverView.swift
@@ -24,7 +24,11 @@ struct ModelPickerPopoverView: View {
 
   var filteredModels: [ChatModel] {
     let sortedModels = viewModel.availableModels.sorted {
-      ($0.lastUsed ?? .distantPast) > ($1.lastUsed ?? .distantPast)
+      guard let date1 = $0.lastUsed, let date2 = $1.lastUsed else {
+        return $0.lastUsed != nil
+      }
+
+      return date1 > date2
     }
 
     if searchText.isEmpty {
diff --git a/DraftPatch/Components/RenamableTitleView.swift b/DraftPatch/Components/RenamableTitleView.swift
@@ -11,7 +11,7 @@ struct RenamableTitleView: View {
   @ObservedObject var thread: ChatThread
   @State private var isRenaming = false
   @State private var localTitle: String
-  @FocusState private var isTextFieldFocused: Bool
+  @FocusState private var focused: Bool
 
   init(thread: ChatThread) {
     self.thread = thread
@@ -31,19 +31,19 @@ struct RenamableTitleView: View {
         .accessibilityIdentifier("renameThreadTextField")
         .textFieldStyle(.roundedBorder)
         .frame(maxWidth: 200)
-        .focused($isTextFieldFocused)
+        .focused($focused)
         .onKeyPress { key in
           if key.characters == "\u{1B}" {
             localTitle = thread.title
-            isTextFieldFocused = false
+            focused = false
             isRenaming = false
             return .handled
           }
           return .ignored
         }
         .task {
           DispatchQueue.main.async {
-            isTextFieldFocused = true
+            focused = true
           }
         }
       } else {
diff --git a/DraftPatch/DraftPatchViewModel.swift b/DraftPatch/DraftPatchViewModel.swift
@@ -32,6 +32,7 @@ class DraftPatchViewModel: ObservableObject {
   @Published var selectedModel: ChatModel? = nil
   @Published var thinking: Bool = false
   @Published var showSettings: Bool = false
+  @Published var chatBoxFocused: Bool = true
 
   @Published var isDraftingEnabled: Bool = false
   @Published var selectedDraftApp: DraftApp? = nil {
@@ -48,6 +49,7 @@ class DraftPatchViewModel: ObservableObject {
     self.repository = repository
     self.llmManager = llmManager
 
+    loadModels()
     loadSettings()
     loadThreads()
 
@@ -80,6 +82,14 @@ class DraftPatchViewModel: ObservableObject {
     }
   }
 
+  func loadModels() {
+    do {
+      availableModels = try repository.fetchModels() ?? []
+    } catch {
+      print("Error loading settings: \(error)")
+    }
+  }
+
   func deleteThread(_ thread: ChatThread) {
     do {
       try repository.deleteThread(thread)
@@ -106,27 +116,7 @@ class DraftPatchViewModel: ObservableObject {
   }
 
   func loadLLMs() async {
-    do {
-      let storedModels = try repository.fetchStoredModels()
-      self.availableModels = storedModels.map { ChatModel(name: $0.name, provider: $0.provider) }
-    } catch {
-      print("Error loading stored models: \(error)")
-    }
-
-    let fetchedModels = await llmManager.loadLLMs(settings)
-
-    do {
-      for model in fetchedModels {
-        if !self.availableModels.contains(where: { $0.name == model.name && $0.provider == model.provider }) {
-          let storedModel = ChatModel(name: model.name, provider: model.provider)
-          try repository.insertStoredModel(storedModel)
-        }
-      }
-    } catch {
-      print("Error saving fetched models: \(error)")
-    }
-
-    self.availableModels = fetchedModels
+    self.availableModels = await llmManager.loadLLMs(settings, existingModels: availableModels)
   }
 
   func toggleDraftWithLastApp() {
@@ -165,9 +155,12 @@ class DraftPatchViewModel: ObservableObject {
   /// we insert that draft into the context before persisting the message.
   func sendMessage(_ text: String? = nil) async {
     guard let thread = selectedThread else { return }
-    guard let model = selectedModel ?? availableModels.first else { return }
-    model.lastUsed = Date()
-    thread.model = model
+    guard let currentModel = selectedModel ?? availableModels.first else { return }
+
+    if let model = availableModels.first(where: { $0.id == currentModel.id }) {
+      model.lastUsed = Date()
+      thread.model = model
+    }
 
     // Fetch selected text if a DraftApp is selected
     let selectedText = selectedDraftApp.flatMap { draftApp in
@@ -309,4 +302,28 @@ class DraftPatchViewModel: ObservableObject {
     return try await llmManager.getService(for: model.provider)
       .generateTitle(for: text, modelName: model.name)
   }
+
+  func selectPreviousThread() {
+    guard !chatThreads.isEmpty else { return }
+
+    if let currentThread = selectedThread,
+      let index = chatThreads.firstIndex(where: { $0.id == currentThread.id })
+    {
+      selectedThread = index > 0 ? chatThreads[index - 1] : chatThreads.last
+    } else {
+      selectedThread = chatThreads.last
+    }
+  }
+
+  func selectNextThread() {
+    guard !chatThreads.isEmpty else { return }
+
+    if let currentThread = selectedThread,
+      let index = chatThreads.firstIndex(where: { $0.id == currentThread.id })
+    {
+      selectedThread = index < chatThreads.count - 1 ? chatThreads[index + 1] : chatThreads.first
+    } else {
+      selectedThread = chatThreads.first
+    }
+  }
 }
diff --git a/DraftPatch/Models/ChatModel.swift b/DraftPatch/Models/ChatModel.swift
@@ -16,20 +16,22 @@ enum LLMProvider: String, Codable {
 }
 
 @Model
-class ChatModel: Identifiable, Equatable {
+final class ChatModel: Identifiable, Equatable {
   var name: String
   var provider: LLMProvider
-  var lastUsed: Date? = nil
+  var lastUsed: Date?
 
   var id: String { name }
 
   init(name: String, provider: LLMProvider, lastUsed: Date? = nil) {
     self.name = name
     self.provider = provider
-    self.lastUsed = Date()
+    self.lastUsed = lastUsed
   }
 
   static func == (lhs: ChatModel, rhs: ChatModel) -> Bool {
-    return lhs.name == rhs.name && lhs.provider == rhs.provider
+    return lhs.name == rhs.name
+    && lhs.provider == rhs.provider
+    && lhs.lastUsed == rhs.lastUsed
   }
 }
diff --git a/DraftPatch/Protocols/DraftPatchRepository.swift b/DraftPatch/Protocols/DraftPatchRepository.swift
@@ -9,8 +9,9 @@ protocol DraftPatchRepository {
   func save() throws
   func fetchThreads() throws -> [ChatThread]
   func fetchSettings() throws -> Settings?
+  func fetchModels() throws -> [ChatModel]?
+  func insertModel(_ model: ChatModel) throws
   func insertThread(_ thread: ChatThread) throws
   func deleteThread(_ thread: ChatThread) throws
-  func fetchStoredModels() throws -> [ChatModel]
-  func insertStoredModel(_ model: ChatModel) throws
+
 }
diff --git a/DraftPatch/RootView.swift b/DraftPatch/RootView.swift
@@ -10,7 +10,6 @@ import SwiftUI
 
 struct RootView: View {
   @EnvironmentObject var viewModel: DraftPatchViewModel
-  @FocusState var isTextFieldFocused: Bool
 
   var body: some View {
     NavigationSplitView {
@@ -64,7 +63,7 @@ struct RootView: View {
       .background(viewModel.showSettings ? Color.accentColor.opacity(0.2) : Color.clear)
     } detail: {
       NavigationStack {
-        ChatView(isTextFieldFocused: $isTextFieldFocused)
+        ChatView()
           .environmentObject(viewModel)
           .navigationDestination(isPresented: $viewModel.showSettings) {
             SettingsView()
@@ -98,7 +97,7 @@ struct RootView: View {
         ToolbarItem(placement: .primaryAction) {
           Button {
             viewModel.createDraftThread(title: "New Conversation")
-            isTextFieldFocused = true
+            viewModel.chatBoxFocused = true
           } label: {
             Label("New Chat", systemImage: "highlighter")
           }
diff --git a/DraftPatch/Services/LLMManager.swift b/DraftPatch/Services/LLMManager.swift
@@ -21,7 +21,7 @@ class LLMManager {
     }
   }
 
-  func loadLLMs(_ settings: Settings?) async -> [ChatModel] {
+  func loadLLMs(_ settings: Settings?, existingModels: [ChatModel]) async -> [ChatModel] {
     var availableModels: [ChatModel] = []
 
     let providers: [(enabled: Bool, service: LLMService, provider: LLMProvider)] = [
@@ -35,8 +35,17 @@ class LLMManager {
       for provider in providers where provider.enabled {
         group.addTask {
           do {
-            let models = try await provider.service.fetchAvailableModels()
-            return models.map { ChatModel(name: $0, provider: provider.provider) }
+            let fetchedModelNames = try await provider.service.fetchAvailableModels()
+
+            return fetchedModelNames.compactMap { modelName in
+              if let existingModel = existingModels.first(where: {
+                $0.name == modelName && $0.provider == provider.provider
+              }) {
+                return existingModel
+              } else {
+                return ChatModel(name: modelName, provider: provider.provider)
+              }
+            }
           } catch {
             print("Error loading \(provider.provider) models: \(error)")
             return []
diff --git a/DraftPatch/Services/LLMs/MockLLMService.swift b/DraftPatch/Services/LLMs/MockLLMService.swift
@@ -12,7 +12,7 @@ class MockLLMManager: LLMManager {
     return MockLLMService.shared
   }
 
-  override func loadLLMs(_ settings: Settings?) async -> [ChatModel] {
+  override func loadLLMs(_ settings: Settings?, existingModels: [ChatModel] = []) async -> [ChatModel] {
     return try! await MockLLMService.shared.fetchAvailableModels().map {
       ChatModel(name: $0, provider: .ollama)
     }
diff --git a/DraftPatch/Utils/MockChatThreadRepository.swift b/DraftPatch/Utils/MockChatThreadRepository.swift
@@ -18,6 +18,14 @@ class MockChatThreadRepository: DraftPatchRepository {
     return mockSettings
   }
 
+  func fetchModels() throws -> [ChatModel]? {
+    return mockStoredModels
+  }
+
+  func insertModel(_ model: ChatModel) throws {
+    mockStoredModels.append(model)
+  }
+
   func insertThread(_ thread: ChatThread) throws {
     mockThreads.append(thread)
   }
@@ -28,10 +36,6 @@ class MockChatThreadRepository: DraftPatchRepository {
     mockThreads.removeAll { $0.id == thread.id }
   }
 
-  func fetchStoredModels() throws -> [ChatModel] {
-    return mockStoredModels
-  }
-
   func insertStoredModel(_ model: ChatModel) throws {
     mockStoredModels.append(model)
   }
diff --git a/DraftPatch/Utils/SwiftDataChatThreadRepository.swift b/DraftPatch/Utils/SwiftDataChatThreadRepository.swift
@@ -25,6 +25,16 @@ class SwiftDataDraftPatchRepository: DraftPatchRepository {
     return try context.fetch(descriptor).first
   }
 
+  func fetchModels() throws -> [ChatModel]? {
+    let descriptor = FetchDescriptor<ChatModel>(sortBy: [SortDescriptor(\.lastUsed, order: .reverse)])
+    return try context.fetch(descriptor)
+  }
+
+  func insertModel(_ model: ChatModel) throws {
+    context.insert(model)
+    try context.save()
+  }
+
   func insertThread(_ thread: ChatThread) throws {
     context.insert(thread)
   }
@@ -36,14 +46,4 @@ class SwiftDataDraftPatchRepository: DraftPatchRepository {
   func deleteThread(_ thread: ChatThread) throws {
     context.delete(thread)
   }
-
-  func fetchStoredModels() throws -> [ChatModel] {
-    let descriptor = FetchDescriptor<ChatModel>()
-    return try context.fetch(descriptor)
-  }
-
-  func insertStoredModel(_ model: ChatModel) throws {
-    context.insert(model)
-    try context.save()
-  }
 }
diff --git a/DraftPatch/Views/ChatView.swift b/DraftPatch/Views/ChatView.swift
@@ -10,7 +10,6 @@ import SwiftUI
 struct ChatView: View {
   @EnvironmentObject var viewModel: DraftPatchViewModel
   @State private var userMessage = ""
-  @FocusState.Binding var isTextFieldFocused: Bool
 
   @State private var recentUserMessageId: String? = nil
   @State private var dynamicSpacerHeight: CGFloat? = nil
@@ -111,10 +110,27 @@ struct ChatView: View {
               }
           }
 
+          Button {
+            viewModel.selectNextThread()
+          } label: {
+            Text("Next thread")
+          }
+          .opacity(0)
+          .keyboardShortcut(KeyEquivalent.upArrow, modifiers: .command)
+
+          Button {
+            viewModel.selectPreviousThread()
+            print("viewModel.chatBoxFocused: \(viewModel.chatBoxFocused)")
+          } label: {
+            Text("Previous thread")
+          }
+          .opacity(0)
+          .keyboardShortcut(KeyEquivalent.downArrow, modifiers: .command)
+
           ChatBoxView(
             userMessage: $userMessage,
             selectedDraftApp: $viewModel.selectedDraftApp,
-            isTextFieldFocused: $isTextFieldFocused,
+            isTextFieldFocused: $viewModel.chatBoxFocused,
             thinking: viewModel.thinking,
             onSubmit: sendMessage,
             onCancel: {
@@ -129,6 +145,7 @@ struct ChatView: View {
           .padding(.horizontal)
           .frame(maxWidth: 960)
         }
+        .id(thread.id)
       }
       .padding(.bottom, 12)
       .background(Color(.black).opacity(0.2))

Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,22 @@ enum LLMProvider: String, Codable {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Model`
`19`		`-class ChatModel: Identifiable, Equatable {`
	`19`	`+final class ChatModel: Identifiable, Equatable {`
`20`	`20`	`var name: String`
`21`	`21`	`var provider: LLMProvider`
`22`		`- var lastUsed: Date? = nil`
	`22`	`+ var lastUsed: Date?`
`23`	`23`
`24`	`24`	`var id: String { name }`
`25`	`25`
`26`	`26`	`init(name: String, provider: LLMProvider, lastUsed: Date? = nil) {`
`27`	`27`	`self.name = name`
`28`	`28`	`self.provider = provider`
`29`		`- self.lastUsed = Date()`
	`29`	`+ self.lastUsed = lastUsed`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`static func == (lhs: ChatModel, rhs: ChatModel) -> Bool {`
`33`		`- return lhs.name == rhs.name && lhs.provider == rhs.provider`
	`33`	`+ return lhs.name == rhs.name`
	`34`	`+ && lhs.provider == rhs.provider`
	`35`	`+ && lhs.lastUsed == rhs.lastUsed`
`34`	`36`	`}`
`35`	`37`	`}`