[pull] main from intitni:main

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Pro"]
-	path = Pro
-	url = git@github.com:intitni/CopilotForXcodePro.git

Config.xcconfig

@@ -3,7 +3,7 @@ SLASH = /
 
 HOST_APP_NAME = Copilot for Xcode
 BUNDLE_IDENTIFIER_BASE = com.intii.CopilotForXcode
-SPARKLE_FEED_URL = https:$(SLASH)$(SLASH)raw.githubusercontent.com/intitni/CopilotForXcode/main/appcast.xml
+SPARKLE_FEED_URL = https:$(SLASH)$(SLASH)copilotforxcode.intii.com/appcast.xml
 SPARKLE_PUBLIC_KEY = WDzm5GHnc6c8kjeJEgX5GuGiPpW6Lc/ovGjLnrrZvPY=
 APPLICATION_SUPPORT_FOLDER = com.intii.CopilotForXcode
 EXTENSION_BUNDLE_NAME = Copilot

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -205,7 +205,6 @@
 		C8216B772980370100AD38C7 /* ReloadLaunchAgent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReloadLaunchAgent.swift; sourceTree = "<group>"; };
 		C828B27D2B1F241500E7612A /* ExtensionPoint.appextensionpoint */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = ExtensionPoint.appextensionpoint; sourceTree = "<group>"; };
 		C82E38492A1F025F00D4EADF /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
-		C83E5DED2A38CD8C0071506D /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		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>"; };
 		C861A6A229E5503F005C41A3 /* PromptToCodeCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromptToCodeCommand.swift; sourceTree = "<group>"; };
@@ -335,7 +334,6 @@
 				C887BC832965D96000931567 /* DEVELOPMENT.md */,
 				C8520308293D805800460097 /* README.md */,
 				C82E38492A1F025F00D4EADF /* LICENSE */,
-				C83E5DED2A38CD8C0071506D /* Makefile */,
 				C8F103292A7A365000D28F4F /* launchAgent.plist */,
 				C8738B6D2BE4F3E800609E7F /* bridgeLaunchAgent.plist */,
 				C81E867D296FE4420026E908 /* Version.xcconfig */,

Core/Package.swift

@@ -4,57 +4,6 @@
 import Foundation
 import PackageDescription
 
