Add new custom command one-time dialog

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -85,6 +85,14 @@ 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 {
+            return reply
+        }
+        return ""
+    }
 
     public func stopReceivingMessage() async {
         await pluginController.stopResponding()
@@ -175,8 +183,8 @@ public final class ChatService: ObservableObject {
                     sendingMessageImmediately: prompt,
                     name: command.name
                 )
-            case .promptToCode:
-                return nil
+            case .promptToCode: return nil
+            case .oneTimeDialog: return nil
             }
         }()
 

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 .oneTimeDialog: return false
                     }
                 },
                 id: \.name

Core/Sources/HostApp/CustomCommandView.swift

@@ -15,22 +15,6 @@ extension List {
 struct CustomCommandView: View {
     final class Settings: ObservableObject {
         @AppStorage(\.customCommands) var customCommands
-        var illegalNames: [String] {
-            let existed = customCommands.map(\.name)
-            let builtin: [String] = [
-                "Get Suggestions",
-                "Accept Suggestion",
-                "Reject Suggestion",
-                "Next Suggestion",
-                "Previous Suggestion",
-                "Real-time Suggestions",
-                "Prefetch Suggestions",
-                "Open Chat",
-                "Prompt to Code",
-            ]
-
-            return existed + builtin
-        }
 
         init(customCommands: AppStorage<[CustomCommand]>? = nil) {
             if let list = customCommands {
@@ -67,6 +51,8 @@ struct CustomCommandView: View {
                                     Text("Custom Chat")
                                 case .promptToCode:
                                     Text("Prompt to Code")
+                                case .oneTimeDialog:
+                                    Text("One-time Dialog")
                                 }
                             }
                             .font(.caption)
@@ -146,224 +132,6 @@ struct CustomCommandView: View {
     }
 }
 
-struct EditCustomCommandView: View {
-    @Environment(\.toast) var toast
-    @Binding var editingCommand: CustomCommandView.EditingCommand?
-    var settings: CustomCommandView.Settings
-    let originalName: String
-    @State var commandType: CommandType
-
-    @State var name: String
-    @State var prompt: String
-    @State var systemPrompt: String
-    @State var usePrompt: Bool
-    @State var continuousMode: Bool
-    @State var editingContentInFullScreen: Binding<String>?
-    @State var generatingPromptToCodeDescription: Bool
-
-    enum CommandType: Int, CaseIterable {
-        case chatWithSelection
-        case promptToCode
-        case customChat
-    }
-
-    init(
-        editingCommand: Binding<CustomCommandView.EditingCommand?>,
-        settings: CustomCommandView.Settings
-    ) {
-        _editingCommand = editingCommand
-        self.settings = settings
-        originalName = editingCommand.wrappedValue?.command.name ?? ""
-        name = originalName
-        switch editingCommand.wrappedValue?.command.feature {
-        case let .chatWithSelection(extraSystemPrompt, prompt, useExtraSystemPrompt):
-            commandType = .chatWithSelection
-            self.prompt = prompt ?? ""
-            systemPrompt = extraSystemPrompt ?? ""
-            usePrompt = useExtraSystemPrompt ?? true
-            continuousMode = false
-            generatingPromptToCodeDescription = true
-        case let .customChat(systemPrompt, prompt):
-            commandType = .customChat
-            self.systemPrompt = systemPrompt ?? ""
-            self.prompt = prompt ?? ""
-            usePrompt = false
-            continuousMode = false
-            generatingPromptToCodeDescription = true
-        case let .promptToCode(extraSystemPrompt, prompt, continuousMode, generateDescription):
-            commandType = .promptToCode
-            self.prompt = prompt ?? ""
-            systemPrompt = extraSystemPrompt ?? ""
-            usePrompt = false
-            self.continuousMode = continuousMode ?? false
-            generatingPromptToCodeDescription = generateDescription ?? true
-        case .none:
-            commandType = .chatWithSelection
-            prompt = ""
-            systemPrompt = ""
-            continuousMode = false
-            usePrompt = true
-            generatingPromptToCodeDescription = true
-        }
-    }
-
-    var body: some View {
-        ScrollView {
-            Form {
-                TextField("Name", text: $name)
-
-                Picker("Command Type", selection: $commandType) {
-                    ForEach(CommandType.allCases, id: \.rawValue) { commandType in
-                        Text({
-                            switch commandType {
-                            case .chatWithSelection:
-                                return "Send Message"
-                            case .promptToCode:
-                                return "Prompt to Code"
-                            case .customChat:
-                                return "Custom Chat"
-                            }
-                        }() as String).tag(commandType)
-                    }
-                }
-
-                switch commandType {
-                case .chatWithSelection:
-                    systemPromptTextField(title: "Extra System Prompt", hasToggle: true)
-                    promptTextField
-                case .promptToCode:
-                    continuousModeToggle
-                    generateDescriptionToggle
-                    systemPromptTextField(title: "Extra System Prompt", hasToggle: false)
-                    promptTextField
-                case .customChat:
-                    systemPromptTextField(hasToggle: false)
-                    promptTextField
-                }
-            }.padding()
-        }.safeAreaInset(edge: .bottom) {
-            VStack {
-                Divider()
-
-                VStack {
-                    Text(
-                        "After renaming or adding a custom command, please restart Xcode to refresh the menu."
-                    )
-                    .foregroundStyle(.secondary)
-
-                    HStack {
-                        Spacer()
-                        Button("Close") {
-                            editingCommand = nil
-                        }
-
-                        lazy var newCommand = CustomCommand(
-                            commandId: editingCommand?.command.id ?? UUID().uuidString,
-                            name: name,
-                            feature: {
-                                switch commandType {
-                                case .chatWithSelection:
-                                    return .chatWithSelection(
-                                        extraSystemPrompt: systemPrompt,
-                                        prompt: prompt,
-                                        useExtraSystemPrompt: usePrompt
-                                    )
-                                case .promptToCode:
-                                    return .promptToCode(
-                                        extraSystemPrompt: systemPrompt,
-                                        prompt: prompt,
-                                        continuousMode: continuousMode,
-                                        generateDescription: generatingPromptToCodeDescription
-                                    )
-                                case .customChat:
-                                    return .customChat(
-                                        systemPrompt: systemPrompt,
-                                        prompt: prompt
-                                    )
-                                }
-                            }()
-                        )
-
-                        if editingCommand?.isNew ?? true {
-                            Button("Add") {
-                                guard !settings.illegalNames.contains(newCommand.name) else {
-                                    toast(Text("Command name is illegal."), .error)
-                                    return
-                                }
-                                guard !newCommand.name.isEmpty else {
-                                    toast(Text("Command name cannot be empty."), .error)
-                                    return
-                                }
-                                settings.customCommands.append(newCommand)
-                                editingCommand?.isNew = false
-                                editingCommand?.command = newCommand
-
-                                toast(Text("The command is created."), .info)
-                            }
-                        } else {
-                            Button("Save") {
-                                guard !settings.illegalNames.contains(newCommand.name)
-                                    || newCommand.name == originalName
-                                else {
-                                    toast(Text("Command name is illegal."), .error)
-                                    return
-                                }
-                                guard !newCommand.name.isEmpty else {
-                                    toast(Text("Command name cannot be empty."), .error)
-                                    return
-                                }
-
-                                if let index = settings.customCommands.firstIndex(where: {
-                                    $0.id == newCommand.id
-                                }) {
-                                    settings.customCommands[index] = newCommand
-                                } else {
-                                    settings.customCommands.append(newCommand)
-                                }
-
-                                toast(Text("The command is updated."), .info)
-                            }
-                        }
-                    }
-                }
-                .padding(.horizontal)
-            }
-            .padding(.bottom)
-            .background(.regularMaterial)
-        }
-    }
-
-    @ViewBuilder
-    var promptTextField: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            Text("Prompt")
-            EditableText(text: $prompt)
-        }
-        .padding(.vertical, 4)
-    }
-
-    @ViewBuilder
-    func systemPromptTextField(title: String? = nil, hasToggle: Bool) -> some View {
-        VStack(alignment: .leading, spacing: 4) {
-            if hasToggle {
-                Toggle(title ?? "System Prompt", isOn: $usePrompt)
-            } else {
-                Text(title ?? "System Prompt")
-            }
-            EditableText(text: $systemPrompt)
-        }
-        .padding(.vertical, 4)
-    }
-
-    var continuousModeToggle: some View {
-        Toggle("Continuous Mode", isOn: $continuousMode)
-    }
-    
-    var generateDescriptionToggle: some View {
-        Toggle("Generate Description", isOn: $generatingPromptToCodeDescription)
-    }
-}
-
 // MARK: - Previews
 
 struct CustomCommandView_Preview: PreviewProvider {
@@ -403,25 +171,3 @@ struct CustomCommandView_Preview: PreviewProvider {
     }
 }
 
-struct EditCustomCommandView_Preview: PreviewProvider {
-    static var previews: some View {
-        EditCustomCommandView(
-            editingCommand: .constant(CustomCommandView.EditingCommand(
-                isNew: false,
-                command: .init(
-                    commandId: "4",
-                    name: "Explain Code",
-                    feature: .promptToCode(
-                        extraSystemPrompt: nil,
-                        prompt: "Hello",
-                        continuousMode: false,
-                        generateDescription: true
-                    )
-                )
-            )),
-            settings: .init(customCommands: .init(wrappedValue: [], "CustomCommandView_Preview"))
-        )
-        .frame(width: 800)
-    }
-}
-