removing usage of messagebus

Author: LokeshDogga13

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

@@ -31,7 +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
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessageConnector
@@ -65,21 +65,6 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
     private val editorThemeAdapter = EditorThemeAdapter()
     private val appConnections = mutableListOf<AppConnection>()
 
-    init {
-        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)
@@ -134,6 +119,11 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                     browser.complete(
                         Browser(this@AmazonQPanel, webUri, project).also { browserInstance ->
                             wrapper.setContent(browserInstance.component())
+                            
+                            // Register direct callback instead of using message bus
+                            ChatCommunicationManager.getInstance(project).setChatUpdateCallback { message ->
+                                browserInstance.postChat(message)
+                            }
 
                             // Add DropTarget to the browser component
                             // JCEF does not propagate OS-level dragenter, dragOver and drop into DOM.

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -399,8 +399,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
     }
 
     override fun sendChatUpdate(params: LSPAny) {
-        AsyncChatUiListener.notifyPartialMessageUpdate(
-            project,
+        chatManager.notifyUi(
             FlareUiMessage(
                 command = CHAT_SEND_UPDATE,
                 params = params,

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AsyncChatUiListener.kt

@@ -23,6 +23,7 @@ interface AsyncChatUiListener : EventListener {
             project.messageBus.syncPublisher(TOPIC).onChange(command)
         }
 
+        // will be removed in next iteration.
         @Deprecated("shouldn't need this version")
         fun notifyPartialMessageUpdate(project: Project, command: String) {
             project.messageBus.syncPublisher(TOPIC).onChange(command)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

@@ -49,10 +49,16 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
         uiReady.complete(true)
     }
 
+    private var chatUpdateCallback: ((FlareUiMessage) -> Unit)? = null
+
+    fun setChatUpdateCallback(callback: (FlareUiMessage) -> Unit) {
+        chatUpdateCallback = callback
+    }
+
     fun notifyUi(uiMessage: FlareUiMessage) {
         cs.launch {
             uiReady.await()
-            AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
+            chatUpdateCallback?.invoke(uiMessage)
         }
     }
 
@@ -131,13 +137,10 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
         val encryptedPartialChatResult = getObject(params, String::class.java)
         if (encryptedPartialChatResult != null) {
             val partialChatResult = AmazonQLspService.getInstance(project).encryptionManager.decrypt(encryptedPartialChatResult)
-            val uiMessage = convertToJsonToSendToChat(
+            notifyUi(FlareUiMessage(
                 command = SEND_CHAT_COMMAND_PROMPT,
-                tabId = tabId,
                 params = partialChatResult,
-                isPartialResult = true
-            )
-            AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
+            ))
         }
     }