-// MARK: - Pro
-
-extension [Target.Dependency] {
-    func pro(_ targetNames: [String]) -> [Target.Dependency] {
-        if isProIncluded {
-            // include the pro package
-            return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
-        }
-        return self
-    }
-}
-
-extension [Package.Dependency] {
-    var pro: [Package.Dependency] {
-        if isProIncluded {
-            // include the pro package
-            return self + [.package(path: "../Pro/Pro")]
-        }
-        return self
-    }
-}
-
-let isProIncluded: Bool = {
-    func isProIncluded(file: StaticString = #file) -> Bool {
-        let filePath = "\(file)"
-        let fileURL = URL(fileURLWithPath: filePath)
-        let rootURL = fileURL
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-        let confURL = rootURL.appendingPathComponent("PLUS")
-        if !FileManager.default.fileExists(atPath: confURL.path) {
-            return false
-        }
-        do {
-            if let content = try String(
-                data: Data(contentsOf: confURL),
-                encoding: .utf8
-            ) {
-                if content.hasPrefix("YES") {
-                    return true
-                }
-            }
-            return false
-        } catch {
-            return false
-        }
-    }
-
-    return isProIncluded()
-}()
-
 // MARK: - Package
 
 let package = Package(
@@ -101,6 +50,8 @@ let package = Package(
         // quick hack to support custom UserDefaults
         // https://github.com/sindresorhus/KeyboardShortcuts
         .package(url: "https://github.com/intitni/KeyboardShortcuts", branch: "main"),
+        .package(url: "https://github.com/intitni/CGEventOverride", from: "1.2.1"),
+        .package(url: "https://github.com/intitni/Highlightr", branch: "master"),
     ].pro,
     targets: [
         // MARK: - Main
@@ -110,7 +61,7 @@ let package = Package(
             dependencies: [
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
             ].pro([
@@ -127,12 +78,14 @@ let package = Package(
                 "ServiceUpdateMigration",
                 "ChatGPTChatTab",
                 "PlusFeatureFlag",
+                "KeyBindingManager",
+                "XcodeThemeController",
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "Workspace", package: "Tool"),
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "ChatTab", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
@@ -153,7 +106,7 @@ let package = Package(
                 "SuggestionInjector",
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
             ]
         ),
@@ -169,7 +122,7 @@ let package = Package(
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "Toast", package: "Tool"),
                 .product(name: "SharedUIComponents", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
@@ -187,15 +140,15 @@ let package = Package(
             dependencies: [
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool")
             ].pro([
                 "ProExtension",
             ])
         ),
         .target(
             name: "SuggestionInjector",
-            dependencies: [.product(name: "SuggestionModel", package: "Tool")]
+            dependencies: [.product(name: "SuggestionBasic", package: "Tool")]
         ),
         .testTarget(
             name: "SuggestionInjectorTests",
@@ -208,7 +161,7 @@ let package = Package(
             name: "PromptToCodeService",
             dependencies: [
                 .product(name: "FocusedCodeFinder", package: "Tool"),
-                .product(name: "SuggestionModel", package: "Tool"),
+                .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
@@ -377,6 +330,73 @@ let package = Package(
             ],
             path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
         ),
+
+        // MARK: Key Binding
+
+        .target(
+            name: "KeyBindingManager",
+            dependencies: [
+                .product(name: "Workspace", package: "Tool"),
+                .product(name: "Preferences", package: "Tool"),
+                .product(name: "Logger", package: "Tool"),
+                .product(name: "CGEventOverride", package: "CGEventOverride"),
+                .product(name: "AppMonitoring", package: "Tool"),
+                .product(name: "UserDefaultsObserver", package: "Tool"),
+            ]
+        ),
+        .testTarget(
+            name: "KeyBindingManagerTests",
+            dependencies: ["KeyBindingManager"]
+        ),
+
+        // MARK: Theming
+
+        .target(
+            name: "XcodeThemeController",
+            dependencies: [
+                .product(name: "Preferences", package: "Tool"),
+                .product(name: "AppMonitoring", package: "Tool"),
+                .product(name: "Highlightr", package: "Highlightr"),
+            ]
+        ),
+
     ]
 )
 
+extension [Target.Dependency] {
+    func pro(_ targetNames: [String]) -> [Target.Dependency] {
+        if isProIncluded {
+            // include the pro package
+            return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
+        }
+        return self
+    }
+}
+
+extension [Package.Dependency] {
+    var pro: [Package.Dependency] {
+        if isProIncluded {
+            // include the pro package
+            return self + [.package(path: "../../CopilotForXcodePro/Pro")]
+        }
+        return self
+    }
+}
+
+let isProIncluded: Bool = {
+    func isProIncluded(file: StaticString = #file) -> Bool {
+        let filePath = "\(file)"
+        let fileURL = URL(fileURLWithPath: filePath)
+        let rootURL = fileURL
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let confURL = rootURL.appendingPathComponent("PLUS")
+        if !FileManager.default.fileExists(atPath: confURL.path) {
+            return false
+        }
+        return true
+    }
+
+    return isProIncluded()
+}()

Core/Sources/ChatContextCollectors/WebChatContextCollector/QueryWebsiteFunction.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import Foundation
 import LangChain
 import OpenAIService

Core/Sources/ChatContextCollectors/WebChatContextCollector/SearchFunction.swift

@@ -1,4 +1,5 @@
 import BingSearchService
+import ChatBasic
 import Foundation
 import OpenAIService
 import Preferences

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -1,3 +1,4 @@
+import ChatBasic
 import ChatContextCollector
 import Foundation
 import OpenAIService

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -1,6 +1,8 @@
+import ChatBasic
 import ChatService
 import ComposableArchitecture
 import Foundation
+import MarkdownUI
 import OpenAIService
 import Preferences
 import Terminal
@@ -40,12 +42,14 @@ public struct DisplayedChatMessage: Equatable {
     public var id: String
     public var role: Role
     public var text: String
+    public var markdownContent: MarkdownContent
     public var references: [Reference] = []
 
     public init(id: String, role: Role, text: String, references: [Reference]) {
         self.id = id
         self.role = role
         self.text = text
+        markdownContent = .init(text)
         self.references = references
     }
 }
@@ -151,7 +155,7 @@ struct Chat {
             case let .setIsEnabled(isEnabled):
                 state.isEnabled = isEnabled
                 return .none
-            
+
             case .sendButtonTapped:
                 guard !state.typedMessage.isEmpty else { return .none }
                 let message = state.typedMessage
@@ -213,11 +217,11 @@ struct Chat {
                         await openURL(url)
                     }
                 }
-                
+
             case .manuallyScrolledUp:
                 state.isPinnedToBottom = false
                 return .none
-                
+
             case .scrollToBottomButtonTapped:
                 state.isPinnedToBottom = true
                 return .none
@@ -248,7 +252,7 @@ struct Chat {
                     let debouncedHistoryChange = TimedDebounceFunction(duration: 0.2) {
                         await send(.historyChanged)
                     }
-                    
+
                     for await _ in stream {
                         await debouncedHistoryChange()
                     }
@@ -502,9 +506,10 @@ private actor TimedDebounceFunction {
             }
         }
     }
-    
+
     func fire() async {
         lastFireTime = Date()
         await block()
     }
 }
+