fix(amazonq): Context menu actions trigger all chat windows (#4744)

* fix(amazonq): chat context menu actions show up in all windows

* Update .changes/next-release/bugfix-5fe1eb51-f0eb-4029-a003-35e6322cef48.json

Co-authored-by: manodnyab <[email protected]>

---------

Co-authored-by: manodnyab <[email protected]>

Author: zixlin7

.changes/next-release/bugfix-5fe1eb51-f0eb-4029-a003-35e6322cef48.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix Amazon Q chat context menu actions show up in all chat windows"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
@@ -13,12 +14,12 @@ class ActionRegistrar {
     private val _messages by lazy { MutableSharedFlow<AmazonQMessage>(extraBufferCapacity = 10) }
     val flow = _messages.asSharedFlow()
 
-    fun reportMessageClick(command: EditorContextCommand) {
-        _messages.tryEmit(ContextMenuActionMessage(command))
+    fun reportMessageClick(command: EditorContextCommand, project: Project) {
+        _messages.tryEmit(ContextMenuActionMessage(command, project))
     }
 
-    fun reportMessageClick(command: EditorContextCommand, issue: MutableMap<String, String>) {
-        _messages.tryEmit(CodeScanIssueActionMessage(command, issue))
+    fun reportMessageClick(command: EditorContextCommand, issue: MutableMap<String, String>, project: Project) {
+        _messages.tryEmit(CodeScanIssueActionMessage(command, issue, project))
     }
 
     // provide singleton access

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/CodeScanIssueActionMessage.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
+import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 
-data class CodeScanIssueActionMessage(val command: EditorContextCommand, val issue: MutableMap<String, String>) : AmazonQMessage
+data class CodeScanIssueActionMessage(val command: EditorContextCommand, val issue: MutableMap<String, String>, val project: Project) : AmazonQMessage

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ContextMenuActionMessage.kt

@@ -3,9 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
+import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 
 /**
  * Event emitted for context menu editor actions
  */
-data class ContextMenuActionMessage(val command: EditorContextCommand) : AmazonQMessage
+data class ContextMenuActionMessage(val command: EditorContextCommand, val project: Project) : AmazonQMessage

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/CustomAction.kt

@@ -27,6 +27,6 @@ open class CustomAction(private val command: EditorContextCommand) : AnAction(),
             else -> TriggerType.ContextMenu
         }
 
-        ActionRegistrar.instance.reportMessageClick(command)
+        ActionRegistrar.instance.reportMessageClick(command, project)
     }
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/CodeScanQActions.kt

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.cwc.commands.codescan.actions
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.DataKey
 import com.intellij.openapi.project.DumbAware
 import software.aws.toolkits.jetbrains.services.cwc.commands.ActionRegistrar
@@ -15,9 +16,10 @@ open class CodeScanQActions(private val command: EditorContextCommand) : AnActio
     override fun actionPerformed(e: AnActionEvent) {
         val issueDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.explainissue")
         val issueContext = e.getData(issueDataKey) ?: return
+        val project = e.getData(CommonDataKeys.PROJECT) ?: return
 
         ActionManager.getInstance().getAction("q.openchat").actionPerformed(e)
 
-        ActionRegistrar.instance.reportMessageClick(command, issueContext)
+        ActionRegistrar.instance.reportMessageClick(command, issueContext, project)
     }
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -299,12 +299,15 @@ class ChatController private constructor(
             "Description:    ${message.issue["description"]} \n" +
             "Code:    $codeSelection"
 
-        processPromptActions(prompt, ContextMenuActionMessage(message.command), triggerId, fileContext, modelPrompt)
+        processPromptActions(prompt, ContextMenuActionMessage(message.command, message.project), triggerId, fileContext, modelPrompt)
     }
 
     // JB specific (not in vscode)
     override suspend fun processContextMenuCommand(message: ContextMenuActionMessage) {
         // Extract context
+        if (message.project != context.project) {
+            return
+        }
         val fileContext = contextExtractor.extractContextForTrigger(ExtractionTriggerType.ContextMenu)
         val triggerId = UUID.randomUUID().toString()
         val codeSelection = "\n```\n${fileContext.focusAreaContext?.codeSelection?.trimIndent()?.trim()}\n```\n"