Merge master into feature/q-dev-execution

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-3f18ffa1-f90f-4ceb-8af9-a913a56cd5ce.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /dev: Add stop generation action"
+}

packages/core/package.nls.json

@@ -299,6 +299,7 @@
     "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
     "AWS.amazonq.featureDev.pillText.insertCode": "Accept code",
+    "AWS.amazonq.featureDev.pillText.stoppingCodeGeneration": "Stopping code generation...",
     "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
     "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",
     "AWS.amazonq.featureDev.pillText.retry": "Retry",
@@ -315,7 +316,7 @@
     "AWS.amazonq.featureDev.answer.sessionClosed": "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow.",
     "AWS.amazonq.featureDev.answer.newTaskChanges": "What new task would you like to work on?",
     "AWS.amazonq.featureDev.placeholder.chatInputDisabled": "Chat input is disabled",
-    "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Choose an option to proceed",
+    "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Describe your task or issue in detail",
     "AWS.amazonq.featureDev.placeholder.feedback": "Provide feedback or comments",
     "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in detail",
     "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue"

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

@@ -280,6 +280,7 @@ export class Connector {
         this.sendMessageToExtension({
             tabID: tabID,
             command: 'stop-response',
+            tabType: 'featuredev',
         })
     }
 

packages/core/src/amazonq/webview/ui/connector.ts

@@ -176,6 +176,17 @@ export class Connector {
         this.gumbyChatConnector.transform(tabID)
     }
 
+    onStopChatResponse = (tabID: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'featuredev':
+                this.featureDevChatConnector.onStopChatResponse(tabID)
+                break
+            case 'cwc':
+                this.cwChatConnector.onStopChatResponse(tabID)
+                break
+        }
+    }
+
     handleMessageReceive = async (message: MessageEvent): Promise<void> => {
         if (message.data === undefined) {
             return
@@ -457,17 +468,6 @@ export class Connector {
         }
     }
 
-    onStopChatResponse = (tabID: string): void => {
-        switch (this.tabsStorage.getTab(tabID)?.type) {
-            case 'featuredev':
-                this.featureDevChatConnector.onStopChatResponse(tabID)
-                break
-            case 'cwc':
-                this.cwChatConnector.onStopChatResponse(tabID)
-                break
-        }
-    }
-
     sendFeedback = (tabId: string, feedbackPayload: FeedbackPayload): void | undefined => {
         switch (this.tabsStorage.getTab(tabId)?.type) {
             case 'featuredev':

packages/core/src/amazonq/webview/ui/followUps/handler.ts

@@ -46,6 +46,7 @@ export class FollowUpInteractionHandler {
         if (followUp.prompt !== undefined) {
             this.mynahUI.updateStore(tabID, {
                 loadingChat: true,
+                cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
             this.mynahUI.addChatItem(tabID, {

packages/core/src/amazonq/webview/ui/main.ts

@@ -197,6 +197,7 @@ export const createMynahUI = (
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
                     promptInputDisabledState: true,
+                    cancelButtonWhenLoading: true,
                 })
 
                 if (message && messageId) {
@@ -307,6 +308,7 @@ export const createMynahUI = (
             ) {
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
+                    cancelButtonWhenLoading: false,
                     promptInputDisabledState: true,
                 })
 
@@ -462,6 +464,13 @@ export const createMynahUI = (
         onTabRemove: connector.onTabRemove,
         onTabChange: connector.onTabChange,
         // TODO: update mynah-ui this type doesn't seem correct https://github.com/aws/mynah-ui/blob/3777a39eb534a91fd6b99d6cf421ce78ee5c7526/src/main.ts#L372
+        onStopChatResponse: (tabID: string) => {
+            mynahUI.updateStore(tabID, {
+                loadingChat: false,
+                promptInputDisabledState: false,
+            })
+            connector.onStopChatResponse(tabID)
+        },
         onChatPrompt: (tabID: string, prompt: ChatPrompt, eventId: string | undefined) => {
             if ((prompt.prompt ?? '') === '' && (prompt.command ?? '') === '') {
                 return

packages/core/src/amazonq/webview/ui/messages/controller.ts

@@ -76,6 +76,7 @@ export class MessageController {
 
             this.mynahUI.updateStore(selectedTab.id, {
                 loadingChat: true,
+                cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
             this.mynahUI.addChatItem(selectedTab.id, message)
@@ -107,6 +108,7 @@ export class MessageController {
 
             this.mynahUI.updateStore(newTabID, {
                 loadingChat: true,
+                cancelButtonWhenLoading: false,
                 promptInputDisabledState: true,
             })
 

packages/core/src/amazonq/webview/ui/messages/handler.ts

@@ -36,6 +36,7 @@ export class TextMessageHandler {
 
         this.mynahUI.updateStore(tabID, {
             loadingChat: true,
+            cancelButtonWhenLoading: false,
             promptInputDisabledState: true,
         })
 

packages/core/src/amazonq/webview/ui/quickActions/handler.ts

@@ -79,6 +79,7 @@ export class QuickActionHandler {
         if (this.tabsStorage.getTab(affectedTabId)?.type !== 'unknown') {
             affectedTabId = this.mynahUI.updateStore('', {
                 loadingChat: true,
+                cancelButtonWhenLoading: false,
             })
         }
 
@@ -103,6 +104,7 @@ export class QuickActionHandler {
             // disable chat prompt
             this.mynahUI.updateStore(affectedTabId, {
                 loadingChat: true,
+                cancelButtonWhenLoading: false,
             })
 
             this.connector.transform(affectedTabId)
@@ -161,6 +163,7 @@ export class QuickActionHandler {
                 this.mynahUI.updateStore(affectedTabId, {
                     loadingChat: true,
                     promptInputDisabledState: true,
+                    cancelButtonWhenLoading: false,
                 })
 
                 void this.connector.requestGenerativeAIAnswer(affectedTabId, '', {

packages/core/src/amazonq/webview/ui/texts/constants.ts

@@ -19,7 +19,7 @@ export const uiComponentsTexts = {
     save: 'Save',
     cancel: 'Cancel',
     submit: 'Submit',
-    stopGenerating: 'Stop generating',
+    stopGenerating: 'Stop',
     copyToClipboard: 'Copied to clipboard',
     noMoreTabsTooltip: 'You can only open ten conversation tabs at a time.',
     codeSuggestionWithReferenceTitle: 'Some suggestions contain code with references.',