Merge master into feature/amazonq

Author: aws-toolkit-automation

.changes/next-release/Bug Fix-e2494f30-8d61-4b13-97a1-e7631f92412c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Feature Development: Update error message for monthly conversation limit reach"
+}

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -17,6 +17,7 @@ import {
     ApiError,
     CodeIterationLimitError,
     ContentLengthError,
+    MonthlyConversationLimitError,
     PlanIterationLimitError,
     UnknownApiError,
 } from '../errors'
@@ -78,6 +79,9 @@ export class FeatureDevClient {
                 getLogger().error(
                     `${featureName}: failed to start conversation: ${e.message} RequestId: ${e.requestId}`
                 )
+                if (e.code === 'ServiceQuotaExceededException') {
+                    throw new MonthlyConversationLimitError(e.message)
+                }
                 throw new ApiError(e.message, 'CreateConversation', e.code, e.statusCode ?? 400)
             }
 

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

@@ -14,6 +14,7 @@ import { featureDevScheme } from '../../constants'
 import {
     CodeIterationLimitError,
     ContentLengthError,
+    MonthlyConversationLimitError,
     PlanIterationLimitError,
     SelectedFolderNotInWorkspaceFolderError,
     createUserFacingErrorMessage,
@@ -242,6 +243,8 @@ export class FeatureDevController {
                         },
                     ],
                 })
+            } else if (err instanceof MonthlyConversationLimitError) {
+                this.messenger.sendMonthlyLimitError(message.tabID)
             } else if (err instanceof PlanIterationLimitError) {
                 this.messenger.sendErrorMessage(err.message, message.tabID, this.retriesRemaining(session))
                 this.messenger.sendAnswer({

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

@@ -46,6 +46,15 @@ export class Messenger {
         )
     }
 
+    public sendMonthlyLimitError(tabID: string) {
+        this.sendAnswer({
+            type: 'answer',
+            tabID: tabID,
+            message: `Sorry, you have reached the monthly limit for feature development. You can try again next month.`,
+        })
+        this.sendUpdatePlaceholder(tabID, 'Chat input is disabled')
+    }
+
     public sendErrorMessage(errorMessage: string, tabID: string, retries: number, phase?: SessionStatePhase) {
         if (retries === 0) {
             this.dispatcher.sendErrorMessage(

packages/core/src/amazonqFeatureDev/errors.ts

@@ -95,6 +95,12 @@ export class CodeIterationLimitError extends ToolkitError {
     }
 }
 
+export class MonthlyConversationLimitError extends ToolkitError {
+    constructor(message: string) {
+        super(message, { code: 'MonthlyConversationLimitError' })
+    }
+}
+
 export class UnknownApiError extends ToolkitError {
     constructor(message: string, api: string) {
         super(message, { code: `${api}-Unknown` })