Merge tag '0.13.3' into develop

Author: intitni

Copilot for Xcode/OpenAIView.swift

@@ -62,11 +62,6 @@ struct OpenAIView: View {
                             Image(systemName: "questionmark.circle.fill")
                         }.buttonStyle(.plain)
                     }
-                    .onChange(of: settings.chatGPTModel) { newValue in
-                        if let model = ChatGPTModel(rawValue: newValue) {
-                            settings.chatGPTEndpoint = model.endpoint
-                        }
-                    }
 
                     TextField(
                         text: $settings.chatGPTEndpoint,

Core/Sources/ChatPlugins/AITerminalChatPlugin.swift

@@ -19,7 +19,7 @@ public actor AITerminalChatPlugin: ChatPlugin {
         self.delegate = delegate
     }
 
-    public func send(content: String) async {
+    public func send(content: String, originalMessage: String) async {
         if !isStarted {
             isStarted = true
             delegate?.pluginDidStart(self)
@@ -69,7 +69,11 @@ public actor AITerminalChatPlugin: ChatPlugin {
                 }
             } else {
                 await chatGPTService.mutateHistory { history in
-                    history.append(.init(role: .user, content: "Run a command to \(content)"))
+                    history.append(.init(
+                        role: .user,
+                        content: originalMessage,
+                        summary: "Run a command to \(content)")
+                    )
                 }
                 delegate?.pluginDidStartResponding(self)
                 let result = try await generateCommand(task: content)

Core/Sources/ChatPlugins/ChatPlugin.swift

@@ -7,7 +7,7 @@ public protocol ChatPlugin: AnyObject {
     var name: String { get }
 
     init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate)
-    func send(content: String) async
+    func send(content: String, originalMessage: String) async
     func cancel() async
     func stopResponding() async
 }

Core/Sources/ChatPlugins/TerminalChatPlugin.swift

@@ -17,7 +17,7 @@ public actor TerminalChatPlugin: ChatPlugin {
         self.delegate = delegate
     }
 
-    public func send(content: String) async {
+    public func send(content: String, originalMessage: String) async {
         delegate?.pluginDidStart(self)
         delegate?.pluginDidStartResponding(self)
 
@@ -38,7 +38,11 @@ public actor TerminalChatPlugin: ChatPlugin {
             let projectURL = try await Environment.fetchCurrentProjectRootURL(fileURL)
 
             await chatGPTService.mutateHistory { history in
-                history.append(.init(role: .user, content: "Run command: \(content)"))
+                history.append(.init(
+                    role: .user,
+                    content: originalMessage,
+                    summary: "Run command: \(content)")
+                )
             }
 
             if isCancelled { throw CancellationError() }

Core/Sources/ChatService/ChatService.swift

@@ -53,24 +53,28 @@ public final class ChatService: ObservableObject {
                     }
                 }
             } else if let runningPlugin {
-                await runningPlugin.send(content: content)
+                await runningPlugin.send(content: content, originalMessage: content)
             } else if let pluginType = plugins[command] {
                 let plugin = pluginType.init(inside: chatGPTService, delegate: self)
                 if #available(macOS 13.0, *) {
                     await plugin.send(
                         content: String(
                             content.dropFirst(command.count + 1)
                                 .trimmingPrefix(while: { $0 == " " })
-                        )
+                        ),
+                        originalMessage: content
                     )
                 } else {
-                    await plugin.send(content: String(content.dropFirst(command.count + 1)))
+                    await plugin.send(
+                        content: String(content.dropFirst(command.count + 1)),
+                        originalMessage: content
+                    )
                 }
             } else {
                 _ = try await chatGPTService.send(content: content, summary: nil)
             }
         } else if let runningPlugin {
-            await runningPlugin.send(content: content)
+            await runningPlugin.send(content: content, originalMessage: content)
         } else {
             _ = try await chatGPTService.send(content: content, summary: nil)
         }
@@ -89,13 +93,13 @@ public final class ChatService: ObservableObject {
         }
         await chatGPTService.clearHistory()
     }
-    
+
     public func deleteMessage(id: String) async {
         await chatGPTService.mutateHistory { messages in
             messages.removeAll(where: { $0.id == id })
         }
     }
