[pull] main from intitni:main

Core/Sources/ChatService/ChatService.swift

@@ -4,23 +4,13 @@ import Combine
 import Foundation
 import OpenAIService
 
-let defaultSystemPrompt = """
-You are an AI programming assistant.
-Your reply should be concise, clear, informative and logical.
-You MUST reply in the format of markdown.
-You MUST embed every code you provide in a markdown code block.
-You MUST add the programming language name at the start of the markdown code block.
-If you are asked to help perform a task, you MUST think step-by-step, then describe each step concisely.
-If you are asked to explain code, you MUST explain it step-by-step in a ordered list.
-Make your answer short and structured.
-"""
-
 public final class ChatService: ObservableObject {
     public let chatGPTService: any ChatGPTServiceType
     let pluginController: ChatPluginController
     let contextController: DynamicContextController
     var cancellable = Set<AnyCancellable>()
-    @Published public internal(set) var systemPrompt = defaultSystemPrompt
+    @Published public internal(set) var systemPrompt = UserDefaults.shared
+        .value(for: \.defaultChatSystemPrompt)
     @Published public internal(set) var extraSystemPrompt = ""
 
     public init<T: ChatGPTServiceType>(chatGPTService: T) {
@@ -58,7 +48,7 @@ public final class ChatService: ObservableObject {
     }
 
     public func resetPrompt() async {
-        systemPrompt = defaultSystemPrompt
+        systemPrompt = UserDefaults.shared.value(for: \.defaultChatSystemPrompt)
         extraSystemPrompt = ""
     }
 
@@ -89,7 +79,7 @@ public final class ChatService: ObservableObject {
 
     /// Setting it to `nil` to reset the system prompt
     public func mutateSystemPrompt(_ newPrompt: String?) {
-        systemPrompt = newPrompt ?? defaultSystemPrompt
+        systemPrompt = newPrompt ?? UserDefaults.shared.value(for: \.defaultChatSystemPrompt)
     }
 
     public func mutateExtraSystemPrompt(_ newPrompt: String) {

Core/Sources/HostApp/CustomCommandView.swift

@@ -330,42 +330,14 @@ struct EditCustomCommandView: View {
             }
             .padding(.bottom)
             .background(.regularMaterial)
-            .sheet(isPresented: .init(get: { editingContentInFullScreen != nil }, set: {
-                if $0 == false {
-                    editingContentInFullScreen = nil
-                }
-            }), content: {
-                VStack {
-                    if let editingContentInFullScreen {
-                        TextEditor(text: editingContentInFullScreen)
-                            .font(Font.system(.body, design: .monospaced))
-                            .padding(4)
-                            .frame(minHeight: 120)
-                            .multilineTextAlignment(.leading)
-                            .overlay(
-                                RoundedRectangle(cornerRadius: 4)
-                                    .stroke(Color(nsColor: .separatorColor), lineWidth: 1)
-                            )
-                    }
-
-                    Button(action: {
-                        editingContentInFullScreen = nil
-                    }) {
-                        Text("Done")
-                    }
-                }
-                .padding()
-                .frame(width: 600, height: 500)
-                .background(Color(nsColor: .windowBackgroundColor))
-            })
         }
     }
 
     @ViewBuilder
     var promptTextField: some View {
         VStack(alignment: .leading, spacing: 4) {
             Text("Prompt")
-            editableText($prompt)
+            EditableText(text: $prompt)
         }
         .padding(.vertical, 4)
     }
@@ -378,7 +350,7 @@ struct EditCustomCommandView: View {
             } else {
                 Text(title ?? "System Prompt")
             }
-            editableText($systemPrompt)
+            EditableText(text: $systemPrompt)
         }
         .padding(.vertical, 4)
     }
@@ -390,38 +362,6 @@ struct EditCustomCommandView: View {
     var generateDescriptionToggle: some View {
         Toggle("Generate Description", isOn: $generatingPromptToCodeDescription)
     }
-
-    func editableText(_ binding: Binding<String>) -> some View {
-        Button(action: {
-            editingContentInFullScreen = binding
-        }) {
-            HStack(alignment: .top) {
-                Text(binding.wrappedValue)
-                    .font(Font.system(.body, design: .monospaced))
-                    .padding(4)
-                    .multilineTextAlignment(.leading)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .background {
-                        RoundedRectangle(cornerRadius: 4)
-                            .fill(Color(nsColor: .textBackgroundColor))
-                    }
-                    .overlay {
-                        RoundedRectangle(cornerRadius: 4)
-                            .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
-                    }
-                Image(systemName: "square.and.pencil")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 14)
-                    .padding(4)
-                    .background(
-                        Color.primary.opacity(0.1),
-                        in: RoundedRectangle(cornerRadius: 4)
-                    )
-            }
-        }
-        .buttonStyle(.plain)
-    }
 }
 
 // MARK: - Previews

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -19,6 +19,7 @@ struct ChatSettingsView: View {
 
         @AppStorage(\.chatFeatureProvider) var chatFeatureProvider
         @AppStorage(\.chatGPTModel) var chatGPTModel
+        @AppStorage(\.defaultChatSystemPrompt) var defaultChatSystemPrompt
 
         init() {}
     }
