Move CustomCommandTemplateProcessor to Tool

Author: intitni

Core/Package.swift

@@ -96,6 +96,7 @@ let package = Package(
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Dependencies", package: "swift-dependencies"),
                 .product(name: "KeyboardShortcuts", package: "KeyboardShortcuts"),
+                .product(name: "CustomCommandTemplateProcessor", package: "Tool"),
             ].pro([
                 "ProService",
             ])
@@ -142,7 +143,7 @@ let package = Package(
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
-                .product(name: "SuggestionProvider", package: "Tool")
+                .product(name: "SuggestionProvider", package: "Tool"),
             ].pro([
                 "ProExtension",
             ])
@@ -186,6 +187,7 @@ let package = Package(
                 .product(name: "Parsing", package: "swift-parsing"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
+                .product(name: "CustomCommandTemplateProcessor", package: "Tool"),
             ].pro([
                 "ProService",
             ])
@@ -326,7 +328,7 @@ let package = Package(
             ],
             path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
         ),
-        
+
         // MARK: Key Binding
 
         .target(
@@ -346,7 +348,7 @@ let package = Package(
             name: "KeyBindingManagerTests",
             dependencies: ["KeyBindingManager"]
         ),
-        
+
         // MARK: Theming
 
         .target(
@@ -357,7 +359,6 @@ let package = Package(
                 .product(name: "Highlightr", package: "Highlightr"),
             ]
         ),
-
     ]
 )
 
@@ -393,3 +394,4 @@ var isProIncluded: Bool {
 
     return isProIncluded()
 }
+

Core/Sources/ChatService/ChatService.swift

@@ -1,13 +1,14 @@
 import ChatContextCollector
 import ChatPlugin
 import Combine
+import CustomCommandTemplateProcessor
 import Foundation
 import OpenAIService
 import Preferences
 
 public final class ChatService: ObservableObject {
     public typealias Scope = ChatContext.Scope
-    
+
     public let memory: ContextAwareAutoManagedChatGPTMemory
     public let configuration: OverridingChatGPTConfiguration
     public let chatGPTService: any LegacyChatGPTServiceType
@@ -91,7 +92,7 @@ public final class ChatService: ObservableObject {
         if UserDefaults.shared.value(for: \.enableWebScopeByDefaultInChatContext) {
             scopes.insert(.web)
         }
-        
+
         defaultScopes = scopes
     }
 

Core/Sources/Service/GUI/ChatTabFactory.swift

@@ -55,65 +55,3 @@ enum ChatTabFactory {
         return (defaultChatTab, otherChatTabs)
     }
 }
-
-// #if canImport(ProChatTabs)
-// let lazyLoadDependency: () = {
-//    BrowserChatTab.externalDependency = .init(
-//        handleCustomCommand: { command, prompt in
-//           switch command.feature {
-//           case let .chatWithSelection(extraSystemPrompt, _, useExtraSystemPrompt):
-//               let service = ChatService()
-//               return try await service.processMessage(
-//                   systemPrompt: nil,
-//                   extraSystemPrompt: (useExtraSystemPrompt ?? false) ? extraSystemPrompt :
-//                       nil,
-//                   prompt: prompt
-//               )
-//           case let .customChat(systemPrompt, _):
-//               let service = ChatService()
-//               return try await service.processMessage(
-//                   systemPrompt: systemPrompt,
-//                   extraSystemPrompt: nil,
-//                   prompt: prompt
-//               )
-//           case let .singleRoundDialog(
-//               systemPrompt,
-//               overwriteSystemPrompt,
-//               _,
-//               _
-//           ):
-//               let service = ChatService()
-//               return try await service.handleSingleRoundDialogCommand(
-//                   systemPrompt: systemPrompt,
-//                   overwriteSystemPrompt: overwriteSystemPrompt ?? false,
-//                   prompt: prompt
-//               )
-//           case let .promptToCode(extraSystemPrompt, instruction, _, _):
-//               let service = OpenAIPromptToCodeService()
-//
-//               let result = try await service.modifyCode(
-//                   code: prompt,
-//                   requirement: instruction ?? "Modify content.",
-//                   source: .init(
-//                       language: .plaintext,
-//                       documentURL: .init(fileURLWithPath: "/"),
-//                       projectRootURL: .init(fileURLWithPath: "/"),
-//                       content: prompt,
-//                       lines: prompt.breakLines(),
-//                       range: .outOfScope
-//                   ),
-//                   isDetached: true,
-//                   extraSystemPrompt: extraSystemPrompt,
-//                   generateDescriptionRequirement: false
-//               )
-//               var code = ""
-//               for try await (newCode, _) in result {
-//                   code = newCode
-//               }
-//               return code
-//           }
-//       }
-//    )
-// }()
-// #endif
-

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -1,12 +1,13 @@
 import AppKit
 import ChatService
 import ComposableArchitecture
+import CustomCommandTemplateProcessor
 import Foundation
 import GitHubCopilotService
 import LanguageServerProtocol
 import Logger
-import OpenAIService
 import ModificationBasic
+import OpenAIService
 import SuggestionBasic
 import SuggestionInjector
 import SuggestionWidget

Tool/Package.swift

@@ -53,6 +53,10 @@ let package = Package(
         .library(name: "CodeDiff", targets: ["CodeDiff"]),
         .library(name: "BuiltinExtension", targets: ["BuiltinExtension"]),
         .library(name: "BingSearchService", targets: ["BingSearchService"]),
+        .library(
+            name: "CustomCommandTemplateProcessor",
+            targets: ["CustomCommandTemplateProcessor"]
+        ),
     ],
     dependencies: [
         // A fork of https://github.com/aespinilla/Tiktoken to allow loading from local files.
@@ -129,6 +133,14 @@ let package = Package(
             )]
         ),
 
+        .target(
+            name: "CustomCommandTemplateProcessor",
+            dependencies: [
+                "XcodeInspector",
+                "SuggestionBasic",
+            ]
+        ),
+
         .target(name: "DebounceFunction"),
 
         .target(