Merge tag '0.30.1' into develop

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -350,6 +350,8 @@ public struct WidgetFeature: ReducerProtocol {
                 let documentURL = state.focusingDocumentURL
 
                 let notifications = app.axNotifications
+                
+                #warning("TODO: Handling events outside of TCA because the fire rate is too high.")
 
                 return .run { send in
                     await send(.observeEditorChange)
@@ -522,7 +524,6 @@ public struct WidgetFeature: ReducerProtocol {
                     }
                 }
 
-                #warning("TODO: control windows in their dedicated reducers.")
             case let .updateWindowOpacity(immediately):
                 let isChatPanelDetached = state.chatPanelState.chatPanelInASeparateWindow
                 let hasChat = !state.chatPanelState.chatTabGroup.tabInfo.isEmpty

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -239,6 +239,7 @@ public extension SuggestionWidgetController {
         store.send(.panel(.discardSuggestion))
     }
 
+    #warning("TODO: Make a progress controller that doesn't use TCA.")
     func markAsProcessing(_ isProcessing: Bool) {
         store.withState { state in
             if isProcessing, !state.circularWidgetState.isProcessing {

README.md

@@ -364,6 +364,7 @@ Since the app needs to manage license keys, it will send network request to `htt
 
 - when you activate the license key
 - when you deactivate the license key
+- when you validate the license key manually
 - when you open the host app or the service app if a license key is available
 - every 24 hours if a license key is available
 

TestPlan.xctestplan

@@ -133,6 +133,13 @@
         "identifier" : "FocusedCodeFinderTests",
         "name" : "FocusedCodeFinderTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Tool",
+        "identifier" : "XcodeInspectorTests",
+        "name" : "XcodeInspectorTests"
+      }
     }
   ],
   "version" : 1

Tool/Package.swift

@@ -175,6 +175,8 @@ let package = Package(
             ]
         ),
 
+        .testTarget(name: "XcodeInspectorTests", dependencies: ["XcodeInspector"]),
+
         .target(name: "UserDefaultsObserver"),
 
         .target(

Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -45,9 +45,28 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
         var functions = [any ChatGPTFunction]()
 
         if !isSensitive {
+            var functionPrompt = """
+            ONLY call it when one of the following conditions are satisfied:
+            - the user ask you about specific line from the latest message, \
+            which is not included in the focused range.
+            """
+
+            if let annotations = context.focusedContext?.otherLineAnnotations,
+               !annotations.isEmpty
+            {
+                functionPrompt += """
+
+                - the user ask about annotations at line \(
+                    Set(annotations.map(\.line)).map(String.init).joined(separator: ",")
+                ).
+                """
+            }
+
+            print(functionPrompt)
+
             functions.append(GetCodeCodeAroundLineFunction(
                 contextCollector: self,
-                additionalDescription: "You already have the code in focusing range, don't get it again!"
+                additionalDescription: functionPrompt
             ))
         }
 
@@ -91,54 +110,54 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
         let relativePath = "Document Relative Path: \(context.relativePath)"
         let language = "Language: \(context.language.rawValue)"
 
-        let focusingContextExplanation =
+        let focusedContextExplanation =
             "Below is the code inside the active document that the user is looking at right now:"
 
-        if let focusingContext = context.focusedContext {
-            let codeContext = focusingContext.context.isEmpty || isSensitive
+        if let focusedContext = context.focusedContext {
+            let codeContext = focusedContext.context.isEmpty || isSensitive
                 ? ""
                 : """
-                Focusing Context:
+                Focused Context:
                 ```
-                \(focusingContext.context.map(\.signature).joined(separator: "\n"))
+                \(focusedContext.context.map(\.signature).joined(separator: "\n"))
                 ```
                 """
 
-            let codeRange = "Focusing Range [line, character]: \(focusingContext.codeRange)"
+            let codeRange = "Focused Range [line, character]: \(focusedContext.codeRange)"
 
             let code = context.selectionRange.isEmpty && isSensitive
                 ? """
                 The file is in gitignore, you can't read the file.
                 Ask the user to select the code in the editor to get help. Also tell them the file is in gitignore.
                 """
                 : """
-                Focusing Code (from line \(
-                    focusingContext.codeRange.start.line + 1
-                ) to line \(focusingContext.codeRange.end.line + 1)):
+                Focused Code (from line \(
+                    focusedContext.codeRange.start.line + 1
+                ) to line \(focusedContext.codeRange.end.line + 1)):
                 ```\(context.language.rawValue)
-                \(focusingContext.code)
+                \(focusedContext.code)
                 ```
                 """
 
-            let fileAnnotations = focusingContext.otherLineAnnotations.isEmpty || isSensitive
+            let fileAnnotations = focusedContext.otherLineAnnotations.isEmpty || isSensitive
                 ? ""
                 : """
                 Out-of-scope Annotations:\"""
-                (They are not inside the focusing code. You can get the code at the line for details)
+                (The related code are not inside the focused code.)
                 \(
-                    focusingContext.otherLineAnnotations
+                    focusedContext.otherLineAnnotations
                         .map(convertAnnotationToText)
                         .joined(separator: "\n")
                 )
                 \"""
                 """
 
-            let codeAnnotations = focusingContext.lineAnnotations.isEmpty || isSensitive
+            let codeAnnotations = focusedContext.lineAnnotations.isEmpty || isSensitive
                 ? ""
                 : """
-                Annotations Inside Focusing Range:\"""
+                Annotations Inside Focused Range:\"""
                 \(
-                    focusingContext.lineAnnotations
+                    focusedContext.lineAnnotations
                         .map(convertAnnotationToText)
                         .joined(separator: "\n")
                 )
@@ -149,7 +168,7 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
                 start,
                 relativePath,
                 language,
-                focusingContextExplanation,
+                focusedContextExplanation,
                 codeContext,
                 codeRange,
                 code,

Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/Functions/GetCodeCodeAroundLineFunction.swift

@@ -32,7 +32,7 @@ struct GetCodeCodeAroundLineFunction: ChatGPTFunction {
     }
 
     var description: String {
-        "Get the code at the given line. You must ONLY call it when the user give you a specific line or the user ask about an out of scope annotation. \n\(additionalDescription)"
+        "Get the code at the given line. \(additionalDescription)"
     }
 
     var argumentSchema: JSONSchemaValue { [

Tool/Sources/WorkspaceSuggestionService/Filespace+SuggestionService.swift

@@ -3,6 +3,7 @@ import SuggestionModel
 import Workspace
 
 public struct FilespaceSuggestionSnapshot: Equatable {
+    #warning("TODO: Can we remove it?")
     public var linesHash: Int
     public var cursorPosition: CursorPosition
 

Tool/Sources/XcodeInspector/SourceEditor.swift

@@ -121,12 +121,24 @@ extension SourceEditor {
         private var sourceSelectedTextRange: ClosedRange<Int>?
         private var cachedSelections = [CursorRange]()
 
+        init(
+            sourceContent: String? = nil,
+            cachedLines: [String] = [String](),
+            sourceSelectedTextRange: ClosedRange<Int>? = nil,
+            cachedSelections: [CursorRange] = [CursorRange]()
+        ) {
+            self.sourceContent = sourceContent
+            self.cachedLines = cachedLines
+            self.sourceSelectedTextRange = sourceSelectedTextRange
+            self.cachedSelections = cachedSelections
+        }
+
         func get(content: String, selectedTextRange: ClosedRange<Int>?) -> (
             lines: [String],
             selections: [CursorRange]
         ) {
             Self.queue.sync {
-                let contentMatch = content.hashValue == sourceContent?.hashValue
+                let contentMatch = content == sourceContent
                 let selectedRangeMatch = selectedTextRange == sourceSelectedTextRange
                 let lines: [String] = {
                     if contentMatch {

Tool/Sources/XcodeInspector/XcodeInspector.swift

@@ -35,6 +35,7 @@ public final class XcodeInspector: ObservableObject {
     @Published public fileprivate(set) var focusedElement: AXUIElement?
     @Published public fileprivate(set) var completionPanel: AXUIElement?
 
+    #warning("TODO: make it a function and mark it as expensive")
     public var focusedEditorContent: EditorInformation? {
         guard let documentURL = XcodeInspector.shared.realtimeActiveDocumentURL,
               let workspaceURL = XcodeInspector.shared.realtimeActiveWorkspaceURL,
@@ -214,6 +215,7 @@ public final class XcodeInspector: ObservableObject {
                     let sequence = NSWorkspace.shared.notificationCenter
                         .notifications(named: .accessibilityAPIMalfunctioning)
                     for await notification in sequence {
+                        try Task.checkCancellation()
                         guard let self else { return }
                         await self
                             .recoverFromAccessibilityMalfunctioning(notification.object as? String)
@@ -296,10 +298,10 @@ public final class XcodeInspector: ObservableObject {
             }
 
             activeXcodeObservations.insert(malfunctionCheck)
-    
+
             checkForAccessibilityMalfunction("Reactivate Xcode")
         }
-        
+
         xcode.$completionPanel.receive(on: DispatchQueue.main).sink { [weak self] element in
             self?.completionPanel = element
         }.store(in: &activeXcodeCancellable)
@@ -320,7 +322,7 @@ public final class XcodeInspector: ObservableObject {
             self?.focusedWindow = window
         }.store(in: &activeXcodeCancellable)
     }
-    
+
     private var lastRecoveryFromAccessibilityMalfunctioningTimeStamp = Date()
 
     @MainActor
@@ -339,23 +341,24 @@ public final class XcodeInspector: ObservableObject {
             {
                 NSWorkspace.shared.notificationCenter.post(
                     name: .accessibilityAPIMalfunctioning,
-                    object: "Element Inconsistency:  \(source)"
+                    object: "Element Inconsistency: \(source)"
                 )
             }
         }
     }
-    
+
     @MainActor
     private func recoverFromAccessibilityMalfunctioning(_ source: String?) {
+        let message = """
+        Accessibility API malfunction detected: \
+        \(source ?? "").
+        Resetting active Xcode.
+        """
+
         if UserDefaults.shared.value(for: \.toastForTheReasonWhyXcodeInspectorNeedsToBeRestarted) {
-            toast.toast(
-                content: """
-                Accessibility API malfunction detected: \
-                \(source ?? "").
-                Resetting active Xcode.
-                """,
-                type: .warning
-            )
+            toast.toast(content: message, type: .warning)
+        } else {
+            Logger.service.info(message)
         }
         if let activeXcode {
             lastRecoveryFromAccessibilityMalfunctioningTimeStamp = Date()