Merge tag '0.11.0' into develop

Author: intitni

Core/Sources/CopilotService/CopilotService.swift

@@ -51,6 +51,10 @@ public class CopilotBaseService {
                 try? FileManager.default
                     .createDirectory(at: supportURL, withIntermediateDirectories: false)
             }
+            var userEnvPath = ProcessInfo.processInfo.userEnvironment["PATH"] ?? ""
+            if userEnvPath.isEmpty {
+                userEnvPath = "/usr/bin:/usr/local/bin" // fallback
+            }
             let executionParams = {
                 let nodePath = UserDefaults.shared.value(for: \.nodePath)
                 return Process.ExecutionParameters(
@@ -65,7 +69,7 @@ public class CopilotBaseService {
                         "--stdio",
                     ],
                     environment: [
-                        "PATH": "/usr/bin:/usr/local/bin",
+                        "PATH": userEnvPath,
                     ],
                     currentDirectoryURL: supportURL
                 )

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -128,6 +128,10 @@ public actor ChatGPTService: ChatGPTServiceType {
                 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 }

Core/Sources/OpenAIService/CompletionStreamAPI.swift

@@ -89,28 +89,34 @@ struct OpenAICompletionStreamAPI: CompletionStreamAPI {
             let error = try? decoder.decode(ChatGPTError.self, from: data)
             throw error ?? ChatGPTServiceError.responseInvalid
         }
-
-        return (
-            AsyncThrowingStream<CompletionStreamDataTrunk, Error> { continuation in
-                Task {
-                    do {
-                        for try await line in result.lines {
-                            let prefix = "data: "
-                            guard line.hasPrefix(prefix),
-                                  let content = line.dropFirst(prefix.count).data(using: .utf8),
-                                  let trunk = try? JSONDecoder()
-                                  .decode(CompletionStreamDataTrunk.self, from: content)
-                            else { continue }
-                            continuation.yield(trunk)
-                        }
-                        continuation.finish()
-                    } catch {
-                        continuation.finish(throwing: error)
+        
+        var receivingDataTask: Task<Void, Error>?
+        
+        let stream = AsyncThrowingStream<CompletionStreamDataTrunk, Error> { continuation in
+            receivingDataTask = Task {
+                do {
+                    for try await line in result.lines {
+                        if Task.isCancelled { break }
+                        let prefix = "data: "
+                        guard line.hasPrefix(prefix),
+                              let content = line.dropFirst(prefix.count).data(using: .utf8),
+                              let trunk = try? JSONDecoder()
+                              .decode(CompletionStreamDataTrunk.self, from: content)
+                        else { continue }
+                        continuation.yield(trunk)
                     }
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
                 }
-            },
+            }
+        }
+
+        return (
+            stream,
             Cancellable {
                 result.task.cancel()
+                receivingDataTask?.cancel()
             }
         )
     }

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -8,13 +8,16 @@ final class WidgetDataSource {
 
     var globalChat: ChatService?
     var chats = [URL: ChatService]()
+    var globalChatProvider: ChatProvider?
+    var chatProviders = [URL: ChatProvider]()
 
     private init() {}
 
     @discardableResult
     func createChatIfNeeded(for url: URL) -> ChatService {
         let useGlobalChat = UserDefaults.shared.value(for: \.useGlobalChat)
         let chat: ChatService
+        
         if useGlobalChat {
             chat = globalChat ?? ChatService(chatGPTService: ChatGPTService())
             globalChat = chat
@@ -77,8 +80,10 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                 onCloseChat: { [weak self] in
                     if UserDefaults.shared.value(for: \.useGlobalChat) {
                         self?.globalChat = nil
+                        self?.globalChatProvider = nil
                     } else {
                         self?.chats[url] = nil
+                        self?.chatProviders[url] = nil
                     }
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closeChatRoom(fileURL: url)
@@ -94,12 +99,20 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
         }
 
         if useGlobalChat {
-            if let globalChat {
-                return buildChatProvider(globalChat)
+            if let globalChatProvider {
+                return globalChatProvider
+            } else if let globalChat {
+                let new = buildChatProvider(globalChat)
+                self.globalChatProvider = new
+                return new
             }
         } else {
-            if let service = chats[url] {
-                return buildChatProvider(service)
+            if let provider = chatProviders[url] {
+                return provider
+            } else if let service = chats[url] {
+                let new = buildChatProvider(service)
+                self.chatProviders[url] = new
+                return new
             }
         }
 

Core/Sources/Service/ScheduledCleaner.swift

@@ -15,6 +15,7 @@ public final class ScheduledCleaner {
                         for (url, filespace) in filespaces {
                             if filespace.isExpired {
                                 WidgetDataSource.shared.chats[url] = nil
+                                WidgetDataSource.shared.chatProviders[url] = nil
                             }
                         }
                         // cleanup workspace

Core/Sources/SuggestionWidget/ChatProvider.swift

@@ -2,6 +2,7 @@ import Foundation
 import SwiftUI
 
 public final class ChatProvider: ObservableObject {
+    let id = UUID()
     @Published public var history: [ChatMessage] = []
     @Published public var isReceivingMessage = false
     public var onMessageSend: (String) -> Void

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -444,7 +444,9 @@ extension SuggestionWidgetController {
         }
 
         if let chat = await dataSource?.chatForFile(at: fileURL) {
-            suggestionPanelViewModel.chat = chat
+            if suggestionPanelViewModel.chat?.id != chat.id {
+                suggestionPanelViewModel.chat = chat
+            }
         } else {
             suggestionPanelViewModel.chat = nil
         }

README.md

@@ -59,7 +59,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 `/usr/bin:/usr/local/bin`. 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.10.0
-APP_BUILD = 70
+APP_VERSION = 0.11.0
+APP_BUILD = 80

appcast.xml

@@ -2,6 +2,21 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
   <channel>
     <title>Copilot for Xcode</title>
+    <item>
+      <title>0.11.0</title>
+      <pubDate>Sat, 08 Apr 2023 23:32:22 +0800</pubDate>
+      <sparkle:version>80</sparkle:version>
+      <sparkle:shortVersionString>0.11.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.11.0
+      </sparkle:releaseNotesLink>
+      <enclosure
+        url="https://github.com/intitni/CopilotForXcode/releases/download/0.11.0/Copilot.for.Xcode.app.zip"
+        length="19040986" type="application/octet-stream"
+        sparkle:edSignature="VqjW63XWJdCnQYlRzOqQrKSNVp5E4S2GswlpbOh4aUW2grgget1BCcHUFKQqsc45gbGM7U79SVN236ZNjdL2CA==" />
+    </item>
+
     <item>
       <title>0.10.0</title>
       <pubDate>Fri, 31 Mar 2023 23:12:28 +0800</pubDate>
@@ -18,8 +33,7 @@
     </item>
 
     <item>
-      <title>
-        0.9.0</title>
+      <title>0.9.0</title>
       <pubDate>Sat, 25 Mar 2023 23:43:42 +0800</pubDate>
       <sparkle:version>62</sparkle:version>
       <sparkle:shortVersionString>0.9.0</sparkle:shortVersionString>