Pull error messages as constants

Author: linyuxi-0511

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

@@ -10,7 +10,7 @@ import { ServiceOptions } from '../../shared/awsClientBuilder'
 import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger'
 import * as FeatureDevProxyClient from './featuredevproxyclient'
-import { featureName } from '../constants'
+import { featureName, startTaskAssisLimitReachedMessage } from '../constants'
 import { CodeReference } from '../../amazonq/webview/ui/connector'
 import {
     ApiError,
@@ -185,10 +185,7 @@ export class FeatureDevClient {
             )
             if (isAwsError(e)) {
                 // API Front-end will throw Throttling if conversation limit is reached. API Front-end monitors StartCodeGeneration for throttling
-                if (
-                    e.code === 'ThrottlingException' &&
-                    e.message.includes('StartTaskAssistCodeGeneration reached for this month.')
-                ) {
+                if (e.code === 'ThrottlingException' && e.message.includes(startTaskAssisLimitReachedMessage)) {
                     throw new MonthlyConversationLimitError(e.message)
                 }
                 // BE service will throw ServiceQuota if code generation iteration limit is reached

packages/core/src/amazonqFeatureDev/constants.ts

@@ -21,8 +21,8 @@ export const generateDevFilePrompt =
 export const maxRepoSizeBytes = 200 * 1024 * 1024
 
 export const startCodeGenClientErrorMessages = ['Improperly formed request', 'Resource not found']
+export const startTaskAssisLimitReachedMessage = 'StartTaskAssistCodeGeneration reached for this month.'
 export const clientErrorMessages = [
-    'StartTaskAssistCodeGeneration reached for this month.',
     'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.',
 ]
 

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

@@ -35,6 +35,7 @@ import {
     featureName,
     generateDevFilePrompt,
     startCodeGenClientErrorMessages,
+    startTaskAssisLimitReachedMessage,
 } from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
@@ -571,7 +572,8 @@ export class FeatureDevController {
                     if (
                         (err.code === 'StartCodeGenerationFailed' &&
                             startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
-                        clientErrorMessages.some((msg) => err.message.includes(msg))
+                        clientErrorMessages.some((msg) => err.message.includes(msg)) ||
+                        err.message.includes(startTaskAssisLimitReachedMessage)
                     ) {
                         result = MetricDataResult.Error
                     } else {

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

@@ -39,7 +39,14 @@ import { CodeGenState, PrepareCodeGenState } from '../../../../amazonqFeatureDev
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 import { createAmazonQUri } from '../../../../amazonq/commons/diff'
 import { AuthUtil } from '../../../../codewhisperer'
-import { featureDevScheme, featureName, messageWithConversationId } from '../../../../amazonqFeatureDev'
+import {
+    featureDevScheme,
+    featureName,
+    messageWithConversationId,
+    clientErrorMessages,
+    startCodeGenClientErrorMessages,
+    startTaskAssisLimitReachedMessage,
+} from '../../../../amazonqFeatureDev'
 import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
 import { ToolkitError } from '../../../../shared'
@@ -481,18 +488,13 @@ describe('Controller', () => {
                 }
                 if (
                     error.code === 'StartCodeGenerationFailed' &&
-                    (error.message.includes('Improperly formed request') ||
-                        error.message.includes('Resource not found'))
+                    startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))
                 ) {
                     return MetricDataResult.Error
                 }
-                if (error.message.includes('StartTaskAssistCodeGeneration reached for this month.')) {
-                    return MetricDataResult.Error
-                }
                 if (
-                    error.message.includes(
-                        'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.'
-                    )
+                    clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
+                    error.message.includes(startTaskAssisLimitReachedMessage) // Include this check
                 ) {
                     return MetricDataResult.Error
                 }