Merge tag '0.20.0' into develop

Author: intitni

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -28,9 +28,14 @@ public final class WebChatContextCollector: ChatContextCollector {
 
 extension WebChatContextCollector {
     static func detectLinks(from messages: [ChatMessage]) -> [String] {
-        return messages.lazy.compactMap(\.content).map(detectLinks(from:)).flatMap { $0 }
+        return messages.lazy
+            .compactMap {
+                $0.content ?? $0.functionCall?.arguments
+            }
+            .map(detectLinks(from:))
+            .flatMap { $0 }
     }
-    
+
     static func detectLinks(from content: String) -> [String] {
         var links = [String]()
         let detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)

Core/Sources/GitHubCopilotService/GitHubCopilotService.swift

@@ -316,7 +316,7 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,
                     if UserDefaults.shared.value(for: \.gitHubCopilotIgnoreTrailingNewLines) {
                         var updated = $0
                         var text = updated.text[...]
-                        while text.hasSuffix("\n") {
+                        while let last = text.last, last.isNewline || last.isWhitespace {
                             text = text.dropLast(1)
                         }
                         updated.text = String(text)

Core/Sources/HostApp/AccountSettings/CopilotView.swift

@@ -231,7 +231,7 @@ struct CopilotView: View {
 
                 Form {
                     Toggle(
-                        "Ignore Trailing New Lines",
+                        "Ignore Trailing New Lines and Whitespaces",
                         isOn: $settings.gitHubCopilotIgnoreTrailingNewLines
                     )
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift.swift

@@ -74,8 +74,8 @@ struct GUI: ReducerProtocol {
 
                 if let activeTab = state.chatTabGroup.activeChatTab as? ChatGPTChatTab {
                     return .run { send in
-                        await stopAndHandleCommand(activeTab)
                         await send(.openChatPanel(forceDetach: false))
+                        await stopAndHandleCommand(activeTab)
                     }
                 }
 
@@ -85,15 +85,15 @@ struct GUI: ReducerProtocol {
                 }) as? ChatGPTChatTab {
                     state.chatTabGroup.selectedTabId = chatTab.id
                     return .run { send in
-                        await stopAndHandleCommand(chatTab)
                         await send(.openChatPanel(forceDetach: false))
+                        await stopAndHandleCommand(chatTab)
                     }
                 }
                 let chatTab = ChatGPTChatTab()
                 state.chatTabGroup.tabs.append(chatTab)
                 return .run { send in
-                    await stopAndHandleCommand(chatTab)
                     await send(.openChatPanel(forceDetach: false))
+                    await stopAndHandleCommand(chatTab)
                 }
 
             case .suggestionWidget:

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -237,8 +237,9 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     }
 
     func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent? {
-        Task {
+        Task { @MainActor in
             let viewStore = GraphicalUserInterfaceController.shared.viewStore
+            viewStore.send(.createChatGPTChatTabIfNeeded)
             viewStore.send(.openChatPanel(forceDetach: false))
         }
         return nil

Core/Sources/Service/Workspace.swift

@@ -105,7 +105,7 @@ final class Filespace {
         }
 
         // finished typing the whole suggestion when the suggestion has only one line
-        if editingLine == suggestionFirstLine, suggestionLines.count <= 1 {
+        if editingLine.hasPrefix(suggestionFirstLine), suggestionLines.count <= 1 {
             reset()
             return false
         }

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -49,9 +49,7 @@ public struct WidgetFeature: ReducerProtocol {
                     isProcessingCounters: circularWidgetState.isProcessingCounters,
                     isProcessing: circularWidgetState.isProcessing,
                     isDisplayingContent: {
-                        if chatPanelState.isPanelDisplayed,
-                           !chatPanelState.chatTapGroup.tabs.isEmpty
-                        {
+                        if chatPanelState.isPanelDisplayed {
                             return true
                         }
                         if panelState.sharedPanelState.isPanelDisplayed,
@@ -69,8 +67,7 @@ public struct WidgetFeature: ReducerProtocol {
                     isContentEmpty: chatPanelState.chatTapGroup.tabs.isEmpty
                         && panelState.sharedPanelState.content == nil,
                     isChatPanelDetached: chatPanelState.chatPanelInASeparateWindow,
-                    isChatOpen: chatPanelState.isPanelDisplayed
-                        && !chatPanelState.chatTapGroup.tabs.isEmpty,
+                    isChatOpen: chatPanelState.isPanelDisplayed,
                     animationProgress: circularWidgetState.animationProgress
                 )
             }
@@ -227,7 +224,7 @@ public struct WidgetFeature: ReducerProtocol {
                                     // clicked
                                     // before the completion panel updates the location of the
                                     // suggestion panel
-                                    try await Task.sleep(nanoseconds: 200_000_000)
+                                    try await Task.sleep(nanoseconds: 400_000_000)
                                 }
                                 continuation.yield()
                             }
@@ -253,7 +250,7 @@ public struct WidgetFeature: ReducerProtocol {
                         else { continue }
                         guard await windows.fullscreenDetector.isOnActiveSpace else { continue }
                         let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
-                        if let window = app.focusedWindow, window.isFullScreen {
+                        if let window = app.focusedWindow {
                             await windows.orderFront()
                         }
                     }
@@ -549,10 +546,6 @@ public struct WidgetFeature: ReducerProtocol {
                     suggestionWidgetControllerDependency.onOpenChatClicked()
                     return .none
 
-                case let .runCustomCommandButtonClicked(command):
-                    suggestionWidgetControllerDependency.onCustomCommandClicked(command)
-                    return .none
-
                 default:
                     return .none
                 }

Core/Sources/XcodeInspector/XcodeInspector.swift

@@ -5,8 +5,6 @@ import AXNotificationStream
 import Combine
 import Foundation
 
-#warning("MUSTDO: - store(in:) thread safe crash")
-
 public final class XcodeInspector: ObservableObject {
     public static let shared = XcodeInspector()
 
@@ -228,22 +226,26 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
                     uiElement: window
                 )
                 focusedWindow = window
-                focusedWindowObservations.forEach { $0.cancel() }
-                focusedWindowObservations.removeAll()
-
-                documentURL = window.documentURL
-                projectURL = window.projectURL
-
-                window.$documentURL
-                    .filter { $0 != .init(fileURLWithPath: "/") }
-                    .sink { [weak self] url in
-                        self?.documentURL = url
-                    }.store(in: &focusedWindowObservations)
-                window.$projectURL
-                    .filter { $0 != .init(fileURLWithPath: "/") }
-                    .sink { [weak self] url in
-                        self?.projectURL = url
-                    }.store(in: &focusedWindowObservations)
+
+                // should find a better solution to do this thread safe
+                Task { @MainActor in
+                    focusedWindowObservations.forEach { $0.cancel() }
+                    focusedWindowObservations.removeAll()
+
+                    documentURL = window.documentURL
+                    projectURL = window.projectURL
+
+                    window.$documentURL
+                        .filter { $0 != .init(fileURLWithPath: "/") }
+                        .sink { [weak self] url in
+                            self?.documentURL = url
+                        }.store(in: &focusedWindowObservations)
+                    window.$projectURL
+                        .filter { $0 != .init(fileURLWithPath: "/") }
+                        .sink { [weak self] url in
+                            self?.projectURL = url
+                        }.store(in: &focusedWindowObservations)
+                }
             } else {
                 let window = XcodeWindowInspector(uiElement: window)
                 focusedWindow = window

Core/Tests/ServiceTests/FilespaceSuggestionInvalidationTests.swift

@@ -119,6 +119,20 @@ class FilespaceSuggestionInvalidationTests: XCTestCase {
         XCTAssertNil(suggestion)
     }
 
+    func test_finish_typing_the_whole_single_line_suggestion_suggestion_is_incomplete_should_invalidate() async throws {
+        let filespace = try await prepare(
+            suggestionText: "hello man",
+            cursorPosition: .init(line: 1, character: 0)
+        )
+        let isValid = await filespace.validateSuggestions(
+            lines: ["\n", "hello man!!!!!\n", "\n"],
+            cursorPosition: .init(line: 1, character: 9)
+        )
+        XCTAssertFalse(isValid)
+        let suggestion = await filespace.presentingSuggestion
+        XCTAssertNil(suggestion)
+    }
+    
     func test_finish_typing_the_whole_multiple_line_suggestion_should_be_valid() async throws {
         let filespace = try await prepare(
             suggestionText: "hello man\nhow are you?",

Tool/Sources/LangChain/Chains/RetrievalQA.swift

@@ -27,7 +27,7 @@ public final class RetrievalQAChain: Chain {
         let embeddedQuestion = try await embedding.embed(query: input)
         let documents = try await vectorStore.searchWithDistance(
             embeddings: embeddedQuestion,
-            count: 10
+            count: 5
         )
         let refinementChain = RefineDocumentChain(chatModelFactory: chatModelFactory)
         let answer = try await refinementChain.run(