fix(amazonq): remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining

Author: siakmun-aws

packages/amazonq/.changes/next-release/Feature-f03a4f2f-5819-4276-b914-be0b1a4ecedf.json

@@ -460,12 +460,17 @@ export class FeatureDevController {
 
             if (remainingIterations !== undefined && totalIterations !== undefined) {
                 this.messenger.sendAnswer({
-                    type: 'answer',
+                    type: 'answer' as const,
                     tabID: tabID,
-                    message:
-                        remainingIterations > 2 || remainingIterations <= 0
-                            ? 'Would you like me to add this code to your project?'
-                            : `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`,
+                    message: (() => {
+                        if (remainingIterations > 2) {
+                            return 'Would you like me to add this code to your project, or provide feedback for new code?'
+                        } else if (remainingIterations > 0) {
+                            return `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`
+                        } else {
+                            return 'Would you like me to add this code to your project?'
+                        }
+                    })(),
                 })
             }
 

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

@@ -586,10 +586,15 @@ describe('Controller', () => {
             for (let remainingIterations = 0; remainingIterations <= 3; remainingIterations++) {
                 it(`verifies add code messages for remaining iterations at ${remainingIterations}`, async () => {
                     const totalIterations = 10
-                    const expectedMessage =
-                        remainingIterations > 2 || remainingIterations <= 0
-                            ? 'Would you like me to add this code to your project?'
-                            : `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`
+                    const expectedMessage = (() => {
+                        if (remainingIterations > 2) {
+                            return 'Would you like me to add this code to your project, or provide feedback for new code?'
+                        } else if (remainingIterations > 0) {
+                            return `Would you like me to add this code to your project, or provide feedback for new code? You have ${remainingIterations} out of ${totalIterations} code generations left.`
+                        } else {
+                            return 'Would you like me to add this code to your project?'
+                        }
+                    })()
                     await verifyAddCodeMessage(remainingIterations, totalIterations, expectedMessage)
                 })
             }

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

@@ -111,17 +111,17 @@ describe('sessionState', () => {
         it('transitions to PrepareCodeGenState when codeGenerationStatus ready ', async () => {
             mockGetCodeGeneration = sinon.stub().resolves({
                 codeGenerationStatus: { status: 'Complete' },
-                codeGenerationRemainingIterationCount: 9,
-                codeGenerationTotalIterationCount: 10,
+                codeGenerationRemainingIterationCount: 2,
+                codeGenerationTotalIterationCount: 3,
             })
 
             mockExportResultArchive = sinon.stub().resolves({ newFileContents: [], deletedFiles: [], references: [] })
 
             const testAction = mockSessionStateAction()
-            const state = new CodeGenState(testConfig, [], [], [], tabId, 0, {}, 9, 10)
+            const state = new CodeGenState(testConfig, [], [], [], tabId, 0, {}, 2, 3)
             const result = await state.interact(testAction)
 
-            const nextState = new PrepareCodeGenState(testConfig, [], [], [], tabId, 1, 9, 10, undefined)
+            const nextState = new PrepareCodeGenState(testConfig, [], [], [], tabId, 1, 2, 3, undefined)
 
             assert.deepStrictEqual(result.nextState?.deletedFiles, nextState.deletedFiles)
             assert.deepStrictEqual(result.nextState?.filePaths, result.nextState?.filePaths)