Merge branch 'feature/custom-command-one-time-conversation' into develop

Author: intitni

Core/Package.swift

@@ -128,8 +128,10 @@ let package = Package(
                 "CodeiumService",
                 "SuggestionModel",
                 "LaunchAgentManager",
+                .product(name: "MarkdownUI", package: "swift-markdown-ui"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),
 

Core/Sources/ChatService/ChatService.swift

@@ -86,6 +86,14 @@ public final class ChatService: ObservableObject {
         }
     }
 
+    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 {
+            return reply
+        }
+        return ""
+    }
+
     public func stopReceivingMessage() async {
         await pluginController.stopResponding()
         await chatGPTService.stopReceivingMessage()
@@ -175,8 +183,8 @@ public final class ChatService: ObservableObject {
                     sendingMessageImmediately: prompt,
                     name: command.name
                 )
-            case .promptToCode:
-                return nil
+            case .promptToCode: return nil
+            case .singleRoundDialog: return nil
             }
         }()
 
@@ -207,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/ChatTab/ChatGPT/ChatPanel.swift

@@ -463,6 +463,7 @@ struct ChatContextMenu: View {
                     switch $0.feature {
                     case .chatWithSelection, .customChat: return true
                     case .promptToCode: return false
+                    case .singleRoundDialog: return false
                     }
                 },
                 id: \.name

Core/Sources/HostApp/CustomCommandSettings/CustomCommand.swift

@@ -0,0 +1,49 @@
+import ComposableArchitecture
+import Foundation
+import Preferences
+import SwiftUI
+
+struct CustomCommandFeature: ReducerProtocol {
+    struct State: Equatable {
+        var editCustomCommand: EditCustomCommand.State?
+    }
+    
+    let settings: CustomCommandView.Settings
+    let toast: (Text, ToastType) -> Void
+    
+    enum Action: Equatable {
+        case createNewCommand
+        case editCommand(CustomCommand)
+        case editCustomCommand(EditCustomCommand.Action)
+        case deleteCommand(CustomCommand)
+    }
+    
+    var body: some ReducerProtocol<State, Action> {
+        Reduce { state, action in
+            switch action {
+            case .createNewCommand:
+                state.editCustomCommand = EditCustomCommand.State(nil)
+                return .none
+            case let .editCommand(command):
+                state.editCustomCommand = EditCustomCommand.State(command)
+                return .none
+            case .editCustomCommand(.close):
+                state.editCustomCommand = nil
+                return .none
+            case let .deleteCommand(command):
+                settings.customCommands.removeAll(
+                    where: { $0.id == command.id }
+                )
+                if state.editCustomCommand?.commandId == command.id {
+                    state.editCustomCommand = nil
+                }
+                return .none
+            case .editCustomCommand:
+                return .none
+                
+            }
+        }.ifLet(\.editCustomCommand, action: /Action.editCustomCommand) {
+            EditCustomCommand(settings: settings, toast: toast)
+        }
+    }
+}