Update info

Author: intitni

Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotRequest.swift

@@ -2,6 +2,7 @@ import Foundation
 import JSONRPC
 import LanguageServerProtocol
 import SuggestionBasic
+import XcodeInspector
 
 struct GitHubCopilotDoc: Codable {
     var source: String
@@ -55,6 +56,8 @@ enum GitHubCopilotChatSource: String, Codable {
 
 enum GitHubCopilotRequest {
     struct SetEditorInfo: GitHubCopilotRequestType {
+        let xcodeVersion: String
+        
         struct Response: Codable {}
 
         var networkProxy: JSONValue? {
@@ -142,12 +145,13 @@ enum GitHubCopilotRequest {
                     "name": "vscode",
                     "version": "1.89.1",
                 ]) : .hash([
-                    "name": "xcode",
-                    "version": "",
+                    "name": "Xcode",
+                    "version": .string(xcodeVersion),
                 ]),
                 "editorPluginInfo": .hash([
                     "name": "Copilot for Xcode",
-                    "version": "",
+                    "version": .string(Bundle.main
+                        .infoDictionary?["CFBundleShortVersionString"] as? String ?? ""),
                 ]),
             ]
 

Tool/Sources/GitHubCopilotService/LanguageServer/GitHubCopilotService.swift

@@ -6,6 +6,7 @@ import LanguageServerProtocol
 import Logger
 import Preferences
 import SuggestionBasic
+import XcodeInspector
 
 public protocol GitHubCopilotAuthServiceType {
     func checkStatus() async throws -> GitHubCopilotAccountStatus
@@ -34,6 +35,7 @@ public protocol GitHubCopilotSuggestionServiceType {
     func notifySaveTextDocument(fileURL: URL) async throws
     func cancelRequest() async
     func terminate() async
+    func cancelOngoingTask(workDoneToken: String) async
 }
 
 protocol GitHubCopilotLSP {
@@ -255,11 +257,15 @@ public class GitHubCopilotBaseService {
         let notifications = NotificationCenter.default
             .notifications(named: .gitHubCopilotShouldRefreshEditorInformation)
         Task { [weak self] in
-            _ = try? await server.sendRequest(GitHubCopilotRequest.SetEditorInfo())
+            _ = try? await server.sendRequest(
+                GitHubCopilotRequest.SetEditorInfo(xcodeVersion: xcodeVersion() ?? "16.0")
+            )
 
             for await _ in notifications {
                 guard self != nil else { return }
-                _ = try? await server.sendRequest(GitHubCopilotRequest.SetEditorInfo())
+                _ = try? await server.sendRequest(
+                    GitHubCopilotRequest.SetEditorInfo(xcodeVersion: xcodeVersion() ?? "16.0")
+                )
             }
         }
     }
@@ -587,6 +593,10 @@ public final class GitHubCopilotService: GitHubCopilotBaseService,
     public func terminate() async {
         // automatically handled
     }
+    
+    public func cancelOngoingTask(workDoneToken: String) async {
+        await localProcessServer?.cancelOngoingTask(workDoneToken: workDoneToken)
+    }
 }
 
 extension InitializingServer: GitHubCopilotLSP {
@@ -606,3 +616,30 @@ extension InitializingServer: GitHubCopilotLSP {
     }
 }
 
+private func xcodeVersion() async -> String? {
+    if let xcode = await XcodeInspector.shared.safe.latestActiveXcode {
+        return xcode.version
+    }
+    let process = Process()
+    process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
+    process.arguments = ["xcodebuild", "-version"]
+
+    let pipe = Pipe()
+    process.standardOutput = pipe
+
+    do {
+        try process.run()
+    } catch {
+        print("Error running xcrun xcodebuild: \(error)")
+        return nil
+    }
+
+    let data = pipe.fileHandleForReading.readDataToEndOfFile()
+    guard let output = String(data: data, encoding: .utf8) else {
+        return nil
+    }
+
+    let lines = output.split(separator: "\n")
+    return lines.first?.split(separator: " ").last.map(String.init)
+}
+