Update single round dialog to support template

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -85,7 +85,7 @@ public final class ChatService: ObservableObject {
             isReceivingMessage = false
         }
     }
-    
+
     public func sendAndWait(content: String) async throws -> String {
         try await send(content: content)
         if let reply = await memory.history.last(where: { $0.role == .assistant })?.content {
@@ -215,5 +215,21 @@ public final class ChatService: ObservableObject {
             try await send(content: templateProcessor.process(sendingMessageImmediately))
         }
     }
+
+    public func handleSingleRoundDialogCommand(
+        systemPrompt: String?,
+        overwriteSystemPrompt: Bool,
+        prompt: String
+    ) async throws -> String {
+        let templateProcessor = CustomCommandTemplateProcessor()
+        if let systemPrompt {
+            if overwriteSystemPrompt {
+                mutateSystemPrompt(templateProcessor.process(systemPrompt))
+            } else {
+                mutateExtraSystemPrompt(templateProcessor.process(systemPrompt))
+            }
+        }
+        return try await sendAndWait(content: templateProcessor.process(prompt))
+    }
 }
 

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -400,16 +400,12 @@ extension WindowBaseCommandHandler {
 
         let service = ChatService()
 
-        if let systemPrompt {
-            if overwriteSystemPrompt {
-                service.mutateSystemPrompt(systemPrompt)
-            } else {
-                service.mutateExtraSystemPrompt(systemPrompt)
-            }
-        }
+        let result = try await service.handleSingleRoundDialogCommand(
+            systemPrompt: systemPrompt,
+            overwriteSystemPrompt: overwriteSystemPrompt,
+            prompt: prompt
+        )
 
-        let result = try await service.sendAndWait(content: prompt)
-        
         guard receiveReplyInNotification else { return }
 
         let granted = try await UNUserNotificationCenter.current()

Tool/Sources/Preferences/Types/CustomCommand.swift

@@ -41,6 +41,18 @@ public struct CustomCommand: Codable, Equatable {
         self.feature = feature
     }
 
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        commandId = try container.decodeIfPresent(String.self, forKey: .commandId)
+        name = try container.decode(String.self, forKey: .name)
+        feature = (try? container
+            .decode(CustomCommand.Feature.self, forKey: .feature)) ?? .chatWithSelection(
+                extraSystemPrompt: "",
+                prompt: "",
+                useExtraSystemPrompt: false
+            )
+    }
+
     var legacyId: String {
         name.sha1HexString
     }