Merge branch 'aws:feature/agentic-chat' into feature/agentic-chat

Author: laileni-aws

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

@@ -392,7 +392,7 @@ export class Connector extends BaseConnector {
                 break
             case 'run-shell-command':
                 answer.header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     status: {
                         icon: 'ok' as MynahIconsType,
@@ -403,7 +403,7 @@ export class Connector extends BaseConnector {
                 break
             case 'reject-shell-command':
                 answer.header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     status: {
                         icon: 'cancel' as MynahIconsType,

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

@@ -821,10 +821,7 @@ export class ChatController {
             getLogger().error(
                 `toolUse name: ${currentToolUse!.name} of toolUseWithError in the stored session doesn't match when click shell command reject button.`
             )
-            return
         }
-
-        await this.generateStaticTextResponse('reject-shell-command', triggerId)
     }
 
     private async processCustomFormAction(message: CustomFormActionMessage) {

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

@@ -72,12 +72,7 @@ import { localize } from '../../../../shared/utilities/vsCodeUtils'
 import { getDiffLinesFromChanges } from '../../../../shared/utilities/diffUtils'
 import { FsReadParams } from '../../../tools/fsRead'
 
-export type StaticTextResponseType =
-    | 'quick-action-help'
-    | 'onboarding-help'
-    | 'transform'
-    | 'help'
-    | 'reject-shell-command'
+export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'
 
 export type MessengerResponseType = {
     $metadata: { requestId?: string; httpStatusCode?: number }
@@ -605,7 +600,7 @@ export class Messenger {
                     },
                 ]
                 header = {
-                    icon: 'code-block' as MynahIconsType,
+                    icon: 'shell' as MynahIconsType,
                     body: 'shell',
                     buttons,
                 }
@@ -753,10 +748,6 @@ export class Messenger {
                 ]
                 followUpsHeader = 'Try Examples:'
                 break
-            case 'reject-shell-command':
-                // need to update the string later
-                message = 'The shell command execution rejected. Abort.'
-                break
         }
 
         this.dispatcher.sendChatMessage(