Merge tag '0.24.0' into develop

intitni · intitni · commit 6ad2ead74b09 · 2023-09-28T14:42:07.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -133,3 +133,4 @@ Python/site-packages/*
 
 Python/VERSIONS
 Copilot for Xcode Plus.xcworkspace
+PLUS
diff --git a/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -405,14 +405,18 @@ func isProIncluded(file: StaticString = #file) -> Bool {
     let rootURL = fileURL
         .deletingLastPathComponent()
         .deletingLastPathComponent()
-    let folderURL = rootURL.appendingPathComponent("Pro")
-    if !FileManager.default.fileExists(atPath: folderURL.path) {
+    let confURL = rootURL.appendingPathComponent("PLUS")
+    if !FileManager.default.fileExists(atPath: confURL.path) {
         return false
     }
-    let packageManifestURL = folderURL.appendingPathComponent("Package.swift")
-    if !FileManager.default.fileExists(atPath: packageManifestURL.path) {
+    do {
+        let content = String(
+            data: try Data(contentsOf: confURL),
+            encoding: .utf8
+        )
+        return content?.hasPrefix("YES") ?? false
+    } catch {
         return false
     }
-    return true
 }
 
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/Core/Sources/ChatGPTChatTab/ChatPanel.swift
@@ -132,6 +132,7 @@ private struct Instruction: View {
                 | `@file` | Read the metadata of the editing file |
                 | `@code` | Read the code and metadata in the editing file |
                 | `@web` (beta) | Search on Bing or query from a web page |
+                | `@project` | Experimental. Access content of the project |
 
                 To use scopes, you can prefix a message with `@code`.
 
diff --git a/Core/Sources/ChatService/AllContextCollector.swift b/Core/Sources/ChatService/AllContextCollector.swift
@@ -2,12 +2,19 @@ import ActiveDocumentChatContextCollector
 import ChatContextCollector
 import SystemInfoChatContextCollector
 import WebChatContextCollector
+#if canImport(ProChatContextCollectors)
 import ProChatContextCollectors
-
 let allContextCollectors: [any ChatContextCollector] = [
     SystemInfoChatContextCollector(),
     ActiveDocumentChatContextCollector(),
     WebChatContextCollector(),
     ProChatContextCollectors(),
 ]
+#else
+let allContextCollectors: [any ChatContextCollector] = [
+    SystemInfoChatContextCollector(),
+    ActiveDocumentChatContextCollector(),
+    WebChatContextCollector(),
+]
+#endif
 
diff --git a/Core/Sources/HostApp/DebugView.swift b/Core/Sources/HostApp/DebugView.swift
@@ -15,6 +15,7 @@ final class DebugSettings: ObservableObject {
     @AppStorage(\.disableGitHubCopilotSettingsAutoRefreshOnAppear)
     var disableGitHubCopilotSettingsAutoRefreshOnAppear
     @AppStorage(\.useUserDefaultsBaseAPIKeychain) var useUserDefaultsBaseAPIKeychain
+    @AppStorage(\.disableEnhancedWorkspace) var disableEnhancedWorkspace
     init() {}
 }
 
@@ -59,6 +60,10 @@ struct DebugSettingsView: View {
                         Text("Store API keys in UserDefaults")
                     }
                     
+                    Toggle(isOn: $settings.disableEnhancedWorkspace) {
+                        Text("Disable Enhanced Workspace")
+                    }
+                    
                     Button("Reset Migration Version to 0") {
                         UserDefaults.shared.set(nil, forKey: "OldMigrationVersion")
                     }
diff --git a/Core/Sources/Service/Service.swift b/Core/Sources/Service/Service.swift
@@ -28,7 +28,7 @@ public final class Service {
 
     private init() {
         @Dependency(\.workspacePool) var workspacePool
-        
+
         scheduledCleaner = .init(workspacePool: workspacePool, guiController: guiController)
         #if canImport(KeyBindingManager)
         keyBindingManager = .init(
@@ -43,9 +43,11 @@ public final class Service {
 
         workspacePool.registerPlugin { SuggestionServiceWorkspacePlugin(workspace: $0) }
         #if canImport(EnhancedWorkspace)
-        workspacePool.registerPlugin { EnhancedWorkspacePlugin(workspace: $0) }
+        if !UserDefaults.shared.value(for: \.disableEnhancedWorkspace) {
+            workspacePool.registerPlugin { EnhancedWorkspacePlugin(workspace: $0) }
+        }
         #endif
-        
+
         self.workspacePool = workspacePool
     }
 
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -410,7 +410,8 @@ extension WindowBaseCommandHandler {
         let viewStore = Service.shared.guiController.viewStore
 
         _ = await Task { @MainActor in
-            viewStore.send(.promptToCodeGroup(.createPromptToCode(.init(
+            // if there is already a prompt to code presenting, we should not present another one
+            viewStore.send(.promptToCodeGroup(.activateOrCreatePromptToCode(.init(
                 code: code,
                 selectionRange: selection,
                 language: codeLanguage,
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift
@@ -114,7 +114,8 @@ public struct PanelFeature: ReducerProtocol {
                 state.content.suggestion = nil
                 return .none
 
-            case .sharedPanel(.promptToCodeGroup(.createPromptToCode)):
+            case .sharedPanel(.promptToCodeGroup(.activateOrCreatePromptToCode)),
+                 .sharedPanel(.promptToCodeGroup(.createPromptToCode)):
                 let hasPromptToCode = state.content.promptToCode != nil
                 return .run { send in
                     await send(.displayPanelContent)
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift
@@ -67,6 +67,8 @@ public struct PromptToCodeGroup: ReducerProtocol {
     }
 
     public enum Action: Equatable {
+        /// Activate the prompt to code if it exists or create it if it doesn't
+        case activateOrCreatePromptToCode(PromptToCodeInitialState)
         case createPromptToCode(PromptToCodeInitialState)
         case updatePromptToCodeRange(id: PromptToCode.State.ID, range: CursorRange)
         case discardAcceptedPromptToCodeIfNotContinuous(id: PromptToCode.State.ID)
@@ -80,6 +82,13 @@ public struct PromptToCodeGroup: ReducerProtocol {
     public var body: some ReducerProtocol<State, Action> {
         Reduce { state, action in
             switch action {
+            case let .activateOrCreatePromptToCode(s):
+                guard state.activePromptToCode == nil else {
+                    return .none
+                }
+                return .run { send in
+                    await send(.createPromptToCode(s))
+                }
             case let .createPromptToCode(s):
                 let newPromptToCode = PromptToCode.State(
                     code: s.code,
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit 8fad5c296030922a4ac5acaef178dfb79a5f30e2
+Subproject commit 6b43f38aaa12fab3c051eb94c20a8d7192a6020b
diff --git a/README.md b/README.md
@@ -75,7 +75,9 @@ You can install it via [Homebrew](http://brew.sh/):
 brew install --cask copilot-for-xcode
 ```
 
-Or install it manually, by downloading the `Copilot for Xcode.app` from the latest [release](https://github.com/intitni/CopilotForXcode/releases), and extract it to the Applications folder.
+Or install it manually, by downloading the `Copilot for Xcode.app` from the latest [release](https://github.com/intitni/CopilotForXcode/releases).
+
+Please make sure the app is inside the Applications folder.
 
 Open the app, the app will create a launch agent to setup a background running Service that does the real job.
 
diff --git a/Tool/Package.swift b/Tool/Package.swift
@@ -189,6 +189,7 @@ let package = Package(
                 "Environment",
                 "Logger",
                 "Preferences",
+                "XcodeInspector"
             ]
         ),
 
diff --git a/Tool/Sources/Environment/Environment.swift b/Tool/Sources/Environment/Environment.swift
@@ -41,7 +41,8 @@ public enum Environment {
             return false
         }
     }
-    
+
+    #warning("TODO: Use XcodeInspector instead.")
     public static var fetchCurrentWorkspaceURLFromXcode: () async throws -> URL? = {
         if let xcode = ActiveApplicationMonitor.shared.activeXcode
             ?? ActiveApplicationMonitor.shared.latestXcode
@@ -69,6 +70,7 @@ public enum Environment {
         return nil
     }
 
+    #warning("TODO: Use WorkspaceXcodeWindowInspector.extractProjectURL instead.")
     public static var guessProjectRootURLForFile: (_ fileURL: URL) async throws -> URL = {
         fileURL in
         var currentURL = fileURL
@@ -77,10 +79,19 @@ public enum Environment {
         while currentURL.pathComponents.count > 1 {
             defer { currentURL.deleteLastPathComponent() }
             guard FileManager.default.fileIsDirectory(atPath: currentURL.path) else { continue }
+            guard currentURL.pathExtension != "xcodeproj" else { continue }
+            guard currentURL.pathExtension != "xcworkspace" else { continue }
+            guard currentURL.pathExtension != "playground" else { continue }
             if firstDirectoryURL == nil { firstDirectoryURL = currentURL }
             let gitURL = currentURL.appendingPathComponent(".git")
             if FileManager.default.fileIsDirectory(atPath: gitURL.path) {
                 lastGitDirectoryURL = currentURL
+            } else if let text = try? String(contentsOf: gitURL) {
+                if !text.hasPrefix("gitdir: ../"), // it's not a sub module
+                   text.range(of: "/.git/worktrees/") != nil // it's a git worktree
+                {
+                    lastGitDirectoryURL = currentURL
+                }
             }
         }
 
diff --git a/Tool/Sources/Preferences/Keys.swift b/Tool/Sources/Preferences/Keys.swift
@@ -499,5 +499,12 @@ public extension UserDefaultPreferenceKeys {
             key: "FeatureFlag-DisableGitHubCopilotSettingsAutoRefreshOnAppear"
         )
     }
+    
+    var disableEnhancedWorkspace: FeatureFlag {
+        .init(
+            defaultValue: false,
+            key: "FeatureFlag-DisableEnhancedWorkspace"
+        )
+    }
 }
 
diff --git a/Tool/Sources/Workspace/Workspace.swift b/Tool/Sources/Workspace/Workspace.swift
@@ -3,6 +3,7 @@ import Foundation
 import Preferences
 import SuggestionModel
 import UserDefaultsObserver
+import XcodeInspector
 
 public protocol WorkspacePropertyKey {
     associatedtype Value
@@ -89,16 +90,10 @@ public final class Workspace {
 
     init(workspaceURL: URL) {
         self.workspaceURL = workspaceURL
-        self.projectRootURL = {
-            var url = workspaceURL
-            while !FileManager.default.fileIsDirectory(atPath: url.path) ||
-                !url.pathExtension.isEmpty
-            {
-                url = url.deletingLastPathComponent()
-            }
-            return url
-
-        }()
+        self.projectRootURL = WorkspaceXcodeWindowInspector.extractProjectURL(
+            workspaceURL: workspaceURL,
+            documentURL: nil
+        ) ?? workspaceURL
         openedFileRecoverableStorage = .init(projectRootURL: projectRootURL)
         let openedFiles = openedFileRecoverableStorage.openedFiles
         Task { @WorkspaceActor in
diff --git a/Tool/Sources/XcodeInspector/XcodeInspector.swift b/Tool/Sources/XcodeInspector/XcodeInspector.swift
@@ -24,7 +24,7 @@ public final class XcodeInspector: ObservableObject {
     @Published public internal(set) var focusedEditor: SourceEditor?
     @Published public internal(set) var focusedElement: AXUIElement?
     @Published public internal(set) var completionPanel: AXUIElement?
-
+    
     public var focusedEditorContent: EditorInformation? {
         guard let documentURL = XcodeInspector.shared.realtimeActiveDocumentURL,
               let workspaceURL = XcodeInspector.shared.realtimeActiveWorkspaceURL,
@@ -253,11 +253,9 @@ public final class XcodeAppInstanceInspector: AppInstanceInspector {
     }
 
     public var realtimeProjectURL: URL? {
-        guard let window = appElement.focusedWindow else { return nil }
         let workspaceURL = realtimeWorkspaceURL
         let documentURL = realtimeDocumentURL
         return WorkspaceXcodeWindowInspector.extractProjectURL(
-            windowElement: window,
             workspaceURL: workspaceURL,
             documentURL: documentURL
         )
@@ -469,18 +467,8 @@ extension XcodeAppInstanceInspector {
 
     /// Use the project path as the workspace identifier.
     static func workspaceIdentifier(_ window: AXUIElement) -> WorkspaceIdentifier {
-        for child in window.children {
-            if child.description.starts(with: "/"), child.description.count > 1 {
-                let path = child.description
-                let trimmedNewLine = path.trimmingCharacters(in: .newlines)
-                var url = URL(fileURLWithPath: trimmedNewLine)
-                while !FileManager.default.fileIsDirectory(atPath: url.path) ||
-                    !url.pathExtension.isEmpty
-                {
-                    url = url.deletingLastPathComponent()
-                }
-                return WorkspaceIdentifier.url(url)
-            }
+        if let url = WorkspaceXcodeWindowInspector.extractWorkspaceURL(windowElement: window) {
+            return WorkspaceIdentifier.url(url)
         }
         return WorkspaceIdentifier.unknown
     }
diff --git a/Tool/Sources/XcodeInspector/XcodeWindowInspector.swift b/Tool/Sources/XcodeInspector/XcodeWindowInspector.swift
@@ -66,7 +66,6 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
             self.workspaceURL = workspaceURL
         }
         let projectURL = Self.extractProjectURL(
-            windowElement: uiElement,
             workspaceURL: workspaceURL,
             documentURL: documentURL
         )
@@ -104,8 +103,7 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
         return nil
     }
 
-    static func extractProjectURL(
-        windowElement: AXUIElement,
+    public static func extractProjectURL(
         workspaceURL: URL?,
         documentURL: URL?
     ) -> URL? {
@@ -115,10 +113,19 @@ public final class WorkspaceXcodeWindowInspector: XcodeWindowInspector {
         while currentURL.pathComponents.count > 1 {
             defer { currentURL.deleteLastPathComponent() }
             guard FileManager.default.fileIsDirectory(atPath: currentURL.path) else { continue }
+            guard currentURL.pathExtension != "xcodeproj" else { continue }
+            guard currentURL.pathExtension != "xcworkspace" else { continue }
+            guard currentURL.pathExtension != "playground" else { continue }
             if firstDirectoryURL == nil { firstDirectoryURL = currentURL }
             let gitURL = currentURL.appendingPathComponent(".git")
             if FileManager.default.fileIsDirectory(atPath: gitURL.path) {
                 lastGitDirectoryURL = currentURL
+            } else if let text = try? String(contentsOf: gitURL) {
+                if !text.hasPrefix("gitdir: ../"), // it's not a sub module
+                   text.range(of: "/.git/worktrees/") != nil // it's a git worktree
+                {
+                    lastGitDirectoryURL = currentURL
+                }
             }
         }
 
diff --git a/Version.xcconfig b/Version.xcconfig
@@ -1,3 +1,3 @@
-APP_VERSION = 0.23.2
-APP_BUILD = 241
+APP_VERSION = 0.24.0
+APP_BUILD = 250
  
diff --git a/appcast.xml b/appcast.xml
@@ -3,16 +3,28 @@
   <channel>
     <title>Copilot for Xcode</title>
 
-      <item>
-        <title>0.23.2</title>
-        <pubDate>Sat, 09 Sep 2023 22:07:35 +0800</pubDate>
-        <sparkle:version>241</sparkle:version>
-        <sparkle:shortVersionString>0.23.2</sparkle:shortVersionString>
-        <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
-        <sparkle:releaseNotesLink>
+    <item>
+      <title>0.24.0</title>
+      <pubDate>Thu, 28 Sep 2023 01:35:21 +0800</pubDate>
+      <sparkle:version>250</sparkle:version>
+      <sparkle:shortVersionString>0.24.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.24.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.24.0/Copilot.for.Xcode.app.zip" length="33885796" type="application/octet-stream" sparkle:edSignature="A5VujChe+oIK51cpXvxrs5agPsZQY+CvhNI5xSS4JM8W6qk8OcMAx38JYOPjirY7gdaonYWSOtSRraAMfgUjCw=="/>
+    </item>
+
+    <item>
+      <title>0.23.2</title>
+      <pubDate>Sat, 09 Sep 2023 22:07:35 +0800</pubDate>
+      <sparkle:version>241</sparkle:version>
+      <sparkle:shortVersionString>0.23.2</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
         https://github.com/intitni/CopilotForXcode/releases/tag/0.23.2
       </sparkle:releaseNotesLink>
-        <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.23.2/Copilot.for.Xcode.app.zip" length="32279961" type="application/octet-stream" sparkle:edSignature="9freCwsRzTUZvOoE97lmYeghullf4xcYcPe+4Zuc1Elkh/U8vRPntxKXH49E0ebv+d+Xiw+feFE3JTRBvqzcCw=="/>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.23.2/Copilot.for.Xcode.app.zip" length="32279961" type="application/octet-stream" sparkle:edSignature="9freCwsRzTUZvOoE97lmYeghullf4xcYcPe+4Zuc1Elkh/U8vRPntxKXH49E0ebv+d+Xiw+feFE3JTRBvqzcCw=="/>
     </item>
 
     <item>

Original file line number	Diff line number	Diff line change
`@@ -133,3 +133,4 @@ Python/site-packages/*`
`133`	`133`
`134`	`134`	`Python/VERSIONS`
`135`	`135`	`Copilot for Xcode Plus.xcworkspace`
	`136`	`+PLUS`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ final class DebugSettings: ObservableObject {`
`15`	`15`	`@AppStorage(\.disableGitHubCopilotSettingsAutoRefreshOnAppear)`
`16`	`16`	`var disableGitHubCopilotSettingsAutoRefreshOnAppear`
`17`	`17`	`@AppStorage(\.useUserDefaultsBaseAPIKeychain) var useUserDefaultsBaseAPIKeychain`
	`18`	`+ @AppStorage(\.disableEnhancedWorkspace) var disableEnhancedWorkspace`
`18`	`19`	`init() {}`
`19`	`20`	`}`
`20`	`21`
`@@ -59,6 +60,10 @@ struct DebugSettingsView: View {`
`59`	`60`	`Text("Store API keys in UserDefaults")`
`60`	`61`	`}`
`61`	`62`
	`63`	`+ Toggle(isOn: $settings.disableEnhancedWorkspace) {`
	`64`	`+ Text("Disable Enhanced Workspace")`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`Button("Reset Migration Version to 0") {`
`63`	`68`	`UserDefaults.shared.set(nil, forKey: "OldMigrationVersion")`
`64`	`69`	`}`