Merge pull request aws#6864 from tsmithsz/feature/agentic-chat

feat(chat): Stream executeBash output to chat

Author: mr-lee

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -88,6 +88,7 @@ import { FsRead, FsReadParams } from '../../tools/fsRead'
 import { InvokeOutput, OutputKind } from '../../tools/toolShared'
 import { FsWrite, FsWriteCommand } from '../../tools/fsWrite'
 import { ExecuteBash, ExecuteBashParams } from '../../tools/executeBash'
+import { ChatStream } from '../../tools/chatStream'
 
 export interface ChatControllerMessagePublishers {
     readonly processPromptChatMessage: MessagePublisher<PromptMessage>
@@ -951,7 +952,8 @@ export class ChatController {
                         case 'executeBash': {
                             const executeBash = new ExecuteBash(toolUse.input as unknown as ExecuteBashParams)
                             await executeBash.validate()
-                            result = await executeBash.invoke(process.stdout)
+                            const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse.toolUseId)
+                            result = await executeBash.invoke(chatStream)
                             break
                         }
                         case 'fsRead': {

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

@@ -438,6 +438,27 @@ export class Messenger {
         )
     }
 
+    public sendPartialBashToolLog(message: string, tabID: string, triggerID: string, toolUseId: string | undefined) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'answer-part',
+                    followUps: undefined,
+                    followUpsHeader: undefined,
+                    relatedSuggestions: undefined,
+                    triggerID,
+                    messageID: toolUseId ?? `tool-output`,
+                    userIntent: undefined,
+                    codeBlockLanguage: 'plaintext',
+                    contextList: undefined,
+                    canBeVoted: false,
+                },
+                tabID
+            )
+        )
+    }
+
     private editorContextMenuCommandVerbs: Map<EditorContextCommandType, string> = new Map([
         ['aws.amazonq.explainCode', 'Explain'],
         ['aws.amazonq.explainIssue', 'Explain'],

packages/core/src/codewhispererChat/tools/chatStream.ts

@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Writable } from 'stream'
+import { getLogger } from '../../shared/logger/logger'
+import { Messenger } from '../controllers/chat/messenger/messenger'
+
+/**
+ * A writable stream that feeds each chunk/line to the chat UI.
+ * Used for streaming tool output (like bash execution) to the chat interface.
+ */
+export class ChatStream extends Writable {
+    private accumulatedLogs = ''
+
+    public constructor(
+        private readonly messenger: Messenger,
+        private readonly tabID: string,
+        private readonly triggerID: string,
+        private readonly toolUseId: string | undefined,
+        private readonly logger = getLogger('chatStream')
+    ) {
+        super()
+        this.logger.debug(`ChatStream created for tabID: ${tabID}, triggerID: ${triggerID}`)
+    }
+
+    override _write(chunk: Buffer, encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
+        const text = chunk.toString()
+        this.accumulatedLogs += text
+        this.logger.debug(`ChatStream received chunk: ${text}`)
+        this.messenger.sendPartialBashToolLog(
+            `\`\`\`bash\n${this.accumulatedLogs}\`\`\``,
+            this.tabID,
+            this.triggerID,
+            this.toolUseId
+        )
+        callback()
+    }
+
+    override _final(callback: (error?: Error | null) => void): void {
+        if (this.accumulatedLogs.trim().length > 0) {
+            this.messenger.sendPartialBashToolLog(
+                `\`\`\`bash\n${this.accumulatedLogs}\`\`\``,
+                this.tabID,
+                this.triggerID,
+                this.toolUseId
+            )
+        }
+        callback()
+    }
+}

packages/core/src/codewhispererChat/tools/executeBash.ts

@@ -126,9 +126,9 @@ export class ExecuteBash {
 
     private static handleChunk(chunk: string, buffer: string[], updates: Writable) {
         try {
+            updates.write(chunk)
             const lines = chunk.split(/\r?\n/)
             for (const line of lines) {
-                updates.write(`${line}\n`)
                 buffer.push(line)
                 if (buffer.length > lineCount) {
                     buffer.shift()

packages/core/src/shared/logger/logger.ts

@@ -19,6 +19,7 @@ export type LogTopic =
     | 'fsRead'
     | 'fsWrite'
     | 'executeBash'
+    | 'chatStream'
     | 'unknown'
 
 class ErrorLog {