Merge branch 'main' into e2e-test

Author: Randall-Jiang

.changes/3.59.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2025-03-13",
+  "version" : "3.59",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "AmazonQ /dev and /doc: Add support for complex workspaces."
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: normalize relative file path before unzipping"
+  }, {
+    "type" : "bugfix",
+    "description" : "fix Q chat request timeout"
+  } ]
+}

.changes/next-release/bugfix-2dc5d27d-f254-4462-b95c-04bccba7524e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix inline completion failure due to context length exceeding the threshold"
+}

.changes/next-release/bugfix-d13b5621-b191-455b-8918-1a5874216512.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Fix cases where content may be incorrectly excluded from workspace."
+}

.changes/next-release/bugfix-fd9065e5-2661-4250-852c-ec51deedd10f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "AmazonQ /test now displays a concise test plan summary to users."
+}

.changes/next-release/feature-862af662-3a71-4203-aa1b-bfa41af24b42.json

@@ -1,3 +1,8 @@
+# _3.59_ (2025-03-13)
+- **(Feature)** AmazonQ /dev and /doc: Add support for complex workspaces.
+- **(Bug Fix)** /review: normalize relative file path before unzipping
+- **(Bug Fix)** fix Q chat request timeout
+
 # _3.58_ (2025-03-06)
 - **(Bug Fix)** Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs
 - **(Removal)** The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing.

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.59-SNAPSHOT
+toolkitVersion=3.60-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle.properties

@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.307"
+telemetryGenerator = "1.0.310"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

gradle/libs.versions.toml

@@ -4,7 +4,7 @@
 package software.aws.toolkits.jetbrains.common.session
 
 import software.aws.toolkits.jetbrains.common.util.AmazonQCodeGenService
-import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
+import software.aws.toolkits.jetbrains.services.amazonq.project.FeatureDevSessionContext
 
 open class SessionStateConfig(
     open val conversationId: String,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/session/SessionStateTypes.kt

@@ -23,13 +23,15 @@ import software.aws.toolkits.jetbrains.common.session.Intent
 import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ApiException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ContentLengthException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ExportParseException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOperation
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ServiceException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.resources.message
@@ -70,8 +72,14 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 if (e is ServiceQuotaExceededException) {
                     throw MonthlyConversationLimitError(errMssg, operation = FeatureDevOperation.CreateConversation.toString(), desc = null, cause = e.cause)
                 }
+                throw ApiException.of(e.statusCode(), errMssg, operation = FeatureDevOperation.CreateConversation.toString(), desc = null, e.cause)
             }
-            throw FeatureDevException(errMssg, operation = FeatureDevOperation.CreateConversation.toString(), desc = null, e.cause)
+            throw ServiceException(
+                errMssg ?: "CreateTaskAssistConversation failed",
+                operation = FeatureDevOperation.CreateConversation.toString(),
+                desc = null,
+                e.cause
+            )
         } finally {
             AmazonqTelemetry.startConversationInvoke(
                 amazonqConversationId = conversationId,
@@ -111,8 +119,10 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                     }
                     throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
                 }
+
+                throw ApiException.of(e.statusCode(), errMssg, operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, e.cause)
             }
-            throw FeatureDevException(errMssg, operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, e.cause)
+            throw ServiceException(errMssg ?: "CreateUploadUrl failed", operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, e.cause)
         }
     }
 
@@ -156,8 +166,14 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 } else if (e is ValidationException && e.message?.contains("zipped file is corrupted") == true) {
                     throw ZipFileCorruptedException(operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, e.cause)
                 }
+                throw ApiException.of(e.statusCode(), errMssg, operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, e.cause)
             }
-            throw FeatureDevException(errMssg, operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, e.cause)
+            throw ServiceException(
+                errMssg ?: "StartTaskAssistCodeGeneration failed",
+                operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(),
+                desc = null,
+                e.cause
+            )
         }
     }
 
@@ -180,8 +196,14 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
             if (e is CodeWhispererRuntimeException) {
                 errMssg = e.awsErrorDetails().errorMessage()
                 logger.warn(e) { "GetTaskAssistCodeGeneration failed for request:  ${e.requestId()}" }
+                throw ApiException.of(e.statusCode(), errMssg, operation = FeatureDevOperation.GetTaskAssistCodeGeneration.toString(), desc = null, e.cause)
             }
-            throw FeatureDevException(errMssg, operation = FeatureDevOperation.GetTaskAssistCodeGeneration.toString(), desc = null, e.cause)
+            throw ServiceException(
+                errMssg ?: "GetTaskAssistCodeGeneration failed",
+                operation = FeatureDevOperation.GetTaskAssistCodeGeneration.toString(),
+                desc = null,
+                e.cause
+            )
         }
     }
 
@@ -198,7 +220,12 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 errMssg = e.awsErrorDetails().errorMessage()
                 logger.warn(e) { "ExportTaskAssistArchiveResult failed for request: ${e.requestId()}" }
             }
-            throw FeatureDevException(errMssg, operation = FeatureDevOperation.ExportTaskAssistArchiveResult.toString(), desc = null, e.cause)
+            throw ServiceException(
+                errMssg ?: "ExportTaskAssistArchive failed",
+                operation = FeatureDevOperation.ExportTaskAssistArchiveResult.toString(),
+                desc = null,
+                e.cause
+            )
         }
 
         val parsedResult: ExportDocTaskAssistResultArchiveStreamResult