Merge branch 'main' into selective-transform-telemetry

Author: dhasani23

.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : " Chosing cancel on sign out confirmation now cancels the sign out and does not delete profiles from ~/.aws/config (#5167)"
+}

.changes/next-release/bugfix-4188d9b7-63eb-4e12-b3ee-4aec88b546be.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix `@workspace` missing from the Amazon Q Chat welcome tab"
+}

.changes/next-release/bugfix-48a5cdf7-da5b-4b77-b7b6-a0996d3cf7ff.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix for /review LLM based code issues for file review on windows"
+}

.changes/next-release/bugfix-64bb518a-0010-4d02-aef8-90487f096b15.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix for File Review payload and Regex error for payload generation"
+}

.changes/next-release/bugfix-8a4575bc-0263-45cb-bf85-04620e306a8f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Transformation: show build logs when server-side build fails"
+}

.changes/next-release/feature-d6ec19f0-49b2-4abe-ba30-c946dae6ce27.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add acknowledgement button for Amazon Q Chat disclaimer"
+}

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

@@ -8,6 +8,7 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
+import software.aws.toolkits.jetbrains.settings.MeetQSettings
 
 /*
 Displays the web view for the Amazon Q tool window
@@ -85,12 +86,14 @@ class Browser(parent: Disposable) : Disposable {
                                 $postMessageToJavaJsCode
                             }
                         },
+                        ${MeetQSettings.getInstance().reinvent2024OnboardingCount < MAX_ONBOARDING_PAGE_COUNT},
+                        ${MeetQSettings.getInstance().disclaimerAcknowledged},
                         $isFeatureDevAvailable, // whether /dev is available
                         $isCodeTransformAvailable, // whether /transform is available
                         $isDocAvailable, // whether /doc is available
                         $isCodeScanAvailable, // whether /scan is available
                         $isCodeTestAvailable // whether /test is available
-                    ); 
+                    );
                 }
             </script>        
         """.trimIndent()
@@ -110,5 +113,6 @@ class Browser(parent: Disposable) : Disposable {
 
     companion object {
         private const val WEB_SCRIPT_URI = "http://mynah/js/mynah-ui.js"
+        private const val MAX_ONBOARDING_PAGE_COUNT = 3
     }
 }

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.webview
 
 import com.intellij.ide.BrowserUtil
+import com.intellij.ide.util.RunOnceUtil
 import com.intellij.ui.jcef.JBCefJSQuery.Response
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.channels.awaitClose
@@ -22,6 +23,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.util.command
 import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
+import software.aws.toolkits.jetbrains.settings.MeetQSettings
 import software.aws.toolkits.telemetry.Telemetry
 import java.util.function.Function
 
@@ -40,7 +42,16 @@ class BrowserConnector(
             .onEach { json ->
                 val node = serializer.toNode(json)
                 when (node.command) {
-                    "ui-is-ready" -> uiReady.complete(true)
+                    "ui-is-ready" -> {
+                        uiReady.complete(true)
+                        RunOnceUtil.runOnceForApp("AmazonQ-UI-Ready") {
+                            MeetQSettings.getInstance().reinvent2024OnboardingCount += 1
+                        }
+                    }
+
+                    "disclaimer-acknowledged" -> {
+                        MeetQSettings.getInstance().disclaimerAcknowledged = true
+                    }
 
                     // some weird issue preventing deserialization from working
                     "open-user-guide" -> {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -124,6 +124,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         )
 
         val job = startTestGenerationResponse.testGenerationJob()
+        session.startTestGenerationRequestId = startTestGenerationResponse.responseMetadata().requestId()
         session.testGenerationJobGroupName = job.testGenerationJobGroupName()
         session.testGenerationJob = job.testGenerationJobId()
         throwIfCancelled(session)
@@ -522,7 +523,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 session.isGeneratingTests = false
             } finally {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -282,14 +282,18 @@ class CodeTestChatController(
             val request = requestData.toChatRequest()
             client.generateAssistantResponse(request, responseHandler).await()
             // TODO: Need to send isCodeBlockSelected field
-            AmazonqTelemetry.utgGenerateTests(
-                cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
-                hasUserPromptSupplied = session.hasUserPromptSupplied,
-                isSupportedLanguage = false,
-                credentialStartUrl = getStartUrl(project),
-                result = MetricResult.Succeeded,
-                perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
-            )
+            requestId.let { id ->
+                LOG.debug { "$FEATURE_NAME: Unit test generation requestId: $id" }
+                AmazonqTelemetry.utgGenerateTests(
+                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                    hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isSupportedLanguage = false,
+                    credentialStartUrl = getStartUrl(project),
+                    result = MetricResult.Succeeded,
+                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                    requestId = id
+                )
+            }
             session.isGeneratingTests = false
             codeTestChatHelper.updateUI(
                 loadingChat = false,
@@ -599,7 +603,8 @@ class CodeTestChatController(
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -792,7 +797,8 @@ class CodeTestChatController(
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 sessionCleanUp(message.tabId)
             }