Merge branch 'release/0.15.3'

Author: intitni

Core/Sources/Environment/Environment.swift

@@ -116,13 +116,20 @@ public enum Environment {
 
         let application = AXUIElementCreateApplication(xcode.processIdentifier)
         let focusedElement = application.focusedElement
-        if focusedElement?.description != "Source Editor" {
+        var windowElement: URL {
             let window = application.focusedWindow
             let id = window?.identifier.hashValue
             return URL(fileURLWithPath: "/xcode-focused-element/\(id ?? 0)")
         }
+        if focusedElement?.description != "Source Editor" {
+            return windowElement
+        }
 
-        return try await fetchCurrentFileURL()
+        do {
+            return try await fetchCurrentFileURL()
+        } catch {
+            return windowElement
+        }
     }
 
     public static var createSuggestionService: (

Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift

@@ -0,0 +1,96 @@
+import Foundation
+import Terminal
+
+public struct GitHubCopilotInstallationManager {
+    private static var isInstalling = false
+
+    public init() {}
+
+    public enum InstallationStatus {
+        case notInstalled
+        case installed
+    }
+
+    public func checkInstallation() -> InstallationStatus {
+        guard let urls = try? GitHubCopilotBaseService.createFoldersIfNeeded()
+        else { return .notInstalled }
+        let executableFolderURL = urls.executableURL
+        let binaryURL = executableFolderURL.appendingPathComponent("copilot")
+
+        if !FileManager.default.fileExists(atPath: binaryURL.path) {
+            return .notInstalled
+        }
+
+        return .installed
+    }
+
+    public enum InstallationStep {
+        case downloading
+        case uninstalling
+        case decompressing
+        case done
+    }
+
+    public enum Error: Swift.Error, LocalizedError {
+        case isInstalling
+        case failedToFindLanguageServer
+
+        public var errorDescription: String? {
+            switch self {
+            case .isInstalling:
+                return "Language server is installing."
+            case .failedToFindLanguageServer:
+                return "Failed to find language server. Please open an issue on GitHub."
+            }
+        }
+    }
+
+    public func installLatestVersion() -> AsyncThrowingStream<InstallationStep, Swift.Error> {
+        AsyncThrowingStream<InstallationStep, Swift.Error> { continuation in
+            Task {
+                guard !GitHubCopilotInstallationManager.isInstalling else {
+                    continuation.finish(throwing: Error.isInstalling)
+                    return
+                }
+                GitHubCopilotInstallationManager.isInstalling = true
+                defer { GitHubCopilotInstallationManager.isInstalling = false }
+                do {
+                    continuation.yield(.downloading)
+                    let urls = try GitHubCopilotBaseService.createFoldersIfNeeded()
+                    let executable = Bundle.main.bundleURL.appendingPathComponent("Contents/Applications/CopilotForXcodeExtensionService.app/Contents/Resources/copilot")
+                    guard FileManager.default.fileExists(atPath: executable.path) else {
+                        throw Error.failedToFindLanguageServer
+                    }
+                    
+                    let targetURL = urls.executableURL.appendingPathComponent("copilot")
+
+                    try FileManager.default.copyItem(
+                        at: executable,
+                        to: targetURL
+                    )
+
+                    // update permission 755
+                    try FileManager.default.setAttributes(
+                        [.posixPermissions: 0o755],
+                        ofItemAtPath: targetURL.path
+                    )
+
+                    continuation.yield(.done)
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
+                }
+            }
+        }
+    }
+
+    public func uninstall() async throws {
+        guard let urls = try? GitHubCopilotBaseService.createFoldersIfNeeded()
+        else { return }
+        let executableFolderURL = urls.executableURL
+        let binaryURL = executableFolderURL.appendingPathComponent("copilot")
+        if FileManager.default.fileExists(atPath: binaryURL.path) {
+            try FileManager.default.removeItem(at: binaryURL)
+        }
+    }
+}

Core/Sources/HostApp/AccountSettings/CopilotView.swift

@@ -16,10 +16,69 @@ struct CopilotView: View {
 
         init() {}
     }
+    
+    class ViewModel: ObservableObject {
+        let installationManager = GitHubCopilotInstallationManager()
+        
+        @Published var installationStatus: GitHubCopilotInstallationManager.InstallationStatus
+        @Published var installationStep: GitHubCopilotInstallationManager.InstallationStep?
+        
+        init() {
+            installationStatus = installationManager.checkInstallation()
+        }
+        
+        init(
+            installationStatus: GitHubCopilotInstallationManager.InstallationStatus,
+            installationStep: GitHubCopilotInstallationManager.InstallationStep?
+        ) {
+            assert(isPreview)
+            self.installationStatus = installationStatus
+            self.installationStep = installationStep
+        }
+        
+        func refreshInstallationStatus() {
+            Task { @MainActor in
+                installationStatus = installationManager.checkInstallation()
+            }
+        }
+        
+        func install() async throws {
+            defer { refreshInstallationStatus() }
+            do {
+                for try await step in installationManager.installLatestVersion() {
+                    Task { @MainActor in
+                        self.installationStep = step
+                    }
+                }
+                Task {
+                    try await Task.sleep(nanoseconds: 1_000_000_000)
+                    Task { @MainActor in
+                        self.installationStep = nil
+                    }
+                }
+            } catch {
+                Task { @MainActor in
+                    installationStep = nil
+                }
+                throw error
+            }
+        }
+
+        func uninstall() {
+            Task {
+                defer { refreshInstallationStatus() }
+                try await installationManager.uninstall()
+                Task { @MainActor in
+                    CopilotView.copilotAuthService = nil
+                }
+            }
+        }
+    }
 
     @Environment(\.openURL) var openURL
     @Environment(\.toast) var toast
     @StateObject var settings = Settings()
+    @StateObject var viewModel = ViewModel()
 
     @State var status: GitHubCopilotAccountStatus?
     @State var userCode: String?
@@ -33,6 +92,30 @@ struct CopilotView: View {
         Self.copilotAuthService = service
         return service
     }
+    
+    var installButton: some View {
+        Button(action: {
+            Task {
+                do {
+                    try await viewModel.install()
+                } catch {
+                    toast(Text(error.localizedDescription), .error)
+                }
+            }
+        }) {
+            Text("Install")
+        }
+        .disabled(viewModel.installationStep != nil)
+    }
+
+    var uninstallButton: some View {
+        Button(action: {
+            viewModel.uninstall()
+        }) {
+            Text("Uninstall")
+        }
+        .disabled(viewModel.installationStep != nil)
+    }
 
     var body: some View {
         HStack {
@@ -66,7 +149,15 @@ struct CopilotView: View {
                 .foregroundColor(.secondary)
 
                 VStack(alignment: .leading) {
-                    Text("Language Server Version: \(version ?? "Loading..")")
+                    HStack {
+                        Text("Language Server Version: \(version ?? "Loading..")")
+                        switch viewModel.installationStatus {
+                        case .notInstalled:
+                            installButton
+                        case .installed:
+                            uninstallButton
+                        }
+                    }
                     Text("Status: \(status?.description ?? "Loading..")")
 
                     HStack(alignment: .center) {

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

@@ -10,19 +10,12 @@ public final class GraphicalUserInterfaceController {
     private nonisolated init() {
         Task { @MainActor in
             suggestionWidget.dataSource = WidgetDataSource.shared
-            suggestionWidget.onOpenChatClicked = {
+            suggestionWidget.onOpenChatClicked = { [weak self] in
                 Task {
-                    let commandHandler = WindowBaseCommandHandler()
-                    _ = try await commandHandler.chatWithSelection(editor: .init(
-                        content: "",
-                        lines: [],
-                        uti: "",
-                        cursorPosition: .outOfScope,
-                        selections: [],
-                        tabSize: 0,
-                        indentSize: 0,
-                        usesTabsForIndentation: false
-                    ))
+                    let uri = try await Environment.fetchFocusedElementURI()
+                    let dataSource = WidgetDataSource.shared
+                    await dataSource.createChatIfNeeded(for: uri)
+                    self?.suggestionWidget.presentChatRoom(fileURL: uri)
                 }
             }
             suggestionWidget.onCustomCommandClicked = { command in

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -41,7 +41,14 @@ final class WidgetDataSource {
     @discardableResult
     func createChatIfNeeded(for url: URL) -> ChatService {
         let build = {
-            let service = ChatService(chatGPTService: ChatGPTService())
+            let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
+            let systemPrompt = """
+            \(language.isEmpty ? "" : "You must always reply in \(language)")
+            You are a senior programmer, you will answer my questions concisely. If you are replying with code, embed the code in a code block in markdown.
+            
+            You don't have any code in advance, ask me to provide it when needed.
+            """
+            let service = ChatService(chatGPTService: ChatGPTService(systemPrompt: systemPrompt))
             let provider = ChatProvider(
                 service: service,
                 fileURL: url,

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -555,14 +555,17 @@ extension SuggestionWidgetController {
         }
 
         if let app = ActiveApplicationMonitor.activeApplication, app.isXcode {
-            panelWindow.alphaValue = 1
-            widgetWindow.alphaValue = 1
-            tabWindow.alphaValue = 1
+            let application = AXUIElementCreateApplication(app.processIdentifier)
+            /// We need this to hide the windows when Xcode is minimized.
+            let noFocus = application.focusedWindow == nil
+            panelWindow.alphaValue = noFocus ? 0 : 1
+            widgetWindow.alphaValue = noFocus ? 0 : 1
+            tabWindow.alphaValue = noFocus ? 0 : 1
 
             if detachChat {
                 chatWindow.alphaValue = chatWindowViewModel.chat != nil ? 1 : 0
             } else {
-                chatWindow.alphaValue = 1
+                chatWindow.alphaValue = noFocus ? 0 : 1
             }
         } else if let app = ActiveApplicationMonitor.activeApplication,
                   app.bundleIdentifier == Bundle.main.bundleIdentifier

README.md

@@ -133,6 +133,8 @@ brew upgrade --cask copilot-for-xcode
 
 Alternatively, You can use the in-app updater or download the latest version manually from the latest [release](https://github.com/intitni/CopilotForXcode/releases).  
 
+After updating, please restart Xcode to allow the extension to reload.
+
 If you are upgrading from a version lower than **0.7.0**, please run `Copilot for Xcode.app` at least once to let it set up the new launch agent for you and re-grant the permissions according to the new rules.
 
 If you find that some of the features are no longer working, please first try regranting permissions to the app.

Version.xcconfig

@@ -1,2 +1,2 @@
-APP_VERSION = 0.15.2
-APP_BUILD = 152
+APP_VERSION = 0.15.3
+APP_BUILD = 153

appcast.xml

@@ -2,6 +2,19 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
   <channel>
     <title>Copilot for Xcode</title>
+
+    <item>
+      <title>0.15.3</title>
+      <pubDate>Mon, 15 May 2023 18:46:47 +0800</pubDate>
+      <sparkle:version>153</sparkle:version>
+      <sparkle:shortVersionString>0.15.3</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.15.3
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.15.3/Copilot.for.Xcode.app.zip" length="21342371" type="application/octet-stream" sparkle:edSignature="YYOBKinz8Ay++VYFIOwFRi4xcM3WuOTmPG6n4ar8e7Nc8Sq/JPLWaR2b6wLU05No2DCzMxlHXCF+a4a+o5V4AQ=="/>
+    </item>
+
     <item>
       <title>0.15.2</title>
       <pubDate>Sun, 14 May 2023 20:58:20 +0800</pubDate>