Update ChatAgentResponse

Author: intitni

ChatPlugins/Sources/ShortcutChatPlugin/ShortcutChatPlugin.swift

@@ -62,14 +62,21 @@ public final class ShortcutChatPlugin: ChatPlugin {
                         task: "Run shortcut \(shortcutName)"
                     ))
 
-                    let result = try await terminal.runCommand(
-                        shell,
-                        arguments: ["-i", "-l", "-c", command],
-                        currentDirectoryURL: nil,
-                        environment: [:]
-                    )
-
-                    continuation.yield(.finishAction(id: "run", result: result))
+                    do {
+                        let result = try await terminal.runCommand(
+                            shell,
+                            arguments: ["-i", "-l", "-c", command],
+                            currentDirectoryURL: nil,
+                            environment: [:]
+                        )
+                        continuation.yield(.finishAction(id: "run", result: .success(result)))
+                    } catch {
+                        continuation.yield(.finishAction(
+                            id: "run",
+                            result: .failure(error.localizedDescription)
+                        ))
+                        throw error
+                    }
 
                     await Task.yield()
                     try Task.checkCancellation()

ChatPlugins/Sources/TerminalChatPlugin/TerminalChatPlugin.swift

@@ -42,7 +42,10 @@ public final class TerminalChatPlugin: ChatPlugin {
                             id: "run",
                             task: "Continue `\(request.text)`"
                         ))
-                        continuation.yield(.finishAction(id: "run", result: "Printing output..."))
+                        continuation.yield(.finishAction(
+                            id: "run",
+                            result: .success("Printing output...")
+                        ))
                         continuation.yield(.content(.text("[continue]\n")))
                         continuation.yield(.content(.text(content)))
                     } else {
@@ -76,7 +79,10 @@ public final class TerminalChatPlugin: ChatPlugin {
                         environment: environment
                     )
 
-                    continuation.yield(.finishAction(id: "run", result: "Printing output..."))
+                    continuation.yield(.finishAction(
+                        id: "run",
+                        result: .success("Printing output...")
+                    ))
 
                     for try await content in output {
                         try Task.checkCancellation()

Tool/Package.swift

@@ -355,6 +355,8 @@ let package = Package(
             dependencies: [
                 "XcodeInspector",
                 "Preferences",
+                "ChatBasic",
+                "ModificationBasic",
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),

Tool/Sources/ChatBasic/ChatAgent.swift

@@ -4,6 +4,11 @@ public enum ChatAgentResponse {
     public enum Content {
         case text(String)
     }
+    
+    public enum ActionResult {
+        case success(String)
+        case failure(String)
+    }
 
     /// Post the status of the current message.
     case status([String])
@@ -14,7 +19,7 @@ public enum ChatAgentResponse {
     /// start a new action.
     case startAction(id: String, task: String)
     /// Finish the current action.
-    case finishAction(id: String, result: String)
+    case finishAction(id: String, result: ActionResult)
     /// Update the references of the current message.
     case references([ChatMessage.Reference])
     /// End the current message. The next contents will be sent as a new message.