Merge branch 'main' into samgst/NotificationResourceResolver

Author: samgst-amazon

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

@@ -334,6 +334,7 @@ class ArtifactHandler(
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(type = CodeTransformChatMessageType.PendingAnswer, message = message)
                             )
+                            codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                         } else {
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(

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

@@ -399,6 +399,7 @@ class CodeTransformChatController(
                 EXPLAINABILITY_V1
             )
         }
+        telemetry.submitSelection(message.oneOrMultipleDiffsSelection)
         codeTransformChatHelper.addNewMessage(buildUserOneOrMultipleDiffsSelectionChatContent(message.oneOrMultipleDiffsSelection))
         codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent())
         codeModernizerManager.codeTransformationSession?.let {
@@ -458,7 +459,7 @@ class CodeTransformChatController(
     }
 
     override suspend fun processCodeTransformStopAction(tabId: String) {
-        if (!checkForAuth(tabId)) {
+        if (!checkForAuth(tabId) || !codeModernizerManager.isModernizationJobActive()) {
             return
         }