Merge branch 'feature/prompt-to-code-service' into develop

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 		C841BB242994CAD400B0B336 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C841BB232994CAD400B0B336 /* SettingsView.swift */; };
 		C8520301293C4D9000460097 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8520300293C4D9000460097 /* Helpers.swift */; };
 		C85AF32D29CF0C170031E18B /* DebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C85AF32C29CF0C170031E18B /* DebugView.swift */; };
+		C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */; };
 		C861E6112994F6070056CB02 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C861E6102994F6070056CB02 /* AppDelegate.swift */; };
 		C861E6152994F6080056CB02 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C861E6142994F6080056CB02 /* Assets.xcassets */; };
 		C861E61E2994F6150056CB02 /* Service in Frameworks */ = {isa = PBXBuildFile; productRef = C861E61D2994F6150056CB02 /* Service */; };
@@ -180,6 +181,7 @@
 		C8520300293C4D9000460097 /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
 		C8520308293D805800460097 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		C85AF32C29CF0C170031E18B /* DebugView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugView.swift; sourceTree = "<group>"; };
+		C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromptToCodeCommand.swift; sourceTree = "<group>"; };
 		C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CopilotForXcodeExtensionService.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C861E6102994F6070056CB02 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C861E6142994F6080056CB02 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -262,6 +264,7 @@
 				C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */,
 				C8EE07A029CC9ED30043B6D9 /* ExplainSelectionCommand.swift */,
 				C8DCEFFF29CE11D500FDDDD7 /* ChatWithSelection.swift */,
+				C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */,
 				C81458972939EFDC00135263 /* Info.plist */,
 				C81458982939EFDC00135263 /* EditorExtension.entitlements */,
 			);
@@ -527,6 +530,7 @@
 			files = (
 				C8DCF00029CE11D500FDDDD7 /* ChatWithSelection.swift in Sources */,
 				C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */,
+				C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */,
 				C8520301293C4D9000460097 /* Helpers.swift in Sources */,
 				C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */,
 				C87B03A5293B261200C77EAE /* AcceptSuggestionCommand.swift in Sources */,

Core/Package.swift

@@ -87,6 +87,7 @@ let package = Package(
                 "AXExtension",
                 "Logger",
                 "ChatService",
+                "PromptToCodeService",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
             ]
         ),
@@ -154,5 +155,10 @@ let package = Package(
         .target(name: "ChatPlugins", dependencies: ["OpenAIService", "Environment", "Terminal"]),
         .target(name: "Terminal"),
         .target(name: "ChatService", dependencies: ["OpenAIService", "ChatPlugins", "Environment"]),
+        .target(
+            name: "PromptToCodeService",
+            dependencies: ["OpenAIService", "Environment", "CopilotService", "CopilotModel"]
+        ),
+        .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
     ]
 )

Core/Sources/ChatPlugins/AITerminalChatPlugin.swift