@@ -122,6 +123,13 @@ struct ChatSettingsView: View {
                 Text("9 Messages").tag(9)
                 Text("11 Messages").tag(11)
             }
+
+            VStack(alignment: .leading, spacing: 4) {
+                Text("Default System Prompt")
+                EditableText(text: $settings.defaultChatSystemPrompt)
+                    .lineLimit(6)
+            }
+            .padding(.vertical, 4)
         }.onAppear {
             checkMaxToken()
         }.onChange(of: settings.chatFeatureProvider) { _ in

Core/Sources/HostApp/SharedComponents/EditableText.swift

@@ -0,0 +1,62 @@
+import Foundation
+import SwiftUI
+
+struct EditableText: View {
+    var text: Binding<String>
+    @State var isEditing: Bool = false
+
+    var body: some View {
+        Button(action: {
+            isEditing = true
+        }) {
+            HStack(alignment: .top) {
+                Text(text.wrappedValue)
+                    .font(Font.system(.body, design: .monospaced))
+                    .padding(4)
+                    .multilineTextAlignment(.leading)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .background {
+                        RoundedRectangle(cornerRadius: 4)
+                            .fill(Color(nsColor: .textBackgroundColor))
+                    }
+                    .overlay {
+                        RoundedRectangle(cornerRadius: 4)
+                            .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
+                    }
+                Image(systemName: "square.and.pencil")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 14)
+                    .padding(4)
+                    .background(
+                        Color.primary.opacity(0.1),
+                        in: RoundedRectangle(cornerRadius: 4)
+                    )
+            }
+        }
+        .buttonStyle(.plain)
+        .sheet(isPresented: $isEditing) {
+            VStack {
+                TextEditor(text: text)
+                    .font(Font.system(.body, design: .monospaced))
+                    .padding(4)
+                    .frame(minHeight: 120)
+                    .multilineTextAlignment(.leading)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 4)
+                            .stroke(Color(nsColor: .separatorColor), lineWidth: 1)
+                    )
+
+                Button(action: {
+                    isEditing = false
+                }) {
+                    Text("Done")
+                }
+            }
+            .padding()
+            .frame(width: 600, height: 500)
+            .background(Color(nsColor: .windowBackgroundColor))
+        }
+    }
+}
+

Tool/Sources/Preferences/Keys.swift

@@ -105,11 +105,11 @@ public extension UserDefaultPreferenceKeys {
     var azureOpenAIAPIKey: PreferenceKey<String> {
         .init(defaultValue: "", key: "AzureOpenAIAPIKey")
     }
-    
+
     var azureOpenAIBaseURL: PreferenceKey<String> {
         .init(defaultValue: "", key: "AzureOpenAIBaseURL")
     }
-    
+
     var azureChatGPTDeployment: PreferenceKey<String> {
         .init(defaultValue: "", key: "AzureChatGPTDeployment")
     }
@@ -205,7 +205,7 @@ public extension UserDefaultPreferenceKeys {
     var chatFeatureProvider: PreferenceKey<ChatFeatureProvider> {
         .init(defaultValue: .openAI, key: "ChatFeatureProvider")
     }
-    
+
     var chatFontSize: PreferenceKey<Double> {
         .init(defaultValue: 12, key: "ChatFontSize")
     }
@@ -225,10 +225,26 @@ public extension UserDefaultPreferenceKeys {
     var maxEmbeddableFileInChatContextLineCount: PreferenceKey<Int> {
         .init(defaultValue: 100, key: "MaxEmbeddableFileInChatContextLineCount")
     }
-    
+
     var useSelectionScopeByDefaultInChatContext: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "UseSelectionScopeByDefaultInChatContext")
     }
+
+    var defaultChatSystemPrompt: PreferenceKey<String> {
+        .init(
+            defaultValue: """
+            You are an AI programming assistant.
+            Your reply should be concise, clear, informative and logical.
+            You MUST reply in the format of markdown.
+            You MUST embed every code you provide in a markdown code block.
+            You MUST add the programming language name at the start of the markdown code block.
+            If you are asked to help perform a task, you MUST think step-by-step, then describe each step concisely.
+            If you are asked to explain code, you MUST explain it step-by-step in a ordered list.
+            Make your answer short and structured.
+            """,
+            key: "DefaultChatSystemPrompt"
+        )
+    }
 }
 
 // MARK: - Custom Commands