Merge tag '0.26.0' into develop

Author: intitni

Core/Sources/ChatService/DynamicContextController.swift

@@ -1,7 +1,6 @@
 import ChatContextCollector
 import Foundation
 import OpenAIService
-import Parsing
 import Preferences
 import XcodeInspector
 
@@ -65,17 +64,17 @@ final class DynamicContextController {
             }
             return contexts
         }
-        
+
         let extraSystemPrompt = contexts
             .map(\.systemPrompt)
             .filter { !$0.isEmpty }
             .joined(separator: "\n\n")
-        
+
         let contextPrompts = contexts
             .flatMap(\.retrievedContent)
             .filter { !$0.content.isEmpty }
             .sorted { $0.priority > $1.priority }
-        
+
         let contextualSystemPrompt = """
         \(language.isEmpty ? "" : "You must always reply in \(language)")
         \(systemPrompt)\(extraSystemPrompt.isEmpty ? "" : "\n\(extraSystemPrompt)")
@@ -88,30 +87,8 @@ final class DynamicContextController {
 
 extension DynamicContextController {
     static func parseScopes(_ prompt: inout String) -> Set<String> {
-        guard !prompt.isEmpty else { return [] }
-        do {
-            let parser = Parse {
-                "@"
-                Many {
-                    Prefix { $0.isLetter }
-                } separator: {
-                    "+"
-                } terminator: {
-                    " "
-                }
-                Skip {
-                    Many {
-                        " "
-                    }
-                }
-                Rest()
-            }
-            let (scopes, rest) = try parser.parse(prompt)
-            prompt = String(rest)
-            return Set(scopes.map(String.init))
-        } catch {
-            return []
-        }
+        let parser = MessageScopeParser()
+        return parser(&prompt)
     }
 }
 

Core/Sources/HostApp/GeneralView.swift

@@ -288,9 +288,12 @@ struct GeneralSettingsView: View {
 
                 Text("pt")
             }
-            
-            KeyboardShortcuts.Recorder("Hotkey to Toggle Widgets", name: .showHideWidget)
-            
+
+            KeyboardShortcuts.Recorder("Hotkey to Toggle Widgets", name: .showHideWidget) { _ in
+                // It's not used in this app!
+                KeyboardShortcuts.disable(.showHideWidget)
+            }
+
             Toggle(isOn: $settings.showHideWidgetShortcutGlobally) {
                 Text("Enable the Hotkey Globally")
             }

Pro

@@ -332,6 +332,7 @@ These features are included in another repo, and are not open sourced.
 
 The currently available Plus features include:
 
+- Terminal tab in chat panel.
 - Unlimited chat/embedding models.
 - Tab to accept suggestions.
 - Persisted chat panel.

README.md

@@ -1,5 +1,6 @@
 import Foundation
 import OpenAIService
+import Parsing
 
 public struct ChatContext {
     public struct RetrievedContent {
@@ -39,3 +40,38 @@ public protocol ChatContextCollector {
     ) async -> ChatContext
 }
 
+public struct MessageScopeParser {
+    public init() {}
+
+    public func callAsFunction(_ content: inout String) -> Set<String> {
+        return parseScopes(&content)
+    }
+
+    func parseScopes(_ prompt: inout String) -> Set<String> {
+        guard !prompt.isEmpty else { return [] }
+        do {
+            let parser = Parse {
+                "@"
+                Many {
+                    Prefix { $0.isLetter }
+                } separator: {
+                    "+"
+                } terminator: {
+                    " "
+                }
+                Skip {
+                    Many {
+                        " "
+                    }
+                }
+                Rest()
+            }
+            let (scopes, rest) = try parser.parse(prompt)
+            prompt = String(rest)
+            return Set(scopes.map(String.init))
+        } catch {
+            return []
+        }
+    }
+}
+

Tool/Sources/ChatContextCollector/ChatContextCollector.swift

@@ -265,7 +265,9 @@ extension ChatGPTService {
             requestBody
         )
 
+        #if DEBUG
         Debugger.didSendRequestBody(body: requestBody)
+        #endif
 
         return AsyncThrowingStream<StreamContent, Error> { continuation in
             Task {
@@ -376,7 +378,9 @@ extension ChatGPTService {
             requestBody
         )
 
+        #if DEBUG
         Debugger.didSendRequestBody(body: requestBody)
+        #endif
 
         let response = try await api()
 
@@ -418,7 +422,9 @@ extension ChatGPTService {
         _ call: ChatMessage.FunctionCall,
         messageId: String? = nil
     ) async -> String {
+        #if DEBUG
         Debugger.didReceiveFunction(name: call.name, arguments: call.arguments)
+        #endif
 
         let messageId = messageId ?? uuidGenerator()
 
@@ -445,7 +451,9 @@ extension ChatGPTService {
                 }
             }
 
+            #if DEBUG
             Debugger.didReceiveFunctionResult(result: result.botReadableContent)
+            #endif
 
             await memory.updateMessage(id: messageId) { message in
                 message.content = result.botReadableContent
@@ -456,7 +464,9 @@ extension ChatGPTService {
             // For errors, use the error message as the result.
             let content = "Error: \(error.localizedDescription)"
 
+            #if DEBUG
             Debugger.didReceiveFunctionResult(result: content)
+            #endif
 
             await memory.updateMessage(id: messageId) { message in
                 message.content = content

Tool/Sources/OpenAIService/ChatGPTService.swift

@@ -1,3 +1,3 @@
-APP_VERSION = 0.25.0
-APP_BUILD = 261
+APP_VERSION = 0.26.0
+APP_BUILD = 272
 

Version.xcconfig

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.26.0</title>
+      <pubDate>Sun, 22 Oct 2023 18:58:49 +0800</pubDate>
+      <sparkle:version>272</sparkle:version>
+      <sparkle:shortVersionString>0.26.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.26.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.26.0/Copilot.for.Xcode.app.zip" length="36274215" type="application/octet-stream" sparkle:edSignature="CB6JDXYugsFfJfokP2yuIrnbse9g+TwUW9rZ6zti+SBSt57YFF7xIKh5KAOdTIUnhqZrm3OffexcsDZqeV+wCQ=="/>
+    </item>
+
     <item>
       <title>0.25.0</title>
       <pubDate>Wed, 11 Oct 2023 23:08:08 +0800</pubDate>