[pull] main from intitni:main

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -32,7 +32,7 @@ extension WebChatContextCollector {
     static func detectLinks(from messages: [ChatMessage]) -> [String] {
         return messages.lazy
             .compactMap {
-                $0.content ?? $0.functionCall?.arguments
+                $0.content ?? $0.toolCalls?.map(\.function.arguments).joined(separator: " ") ?? ""
             }
             .map(detectLinks(from:))
             .flatMap { $0 }

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -9,13 +9,13 @@ public struct DisplayedChatMessage: Equatable {
     public enum Role: Equatable {
         case user
         case assistant
-        case function
+        case tool
         case ignored
     }
 
     public struct Reference: Equatable {
         public typealias Kind = ChatMessage.Reference.Kind
-        
+
         public var title: String
         public var subtitle: String
         public var uri: String
@@ -135,7 +135,7 @@ struct Chat: ReducerProtocol {
                     await send(.focusOnTextField)
                     await send(.refresh)
                 }
-                
+
             case .refresh:
                 return .run { send in
                     await send(.chatMenu(.refresh))
@@ -298,8 +298,9 @@ struct Chat: ReducerProtocol {
                 }.cancellable(id: CancelID.observeDefaultScopesChange(id), cancelInFlight: true)
 
             case .historyChanged:
-                state.history = service.chatHistory.map { message in
-                    .init(
+                state.history = service.chatHistory.flatMap { message in
+                    var all = [DisplayedChatMessage]()
+                    all.append(.init(
                         id: message.id,
                         role: {
                             switch message.role {
@@ -312,7 +313,6 @@ struct Chat: ReducerProtocol {
                                     return .assistant
                                 }
                                 return .ignored
-                            case .function: return .function
                             }
                         }(),
                         text: message.summary ?? message.content ?? "",
@@ -325,7 +325,18 @@ struct Chat: ReducerProtocol {
                                 kind: $0.kind
                             )
                         }
-                    )
+                    ))
+
+                    for call in message.toolCalls ?? [] {
+                        all.append(.init(
+                            id: message.id + call.id,
+                            role: .tool,
+                            text: call.response.summary ?? call.response.content,
+                            references: []
+                        ))
+                    }
+
+                    return all
                 }
 
                 state.title = {
@@ -401,7 +412,7 @@ struct ChatMenu: ReducerProtocol {
                 return .run {
                     await $0(.refresh)
                 }
-                
+
             case .refresh:
                 state.temperatureOverride = service.configuration.overriding.temperature
                 state.chatModelIdOverride = service.configuration.overriding.modelId

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -258,7 +258,7 @@ struct ChatHistory: View {
                         trailing: -8
                     ))
                     .padding(.vertical, 4)
-                case .function:
+                case .tool:
                     FunctionMessage(id: message.id, text: text)
                 case .ignored:
                     EmptyView()
@@ -453,7 +453,7 @@ struct ChatPanel_Preview: PreviewProvider {
         ),
         .init(
             id: "6",
-            role: .function,
+            role: .tool,
             text: """
             Searching for something...
             - abc

Core/Sources/ChatService/ChatService.swift

@@ -124,9 +124,9 @@ public final class ChatService: ObservableObject {
         await chatGPTService.stopReceivingMessage()
         isReceivingMessage = false
 
-        // if it's stopped before the function finishes, remove the function call.
+        // if it's stopped before the tool calls finish, remove the message.
         await memory.mutateHistory { history in
-            if history.last?.role == .assistant, history.last?.functionCall != nil {
+            if history.last?.role == .assistant, history.last?.toolCalls != nil {
                 history.removeLast()
             }
         }

Core/Sources/ChatService/ContextAwareAutoManagedChatGPTMemory.swift

@@ -39,7 +39,7 @@ public final class ContextAwareAutoManagedChatGPTMemory: ChatGPTMemory {
 
     public func generatePrompt() async -> ChatGPTPrompt {
         let content = (await memory.history)
-            .last(where: { $0.role == .user || $0.role == .function })?.content
+            .last(where: { $0.role == .user  })?.content
         try? await contextController.collectContextInformation(
             systemPrompt: """
             \(chatService?.systemPrompt ?? "")

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift

@@ -14,6 +14,7 @@ struct ChatModelEdit: ReducerProtocol {
         @BindingState var maxTokens: Int = 4000
         @BindingState var supportsFunctionCalling: Bool = true
         @BindingState var modelName: String = ""
+        @BindingState var ollamaKeepAlive: String = ""
         var apiKeyName: String { apiKeySelection.apiKeyName }
         var baseURL: String { baseURLSelection.baseURL }
         var isFullURL: Bool { baseURLSelection.isFullURL }
@@ -48,7 +49,7 @@ struct ChatModelEdit: ReducerProtocol {
         Scope(state: \.apiKeySelection, action: /Action.apiKeySelection) {
             APIKeySelection()
         }
-        
+
         Scope(state: \.baseURLSelection, action: /Action.baseURLSelection) {
             BaseURLSelection()
         }
@@ -135,10 +136,10 @@ struct ChatModelEdit: ReducerProtocol {
                     state.suggestedMaxTokens = nil
                     return .none
                 }
-                
+
             case .apiKeySelection:
                 return .none
-                
+
             case .baseURLSelection:
                 return .none
 
@@ -169,6 +170,7 @@ extension ChatModelEdit.State {
             maxTokens: model.info.maxTokens,
             supportsFunctionCalling: model.info.supportsFunctionCalling,
             modelName: model.info.modelName,
+            ollamaKeepAlive: model.info.ollamaInfo.keepAlive,
             apiKeySelection: .init(
                 apiKeyName: model.info.apiKeyName,
                 apiKeyManagement: .init(availableAPIKeyNames: [model.info.apiKeyName])
@@ -193,9 +195,13 @@ extension ChatModel {
                     if case .googleAI = state.format {
                         return false
                     }
+                    if case .ollama = state.format {
+                        return false
+                    }
                     return state.supportsFunctionCalling
                 }(),
-                modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines)
+                modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
+                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive)
             )
         )
     }

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -24,6 +24,8 @@ struct ChatModelEditView: View {
                             openAICompatible
                         case .googleAI:
                             googleAI
+                        case .ollama:
+                            ollama
                         }
                     }
                 }
@@ -92,6 +94,8 @@ struct ChatModelEditView: View {
                             Text("OpenAI Compatible").tag(format)
                         case .googleAI:
                             Text("Google Generative AI").tag(format)
+                        case .ollama:
+                            Text("Ollama").tag(format)
                         }
                     }
                 },
@@ -171,7 +175,7 @@ struct ChatModelEditView: View {
                 )
 
                 TextField(text: textFieldBinding) {
-                    Text("Max Tokens (Including Reply)")
+                    Text("Context Window")
                         .multilineTextAlignment(.trailing)
                 }
                 .overlay(alignment: .trailing) {
@@ -344,6 +348,38 @@ struct ChatModelEditView: View {
 
         maxTokensTextField
     }
+
+    @ViewBuilder
+    var ollama: some View {
+        baseURLTextField(prompt: Text("http://127.0.0.1:11434")) {
+            Text("/api/chat")
+        }
+
+        WithViewStore(
+            store,
+            removeDuplicates: { $0.modelName == $1.modelName }
+        ) { viewStore in
+            TextField("Model Name", text: viewStore.$modelName)
+        }
+
+        maxTokensTextField
+
+        WithViewStore(
+            store,
+            removeDuplicates: { $0.ollamaKeepAlive == $1.ollamaKeepAlive }
+        ) { viewStore in
+            TextField(text: viewStore.$ollamaKeepAlive, prompt: Text("Default Value")) {
+                Text("Keep Alive")
+            }
+        }
+
+        VStack(alignment: .leading, spacing: 8) {
+            Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
+                " For more details, please visit [https://ollama.com](https://ollama.com)."
+            )
+        }
+        .padding(.vertical)
+    }
 }
 
 #Preview("OpenAI") {

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelManagement.swift

@@ -11,6 +11,7 @@ extension ChatModel: ManageableAIModel {
         case .azureOpenAI: return "Azure OpenAI"
         case .openAICompatible: return "OpenAI Compatible"
         case .googleAI: return "Google Generative AI"
+        case .ollama: return "Ollama"
         }
     }
 

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEdit.swift

