Merge branch 'feature/improve-prompt-for-chat' into develop

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -2,12 +2,12 @@ import CopilotModel
 import CopilotService
 import Environment
 import Foundation
+import LanguageServerProtocol
 import Logger
 import OpenAIService
 import SuggestionInjector
 import SuggestionWidget
 import XPCShared
-import LanguageServerProtocol
 
 @ServiceActor
 struct WindowBaseCommandHandler: SuggestionCommandHandler {
@@ -176,7 +176,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         }
         return nil
     }
-    
+
     func prepareCache(editor: EditorContent) async throws -> UpdatedContent? {
         let fileURL = try await Environment.fetchCurrentFileURL()
         let (_, filespace) = try await Workspace
@@ -211,12 +211,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         let endpoint = UserDefaults.shared.value(for: \.chatGPTEndpoint)
         let model = UserDefaults.shared.value(for: \.chatGPTModel)
         let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
+        let codeLanguage = languageIdentifierFromFileURL(fileURL)
         guard let selection = editor.selections.last else { return }
 
         let service = ChatGPTService(
             systemPrompt: """
-            You are a code explanation engine, you can only explain the code concisely, do not interpret or translate it
-            Reply in \(language.isEmpty ? "" : "in \(language)")
+            \(language.isEmpty ? "" : "You must always reply in \(language)")
+            You are a code explanation engine, you can only explain the code concisely, do not interpret or translate it.
             """,
             apiKey: UserDefaults.shared.value(for: \.openAIAPIKey),
             endpoint: endpoint.isEmpty ? nil : endpoint,
@@ -228,7 +229,11 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         let code = editor.selectedCode(in: selection)
         Task {
             try? await service.send(
-                content: removeContinuousSpaces(from: code),
+                content: """
+                ```\(codeLanguage?.rawValue ?? "")
+                \(removeContinuousSpaces(from: code))
+                ```
+                """,
                 summary: "Explain selected code from `\(selection.start.line + 1):\(selection.start.character + 1)` to `\(selection.end.line + 1):\(selection.end.character + 1)`."
             )
         }
@@ -255,6 +260,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         let endpoint = UserDefaults.shared.value(for: \.chatGPTEndpoint)
         let model = UserDefaults.shared.value(for: \.chatGPTModel)
         let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
+        let codeLanguage = languageIdentifierFromFileURL(fileURL)
 
         let code = {
             guard let selection = editor.selections.last,
@@ -265,16 +271,14 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         let prompt = {
             if code.isEmpty {
                 return """
-                You are a senior programmer, you will answer my questions concisely \(
-                    language.isEmpty ? "" : "in \(language)"
-                )
+                \(language.isEmpty ? "" : "You must always reply in \(language)")
+                You are a senior programmer, you will answer my questions concisely. If you are replying with code, embed the code in a code block in markdown.
                 """
             }
             return """
-            You are a senior programmer, you will answer my questions concisely in \(
-                language.isEmpty ? "" : "in \(language)"
-            ) about the code
-            ```
+            \(language.isEmpty ? "" : "You must always reply in \(language)")
+            You are a senior programmer, you will answer my questions concisely about the code below, or modify it according to my requests. When you receive a modification request, reply with the modified code in a code block.
+            ```\(codeLanguage?.rawValue ?? "")
             \(removeContinuousSpaces(from: code))
             ```
             """

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -76,7 +76,6 @@ struct ChatPanelMessages: View {
                     }
                     .buttonStyle(.plain)
                     .xcodeStyleFrame()
-                    .matchedGeometryEffect(id: "input", in: inputAreaNamespace)
                     .scaleEffect(x: -1, y: 1, anchor: .center)
                 }
 
@@ -165,6 +164,7 @@ struct ChatPanelInputArea: View {
             .lineLimit(3)
             .multilineTextAlignment(.leading)
             .textFieldStyle(.plain)
+            .frame(maxWidth: .infinity)
             .padding(8)
             .background(
                 .regularMaterial,
@@ -176,7 +176,6 @@ struct ChatPanelInputArea: View {
                 chat.send(typedMessage)
                 typedMessage = ""
             }
-            .matchedGeometryEffect(id: "input", in: inputAreaNamespace)
 
             Button(action: {
                 if typedMessage.isEmpty { return }