[pull] main from intitni:main

ChatPlugins/Sources/ShortcutChatPlugin/ShortcutChatPlugin.swift

@@ -20,7 +20,36 @@ public final class ShortcutChatPlugin: ChatPlugin {
         terminal = Terminal()
     }
 
-    public func send(_ request: Request) async -> AsyncThrowingStream<Response, any Error> {
+    public func sendForTextResponse(_ request: Request) async
+        -> AsyncThrowingStream<String, any Error>
+    {
+        let stream = await sendForComplicatedResponse(request)
+        return .init { continuation in
+            let task = Task {
+                do {
+                    for try await response in stream {
+                        switch response {
+                        case let .content(.text(content)):
+                            continuation.yield(content)
+                        default:
+                            break
+                        }
+                    }
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
+                }
+            }
+
+            continuation.onTermination = { _ in
+                task.cancel()
+            }
+        }
+    }
+
+    public func sendForComplicatedResponse(_ request: Request) async
+        -> AsyncThrowingStream<Response, any Error>
+    {
         return .init { continuation in
             let task = Task {
                 let id = "\(Self.command)-\(UUID().uuidString)"

ChatPlugins/Sources/TerminalChatPlugin/TerminalChatPlugin.swift

@@ -9,7 +9,7 @@ public final class TerminalChatPlugin: ChatPlugin {
     public static var name: String { "Terminal" }
     public static var description: String { """
     Run the command in the message from terminal.
-    
+
     You can use environment variable `$FILE_PATH` and `$PROJECT_ROOT` to access the current file path and project root.
     """ }
 
@@ -23,41 +23,11 @@ public final class TerminalChatPlugin: ChatPlugin {
         terminal = Terminal()
     }
 
-    public func formatContent(_ content: Response.Content) -> Response.Content {
-        switch content {
-        case let .text(content):
-            return .text("""
-            ```sh
-            \(content)
-            ```
-            """)
-        }
-    }
-
-    public func send(_ request: Request) async -> AsyncThrowingStream<Response, any Error> {
+    public func getTextContent(from request: Request) async
+        -> AsyncStream<String>
+    {
         return .init { continuation in
             let task = Task {
-                var updateTime = Date()
-
-                func streamOutput(_ content: String) {
-                    defer { updateTime = Date() }
-                    if Date().timeIntervalSince(updateTime) > 60 * 2 {
-                        continuation.yield(.startNewMessage)
-                        continuation.yield(.startAction(
-                            id: "run",
-                            task: "Continue `\(request.text)`"
-                        ))
-                        continuation.yield(.finishAction(
-                            id: "run",
-                            result: .success("Executed.")
-                        ))
-                        continuation.yield(.content(.text("[continue]\n")))
-                        continuation.yield(.content(.text(content)))
-                    } else {
-                        continuation.yield(.content(.text(content)))
-                    }
-                }
-
                 do {
                     let fileURL = XcodeInspector.shared.realtimeActiveDocumentURL
                     let projectURL = XcodeInspector.shared.realtimeActiveProjectURL
@@ -75,34 +45,25 @@ public final class TerminalChatPlugin: ChatPlugin {
                     let env = ProcessInfo.processInfo.environment
                     let shell = env["SHELL"] ?? "/bin/bash"
 
-                    continuation.yield(.startAction(id: "run", task: "Run `\(request.text)`"))
-
                     let output = terminal.streamCommand(
                         shell,
                         arguments: ["-i", "-l", "-c", request.text],
                         currentDirectoryURL: projectURL,
                         environment: environment
                     )
 
-                    continuation.yield(.finishAction(
-                        id: "run",
-                        result: .success("Executed.")
-                    ))
-
+                    var accumulatedOutput = ""
                     for try await content in output {
                         try Task.checkCancellation()
-                        streamOutput(content)
+                        accumulatedOutput += content
+                        continuation.yield(accumulatedOutput)
                     }
                 } catch let error as Terminal.TerminationError {
-                    continuation.yield(.content(.text("""
-
-                    [error: \(error.reason)]
-                    """)))
+                    let errorMessage = "\n\n[error: \(error.reason)]"
+                    continuation.yield(errorMessage)
                 } catch {
-                    continuation.yield(.content(.text("""
-
-                    [error: \(error.localizedDescription)]
-                    """)))
+                    let errorMessage = "\n\n[error: \(error.localizedDescription)]"
+                    continuation.yield(errorMessage)
                 }
 
                 continuation.finish()
@@ -116,5 +77,89 @@ public final class TerminalChatPlugin: ChatPlugin {
             }
         }
     }
+
+    public func sendForTextResponse(_ request: Request) async
+        -> AsyncThrowingStream<String, any Error>
+    {
+        let stream = await getTextContent(from: request)
+        return .init { continuation in
+            let task = Task {
+                continuation.yield("Executing command: `\(request.text)`\n\n")
+                continuation.yield("```console\n")
+                for await text in stream {
+                    try Task.checkCancellation()
+                    continuation.yield(text)
+                }
+                continuation.yield("\n```\n")
+                continuation.finish()
+            }
+
+            continuation.onTermination = { _ in
+                task.cancel()
+            }
+        }
+    }
+
+    public func formatContent(_ content: Response.Content) -> Response.Content {
+        switch content {
+        case let .text(content):
+            return .text("""
+            ```console
+            \(content)
+            ```
+            """)
+        }
+    }
+
+    public func sendForComplicatedResponse(_ request: Request) async
+        -> AsyncThrowingStream<Response, any Error>
+    {
+        return .init { continuation in
+            let task = Task {
+                var updateTime = Date()
+
+                continuation.yield(.startAction(id: "run", task: "Run `\(request.text)`"))
+
+                let textStream = await getTextContent(from: request)
+                var previousOutput = ""
+
+                continuation.yield(.finishAction(
+                    id: "run",
+                    result: .success("Executed.")
+                ))
+
+                for await accumulatedOutput in textStream {
+                    try Task.checkCancellation()
+
+                    let newContent = accumulatedOutput.dropFirst(previousOutput.count)
+                    previousOutput = accumulatedOutput
+
+                    if !newContent.isEmpty {
+                        if Date().timeIntervalSince(updateTime) > 60 * 2 {
+                            continuation.yield(.startNewMessage)
+                            continuation.yield(.startAction(
+                                id: "run",
+                                task: "Continue `\(request.text)`"
+                            ))
+                            continuation.yield(.finishAction(
+                                id: "run",
+                                result: .success("Executed.")
+                            ))
+                            continuation.yield(.content(.text("[continue]\n")))
+                            updateTime = Date()
+                        }
+
+                        continuation.yield(.content(.text(String(newContent))))
+                    }
+                }
+
+                continuation.finish()
+            }
+
+            continuation.onTermination = { _ in
+                task.cancel()
+            }
+        }
+    }
 }
 

Core/Package.swift

@@ -64,8 +64,8 @@ let package = Package(
                 .product(name: "SuggestionBasic", package: "Tool"),
                 .product(name: "Logger", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
-            ].pro([
-                "ProClient",
+            ].proCore([
+                "LicenseManagement",
             ])
         ),
         .target(
@@ -348,7 +348,7 @@ extension [Target.Dependency] {
 extension [Package.Dependency] {
     var pro: [Package.Dependency] {
         if isProIncluded {
-            return self + [.package(path: "../../Pro")]
+            return self + [.package(path: "../../Pro"), .package(path: "../../Pro/ProCore")]
         }
         return self
     }

Core/Sources/ChatGPTChatTab/Views/ThemedMarkdownText.swift

@@ -71,7 +71,10 @@ extension MarkdownUI.Theme {
         }
         .codeBlock { configuration in
             let wrapCode = UserDefaults.shared.value(for: \.wrapCodeInChatCodeBlock)
-                || ["plaintext", "text", "markdown", "sh", "bash", "shell", "latex", "tex"]
+                || [
+                    "plaintext", "text", "markdown", "sh", "console", "bash", "shell", "latex",
+                    "tex"
+                ]
                 .contains(configuration.language)
 
             if wrapCode {

Core/Sources/ChatService/AllPlugins.swift

@@ -56,7 +56,7 @@ final class LegacyChatPluginWrapper<Plugin: ChatPlugin>: LegacyChatPlugin {
 
         let plugin = Plugin()
 
-        let stream = await plugin.send(.init(
+        let stream = await plugin.sendForComplicatedResponse(.init(
             text: content,
             arguments: [],
             history: chatGPTService.memory.history

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift

@@ -35,6 +35,7 @@ struct ChatModelEdit {
         var openAICompatibleSupportsMultipartMessageContent = true
         var requiresBeginWithUserMessage = false
         var customBody: String = ""
+        var supportsImages: Bool = true
     }
 
     enum Action: Equatable, BindableAction {
@@ -290,7 +291,9 @@ extension ChatModel {
                         return state.supportsFunctionCalling
                     }
                 }(),
-                modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
+                supportsImage: state.supportsImages,
+                modelName: state.modelName
+                    .trimmingCharacters(in: .whitespacesAndNewlines),
                 openAIInfo: .init(
                     organizationID: state.openAIOrganizationID,
                     projectID: state.openAIProjectID
@@ -331,7 +334,8 @@ extension ChatModel {
             openAICompatibleSupportsMultipartMessageContent: info.openAICompatibleInfo
                 .supportsMultipartMessageContent,
             requiresBeginWithUserMessage: info.openAICompatibleInfo.requiresBeginWithUserMessage,
-            customBody: info.customBodyInfo.jsonBody
+            customBody: info.customBodyInfo.jsonBody,
+            supportsImages: info.supportsImage
         )
     }
 }

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -358,6 +358,10 @@ struct ChatModelEditView: View {
                 TextField(text: $store.openAIProjectID, prompt: Text("Optional")) {
                     Text("Project ID")
                 }
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
@@ -386,6 +390,10 @@ struct ChatModelEditView: View {
 
                 MaxTokensTextField(store: store)
                 SupportsFunctionCallingToggle(store: store)
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
             }
         }
     }
@@ -435,6 +443,10 @@ struct ChatModelEditView: View {
                 Toggle(isOn: $store.requiresBeginWithUserMessage) {
                     Text("Requires the first message to be from the user")
                 }
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
             }
         }
     }
@@ -473,6 +485,10 @@ struct ChatModelEditView: View {
                 MaxTokensTextField(store: store)
 
                 TextField("API Version", text: $store.apiVersion, prompt: Text("v1"))
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
             }
         }
     }
@@ -496,6 +512,10 @@ struct ChatModelEditView: View {
                     Text("Keep Alive")
                 }
 
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
+
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
                         " For more details, please visit [https://ollama.com](https://ollama.com)."
@@ -539,6 +559,10 @@ struct ChatModelEditView: View {
                     }
 
                 MaxTokensTextField(store: store)
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
@@ -572,6 +596,10 @@ struct ChatModelEditView: View {
                 Toggle(isOn: $store.openAICompatibleSupportsMultipartMessageContent) {
                     Text("Support multi-part message content")
                 }
+
+                Toggle(isOn: $store.supportsImages) {
+                    Text("Supports Images")
+                }
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(

Core/Sources/HostApp/FeatureSettings/Suggestion/SuggestionFeatureDisabledLanguageListView.swift

@@ -74,7 +74,7 @@ struct SuggestionFeatureDisabledLanguageListView: View {
                 if settings.suggestionFeatureDisabledLanguageList.isEmpty {
                     Text("""
                     Empty
-                    Disable the language of a file by right clicking the circular widget.
+                    Disable the language of a file by right clicking the indicator widget.
                     """)
                     .multilineTextAlignment(.center)
                     .padding()

Core/Sources/HostApp/FeatureSettings/Suggestion/SuggestionFeatureEnabledProjectListView.swift

@@ -82,7 +82,7 @@ struct SuggestionFeatureEnabledProjectListView: View {
                     Text("""
                     Empty
                     Add project with "+" button
-                    Or right clicking the circular widget
+                    Or right clicking the indicator widget
                     """)
                     .multilineTextAlignment(.center)
                 }