feat(amazonq): Enable one-click collection of logs from chat

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -33,6 +33,7 @@
         <action id="aws.toolkit.open.q.window" class="software.aws.toolkits.jetbrains.services.amazonq.QRefreshPanelAction"/>
         <group id="aws.q.toolwindow.titleBar" popup="false" compact="true">
             <reference id="aws.toolkit.open.q.window"/>
+            <action class="software.aws.toolkits.jetbrains.services.amazonq.GetAmazonQLogsAction"/>
         </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
         <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>

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

@@ -0,0 +1,56 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq
+
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionPlaces
+import com.intellij.openapi.actionSystem.ActionUiKind
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.impl.SimpleDataContext
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.IconLoader
+import com.intellij.ui.ColorUtil
+import com.intellij.ui.JBColor
+import com.intellij.util.IconUtil
+import com.intellij.util.ui.UIUtil
+import software.aws.toolkits.jetbrains.utils.notifyInfo
+import software.aws.toolkits.resources.AmazonQBundle
+import software.aws.toolkits.resources.AmazonQBundle.message
+
+class GetAmazonQLogsAction : DumbAwareAction(
+    AmazonQBundle.message("amazonq.getLogs.tooltip.text")
+) {
+
+    override fun update(e: AnActionEvent) {
+        super.update(e)
+        val baseIcon = IconLoader.getIcon("/icons/file.svg", GetAmazonQLogsAction::class.java)
+        e.presentation.icon = if (!JBColor.isBright()) {
+            baseIcon
+        } else {
+            IconUtil.colorize(baseIcon, ColorUtil.brighter(UIUtil.getLabelForeground(), 2))
+        }
+    }
+
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        showLogCollectionWarningGetLogs(project)
+    }
+
+    companion object {
+        fun showLogCollectionWarningGetLogs(project: Project) {
+            try {
+                val action = ActionManager.getInstance().getAction("CollectZippedLogs")
+                val datacontxt = SimpleDataContext.builder().add(CommonDataKeys.PROJECT, project).build()
+                val ae = AnActionEvent.createEvent(action, datacontxt, null, ActionPlaces.UNKNOWN, ActionUiKind.POPUP, null)
+                action.actionPerformed(ae)
+            } catch (_: Exception) {
+                notifyInfo(message("amazonq.getLogs.tooltip.text"), message("amazonq.logs.warning"))
+            }
+        }
+    }
+}

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

@@ -33,6 +33,7 @@ import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.services.amazonq.GetAmazonQLogsAction
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AppConnection
 import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageSerializer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQChatServer
@@ -419,33 +420,40 @@ class BrowserConnector(
             }
 
             CHAT_TAB_BAR_ACTIONS -> {
-                handleChat(AmazonQChatServer.tabBarActions, node) { params, invoke ->
-                    invoke()
-                        .whenComplete { actions, error ->
-                            try {
-                                if (error != null) {
-                                    throw error
-                                }
-
-                                browser.postChat(
-                                    FlareUiMessage(
-                                        command = CHAT_TAB_BAR_ACTIONS,
-                                        params = actions
+                val action = node.params.get("action")
+                if (action.textValue() == "show_logs") {
+                    runInEdt {
+                        GetAmazonQLogsAction.showLogCollectionWarningGetLogs(project)
+                    }
+                } else {
+                    handleChat(AmazonQChatServer.tabBarActions, node) { params, invoke ->
+                        invoke()
+                            .whenComplete { actions, error ->
+                                try {
+                                    if (error != null) {
+                                        throw error
+                                    }
+
+                                    browser.postChat(
+                                        FlareUiMessage(
+                                            command = CHAT_TAB_BAR_ACTIONS,
+                                            params = actions
+                                        )
                                     )
-                                )
-                            } catch (e: Exception) {
-                                val cause = if (e is CompletionException) e.cause else e
-
-                                // dont post error to UI if user cancels export
-                                if (cause is ResponseErrorException && cause.responseError.code == ResponseErrorCode.RequestCancelled.getValue()) {
-                                    return@whenComplete
-                                }
-                                LOG.error { "Failed to perform chat tab bar action $e" }
-                                params.tabId?.let {
-                                    browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
+                                } catch (e: Exception) {
+                                    val cause = if (e is CompletionException) e.cause else e
+
+                                    // dont post error to UI if user cancels export
+                                    if (cause is ResponseErrorException && cause.responseError.code == ResponseErrorCode.RequestCancelled.getValue()) {
+                                        return@whenComplete
+                                    }
+                                    LOG.error { "Failed to perform chat tab bar action $e" }
+                                    params.tabId?.let {
+                                        browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
+                                    }
                                 }
                             }
-                        }
+                    }
                 }
             }
 

plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

@@ -6,6 +6,9 @@ amazonqInlineChat.popup.editCode = Edit Code
 amazonqInlineChat.popup.generating = Generating...
 amazonqInlineChat.popup.reject=Reject \u238B
 amazonqInlineChat.popup.title=Enter Instructions for Q
+amazonq.getLogs=Get Amazon Q logs
+amazonq.getLogs.tooltip.text=Show Logs
+amazonq.logs.warning=Cannot retrieve logs. Please try Help-> Collect Logs and Diagnostic data
 amazonq.refresh.panel=Refresh Chat Session
 amazonq.title=Amazon Q
 amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can disable it from Amazon Q settings.

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt

@@ -37,6 +37,7 @@ class AwsServerCapabilitiesProvider {
             mcpServers = true,
             // Seems like this is the only way to bounce reroute back to the LSP?
             reroute = true,
+            showLogs = true
         )
     }
 }
@@ -51,6 +52,7 @@ data class ChatOptions(
     val export: Boolean,
     val mcpServers: Boolean,
     val reroute: Boolean,
+    val showLogs: Boolean,
 )
 
 data class QuickActions(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt

@@ -32,6 +32,7 @@ data class DeveloperProfiles(
 
 data class WindowSettings(
     val showSaveFileDialog: Boolean,
+    val showLogs: Boolean,
 )
 
 data class ClientInfoMetadata(
@@ -73,7 +74,8 @@ fun createExtendedClientMetadata(project: Project): ExtendedClientMetadata {
                     workspaceFilePath = project.workspaceFile?.path,
                 ),
                 window = WindowSettings(
-                    showSaveFileDialog = true
+                    showSaveFileDialog = true,
+                    showLogs = true,
                 )
             ),
             contextConfiguration = ContextConfiguration(