merge conflicts resolved

Author: manodnyab

.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"
+  } ]
+}

.changes/3.66.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-04-11",
+  "version" : "3.66",
+  "entries" : [ {
+    "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."
+  }, {
+    "type" : "bugfix",
+    "description" : "Unit test generation now completes successfully when using the `/test` command "
+  } ]
+}

.changes/next-release/bugfix-00947041-108c-4ef1-bec6-eb749dae7c2f.json

@@ -1,6 +1,13 @@
+# _3.66_ (2025-04-11)
+- **(Feature)** 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.
+- **(Bug Fix)** Unit test generation now completes successfully when using the `/test` command
+
 # _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

CHANGELOG.md

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

gradle.properties

@@ -178,7 +178,9 @@ class BrowserConnector(
                 var encryptionManager: JwtEncryptionManager? = null
                 val result = AmazonQLspService.executeIfRunning(project) { server ->
                     encryptionManager = this.encryptionManager
-                    server.sendChatPrompt(EncryptedChatParams(encryptionManager!!.encrypt(chatParams), partialResultToken))
+
+                    encryptionManager?.encrypt(chatParams)?.let { EncryptedChatParams(it, partialResultToken) }?.let { server.sendChatPrompt(it) }
+
                 } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
 
                 result.whenComplete {
@@ -187,7 +189,7 @@ class BrowserConnector(
                     val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
                         node.command,
                         requestFromUi.params.tabId,
-                        encryptionManager?.decrypt(value) ?: "",
+                        encryptionManager?.decrypt(value).orEmpty(),
                         isPartialResult = false
                     )
                     browser.postChat(messageToChat)

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

@@ -409,6 +409,7 @@ class CodeTestChatController(
             .build()
         return GenerateAssistantResponseRequest.builder()
             .conversationState(conversationState)
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(context.project)?.arn)
             .build()
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.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,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt

@@ -210,6 +210,7 @@ class ChatSessionV1(
             .build()
         return GenerateAssistantResponseRequest.builder()
             .conversationState(conversationState)
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
             .build()
     }
 
@@ -294,6 +295,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
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.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) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.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"

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.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 {

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.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 {

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.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"
     }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -61,6 +61,7 @@ class AmazonQStreamingClient(private val project: Project) {
                             it.exportId(exportId)
                             it.exportIntent(exportIntent)
                             it.exportContext(exportContext)
+                            it.profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
                         },
                         ExportResultArchiveResponseHandler.builder().subscriber(
                             ExportResultArchiveResponseHandler.Visitor.builder()