Merge branch 'feature/q-lsp-chat' into q-lsp-chat

Author: andrewyuq

.changes/3.69.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-28",
+  "version" : "3.69",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for 2024.1.x IDEs"
+  }, {
+    "type" : "removal",
+    "description" : "Removed support for Gateway 2024.3"
+  } ]
+}

.changes/next-release/bugfix-31222d0f-5ff2-4495-9bf2-e354eabc82c7.json

@@ -1,3 +1,10 @@
+# _3.69_ (2025-04-28)
+- **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
+- **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments
+- **(Bug Fix)** Fix issue where user can become stuck because Amazon Q Chat does not show authentication prompt
+- **(Removal)** Removed support for 2024.1.x IDEs
+- **(Removal)** Removed support for Gateway 2024.3
+
 # _3.68_ (2025-04-23)
 - **(Feature)** Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat
 - **(Feature)** Amazon Q /test: Remove unsupported message for non-java python languages

.changes/next-release/bugfix-7c7e1720-545f-4b5e-8d21-511f40fabf38.json

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

.changes/next-release/bugfix-a7fedb6e-13ab-4d6a-a9ea-293b3f533bad.json

@@ -36,6 +36,7 @@ dependencies {
     implementation(project(":plugin-amazonq:codewhisperer"))
     implementation(project(":plugin-amazonq:mynah-ui"))
     implementation(project(":plugin-amazonq:shared"))
+    implementation(libs.bundles.jackson)
     implementation(libs.lsp4j)
 
     testImplementation(project(":plugin-core"))

.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json

@@ -1,9 +1,10 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
+@file:Suppress("BannedImports")
 package software.aws.toolkits.jetbrains.services.amazonq.webview
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.google.gson.Gson
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.util.RunOnceUtil
 import com.intellij.openapi.project.Project
@@ -28,6 +29,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageSerializ
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickNotification
@@ -36,6 +38,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Butto
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_COPY_CODE_TO_CLIPBOARD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FILE_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INSERT_TO_CURSOR
@@ -58,6 +61,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Encry
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FileClickNotification
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FileClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickNotification
@@ -146,6 +151,14 @@ class BrowserConnector(
         // Wait for UI ready before starting to send messages to the UI.
         uiReady.await()
 
+        // Chat options including history and quick actions need to be sent in once UI is ready
+        val showChatOptions = """{
+            "command": "chatOptions",
+            "params": ${Gson().toJson(AwsServerCapabilitiesProvider.getInstance(project).getChatOptions())}
+            }
+        """.trimIndent()
+        browser.postChat(showChatOptions)
+
         // Send inbound messages to the browser
         val inboundMessages = connections.map { it.messagesFromAppToUi.flow }.merge()
         inboundMessages
@@ -277,33 +290,33 @@ class BrowserConnector(
                     server.linkClick(params)
                 }
             }
-
             CHAT_INFO_LINK_CLICK -> {
                 handleChatNotification<InfoLinkClickNotification, InfoLinkClickParams>(node) { server, params ->
                     server.infoLinkClick(params)
                 }
             }
-
             CHAT_SOURCE_LINK_CLICK -> {
                 handleChatNotification<SourceLinkClickNotification, SourceLinkClickParams>(node) { server, params ->
                     server.sourceLinkClick(params)
                 }
             }
-
+            CHAT_FILE_CLICK -> {
+                handleChatNotification<FileClickNotification, FileClickParams>(node) { server, params ->
+                    server.fileClick(params)
+                }
+            }
             PROMPT_INPUT_OPTIONS_CHANGE -> {
                 handleChatNotification<PromptInputOptionChangeNotification, PromptInputOptionChangeParams>(node) {
                         server, params ->
                     server.promptInputOptionsChange(params)
                 }
             }
-
             CHAT_PROMPT_OPTION_ACKNOWLEDGED -> {
                 val acknowledgedMessage = node.get("params").get("messageId")
                 if (acknowledgedMessage.asText() == "programmerModeCardId") {
                     MeetQSettings.getInstance().amazonQChatPairProgramming = false
                 }
             }
-
             CHAT_FOLLOW_UP_CLICK -> {
                 handleChatNotification<FollowUpClickNotification, FollowUpClickParams>(node) { server, params ->
                     server.followUpClick(params)