@@ -13,6 +13,7 @@ struct EmbeddingModelEdit: ReducerProtocol {
         @BindingState var format: EmbeddingModel.Format
         @BindingState var maxTokens: Int = 8191
         @BindingState var modelName: String = ""
+        @BindingState var ollamaKeepAlive: String = ""
         var apiKeyName: String { apiKeySelection.apiKeyName }
         var baseURL: String { baseURLSelection.baseURL }
         var isFullURL: Bool { baseURLSelection.isFullURL }
@@ -83,14 +84,13 @@ struct EmbeddingModelEdit: ReducerProtocol {
                 )
                 return .run { send in
                     do {
-                        let tokenUsage =
-                            try await EmbeddingService(
-                                configuration: UserPreferenceEmbeddingConfiguration()
-                                    .overriding {
-                                        $0.model = model
-                                    }
-                            ).embed(text: "Hello").usage.total_tokens
-                        await send(.testSucceeded("Used \(tokenUsage) tokens."))
+                        _ = try await EmbeddingService(
+                            configuration: UserPreferenceEmbeddingConfiguration()
+                                .overriding {
+                                    $0.model = model
+                                }
+                        ).embed(text: "Hello")
+                        await send(.testSucceeded("Succeeded!"))
                     } catch {
                         await send(.testFailed(error.localizedDescription))
                     }
@@ -155,6 +155,7 @@ extension EmbeddingModelEdit.State {
             format: model.format,
             maxTokens: model.info.maxTokens,
             modelName: model.info.modelName,
+            ollamaKeepAlive: model.info.ollamaInfo.keepAlive,
             apiKeySelection: .init(
                 apiKeyName: model.info.apiKeyName,
                 apiKeyManagement: .init(availableAPIKeyNames: [model.info.apiKeyName])
@@ -175,7 +176,8 @@ extension EmbeddingModel {
                 baseURL: state.baseURL.trimmingCharacters(in: .whitespacesAndNewlines),
                 isFullURL: state.isFullURL,
                 maxTokens: state.maxTokens,
-                modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines)
+                modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
+                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive)
             )
         )
     }

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEditView.swift

@@ -22,6 +22,8 @@ struct EmbeddingModelEditView: View {
                             azureOpenAI
                         case .openAICompatible:
                             openAICompatible
+                        case .ollama:
+                            ollama
                         }
                     }
                 }
@@ -88,6 +90,8 @@ struct EmbeddingModelEditView: View {
                             Text("Azure OpenAI").tag(format)
                         case .openAICompatible:
                             Text("OpenAI Compatible").tag(format)
+                        case .ollama:
+                            Text("Ollama").tag(format)
                         }
                     }
                 },
@@ -289,6 +293,38 @@ struct EmbeddingModelEditView: View {
 
         maxTokensTextField
     }
+
+    @ViewBuilder
+    var ollama: some View {
+        baseURLTextField(prompt: Text("http://127.0.0.1:11434")) {
+            Text("/api/embeddings")
+        }
+
+        WithViewStore(
+            store,
+            removeDuplicates: { $0.modelName == $1.modelName }
+        ) { viewStore in
+            TextField("Model Name", text: viewStore.$modelName)
+        }
+
+        maxTokensTextField
+
+        WithViewStore(
+            store,
+            removeDuplicates: { $0.ollamaKeepAlive == $1.ollamaKeepAlive }
+        ) { viewStore in
+            TextField(text: viewStore.$ollamaKeepAlive, prompt: Text("Default Value")) {
+                Text("Keep Alive")
+            }
+        }
+
+        VStack(alignment: .leading, spacing: 8) {
+            Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
+                " For more details, please visit [https://ollama.com](https://ollama.com)."
+            )
+        }
+        .padding(.vertical)
+    }
 }
 
 class EmbeddingModelManagementView_Editing_Previews: PreviewProvider {

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelManagement.swift

@@ -10,6 +10,7 @@ extension EmbeddingModel: ManageableAIModel {
         case .openAI: return "OpenAI"
         case .azureOpenAI: return "Azure OpenAI"
         case .openAICompatible: return "OpenAI Compatible"
+        case .ollama: return "Ollama"
         }
     }
 

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -93,6 +93,7 @@ actor WidgetWindowsController: NSObject {
             let xcodeInspector = self.xcodeInspector
             let activeApp = await xcodeInspector.safe.activeApplication
             let latestActiveXcode = await xcodeInspector.safe.latestActiveXcode
+            let previousActiveApplication = xcodeInspector.previousActiveApplication
             await MainActor.run {
                 let state = store.withState { $0 }
                 let isChatPanelDetached = state.chatPanelState.chatPanelInASeparateWindow
@@ -123,9 +124,17 @@ actor WidgetWindowsController: NSObject {
                         return true
                     }()
 
+                    let previousAppIsXcode = previousActiveApplication?.isXcode ?? false
+
                     windows.sharedPanelWindow.alphaValue = noFocus ? 0 : 1
                     windows.suggestionPanelWindow.alphaValue = noFocus ? 0 : 1
-                    windows.widgetWindow.alphaValue = noFocus ? 0 : 1
+                    windows.widgetWindow.alphaValue = if noFocus {
+                        0
+                    } else if previousAppIsXcode {
+                        1
+                    } else {
+                        0
+                    }
                     windows.toastWindow.alphaValue = noFocus ? 0 : 1
                     if isChatPanelDetached {
                         windows.chatPanelWindow.isWindowHidden = !hasChat

ExtensionService/AppDelegate+Menu.swift

@@ -20,6 +20,7 @@ extension AppDelegate {
         .init("sourceEditorDebugMenu")
     }
 
+    @MainActor
     @objc func buildStatusBarMenu() {
         let statusBar = NSStatusBar.system
         statusBarItem = statusBar.statusItem(