Add header for shell command

Author: yueny2020

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -8,6 +8,7 @@ import {
     ChatItemButton,
     ChatItemFormItem,
     ChatItemType,
+    MynahIcons,
     MynahIconsType,
     MynahUIDataModel,
     QuickActionCommand,
@@ -291,7 +292,7 @@ export class Connector extends BaseConnector {
 
         if (
             !this.onChatAnswerUpdated ||
-            !['accept-code-diff', 'reject-code-diff', 'confirm-tool-use'].includes(action.id)
+            !['accept-code-diff', 'reject-code-diff', 'confirm-tool-use', 'run-shell-command'].includes(action.id)
         ) {
             return
         }
@@ -341,6 +342,17 @@ export class Connector extends BaseConnector {
                     },
                 ]
                 break
+            case 'run-shell-command':
+                answer.header = {
+                    body: 'shell',
+                    icon: 'code-block' as MynahIconsType,
+                    status: {
+                        icon: MynahIcons.OK,
+                        text: 'Accepted',
+                        status: 'success',
+                    },
+                }
+                break
             default:
                 break
         }

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

@@ -743,6 +743,7 @@ export class ChatController {
                 break
             case 'accept-code-diff':
             case 'confirm-tool-use':
+            case 'run-shell-command':
             case 'generic-tool-execution':
                 await this.closeDiffView()
                 await this.processToolUseMessage(message)

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

@@ -438,12 +438,21 @@ export class Messenger {
     ) {
         const buttons: ChatItemButton[] = []
         let fileList: ChatItemContent['fileList'] = undefined
-        if (validation.requiresAcceptance && toolUse?.name === ToolType.ExecuteBash) {
-            buttons.push({
-                id: 'confirm-tool-use',
-                text: 'Confirm',
-                status: 'info',
-            })
+        let shellCommandHeader = undefined
+        if (toolUse?.name === ToolType.ExecuteBash && message.startsWith('```shell')) {
+            if (validation.requiresAcceptance) {
+                buttons.push({
+                    id: 'run-shell-command',
+                    text: 'Run',
+                    icon: 'play' as MynahIconsType,
+                })
+            }
+
+            shellCommandHeader = {
+                body: 'shell',
+                icon: 'code-block' as MynahIconsType,
+                buttons: buttons,
+            }
 
             if (validation.warning) {
                 message = validation.warning + message
@@ -497,16 +506,23 @@ export class Messenger {
                     codeBlockLanguage: undefined,
                     contextList: undefined,
                     canBeVoted: false,
-                    buttons: toolUse?.name === ToolType.FsWrite ? undefined : buttons,
-                    fullWidth: toolUse?.name === ToolType.FsWrite,
+                    buttons:
+                        toolUse?.name === ToolType.FsWrite || toolUse?.name === ToolType.ExecuteBash
+                            ? undefined
+                            : buttons,
+                    fullWidth: toolUse?.name === ToolType.FsWrite || toolUse?.name === ToolType.ExecuteBash,
                     padding: !(toolUse?.name === ToolType.FsWrite),
                     header:
                         toolUse?.name === ToolType.FsWrite
                             ? { icon: 'code-block' as MynahIconsType, buttons: buttons, fileList: fileList }
-                            : undefined,
+                            : toolUse?.name === ToolType.ExecuteBash
+                              ? shellCommandHeader
+                              : undefined,
                     codeBlockActions:
                         // eslint-disable-next-line unicorn/no-null, prettier/prettier
-                        toolUse?.name === ToolType.FsWrite ? { 'insert-to-cursor': null, copy: null } : undefined,
+                        toolUse?.name === ToolType.FsWrite || toolUse?.name === ToolType.ExecuteBash
+                            ? { 'insert-to-cursor': null, copy: null }
+                            : undefined,
                 },
                 tabID
             )

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

@@ -327,8 +327,7 @@ export class ExecuteBash {
     }
 
     public queueDescription(updates: Writable): void {
-        updates.write(`I will run the following shell command:\n`)
-        updates.write('```bash\n' + this.command + '\n```')
+        updates.write('```shell\n' + this.command + '\n```')
         updates.end()
     }
 }