Merge branch 'feature/pro-feature-flag' into develop

Author: intitni

Core/Package.swift

@@ -117,6 +117,7 @@ let package = Package(
                 "GitHubCopilotService",
                 "CodeiumService",
                 "LaunchAgentManager",
+                "PlusFeatureFlag",
                 .product(name: "Toast", package: "Tool"),
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "MarkdownUI", package: "swift-markdown-ui"),
@@ -263,6 +264,13 @@ let package = Package(
             ]
         ),
         .target(name: "UserDefaultsObserver"),
+        .target(
+            name: "PlusFeatureFlag",
+            dependencies: [
+            ].pro([
+                "LicenseManagement"
+            ])
+        ),
 
         // MARK: - GitHub Copilot
 

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -15,6 +15,7 @@ public class ChatGPTChatTab: ChatTab {
 
     struct Builder: ChatTabBuilder {
         var title: String
+        var buildable: Bool { true }
         var customCommand: CustomCommand?
 
         func build() -> any ChatTab {

Core/Sources/Client/AsyncXPCService.swift

@@ -134,6 +134,24 @@ public struct AsyncXPCService {
             { service in { service.customCommand(id: id, editorContent: $0, withReply: $1) } }
         )
     }
+    
+    public func postNotification(name: String) async throws {
+        try await withXPCServiceConnected(connection: connection) {
+            service, continuation in
+            service.postNotification(name: name) {
+                continuation.resume(())
+            }
+        }
+    }
+    
+    public func performAction(name: String, arguments: String) async throws -> String {
+        try await withXPCServiceConnected(connection: connection) {
+            service, continuation in
+            service.performAction(name: name, arguments: arguments) {
+                continuation.resume($0)
+            }
+        }
+    }
 }
 
 struct AutoFinishContinuation<T> {

Core/Sources/HostApp/CustomCommandSettings/CustomCommand.swift

@@ -18,12 +18,16 @@ struct CustomCommandFeature: ReducerProtocol {
         case deleteCommand(CustomCommand)
     }
 
-    @Dependency(\.toastController) var toastController
+    @Dependency(\.toast) var toast
 
     var body: some ReducerProtocol<State, Action> {
         Reduce { state, action in
             switch action {
             case .createNewCommand:
+                if settings.customCommands.count >= 10 {
+                    toast("Upgrade to Plus to add more commands", .info)
+                    return .none
+                }
                 state.editCustomCommand = EditCustomCommand.State(nil)
                 return .none
             case let .editCommand(command):

Core/Sources/HostApp/CustomCommandSettings/CustomCommandView.swift

@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import MarkdownUI
+import PlusFeatureFlag
 import Preferences
 import SwiftUI
 
@@ -72,7 +73,12 @@ struct CustomCommandView: View {
             Button(action: {
                 store.send(.createNewCommand)
             }) {
-                Text(Image(systemName: "plus.circle.fill")) + Text(" New Command")
+                if isFeatureAvailable(\.unlimitedCustomCommands) {
+                    Text(Image(systemName: "plus.circle.fill")) + Text(" New Command")
+                } else {
+                    Text(Image(systemName: "plus.circle.fill")) +
+                        Text(" New Command (\(settings.customCommands.count)/10)")
+                }
             }
             .buttonStyle(.plain)
             .padding()

Core/Sources/HostApp/HostApp.swift

@@ -1,28 +1,51 @@
-import Foundation
+import Client
 import ComposableArchitecture
+import Foundation
+
+#if canImport(LicenseManagement)
+import LicenseManagement
+#endif
 
 struct HostApp: ReducerProtocol {
     struct State: Equatable {
         var general = General.State()
     }
-    
+
     enum Action: Equatable {
         case appear
+        case informExtensionServiceAboutLicenseKeyChange
         case general(General.Action)
     }
-    
+
+    @Dependency(\.toast) var toast
+
     var body: some ReducerProtocol<State, Action> {
         Scope(state: \.general, action: /Action.general) {
             General()
         }
-        
+
         Reduce { _, action in
             switch action {
             case .appear:
                 return .none
+            case .informExtensionServiceAboutLicenseKeyChange:
+                #if canImport(LicenseManagement)
+                return .run { _ in
+                    let service = try getService()
+                    do {
+                        try await service
+                            .postNotification(name: Notification.Name.licenseKeyChanged.rawValue)
+                    } catch {
+                        toast(error.localizedDescription, .error)
+                    }
+                }
+                #else
+                return .none
+                #endif
             case .general:
                 return .none
             }
         }
     }
 }
+

Core/Sources/HostApp/TabContainer.swift

@@ -59,7 +59,9 @@ public struct TabContainer: View {
                     image: "command.square"
                 )
                 #if canImport(ProHostApp)
-                PlusView().tabBarItem(
+                PlusView(onLicenseKeyChanged: {
+                    store.send(.informExtensionServiceAboutLicenseKeyChange)
+                }).tabBarItem(
                     tag: 5,
                     title: "Plus",
                     image: "plus.diamond"

Core/Sources/PlusFeatureFlag/PlusFeatureFlag.swift

@@ -0,0 +1,45 @@
+import Foundation
+import SwiftUI
+
+#if canImport(LicenseManagement)
+
+import LicenseManagement
+
+#else
+
+public typealias PlusFeatureFlag = Int
+
+public struct PlusFeatureFlags {
+    public let browserTab = 1
+    public let unlimitedCustomCommands = 1
+    init() {}
+}
+
+#endif
+
+public func withFeatureEnabled(
+    _ flag: KeyPath<PlusFeatureFlags, PlusFeatureFlag>,
+    then: () throws -> Void
+) rethrows {
+    #if canImport(LicenseManagement)
+    try LicenseManagement.withFeatureEnabled(flag, then: then)
+    #endif
+}
+
+public func withFeatureEnabled(
+    _ flag: KeyPath<PlusFeatureFlags, PlusFeatureFlag>,
+    then: () async throws -> Void
+) async rethrows {
+    #if canImport(LicenseManagement)
+    try await LicenseManagement.withFeatureEnabled(flag, then: then)
+    #endif
+}
+
+public func isFeatureAvailable(_ flag: KeyPath<PlusFeatureFlags, PlusFeatureFlag>) -> Bool {
+    #if canImport(LicenseManagement)
+    return LicenseManagement.isFeatureAvailable(flag)
+    #else
+    return false
+    #endif
+}
+

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -41,7 +41,8 @@ struct GUI: ReducerProtocol {
             Reduce { _, action in
                 switch action {
                 case let .createNewTapButtonClicked(kind):
-                    let chatTap = kind?.builder.build() ?? ChatGPTChatTab()
+                    guard let builder = kind?.builder, builder.buildable else { return .none }
+                    let chatTap = builder.build()
                     return .run { send in
                         await send(.appendAndSelectTab(chatTap))
                     }

Core/Sources/Service/XPCService.swift

@@ -184,5 +184,14 @@ public class XPCService: NSObject, XPCServiceProtocol {
             reply(nil)
         }
     }
+    
+    public func postNotification(name: String, withReply reply: @escaping () -> Void) {
+        reply()
+        NSWorkspace.shared.notificationCenter.post(name: .init(name), object: nil)
+    }
+    
+    public func performAction(name: String, arguments: String, withReply reply: @escaping (String) -> Void) {
+        reply("None")
+    }
 }