Update

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"),
@@ -266,8 +267,9 @@ let package = Package(
         .target(
             name: "PlusFeatureFlag",
             dependencies: [
-                .product(name: "LicenseManagement", package: "Tool"),
-            ]
+            ].pro([
+                "LicenseManagement"
+            ])
         ),
 
         // MARK: - GitHub Copilot

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

@@ -29,17 +29,19 @@ struct HostApp: ReducerProtocol {
             case .appear:
                 return .none
             case .informExtensionServiceAboutLicenseKeyChange:
+                #if canImport(LicenseManagement)
                 return .run { _ in
-                    #if canImport(LicenseManagement)
                     let service = try getService()
                     do {
                         try await service
                             .postNotification(name: Notification.Name.licenseKeyChanged.rawValue)
                     } catch {
                         toast(error.localizedDescription, .error)
                     }
-                    #endif
                 }
+                #else
+                return .none
+                #endif
             case .general:
                 return .none
             }

Core/Sources/PlusFeatureFlag/PlusFeatureFlag.swift

@@ -1,27 +1,45 @@
-import Dependencies
 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 {
-    LicenseManagement.isFeatureAvailable(flag)
+    #if canImport(LicenseManagement)
+    return LicenseManagement.isFeatureAvailable(flag)
+    #else
+    return false
+    #endif
 }
 
-#endif

TestPlan.xctestplan

@@ -78,13 +78,6 @@
         "name" : "ChatServiceTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "SharedUIComponentsTests",
-        "name" : "SharedUIComponentsTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Tool",
@@ -105,6 +98,13 @@
         "identifier" : "SuggestionModelTests",
         "name" : "SuggestionModelTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Tool",
+        "identifier" : "SharedUIComponentsTests",
+        "name" : "SharedUIComponentsTests"
+      }
     }
   ],
   "version" : 1