Merge branch 'main' into API-refactor

Randall-Jiang · web-flow · commit 83c52fcbed32 · 2025-03-10T10:44:00.000-07:00
diff --git a/.changes/3.58.json b/.changes/3.58.json
@@ -0,0 +1,11 @@
+{
+  "date" : "2025-03-06",
+  "version" : "3.58",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs"
+  }, {
+    "type" : "removal",
+    "description" : "The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing."
+  } ]
+}
diff --git a/.changes/next-release/bugfix-79596dfc-37a0-44c8-adf2-a6c87ba806ac.json b/.changes/next-release/bugfix-79596dfc-37a0-44c8-adf2-a6c87ba806ac.json
diff --git a/.changes/next-release/feature-0b164167-b04b-4a26-a59b-5ac41a717975.json b/.changes/next-release/feature-0b164167-b04b-4a26-a59b-5ac41a717975.json
diff --git a/.changes/next-release/removal-5b5b9cf3-701c-48b5-b232-96e726a9a860.json b/.changes/next-release/removal-5b5b9cf3-701c-48b5-b232-96e726a9a860.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# _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.
+
 # _3.57_ (2025-02-28)
 - **(Bug Fix)** Fix suggestion not visible in remote for 2024.3
 - **(Bug Fix)** /test: update capability card text
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.58-SNAPSHOT
+toolkitVersion=3.59-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,10 +24,10 @@ kotlin = "2.0.0"
 kotlinCoroutines = "1.8.0"
 mockito = "5.12.0"
 mockitoKotlin = "5.4.0"
-mockk = "1.13.10"
+mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.301"
+telemetryGenerator = "1.0.307"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -67,7 +67,7 @@ class BrowserConnector(
                                 it.elementId(source.asText())
                             }
                         } else if (module != null && trigger != null) {
-                            Telemetry.toolkit.openModule.use {
+                            Telemetry.toolkit.willOpenModule.use {
                                 it.module(module.asText())
                                 it.source(trigger.asText())
                             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -57,6 +57,7 @@ import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -608,7 +609,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
                 )
                 session.isGeneratingTests = false
             } finally {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -98,6 +98,7 @@ import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.FeatureId
 import software.aws.toolkits.telemetry.InteractionType
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import software.aws.toolkits.telemetry.UiTelemetry
 import java.io.File
 import java.nio.file.Files
@@ -310,7 +311,8 @@ class CodeTestChatController(
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    requestId = id
+                    requestId = id,
+                    status = Status.ACCEPTED,
                 )
             }
             session.isGeneratingTests = false
@@ -682,7 +684,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.ACCEPTED,
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -878,7 +881,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.REJECTED,
                 )
                 sessionCleanUp(message.tabId)
             }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanException.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanException.kt
@@ -9,7 +9,12 @@ open class CodeWhispererCodeScanException(override val message: String?) : Runti
 
 open class CodeWhispererCodeFixException(override val message: String?) : RuntimeException()
 
-open class CodeWhispererCodeScanServerException(override val message: String?) : RuntimeException()
+open class CodeWhispererCodeScanServerException(
+    override val message: String?,
+    val requestId: String?,
+    val requestServiceType: String?,
+    val httpStatusCode: String?,
+) : RuntimeException()
 
 internal fun noFileOpenError(): Nothing =
     throw CodeWhispererCodeScanException(message("codewhisperer.codescan.no_file_open"))
@@ -29,8 +34,12 @@ internal fun fileFormatNotSupported(format: String): Nothing =
 internal fun fileTooLarge(): Nothing =
     throw CodeWhispererCodeScanException(message("codewhisperer.codescan.file_too_large"))
 
