feat(/dev): handle validation exceptions for planning and code gen (#4630)

* feat(/dev): handle validation exceptions for planning and code gen

* handling exception during generate code also

* Add changelog

---------

Co-authored-by: Matyas Boros <[email protected]>

Author: kumsmrit

.changes/next-release/bugfix-38b2aaa7-2bd0-4eda-95d0-2bd0f7e05f9c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Expose Amazon Q backend validation error message"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevExceptions.kt

@@ -10,6 +10,8 @@ open class FeatureDevException(override val message: String?, override val cause
 
 class ContentLengthError(override val message: String, override val cause: Throwable?) : RepoSizeError, RuntimeException()
 
+class ZipFileError(override val message: String, override val cause: Throwable?) : RuntimeException()
+
 class PlanIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
 class CodeIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -34,6 +34,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.InboundAppMess
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderErrorReason
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PlanIterationLimitError
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.createUserFacingErrorMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FeatureDevMessageType
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUp
@@ -282,14 +283,42 @@ class FeatureDevController(
             session.initCodegen(messenger)
             onCodeGeneration(session, "", tabId)
         } catch (err: Exception) {
-            val message = createUserFacingErrorMessage(err.message)
-            messenger.sendError(
-                tabId = tabId,
-                errMessage = message ?: message("amazonqFeatureDev.exception.request_failed"),
-                retries = retriesRemaining(session),
-                phase = session.sessionState.phase,
-                conversationId = session.conversationIdUnsafe
-            )
+            logger.warn(err) { "Encountered ${err.message} for tabId: $tabId" }
+            if (err is RepoSizeError) {
+                messenger.sendError(
+                    tabId = tabId,
+                    errMessage = err.message,
+                    retries = retriesRemaining(session),
+                    conversationId = session.conversationIdUnsafe
+                )
+                messenger.sendSystemPrompt(
+                    tabId = tabId,
+                    followUp = listOf(
+                        FollowUp(
+                            pillText = message("amazonqFeatureDev.follow_up.modify_source_folder"),
+                            type = FollowUpTypes.MODIFY_DEFAULT_SOURCE_FOLDER,
+                            status = FollowUpStatusType.Info,
+                        )
+                    ),
+                )
+            } else if (err is ZipFileError) {
+                messenger.sendError(
+                    tabId = tabId,
+                    errMessage = err.message,
+                    retries = 0,
+                    phase = session.sessionState.phase,
+                    conversationId = session.conversationIdUnsafe
+                )
+            } else {
+                val message = createUserFacingErrorMessage(err.message)
+                messenger.sendError(
+                    tabId = tabId,
+                    errMessage = message ?: message("amazonqFeatureDev.exception.request_failed"),
+                    retries = retriesRemaining(session),
+                    phase = session.sessionState.phase,
+                    conversationId = session.conversationIdUnsafe
+                )
+            }
         }
     }
 
@@ -496,6 +525,14 @@ class FeatureDevController(
                         )
                     ),
                 )
+            } else if (err is ZipFileError) {
+                messenger.sendError(
+                    tabId = tabId,
+                    errMessage = err.message,
+                    retries = 0,
+                    phase = session?.sessionState?.phase,
+                    conversationId = session?.conversationIdUnsafe
+                )
             } else {
                 val msg = createUserFacingErrorMessage("$FEATURE_NAME request failed: ${err.message ?: err.cause?.message}")
                 messenger.sendError(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt

@@ -24,6 +24,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ContentLengthE
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PlanIterationLimitError
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.apiError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.GenerateTaskAssistPlanResult
@@ -34,6 +35,7 @@ import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.ge
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.Result
+import software.amazon.awssdk.services.codewhispererstreaming.model.ValidationException as StreamingValidationException
 
 private val logger = getLogger<FeatureDevClient>()
 
@@ -138,6 +140,10 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
                     (e is ThrottlingException && e.message?.contains("limit for number of iterations on an implementation plan") == true)
                 ) {
                     throw PlanIterationLimitError(message("amazonqFeatureDev.approach_gen.iteration_limit.error_text"), e.cause)
+                } else if (e is StreamingValidationException && e.message?.contains("repo size is exceeding the limits") == true) {
+                    throw ContentLengthError(message("amazonqFeatureDev.content_length.error_text"), e.cause)
+                } else if (e is StreamingValidationException && e.message?.contains("zipped file is corrupted") == true) {
+                    throw ZipFileError("The zip file is corrupted", e.cause)
                 }
             }
             apiError(errMssg, e.cause)
@@ -181,6 +187,10 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
                         )
                 ) {
                     throw CodeIterationLimitError(message("amazonqFeatureDev.code_generation.iteration_limit.error_text"), e.cause)
+                } else if (e is ValidationException && e.message?.contains("repo size is exceeding the limits") == true) {
+                    throw ContentLengthError(message("amazonqFeatureDev.content_length.error_text"), e.cause)
+                } else if (e is ValidationException && e.message?.contains("zipped file is corrupted") == true) {
+                    throw ZipFileError("The zip file is corrupted", e.cause)
                 }
             }
             apiError(errMssg, e.cause)