Merge branch 'feature/widget-refactor' into develop

Author: intitni

Copilot for Xcode.xcodeproj/xcshareddata/xcschemes/Copilot for Xcode Debug.xcscheme

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C8189B152938972F00C9DCDA"
+               BuildableName = "Copilot for Xcode.app"
+               BlueprintName = "Copilot for Xcode"
+               ReferencedContainer = "container:Copilot for Xcode.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:TestPlan.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C8189B152938972F00C9DCDA"
+            BuildableName = "Copilot for Xcode.app"
+            BlueprintName = "Copilot for Xcode"
+            ReferencedContainer = "container:Copilot for Xcode.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-_NS_4445425547 YES"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C8189B152938972F00C9DCDA"
+            BuildableName = "Copilot for Xcode.app"
+            BlueprintName = "Copilot for Xcode"
+            ReferencedContainer = "container:Copilot for Xcode.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Debug"
+      customArchiveName = "Copilot for Xcode Debug"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Core/Package.swift

@@ -86,6 +86,7 @@ let package = Package(
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
+                .product(name: "PromptToCode", package: "Tool"),
                 .product(name: "ChatTab", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
@@ -152,6 +153,7 @@ let package = Package(
         .target(
             name: "PromptToCodeService",
             dependencies: [
+                .product(name: "PromptToCode", package: "Tool"),
                 .product(name: "FocusedCodeFinder", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
@@ -219,6 +221,7 @@ let package = Package(
             dependencies: [
                 "PromptToCodeService",
                 "ChatGPTChatTab",
+                .product(name: "PromptToCode", package: "Tool"),
                 .product(name: "Toast", package: "Tool"),
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "SharedUIComponents", package: "Tool"),

Core/Sources/ChatGPTChatTab/Views/ThemedMarkdownText.swift

@@ -15,9 +15,9 @@ struct ThemedMarkdownText: View {
     let content: MarkdownContent
 
     init(_ text: String) {
-        self.content = .init(text)
+        content = .init(text)
     }
-    
+
     init(_ content: MarkdownContent) {
         self.content = content
     }
@@ -71,6 +71,8 @@ extension MarkdownUI.Theme {
         }
         .codeBlock { configuration in
             let wrapCode = UserDefaults.shared.value(for: \.wrapCodeInChatCodeBlock)
+                || ["plaintext", "text", "markdown", "sh", "bash", "shell", "latex", "tex"]
+                .contains(configuration.language)
 
             if wrapCode {
                 AsyncCodeBlockView(

Core/Sources/ChatPlugin/AskChatGPT.swift

@@ -12,7 +12,8 @@ public func askChatGPT(
     let memory = AutoManagedChatGPTMemory(
         systemPrompt: systemPrompt,
         configuration: configuration,
-        functionProvider: NoChatGPTFunctionProvider()
+        functionProvider: NoChatGPTFunctionProvider(), 
+        maxNumberOfMessages: .max
     )
     let service = LegacyChatGPTService(
         memory: memory,

Core/Sources/ChatPlugin/CallAIFunction.swift

@@ -22,7 +22,8 @@ func callAIFunction(
         memory: AutoManagedChatGPTMemory(
             systemPrompt: "You are now the following python function: ```# \(description)\n\(function)```\n\nOnly respond with your `return` value.",
             configuration: configuration,
-            functionProvider: NoChatGPTFunctionProvider()
+            functionProvider: NoChatGPTFunctionProvider(),
+            maxNumberOfMessages: .max
         ),
         configuration: configuration
     )

Core/Sources/ChatService/ContextAwareAutoManagedChatGPTMemory.swift

@@ -22,7 +22,8 @@ public final class ContextAwareAutoManagedChatGPTMemory: ChatGPTMemory {
         memory = AutoManagedChatGPTMemory(
             systemPrompt: "",
             configuration: configuration,
-            functionProvider: functionProvider
+            functionProvider: functionProvider,
+            maxNumberOfMessages: UserDefaults.shared.value(for: \.chatGPTMaxMessageCount)
         )
         contextController = DynamicContextController(
             memory: memory,

Core/Sources/HostApp/CustomCommandSettings/CustomCommandView.swift

@@ -149,7 +149,7 @@ struct CustomCommandView: View {
                             case .customChat:
                                 Text("Custom Chat")
                             case .promptToCode:
-                                Text("Prompt to Code")
+                                Text("Modification")
                             case .singleRoundDialog:
                                 Text("Single Round Dialog")
                             }
@@ -201,7 +201,7 @@ struct CustomCommandView: View {
                                 "This command sends a message to the active chat tab. You can provide additional context through the \"Extra System Prompt\" as well."
                             )
                         }
-                        SubSection(title: Text("Prompt to Code")) {
+                        SubSection(title: Text("Modification")) {
                             Text(
                                 "This command opens the prompt-to-code panel and executes the provided requirements on the selected code. You can provide additional context through the \"Extra Context\" as well."
                             )

Core/Sources/HostApp/CustomCommandSettings/EditCustomCommandView.swift

@@ -37,7 +37,7 @@ struct EditCustomCommandView: View {
                         case .sendMessage:
                             return "Send Message"
                         case .promptToCode:
-                            return "Prompt to Code"
+                            return "Modification"
                         case .customChat:
                             return "Custom Chat"
                         case .singleRoundDialog:

Core/Sources/HostApp/FeatureSettingsView.swift

@@ -26,8 +26,8 @@ struct FeatureSettingsView: View {
             }
             .sidebarItem(
                 tag: 2,
-                title: "Prompt to Code",
-                subtitle: "Write code with natural language",
+                title: "Modification",
+                subtitle: "Write or modify code with natural language",
                 image: "paintbrush"
             )
 

Core/Sources/HostApp/ServiceView.swift

@@ -33,7 +33,7 @@ struct ServiceView: View {
                     )).sidebarItem(
                         tag: 2,
                         title: "Chat Models",
-                        subtitle: "Chat, Prompt to Code",
+                        subtitle: "Chat, Modification",
                         image: "globe"
                     )
 
@@ -43,7 +43,7 @@ struct ServiceView: View {
                     )).sidebarItem(
                         tag: 3,
                         title: "Embedding Models",
-                        subtitle: "Chat, Prompt to Code",
+                        subtitle: "Chat, Modification",
                         image: "globe"
                     )