fix(dev): update strings

Author: tverney

packages/core/package.nls.json

@@ -298,8 +298,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.stoppedCodeGeneration": "The code generation has stopped.",
+    "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",
@@ -316,7 +315,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/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.',

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

@@ -450,8 +450,13 @@ export class FeatureDevController {
             // Finish processing the event
 
             if (session?.state?.tokenSource?.token.isCancellationRequested) {
+                this.workOnNewTask(
+                    session,
+                    session.state.codeGenerationRemainingIterationCount || session.state?.currentIteration,
+                    session.state.codeGenerationTotalIterationCount,
+                    session?.state?.tokenSource?.token.isCancellationRequested
+                )
                 this.disposeToken(session)
-                this.workOnNewTask(session)
             } else {
                 this.messenger.sendAsyncEventProgress(tabID, false, undefined)
 
@@ -472,28 +477,41 @@ export class FeatureDevController {
             }
         }
     }
-    private workOnNewTask(message: any) {
-        this.messenger.sendAnswer({
-            message: i18n('AWS.amazonq.featureDev.pillText.stoppedCodeGeneration'),
-            type: 'answer-part',
-            tabID: message.tabID,
-        })
-        this.messenger.sendAnswer({
-            type: 'system-prompt',
-            tabID: message.tabID,
-            followUps: [
-                {
-                    pillText: i18n('AWS.amazonq.featureDev.pillText.newTask'),
-                    type: FollowUpTypes.NewTask,
-                    status: 'info',
-                },
-                {
-                    pillText: i18n('AWS.amazonq.featureDev.pillText.closeSession'),
-                    type: FollowUpTypes.CloseSession,
-                    status: 'info',
-                },
-            ],
-        })
+    private workOnNewTask(
+        message: any,
+        remainingIterations?: number,
+        totalIterations?: number,
+        isStoppedGeneration: boolean = false
+    ) {
+        if (isStoppedGeneration) {
+            this.messenger.sendAnswer({
+                message:
+                    remainingIterations === 0
+                        ? "I stopped generating your code. You don't have more iterations left, however, you can start a new session."
+                        : `I stopped generating your code. If you want to continue working on this task, provide another description. ${!totalIterations ? `You have started ${remainingIterations} code generations.` : `You have ${remainingIterations} out of ${totalIterations} code generations left.`}`,
+                type: 'answer-part',
+                tabID: message.tabID,
+            })
+        }
+
+        if ((remainingIterations === 0 && isStoppedGeneration) || !isStoppedGeneration) {
+            this.messenger.sendAnswer({
+                type: 'system-prompt',
+                tabID: message.tabID,
+                followUps: [
+                    {
+                        pillText: i18n('AWS.amazonq.featureDev.pillText.newTask'),
+                        type: FollowUpTypes.NewTask,
+                        status: 'info',
+                    },
+                    {
+                        pillText: i18n('AWS.amazonq.featureDev.pillText.closeSession'),
+                        type: FollowUpTypes.CloseSession,
+                        status: 'info',
+                    },
+                ],
+            })
+        }
 
         // Ensure that chat input is enabled so that they can provide additional iterations if they choose
         this.messenger.sendChatInputEnabled(message.tabID, true)
@@ -528,7 +546,11 @@ export class FeatureDevController {
                 canBeVoted: true,
             })
 
-            this.workOnNewTask(message)
+            this.workOnNewTask(
+                message,
+                session.state.codeGenerationRemainingIterationCount,
+                session.state.codeGenerationTotalIterationCount
+            )
         } catch (err: any) {
             this.messenger.sendErrorMessage(
                 createUserFacingErrorMessage(`Failed to insert code changes: ${err.message}`),

packages/core/src/amazonqFeatureDev/session/sessionState.ts

@@ -278,7 +278,7 @@ export class CodeGenState extends CodeGenBase implements SessionState {
         public deletedFiles: DeletedFileInfo[],
         public references: CodeReference[],
         tabID: string,
-        private currentIteration: number,
+        public currentIteration: number,
         public uploadHistory: UploadHistory,
         public codeGenerationRemainingIterationCount?: number,
         public codeGenerationTotalIterationCount?: number
@@ -485,7 +485,7 @@ export class PrepareCodeGenState implements SessionState {
         public deletedFiles: DeletedFileInfo[],
         public references: CodeReference[],
         public tabID: string,
-        private currentIteration: number,
+        public currentIteration: number,
 
         public codeGenerationRemainingIterationCount?: number,
         public codeGenerationTotalIterationCount?: number,

packages/core/src/amazonqFeatureDev/types.ts

@@ -61,6 +61,7 @@ export interface SessionState {
     readonly references?: CodeReference[]
     readonly phase?: SessionStatePhase
     readonly uploadId: string
+    readonly currentIteration?: number
     currentCodeGenerationId?: string
     tokenSource?: CancellationTokenSource
     readonly codeGenerationId?: string