Merge tag '0.21.0' into develop

Author: intitni

Core/Sources/ChatContextCollectors/WebChatContextCollector/QueryWebsiteFunction.swift

@@ -63,7 +63,7 @@ struct QueryWebsiteFunction: ChatGPTFunction {
                         await reportProgress("Loading \(url)..")
 
                         if let database = await TemporaryUSearch.view(identifier: urlString) {
-                            await reportProgress("Generating answers..")
+                            await reportProgress("Getting relevant information..")
                             let qa = QAInformationRetrievalChain(vectorStore: database, embedding: embedding)
                             return try await qa.call(.init(arguments.query)).information
                         }
@@ -82,7 +82,7 @@ struct QueryWebsiteFunction: ChatGPTFunction {
                         let database = TemporaryUSearch(identifier: urlString)
                         try await database.set(embeddedDocuments)
                         // 4. generate answer
-                        await reportProgress("Generating answers..")
+                        await reportProgress("Getting relevant information..")
                         let qa = QAInformationRetrievalChain(vectorStore: database, embedding: embedding)
                         let result = try await qa.call(.init(arguments.query))
                         return result.information

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -412,8 +412,9 @@ struct ChatPanelInputArea: View {
         let plugins = chat.pluginIdentifiers.map { "/\($0)" }
         let availableFeatures = plugins + [
             "/exit",
-            "@selection",
+            "@code",
             "@file",
+            "@web",
         ]
 
         let result: [String] = availableFeatures

Core/Sources/HostApp/CustomCommandSettings/CustomCommand.swift

@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import Foundation
+import PlusFeatureFlag
 import Preferences
 import SwiftUI
 import Toast
@@ -24,7 +25,9 @@ struct CustomCommandFeature: ReducerProtocol {
         Reduce { state, action in
             switch action {
             case .createNewCommand:
-                if settings.customCommands.count >= 10 {
+                if !isFeatureAvailable(\.unlimitedCustomCommands),
+                   settings.customCommands.count >= 10
+                {
                     toast("Upgrade to Plus to add more commands", .info)
                     return .none
                 }

LICENSE

@@ -2,6 +2,8 @@
 
 This license is a combination of the GPLv3 and some additional agreements.
 
+Features that requires a Plus license key are not included in this project, and are not open source.
+
 As a contributor, you agree that your contributed code:
 a. may be subject to a more permissive open-source license in the future.
 b. can be used for commercial purposes.

Pro

@@ -6,6 +6,8 @@ Copilot for Xcode is an Xcode Source Editor Extension that provides GitHub Copil
 
 <a href="https://www.buymeacoffee.com/intitni" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
 
+[Get a Plus License Key to unlock more features and support this project](https://intii.lemonsqueezy.com/checkout/buy/298a8d4c-11fb-4ecd-b328-049589645449)
+
 ## Features
 
 - Code Suggestions (powered by GitHub Copilot and Codeium).
@@ -28,13 +30,16 @@ Copilot for Xcode is an Xcode Source Editor Extension that provides GitHub Copil
 - [Update](#update)
 - [Feature](#feature)
 - [Key Bindings](#key-bindings)
+- [Plus Features](#plus-features)
 - [Limitations](#limitations)
 - [License](#license)
 
-For frequently asked questions, check [FAQ](https://github.com/intitni/CopilotForXcode/issues/65).
+For frequently asked questions, check [FAQ](https://github.com/intitni/CopilotForXcode/wiki/Frequently-Asked-Questions).
 
 For development instruction, check [Development.md](DEVELOPMENT.md).
 
+For more information, check the [wiki](https://github.com/intitni/CopilotForXcode/wiki)
+
 ## Prerequisites
 
 - Public network connection.
@@ -296,6 +301,25 @@ Essentially using `⌥⇧` as the "access" key combination for all bindings.
 
 Another convenient method to access commands is by using the `⇧⌘/` shortcut to search for a command in the menu bar.
 
+## Plus Features
+
+The pre-built binary contains a set of exclusive features that can only be accessed with a Plus license key. To obtain a license key, please visit [this link](https://intii.lemonsqueezy.com/checkout/buy/298a8d4c-11fb-4ecd-b328-049589645449).
+
+These features are included in another repo, and are not open sourced.
+
+The currently available Plus features include:
+
+- Browser tap in chat panel.
+- Unlimited custom commands.
+
+Since the app needs to manage license keys, it will send network request to `https://copilotforxcode-license.intii.com`,
+- when you activate the license key
+- when you deactivate the license key
+- when you opened the host app or the service app if a license key is available
+- every 24 hours if a license key is available
+
+The request contains only the license key, the email address (only on activation), and an instance id. You are free to MITM the request to see what data is sent.
+
 ## Limitations
 
 - The extension uses some dirty tricks to get the file and project/workspace paths. It may fail, it may be incorrect, especially when you have multiple Xcode windows running, and maybe even worse when they are in different displays. I am not sure about that though.

README.md

@@ -1,2 +1,2 @@
-APP_VERSION = 0.20.1
-APP_BUILD = 210
+APP_VERSION = 0.21.0
+APP_BUILD = 220

Version.xcconfig

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.21.0</title>
+      <pubDate>Wed, 09 Aug 2023 15:45:24 +0800</pubDate>
+      <sparkle:version>220</sparkle:version>
+      <sparkle:shortVersionString>0.21.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.21.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.21.0/Copilot.for.Xcode.app.zip" length="31114547" type="application/octet-stream" sparkle:edSignature="UFSThidzLxU/lEPfoymq2y4phSrbZRRA8JiB0NCX5Rq2n5sLkbIuRi8RK80gTk4dvSAbrvILz8GIbZYZ+GINBQ=="/>
+    </item>
+
     <item>
       <title>0.20.1</title>
       <pubDate>Fri, 21 Jul 2023 16:00:42 +0800</pubDate>