Replacing other places as well

Author: LokeshDogga13

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

@@ -31,6 +31,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegi
 import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
@@ -65,6 +66,22 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
     private val editorThemeAdapter = EditorThemeAdapter()
     private val appConnections = mutableListOf<AppConnection>()
 
+    init {
+        // will be removed in next iteration.
+        project.messageBus.connect().subscribe(
+            AsyncChatUiListener.TOPIC,
+            object : AsyncChatUiListener {
+                override fun onChange(command: String) {
+                    browser.get()?.postChat(command)
+                }
+
+                override fun onChange(command: FlareUiMessage) {
+                    browser.get()?.postChat(command)
+                }
+            }
+        )
+    }
+
     val component = panel {
         row {
             cell(webviewContainer)

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

@@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.runBlocking
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GENERIC_COMMAND
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GenericCommandParams
@@ -40,7 +40,8 @@ class ActionRegistrar {
                     val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
                     uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)
                 }
-                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
+                ChatCommunicationManager.getInstance(project).notifyUi(uiMessage)
+                // AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }

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

@@ -11,7 +11,7 @@ import com.intellij.openapi.actionSystem.DataKey
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAware
 import kotlinx.coroutines.runBlocking
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_TO_PROMPT
@@ -58,7 +58,8 @@ class ExplainCodeIssueAction : AnAction(), DumbAware {
                 )
 
                 val uiMessage = FlareUiMessage(SEND_TO_PROMPT, params)
-                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
+                ChatCommunicationManager.getInstance(project).notifyUi(uiMessage)
+//                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }