From e1e517789f424f2795fb5afd3393ae414980e681 Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Wed, 23 Oct 2024 16:50:23 -0400 Subject: [PATCH 1/6] feat(amazonq) Increase polling rate for Q agent code summary --- .../feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json | 4 ++++ .../services/amazonqFeatureDev/session/CodeGenerationState.kt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json diff --git a/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json b/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json new file mode 100644 index 00000000000..0b8ba50cb01 --- /dev/null +++ b/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json @@ -0,0 +1,4 @@ +{ + "type" : "feature", + "description" : "Provide more frequent updates about code changes made by agent" +} \ No newline at end of file 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 index c5d7acccb17..d3a1f03c9d7 100644 --- 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 @@ -120,8 +120,8 @@ class CodeGenerationState( } private suspend fun CodeGenerationState.generateCode(codeGenerationId: String, messenger: MessagePublisher): CodeGenerationResult { - val pollCount = 180 - val requestDelay = 10000L + val pollCount = 360 + val requestDelay = 5000L repeat(pollCount) { val codeGenerationResultState = config.featureDevService.getTaskAssistCodeGeneration( From 35eea6a78034cb05ca463c97598469b481e77bcd Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Wed, 23 Oct 2024 17:56:49 -0400 Subject: [PATCH 2/6] Adjusted CodeGenerationStateTest to be aligned with new polling rate --- .../amazonqFeatureDev/session/CodeGenerationStateTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a1d25f7944a..ab209ad42b0 100644 --- 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 @@ -164,7 +164,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() { } verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) } - verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) } + verify(exactly = 360) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) } coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) } } } From 157bc2d6e9430430be6f9aff048c5102b4ddad1b Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Wed, 23 Oct 2024 18:03:30 -0400 Subject: [PATCH 3/6] Removed forced Read-Only view for before diff on Q code changes --- .../amazonqFeatureDev/controller/FeatureDevController.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt index af79bca98c8..9bb0dcb4915 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt @@ -219,7 +219,6 @@ class FeatureDevController( } val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null) - request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true) DiffManager.getInstance().showDiff(project, request) } From c55035af4a9fde4a174b0047a967a2a46b91465f Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Wed, 23 Oct 2024 18:48:14 -0400 Subject: [PATCH 4/6] Reverting remove read-only view change --- .../amazonqFeatureDev/controller/FeatureDevController.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt index 9bb0dcb4915..af79bca98c8 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt @@ -219,6 +219,7 @@ class FeatureDevController( } val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null) + request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true) DiffManager.getInstance().showDiff(project, request) } From 5092f74c29af4c44eead0d92948baf9b189bd314 Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Thu, 24 Oct 2024 14:17:48 -0400 Subject: [PATCH 5/6] fix(amazonq): Fixed syntax error in CodeGenerationStateTest --- .../amazonqFeatureDev/session/CodeGenerationStateTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 1e5fcf1a85b..e488d5e4731 100644 --- 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 @@ -163,8 +163,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() { assertThat(actual.interaction.content).isEqualTo("") } - verify(exactly = 1) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage) } - verify(exactly = 360) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) } + verify(exactly = 360) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId) } coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) } } } From a2f4cf1be6165e6f151d575d6f5da3460f18ddbb Mon Sep 17 00:00:00 2001 From: JuusticeT Date: Fri, 25 Oct 2024 15:21:03 -0400 Subject: [PATCH 6/6] feat(Amazonq): Remove forced read-only view from before diff on agent code changess --- .../feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json | 4 ++++ .../amazonqFeatureDev/controller/FeatureDevController.kt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json diff --git a/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json b/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json new file mode 100644 index 00000000000..627830c9ab6 --- /dev/null +++ b/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json @@ -0,0 +1,4 @@ +{ + "type" : "feature", + "description" : "Remove read-only mode on before diff of code changes generated by agent" +} \ No newline at end of file diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt index 4fa4381e319..84d2cd084c8 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt @@ -8,7 +8,6 @@ import com.intellij.diff.DiffContentFactory import com.intellij.diff.DiffManager import com.intellij.diff.contents.EmptyContent import com.intellij.diff.requests.SimpleDiffRequest -import com.intellij.diff.util.DiffUserDataKeys import com.intellij.ide.BrowserUtil import com.intellij.openapi.application.runInEdt import com.intellij.openapi.command.WriteCommandAction @@ -225,7 +224,6 @@ class FeatureDevController( } val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null) - request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true) DiffManager.getInstance().showDiff(project, request) }