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
index 71110cba420..292d1aa7358 100644
--- 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
@@ -3,10 +3,19 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
+import com.intellij.openapi.application.ApplicationManager
 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.FlareUiMessage
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GenericCommandParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendToPromptParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
+import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContextExtractor
+import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTriggerType
 
 // Register Editor Actions in the Editor Context Menu
 class ActionRegistrar {
@@ -15,7 +24,28 @@ class ActionRegistrar {
     val flow = _messages.asSharedFlow()
 
     fun reportMessageClick(command: EditorContextCommand, project: Project) {
-        _messages.tryEmit(ContextMenuActionMessage(command, project))
+        if (command == EditorContextCommand.GenerateUnitTests) {
+            // pre-existing old chat code path
+            _messages.tryEmit(ContextMenuActionMessage(command, project))
+        } else {
+            // new agentic chat route
+            ApplicationManager.getApplication().executeOnPooledThread {
+                runBlocking {
+                    val contextExtractor = ActiveFileContextExtractor.create(fqnWebviewAdapter = null, project = project)
+                    val fileContext = contextExtractor.extractContextForTrigger(ExtractionTriggerType.ContextMenu)
+                    val codeSelection = "\n```\n${fileContext.focusAreaContext?.codeSelection?.trimIndent()?.trim()}\n```\n"
+                    var uiMessage: FlareUiMessage? = null
+                    if (command.verb != "sendToPrompt") {
+                        val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
+                        uiMessage = FlareUiMessage(command = "genericCommand", params = params)
+                    } else {
+                        val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
+                        uiMessage = FlareUiMessage(command = "sendToPrompt", params = params)
+                    }
+                    AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                }
+            }
+        }
     }
 
     fun reportMessageClick(command: EditorContextCommand, issue: MutableMap<String, String>, project: Project) {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt
index d7b8f8d0a42..33a9cc50baa 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt
@@ -31,7 +31,7 @@ enum class EditorContextCommand(
         actionId = "aws.amazonq.generateUnitTests",
     ),
     SendToPrompt(
-        verb = "SendToPrompt",
+        verb = "sendToPrompt",
         actionId = "aws.amazonq.sendToPrompt",
     ),
     ExplainCodeScanIssue(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
index c061f8be1c3..09c970814d3 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
@@ -289,28 +289,11 @@ class ChatController private constructor(
         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"
-
-        if (message.command == EditorContextCommand.SendToPrompt) {
-            messagePublisher.publish(
-                EditorContextCommandMessage(
-                    message = codeSelection,
-                    command = message.command.actionId,
-                    triggerId = triggerId,
-                ),
-            )
-            return
-        }
+
         if (message.command == EditorContextCommand.GenerateUnitTests) {
             // Publish an event to "codetest" tab with command as "test" and type as "addAnswer"
             val messageToPublish = TestCommandMessage()
             context.messagesFromAppToUi.publish(messageToPublish)
-        } else {
-            // Create prompt
-            val prompt = "${message.command} the following part of my code for me: $codeSelection"
-            processPromptActions(prompt, message, triggerId, fileContext)
         }
     }
 
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/GenericCommandParams.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/GenericCommandParams.kt
new file mode 100644
index 00000000000..5cdea4dc84f
--- /dev/null
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/GenericCommandParams.kt
@@ -0,0 +1,26 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
+
+// https://github.com/aws/language-server-runtimes/blob/main/chat-client-ui-types/src/uiContracts.ts#L27
+enum class TriggerType(val value: String) {
+    HOTKEYS("hotkeys"),
+    CLICK("click"),
+    CONTEXT_MENU("contextMenu"),
+}
+
+data class GenericCommandParams(
+    val tabId: String? = null,
+    val selection: String,
+    val triggerType: TriggerType,
+    val genericCommand: String,
+)
+
+// https://github.com/aws/language-server-runtimes/blob/b7c4718b9bd84e08e72b992da5d699549af9f115/chat-client-ui-types/src/uiContracts.ts#L67
+data class SendToPromptParams(
+    val selection: String,
+    val triggerType: TriggerType,
+    val prompt: ChatPrompt? = null,
+    val autoSubmit: Boolean? = null,
+)