fix(amazonq): fix issue where chat messages get sent to all projects (#5787)

rli · manodnyab · web-flow · commit 060a13248a44 · 2025-06-04T21:14:56.000-07:00
* fix(amazonq): fix issue where chat messages get sent to all projects

* callsites

---------

Co-authored-by: manodnyab &lt;66754471+manodnyab@users.noreply.github.com&gt;
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
@@ -29,7 +29,7 @@ class ActionRegistrar {
 
     fun reportMessageClick(command: EditorContextCommand, project: Project) {
         if (command == EditorContextCommand.GenerateUnitTests) {
-            AsyncChatUiListener.notifyPartialMessageUpdate(Gson().toJson(TestCommandMessage()))
+            AsyncChatUiListener.notifyPartialMessageUpdate(project, Gson().toJson(TestCommandMessage()))
         } else {
             // new agentic chat route
             ApplicationManager.getApplication().executeOnPooledThread {
@@ -45,7 +45,7 @@ class ActionRegistrar {
                         val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
                         uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)
                     }
-                    AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                    AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
                 }
             }
         }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/ExplainCodeIssueAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/ExplainCodeIssueAction.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.cwc.commands.codescan.actions
 
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataKey
@@ -18,7 +19,14 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
 
 class ExplainCodeIssueAction : AnAction(), DumbAware {
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = e.project != null
+    }
+
     override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
         val issueDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.explainissue")
         val issueContext = e.getData(issueDataKey) ?: return
 
@@ -50,7 +58,7 @@ class ExplainCodeIssueAction : AnAction(), DumbAware {
                 )
 
                 val uiMessage = FlareUiMessage(SEND_TO_PROMPT, params)
-                AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
@@ -315,6 +315,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
 
     override fun sendChatUpdate(params: LSPAny): CompletableFuture<Unit> {
         AsyncChatUiListener.notifyPartialMessageUpdate(
+            project,
             FlareUiMessage(
                 command = CHAT_SEND_UPDATE,
                 params = params,
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt
@@ -3,27 +3,29 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
 
-import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import com.intellij.util.messages.Topic
 import java.util.EventListener
 
+@Deprecated("Why are we using a message bus for this????????")
 interface AsyncChatUiListener : EventListener {
     @Deprecated("shouldn't need this version")
     fun onChange(command: String) {}
 
     fun onChange(command: FlareUiMessage) {}
 
     companion object {
-        @Topic.AppLevel
+        @Topic.ProjectLevel
         val TOPIC = Topic.create("Partial chat message provider", AsyncChatUiListener::class.java)
 
-        fun notifyPartialMessageUpdate(command: FlareUiMessage) {
-            ApplicationManager.getApplication().messageBus.syncPublisher(TOPIC).onChange(command)
+        @Deprecated("Why are we using a message bus for this????????")
+        fun notifyPartialMessageUpdate(project: Project, command: FlareUiMessage) {
+            project.messageBus.syncPublisher(TOPIC).onChange(command)
         }
 
         @Deprecated("shouldn't need this version")
-        fun notifyPartialMessageUpdate(command: String) {
-            ApplicationManager.getApplication().messageBus.syncPublisher(TOPIC).onChange(command)
+        fun notifyPartialMessageUpdate(project: Project, command: String) {
+            project.messageBus.syncPublisher(TOPIC).onChange(command)
         }
     }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt
@@ -37,7 +37,7 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
 
 @Service(Service.Level.PROJECT)
-class ChatCommunicationManager(private val cs: CoroutineScope) {
+class ChatCommunicationManager(private val project: Project, private val cs: CoroutineScope) {
     val uiReady = CompletableDeferred<Boolean>()
     private val chatPartialResultMap = ConcurrentHashMap<String, String>()
     private val inflightRequestByTabId = ConcurrentHashMap<String, CompletableFuture<String>>()
@@ -53,7 +53,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {
     fun notifyUi(uiMessage: FlareUiMessage) {
         cs.launch {
             uiReady.await()
-            AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+            AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
         }
     }
 
@@ -148,7 +148,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {
                                 params = partialChatResult,
                                 isPartialResult = true
                             )
-                            AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                            AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
                             finalResultProcessed[token] = true
                             ChatAsyncResultManager.getInstance(project).setResult(token, partialResultMap)
                             return
@@ -169,7 +169,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {
                     params = partialChatResult,
                     isPartialResult = true
                 )
-                AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ActionRegistrar {`
`29`	`29`
`30`	`30`	`fun reportMessageClick(command: EditorContextCommand, project: Project) {`
`31`	`31`	`if (command == EditorContextCommand.GenerateUnitTests) {`
`32`		`- AsyncChatUiListener.notifyPartialMessageUpdate(Gson().toJson(TestCommandMessage()))`
	`32`	`+ AsyncChatUiListener.notifyPartialMessageUpdate(project, Gson().toJson(TestCommandMessage()))`
`33`	`33`	`} else {`
`34`	`34`	`// new agentic chat route`
`35`	`35`	`ApplicationManager.getApplication().executeOnPooledThread {`
`@@ -45,7 +45,7 @@ class ActionRegistrar {`
`45`	`45`	`val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)`
`46`	`46`	`uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)`
`47`	`47`	`}`
`48`		`- AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)`
	`48`	`+ AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import java.util.concurrent.CompletableFuture`
`37`	`37`	`import java.util.concurrent.ConcurrentHashMap`
`38`	`38`
`39`	`39`	`@Service(Service.Level.PROJECT)`
`40`		`-class ChatCommunicationManager(private val cs: CoroutineScope) {`
	`40`	`+class ChatCommunicationManager(private val project: Project, private val cs: CoroutineScope) {`
`41`	`41`	`val uiReady = CompletableDeferred<Boolean>()`
`42`	`42`	`private val chatPartialResultMap = ConcurrentHashMap<String, String>()`
`43`	`43`	`private val inflightRequestByTabId = ConcurrentHashMap<String, CompletableFuture<String>>()`
`@@ -53,7 +53,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {`
`53`	`53`	`fun notifyUi(uiMessage: FlareUiMessage) {`
`54`	`54`	`cs.launch {`
`55`	`55`	`uiReady.await()`
`56`		`- AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)`
	`56`	`+ AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`@@ -148,7 +148,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {`
`148`	`148`	`params = partialChatResult,`
`149`	`149`	`isPartialResult = true`
`150`	`150`	`)`
`151`		`- AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)`
	`151`	`+ AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)`
`152`	`152`	`finalResultProcessed[token] = true`
`153`	`153`	`ChatAsyncResultManager.getInstance(project).setResult(token, partialResultMap)`
`154`	`154`	`return`
`@@ -169,7 +169,7 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {`
`169`	`169`	`params = partialChatResult,`
`170`	`170`	`isPartialResult = true`
`171`	`171`	`)`
`172`		`- AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)`
	`172`	`+ AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`