Merge branch 'main' into regionExpansion_fixlaunch

evanliu048 · evanliu048 · commit b6f5cd24408c · 2025-04-11T15:49:36.000-07:00
# Conflicts:
#	plugins/core/sdk-codegen/codegen-resources/codewhispererstreaming/service-2.json
diff --git a/.changes/3.65.json b/.changes/3.65.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-04-10",
+  "version" : "3.65",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where Amazon Q cannot process chunks from local `@workspace` context"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-00947041-108c-4ef1-bec6-eb749dae7c2f.json b/.changes/next-release/bugfix-00947041-108c-4ef1-bec6-eb749dae7c2f.json
diff --git a/.changes/next-release/feature-5391ea41-f418-4154-9f0c-5de8bacf1aeb.json b/.changes/next-release/feature-5391ea41-f418-4154-9f0c-5de8bacf1aeb.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "The logs emitted by the Agent during user command execution will be accepted and written to `.amazonq/dev/run_command.log` file in the user's local repository."
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # _3.64_ (2025-04-10)
 - **(Bug Fix)** Fix issue where IDE freezes when logging into Amazon Q
 
+# _3.65_ (2025-04-10)
+- **(Bug Fix)** Fix issue where Amazon Q cannot process chunks from local `@workspace` context
+
 # _3.63_ (2025-04-08)
 - **(Feature)** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
 - **(Bug Fix)** Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.65-SNAPSHOT
+toolkitVersion=3.66-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
@@ -227,7 +227,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
             }
 
             is BrowserMessage.PublishWebviewTelemetry -> {
-                publishTelemetry(message)
+//                publishTelemetry(message)
             }
 
             is BrowserMessage.OpenUrl -> {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
@@ -86,7 +86,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
                     if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
                         AmazonQToolWindow.getInstance(project).disposeAndRecreate()
-                        qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
+                        prepareChatContent(project, qPanel)
                     }
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
@@ -30,6 +30,7 @@ import software.aws.toolkits.telemetry.MetricResult
 import java.util.UUID
 
 private val logger = getLogger<CodeGenerationState>()
+private const val RUN_COMMAND_LOG_PATH = ".amazonq/dev/run_command.log"
 
 class CodeGenerationState(
     override val tabID: String,
@@ -211,9 +212,23 @@ private suspend fun CodeGenerationState.generateCode(
                         conversationId = config.conversationId,
                     )
 
-                val newFileInfo = registerNewFiles(newFileContents = codeGenerationStreamResult.new_file_contents)
-                val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)
+                val fileContents = codeGenerationStreamResult.new_file_contents.filterKeys { file ->
+                    if (file.endsWith(RUN_COMMAND_LOG_PATH)) {
+                        val contents: String = codeGenerationStreamResult.new_file_contents[file].orEmpty()
+                        val truncatedContents = if (contents.length > 10000000) {
+                            contents.substring(0, 10000000)
+                        } else {
+                            contents
+                        }
+                        logger.info(truncatedContents) { "Run command log: $truncatedContents" }
+                        false
+                    } else {
+                        true
+                    }
+                }
 