-    
+
     public func resendMessage(id: String) async throws {
         if let message = (await chatGPTService.history).first(where: { $0.id == id }) {
             try await send(content: message.content)
@@ -133,7 +137,7 @@ extension ChatService: ChatPluginDelegate {
     public func shouldStartAnotherPlugin(_ type: ChatPlugin.Type, withContent content: String) {
         let plugin = type.init(inside: chatGPTService, delegate: self)
         Task {
-            await plugin.send(content: content)
+            await plugin.send(content: content, originalMessage: content)
         }
     }
 }

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -410,6 +410,8 @@ extension WindowBaseCommandHandler {
                 return """
                 \(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.
                 """
             }
             return """
@@ -451,6 +453,14 @@ extension WindowBaseCommandHandler {
                         summary: "\(customCommandPrefix) Chatting about selected code in `\(fileURL.lastPathComponent)` from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character)`.\nThe code will persist in the conversation."
                     ))
                 }
+            } else if !customCommandPrefix.isEmpty {
+                await chat.chatGPTService.mutateHistory { history in
+                    history.append(.init(
+                        role: .assistant,
+                        content: "",
+                        summary: "\(customCommandPrefix) System prompt is updated."
+                    ))
+                }
             }
 
             if let sendingMessageImmediately, !sendingMessageImmediately.isEmpty {

Core/Sources/SuggestionWidget/Styles.swift

@@ -68,12 +68,21 @@ extension MarkdownUI.Theme {
                     FontSize(.em(0.85))
                 }
                 .padding(16)
+                .padding(.top, 14)
                 .background(Color(nsColor: .textBackgroundColor).opacity(0.7))
                 .clipShape(RoundedRectangle(cornerRadius: 6))
-                .overlay(alignment: .topTrailing) {
-                    CopyButton {
-                        NSPasteboard.general.clearContents()
-                        NSPasteboard.general.setString(configuration.content, forType: .string)
+                .overlay(alignment: .top) {
+                    HStack(alignment: .center) {
+                        Text(configuration.language ?? "code")
+                            .foregroundStyle(.tertiary)
+                            .font(.callout)
+                            .padding(.leading, 8)
+                            .lineLimit(1)
+                        Spacer()
+                        CopyButton {
+                            NSPasteboard.general.clearContents()
+                            NSPasteboard.general.setString(configuration.content, forType: .string)
+                        }
                     }
                 }
                 .markdownMargin(top: 0, bottom: 16)

README.md

@@ -8,6 +8,13 @@ Thanks to [LSP-copilot](https://github.com/TerminalFi/LSP-copilot) for showing t
 
 <a href="https://www.buymeacoffee.com/intitni" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
 
+## Features
+
+- Code Suggestions (powered by GitHub Copilot).
+- Chat (powered by OpenAI ChatGPT).
+- Prompt to Code (powered by OpenAI ChatGPT).
+- Custom Commands to extend Chat and Prompt to Code.
+
 ## Table of Contents
 
 - [Prerequisites](#prerequisites)
@@ -63,7 +70,7 @@ Or install it manually, by downloading the `Copilot for Xcode.app` from the late
 Then set it up with the following steps:
 
 1. Open the app, the app will create a launch agent to setup a background running Service that does the real job.
-2. Optionally setup the path to Node. The default value is just `node`, Copilot for Xcode.app will try to find the Node from the PATH available in a login shell. If your Node is installed somewhere else, you can run `which node` from terminal to get the path.   
+2. Optionally setup the path to Node. The default value is just `node`, Copilot for Xcode.app will try to find the Node from the PATH available in a login shell. If your Node is installed somewhere else, you can run `which node` from terminal to get the path.
 
 ### Enable the Extension
 

Version.xcconfig

@@ -1,2 +1,2 @@
-APP_VERSION = 0.13.2
-APP_BUILD = 106
+APP_VERSION = 0.13.3
+APP_BUILD = 108

appcast.xml

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.13.3</title>
+      <pubDate>Wed, 26 Apr 2023 21:44:25 +0800</pubDate>
+      <sparkle:version>108</sparkle:version>
+      <sparkle:shortVersionString>0.13.3</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.13.3
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.13.3/Copilot.for.Xcode.app.zip" length="20125782" type="application/octet-stream" sparkle:edSignature="h55M7+/0Xv2OcxdUtbxycsKlP3K0xXF66VlbsBP2dsLFx1MTS2nYm2lW4ENV2DTJ4H+A4AG0vTZ+9Qi3zms5DA=="/>
+    </item>
+
     <item>
       <title>0.13.2</title>
       <pubDate>Sun, 23 Apr 2023 18:03:30 +0800</pubDate>