Merge branch 'main' into mockTelemetryService

Will-ShaoHua · web-flow · commit 298ea7124875 · 2025-01-17T16:37:39.000-08:00
diff --git a/.changes/3.49.json b/.changes/3.49.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-01-17",
+  "version" : "3.49",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json b/.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.49_ (2025-01-17)
+- **(Bug Fix)** /review: Improved success rate of code reviews for certain workspace configurations
+
 # _3.48_ (2025-01-16)
 - **(Feature)** Enhance Q inline completion context fetching for better suggestion quality
 - **(Feature)** /doc: Add error message if updated README is too large
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.49-SNAPSHOT
+toolkitVersion=3.50-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
@@ -686,6 +686,8 @@ class CodeTransformChatController(
             is CodeModernizerJobCompletedResult.Stopped, CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> handleCodeTransformStoppedByUser()
             is CodeModernizerJobCompletedResult.JobFailed -> handleCodeTransformJobFailed(result.failureReason)
             is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> handleCodeTransformJobFailedPreBuild(result)
+            is CodeModernizerJobCompletedResult.RetryableFailure -> handleCodeTransformJobFailed(result.failureReason)
+            is CodeModernizerJobCompletedResult.UnableToCreateJob -> handleCodeTransformJobFailed(result.failureReason)
             else -> {
                 if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
                     return
