Add extra system prompt to prompt to code custom command

Author: intitni

Copilot for Xcode/CustomCommandView.swift

@@ -176,10 +176,10 @@ struct EditCustomCommandView: View {
             self.systemPrompt = systemPrompt ?? ""
             self.prompt = prompt ?? ""
             continuousMode = false
-        case let .promptToCode(prompt, continuousMode):
+        case let .promptToCode(extraSystemPrompt, prompt, continuousMode):
             commandType = .promptToCode
             self.prompt = prompt ?? ""
-            systemPrompt = ""
+            systemPrompt = extraSystemPrompt ?? ""
             self.continuousMode = continuousMode ?? false
         case .none:
             commandType = .chatWithSelection
@@ -214,6 +214,7 @@ struct EditCustomCommandView: View {
                     systemPromptTextField(title: "Extra System Prompt")
                     promptTextField
                 case .promptToCode:
+                    systemPromptTextField(title: "Extra System Prompt")
                     promptTextField
                     continuousModeToggle
                 case .customChat:
@@ -244,7 +245,11 @@ struct EditCustomCommandView: View {
                                 prompt: prompt
                             )
                         case .promptToCode:
-                            return .promptToCode(prompt: prompt, continuousMode: continuousMode)
+                            return .promptToCode(
+                                extraSystemPrompt: systemPrompt,
+                                prompt: prompt,
+                                continuousMode: continuousMode
+                            )
                         case .customChat:
                             return .customChat(systemPrompt: systemPrompt, prompt: prompt)
                         }
@@ -335,7 +340,11 @@ struct CustomCommandView_Preview: PreviewProvider {
                 ),
                 .init(
                     name: "Refactor Code",
-                    feature: .promptToCode(prompt: "Refactor", continuousMode: false)
+                    feature: .promptToCode(
+                        extraSystemPrompt: nil,
+                        prompt: "Refactor",
+                        continuousMode: false
+                    )
                 ),
                 .init(
                     name: "Tell Me A Joke",

Core/Sources/Preferences/CustomCommand.swift

@@ -5,7 +5,7 @@ public struct CustomCommand: Codable {
     ///
     /// Keep everything optional so nothing will break when the format changes.
     public enum Feature: Codable {
-        case promptToCode(prompt: String?, continuousMode: Bool?)
+        case promptToCode(extraSystemPrompt: String?, prompt: String?, continuousMode: Bool?)
         case chatWithSelection(extraSystemPrompt: String?, prompt: String?)
         case customChat(systemPrompt: String?, prompt: String?)
     }

Core/Sources/Preferences/Keys.swift

@@ -236,6 +236,7 @@ public extension UserDefaultPreferenceKeys {
             .init(
                 name: "Add Documentation to Selection",
                 feature: .promptToCode(
+                    extraSystemPrompt: nil,
                     prompt: "Add documentation on top of the code. Use triple slash if the language supports it.",
                     continuousMode: false
                 )

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -293,7 +293,7 @@ extension WindowBaseCommandHandler {
                 extraSystemPrompt: nil,
                 sendingMessageImmediately: prompt
             )
-        case let .promptToCode(prompt, continuousMode):
+        case let .promptToCode(_, prompt, continuousMode):
             try await presentPromptToCode(
                 editor: editor,
                 prompt: prompt,