Merge main into feature/remote-chat-lsp

aws-toolkit-automation · web-flow · commit cb1570b324c4 · 2025-07-09T15:47:23.000-07:00
diff --git a/.changes/next-release/feature-c8e68d82-96e3-4043-9fd5-4fa97fc00fe6.json b/.changes/next-release/feature-c8e68d82-96e3-4043-9fd5-4fa97fc00fe6.json
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt
@@ -3,6 +3,7 @@
 @file:Suppress("BannedImports")
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
+import com.google.gson.Gson
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -16,6 +17,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendToPromptParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller.TestCommandMessage
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContextExtractor
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTriggerType
 
@@ -26,21 +28,25 @@ class ActionRegistrar {
     val flow = _messages.asSharedFlow()
 
     fun reportMessageClick(command: EditorContextCommand, project: Project) {
-        // new agentic chat route
-        ApplicationManager.getApplication().executeOnPooledThread {
-            runBlocking {
-                val contextExtractor = ActiveFileContextExtractor.create(fqnWebviewAdapter = null, project = project)
-                val fileContext = contextExtractor.extractContextForTrigger(ExtractionTriggerType.ContextMenu)
-                val codeSelection = "\n```\n${fileContext.focusAreaContext?.codeSelection?.trimIndent()?.trim()}\n```\n"
-                var uiMessage: FlareUiMessage? = null
-                if (command.verb != SEND_TO_PROMPT) {
-                    val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
-                    uiMessage = FlareUiMessage(command = GENERIC_COMMAND, params = params)
-                } else {
-                    val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
-                    uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)
+        if (command == EditorContextCommand.GenerateUnitTests) {
+            AsyncChatUiListener.notifyPartialMessageUpdate(project, Gson().toJson(TestCommandMessage()))
+        } else {
+            // new agentic chat route
+            ApplicationManager.getApplication().executeOnPooledThread {
+                runBlocking {
+                    val contextExtractor = ActiveFileContextExtractor.create(fqnWebviewAdapter = null, project = project)
+                    val fileContext = contextExtractor.extractContextForTrigger(ExtractionTriggerType.ContextMenu)
+                    val codeSelection = "\n```\n${fileContext.focusAreaContext?.codeSelection?.trimIndent()?.trim()}\n```\n"
+                    var uiMessage: FlareUiMessage? = null
+                    if (command.verb != SEND_TO_PROMPT) {
+                        val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
+                        uiMessage = FlareUiMessage(command = GENERIC_COMMAND, params = params)
+                    } else {
+                        val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
+                        uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)
+                    }
+                    AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
                 }
-                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/generator.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/generator.ts
@@ -38,6 +38,7 @@ export class QuickActionGenerator {
 
         const quickActionCommands = [
             {
+                groupName: `Q Developer Agent for <b>Software Development</b>`,
                 commands: [
                     ...(this.isFeatureDevEnabled
                         ? [
@@ -77,6 +78,11 @@ export class QuickActionGenerator {
                             },
                         ]
                         : []),
+                ],
+            },
+            {
+                groupName: `Q Developer Agent for <b>Code Transformation</b>`,
+                commands:[
                     ...(this.isCodeTransformEnabled
                         ? [
                             {
@@ -87,7 +93,22 @@ export class QuickActionGenerator {
                         ]
                         : []),
                 ],
-            }
+            },
+            {
+                groupName: 'Quick Actions',
+                commands: [
+                    {
+                        command: '/help',
+                        icon: MynahIcons.HELP,
+                        description: 'Learn more about Amazon Q',
+                    },
+                    {
+                        command: '/clear',
+                        icon: MynahIcons.TRASH,
+                        description: 'Clear this session',
+                    },
+                ],
+            },
         ].filter((section) => section.commands.length > 0)
 
         const commandUnavailability: Record<
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
@@ -344,7 +344,14 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string
             this.connector.startTestGen(testTabId, realPromptText)
             return
         }
-
+        /**
+         * right click -> generate test has no tab id
+         * we have to manually create one if a testgen tab
+         * wasn't previously created
+         */
+        if (!tabID) {
+            tabID = this.mynahUI?.updateStore('', {})
+        }
         const affectedTabId: string | undefined = this.addTab(tabID)
 
         // if there is no test tab, open a new one
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
@@ -34,9 +34,7 @@ class AwsServerCapabilitiesProvider {
             ),
             history = true,
             export = true,
-            mcpServers = true,
-            // Seems like this is the only way to bounce reroute back to the LSP?
-            reroute = true,
+            mcpServers = true
         )
     }
 }
@@ -50,7 +48,6 @@ data class ChatOptions(
     val history: Boolean,
     val export: Boolean,
     val mcpServers: Boolean,
-    val reroute: Boolean,
 )
 
 data class QuickActions(
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
@@ -33,6 +33,7 @@ import org.eclipse.lsp4j.TextDocumentContentChangeEvent
 import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.TextDocumentItem
 import org.eclipse.lsp4j.VersionedTextDocumentIdentifier
+import software.aws.toolkits.core.utils.tryOrNull
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ACTIVE_EDITOR_CHANGED_NOTIFICATION
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.getCursorState
@@ -91,7 +92,7 @@ class TextDocumentServiceHandler(
                 ApplicationManager.getApplication().runReadAction {
                     val existingListener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
                     if (existingListener != null) {
-                        FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener)
+                        tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener) }
                         file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
                     }
                 }
@@ -175,7 +176,7 @@ class TextDocumentServiceHandler(
     ) {
         val listener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
         if (listener != null) {
-            FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener)
+            tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener) }
             file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
 
             cs.launch {

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@ class AwsServerCapabilitiesProvider {`
`34`	`34`	`),`
`35`	`35`	`history = true,`
`36`	`36`	`export = true,`
`37`		`- mcpServers = true,`
`38`		`- // Seems like this is the only way to bounce reroute back to the LSP?`
`39`		`- reroute = true,`
	`37`	`+ mcpServers = true`
`40`	`38`	`)`
`41`	`39`	`}`
`42`	`40`	`}`
`@@ -50,7 +48,6 @@ data class ChatOptions(`
`50`	`48`	`val history: Boolean,`
`51`	`49`	`val export: Boolean,`
`52`	`50`	`val mcpServers: Boolean,`
`53`		`- val reroute: Boolean,`
`54`	`51`	`)`
`55`	`52`
`56`	`53`	`data class QuickActions(`