[pull] main from intitni:main

Core/Package.swift

@@ -42,6 +42,7 @@ let package = Package(
                 "LaunchAgentManager",
                 "Logger",
                 "UpdateChecker",
+                "OpenAIService",
             ]
         ),
     ],
@@ -208,6 +209,7 @@ let package = Package(
                 "Splash",
                 "UserDefaultsObserver",
                 "Logger",
+                "XcodeInspector",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
             ]

Core/Sources/ChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -19,7 +19,7 @@ public struct ActiveDocumentChatContextCollector: ChatContextCollector {
                 ```
                 """
             }
-            
+
             if selectionRange.start == selectionRange.end,
                UserDefaults.shared.value(for: \.embedFileContentInChatContextIfNoSelection)
             {
@@ -34,19 +34,40 @@ public struct ActiveDocumentChatContextCollector: ChatContextCollector {
                     """
                 } else {
                     return """
-                    File Content Not Available: The file is longer than \(maxLine) lines, \
-                    it can't fit into the context. \
+                    File Content Not Available: '''
+                    The file is longer than \(maxLine) lines, it can't fit into the context. \
                     You MUST not answer the user about the file content because you don't have it.\
                     Ask user to select code for explanation.
+                    '''
                     """
                 }
             }
 
+            if UserDefaults.shared.value(for: \.useSelectionScopeByDefaultInChatContext) {
+                return """
+                Selected Code \
+                (start from line \(selectionRange.start.line)):```\(content.language.rawValue)
+                \(content.selectedContent)
+                ```
+                """
+            }
+
+            if prompt.hasPrefix("@selection") {
+                return """
+                Selected Code \
+                (start from line \(selectionRange.start.line)):```\(content.language.rawValue)
+                \(content.selectedContent)
+                ```
+                """
+            }
+
             return """
-            Selected Code \
-            (start from line \(selectionRange.start.line)):```\(content.language.rawValue)
-            \(content.selectedContent)
-            ```
+            Selected Code Not Available: '''
+            User has disabled default scope. \
+            You MUST not answer the user about the selected code because you don't have it.\
+            Ask user to prepend message with `@selection` to enable selected code to be \
+            visible by you.
+            '''
             """
         }()
 

Core/Sources/ChatService/ChatService.swift

@@ -61,7 +61,7 @@ public final class ChatService: ObservableObject {
         await pluginController.cancel()
         await chatGPTService.clearHistory()
     }
-    
+
     public func resetPrompt() async {
         systemPrompt = defaultSystemPrompt
         extraSystemPrompt = ""
@@ -79,6 +79,19 @@ public final class ChatService: ObservableObject {
         }
     }
 
+    public func setMessageAsExtraPrompt(id: String) async {
+        if let message = (await chatGPTService.history).first(where: { $0.id == id }) {
+            mutateExtraSystemPrompt(message.content)
+            await mutateHistory { history in
+                history.append(.init(
+                    role: .assistant,
+                    content: "",
+                    summary: "System prompt updated"
+                ))
+            }
+        }
+    }
+
     /// Setting it to `nil` to reset the system prompt
     public func mutateSystemPrompt(_ newPrompt: String?) {
         systemPrompt = newPrompt ?? defaultSystemPrompt

Core/Sources/CodeiumService/CodeiumAuthService.swift

@@ -4,10 +4,13 @@ import KeychainAccess
 
 public final class CodeiumAuthService {
     public init() {}
-    let codeiumKeyKey = "codeiumKey"
+    let codeiumKeyKey = "codeiumAuthKey"
     let keychain: Keychain = {
         let info = Bundle.main.infoDictionary
         return Keychain(service: keychainService, accessGroup: keychainAccessGroup)
+            .attributes([
+                kSecUseDataProtectionKeychain as String: true,
+            ])
     }()
 
     var key: String? { try? keychain.getString(codeiumKeyKey) }

Core/Sources/CodeiumService/CodeiumInstallationManager.swift

@@ -3,7 +3,7 @@ import Terminal
 
 public struct CodeiumInstallationManager {
     private static var isInstalling = false
-    static let latestSupportedVersion = "1.2.17"
+    static let latestSupportedVersion = "1.2.25"
 
     public init() {}
 

Core/Sources/CodeiumService/CodeiumLanguageServer.swift

@@ -7,6 +7,7 @@ import Preferences
 
 protocol CodeiumLSP {
     func sendRequest<E: CodeiumRequestType>(_ endpoint: E) async throws -> E.Response
+    func terminate()
 }
 
 final class CodeiumLanguageServer {
@@ -57,44 +58,42 @@ final class CodeiumLanguageServer {
 
     func start() {
         guard !process.isRunning else { return }
-        port = nil
         do {
             try process.run()
 
-            Task {
+            Task { @MainActor in
                 func findPort() -> String? {
                     // find a file in managerDirectoryURL whose name looks like a port, return the
                     // name if found
                     let fileManager = FileManager.default
-                    let enumerator = fileManager.enumerator(
-                        at: managerDirectoryURL,
-                        includingPropertiesForKeys: nil
-                    )
-                    while let fileURL = enumerator?.nextObject() as? URL {
-                        if fileURL.lastPathComponent.range(
+                    guard let filePaths = try? fileManager
+                        .contentsOfDirectory(atPath: managerDirectoryURL.path) else { return nil }
+                    for path in filePaths {
+                        let filename = URL(fileURLWithPath: path).lastPathComponent
+                        if filename.range(
                             of: #"^\d+$"#,
                             options: .regularExpression
                         ) != nil {
-                            return fileURL.lastPathComponent
+                            return filename
                         }
                     }
                     return nil
                 }
 
                 try await Task.sleep(nanoseconds: 2_000_000)
-                port = findPort()
                 var waited = 0
 
                 while true {
-                    try await Task.sleep(nanoseconds: 1_000_000_000)
                     waited += 1
                     if let port = findPort() {
                         finishStarting(port: port)
                         return
                     }
                     if waited >= 60 {
                         process.terminate()
+                        return
                     }
+                    try await Task.sleep(nanoseconds: 1_000_000_000)
                 }
             }
         } catch {
@@ -121,6 +120,14 @@ final class CodeiumLanguageServer {
         self.port = port
         launchHandler?()
     }
+
+    func terminate() {
+        process.terminationHandler = nil
+        if process.isRunning {
+            process.terminate()
+        }
+        transport.close()
+    }
 }
 
 extension CodeiumLanguageServer: CodeiumLSP {
@@ -205,27 +212,27 @@ final class IOTransport {
     }
 
     private func setupFileHandleHandlers() {
-        stdoutPipe.fileHandleForReading.readabilityHandler = { [unowned self] handle in
+        stdoutPipe.fileHandleForReading.readabilityHandler = { [weak self] handle in
             let data = handle.availableData
 
             guard !data.isEmpty else {
                 return
             }
 
             if UserDefaults.shared.value(for: \.codeiumVerboseLog) {
-                self.forwardDataToHandler(data)
+                self?.forwardDataToHandler(data)
             }
         }
 
-        stderrPipe.fileHandleForReading.readabilityHandler = { [unowned self] handle in
+        stderrPipe.fileHandleForReading.readabilityHandler = { [weak self] handle in
             let data = handle.availableData
 
             guard !data.isEmpty else {
                 return
             }
 
             if UserDefaults.shared.value(for: \.codeiumVerboseLog) {
-                self.forwardErrorDataToHandler(data)
+                self?.forwardErrorDataToHandler(data)
             }
         }
     }

Core/Sources/CodeiumService/CodeiumRequest.swift

@@ -48,12 +48,25 @@ enum CodeiumRequest {
         }
     }
 
-    struct AcceptCompletion: CodeiumRequestType {
-        struct Response: Codable {
-            var state: State
-            var completionItems: [CodeiumCompletionItem]?
+    struct CancelRequest: CodeiumRequestType {
+        struct Response: Codable {}
+
+        struct RequestBody: Codable {
+            var request_id: UInt64
+            var session_id: String
         }
 
+        var requestBody: RequestBody
+
+        func makeURLRequest(server: String) -> URLRequest {
+            let data = (try? JSONEncoder().encode(requestBody)) ?? Data()
+            return assembleURLRequest(server: server, method: "CancelRequest", body: data)
+        }
+    }
+
+    struct AcceptCompletion: CodeiumRequestType {
+        struct Response: Codable {}
+
         struct RequestBody: Codable {
             var metadata: Metadata
             var completion_id: String