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

Author: ashishrp-aws

packages/core/package.nls.json

@@ -457,6 +457,9 @@
     "AWS.amazonq.opensettings:": "Open settings",
     "AWS.amazonq.executeBash.run": "Run",
     "AWS.amazonq.executeBash.reject": "Reject",
+    "AWS.amazonq.chat.directive.pairProgrammingModeOn": "You are using **pair programming mode**: Q can now list files, preview code diffs and allow you to run shell commands.",
+    "AWS.amazonq.chat.directive.pairProgrammingModeOff": "You turned off **pair programming mode**. Q will not include code diffs or run commands in the chat.",
+    "AWS.amazonq.chat.directive.runCommandToProceed": "Run the command to proceed.",
     "AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough",
     "AWS.toolkit.lambda.walkthrough.title": "Get started building your application",
     "AWS.toolkit.lambda.walkthrough.description": "Your quick guide to build an application visually, iterate locally, and deploy to the cloud!",

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -94,7 +94,7 @@ export class TabDataGenerator {
                               type: 'toggle',
                               id: 'prompt-type',
                               value: 'pair-programming-on',
-                              tooltip: 'Pair programmar on',
+                              tooltip: 'Pair programmer on',
                               options: [
                                   {
                                       value: 'pair-programming-on',

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

@@ -933,10 +933,19 @@ export class ChatController {
     private async processPromptInputOptionChange(message: PromptInputOptionChange) {
         const session = this.sessionStorage.getSession(message.tabID)
         const promptTypeValue = message.optionsValues['prompt-type']
-        // TODO: display message: You turned off pair programmer mode. Q will not include code diffs or run commands in the chat.
         if (promptTypeValue === 'pair-programming-on') {
             session.setPairProgrammingModeOn(true)
+            this.messenger.sendDirectiveMessage(
+                message.tabID,
+                promptTypeValue,
+                i18n('AWS.amazonq.chat.directive.pairProgrammingModeOn')
+            )
         } else {
+            this.messenger.sendDirectiveMessage(
+                message.tabID,
+                promptTypeValue,
+                i18n('AWS.amazonq.chat.directive.pairProgrammingModeOff')
+            )
             session.setPairProgrammingModeOn(false)
         }
     }

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

@@ -287,8 +287,8 @@ export class Messenger {
                                 toolUse.input = JSON.parse(toolUseInput)
                             } catch (error: any) {
                                 getLogger().error(`JSON parse error for toolUseInput: ${toolUseInput}`)
-                                // set toolUse.input to the raw value
-                                toolUse.input = toolUseInput
+                                // set toolUse.input to be empty valid json object
+                                toolUse.input = {}
                                 error.message = `Tool input has invalid JSON format: ${error.message}`
                                 // throw it out to allow the error to be handled in the catch block
                                 throw error
@@ -950,8 +950,28 @@ export class Messenger {
             )
         )
     }
-
-    /**
+  
+    public sendDirectiveMessage(tabID: string, triggerID: string, message: string) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'directive',
+                    followUps: undefined,
+                    followUpsHeader: undefined,
+                    relatedSuggestions: undefined,
+                    triggerID,
+                    messageID: '',
+                    userIntent: undefined,
+                    codeBlockLanguage: undefined,
+                    contextList: undefined,
+                },
+                tabID
+            )
+        )
+    }
+  
+  /**
      * Check if a trigger has been cancelled and should not proceed
      * @param triggerId The trigger ID to check
      * @returns true if the trigger is cancelled and should not proceed
@@ -960,7 +980,6 @@ export class Messenger {
         if (!triggerId) {
             return false
         }
-
         const conversationTracker = ConversationTracker.getInstance()
         return conversationTracker.isTriggerCancelled(triggerId)
     }

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

@@ -10,6 +10,7 @@ import { ToolUse } from '@amzn/codewhisperer-streaming'
 import { CommandValidation } from './executeBash'
 import { Change } from 'diff'
 import { ConversationTracker } from '../storages/conversationTracker'
+import { i18n } from '../../shared/i18n-helper'
 
 /**
  * A writable stream that feeds each chunk/line to the chat UI.
@@ -29,6 +30,13 @@ export class ChatStream extends Writable {
     ) {
         super()
         this.logger.debug(`ChatStream created for tabID: ${tabID}, triggerID: ${triggerID}`)
+        if (validation.requiresAcceptance) {
+            this.messenger.sendDirectiveMessage(
+                tabID,
+                triggerID,
+                i18n('AWS.amazonq.chat.directive.runCommandToProceed')
+            )
+        }
         this.messenger.sendInitalStream(tabID, triggerID)
     }
 

packages/core/src/codewhispererChat/view/connector/connector.ts

@@ -113,7 +113,7 @@ export class SearchView extends UiMessage {
     override type = 'drawNewSearchViewState'
 }
 
-export type ChatMessageType = 'answer-stream' | 'answer-part' | 'answer'
+export type ChatMessageType = 'answer-stream' | 'answer-part' | 'answer' | 'directive'
 
 export interface CodeReference {
     licenseName?: string