+                val newFileInfo = registerNewFiles(newFileContents = fileContents)
+                val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)
                 return CodeGenerationResult(
                     newFiles = newFileInfo,
                     deletedFiles = deletedFileInfo,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt
@@ -294,6 +294,8 @@ class ChatSessionV1(
         UserIntent.EXPLAIN_CODE_SELECTION -> FollowUpType.ExplainInDetail
         UserIntent.UNKNOWN_TO_SDK_VERSION -> FollowUpType.Generated
         UserIntent.GENERATE_UNIT_TESTS -> FollowUpType.Generated
+        UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> FollowUpType.Generated
+        UserIntent.CODE_GENERATION -> FollowUpType.Generated
         null -> FollowUpType.Generated
     }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt
@@ -64,6 +64,8 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
         UserIntent.EXPLAIN_CODE_SELECTION -> CwsprChatUserIntent.ExplainCodeSelection
         UserIntent.GENERATE_UNIT_TESTS -> CwsprChatUserIntent.GenerateUnitTests
         UserIntent.UNKNOWN_TO_SDK_VERSION -> CwsprChatUserIntent.Unknown
+        UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> CwsprChatUserIntent.Unknown
+        UserIntent.CODE_GENERATION -> CwsprChatUserIntent.Unknown
     }
 
     private fun getTelemetryTriggerType(triggerType: TriggerType): CwsprChatTriggerInteraction = when (triggerType) {
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.kt
@@ -65,6 +65,8 @@ open class FeatureDevTestBase(
     internal val otherStatus = "Other"
     internal val testTabId = "test-tab-id"
     internal val testFilePaths = mapOf(Pair("test.ts", "This is a comment"))
+    internal val testRunCommandLogPath = ".amazonq/dev/run_command.log"
+    internal val testLogPath = mapOf(Pair(testRunCommandLogPath, "This is a log"))
     internal val testDeletedFiles = listOf("deleted.ts")
     internal val testReferences = listOf(CodeReferenceGenerated())
     internal val testChecksumSha = "test-sha"
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt
@@ -39,13 +39,14 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
     private lateinit var messenger: MessagePublisher
     private val action = SessionStateAction("test-task", userMessage)
     private lateinit var featureDevService: FeatureDevService
+    private lateinit var repoContext: FeatureDevSessionContext
 
     @Before
     override fun setup() {
         featureDevService = mockk<FeatureDevService>()
         every { featureDevService.project } returns projectRule.project
         messenger = mock()
-        val repoContext = mock<FeatureDevSessionContext>()
+        repoContext = mockk<FeatureDevSessionContext>()
         val sessionStateConfig = SessionStateConfig(testConversationId, repoContext, featureDevService)
 
         codeGenerationState =
@@ -103,6 +104,34 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
         coVerify(exactly = 1) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
     }
 
+    @Test
+    fun `test generateCode excludes run_command log file`() {
+        val runCommandLogFileName = "run_command.log"
+
+        val archiveFiles = mapOf(
+            runCommandLogFileName to "newLog",
+            "other.ts" to "other content"
+        )
+        val deletedFiles = emptyList<DeletedFileInfo>()
+        val references = emptyList<CodeReference>()
+
+        every { featureDevService.getTaskAssistCodeGeneration(any(), any()) } returns exampleCompleteGetTaskAssistCodeGenerationResponse
+        every { featureDevService.startTaskAssistCodeGeneration(any(), any(), any(), any(), any()) } returns exampleStartTaskAssistConversationResponse
+        coEvery { featureDevService.exportTaskAssistArchiveResult(any()) } returns
+            CodeGenerationStreamResult(archiveFiles, listOf("deleted.ts"), listOf(CodeReferenceGenerated()))
+
+        runTest {
+            val actual = codeGenerationState.interact(action)
+            val nextState = actual.nextState as PrepareCodeGenerationState
+            assertThat(nextState.filePaths).contains(
+                NewFileZipInfo(runCommandLogFileName, "newLog", rejected = false, changeApplied = false)
+            )
+            assertThat(nextState.filePaths).contains(
+                NewFileZipInfo("other.ts", "other content", rejected = false, changeApplied = false)
+            )
+        }
+    }
+
     @Test(expected = FeatureDevException::class)
     fun `test code generation failed`() =
         runTest {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -528,6 +528,7 @@ class ArtifactHandler(
             TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> CodeTransformArtifactType.ClientInstructions
             TransformationDownloadArtifactType.LOGS -> CodeTransformArtifactType.Logs
             TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> CodeTransformArtifactType.Unknown
+            TransformationDownloadArtifactType.GENERATED_CODE -> CodeTransformArtifactType.Unknown
         }
 
     companion object {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -778,4 +778,5 @@ fun getDownloadedArtifactTextFromType(artifactType: TransformationDownloadArtifa
         TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS -> "upgraded code"
         TransformationDownloadArtifactType.LOGS -> "build log"
         TransformationDownloadArtifactType.UNKNOWN_TO_SDK_VERSION -> "code"
+        TransformationDownloadArtifactType.GENERATED_CODE -> "code"
     }
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt
@@ -9,6 +9,7 @@ import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.mockito.kotlin.argumentCaptor
@@ -34,6 +35,7 @@ class TestLoginBrowser(project: Project) : LoginBrowser(project, "", "") {
     override fun loadWebView(query: JBCefJSQuery) {}
 }
 
+@Disabled
 class LoginBrowserTest {
     private lateinit var sut: TestLoginBrowser
     private val project: Project

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "The logs emitted by the Agent during user command execution will be accepted and written to `.amazonq/dev/run_command.log` file in the user's local repository."
 +}
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`is BrowserMessage.PublishWebviewTelemetry -> {`
`230`		`- publishTelemetry(message)`
	`230`	`+// publishTelemetry(message)`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`is BrowserMessage.OpenUrl -> {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`86`	`86`	`override fun onChange(providerId: String, newScopes: List<String>?) {`
`87`	`87`	`if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {`
`88`	`88`	`AmazonQToolWindow.getInstance(project).disposeAndRecreate()`
`89`		`- qPanel.setContent(AmazonQToolWindow.getInstance(project).component)`
	`89`	`+ prepareChatContent(project, qPanel)`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ class ChatSessionV1(`
`294`	`294`	`UserIntent.EXPLAIN_CODE_SELECTION -> FollowUpType.ExplainInDetail`
`295`	`295`	`UserIntent.UNKNOWN_TO_SDK_VERSION -> FollowUpType.Generated`
`296`	`296`	`UserIntent.GENERATE_UNIT_TESTS -> FollowUpType.Generated`
	`297`	`+ UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> FollowUpType.Generated`
	`298`	`+ UserIntent.CODE_GENERATION -> FollowUpType.Generated`
`297`	`299`	`null -> FollowUpType.Generated`
`298`	`300`	`}`
`299`	`301`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:`
`64`	`64`	`UserIntent.EXPLAIN_CODE_SELECTION -> CwsprChatUserIntent.ExplainCodeSelection`
`65`	`65`	`UserIntent.GENERATE_UNIT_TESTS -> CwsprChatUserIntent.GenerateUnitTests`
`66`	`66`	`UserIntent.UNKNOWN_TO_SDK_VERSION -> CwsprChatUserIntent.Unknown`
	`67`	`+ UserIntent.GENERATE_CLOUDFORMATION_TEMPLATE -> CwsprChatUserIntent.Unknown`
	`68`	`+ UserIntent.CODE_GENERATION -> CwsprChatUserIntent.Unknown`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`private fun getTelemetryTriggerType(triggerType: TriggerType): CwsprChatTriggerInteraction = when (triggerType) {`