Merge branch 'feature/remote-chat' into manodnyb/updateRemoteChatBuildVersion

Author: bryceitoc9

.changes/3.60.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2025-03-20",
+  "version" : "3.60",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "AmazonQ /test now displays a concise test plan summary to users."
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix inline completion failure due to context length exceeding the threshold"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix cases where content may be incorrectly excluded from workspace."
+  } ]
+}

CHANGELOG.md

@@ -1,3 +1,8 @@
+# _3.60_ (2025-03-20)
+- **(Feature)** AmazonQ /test now displays a concise test plan summary to users.
+- **(Bug Fix)** Fix inline completion failure due to context length exceeding the threshold
+- **(Bug Fix)** Amazon Q: Fix cases where content may be incorrectly excluded from workspace.
+
 # _3.59_ (2025-03-13)
 - **(Feature)** AmazonQ /dev and /doc: Add support for complex workspaces.
 - **(Bug Fix)** /review: normalize relative file path before unzipping

gradle.properties

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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/AssetResourceHandler.kt

@@ -92,7 +92,7 @@ class Browser(parent: Disposable) : Disposable {
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
 
         val jsScripts = """
-            <script type="text/javascript" src="http://toolkitasset/mynah/js/mynah-ui.js" defer onload="init()"></script>
+            <script type="text/javascript" src="${LocalAssetJBCefRequestHandler.PROTOCOL}://${LocalAssetJBCefRequestHandler.AUTHORITY}/mynah/js/mynah-ui.js" defer onload="init()"></script>
             <script type="text/javascript">
                 const init = () => {
                     mynahUI.createMynahUI(