@@ -52,7 +52,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
                     delegate?.pluginDidEndResponding(self)
                     await chatGPTService.mutateHistory { history in
                         history.append(.init(role: .assistant, content: """
-                        Confirm to run?
+                        Should I run this command? You can instruct me to modify it again.
                         ```
                         \(result)
                         ```
@@ -63,7 +63,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
                     await chatGPTService.mutateHistory { history in
                         history.append(.init(
                             role: .assistant,
-                            content: "Should I run it? Or should I modify it?"
+                            content: "Sorry, I don't understand. Do you want me to run it?"
                         ))
                     }
                 }
@@ -77,7 +77,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
                 if isCancelled { return }
                 await chatGPTService.mutateHistory { history in
                     history.append(.init(role: .assistant, content: """
-                    Confirm to run?
+                    Should I run this command? You can instruct me to modify it.
                     ```
                     \(result)
                     ```
@@ -118,7 +118,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
         return extractCodeFromMarkdown(try await askChatGPT(
             systemPrompt: p,
             question: "the task is: \"\(task)\""
-        ))
+        ) ?? "")
     }
 
     func modifyCommand(command: String, requirement: String) async throws -> String {
@@ -139,7 +139,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
         return extractCodeFromMarkdown(try await askChatGPT(
             systemPrompt: p,
             question: "The requirement is: \"\(requirement)\""
-        ))
+        ) ?? "")
     }
 
     func checkConfirmation(content: String) async throws -> Tone {
@@ -165,7 +165,8 @@ public actor AITerminalChatPlugin: ChatPlugin {
             systemPrompt: p,
             question: "The content is: \"\(content)\""
         )
-        return Tone(rawValue: Int(result) ?? 2) ?? .cancellation
+        let tone = result.flatMap(Int.init).flatMap(Tone.init(rawValue:)) ?? .other
+        return tone
     }
 
     enum Tone: Int {

Core/Sources/ChatPlugins/AskChatGPT.swift

@@ -2,7 +2,7 @@ import Foundation
 import OpenAIService
 
 /// Quickly ask a question to ChatGPT.
-func askChatGPT(systemPrompt: String, question: String) async throws -> String {
+func askChatGPT(systemPrompt: String, question: String) async throws -> String? {
     let service = ChatGPTService(systemPrompt: systemPrompt)
     return try await service.sendAndWait(content: question)
 }

Core/Sources/ChatPlugins/CallAIFunction.swift

@@ -7,7 +7,7 @@ func callAIFunction(
     function: String,
     args: [Any?],
     description: String
-) async throws -> String {
+) async throws -> String? {
     let args = args.map { arg -> String in
         if let arg = arg {
             return String(describing: arg)

Core/Sources/Client/AsyncXPCService.swift

@@ -186,6 +186,14 @@ public struct AsyncXPCService {
             { $0.chatWithSelection }
         )
     }
+    
+    public func promptToCode(editorContent: EditorContent) async throws -> UpdatedContent? {
+        try await suggestionRequest(
+            connection,
+            editorContent,
+            { $0.promptToCode }
+        )
+    }
 }
 
 struct AutoFinishContinuation<T> {

Core/Sources/CopilotModel/CopilotCompletion.swift

@@ -15,9 +15,14 @@ public struct CopilotCompletion: Codable, Equatable {
         self.displayText = displayText
     }
 
+    /// The new code to be inserted and the original code on the first line.
     public var text: String
+    /// The position of the cursor before generating the completion.
     public var position: CursorPosition
+    /// An id.
     public var uuid: String
+    /// The range of the original code that should be replaced.
     public var range: CursorRange
+    /// The new code to be inserted.
     public var displayText: String
 }

Core/Sources/CopilotModel/ExportedFromLSP.swift

@@ -6,3 +6,7 @@ public typealias CursorRange = LanguageServerProtocol.LSPRange
 public extension CursorPosition {
     static var outOfScope: CursorPosition { .init(line: -1, character: -1) }
 }
+
+public extension CursorRange {
+    static var outOfScope: CursorRange { .init(start: .outOfScope, end: .outOfScope) }
+}

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -88,6 +88,7 @@ public actor ChatGPTService: ChatGPTServiceType {
     var uuidGenerator: () -> String = { UUID().uuidString }
     var cancelTask: Cancellable?
     var buildCompletionStreamAPI: CompletionStreamAPIBuilder = OpenAICompletionStreamAPI.init
+    var buildCompletionAPI: CompletionAPIBuilder = OpenAICompletionAPI.init
 
     public init(
         systemPrompt: String = "",
@@ -121,72 +122,99 @@ public actor ChatGPTService: ChatGPTServiceType {
 
         isReceivingMessage = true
 
-        do {
-            let api = buildCompletionStreamAPI(apiKey, url, requestBody)
+        let api = buildCompletionStreamAPI(apiKey, url, requestBody)
 
-            return AsyncThrowingStream<String, Error> { continuation in
-                Task {
-                    do {
-                        let (trunks, cancel) = try await api()
-                        guard isReceivingMessage else {
-                            continuation.finish()
-                            return
-                        }
-                        cancelTask = cancel
-                        for try await trunk in trunks {
-                            guard let delta = trunk.choices.first?.delta else { continue }
-
-                            if history.last?.id == trunk.id {
-                                if let role = delta.role {
-                                    history[history.endIndex - 1].role = role
-                                }
-                                if let content = delta.content {
-                                    history[history.endIndex - 1].content.append(content)
-                                }
-                            } else {
-                                history.append(.init(
-                                    id: trunk.id,
-                                    role: delta.role ?? .assistant,
-                                    content: delta.content ?? ""
-                                ))
-                            }
+        return AsyncThrowingStream<String, Error> { continuation in
+            Task {
+                do {
+                    let (trunks, cancel) = try await api()
+                    guard isReceivingMessage else {
+                        continuation.finish()
+                        return
+                    }
+                    cancelTask = cancel
+                    for try await trunk in trunks {
+                        guard let delta = trunk.choices.first?.delta else { continue }
 
+                        if history.last?.id == trunk.id {
+                            if let role = delta.role {
+                                history[history.endIndex - 1].role = role
+                            }
                             if let content = delta.content {
-                                continuation.yield(content)
+                                history[history.endIndex - 1].content.append(content)
                             }
+                        } else {
+                            history.append(.init(
+                                id: trunk.id,
+                                role: delta.role ?? .assistant,
+                                content: delta.content ?? ""
+                            ))
                         }
 
-                        continuation.finish()
-                        isReceivingMessage = false
-                    } catch let error as CancellationError {
-                        isReceivingMessage = false
-                        continuation.finish(throwing: error)
-                    } catch let error as NSError where error.code == NSURLErrorCancelled {
-                        isReceivingMessage = false
-                        continuation.finish(throwing: error)
-                    } catch {
-                        history.append(.init(
-                            role: .assistant,
-                            content: error.localizedDescription
-                        ))
-                        isReceivingMessage = false
-                        continuation.finish(throwing: error)
+                        if let content = delta.content {
+                            continuation.yield(content)
+                        }
                     }
+
+                    continuation.finish()
+                    isReceivingMessage = false
+                } catch let error as CancellationError {
+                    isReceivingMessage = false
+                    continuation.finish(throwing: error)
+                } catch let error as NSError where error.code == NSURLErrorCancelled {
+                    isReceivingMessage = false
+                    continuation.finish(throwing: error)
+                } catch {
+                    history.append(.init(
+                        role: .assistant,
+                        content: error.localizedDescription
+                    ))
+                    isReceivingMessage = false
+                    continuation.finish(throwing: error)
                 }
             }
         }
     }
-    
+
     public func sendAndWait(
         content: String,
         summary: String? = nil
-    ) async throws -> String {
-        let stream = try await send(content: content, summary: summary)
-        var content = ""
-        for try await fragment in stream {
-            content.append(fragment)
+    ) async throws -> String? {
+        guard !isReceivingMessage else { throw CancellationError() }
+        guard let url = URL(string: endpoint) else { throw ChatGPTServiceError.endpointIncorrect }
+        let newMessage = ChatMessage(
+            id: uuidGenerator(),
+            role: .user,
+            content: content,
+            summary: summary
+        )
+        history.append(newMessage)
+
+        let requestBody = CompletionRequestBody(
+            model: model,
+            messages: combineHistoryWithSystemPrompt(),
+            temperature: temperature,
+            stream: true,
+            max_tokens: maxToken
+        )
+
+        isReceivingMessage = true
+        defer { isReceivingMessage = false }
+
+        let api = buildCompletionAPI(apiKey, url, requestBody)
+        let response = try await api()
+
+        if let choice = response.choices.first {
+            history.append(.init(
+                id: response.id,
+                role: choice.message.role,
+                content: choice.message.content
+            ))
+            
+            return choice.message.content
         }
-        return content
+        
+        return nil
     }
 
     public func stopReceivingMessage() {
@@ -231,7 +259,7 @@ extension ChatGPTService {
             all.append(.init(role: message.role, content: message.content))
             count += 1
         }
-        
+
         all.append(.init(role: .system, content: systemPrompt))
         return all.reversed()
     }