Merge pull request aws#6875 from ctlai95/tool-confirmation

feat(chat): add confirmation buttons and tool descriptions

Author: mr-lee

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

@@ -215,14 +215,24 @@ export class Messenger {
 
                         const tool = ToolUtils.tryFromToolUse(toolUse)
                         if ('type' in tool) {
-                            const chatStream = new ChatStream(this, tabID, triggerID, toolUse.toolUseId)
-                            ToolUtils.queueDescription(tool, chatStream)
+                            const requiresAcceptance = ToolUtils.requiresAcceptance(tool)
 
-                            this.dispatcher.sendCustomFormActionMessage(
-                                new CustomFormActionMessage(tabID, {
-                                    id: 'confirm-tool-use',
-                                })
+                            const chatStream = new ChatStream(
+                                this,
+                                tabID,
+                                triggerID,
+                                toolUse.toolUseId,
+                                requiresAcceptance
                             )
+                            ToolUtils.queueDescription(tool, chatStream)
+
+                            if (!requiresAcceptance) {
+                                this.dispatcher.sendCustomFormActionMessage(
+                                    new CustomFormActionMessage(tabID, {
+                                        id: 'confirm-tool-use',
+                                    })
+                                )
+                            }
                         } else {
                             // TODO: Handle the error
                         }
@@ -418,7 +428,22 @@ export class Messenger {
         )
     }
 
-    public sendPartialToolLog(message: string, tabID: string, triggerID: string, toolUseId: string | undefined) {
+    public sendPartialToolLog(
+        message: string,
+        tabID: string,
+        triggerID: string,
+        toolUseId: string | undefined,
+        requiresAcceptance = false
+    ) {
+        const buttons: ChatItemButton[] = []
+        if (requiresAcceptance) {
+            buttons.push({
+                id: 'confirm-tool-use',
+                text: 'Confirm',
+                position: 'outside',
+            })
+        }
+
         this.dispatcher.sendChatMessage(
             new ChatMessage(
                 {
@@ -433,6 +458,7 @@ export class Messenger {
                     codeBlockLanguage: undefined,
                     contextList: undefined,
                     canBeVoted: false,
+                    buttons,
                 },
                 tabID
             )

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

@@ -19,6 +19,7 @@ export class ChatStream extends Writable {
         private readonly tabID: string,
         private readonly triggerID: string,
         private readonly toolUseId: string | undefined,
+        private readonly requiresAcceptance = false,
         private readonly logger = getLogger('chatStream')
     ) {
         super()
@@ -30,13 +31,25 @@ export class ChatStream extends Writable {
         const text = chunk.toString()
         this.accumulatedLogs += text
         this.logger.debug(`ChatStream received chunk: ${text}`)
-        this.messenger.sendPartialToolLog(this.accumulatedLogs, this.tabID, this.triggerID, this.toolUseId)
+        this.messenger.sendPartialToolLog(
+            this.accumulatedLogs,
+            this.tabID,
+            this.triggerID,
+            this.toolUseId,
+            this.requiresAcceptance
+        )
         callback()
     }
 
     override _final(callback: (error?: Error | null) => void): void {
         if (this.accumulatedLogs.trim().length > 0) {
-            this.messenger.sendPartialToolLog(this.accumulatedLogs, this.tabID, this.triggerID, this.toolUseId)
+            this.messenger.sendPartialToolLog(
+                this.accumulatedLogs,
+                this.tabID,
+                this.triggerID,
+                this.toolUseId,
+                this.requiresAcceptance
+            )
         }
         callback()
     }

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

@@ -8,6 +8,7 @@ import { readDirectoryRecursively } from '../../shared/utilities/workspaceUtils'
 import fs from '../../shared/fs/fs'
 import { InvokeOutput, maxToolResponseSize, OutputKind, sanitizePath } from './toolShared'
 import { Writable } from 'stream'
+import path from 'path'
 
 export interface FsReadParams {
     path: string
@@ -49,7 +50,12 @@ export class FsRead {
         this.logger.debug(`Validation succeeded for path: ${this.fsPath}`)
     }
 
-    public queueDescription(updates: Writable): void {}
+    public queueDescription(updates: Writable): void {
+        const fileName = path.basename(this.fsPath)
+        const fileUri = vscode.Uri.file(this.fsPath)
+        updates.write(`Reading: [${fileName}](${fileUri})`)
+        updates.end()
+    }
 
     public async invoke(updates: Writable): Promise<InvokeOutput> {
         try {

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

@@ -8,6 +8,7 @@ import { getLogger } from '../../shared/logger/logger'
 import vscode from 'vscode'
 import { fs } from '../../shared/fs/fs'
 import { Writable } from 'stream'
+import path from 'path'
 
 interface BaseParams {
     path: string
@@ -69,7 +70,12 @@ export class FsWrite {
         }
     }
 
-    public queueDescription(updates: Writable): void {}
+    public queueDescription(updates: Writable): void {
+        const fileName = path.basename(this.params.path)
+        const fileUri = vscode.Uri.file(this.params.path)
+        updates.write(`Writing to: [${fileName}](${fileUri})`)
+        updates.end()
+    }
 
     public async validate(): Promise<void> {
         switch (this.params.command) {