[pull] main from intitni:main

Core/Sources/ChatPlugin/TerminalChatPlugin.swift

@@ -34,8 +34,8 @@ public actor TerminalChatPlugin: ChatPlugin {
         }
 
         do {
-            let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL
-            let projectURL = XcodeInspector.shared.realtimeActiveProjectURL
+            let fileURL = await XcodeInspector.shared.safe.realtimeActiveDocumentURL
+            let projectURL = await XcodeInspector.shared.safe.realtimeActiveProjectURL
 
             var environment = [String: String]()
             if let fileURL {

Core/Sources/ChatService/ChatService.swift

@@ -217,8 +217,14 @@ public final class ChatService: ObservableObject {
         guard let info else { return }
 
         let templateProcessor = CustomCommandTemplateProcessor()
-        mutateSystemPrompt(info.specifiedSystemPrompt.map(templateProcessor.process))
-        mutateExtraSystemPrompt(info.extraSystemPrompt.map(templateProcessor.process) ?? "")
+        if let specifiedSystemPrompt = info.specifiedSystemPrompt {
+            await mutateSystemPrompt(templateProcessor.process(specifiedSystemPrompt))
+        }
+        if let extraSystemPrompt = info.extraSystemPrompt {
+            await mutateExtraSystemPrompt(templateProcessor.process(extraSystemPrompt))
+        } else {
+            mutateExtraSystemPrompt("")
+        }
 
         let customCommandPrefix = {
             if let name = info.name { return "[\(name)] " }
@@ -250,9 +256,9 @@ public final class ChatService: ObservableObject {
         let templateProcessor = CustomCommandTemplateProcessor()
         if let systemPrompt {
             if overwriteSystemPrompt {
-                mutateSystemPrompt(templateProcessor.process(systemPrompt))
+                await mutateSystemPrompt(templateProcessor.process(systemPrompt))
             } else {
-                mutateExtraSystemPrompt(templateProcessor.process(systemPrompt))
+                await mutateExtraSystemPrompt(templateProcessor.process(systemPrompt))
             }
         }
         return try await sendAndWait(content: templateProcessor.process(prompt))
@@ -265,10 +271,10 @@ public final class ChatService: ObservableObject {
     ) async throws -> String {
         let templateProcessor = CustomCommandTemplateProcessor()
         if let systemPrompt {
-            mutateSystemPrompt(templateProcessor.process(systemPrompt))
+            await mutateSystemPrompt(templateProcessor.process(systemPrompt))
         }
         if let extraSystemPrompt {
-            mutateExtraSystemPrompt(templateProcessor.process(extraSystemPrompt))
+            await mutateExtraSystemPrompt(templateProcessor.process(extraSystemPrompt))
         }
         return try await sendAndWait(content: templateProcessor.process(prompt))
     }

Core/Sources/ChatService/ContextAwareAutoManagedChatGPTMemory.swift

@@ -44,7 +44,7 @@ public final class ContextAwareAutoManagedChatGPTMemory: ChatGPTMemory {
             systemPrompt: """
             \(chatService?.systemPrompt ?? "")
             \(chatService?.extraSystemPrompt ?? "")
-            """,
+            """.trimmingCharacters(in: .whitespacesAndNewlines),
             content: content ?? ""
         )
         return await memory.generatePrompt()

Core/Sources/ChatService/CustomCommandTemplateProcessor.swift

@@ -6,8 +6,8 @@ import XcodeInspector
 public struct CustomCommandTemplateProcessor {
     public init() {}
 
-    public func process(_ text: String) -> String {
-        let info = getEditorInformation()
+    public func process(_ text: String) async -> String {
+        let info = await getEditorInformation()
         let editorContent = info.editorContent
         let updatedText = text
             .replacingOccurrences(of: "{{selected_code}}", with: """
@@ -38,9 +38,9 @@ public struct CustomCommandTemplateProcessor {
         let documentURL: URL?
     }
 
-    func getEditorInformation() -> EditorInformation {
-        let editorContent = XcodeInspector.shared.focusedEditor?.getContent()
-        let documentURL = XcodeInspector.shared.activeDocumentURL
+    func getEditorInformation() async -> EditorInformation {
+        let editorContent = await XcodeInspector.shared.safe.focusedEditor?.getContent()
+        let documentURL = await XcodeInspector.shared.safe.activeDocumentURL
         let language = documentURL.map(languageIdentifierFromFileURL) ?? .plaintext
 
         return .init(

Core/Sources/ChatService/DynamicContextController.swift

@@ -106,7 +106,7 @@ final class DynamicContextController {
         let contextualSystemPrompt = """
         \(language.isEmpty ? "" : "You must always reply in \(language)")
         \(systemPrompt)
-        """
+        """.trimmingCharacters(in: .whitespacesAndNewlines)
         await memory.mutateSystemPrompt(contextualSystemPrompt)
         await memory.mutateContextSystemPrompt(contextSystemPrompt)
         await memory.mutateRetrievedContent(retrievedContent.map(\.document))

Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift

@@ -19,6 +19,7 @@ struct GitHubCopilotView: View {
         @AppStorage(\.gitHubCopilotProxyUsername) var gitHubCopilotProxyUsername
         @AppStorage(\.gitHubCopilotProxyPassword) var gitHubCopilotProxyPassword
         @AppStorage(\.gitHubCopilotUseStrictSSL) var gitHubCopilotUseStrictSSL
+        @AppStorage(\.gitHubCopilotEnterpriseURI) var gitHubCopilotEnterpriseURI
         @AppStorage(\.gitHubCopilotIgnoreTrailingNewLines)
         var gitHubCopilotIgnoreTrailingNewLines
         @AppStorage(\.disableGitHubCopilotSettingsAutoRefreshOnAppear)
@@ -157,15 +158,15 @@ struct GitHubCopilotView: View {
                         ) {
                             Text("Path to Node (v18+)")
                         }
-                        
+
                         Text(
                             "Provide the path to the executable if it can't be found by the app, shim executable is not supported"
                         )
                         .lineLimit(10)
                         .foregroundColor(.secondary)
                         .font(.callout)
                         .dynamicHeightTextInFormWorkaround()
-                        
+
                         Picker(selection: $settings.runNodeWith) {
                             ForEach(NodeRunner.allCases, id: \.rawValue) { runner in
                                 switch runner {
@@ -180,7 +181,7 @@ struct GitHubCopilotView: View {
                         } label: {
                             Text("Run Node with")
                         }
-                        
+
                         Group {
                             switch settings.runNodeWith {
                             case .env:
@@ -257,6 +258,10 @@ struct GitHubCopilotView: View {
                     }
                     .opacity(isRunningAction ? 0.8 : 1)
                     .disabled(isRunningAction)
+
+                    Button("Refresh Configuration for Enterprise and Proxy") {
+                        refreshConfiguration()
+                    }
                 }
 
                 SettingsDivider("Advanced")
@@ -276,6 +281,17 @@ struct GitHubCopilotView: View {
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
 
+                SettingsDivider("Enterprise")
+
+                Form {
+                    TextField(
+                        text: $settings.gitHubCopilotEnterpriseURI,
+                        prompt: Text("Leave it blank if non is available.")
+                    ) {
+                        Text("Auth Provider URL")
+                    }
+                }
+
                 SettingsDivider("Proxy")
 
                 Form {
@@ -403,6 +419,25 @@ struct GitHubCopilotView: View {
             }
         }
     }
+
+    func refreshConfiguration() {
+        NotificationCenter.default.post(
+            name: .gitHubCopilotShouldRefreshEditorInformation,
+            object: nil
+        )
+
+        Task {
+            let service = try getService()
+            do {
+                try await service.postNotification(
+                    name: Notification.Name
+                        .gitHubCopilotShouldRefreshEditorInformation.rawValue
+                )
+            } catch {
+                toast(error.localizedDescription, .error)
+            }
+        }
+    }
 }
 
 struct ActivityIndicatorView: NSViewRepresentable {

Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift

@@ -31,22 +31,23 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
             return userPreferredLanguage.isEmpty ? "" : " in \(userPreferredLanguage)"
         }()
 
-        let editor: EditorInformation = XcodeInspector.shared.getFocusedEditorContent() ?? .init(
-            editorContent: .init(
-                content: source.content,
-                lines: source.lines,
-                selections: [source.range],
-                cursorPosition: .outOfScope,
-                lineAnnotations: []
-            ),
-            selectedContent: code,
-            selectedLines: [],
-            documentURL: source.documentURL,
-            workspaceURL: source.projectRootURL,
-            projectRootURL: source.projectRootURL,
-            relativePath: "",
-            language: source.language
-        )
+        let editor: EditorInformation = await XcodeInspector.shared.getFocusedEditorContent()
+            ?? .init(
+                editorContent: .init(
+                    content: source.content,
+                    lines: source.lines,
+                    selections: [source.range],
+                    cursorPosition: .outOfScope,
+                    lineAnnotations: []
+                ),
+                selectedContent: code,
+                selectedLines: [],
+                documentURL: source.documentURL,
+                workspaceURL: source.projectRootURL,
+                projectRootURL: source.projectRootURL,
+                relativePath: "",
+                language: source.language
+            )
 
         let rule: String = {
             func generateDescription(index: Int) -> String {

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -45,7 +45,8 @@ public actor RealtimeSuggestionController {
     private func handleFocusElementChange(_ sourceEditor: SourceEditor) {
         Task { // Notify suggestion service for open file.
             try await Task.sleep(nanoseconds: 500_000_000)
-            guard let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL else { return }
+            guard let fileURL = await XcodeInspector.shared.safe.realtimeActiveDocumentURL
+            else { return }
             _ = try await Service.shared.workspacePool
                 .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         }
@@ -58,15 +59,16 @@ public actor RealtimeSuggestionController {
         editorObservationTask = nil
 
         editorObservationTask = Task { [weak self] in
-            if let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL {
+            if let fileURL = await XcodeInspector.shared.safe.realtimeActiveDocumentURL {
                 await PseudoCommandHandler().invalidateRealtimeSuggestionsIfNeeded(
                     fileURL: fileURL,
                     sourceEditor: sourceEditor
                 )
             }
 
-            let valueChange = notificationsFromEditor.filter { $0.kind == .valueChanged }
-            let selectedTextChanged = notificationsFromEditor
+            let valueChange = await notificationsFromEditor.notifications()
+                .filter { $0.kind == .valueChanged }
+            let selectedTextChanged = await notificationsFromEditor.notifications()
                 .filter { $0.kind == .selectedTextChanged }
 
             await withTaskGroup(of: Void.self) { [weak self] group in
@@ -92,7 +94,8 @@ public actor RealtimeSuggestionController {
                 }
                 group.addTask {
                     let handler = {
-                        guard let fileURL = XcodeInspector.shared.activeDocumentURL else { return }
+                        guard let fileURL = await XcodeInspector.shared.safe.activeDocumentURL
+                        else { return }
                         await PseudoCommandHandler().invalidateRealtimeSuggestionsIfNeeded(
                             fileURL: fileURL,
                             sourceEditor: sourceEditor
@@ -118,7 +121,8 @@ public actor RealtimeSuggestionController {
 
         Task { @WorkspaceActor in // Get cache ready for real-time suggestions.
             guard UserDefaults.shared.value(for: \.preCacheOnFileOpen) else { return }
-            guard let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL else { return }
+            guard let fileURL = await XcodeInspector.shared.safe.realtimeActiveDocumentURL
+            else { return }
             let (_, filespace) = try await Service.shared.workspacePool
                 .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
 
@@ -127,7 +131,7 @@ public actor RealtimeSuggestionController {
                 // avoid the command get called twice
                 filespace.codeMetadata.uti = ""
                 do {
-                    try await XcodeInspector.shared.latestActiveXcode?
+                    try await XcodeInspector.shared.safe.latestActiveXcode?
                         .triggerCopilotCommand(name: "Real-time Suggestions")
                 } catch {
                     if filespace.codeMetadata.uti?.isEmpty ?? true {
@@ -141,7 +145,7 @@ public actor RealtimeSuggestionController {
     func triggerPrefetchDebounced(force: Bool = false) {
         inflightPrefetchTask = Task(priority: .utility) { @WorkspaceActor in
             try? await Task.sleep(nanoseconds: UInt64(
-                max(UserDefaults.shared.value(for: \.realtimeSuggestionDebounce), 0.15)
+                max(UserDefaults.shared.value(for: \.realtimeSuggestionDebounce), 0.25)
                     * 1_000_000_000
             ))
 
@@ -151,7 +155,7 @@ public actor RealtimeSuggestionController {
             else { return }
 
             if UserDefaults.shared.value(for: \.disableSuggestionFeatureGlobally),
-               let fileURL = XcodeInspector.shared.activeDocumentURL,
+               let fileURL = await XcodeInspector.shared.safe.activeDocumentURL,
                let (workspace, _) = try? await Service.shared.workspacePool
                .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
             {
@@ -188,7 +192,7 @@ public actor RealtimeSuggestionController {
     }
 
     func notifyEditingFileChange(editor: AXUIElement) async {
-        guard let fileURL = XcodeInspector.shared.activeDocumentURL,
+        guard let fileURL = await XcodeInspector.shared.safe.activeDocumentURL,
               let (workspace, _) = try? await Service.shared.workspacePool
               .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         else { return }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -159,7 +159,7 @@ struct PseudoCommandHandler {
             }
         }() else {
             do {
-                try await XcodeInspector.shared.latestActiveXcode?
+                try await XcodeInspector.shared.safe.latestActiveXcode?
                     .triggerCopilotCommand(name: command.name)
             } catch {
                 let presenter = PresentInWindowSuggestionPresenter()
@@ -183,7 +183,7 @@ struct PseudoCommandHandler {
                 throw CancellationError()
             }
             do {
-                try await XcodeInspector.shared.latestActiveXcode?
+                try await XcodeInspector.shared.safe.latestActiveXcode?
                     .triggerCopilotCommand(name: "Accept Prompt to Code")
             } catch {
                 let last = Self.lastTimeCommandFailedToTriggerWithAccessibilityAPI
@@ -238,7 +238,7 @@ struct PseudoCommandHandler {
                 throw CancellationError()
             }
             do {
-                try await XcodeInspector.shared.latestActiveXcode?
+                try await XcodeInspector.shared.safe.latestActiveXcode?
                     .triggerCopilotCommand(name: "Accept Suggestion")
             } catch {
                 let last = Self.lastTimeCommandFailedToTriggerWithAccessibilityAPI
@@ -288,7 +288,7 @@ struct PseudoCommandHandler {
     }
 
     func dismissSuggestion() async {
-        guard let documentURL = XcodeInspector.shared.activeDocumentURL else { return }
+        guard let documentURL = await XcodeInspector.shared.safe.activeDocumentURL else { return }
         guard let (_, filespace) = try? await Service.shared.workspacePool
             .fetchOrCreateWorkspaceAndFilespace(fileURL: documentURL) else { return }
 
@@ -377,14 +377,14 @@ extension PseudoCommandHandler {
         return (content, split, [range], range.start)
     }
 
-    func getFileURL() -> URL? {
-        XcodeInspector.shared.realtimeActiveDocumentURL
+    func getFileURL() async -> URL? {
+        await XcodeInspector.shared.safe.realtimeActiveDocumentURL
     }
 
     @WorkspaceActor
     func getFilespace() async -> Filespace? {
         guard
-            let fileURL = getFileURL(),
+            let fileURL = await getFileURL(),
             let (_, filespace) = try? await Service.shared.workspacePool
             .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         else { return nil }
@@ -394,7 +394,10 @@ extension PseudoCommandHandler {
     @WorkspaceActor
     func getEditorContent(sourceEditor: SourceEditor?) async -> EditorContent? {
         guard let filespace = await getFilespace(),
-              let sourceEditor = sourceEditor ?? XcodeInspector.shared.focusedEditor
+              let sourceEditor = await {
+                  if let sourceEditor { sourceEditor }
+                  else { await XcodeInspector.shared.safe.focusedEditor }
+              }()
         else { return nil }
         if Task.isCancelled { return nil }
         let content = sourceEditor.getContent()