Merge branch 'main' into lodogga/memoryUsage

LokeshDogga13 · web-flow · commit dbd94a937f2f · 2025-08-12T09:19:56.000-07:00
diff --git a/.changes/3.89.json b/.changes/3.89.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-08-07",
+  "version" : "3.89",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/transform: validate YAML dependency file for required fields"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-bc83a934-5f3d-49d1-9e81-4390229ea052.json b/.changes/next-release/bugfix-bc83a934-5f3d-49d1-9e81-4390229ea052.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.89_ (2025-08-07)
+- **(Bug Fix)** /transform: validate YAML dependency file for required fields
+
 # _3.88_ (2025-08-04)
 - **(Feature)** Add support for 2025.2
 - **(Bug Fix)** Fix unsupported files being shown in file picker when selecting images for adding image context in Windows
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -151,44 +151,44 @@ object IdeVersions {
         Profile(
             name = "2025.2",
             gateway = ProductProfile(
-                sdkVersion = "252.23892.230",
+                sdkVersion = "2025.2",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
-                sdkVersion = "252.23892.248-EAP-SNAPSHOT",
+                sdkVersion = "2025.2",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                     "com.intellij.properties"
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:252.23892.361",
-                    "PythonCore:252.23892.248",
-                    "Docker:252.23892.248",
-                    "com.intellij.modules.json:252.23892.248"
+                    "org.toml.lang:252.23892.464",
+                    "PythonCore:252.23892.458",
+                    "Docker:252.23892.464",
+                    "com.intellij.modules.json:252.23892.360"
                 )
             ),
             ultimate = ProductProfile(
-                sdkVersion = "252.23892.248-EAP-SNAPSHOT",
+                sdkVersion = "2025.2",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
-                    "Pythonid:252.23892.248",
-                    "org.jetbrains.plugins.go:252.23892.248",
-                    "com.intellij.modules.json:252.23892.248"
+                    "Pythonid:252.23892.458",
+                    "org.jetbrains.plugins.go:252.23892.360",
+                    "com.intellij.modules.json:252.23892.360"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2025.2-EAP8-SNAPSHOT",
+                sdkVersion = "2025.2-SNAPSHOT",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2025.2.2",
-                nugetVersion = "2025.2.0-eap08"
+                nugetVersion = "2025.2.0-rc02"
             )
         )
     ).associateBy { it.name }
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.89-SNAPSHOT
+toolkitVersion=3.90-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml b/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" id="q.getLogs"/>
         </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"/>
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/GetAmazonQLogsAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/GetAmazonQLogsAction.kt
@@ -0,0 +1,68 @@
+// 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.icons.AllIcons
+import com.intellij.ide.actions.RevealFileAction
+import com.intellij.ide.logsUploader.LogPacker
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.Messages
+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 kotlinx.coroutines.runBlocking
+import software.aws.toolkits.jetbrains.utils.notifyInfo
+import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
+import software.aws.toolkits.resources.AmazonQBundle.message
+import software.aws.toolkits.resources.AwsCoreBundle
+
+class GetAmazonQLogsAction : DumbAwareAction(message("amazonq.getLogs.tooltip.text")) {
+    private val baseIcon = IconLoader.getIcon("/icons/file.svg", GetAmazonQLogsAction::class.java)
+
+    private val lightIcon by lazy {
+        IconUtil.colorize(baseIcon, ColorUtil.brighter(UIUtil.getLabelForeground(), 2))
+    }
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.icon = if (!JBColor.isBright()) {
+            baseIcon
+        } else {
+            lightIcon
+        }
+    }
+
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        showLogCollectionWarningGetLogs(project)
+    }
+
+    companion object {
+        fun showLogCollectionWarningGetLogs(project: Project) {
+            if (Messages.showOkCancelDialog(
+                    message("amazonq.logs.warning"),
+                    message("amazonq.getLogs"),
+                    AwsCoreBundle.message("general.ok"),
+                    AwsCoreBundle.message("general.cancel"),
+                    AllIcons.General.Warning
+                ) == 0
+            ) {
+                runUnderProgressIfNeeded(project, message("amazonq.getLogs"), cancelable = true) {
+                    runBlocking {
+                        try {
+                            RevealFileAction.openFile(LogPacker.packLogs(project))
+                        } catch (_: Exception) {
+                            notifyInfo(message("amazonq.getLogs"), message("amazonq.logs.error"), project)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/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
@@ -415,33 +416,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))
+                                    }
                                 }
                             }
-                        }
+                    }
                 }
             }
 
diff --git a/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties b/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties
@@ -6,6 +6,10 @@ 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.error=Cannot retrieve logs. Please try Help-> Collect Logs and Diagnostic data
+amazonq.logs.warning=Log files may contain sensitive information such as account IDs, resource names, and other data. Please be careful when sharing these logs.
 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.
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
@@ -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(
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt b/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(
diff --git a/plugins/amazonq/src/main/resources/icons/file.svg b/plugins/amazonq/src/main/resources/icons/file.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="none">
+
+ <g>
+  <title>Layer 1</title>
+  <path id="svg_1" fill="#CCCCCC" d="m13.40117,4.15671l0.32,0.74666l0,8.95997l-1.0134,1.0134l-9.0133,0l-1.01333,-1.0134l0,-11.99997l1.01333,-0.96l6.02667,0l0.69333,0.26667l2.9867,2.98667zm-0.6934,9.70663l0,-7.99997l-3.99997,0l0,-4l-5.01333,0l0,11.99997l9.0133,0zm-2.98663,-8.95997l2.98663,0l-2.98663,-3.04l0,3.04z"/>
+ </g>
+</svg>

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