-internal fun codeScanServerException(errorMessage: String): Nothing =
-    throw CodeWhispererCodeScanServerException(errorMessage)
+internal fun codeScanServerException(
+    errorMessage: String,
+    requestId: String? = null,
+    requestServiceType: String? = null,
+    httpStatusCode: String? = null,
+): Nothing = throw CodeWhispererCodeScanServerException(errorMessage, requestId, requestServiceType, httpStatusCode)
 
 internal fun invalidSourceZipError(): Nothing =
     throw CodeWhispererCodeScanException(message("codewhisperer.codescan.invalid_source_zip_telemetry"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
@@ -7,21 +7,16 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.application.ApplicationInfo
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.modules
-import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.vfs.LocalFileSystem
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.time.withTimeout
 import kotlinx.coroutines.withContext
-import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
-import org.apache.commons.codec.digest.DigestUtils
 import software.amazon.awssdk.services.codewhisperer.model.ArtifactType
 import software.amazon.awssdk.services.codewhisperer.model.CodeScanFindingsSchema
 import software.amazon.awssdk.services.codewhisperer.model.CodeScanStatus
@@ -38,14 +33,12 @@ import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
-import software.aws.toolkits.core.utils.toHexString
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.CodeScanSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CodeScanResponseContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CreateUploadUrlServiceInvocationContext
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_POLLING_INTERVAL_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCANS_THROTTLING_MESSAGE
@@ -59,14 +52,12 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.getTelemetryErrorMessage
 import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
 import software.aws.toolkits.resources.message
-import software.aws.toolkits.telemetry.CodewhispererCodeScanScope
 import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.nio.file.Path
 import java.time.Duration
 import java.time.Instant
 import java.util.UUID
 import kotlin.coroutines.coroutineContext
-import kotlin.io.path.pathString
 
 class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
     private val clientToken: UUID = UUID.randomUUID()
@@ -112,12 +103,12 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             // 2 & 3. CreateUploadURL and upload the context.
             currentCoroutineContext.ensureActive()
             val artifactsUploadStartTime = now()
-            val codeScanName = generateScanName()
+            val codeScanName = UUID.randomUUID().toString()
 
-            val taskType = if (sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
-                CodeWhispererConstants.UploadTaskType.SCAN_PROJECT
-            } else {
+            val taskType = if (isAutoScan()) {
                 CodeWhispererConstants.UploadTaskType.SCAN_FILE
+            } else {
+                CodeWhispererConstants.UploadTaskType.SCAN_PROJECT
             }
 
             val sourceZipUploadResponse =
@@ -375,26 +366,6 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
     private fun isAutoScan(): Boolean =
         sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.FILE && !sessionContext.sessionConfig.isInitiatedByChat()
 
-    private fun generateScanName(): String {
-        val clientId = AwsSettings.getInstance().clientId
-        val filePath = sessionContext.sessionConfig.getSelectedFile()?.toNioPath()?.pathString
-        val scope = CodeWhispererTelemetryService.getInstance().mapToTelemetryScope(
-            sessionContext.codeAnalysisScope,
-            sessionContext.sessionConfig.isInitiatedByChat()
-        )
-        val projectId = if (scope != CodewhispererCodeScanScope.PROJECT && filePath != null) {
-            filePath
-        } else {
-            ApplicationManager.getApplication().runReadAction<String> {
-                sessionContext.project.modules.map { module ->
-                    ModuleRootManager.getInstance(module).contentRoots.firstOrNull()?.path
-                }.joinToString(",")
-            }
-        }
-
-        return DigestUtils.sha256("$clientId::$projectId::$scope").toHexString()
-    }
-
     companion object {
         private val LOG = getLogger<CodeWhispererCodeScanSession>()
         private val MAPPER = jacksonObjectMapper()
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt
@@ -285,7 +285,7 @@ class CodeWhispererTelemetryService {
         )
     }
 
-    fun mapToTelemetryScope(codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, initiatedByChat: Boolean): CodewhispererCodeScanScope =
+    private fun mapToTelemetryScope(codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, initiatedByChat: Boolean): CodewhispererCodeScanScope =
         when (codeAnalysisScope) {
             CodeWhispererConstants.CodeAnalysisScope.FILE -> {
                 if (initiatedByChat) {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererZipUploadManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererZipUploadManager.kt
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/PluginResolverTest.kt

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class BrowserConnector(`
`67`	`67`	`it.elementId(source.asText())`
`68`	`68`	`}`
`69`	`69`	`} else if (module != null && trigger != null) {`
`70`		`- Telemetry.toolkit.openModule.use {`
	`70`	`+ Telemetry.toolkit.willOpenModule.use {`
`71`	`71`	`it.module(module.asText())`
`72`	`72`	`it.source(trigger.asText())`
`73`	`73`	`}`