Merge branch 'main' into main

Author: osdemah

.changes/next-release/bugfix-28ad12be-ac9d-4ece-b538-48613ab94969.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: always include button to start a new transformation at the end of a job"
+}

.changes/next-release/feature-d6e1bcfb-6d81-4b3a-af08-828ff10c02b1.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "/doc: Add error message if updated README is too large"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocGenerationState.kt

@@ -179,6 +179,11 @@ private suspend fun DocGenerationState.generateCode(codeGenerationId: String, mo
                     ),
                     -> docServiceError(message("amazonqDoc.exception.readme_too_large"))
 
+                    codeGenerationResultState.codeGenerationStatusDetail()?.contains(
+                        "README_UPDATE_TOO_LARGE"
+                    ),
+                    -> docServiceError(message("amazonqDoc.exception.readme_update_too_large"))
+
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "WORKSPACE_TOO_LARGE"
                     ),

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt

@@ -31,7 +31,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESH
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_EXPIRED
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildStartNewTransformFollowup
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.getDownloadedArtifactTextFromType
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.viewSummaryButton
@@ -317,7 +316,6 @@ class ArtifactHandler(
                         message = message("codemodernizer.chat.message.changes_applied"),
                     )
                     codeTransformChatHelper?.updateLastPendingMessage(resultContent)
-                    codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                 } else {
                     if (getCurrentPatchIndex() < totalPatchFiles) {
                         val message = "I applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles. " +
@@ -331,7 +329,6 @@ class ArtifactHandler(
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(type = CodeTransformChatMessageType.PendingAnswer, message = message)
                             )
-                            codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                         } else {
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(
@@ -345,7 +342,7 @@ class ArtifactHandler(
                             )
                         }
                     } else {
-                        codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
+                        // no-op; start a new transformation button already visible at this point
                     }
                 }
             } else {

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -600,6 +600,7 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, to
         } else {
             null
         },
+        followUps = listOf(startNewTransformFollowUp),
     )
 }
 

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -50,6 +50,7 @@ amazonqDoc.exception.no_change_required=I couldn't find any code changes to upda
 amazonqDoc.exception.prompt_too_vague=I need more information to make changes to your README. Try providing some of the following details:\n- Which sections you want to modify\n- The content you want to add or remove\n- Specific issues that need correcting\n\nFor more information on prompt best practices, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.exception.prompt_unrelated=These changes don't seem related to documentation. Try describing your changes again, using the following best practices:\n- Changes should relate to how project functionality is reflected in the README\n- Content you refer to should be available in your codebase\n\nFor more information on prompt best practices, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.exception.readme_too_large=The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas" target="_blank">Amazon Q Developer documentation.</a>
+amazonqDoc.exception.readme_update_too_large=The updated README is too large. Try reducing the size of your README, or asking for a smaller update. For more information on quotas, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.exception.workspace_empty=The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.inprogress_message.generating=Generating documentation...
 amazonqDoc.progress_message.baseline=This might take a few minutes.