From 6caa149146402e77013eae2a3de1e08ba00678b1 Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Thu, 6 Mar 2025 11:32:32 -0800
Subject: [PATCH 01/12] feat(amazonq): Add support for Amazon Q chat on remote
 242+ (#4825)

---
 ...oolkit-publish-root-conventions.gradle.kts |   6 +
 plugins/amazonq/build.gradle.kts              |   4 -
 .../services/amazonq/QLoginWebview.kt         |  25 +-
 .../services/amazonq/QOpenPanelAction.kt      |   6 +-
 .../gettingstarted/QGettingStartedContent.kt  |   3 +-
 .../amazonq/toolwindow/AmazonQPanel.kt        |   6 +-
 .../services/amazonq/webview/Browser.kt       |  33 +-
 .../controller/CodeTestChatController.kt      |   2 +-
 .../controller/FeatureDevController.kt        |   2 +-
 .../services/cwc/controller/ChatController.kt |   2 +-
 .../context/file/FileContextExtractor.kt      |   2 +-
 .../focusArea/FocusAreaContextExtractor.kt    |   4 +-
 .../listeners/InlineChatFileListener.kt       |   2 +-
 .../listeners/InlineChatSelectionListener.kt  |   4 +-
 .../META-INF/codetransform-ext-java.xml       |   1 -
 .../codemodernizer/CodeModernizerManager.kt   |   9 -
 .../plan/CodeModernizerPlanEditorProvider.kt  |   3 +-
 .../summary/CodeModernizerSummaryEditor.kt    | 535 ------------------
 .../CodeModernizerSummaryEditorProvider.kt    |  48 --
 .../CodeModernizerSummaryVirtualFile.kt       |  20 -
 .../explorer/actions/ActionFactory.kt         |   5 +-
 .../inlay/CodeWhispererInlayManager.kt        |   6 +-
 .../inlay/CodeWhispererInlayManagerNew.kt     |   6 +-
 .../learn/LearnCodeWhispererEditorProvider.kt |   4 +-
 .../popup/CodeWhispererPopupComponents.kt     |   6 +-
 .../popup/CodeWhispererPopupManager.kt        |   9 +-
 .../popup/CodeWhispererPopupManagerNew.kt     |   6 +-
 .../status/CodeWhispererStatusBarWidget.kt    |   4 +-
 ...WhispererCodeReferenceToolWindowFactory.kt |   3 +-
 .../utils/CodeTransformSharedUtils.kt         |   2 -
 .../impl/jcef/JBCefLocalRequestHandler.kt     |  87 +++
 .../impl/jcef/JBCefStreamResourceHandler.kt   |  78 +++
 .../webview/LocalAssetJBCefRequestHandler.kt  |  83 +++
 .../jetbrains/core/webview/LoginBrowser.kt    |   2 -
 .../core/webview/WebviewResourceHandler.kt    |  88 ---
 .../jetbrains/utils/RemoteEnvUtils.kt         |   2 +-
 .../jetbrains/core/BrowserMessageTest.kt      |   2 +-
 .../explorer/webview/ToolkitLoginWebview.kt   |  27 +-
 .../editor/GettingStartedPanel.kt             |  11 +-
 39 files changed, 336 insertions(+), 812 deletions(-)
 delete mode 100644 plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditor.kt
 delete mode 100644 plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditorProvider.kt
 delete mode 100644 plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryVirtualFile.kt
 create mode 100644 plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt
 create mode 100644 plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefStreamResourceHandler.kt
 create mode 100644 plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
 delete mode 100644 plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt

diff --git a/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts
index 2e4d45b570e..d7b079b1160 100644
--- a/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts
@@ -3,6 +3,7 @@
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
+import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware
 import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 
@@ -75,3 +76,8 @@ tasks.runIde {
     systemProperty("user.home", home)
     environment("HOME", home)
 }
+
+val runSplitIde by intellijPlatformTesting.runIde.registering {
+    splitMode = true
+    splitModeTarget = SplitModeAware.SplitModeTarget.BACKEND
+}
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
index f3caa6e678e..4985f69e765 100644
--- a/plugins/amazonq/build.gradle.kts
+++ b/plugins/amazonq/build.gradle.kts
@@ -1,11 +1,7 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import software.aws.toolkits.gradle.changelog.tasks.GeneratePluginChangeLog
-import software.aws.toolkits.gradle.intellij.IdeFlavor
-import software.aws.toolkits.gradle.intellij.IdeVersions
-import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 
 plugins {
     id("toolkit-publishing-conventions")
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
index bc594209fba..a314ea8d49c 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
@@ -16,7 +16,6 @@ import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.jcef.JBCefJSQuery
-import org.cef.CefApp
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -30,8 +29,8 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
 import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
 import software.aws.toolkits.jetbrains.core.webview.BrowserMessage
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
+import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.core.webview.LoginBrowser
-import software.aws.toolkits.jetbrains.core.webview.WebviewResourceHandlerFactory
 import software.aws.toolkits.jetbrains.isDeveloperMode
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
 import software.aws.toolkits.jetbrains.utils.isQConnected
@@ -108,25 +107,14 @@ class QWebviewPanel private constructor(val project: Project) : Disposable {
 class QWebviewBrowser(val project: Project, private val parentDisposable: Disposable) :
     LoginBrowser(
         project,
-        QWebviewBrowser.DOMAIN,
-        QWebviewBrowser.WEB_SCRIPT_URI
     ),
     Disposable {
     // TODO: confirm if we need such configuration or the default is fine
     override val jcefBrowser = createBrowser(parentDisposable)
     private val query = JBCefJSQuery.create(jcefBrowser)
+    private val assetHandler = LocalAssetJBCefRequestHandler(jcefBrowser)
 
     init {
-        CefApp.getInstance()
-            .registerSchemeHandlerFactory(
-                "http",
-                domain,
-                WebviewResourceHandlerFactory(
-                    domain = "http://$domain/",
-                    assetUri = "/webview/assets/"
-                ),
-            )
-
         loadWebView(query)
 
         query.addHandler(jcefHandler)
@@ -273,12 +261,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
     }
 
     override fun loadWebView(query: JBCefJSQuery) {
-        jcefBrowser.loadHTML(getWebviewHTML(webScriptUri, query))
+        val webScriptUri = assetHandler.createResource(
+            "js/getStart.js",
+            QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/getStart.js")
+        )
+
+        jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
     }
 
     companion object {
         private val LOG = getLogger<QWebviewBrowser>()
-        private const val WEB_SCRIPT_URI = "http://webview/js/getStart.js"
-        private const val DOMAIN = "webview"
     }
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt
index de01e99bade..cab5e06d312 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt
@@ -11,13 +11,11 @@ import icons.AwsIcons
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AMAZON_Q_WINDOW_ID
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.runScanKey
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.UiTelemetry
 
 class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIcons.Logos.AWS_Q) {
     override fun actionPerformed(e: AnActionEvent) {
-        if (isRunningOnRemoteBackend()) return
         val project = e.getRequiredData(CommonDataKeys.PROJECT)
         UiTelemetry.click(project, "q_openChat")
         ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true)
@@ -25,4 +23,8 @@ class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIc
             AmazonQToolWindow.openScanTab(project)
         }
     }
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = e.getData(CommonDataKeys.PROJECT) != null
+    }
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
index afb490b9f19..3e81b2c836d 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt
@@ -18,6 +18,7 @@ import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
 import org.cef.handler.CefLoadHandlerAdapter
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
+import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.EditorThemeAdapter
 import software.aws.toolkits.resources.message
@@ -72,7 +73,7 @@ class QGettingStartedContent(val project: Project) : Disposable {
 
     private fun loadWebView() {
         // load the web app
-        jcefBrowser.loadHTML(getWebviewHTML())
+        jcefBrowser.loadURL(LocalAssetJBCefRequestHandler(jcefBrowser).createResource("content.html", getWebviewHTML()))
     }
 
     private fun getWebviewHTML(): String {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index 396057bc9a9..a0e18e10382 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
-import com.intellij.idea.AppMode
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBTextArea
@@ -15,6 +14,7 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.jcef.JBCefApp
 import software.aws.toolkits.jetbrains.isDeveloperMode
 import software.aws.toolkits.jetbrains.services.amazonq.webview.Browser
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.awt.event.ActionListener
 import javax.swing.JButton
 
@@ -66,8 +66,8 @@ class AmazonQPanel(private val parent: Disposable) {
     private fun init() {
         if (!JBCefApp.isSupported()) {
             // Fallback to an alternative browser-less solution
-            if (AppMode.isRemoteDevHost()) {
-                webviewContainer.add(JBTextArea("Amazon Q chat is not supported in remote dev environment."))
+            if (isRunningOnRemoteBackend()) {
+                webviewContainer.add(JBTextArea("Amazon Q chat is not supported in this remote dev environment because it lacks JCEF webview support."))
             } else {
                 webviewContainer.add(JBTextArea("JCEF not supported"))
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index cc39985dd36..c08ed48c989 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -7,10 +7,11 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
-import org.cef.CefApp
+import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
 import software.aws.toolkits.jetbrains.settings.MeetQSettings
+import java.nio.file.Paths
 
 /*
 Displays the web view for the Amazon Q tool window
@@ -21,6 +22,17 @@ class Browser(parent: Disposable) : Disposable {
 
     val receiveMessageQuery = JBCefJSQuery.create(jcefBrowser)
 
+    private val assetRequestHandler = LocalAssetJBCefRequestHandler(jcefBrowser)
+
+    init {
+        assetRequestHandler.addWildcardHandler("mynah") { path ->
+            val asset = path.replaceFirst("mynah/", "/mynah-ui/assets/")
+            Paths.get(asset).normalize().toString().replace("\\", "/").let {
+                this::class.java.getResourceAsStream(it)
+            }
+        }
+    }
+
     fun init(
         isCodeTransformAvailable: Boolean,
         isFeatureDevAvailable: Boolean,
@@ -29,14 +41,6 @@ class Browser(parent: Disposable) : Disposable {
         isCodeTestAvailable: Boolean,
         highlightCommand: HighlightCommand?,
     ) {
-        // register the scheme handler to route http://mynah/ URIs to the resources/assets directory on classpath
-        CefApp.getInstance()
-            .registerSchemeHandlerFactory(
-                "http",
-                "mynah",
-                AssetResourceHandler.AssetResourceHandlerFactory(),
-            )
-
         loadWebView(isCodeTransformAvailable, isFeatureDevAvailable, isDocAvailable, isCodeScanAvailable, isCodeTestAvailable, highlightCommand)
     }
 
@@ -63,9 +67,13 @@ class Browser(parent: Disposable) : Disposable {
         // setup empty state. The message request handlers use this for storing state
         // that's persistent between page loads.
         jcefBrowser.setProperty("state", "")
+
         // load the web app
-        jcefBrowser.loadHTML(
-            getWebviewHTML(isCodeTransformAvailable, isFeatureDevAvailable, isDocAvailable, isCodeScanAvailable, isCodeTestAvailable, highlightCommand)
+        jcefBrowser.loadURL(
+            assetRequestHandler.createResource(
+                "webview/chat.html",
+                getWebviewHTML(isCodeTransformAvailable, isFeatureDevAvailable, isDocAvailable, isCodeScanAvailable, isCodeTestAvailable, highlightCommand)
+            )
         )
     }
 
@@ -84,7 +92,7 @@ class Browser(parent: Disposable) : Disposable {
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
 
         val jsScripts = """
-            <script type="text/javascript" src="$WEB_SCRIPT_URI" defer onload="init()"></script>
+            <script type="text/javascript" src="http://toolkitasset/mynah/js/mynah-ui.js" defer onload="init()"></script>
             <script type="text/javascript">
                 const init = () => {
                     mynahUI.createMynahUI(
@@ -120,7 +128,6 @@ class Browser(parent: Disposable) : Disposable {
     }
 
     companion object {
-        private const val WEB_SCRIPT_URI = "http://mynah/js/mynah-ui.js"
         private const val MAX_ONBOARDING_PAGE_COUNT = 3
         private val OBJECT_MAPPER = jacksonObjectMapper()
     }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 2807e2cf9c2..d88224fd47e 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -130,7 +130,7 @@ class CodeTestChatController(
 
         ApplicationManager.getApplication().invokeAndWait {
             selectionRange = ApplicationManager.getApplication().runReadAction<Range?> {
-                val editor = FileEditorManager.getInstance(project).selectedTextEditor
+                val editor = FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
                 editor?.let {
                     val selectionModel = it.selectionModel
                     val startOffset = selectionModel.selectionStart
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
index fa027cbb729..8b3479dd364 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -207,7 +207,7 @@ class FeatureDevController(
 
         withContext(EDT) {
             broadcastQEvent(QFeatureEvent.STARTS_EDITING)
-            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
+            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditorWithRemotes.firstOrNull() ?: return@withContext
 
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset
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 25630d63bab..84ebaa60cef 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
@@ -209,7 +209,7 @@ class ChatController private constructor(
     override suspend fun processInsertCodeAtCursorPosition(message: IncomingCwcMessage.InsertCodeAtCursorPosition) {
         broadcastQEvent(QFeatureEvent.STARTS_EDITING)
         withContext(EDT) {
-            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
+            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditorWithRemotes.firstOrNull() ?: return@withContext
 
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
index 888bdb198bb..288a6991099 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
@@ -18,7 +18,7 @@ class FileContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter?, pr
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FileContext? {
         val editor = computeOnEdt {
-            FileEditorManager.getInstance(project).selectedTextEditor
+            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
         } ?: return null
 
         val fileLanguage = computeOnEdt {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
index 255b21aa717..975525ed87c 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
@@ -26,7 +26,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FocusAreaContext? {
         val editor = computeOnEdt {
-            FileEditorManager.getInstance(project).selectedTextEditor
+            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
         } ?: return null
 
         if (editor.document.text.isBlank()) return null
@@ -109,7 +109,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
             languageExtractor.extractLanguageNameFromCurrentFile(editor)
         }
         val fileText = editor.document.text
-        val fileName = FileEditorManager.getInstance(project).selectedFiles.first().name
+        val fileName = editor.virtualFile.name
 
         // Offset the selection range to the start of the trimmedFileText
         val selectionInsideTrimmedFileTextRange = codeSelectionRange.let {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt
index 96e2262a0eb..653967c8213 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt
@@ -18,7 +18,7 @@ class InlineChatFileListener(project: Project, private val controller: InlineCha
     private var selectionListener: InlineChatSelectionListener? = null
 
     init {
-        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditor }
+        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditorWithRemotes.firstOrNull() }
         if (editor != null) {
             setupListenersForEditor(editor)
             currentEditor = editor
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
index 270ac2820b7..7cb026406bb 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
@@ -3,16 +3,16 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.inline.listeners
 
-import com.intellij.idea.AppMode
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.editor.event.SelectionListener
 import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatEditorHint
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 class InlineChatSelectionListener : SelectionListener, Disposable {
     private val inlineChatEditorHint = InlineChatEditorHint()
     override fun selectionChanged(e: SelectionEvent) {
-        if (AppMode.isRemoteDevHost()) return
+        if (isRunningOnRemoteBackend()) return
         val editor = e.editor
         val selectionModel = editor.selectionModel
 
diff --git a/plugins/amazonq/codetransform/jetbrains-community/resources/META-INF/codetransform-ext-java.xml b/plugins/amazonq/codetransform/jetbrains-community/resources/META-INF/codetransform-ext-java.xml
index 614c5e18b10..d1a9208c24f 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/resources/META-INF/codetransform-ext-java.xml
+++ b/plugins/amazonq/codetransform/jetbrains-community/resources/META-INF/codetransform-ext-java.xml
@@ -20,7 +20,6 @@
                     factoryClass="software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeModernizerBottomToolWindowFactory"
                     icon="AllIcons.Actions.Preview"/>
         <fileEditorProvider implementation="software.aws.toolkits.jetbrains.services.codemodernizer.plan.CodeModernizerPlanEditorProvider"/>
-        <fileEditorProvider implementation="software.aws.toolkits.jetbrains.services.codemodernizer.summary.CodeModernizerSummaryEditorProvider"/>
     </extensions>
 
     <extensions defaultExtensionNs="amazon.q">
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
index a827a4bab8d..c2038db7a86 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -77,7 +77,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.parseXmlDep
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.setDependencyVersionInPom
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
 import software.aws.toolkits.jetbrains.ui.feedback.CodeTransformFeedbackDialog
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.jetbrains.utils.notifyStickyError
 import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
@@ -134,14 +133,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     fun validate(project: Project, transformationType: CodeTransformType): ValidationResult {
         fun validateCore(project: Project): ValidationResult {
-            if (isRunningOnRemoteBackend()) {
-                return ValidationResult(
-                    false,
-                    InvalidTelemetryReason(
-                        CodeTransformPreValidationError.RemoteRunProject,
-                    )
-                )
-            }
             if (!isCodeTransformAvailable(project)) {
                 return ValidationResult(
                     false,
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditorProvider.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditorProvider.kt
index c2d256c05d6..e86fab4b40e 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditorProvider.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditorProvider.kt
@@ -15,7 +15,6 @@ import com.intellij.openapi.vfs.VirtualFile
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationPlan
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 class CodeModernizerPlanEditorProvider : FileEditorProvider, DumbAware {
     override fun accept(project: Project, file: VirtualFile) = file is CodeModernizerPlanVirtualFile
@@ -31,8 +30,8 @@ class CodeModernizerPlanEditorProvider : FileEditorProvider, DumbAware {
         val MIGRATION_PLAN_KEY = Key.create<TransformationPlan>("TRANSFORMATION_PLAN")
         val MODULE_NAME_KEY = Key.create<String>("MODULE_NAME")
         val JAVA_VERSION = Key.create<String>("JAVA_VERSION")
+
         fun openEditor(project: Project, plan: TransformationPlan, module: String?, javaVersionNumber: String) {
-            if (isRunningOnRemoteBackend()) return
             val virtualFile = CodeModernizerPlanVirtualFile()
             virtualFile.putUserData(MIGRATION_PLAN_KEY, plan)
             virtualFile.putUserData(MODULE_NAME_KEY, module)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditor.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditor.kt
deleted file mode 100644
index 612594289e4..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditor.kt
+++ /dev/null
@@ -1,535 +0,0 @@
-// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.services.codemodernizer.summary
-
-import com.intellij.ide.BrowserUtil
-import com.intellij.markdown.utils.MarkdownToHtmlConverter
-import com.intellij.openapi.editor.colors.EditorColorsManager
-import com.intellij.openapi.fileEditor.FileEditor
-import com.intellij.openapi.fileEditor.FileEditorState
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.UserDataHolderBase
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.ui.components.JBScrollPane
-import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
-import software.aws.toolkits.jetbrains.services.codemodernizer.summary.CodeModernizerSummaryEditorProvider.Companion.MIGRATION_SUMMARY_KEY
-import java.beans.PropertyChangeListener
-import javax.swing.BorderFactory
-import javax.swing.JEditorPane
-import javax.swing.SwingUtilities
-import javax.swing.event.HyperlinkEvent
-
-class CodeModernizerSummaryEditor(val project: Project, val virtualFile: VirtualFile) : UserDataHolderBase(), FileEditor {
-    val summary = virtualFile.getUserData(MIGRATION_SUMMARY_KEY) ?: throw RuntimeException("Migration summary not found")
-
-    private val rootPanel = buildRootPanel()
-
-    fun renderCSSStyles(): String {
-        var fontFamilies = "-apple-system,BlinkMacSystemFont,'Segoe UI','Noto Sans',Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji'"
-        var mainFontColor = "#1F2328"
-        var mainAnchorColor = "#0969da"
-        var mainThemeBorder = "1px solid #d0d7de"
-        var mainMarkTagColor = "#fff8c5"
-        var secondaryThemeColor = "#d0d7de"
-        var tertiaryThemeColor = "#f6f8fa"
-        var tertiaryThemeFontColor = "#656d76"
-        var codeblockBgColor = "rgba(175,184,193,0.2)"
-
-        if (EditorColorsManager.getInstance().isDarkEditor) {
-            mainFontColor = "#e6edf3"
-            mainAnchorColor = "#2f81f7"
-            mainThemeBorder = "1px solid #21262d"
-            mainMarkTagColor = "rgba(187,128,9,0.15)"
-            secondaryThemeColor = "#30363d"
-            tertiaryThemeColor = "#161b22"
-            tertiaryThemeFontColor = "#7d8590"
-            codeblockBgColor = "rgba(110,118,129,0.4)"
-        }
-
-        return """
-            .markdown-body {
-              -ms-text-size-adjust: 100%;
-              -webkit-text-size-adjust: 100%;
-              margin: 0;
-              color: $mainFontColor;
-              font-family: $fontFamilies;
-              font-size: 14px;
-              line-height: 1.5;
-              word-wrap: break-word;
-              padding: 0px 8px;
-            }
-
-            .markdown-body details,
-            .markdown-body figcaption,
-            .markdown-body figure {
-              display: block;
-            }
-
-            .markdown-body summary {
-              display: list-item;
-            }
-
-            .markdown-body [hidden] {
-              display: none !important;
-            }
-
-            .markdown-body a {
-              background-color: transparent;
-              color: $mainAnchorColor;
-              text-decoration: none;
-            }
-
-            .markdown-body abbr[title] {
-              border-bottom: none;
-              -webkit-text-decoration: underline dotted;
-              text-decoration: underline dotted;
-            }
-
-            .markdown-body b,
-            .markdown-body strong {
-              font-weight: 600;
-            }
-
-            .markdown-body dfn {
-              font-style: italic;
-            }
-
-            .markdown-body h1 {
-              margin: 10px 0;
-              font-weight: 600;
-              padding-bottom: 8px;
-              font-size: 32px;
-              border-bottom: $mainThemeBorder;
-            }
-
-            .markdown-body mark {
-              background-color: $mainMarkTagColor;
-              color: $mainFontColor;
-            }
-
-            .markdown-body small {
-              font-size: 10px
-            }
-
-            .markdown-body sub,
-            .markdown-body sup {
-              font-size: 8px;
-              line-height: 0;
-              position: relative;
-              vertical-align: baseline;
-            }
-
-            .markdown-body sub {
-              bottom: -4px;
-            }
-
-            .markdown-body sup {
-              top: -8px;
-            }
-
-            .markdown-body img {
-              border-style: none;
-              max-width: 100%;
-              box-sizing: content-box;
-              
-            }
-
-            .markdown-body code,
-            .markdown-body kbd,
-            .markdown-body pre,
-            .markdown-body samp {
-              font-family: monospace;
-              font-size: 14px;
-            }
-
-            .markdown-body figure {
-              margin: 16px 40px;
-            }
-
-            .markdown-body hr {
-              box-sizing: content-box;
-              overflow: hidden;
-              background: transparent;
-              border-bottom: $mainThemeBorder;
-              height: 4px;
-              padding: 0;
-              margin: 24px 0;
-              background-color: $secondaryThemeColor;
-              border: 0;
-            }
-
-            .markdown-body [type=button],
-            .markdown-body [type=reset],
-            .markdown-body [type=submit] {
-              -webkit-appearance: button;
-            }
-
-            .markdown-body a:hover {
-              text-decoration: underline;
-            }
-
-            .markdown-body hr::before {
-              display: table;
-              content: '';
-            }
-
-            .markdown-body hr::after {
-              display: table;
-              clear: both;
-              content: '';
-            }
-
-            .markdown-body table {
-              border-spacing: 0;
-              border-collapse: collapse;
-              display: block;
-              width: max-content;
-              max-width: 100%;
-              overflow: auto;
-            }
-
-            .markdown-body td,
-            .markdown-body th {
-              padding: 0;
-            }
-
-            .markdown-body details summary {
-              cursor: pointer;
-            }
-
-            .markdown-body details:not([open])>*:not(summary) {
-              display: none !important;
-            }
-
-            .markdown-body h1,
-            .markdown-body h2,
-            .markdown-body h3,
-            .markdown-body h4,
-            .markdown-body h5,
-            .markdown-body h6 {
-              margin-top: 24px;
-              margin-bottom: 16px;
-              font-weight: 600;
-              line-height: 1.25;
-            }
-
-            .markdown-body h2 {
-              font-weight: 600;
-              padding-bottom: 5px;
-              font-size: 24px;
-              border-bottom: $mainThemeBorder;
-            }
-
-            .markdown-body h3 {
-              font-weight: 600;
-              font-size: 20px;
-            }
-
-            .markdown-body h4 {
-              font-weight: 600;
-              font-size: 16px;
-            }
-
-            .markdown-body h5 {
-              font-weight: 600;
-              font-size: 14px;
-            }
-
-            .markdown-body h6 {
-              font-weight: 600;
-              font-size: 14px;
-              color: $tertiaryThemeFontColor;
-            }
-
-            .markdown-body p {
-              margin-top: 0;
-              margin-bottom: 10px;
-            }
-
-            .markdown-body blockquote {
-              margin: 0;
-              padding: 0 16px;
-              color: $tertiaryThemeFontColor;
-              border-left: 4px solid $secondaryThemeColor;
-            }
-
-            .markdown-body ul,
-            .markdown-body ol {
-              margin-top: 0;
-              margin-bottom: 0;
-              padding-left: 32px;
-            }
-
-            .markdown-body ol ol,
-            .markdown-body ul ol {
-              list-style-type: lower-roman;
-            }
-
-            .markdown-body ul ul ol,
-            .markdown-body ul ol ol,
-            .markdown-body ol ul ol,
-            .markdown-body ol ol ol {
-              list-style-type: lower-alpha;
-            }
-
-            .markdown-body dd {
-              margin-left: 0;
-            }
-
-            .markdown-body code,
-            .markdown-body samp {
-              font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
-              font-size: 12px;
-            }
-
-            .markdown-body pre {
-              margin-top: 0;
-              margin-bottom: 0;
-              font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;
-              font-size: 12px;
-              word-wrap: normal;
-            }
-
-            .markdown-body::before {
-              display: table;
-              content: '';
-            }
-
-            .markdown-body::after {
-              display: table;
-              clear: both;
-              content: '';
-            }
-
-            .markdown-body>*:first-child {
-              margin-top: 0 !important;
-            }
-
-            .markdown-body>*:last-child {
-              margin-bottom: 0 !important;
-            }
-
-            .markdown-body p,
-            .markdown-body blockquote,
-            .markdown-body ul,
-            .markdown-body ol,
-            .markdown-body dl,
-            .markdown-body table,
-            .markdown-body pre,
-            .markdown-body details {
-              margin-top: 0;
-              margin-bottom: 16px;
-            }
-
-            .markdown-body blockquote>:first-child {
-              margin-top: 0;
-            }
-
-            .markdown-body blockquote>:last-child {
-              margin-bottom: 0;
-            }
-
-            .markdown-body h1 code,
-            .markdown-body h2 code,
-            .markdown-body h3 code,
-            .markdown-body h4 code,
-            .markdown-body h5 code,
-            .markdown-body h6 code {
-              padding: 0 4px;
-              font-size: inherit;
-            }
-
-            .markdown-body summary h1,
-            .markdown-body summary h2,
-            .markdown-body summary h3,
-            .markdown-body summary h4,
-            .markdown-body summary h5,
-            .markdown-body summary h6 {
-              display: inline-block;
-            }
-
-
-            .markdown-body summary h1,
-            .markdown-body summary h2 {
-              padding-bottom: 0;
-              border-bottom: 0;
-            }
-
-
-            .markdown-body div>ol:not([type]) {
-              list-style-type: decimal;
-            }
-
-            .markdown-body ul ul,
-            .markdown-body ul ol,
-            .markdown-body ol ol,
-            .markdown-body ol ul {
-              margin-top: 0;
-              margin-bottom: 0;
-            }
-
-            .markdown-body li>p {
-              margin-top: 16px;
-            }
-
-            .markdown-body li+li {
-              margin-top: 4px;
-            }
-
-            .markdown-body dl {
-              padding: 0;
-            }
-
-            .markdown-body dl dt {
-              padding: 0;
-              margin-top: 16px;
-              font-size: 14px;
-              font-style: italic;
-              font-weight: 600;
-            }
-
-            .markdown-body dl dd {
-              padding: 0 16px;
-              margin-bottom: 16px;
-            }
-
-            .markdown-body table th {
-              font-weight: 600;
-            }
-
-            .markdown-body table th,
-            .markdown-body table td {
-              padding: 6px 13px;
-              border: 1px solid $secondaryThemeColor;
-            }
-
-            .markdown-body table td>:last-child {
-              margin-bottom: 0;
-            }
-
-            .markdown-body table tr {
-              border-top: $mainThemeBorder;
-            }
-
-            .markdown-body table tr:nth-child(2n) {
-              background-color: $tertiaryThemeColor;
-            }
-
-            .markdown-body table img {
-              background-color: transparent;
-            }
-
-            .markdown-body img[align=right] {
-              padding-left: 20px;
-            }
-
-            .markdown-body img[align=left] {
-              padding-right: 20px;
-            }
-
-            .markdown-body code {
-              padding: 4px 6px;
-              margin: 0;
-              font-size: 12px;
-              white-space: break-spaces;
-              background-color: $codeblockBgColor;
-              border-radius: 4px;
-            }
-
-            .markdown-body code br {
-              display: none;
-            }
-
-            .markdown-body samp {
-              font-size: 12px;
-            }
-
-            .markdown-body pre code {
-              font-size: 14px;
-            }
-
-            .markdown-body pre>code {
-              padding: 0;
-              margin: 0;
-              word-break: normal;
-              white-space: pre;
-              background: transparent;
-              border: 0;
-            }
-
-            .markdown-body pre {
-              padding: 16px;
-              overflow: auto;
-              font-size: 12px;
-              line-height: 1.45;
-              color: $mainFontColor;
-              background-color: $tertiaryThemeColor;
-              border-radius: 4px;
-            }
-
-            .markdown-body pre code{
-              display: inline;
-              max-width: auto;
-              padding: 0;
-              margin: 0;
-              overflow: visible;
-              line-height: inherit;
-              word-wrap: normal;
-              background-color: $codeblockBgColor;
-              border: 0;
-            }
-        """.trimIndent()
-    }
-
-    private fun convertUsingGithubFlavoredMarkdown(markdown: String): String {
-        val bodyContents = MarkdownToHtmlConverter(GFMFlavourDescriptor()).convertMarkdownToHtml(markdown)
-
-        return """
-            <html>
-                <head>
-                    <style>
-                        ${renderCSSStyles()}
-                    </style>
-                </head>
-                <body class="markdown-body">
-                    $bodyContents
-                </body>
-            </html>
-        """.trimIndent()
-    }
-
-    private fun buildRootPanel(): JBScrollPane {
-        val description = convertUsingGithubFlavoredMarkdown(summary.content)
-        val editorPane = JEditorPane().apply {
-            contentType = "text/html"
-            putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, true)
-            border = BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(),
-                BorderFactory.createEmptyBorder(7, 11, 8, 11)
-            )
-            isEditable = false
-            addHyperlinkListener { he ->
-                if (he.eventType == HyperlinkEvent.EventType.ACTIVATED) {
-                    BrowserUtil.browse(he.url)
-                }
-            }
-            text = description
-        }
-        val pane = JBScrollPane(editorPane)
-        // scroll to top of pane after it opens (default is bottom)
-        SwingUtilities.invokeLater { pane.verticalScrollBar.setValue(0) }
-        return pane
-    }
-
-    override fun dispose() {}
-    override fun getComponent() = rootPanel
-    override fun getPreferredFocusedComponent() = null
-    override fun getName() = "CodeModernizerSummary"
-    override fun getFile(): VirtualFile = virtualFile
-    override fun setState(state: FileEditorState) {}
-    override fun isModified() = false
-    override fun isValid() = true
-    override fun addPropertyChangeListener(listener: PropertyChangeListener) {}
-    override fun removePropertyChangeListener(listener: PropertyChangeListener) {}
-}
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditorProvider.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditorProvider.kt
deleted file mode 100644
index 4d58c8be1e1..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryEditorProvider.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.services.codemodernizer.summary
-
-import com.intellij.openapi.application.runInEdt
-import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.fileEditor.FileEditorPolicy
-import com.intellij.openapi.fileEditor.FileEditorProvider
-import com.intellij.openapi.fileEditor.OpenFileDescriptor
-import com.intellij.openapi.project.DumbAware
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Key
-import com.intellij.openapi.vfs.VirtualFile
-import software.aws.toolkits.core.utils.debug
-import software.aws.toolkits.core.utils.getLogger
-import software.aws.toolkits.jetbrains.services.codemodernizer.TransformationSummary
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
-
-class CodeModernizerSummaryEditorProvider : FileEditorProvider, DumbAware {
-    override fun accept(project: Project, file: VirtualFile) = file is CodeModernizerSummaryVirtualFile
-
-    override fun createEditor(project: Project, file: VirtualFile) = CodeModernizerSummaryEditor(project, file)
-
-    override fun getEditorTypeId() = "CodeModernizerSummaryEditor"
-
-    override fun getPolicy() = FileEditorPolicy.HIDE_DEFAULT_EDITOR
-
-    companion object {
-        private val LOG = getLogger<CodeModernizerSummaryEditorProvider>()
-        val MIGRATION_SUMMARY_KEY = Key.create<TransformationSummary>("")
-
-        fun openEditor(project: Project, summary: TransformationSummary) {
-            if (isRunningOnRemoteBackend()) return
-            val virtualFile = CodeModernizerSummaryVirtualFile()
-            virtualFile.putUserData(MIGRATION_SUMMARY_KEY, summary)
-            runInEdt {
-                try {
-                    FileEditorManager
-                        .getInstance(project)
-                        .openFileEditor(OpenFileDescriptor(project, virtualFile), true)
-                } catch (e: Exception) {
-                    LOG.debug(e) { "Showing transformation job summary  page failed to open" }
-                }
-            }
-        }
-    }
-}
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryVirtualFile.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryVirtualFile.kt
deleted file mode 100644
index 2fa6f8c709f..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/summary/CodeModernizerSummaryVirtualFile.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.services.codemodernizer.summary
-
-import com.intellij.testFramework.LightVirtualFile
-import software.aws.toolkits.resources.message
-
-class CodeModernizerSummaryVirtualFile : LightVirtualFile(message("codemodernizer.migration_summary.header.title")) {
-    override fun getPresentableName(): String = message("codemodernizer.migration_summary.header.title")
-
-    override fun getPath(): String = "transformationSummary"
-
-    override fun isWritable(): Boolean = false
-
-    // This along with hashCode() is to make sure only one editor for this is opened at a time
-    override fun equals(other: Any?) = other is CodeModernizerSummaryVirtualFile && this.hashCode() == other.hashCode()
-
-    override fun hashCode(): Int = presentableName.hashCode()
-}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt
index cf342acf4c8..5a571722846 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt
@@ -10,7 +10,6 @@ import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isUserBuilderId
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 interface ActionProvider<T> {
     val pause: T
@@ -59,9 +58,7 @@ fun <T> buildActionListForCodeScan(project: Project, actionProvider: ActionProvi
 
 fun <T> buildActionListForOtherFeatures(project: Project, actionProvider: ActionProvider<T>): List<T> =
     buildList {
-        if (!isRunningOnRemoteBackend()) {
-            add(actionProvider.openChatPanel)
-        }
+        add(actionProvider.openChatPanel)
 
         val isIdC = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance()).let { conn ->
             conn != null && !conn.isSono()
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt
index e72269ce2f7..11fb8f2d61e 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt
@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
 
-import com.intellij.idea.AppMode
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Editor
@@ -13,6 +12,7 @@ import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.util.Disposer
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.RecommendationChunk
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 @Service
 class CodeWhispererInlayManager {
@@ -41,7 +41,7 @@ class CodeWhispererInlayManager {
 
         if (firstLine.isNotEmpty()) {
             val firstLineRenderer =
-                if (!AppMode.isRemoteDevHost()) {
+                if (!isRunningOnRemoteBackend()) {
                     CodeWhispererInlayInlineRenderer(firstLine)
                 } else {
                     InlineCompletionRemoteRendererFactory.createLineInlay(editor, firstLine)
@@ -57,7 +57,7 @@ class CodeWhispererInlayManager {
             return
         }
         val otherLinesRenderers =
-            if (!AppMode.isRemoteDevHost()) {
+            if (!isRunningOnRemoteBackend()) {
                 listOf(CodeWhispererInlayBlockRenderer(otherLines))
             } else {
                 InlineCompletionRemoteRendererFactory.createBlockInlays(editor, otherLines.split("\n"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt
index 339b5aa8df2..020b016e999 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt
@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.inlay
 
-import com.intellij.idea.AppMode
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.EditorCustomElementRenderer
@@ -11,6 +10,7 @@ import com.intellij.openapi.editor.Inlay
 import com.intellij.openapi.util.Disposer
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.RecommendationChunk
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContextNew
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 @Service
 class CodeWhispererInlayManagerNew {
@@ -39,7 +39,7 @@ class CodeWhispererInlayManagerNew {
 
         if (firstLine.isNotEmpty()) {
             val firstLineRenderer =
-                if (!AppMode.isRemoteDevHost()) {
+                if (!isRunningOnRemoteBackend()) {
                     CodeWhispererInlayInlineRenderer(firstLine)
                 } else {
                     InlineCompletionRemoteRendererFactory.createLineInlay(editor, firstLine)
@@ -55,7 +55,7 @@ class CodeWhispererInlayManagerNew {
             return
         }
         val otherLinesRenderers =
-            if (!AppMode.isRemoteDevHost()) {
+            if (!isRunningOnRemoteBackend()) {
                 listOf(CodeWhispererInlayBlockRenderer(otherLines))
             } else {
                 InlineCompletionRemoteRendererFactory.createBlockInlays(editor, otherLines.split("\n"))
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/learn/LearnCodeWhispererEditorProvider.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/learn/LearnCodeWhispererEditorProvider.kt
index b859d4d7b18..9b99abf9dad 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/learn/LearnCodeWhispererEditorProvider.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/learn/LearnCodeWhispererEditorProvider.kt
@@ -15,7 +15,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
+import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
 import software.aws.toolkits.telemetry.UiTelemetry
 
 class LearnCodeWhispererEditorProvider : FileEditorProvider, DumbAware {
@@ -32,7 +32,7 @@ class LearnCodeWhispererEditorProvider : FileEditorProvider, DumbAware {
 
         // Will be called every time the getting started page is opened
         fun openEditor(project: Project) {
-            if (isRunningOnRemoteBackend()) return
+            if (!isQWebviewsAvailable()) return
 
             val virtualFile = LearnCodeWhispererVirtualFile()
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupComponents.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupComponents.kt
index cd6d4bea4d5..2a18bc48a41 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupComponents.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupComponents.kt
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.popup
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
-import com.intellij.idea.AppMode
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.ActionToolbar
@@ -34,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_REF_NOTICE_HEX
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_BUTTON_TEXT_SIZE
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_INFO_TEXT_SIZE
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import java.awt.GridBagLayout
 import java.awt.event.MouseAdapter
@@ -96,7 +96,7 @@ class CodeWhispererPopupComponents {
         add(recommendationInfoLabel, inlineLabelConstraints)
         addHorizontalGlue()
         // "More menu" not working in remote dev, it's not so important so disable it for now
-        if (!AppMode.isRemoteDevHost()) {
+        if (!isRunningOnRemoteBackend()) {
             add(kebabMenu, kebabMenuConstraints)
         }
     }
@@ -232,7 +232,7 @@ class CodeWhispererPopupComponentsNew {
         add(recommendationInfoLabel, inlineLabelConstraints)
         addHorizontalGlue()
         // "More menu" not working in remote dev, it's not so important so disable it for now
-        if (!AppMode.isRemoteDevHost()) {
+        if (!isRunningOnRemoteBackend()) {
             add(kebabMenu, kebabMenuConstraints)
         }
     }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
index 234813002bb..c69f7051a07 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.popup
 
 import com.intellij.codeInsight.hint.ParameterInfoController
 import com.intellij.codeInsight.lookup.LookupManager
-import com.intellij.idea.AppMode
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ENTER
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ESCAPE
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_TAB
@@ -304,7 +303,7 @@ class CodeWhispererPopupManager {
         CodeWhispererInvocationStatus.getInstance().setDisplaySessionActive(true)
 
         // Check if the current editor still has focus. If not, don't show the popup.
-        val isSameEditorAsTrigger = if (!AppMode.isRemoteDevHost()) {
+        val isSameEditorAsTrigger = if (!isRunningOnRemoteBackend()) {
             editor.contentComponent.isFocusOwner
         } else {
             FileEditorManager.getInstance(states.requestContext.project).selectedTextEditorWithRemotes.firstOrNull() == editor
@@ -340,12 +339,12 @@ class CodeWhispererPopupManager {
         // TODO: visibleAreaChanged listener is not getting triggered in remote environment when scrolling
         if (popup.isVisible) {
             // Changing the position of BackendBeAbstractPopup does not work
-            if (!noEnoughSpaceForPopup && !AppMode.isRemoteDevHost()) {
+            if (!noEnoughSpaceForPopup && !isRunningOnRemoteBackend()) {
                 popup.setLocation(relativePopupLocationToEditor.screenPoint)
                 popup.size = popup.preferredContentSize
             }
         } else {
-            if (!AppMode.isRemoteDevHost()) {
+            if (!isRunningOnRemoteBackend()) {
                 popupComponents.prevButton.text = popupComponents.prevButtonText()
                 popupComponents.nextButton.text = popupComponents.nextButtonText()
                 popup.show(relativePopupLocationToEditor)
@@ -378,7 +377,7 @@ class CodeWhispererPopupManager {
         }
 
         // popup.popupWindow is null in remote host
-        if (!AppMode.isRemoteDevHost()) {
+        if (!isRunningOnRemoteBackend()) {
             if (noEnoughSpaceForPopup) {
                 WindowManager.getInstance().setAlphaModeRatio(popup.popupWindow, 1f)
             } else {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManagerNew.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManagerNew.kt
index 3bd7a19ffc0..1f69b5c30be 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManagerNew.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManagerNew.kt
@@ -4,7 +4,6 @@
 package software.aws.toolkits.jetbrains.services.codewhisperer.popup
 
 import com.intellij.codeInsight.lookup.LookupManager
-import com.intellij.idea.AppMode
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_BACKSPACE
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ENTER
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ESCAPE
@@ -67,6 +66,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_DIM_HEX
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.POPUP_INFO_TEXT_SIZE
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import java.awt.Point
 import java.awt.Rectangle
@@ -276,12 +276,12 @@ class CodeWhispererPopupManagerNew {
         // TODO: visibleAreaChanged listener is not getting triggered in remote environment when scrolling
         if (popup.isVisible) {
             // Changing the position of BackendBeAbstractPopup does not work
-            if (!shouldHidePopup && !AppMode.isRemoteDevHost()) {
+            if (!shouldHidePopup && !isRunningOnRemoteBackend()) {
                 popup.setLocation(relativePopupLocationToEditor.screenPoint)
                 popup.size = popup.preferredContentSize
             }
         } else {
-            if (!AppMode.isRemoteDevHost()) {
+            if (!isRunningOnRemoteBackend()) {
                 if (force && !shouldHidePopup) {
                     popup.show(relativePopupLocationToEditor)
                 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt
index 2e42b47f659..2ee5f8be678 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.status
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.DataManager
-import com.intellij.idea.AppMode
 import com.intellij.openapi.actionSystem.ActionGroup
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.application.ApplicationManager
@@ -32,6 +31,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.reconnectCodeWhisperer
 import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.jetbrains.utils.isQExpired
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import java.awt.event.MouseEvent
 import javax.swing.Icon
@@ -133,7 +133,7 @@ class CodeWhispererStatusBarWidget(project: Project) :
             }
         ) {
             // AnimatedIcon can't serialize over remote host
-            if (!AppMode.isRemoteDevHost()) {
+            if (!isRunningOnRemoteBackend()) {
                 AnimatedIcon.Default()
             } else {
                 AllIcons.Actions.Download
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceToolWindowFactory.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceToolWindowFactory.kt
index a0a8d59ee23..f5870f609de 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceToolWindowFactory.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceToolWindowFactory.kt
@@ -9,7 +9,6 @@ import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.components.JBScrollPane
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 class CodeWhispererCodeReferenceToolWindowFactory : ToolWindowFactory, DumbAware {
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
@@ -23,7 +22,7 @@ class CodeWhispererCodeReferenceToolWindowFactory : ToolWindowFactory, DumbAware
         toolWindow.contentManager.addContent(toolWindowContent)
     }
 
-    override fun shouldBeAvailable(project: Project): Boolean = isCodeWhispererEnabled(project) && !isRunningOnRemoteBackend()
+    override fun shouldBeAvailable(project: Project): Boolean = isCodeWhispererEnabled(project)
 
     companion object {
         const val id = "aws.codewhisperer.codereference"
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt
index 24ce8c0ad9b..c1596603f5b 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformSharedUtils.kt
@@ -9,7 +9,6 @@ import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.lazyIsUnauthedBearerConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.time.Instant
 
 fun calculateTotalLatency(startTime: Instant, endTime: Instant) = (endTime.toEpochMilli() - startTime.toEpochMilli()).toInt()
@@ -27,6 +26,5 @@ fun isValidCodeTransformConnection(project: Project): Boolean {
 }
 fun isCodeTransformAvailable(project: Project): Boolean {
     if (!isIntellij()) return false
-    if (isRunningOnRemoteBackend()) return false
     return isValidCodeTransformConnection(project)
 }
diff --git a/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt b/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt
new file mode 100644
index 00000000000..dcbac7c531f
--- /dev/null
+++ b/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt
@@ -0,0 +1,87 @@
+@file:Suppress("all")
+
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// adapted from https://github.com/JetBrains/intellij-community/blob/54429f3ba00c695c22d09e164135b0713f2cfc0f/platform/ui.jcef/jcef/utils/JBCefLocalRequestHandler.kt
+
+package contrib.org.intellij.images.editor.impl.jcef
+
+import org.cef.browser.CefBrowser
+import org.cef.browser.CefFrame
+import org.cef.callback.CefCallback
+import org.cef.handler.CefRequestHandlerAdapter
+import org.cef.handler.CefResourceHandler
+import org.cef.handler.CefResourceHandlerAdapter
+import org.cef.handler.CefResourceRequestHandler
+import org.cef.handler.CefResourceRequestHandlerAdapter
+import org.cef.misc.BoolRef
+import org.cef.network.CefRequest
+import java.net.URL
+
+/**
+ * Handles local protocol-specific CEF resource requests for a defined `protocol` and `authority`.
+ *
+ * This class implements a mechanism to serve protocol-specific resources based on mappings provided
+ * through the `addResource` function. Only requests matching the configured protocol and authority are processed,
+ * while others are rejected.
+ *
+ * @param myProtocol The protocol to handle (e.g., "http", "file").
+ * @param myAuthority The authority of the requests (e.g., "localhost", "mydomain").
+ */
+open class JBCefLocalRequestHandler(
+    private val myProtocol: String,
+    private val myAuthority: String,
+) : CefRequestHandlerAdapter() {
+    private val myResources: MutableMap<String, () -> CefResourceHandler?> = HashMap()
+
+    private val REJECTING_RESOURCE_HANDLER: CefResourceHandler = object : CefResourceHandlerAdapter() {
+        override fun processRequest(request: CefRequest, callback: CefCallback): Boolean {
+            callback.cancel()
+            return false
+        }
+    }
+
+    private val RESOURCE_REQUEST_HANDLER = resourceHandlerWrapper { path ->
+        myResources[path]?.let { it() }
+    }
+
+    protected fun resourceHandlerWrapper(handler: (String) -> CefResourceHandler?): CefResourceRequestHandler =
+        object : CefResourceRequestHandlerAdapter() {
+            override fun getResourceHandler(browser: CefBrowser?, frame: CefFrame?, request: CefRequest): CefResourceHandler {
+                val url = URL(request.url)
+                url.protocol
+                if (!url.protocol.equals(myProtocol) || !url.authority.equals(myAuthority)) {
+                    return REJECTING_RESOURCE_HANDLER
+                }
+                return try {
+                    val path = url.path.trim('/')
+                    handler(path) ?: REJECTING_RESOURCE_HANDLER
+                } catch (e: RuntimeException) {
+                    println(e.message)
+                    REJECTING_RESOURCE_HANDLER
+                }
+            }
+        }
+
+    fun addResource(resourcePath: String, resourceProvider: () -> CefResourceHandler?) {
+        val normalisedPath = resourcePath.trim('/')
+        myResources[normalisedPath] = resourceProvider
+    }
+
+    fun createResource(resourcePath: String, resourceProvider: () -> CefResourceHandler?): String {
+        val normalisedPath = resourcePath.trim('/')
+        myResources[normalisedPath] = resourceProvider
+        return "$myProtocol://$myAuthority/$normalisedPath"
+    }
+
+    override fun getResourceRequestHandler(
+        browser: CefBrowser?,
+        frame: CefFrame?,
+        request: CefRequest?,
+        isNavigation: Boolean,
+        isDownload: Boolean,
+        requestInitiator: String?,
+        disableDefaultHandling: BoolRef?,
+    ): CefResourceRequestHandler {
+        return RESOURCE_REQUEST_HANDLER
+    }
+}
diff --git a/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefStreamResourceHandler.kt b/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefStreamResourceHandler.kt
new file mode 100644
index 00000000000..d2b5da24269
--- /dev/null
+++ b/plugins/core/jetbrains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefStreamResourceHandler.kt
@@ -0,0 +1,78 @@
+@file:Suppress("all")
+
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// https://github.com/JetBrains/intellij-community/blob/54429f3ba00c695c22d09e164135b0713f2cfc0f/platform/ui.jcef/jcef/utils/JBCefStreamResourceHandler.kt
+package contrib.org.intellij.images.editor.impl.jcef
+
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.util.Disposer
+import org.cef.callback.CefCallback
+import org.cef.handler.CefResourceHandler
+import org.cef.misc.IntRef
+import org.cef.misc.StringRef
+import org.cef.network.CefRequest
+import org.cef.network.CefResponse
+import java.io.IOException
+import java.io.InputStream
+
+/**
+ * A handler for managing custom resource requests in JCEF.
+ * This class implements the `CefResourceHandler` interface, enabling the customization of resource
+ * loading from a provided input stream. It supports setting MIME types and headers for responses
+ * and ensures proper disposal of resources.
+ *
+ * @param myStream The input stream from which the resource will be read.
+ * @param myMimeType The MIME type of the response to be sent to the client.
+ * @param parent A `Disposable` object to which this handler is registered for automatic disposal.
+ * @param headers Optional headers that will be included in the response.
+ */
+open class JBCefStreamResourceHandler(
+    private val myStream: InputStream,
+    private val myMimeType: String,
+    parent: Disposable,
+    private val headers: Map<String, String> = mapOf(),
+) : CefResourceHandler, Disposable {
+    init {
+        Disposer.register(parent, this)
+    }
+
+    override fun processRequest(request: CefRequest, callback: CefCallback): Boolean {
+        callback.Continue()
+        return true
+    }
+
+    override fun getResponseHeaders(response: CefResponse, responseLength: IntRef, redirectUrl: StringRef) {
+        response.mimeType = myMimeType
+        response.status = 200
+        for (header in headers) {
+            response.setHeaderByName(header.key, header.value, true /* overwrite */)
+        }
+    }
+
+    override fun readResponse(dataOut: ByteArray, bytesToRead: Int, bytesRead: IntRef, callback: CefCallback): Boolean {
+        try {
+            bytesRead.set(myStream.read(dataOut, 0, bytesToRead))
+            if (bytesRead.get() != -1) {
+                return true
+            }
+        } catch (_: IOException) {
+            callback.cancel()
+        }
+        bytesRead.set(0)
+        Disposer.dispose(this)
+        return false
+    }
+
+    override fun cancel() {
+        Disposer.dispose(this)
+    }
+
+    override fun dispose() {
+        try {
+            myStream.close()
+        } catch (e: IOException) {
+            Logger.getInstance(JBCefStreamResourceHandler::class.java).warn("Failed to close the stream", e)
+        }
+    }
+}
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
new file mode 100644
index 00000000000..1a540b288bf
--- /dev/null
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
@@ -0,0 +1,83 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.webview
+
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.Disposer
+import com.intellij.ui.jcef.JBCefBrowserBase
+import contrib.org.intellij.images.editor.impl.jcef.JBCefLocalRequestHandler
+import contrib.org.intellij.images.editor.impl.jcef.JBCefStreamResourceHandler
+import org.cef.browser.CefBrowser
+import org.cef.browser.CefFrame
+import org.cef.handler.CefResourceHandler
+import org.cef.handler.CefResourceRequestHandler
+import org.cef.misc.BoolRef
+import org.cef.network.CefRequest
+import java.io.InputStream
+import java.net.URI
+import java.net.URLConnection
+import kotlin.io.byteInputStream
+
+class LocalAssetJBCefRequestHandler(jbCefBrowser: JBCefBrowserBase) : JBCefLocalRequestHandler(PROTOCOL, AUTHORITY), Disposable {
+    init {
+        jbCefBrowser.jbCefClient.addRequestHandler(this, jbCefBrowser.cefBrowser)
+
+        Disposer.register(jbCefBrowser, this)
+    }
+
+    private val wildcardHandlers = mutableMapOf<String, (String) -> CefResourceHandler?>()
+
+    private fun streamHandler(path: String, stream: InputStream) =
+        JBCefStreamResourceHandler(
+            stream,
+            if (path.endsWith(".wasm") == true) "application/wasm" else URLConnection.getFileNameMap().getContentTypeFor(path),
+            this
+        )
+
+    fun addWildcardHandler(prefix: String, handler: (String) -> InputStream?) {
+        wildcardHandlers[prefix] = { path ->
+            handler(path)?.let { stream ->
+                streamHandler(path, stream)
+            }
+        }
+    }
+
+    fun addResource(path: String, stream: InputStream?) =
+        addResource(path) {
+            stream?.let { streamHandler(path, it) }
+        }
+
+    fun createResource(path: String, stream: InputStream?) =
+        createResource(path) {
+            stream?.let { streamHandler(path, it) }
+        }
+
+    fun createResource(path: String, content: String) =
+        createResource(path, content.byteInputStream())
+
+    override fun getResourceRequestHandler(
+        browser: CefBrowser?,
+        frame: CefFrame?,
+        request: CefRequest?,
+        isNavigation: Boolean,
+        isDownload: Boolean,
+        requestInitiator: String?,
+        disableDefaultHandling: BoolRef?,
+    ): CefResourceRequestHandler {
+        val resource = request?.url?.let { URI(it).path.trim('/') }
+        val handler = wildcardHandlers.entries.firstOrNull { (k, _) -> resource?.startsWith(k) == true }
+        if (handler != null) {
+            return resourceHandlerWrapper { path -> handler.value(path) }
+        }
+        return super.getResourceRequestHandler(browser, frame, request, isNavigation, isDownload, requestInitiator, disableDefaultHandling)
+    }
+
+    override fun dispose() {
+    }
+
+    companion object {
+        const val PROTOCOL = "http"
+        const val AUTHORITY = "toolkitasset"
+    }
+}
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
index 86970a2dfd2..eb5693ef92c 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
@@ -64,8 +64,6 @@ data class BrowserState(val feature: FeatureId, val browserCancellable: Boolean
 
 abstract class LoginBrowser(
     private val project: Project,
-    val domain: String,
-    val webScriptUri: String,
 ) {
     abstract val jcefBrowser: JBCefBrowserBase
 
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt
deleted file mode 100644
index 174e63b1882..00000000000
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.core.webview
-
-import org.cef.browser.CefBrowser
-import org.cef.browser.CefFrame
-import org.cef.callback.CefCallback
-import org.cef.callback.CefSchemeHandlerFactory
-import org.cef.handler.CefResourceHandler
-import org.cef.misc.IntRef
-import org.cef.misc.StringRef
-import org.cef.network.CefRequest
-import org.cef.network.CefResponse
-import java.io.IOException
-import java.net.URLConnection
-
-class WebviewResourceHandlerFactory(
-    val domain: String,
-    val assetUri: String,
-) : CefSchemeHandlerFactory {
-    override fun create(
-        browser: CefBrowser?,
-        frame: CefFrame?,
-        schemeName: String?,
-        request: CefRequest?,
-    ): CefResourceHandler? {
-        val resourceUri = request?.url ?: return null
-        if (!resourceUri.startsWith(domain)) return null
-
-        val resource = resourceUri.replace(domain, assetUri)
-        val resourceInputStream = this.javaClass.getResourceAsStream(resource)
-
-        try {
-            resourceInputStream.use {
-                if (resourceInputStream != null) {
-                    return AssetResourceHandler(resourceInputStream.readAllBytes())
-                }
-                return null
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-}
-
-class AssetResourceHandler(var data: ByteArray) : CefResourceHandler {
-    /**
-     * Factory class for [AssetResourceHandler]. Ignores any request that doesn't begin with
-     * [AssetResourceHandler.LOCAL_RESOURCE_URL_PREFIX]
-     */
-
-    private var offset = 0
-    private var resourceUri: String? = null
-    override fun processRequest(cefRequest: CefRequest, cefCallback: CefCallback): Boolean {
-        resourceUri = cefRequest.url
-        cefCallback.Continue()
-        return true
-    }
-
-    override fun getResponseHeaders(cefResponse: CefResponse, intRef: IntRef, stringRef: StringRef) {
-        intRef.set(data.size)
-        cefResponse.setHeaderByName("Access-Control-Allow-Origin", "*", true)
-        val mimeType = if (resourceUri?.endsWith(".wasm") == true) "application/wasm" else URLConnection.getFileNameMap().getContentTypeFor(resourceUri)
-        if (mimeType != null) cefResponse.mimeType = mimeType
-        cefResponse.status = 200
-    }
-
-    override fun readResponse(
-        outBuffer: ByteArray,
-        bytesToRead: Int,
-        bytesRead: IntRef,
-        cefCallback: CefCallback,
-    ): Boolean {
-        if (offset >= data.size) {
-            cefCallback.cancel()
-            return false
-        }
-        var lenToRead = Math.min(outBuffer.size, bytesToRead)
-        lenToRead = Math.min(data.size - offset, lenToRead)
-        System.arraycopy(data, offset, outBuffer, 0, lenToRead)
-        bytesRead.set(lenToRead)
-        offset = offset + lenToRead
-        return true
-    }
-
-    override fun cancel() {}
-}
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
index b868718c210..d955effc1b4 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
@@ -16,4 +16,4 @@ fun isRunningOnRemoteBackend() = AppMode.isRemoteDevHost()
  */
 fun isCodeCatalystDevEnv() = System.getenv("__DEV_ENVIRONMENT_ID") != null
 
-fun isQWebviewsAvailable() = JBCefApp.isSupported() && !isRunningOnRemoteBackend()
+fun isQWebviewsAvailable() = JBCefApp.isSupported()
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/BrowserMessageTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/BrowserMessageTest.kt
index 0ee085f52e6..0ed59f70c41 100644
--- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/BrowserMessageTest.kt
+++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/BrowserMessageTest.kt
@@ -22,7 +22,7 @@ import software.aws.toolkits.jetbrains.core.webview.BrowserMessage
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
 import software.aws.toolkits.jetbrains.core.webview.LoginBrowser
 
-class NoOpLoginBrowser(project: Project, domain: String = "", url: String = "") : LoginBrowser(project, domain, url) {
+class NoOpLoginBrowser(project: Project) : LoginBrowser(project) {
     override val jcefBrowser: JBCefBrowserBase = mock()
 
     override fun prepareBrowser(state: BrowserState) {}
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
index 8ea17eceaa0..9376f506010 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
@@ -30,7 +30,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import migration.software.aws.toolkits.jetbrains.core.credentials.CredentialManager
-import org.cef.CefApp
 import software.aws.toolkits.core.credentials.validatedSsoIdentifierFromUrl
 import software.aws.toolkits.core.region.AwsRegion
 import software.aws.toolkits.core.utils.error
@@ -52,8 +51,8 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.IdcRolePopupState
 import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
 import software.aws.toolkits.jetbrains.core.webview.BrowserMessage
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
+import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.core.webview.LoginBrowser
-import software.aws.toolkits.jetbrains.core.webview.WebviewResourceHandlerFactory
 import software.aws.toolkits.jetbrains.isDeveloperMode
 import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
 import software.aws.toolkits.jetbrains.utils.isTookitConnected
@@ -140,8 +139,6 @@ class ToolkitWebviewPanel(val project: Project, private val scope: CoroutineScop
 // TODO: STILL WIP thus duplicate code / pending move to plugins/toolkit
 class ToolkitWebviewBrowser(val project: Project, private val parentDisposable: Disposable) : LoginBrowser(
     project,
-    ToolkitWebviewBrowser.DOMAIN,
-    ToolkitWebviewBrowser.WEB_SCRIPT_URI
 ) {
     // TODO: confirm if we need such configuration or the default is fine
     // TODO: move JcefBrowserUtils to core
@@ -155,19 +152,10 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
             .setOffScreenRendering(true)
             .build()
     }
-    private val query: JBCefJSQuery = JBCefJSQuery.create(jcefBrowser)
+    private val query = JBCefJSQuery.create(jcefBrowser)
+    private val assetHandler = LocalAssetJBCefRequestHandler(jcefBrowser)
 
     init {
-        CefApp.getInstance()
-            .registerSchemeHandlerFactory(
-                "http",
-                domain,
-                WebviewResourceHandlerFactory(
-                    domain = "http://$domain/",
-                    assetUri = "/webview/assets/"
-                ),
-            )
-
         loadWebView(query)
 
         query.addHandler(jcefHandler)
@@ -334,15 +322,18 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
     }
 
     override fun loadWebView(query: JBCefJSQuery) {
-        jcefBrowser.loadHTML(getWebviewHTML(webScriptUri, query))
+        val webScriptUri = assetHandler.createResource(
+            "js/toolkitGetStart.js",
+            ToolkitWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/toolkitGetStart.js")
+        )
+
+        jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
     }
 
     fun component(): JComponent? = jcefBrowser.component
 
     companion object {
         private val LOG = getLogger<ToolkitWebviewBrowser>()
-        private const val WEB_SCRIPT_URI = "http://webview/js/toolkitGetStart.js"
-        private const val DOMAIN = "webview"
     }
 }
 
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt
index 7d1c55e021f..772a37c109c 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt
@@ -64,7 +64,6 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.requestCredentialsFor
 import software.aws.toolkits.jetbrains.services.caws.CawsEndpoints
 import software.aws.toolkits.jetbrains.services.caws.CawsResources
 import software.aws.toolkits.jetbrains.ui.feedback.ToolkitFeedbackDialog
-import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.jetbrains.utils.ui.editorNotificationCompoundBorder
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.UiTelemetry
@@ -163,12 +162,6 @@ class GettingStartedPanel(
                                     setTitleFont(JBFont.h1().asBold())
                                 }.align(AlignX.FILL)
                             }
-                            row {
-                                label("Note: " + (message("gettingstarted.codewhisperer.remote"))).applyToComponent {
-
-                                    font = JBFont.h4().asBold()
-                                }
-                            }.bottomGap(BottomGap.SMALL).visible(isRunningOnRemoteBackend())
                             featureSetPanel.setFeatureContent()
                             row {
                                 cell(featureSetPanel)
@@ -203,7 +196,7 @@ class GettingStartedPanel(
                                         )
                                     )
                                 )
-                            ).visible(!isRunningOnRemoteBackend())
+                            )
                             // Resource Explorer panel auth bullets
                             cell(
                                 PanelAuthBullets(
@@ -1214,7 +1207,7 @@ class GettingStartedPanel(
                 panel {
                     row {
                         // CodeWhisperer panel
-                        cell(CodeWhispererPanel()).visible(!isRunningOnRemoteBackend())
+                        cell(CodeWhispererPanel())
                         // Resource Explorer Panel
                         cell(ResourceExplorerPanel())
                         // CodeCatalyst Panel

From dc43b0940f4dfa3810b2c12ccd6d376e8447f83b Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:18:57 -0700
Subject: [PATCH 02/12] fix: follow up comments on #4825 (#5450)

---
 .../feature-1afd4cfd-991f-47a7-904d-7311402305bb.json        | 4 ++++
 .../aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt | 5 +++--
 .../jetbrains/core/explorer/webview/ToolkitLoginWebview.kt   | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json

diff --git a/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json b/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json
new file mode 100644
index 00000000000..a1ae79074f6
--- /dev/null
+++ b/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for using Amazon Q chat through a remote IDE instance on 2024.2+"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
index a314ea8d49c..67ceff60677 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
@@ -262,8 +262,8 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
 
     override fun loadWebView(query: JBCefJSQuery) {
         val webScriptUri = assetHandler.createResource(
-            "js/getStart.js",
-            QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/getStart.js")
+            WEB_SCRIPT,
+            QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/$WEB_SCRIPT")
         )
 
         jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
@@ -271,5 +271,6 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
 
     companion object {
         private val LOG = getLogger<QWebviewBrowser>()
+        private const val WEB_SCRIPT = "js/getStart.js"
     }
 }
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
index 9376f506010..8c14c3b9eea 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
@@ -323,8 +323,8 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
 
     override fun loadWebView(query: JBCefJSQuery) {
         val webScriptUri = assetHandler.createResource(
-            "js/toolkitGetStart.js",
-            ToolkitWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/toolkitGetStart.js")
+            WEB_SCRIPT,
+            ToolkitWebviewBrowser::class.java.getResourceAsStream("/webview/assets/$WEB_SCRIPT")
         )
 
         jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
@@ -334,6 +334,7 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
 
     companion object {
         private val LOG = getLogger<ToolkitWebviewBrowser>()
+        private const val WEB_SCRIPT = "js/toolkitGetStart.js"
     }
 }
 

From bc2c92e9363b027f6c8c399cb896b570fb9db4f6 Mon Sep 17 00:00:00 2001
From: Lokesh <lodogga@amazon.com>
Date: Wed, 12 Mar 2025 22:16:08 -0700
Subject: [PATCH 03/12] fix(amazonq): Bug Fix for "Q: Send to Prompt" doesn't
 work in split panes on local or remote (#5463)

* Fixing bugs IDE-16164 and IDE-16163
---
 ...-2e1854d3-f326-4552-aa02-8ce19682c312.json |  4 ++++
 .../controller/CodeTestChatController.kt      | 22 ++++++++++++++++---
 .../context/file/FileContextExtractor.kt      |  8 ++++++-
 .../focusArea/FocusAreaContextExtractor.kt    |  7 +++++-
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 .changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json

diff --git a/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json b/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json
new file mode 100644
index 00000000000..9029f6349d4
--- /dev/null
+++ b/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json
@@ -0,0 +1,4 @@
+{
+    "type" : "bugfix",
+    "description" : "Fix Q: Send to Prompt option to work in split panes on local and remote."
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 01227d4f1d2..0d85e9b43f1 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -10,6 +10,8 @@ import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -95,6 +97,7 @@ import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.FileCont
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.jetbrains.ui.feedback.TestGenFeedbackDialog
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
@@ -1246,9 +1249,22 @@ class CodeTestChatController(
         message: IncomingCodeTestMessage.StartTestGen,
     ): ActiveFileInfo? {
         try {
-            val fileEditorManager = FileEditorManager.getInstance(project)
-            val activeEditor = fileEditorManager.selectedEditor
-            val activeFile = fileEditorManager.selectedFiles.firstOrNull()
+            val (activeEditor, activeFile) = when {
+                isRunningOnRemoteBackend() -> {
+                    val editors = EditorFactory.getInstance().allEditors
+                    val editor = editors.firstOrNull()
+                    val file = editor?.document?.let { document ->
+                        FileDocumentManager.getInstance().getFile(document)
+                    }
+                    Pair(editor, file)
+                }
+                else -> {
+                    val fileEditorManager = FileEditorManager.getInstance(project)
+                    val editor = fileEditorManager.selectedEditor
+                    val file = fileEditorManager.selectedFiles.firstOrNull()
+                    Pair(editor, file)
+                }
+            }
             val projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run {
                 project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
index 288a6991099..c7c90749b3e 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt
@@ -13,12 +13,18 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapte
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.util.LanguageExtractor
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.util.MatchPolicyExtractor
 import software.aws.toolkits.jetbrains.utils.computeOnEdt
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 
 class FileContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter?, private val project: Project) {
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FileContext? {
+        val editorManager = FileEditorManager.getInstance(project)
+
         val editor = computeOnEdt {
-            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
+            when {
+                isRunningOnRemoteBackend() -> editorManager.selectedTextEditorWithRemotes.firstOrNull()
+                else -> editorManager.selectedTextEditor
+            }
         } ?: return null
 
         val fileLanguage = computeOnEdt {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
index 975525ed87c..210c0263c31 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
@@ -18,6 +18,7 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.FullyQual
 import software.aws.toolkits.jetbrains.services.cwc.controller.ChatController
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.util.LanguageExtractor
 import software.aws.toolkits.jetbrains.utils.computeOnEdt
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.awt.Point
 import kotlin.math.min
 
@@ -25,8 +26,12 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
 
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FocusAreaContext? {
+        val editorManager = FileEditorManager.getInstance(project)
         val editor = computeOnEdt {
-            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
+            when {
+                isRunningOnRemoteBackend() -> editorManager.selectedTextEditorWithRemotes.firstOrNull()
+                else -> editorManager.selectedTextEditor
+            }
         } ?: return null
 
         if (editor.document.text.isBlank()) return null

From 1475824ecedab0bbde672e9b93ec51c994df8d39 Mon Sep 17 00:00:00 2001
From: Lokesh <lodogga@amazon.com>
Date: Thu, 13 Mar 2025 11:17:54 -0700
Subject: [PATCH 04/12] Revert "Adding change log" (#5473)

This reverts commit a5e07dd35dd0dca19fb99e7333fb192e00259451.
---
 .../bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json          | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json

diff --git a/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json b/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json
deleted file mode 100644
index 9029f6349d4..00000000000
--- a/.changes/next-release/bugfix-2e1854d3-f326-4552-aa02-8ce19682c312.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "type" : "bugfix",
-    "description" : "Fix Q: Send to Prompt option to work in split panes on local and remote."
-}
\ No newline at end of file

From 9a195e1e0aea14a3c4e31e7de08784b5a5e56f9a Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Thu, 20 Mar 2025 14:37:58 -0700
Subject: [PATCH 05/12] fix(amazonq): use https as scheme for local webview
 resource resolver (#5489)

https://developer.mozilla.org/en-US/docs/Web/API/Clipboard
`navigator.clipboard` is only accessible from a "secure context", which JCEF does not think we are using,
because the URI authority is not localhost or https. Since we are hooking onto the CEF resource request handler,
it does not matter what we use for the scheme/authority as long as there is no conflict with real resources.

Previous implementation used a different load mechanism which somehow met the secure context criteria.
---
 .../amazonq/webview/AssetResourceHandler.kt   | 96 -------------------
 .../services/amazonq/webview/Browser.kt       |  2 +-
 .../webview/LocalAssetJBCefRequestHandler.kt  |  2 +-
 3 files changed, 2 insertions(+), 98 deletions(-)
 delete mode 100644 plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/AssetResourceHandler.kt

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/AssetResourceHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/AssetResourceHandler.kt
deleted file mode 100644
index 3809786e576..00000000000
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/AssetResourceHandler.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package software.aws.toolkits.jetbrains.services.amazonq.webview
-
-import org.cef.browser.CefBrowser
-import org.cef.browser.CefFrame
-import org.cef.callback.CefCallback
-import org.cef.callback.CefSchemeHandlerFactory
-import org.cef.handler.CefResourceHandler
-import org.cef.misc.IntRef
-import org.cef.misc.StringRef
-import org.cef.network.CefRequest
-import org.cef.network.CefResponse
-import java.io.IOException
-import java.net.URLConnection
-
-// TODO: delete this file as it's moved to core/WebviewResourceHandler
-// TODO: maybe parameterize this class with the resource URI so that login UI and chat UI can share the same resource handler?
-/**
- * Loads assets from the /mynah-ui/assets/ directory on classpath if the CEF browser requests for
- * any resource starting with the [AssetResourceHandler.LOCAL_RESOURCE_URL_PREFIX] defined
- * below. The CEF Browser must register this scheme handler using [org.cef.CefApp.registerSchemeHandlerFactory] first. A
- * new AssetResourceHandler instance is created for each request.
- */
-open class AssetResourceHandler(var data: ByteArray) : CefResourceHandler {
-    /**
-     * Factory class for [AssetResourceHandler]. Ignores any request that doesn't begin with
-     * [AssetResourceHandler.LOCAL_RESOURCE_URL_PREFIX]
-     */
-    open class AssetResourceHandlerFactory : CefSchemeHandlerFactory {
-        override fun create(
-            browser: CefBrowser?,
-            frame: CefFrame?,
-            schemeName: String?,
-            request: CefRequest?,
-        ): AssetResourceHandler? {
-            val resourceUri = request?.url ?: return null
-            if (!resourceUri.startsWith(LOCAL_RESOURCE_URL_PREFIX)) return null
-
-            val resource = resourceUri.replace(LOCAL_RESOURCE_URL_PREFIX, "/mynah-ui/assets/")
-            val resourceInputStream = this.javaClass.getResourceAsStream(resource)
-
-            try {
-                resourceInputStream.use {
-                    if (resourceInputStream != null) {
-                        return AssetResourceHandler(resourceInputStream.readAllBytes())
-                    }
-                    return null
-                }
-            } catch (e: IOException) {
-                throw RuntimeException(e)
-            }
-        }
-    }
-
-    private var offset = 0
-    private var resourceUri: String? = null
-    override fun processRequest(cefRequest: CefRequest, cefCallback: CefCallback): Boolean {
-        resourceUri = cefRequest.url
-        cefCallback.Continue()
-        return true
-    }
-
-    override fun getResponseHeaders(cefResponse: CefResponse, intRef: IntRef, stringRef: StringRef) {
-        intRef.set(data.size)
-        cefResponse.setHeaderByName("Access-Control-Allow-Origin", "*", true)
-        val mimeType = if (resourceUri?.endsWith(".wasm") == true) "application/wasm" else URLConnection.getFileNameMap().getContentTypeFor(resourceUri)
-        if (mimeType != null) cefResponse.mimeType = mimeType
-        cefResponse.status = 200
-    }
-
-    override fun readResponse(
-        outBuffer: ByteArray,
-        bytesToRead: Int,
-        bytesRead: IntRef,
-        cefCallback: CefCallback,
-    ): Boolean {
-        if (offset >= data.size) {
-            cefCallback.cancel()
-            return false
-        }
-        var lenToRead = Math.min(outBuffer.size, bytesToRead)
-        lenToRead = Math.min(data.size - offset, lenToRead)
-        System.arraycopy(data, offset, outBuffer, 0, lenToRead)
-        bytesRead.set(lenToRead)
-        offset = offset + lenToRead
-        return true
-    }
-
-    override fun cancel() {}
-
-    companion object {
-        private const val LOCAL_RESOURCE_URL_PREFIX = "http://mynah/"
-    }
-}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index c08ed48c989..a62c8e1191f 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -92,7 +92,7 @@ class Browser(parent: Disposable) : Disposable {
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
 
         val jsScripts = """
-            <script type="text/javascript" src="http://toolkitasset/mynah/js/mynah-ui.js" defer onload="init()"></script>
+            <script type="text/javascript" src="${LocalAssetJBCefRequestHandler.PROTOCOL}://${LocalAssetJBCefRequestHandler.AUTHORITY}/mynah/js/mynah-ui.js" defer onload="init()"></script>
             <script type="text/javascript">
                 const init = () => {
                     mynahUI.createMynahUI(
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
index 1a540b288bf..cd8a4d855d4 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt
@@ -77,7 +77,7 @@ class LocalAssetJBCefRequestHandler(jbCefBrowser: JBCefBrowserBase) : JBCefLocal
     }
 
     companion object {
-        const val PROTOCOL = "http"
+        const val PROTOCOL = "https"
         const val AUTHORITY = "toolkitasset"
     }
 }

From d53b50928faa444a057d70c1f3e505bfdeaef0f2 Mon Sep 17 00:00:00 2001
From: Richard Li <richali@amazon.com>
Date: Thu, 24 Apr 2025 11:10:14 -0700
Subject: [PATCH 06/12] build

---
 .../aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt  | 2 +-
 .../software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index a1d0cc2409e..40f2b76baa2 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -7,8 +7,8 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
-import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
 import software.aws.toolkits.jetbrains.settings.MeetQSettings
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt
index 2a281f7a981..aa63ddd71d1 100644
--- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt
+++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt
@@ -23,7 +23,7 @@ import software.aws.toolkits.jetbrains.core.webview.LoginBrowser
 import software.aws.toolkits.jetbrains.services.telemetry.MockTelemetryServiceExtension
 import kotlin.test.assertNotNull
 
-class TestLoginBrowser(project: Project) : LoginBrowser(project, "", "") {
+class TestLoginBrowser(project: Project) : LoginBrowser(project) {
     // test env can't initiate a real jcef and will throw error
     override val jcefBrowser: JBCefBrowserBase
         get() = mock()

From 5ae53fb2a0c5a314e97271e028f08e9f6d44e7f8 Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Tue, 20 May 2025 14:28:16 -0700
Subject: [PATCH 07/12] fix(amazonq): fix agentic asset loading in remote mode
 (#5734)

local uris cannot be loaded if the host is deemed non-remote
---
 .../services/amazonq/toolwindow/AmazonQPanel.kt    |  4 ++--
 .../jetbrains/services/amazonq/webview/Browser.kt  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index 79016830c90..3f384d6c476 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -111,13 +111,13 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
             wrapper.setContent(loadingPanel)
 
             scope.launch {
-                val webUri = service<ArtifactManager>().fetchArtifact(project).resolve("amazonq-ui.js").toUri()
+                val mynahAsset = service<ArtifactManager>().fetchArtifact(project).resolve("amazonq-ui.js")
                 // wait for server to be running
                 AmazonQLspService.getInstance(project).instanceFlow.first()
 
                 withContext(EDT) {
                     browser.complete(
-                        Browser(this@AmazonQPanel, webUri, project).also {
+                        Browser(this@AmazonQPanel, mynahAsset, project).also {
                             wrapper.setContent(it.component())
 
                             initConnections()
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index 131c4659dfb..4744b962676 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
+import software.aws.toolkits.core.utils.inputStream
 import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
@@ -17,14 +18,13 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
 import software.aws.toolkits.jetbrains.settings.MeetQSettings
-import java.net.URI
+import java.nio.file.Path
 import java.nio.file.Paths
 
-/*
-Displays the web view for the Amazon Q tool window
+/**
+ * Displays the web view for the Amazon Q tool window
  */
-
-class Browser(parent: Disposable, private val webUri: URI, val project: Project) : Disposable {
+class Browser(parent: Disposable, private val mynahAsset: Path, val project: Project) : Disposable {
 
     val jcefBrowser = createBrowser(parent)
 
@@ -122,13 +122,13 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
     ): String {
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
         val connectorAdapterPath = "${LocalAssetJBCefRequestHandler.PROTOCOL}://${LocalAssetJBCefRequestHandler.AUTHORITY}/mynah/js/connectorAdapter.js"
+        val mynahResource = assetRequestHandler.createResource(mynahAsset.fileName.toString(), mynahAsset.inputStream())
         generateQuickActionConfig()
         // https://github.com/highlightjs/highlight.js/issues/1387
         // language=HTML
         val jsScripts = """
             <script type="text/javascript" charset="UTF-8" src="$connectorAdapterPath"></script>
-            <script type="text/javascript" charset="UTF-8" src="$webUri" defer onload="init()"></script>
-            
+            <script type="text/javascript" charset="UTF-8" src="$mynahResource" defer onload="init()"></script>
             <script type="text/javascript">
             
                 const init = () => {

From 859334426224f09600710ec3dc35cadda0073454 Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Tue, 20 May 2025 16:04:20 -0700
Subject: [PATCH 08/12] fix(amazonq): fix code issues tab not appearing in
 remote (#5737)

on remote, each client gets its own instance of the tool window.

logic needs to handle this case, otherwise it will only make changes against the 'main' IDE,
and will not be visible to remote clients
---
 .../toolkits/gradle/intellij/IdeVersions.kt   |   5 +-
 .../codescan/CodeWhispererCodeScanManager.kt  | 108 +++++++++++-------
 .../codescan/CodeWhispererCodeScanSession.kt  |   3 +-
 .../jetbrains/CwmProblemsViewMutator.kt       |  19 +++
 .../jetbrains/DefaultProblemsViewMutator.kt   |  14 +++
 .../toolkits/jetbrains/ProblemsViewMutator.kt |  16 +++
 .../META-INF/amazonq-ext-codewithme.xml       |   8 ++
 .../src/main/resources/META-INF/plugin.xml    |  10 ++
 8 files changed, 142 insertions(+), 41 deletions(-)
 create mode 100644 plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
 create mode 100644 plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/DefaultProblemsViewMutator.kt
 create mode 100644 plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ProblemsViewMutator.kt
 create mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-codewithme.xml

diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
index e0048684766..de331fa4415 100644
--- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
+++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -22,7 +22,7 @@ object IdeVersions {
     private val commonPlugins = listOf(
         "Git4Idea",
         "org.jetbrains.plugins.terminal",
-        "org.jetbrains.plugins.yaml"
+        "org.jetbrains.plugins.yaml",
     )
 
     private val ideProfiles = listOf(
@@ -34,6 +34,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:242.20224.155",
@@ -71,6 +72,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:243.21565.122",
@@ -112,6 +114,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "PythonCore:251.23774.460",
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt
index 674bcdf9500..7fe6d8f1535 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt
@@ -3,13 +3,13 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.codescan
 
-import com.intellij.analysis.problemsView.toolWindow.ProblemsView
 import com.intellij.codeHighlighting.HighlightDisplayLevel
 import com.intellij.codeInspection.util.InspectionMessage
 import com.intellij.icons.AllIcons
 import com.intellij.lang.Commenter
 import com.intellij.lang.Language
 import com.intellij.lang.LanguageCommenters
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -36,8 +36,10 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.isFile
+import com.intellij.openapi.wm.ToolWindow
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.refactoring.suggested.range
+import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentManagerEvent
 import com.intellij.ui.content.ContentManagerListener
 import com.intellij.ui.treeStructure.Tree
@@ -60,6 +62,7 @@ import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.ProblemsViewMutator
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineUiContext
 import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
@@ -107,26 +110,10 @@ import kotlin.coroutines.CoroutineContext
 
 private val LOG = getLogger<CodeWhispererCodeScanManager>()
 
-class CodeWhispererCodeScanManager(val project: Project) {
-    private val defaultScope = projectCoroutineScope(project)
+class CodeWhispererCodeScanManager(val project: Project, private val defaultScope: CoroutineScope) : Disposable {
     private val codeScanResultsPanel by lazy {
         CodeWhispererCodeScanResultsView(project, defaultScope)
     }
-    private val codeScanIssuesContent by lazy {
-        val contentManager = getProblemsWindow().contentManager
-        contentManager.factory.createContent(
-            codeScanResultsPanel,
-            message("codewhisperer.codescan.scan_display"),
-            false
-        ).also {
-            Disposer.register(contentManager, it)
-            contentManager.addContentManagerListener(object : ContentManagerListener {
-                override fun contentRemoved(event: ContentManagerEvent) {
-                    if (event.content == it) reset()
-                }
-            })
-        }
-    }
 
     private var autoScanIssues = emptyList<CodeWhispererCodeScanIssue>()
     private var ondemandScanIssues = emptyList<CodeWhispererCodeScanIssue>()
@@ -507,12 +494,19 @@ class CodeWhispererCodeScanManager(val project: Project) {
     private fun refreshUi() {
         val codeScanTreeModel = CodeWhispererCodeScanTreeModel(codeScanTreeNodeRoot)
         val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
-        if (totalIssuesCount > 0) {
-            codeScanIssuesContent.displayName =
-                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+        val displayName = if (totalIssuesCount > 0) {
+            message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
         } else {
-            codeScanIssuesContent.displayName = message("codewhisperer.codescan.scan_display")
+            message("codewhisperer.codescan.scan_display")
         }
+
+        withToolWindow { window ->
+            window.contentManager.contents.filter { it.isCodeScanView() }
+                .forEach {
+                    it.displayName = displayName
+                }
+        }
+
         codeScanResultsPanel.refreshUIWithUpdatedModel(codeScanTreeModel)
     }
 
@@ -650,10 +644,25 @@ class CodeWhispererCodeScanManager(val project: Project) {
      * This method adds code content to the problems view if not already added.
      */
     fun buildCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        if (!problemsWindow.contentManager.contents.contains(codeScanIssuesContent)) {
-            problemsWindow.contentManager.addContent(codeScanIssuesContent)
-            codeScanIssuesContent.displayName = message("codewhisperer.codescan.scan_display")
+        withToolWindow { problemsWindow ->
+            val contentManager = problemsWindow.contentManager
+            if (!contentManager.contents.any { it.isCodeScanView() }) {
+                contentManager.addContent(
+                    contentManager.factory.createContent(
+                        codeScanResultsPanel,
+                        message("codewhisperer.codescan.scan_display"),
+                        false
+                    ).also {
+                        it.tabName = message("codewhisperer.codescan.scan_display")
+                        Disposer.register(contentManager, it)
+                        contentManager.addContentManagerListener(object : ContentManagerListener {
+                            override fun contentRemoved(event: ContentManagerEvent) {
+                                if (event.content == it) reset()
+                            }
+                        })
+                    }
+                )
+            }
         }
     }
 
@@ -661,15 +670,19 @@ class CodeWhispererCodeScanManager(val project: Project) {
      * This method shows the code content panel in problems view
      */
     fun showCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        problemsWindow.contentManager.setSelectedContent(codeScanIssuesContent)
-        problemsWindow.show()
+        withToolWindow { problemsWindow ->
+            problemsWindow.contentManager.contents.firstOrNull { it.isCodeScanView() }
+                ?.let { problemsWindow.contentManager.setSelectedContent(it) }
+            problemsWindow.show()
+        }
     }
 
     fun removeCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        if (problemsWindow.contentManager.contents.contains(codeScanIssuesContent)) {
-            problemsWindow.contentManager.removeContent(codeScanIssuesContent, false)
+        withToolWindow { problemsWindow ->
+            problemsWindow.contentManager.contents.filter { it.isCodeScanView() }
+                .forEach {
+                    problemsWindow.contentManager.removeContent(it, true)
+                }
         }
     }
 
@@ -735,8 +748,13 @@ class CodeWhispererCodeScanManager(val project: Project) {
         )
     }
 
-    private fun getProblemsWindow() = ProblemsView.getToolWindow(project)
-        ?: error(message("codewhisperer.codescan.problems_window_not_found"))
+    private fun withToolWindow(runnable: (ToolWindow) -> Unit) {
+        ProblemsViewMutator.EP.forEachExtensionSafe { mutator ->
+            mutator.mutateProblemsView(project, runnable)
+        }
+    }
+
+    private fun Content.isCodeScanView() = component == codeScanResultsPanel
 
     private fun reset() = runInEdt {
         // clear the codeScanTreeNodeRoot
@@ -765,7 +783,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
             editorFactory.addEditorFactoryListener(fileListener, project)
             editorFactory.eventMulticaster.addEditorMouseMotionListener(
                 editorMouseListener,
-                codeScanIssuesContent
+                this
             )
         }
     }
@@ -955,8 +973,12 @@ class CodeWhispererCodeScanManager(val project: Project) {
         val codeScanTreeModel = CodeWhispererCodeScanTreeModel(codeScanTreeNodeRoot)
         val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
         if (totalIssuesCount > 0) {
-            codeScanIssuesContent.displayName =
-                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+            withToolWindow { problemsWindow ->
+                problemsWindow.contentManager.contents.filter { it.isCodeScanView() }
+                    .forEach {
+                        it.displayName = message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                    }
+            }
         }
         codeScanResultsPanel.refreshUIWithUpdatedModel(codeScanTreeModel)
     }
@@ -971,8 +993,13 @@ class CodeWhispererCodeScanManager(val project: Project) {
             val codeScanTreeModel = CodeWhispererCodeScanTreeModel(root)
             val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
             if (totalIssuesCount > 0) {
-                codeScanIssuesContent.displayName =
-                    message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                withToolWindow { window ->
+                    window.contentManager.contents.filter { it.isCodeScanView() }
+                        .forEach {
+                            it.displayName =
+                                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                        }
+                }
             }
             codeScanResultsPanel.updateAndDisplayScanResults(codeScanTreeModel, scannedFiles, scope)
         }
@@ -1004,6 +1031,9 @@ class CodeWhispererCodeScanManager(val project: Project) {
         return isInsideWorkTree(projectDir)
     }
 
+    override fun dispose() {
+    }
+
     companion object {
         fun getInstance(project: Project): CodeWhispererCodeScanManager = project.service()
     }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
index ec3b1c30df7..65ef44f18dc 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt
@@ -31,6 +31,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnaly
 import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnalysisResponse
 import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.core.utils.debug
+import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
@@ -291,7 +292,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
                 .build()
         )
     } catch (e: Exception) {
-        LOG.debug { "Getting code review failed: ${e.message}" }
+        LOG.error(e) { "Getting code review failed: ${e.message}" }
         val errorMessage = getTelemetryErrorMessage(e, featureUseCase = CodeWhispererConstants.FeatureName.CODE_REVIEW)
         throw codeScanServerException("GetCodeReviewException: $errorMessage")
     }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
new file mode 100644
index 00000000000..3346352e7ed
--- /dev/null
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
@@ -0,0 +1,19 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.analysis.problemsView.toolWindow.ProblemsView
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+import com.jetbrains.rdserver.toolWindow.BackendToolWindowHost
+
+class CwmProblemsViewMutator : ProblemsViewMutator {
+    override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
+        BackendToolWindowHost.getAllInstances(project).forEach { host ->
+            host.getToolWindow(ProblemsView.ID)?.let {
+                runnable(it)
+            }
+        }
+    }
+}
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/DefaultProblemsViewMutator.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/DefaultProblemsViewMutator.kt
new file mode 100644
index 00000000000..6d4702bfbc0
--- /dev/null
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/DefaultProblemsViewMutator.kt
@@ -0,0 +1,14 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.analysis.problemsView.toolWindow.ProblemsView
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+
+class DefaultProblemsViewMutator : ProblemsViewMutator {
+    override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
+        ProblemsView.getToolWindow(project)?.let { runnable(it) }
+    }
+}
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ProblemsViewMutator.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ProblemsViewMutator.kt
new file mode 100644
index 00000000000..4da60db9d64
--- /dev/null
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ProblemsViewMutator.kt
@@ -0,0 +1,16 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.openapi.extensions.ExtensionPointName
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+
+interface ProblemsViewMutator {
+    fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit)
+
+    companion object {
+        val EP = ExtensionPointName<ProblemsViewMutator>("software.aws.toolkits.jetbrains.problemsViewMutator")
+    }
+}
diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-codewithme.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-codewithme.xml
new file mode 100644
index 00000000000..d199d28324c
--- /dev/null
+++ b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-codewithme.xml
@@ -0,0 +1,8 @@
+<!-- Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
+<idea-plugin>
+    <extensions defaultExtensionNs="software.aws.toolkits.jetbrains">
+        <problemsViewMutator implementation="software.aws.toolkits.jetbrains.CwmProblemsViewMutator"/>
+    </extensions>
+</idea-plugin>
diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
index 786974563a0..bea85c6ab6a 100644
--- a/plugins/amazonq/src/main/resources/META-INF/plugin.xml
+++ b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
@@ -58,6 +58,8 @@
     <depends>aws.toolkit.core</depends>
     <depends>com.intellij.modules.lang</depends>
 
+    <depends optional="true" config-file="amazonq-ext-codewithme.xml">com.jetbrains.codeWithMe</depends>
+
     <depends optional="true" config-file="amazonq-ext-dart.xml">Dart</depends>
     <depends optional="true" config-file="amazonq-ext-datagrip.xml">com.intellij.database</depends>
     <depends optional="true" config-file="amazonq-ext-go.xml">org.jetbrains.plugins.go</depends>
@@ -97,8 +99,16 @@
         <extensionPoint qualifiedName="software.aws.toolkits.jetbrains.moduleDependencyProvider"
                         interface="software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider"
                         dynamic="true"/>
+
+        <extensionPoint qualifiedName="software.aws.toolkits.jetbrains.problemsViewMutator"
+                        interface="software.aws.toolkits.jetbrains.ProblemsViewMutator"
+                        dynamic="true" />
     </extensionPoints>
 
+    <extensions defaultExtensionNs="software.aws.toolkits.jetbrains">
+        <problemsViewMutator implementation="software.aws.toolkits.jetbrains.DefaultProblemsViewMutator"/>
+    </extensions>
+
     <xi:include href="/META-INF/module-amazonq.xml" />
 
     <xi:include href="/META-INF/change-notes.xml" xpointer="xpointer(/idea-plugin/*)">

From 8c4100a885d0eeb37174c7f5498d38f947bc1a8e Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Tue, 27 May 2025 09:49:43 -0700
Subject: [PATCH 09/12] fix(amazonq): use progress bar decorator while loading
 q chat on remote (#5749)

animated icons do not show up on remote
---
 .../services/amazonq/toolwindow/AmazonQPanel.kt        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index 3f384d6c476..3bdeda97713 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBLoadingPanel
 import com.intellij.ui.components.JBTextArea
+import com.intellij.ui.components.ProgressBarLoadingDecorator
 import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.AlignX
@@ -103,7 +104,14 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
             }
             browser.complete(null)
         } else {
-            val loadingPanel = JBLoadingPanel(null, this)
+            val loadingPanel = if (isRunningOnRemoteBackend()) {
+                JBLoadingPanel(null) {
+                    ProgressBarLoadingDecorator(it, this, -1)
+                }
+            } else {
+                JBLoadingPanel(null, this)
+            }
+
             val wrapper = Wrapper()
             loadingPanel.startLoading()
 

From 3bea4efbf52fc9348c82f04387f86d79720597de Mon Sep 17 00:00:00 2001
From: Richard Li <richali@amazon.com>
Date: Fri, 6 Jun 2025 16:22:20 -0700
Subject: [PATCH 10/12] detekt

---
 .../jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index 4b4d03e3940..028dca4e1d8 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -43,8 +43,8 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestA
 import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
-import software.aws.toolkits.resources.message
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
+import software.aws.toolkits.resources.message
 import java.util.concurrent.CompletableFuture
 import javax.swing.JButton
 

From 61270edfd554717c97cf6131ef24e99766191ae5 Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Mon, 25 Aug 2025 10:13:55 -0700
Subject: [PATCH 11/12] fix: provide loading text when chat assets are slow to
 load (#5973)

on remote, it can take 10+ seconds for chat to be visible.

additionally, delete some unneeded assets to slightly reduce load time
---
 .../toolkits/gradle/intellij/IdeVersions.kt   |   1 +
 .../toolwindow/AmazonQToolWindowFactory.kt    |   8 +-
 .../services/amazonq/webview/Browser.kt       |  65 +++------
 .../amazonq/webview/BrowserConnector.kt       |   5 +-
 .../webview/theme/ThemeBrowserAdapter.kt      |   6 +-
 .../mynah-ui/src/mynah-ui/connectorAdapter.ts |  18 +--
 .../mynah-ui/src/mynah-ui/fqn/extractor.ts    | 133 ------------------
 .../mynah-ui/src/mynah-ui/fqn/find-names.js   |  54 -------
 .../src/mynah-ui/fqn/java-import-reader.ts    |  58 --------
 .../amazonq/mynah-ui/src/mynah-ui/index.ts    |  13 --
 .../amazonq/mynah-ui/webpack.media.config.js  |  56 +-------
 .../jetbrains-community/build.gradle.kts      |   2 +
 .../amazonq/lsp/AmazonQLanguageClientImpl.kt  |  10 +-
 .../resources/MessagesBundle.properties       |   2 +-
 14 files changed, 54 insertions(+), 377 deletions(-)
 delete mode 100644 plugins/amazonq/mynah-ui/src/mynah-ui/fqn/extractor.ts
 delete mode 100644 plugins/amazonq/mynah-ui/src/mynah-ui/fqn/find-names.js
 delete mode 100644 plugins/amazonq/mynah-ui/src/mynah-ui/fqn/java-import-reader.ts
 delete mode 100644 plugins/amazonq/mynah-ui/src/mynah-ui/index.ts

diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
index 7cdd1213628..aa474c06e03 100644
--- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
+++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -163,6 +163,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                     "com.intellij.properties"
                 ),
                 marketplacePlugins = listOf(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
index 6e1841499aa..0883a83b657 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
@@ -133,8 +133,12 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         }
     }
 
+    /**
+     * Only applies to local
+     * On remote, since we are using PROJECTOR_INSTANCING, this will never run
+     */
     override fun init(toolWindow: ToolWindow) {
-        toolWindow.stripeTitle = message("q.window.title")
+        toolWindow.stripeTitle = message("toolwindow.stripe.amazon.q.window")
         toolWindow.component.addComponentListener(
             object : ComponentAdapter() {
                 override fun componentResized(e: ComponentEvent) {
@@ -143,6 +147,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                     LOG.debug {
                         "Amazon Q Tool window stretched to a width less than the minimum allowed width, resizing to the minimum allowed width"
                     }
+
+                    // can't implement equivalent on remote as stretchWidth impl is noop
                     (toolWindow as ToolWindowEx).stretchWidth(MINIMUM_TOOLWINDOW_WIDTH - newWidth)
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index f176710bf3a..e6e96874632 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -16,6 +16,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMes
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
+import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.EditorThemeAdapter
+import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
 import software.aws.toolkits.jetbrains.settings.MeetQSettings
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -128,26 +130,26 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
         // https://github.com/highlightjs/highlight.js/issues/1387
         // language=HTML
         val jsScripts = """
-            <script type="text/javascript" charset="UTF-8" src="$connectorAdapterPath"></script>
+            <script type="text/javascript" charset="UTF-8" src="$connectorAdapterPath" defer></script>
             <script type="text/javascript" charset="UTF-8" src="$mynahResource" defer onload="init()"></script>
             <script type="text/javascript">
                 
                 const init = () => {
                     const hybridChatConnector = connectorAdapter.initiateAdapter(
-                     ${MeetQSettings.getInstance().reinvent2024OnboardingCount < MAX_ONBOARDING_PAGE_COUNT},
-                     ${MeetQSettings.getInstance().disclaimerAcknowledged},
-                     $isFeatureDevAvailable,
-                     $isCodeTransformAvailable,
-                     $isDocAvailable,
-                     $isCodeScanAvailable,
-                     $isCodeTestAvailable,
-                     {
-                            postMessage: message => {
-                                $postMessageToJavaJsCode
-                            }
+                        ${MeetQSettings.getInstance().reinvent2024OnboardingCount < MAX_ONBOARDING_PAGE_COUNT},
+                        ${MeetQSettings.getInstance().disclaimerAcknowledged},
+                        $isFeatureDevAvailable,
+                        $isCodeTransformAvailable,
+                        $isDocAvailable,
+                        $isCodeScanAvailable,
+                        $isCodeTestAvailable,
+                        {
+                            postMessage: message => { $postMessageToJavaJsCode }
                         },
+                        ${OBJECT_MAPPER.writeValueAsString(highlightCommand)},
+                        "${activeProfile?.profileName.orEmpty()}"
+                    )
                     
-                     "${activeProfile?.profileName.orEmpty()}")
                     const qChat = amazonQChat.createChat(
                         {
                             postMessage: message => {
@@ -208,15 +210,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
             </script>        
         """.trimIndent()
 
-        addQuickActionCommands(
-            isCodeTransformAvailable,
-            isFeatureDevAvailable,
-            isDocAvailable,
-            isCodeTestAvailable,
-            isCodeScanAvailable,
-            highlightCommand,
-            activeProfile
-        )
+        // language=HTML
         return """
             <!DOCTYPE html>
             <style>
@@ -283,38 +277,21 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
                         transform: translateZ(0) !important;
                     }
                 </style>
-            <html>
+            <html lang="en">
                 <head>
                     <title>AWS Q</title>
                     $jsScripts
                 </head>
                 <body>
+                    <div style="text-align: center;">Amazon Q is loading...</div>
+                    <script type="text/javascript">
+                        ${ThemeBrowserAdapter().buildJsCodeToUpdateTheme(EditorThemeAdapter.getThemeFromIde())}
+                    </script>
                 </body>
             </html>
         """.trimIndent()
     }
 
-    private fun addQuickActionCommands(
-        isCodeTransformAvailable: Boolean,
-        isFeatureDevAvailable: Boolean,
-        isDocAvailable: Boolean,
-        isCodeTestAvailable: Boolean,
-        isCodeScanAvailable: Boolean,
-        highlightCommand: HighlightCommand?,
-        activeProfile: QRegionProfile?,
-    ) {
-        // TODO:  Remove this once chat has been integrated with agents. This is added temporarily to keep detekt happy.
-        isCodeScanAvailable
-        isCodeTestAvailable
-        isDocAvailable
-        isFeatureDevAvailable
-        isCodeTransformAvailable
-        MAX_ONBOARDING_PAGE_COUNT
-        OBJECT_MAPPER
-        highlightCommand
-        activeProfile
-    }
-
     companion object {
         private const val MAX_ONBOARDING_PAGE_COUNT = 3
         private val OBJECT_MAPPER = jacksonObjectMapper()
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
index 0f994cfb35e..f0c725e8a48 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -201,7 +201,8 @@ class BrowserConnector(
         themeSource
             .distinctUntilChanged()
             .onEach {
-                themeBrowserAdapter.updateThemeInBrowser(chatBrowser, it, uiReady)
+                uiReady.await()
+                themeBrowserAdapter.updateThemeInBrowser(chatBrowser, it)
             }
             .launchIn(this)
     }
@@ -619,7 +620,7 @@ class BrowserConnector(
                     $isDocAvailable,
                     $isCodeScanAvailable,
                     $isCodeTestAvailable,
-                    { postMessage: () => {} }
+                    { postMessage: () => {} },
                 );
                 
                 const commands = tempConnector.initialQuickActions?.slice(0, 2) || [];
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
index b3bb829f4ba..b42c96a01e8 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.webview.theme
 
-import kotlinx.coroutines.CompletableDeferred
 import org.cef.browser.CefBrowser
 import java.awt.Color
 import java.awt.Font
@@ -19,13 +18,12 @@ class ThemeBrowserAdapter {
         browser.executeJavaScript("window.changeTheme(${theme.darkMode})", browser.url, 0)
     }
 
-    suspend fun updateThemeInBrowser(browser: CefBrowser, theme: AmazonQTheme, uiReady: CompletableDeferred<Boolean>) {
-        uiReady.await()
+    fun updateThemeInBrowser(browser: CefBrowser, theme: AmazonQTheme) {
         val codeToUpdateTheme = buildJsCodeToUpdateTheme(theme)
         browser.executeJavaScript(codeToUpdateTheme, browser.url, 0)
     }
 
-    private fun buildJsCodeToUpdateTheme(theme: AmazonQTheme) = buildString {
+    fun buildJsCodeToUpdateTheme(theme: AmazonQTheme) = buildString {
         val (bg, altBg, inputBg) = determineInputAndBgColor(theme)
         appendDarkMode(theme.darkMode)
 
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/connectorAdapter.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/connectorAdapter.ts
index 0015e5a940c..c89f92d0a01 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/connectorAdapter.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/connectorAdapter.ts
@@ -7,15 +7,6 @@ import { isTabType } from './ui/storages/tabsStorage'
 import { WebviewUIHandler } from './ui/main'
 import { TabDataGenerator } from './ui/tabs/generator'
 import { ChatClientAdapter, ChatEventHandler } from '@aws/chat-client'
-import { FqnExtractor } from "./fqn/extractor";
-
-export * from "./ui/main";
-
-declare global {
-    interface Window { fqnExtractor: FqnExtractor; }
-}
-
-window.fqnExtractor = new FqnExtractor();
 
 export const initiateAdapter = (showWelcomePage: boolean,
                              disclaimerAcknowledged: boolean,
@@ -25,11 +16,12 @@ export const initiateAdapter = (showWelcomePage: boolean,
                              isCodeScanEnabled: boolean,
                              isCodeTestEnabled: boolean,
                              ideApiPostMessage: (message: any) => void,
-                             profileName?: string) : HybridChatAdapter => {
-    return new HybridChatAdapter(showWelcomePage, disclaimerAcknowledged, isFeatureDevEnabled, isCodeTransformEnabled, isDocEnabled, isCodeScanEnabled, isCodeTestEnabled, ideApiPostMessage, profileName)
+                             highlightCommand?: QuickActionCommand,
+                             profileName?: string,
+) : HybridChatAdapter => {
+    return new HybridChatAdapter(showWelcomePage, disclaimerAcknowledged, isFeatureDevEnabled, isCodeTransformEnabled, isDocEnabled, isCodeScanEnabled, isCodeTestEnabled, ideApiPostMessage, highlightCommand, profileName)
 }
 
-
 // Ref: https://github.com/aws/aws-toolkit-vscode/blob/e9ea8082ffe0b9968a873437407d0b6b31b9e1a5/packages/core/src/amazonq/webview/ui/connectorAdapter.ts#L14
 export class HybridChatAdapter implements ChatClientAdapter {
     private uiHandler?: WebviewUIHandler
@@ -46,6 +38,7 @@ export class HybridChatAdapter implements ChatClientAdapter {
         private isCodeScanEnabled: boolean,
         private isCodeTestEnabled: boolean,
         private ideApiPostMessage: (message: any) => void,
+        private highlightCommand?: QuickActionCommand,
         private profileName?: string,
 
     ) {}
@@ -67,6 +60,7 @@ export class HybridChatAdapter implements ChatClientAdapter {
             isDocEnabled: this.isDocEnabled,
             isCodeScanEnabled: this.isCodeScanEnabled,
             isCodeTestEnabled: this.isCodeTestEnabled,
+            highlightCommand: this.highlightCommand,
             profileName: this.profileName,
             hybridChat: true,
         })
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/extractor.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/extractor.ts
deleted file mode 100644
index 2c598c087c1..00000000000
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/extractor.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*!
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// @ts-ignore
-import {findNames, findNamesWithInExtent} from './find-names';
-import {extractContextFromJavaImports} from "./java-import-reader";
-
-
-export interface FullyQualifiedName {
-    source: string[],
-    symbol: string[],
-}
-
-export interface FullyQualifiedNames {
-    used: FullyQualifiedName[];
-}
-
-export interface CodeQuery {
-    simpleNames: string[];
-    fullyQualifiedNames: FullyQualifiedNames;
-}
-
-export interface CodeSelection {
-    selectedCode: string;
-    file?: {
-        range: {
-            start: {
-                row: string;
-                column: string;
-            };
-            end: {
-                row: string;
-                column: string;
-            };
-        };
-        name: string;
-    };
-}
-
-export class FqnExtractor {
-
-    async readImports(fileText: string, languageId: string): Promise<Set<string>> {
-        const names = await findNames(fileText, languageId);
-
-        if (names.fullyQualified === undefined) {
-            return new Set<string>()
-        }
-
-        if (languageId === 'java') {
-            return new Set<string>(extractContextFromJavaImports(names));
-        }
-
-        return new Set<string>(names.fullyQualified?.declaredSymbols
-            .map((symbol: { source: string[] }): string => {
-                return symbol.source[0].replace('@', '')
-            })
-            .filter((source: string) => source.length !== 0))
-    }
-
-    async extractCodeQuery(fileText: string, languageId: string, selection: CodeSelection): Promise<{ codeQuery: CodeQuery | undefined, namesWereTruncated: boolean }> {
-        const names = selection === undefined ? await findNames(fileText, languageId) :
-            await findNamesWithInExtent(fileText, languageId, selection.file?.range.start.row, selection.file?.range.start.column, selection.file?.range.end.row, selection.file?.range.end.column);
-        if (names === undefined || Object.keys(names).length === 0) {
-            return {codeQuery: undefined, namesWereTruncated: false}
-        }
-
-        const {simpleNames, simpleNamesListWasLongerThanMaxLength} = this.prepareSimpleNames(names);
-
-        const {usedFullyQualifiedNames, namesWereTruncated} = this.prepareFqns(names);
-
-        return {
-            codeQuery: {
-                simpleNames: simpleNames,
-                fullyQualifiedNames: { used: Array.from(usedFullyQualifiedNames) }
-            },
-            namesWereTruncated: simpleNamesListWasLongerThanMaxLength || namesWereTruncated
-        }
-    }
-
-    private prepareSimpleNames(names: any): { simpleNames: string[], simpleNamesListWasLongerThanMaxLength: boolean } {
-        let simpleNames: string[] = names.simple.usedSymbols
-            .concat(names.simple.declaredSymbols)
-            .map((elem: any) => elem.symbol.trim())
-            .filter((name: string) => name.length < 129 && name.length > 1);
-
-        const maxSimpleNames = 100;
-        let simpleNamesListWasLongerThanMaxLength = false;
-
-        if (simpleNames.length > maxSimpleNames) {
-            simpleNamesListWasLongerThanMaxLength = true
-
-            simpleNames = [...new Set(simpleNames)]
-
-            if (simpleNames.length > maxSimpleNames) {
-                simpleNames = simpleNames.sort((a, b) => a.length - b.length)
-                simpleNames.splice(0, simpleNames.length - maxSimpleNames)
-            }
-        }
-
-        return {simpleNames, simpleNamesListWasLongerThanMaxLength}
-    }
-
-    private prepareFqns(names: any): {
-        readonly usedFullyQualifiedNames: Set<FullyQualifiedName>
-        readonly namesWereTruncated: boolean
-    } {
-        const usedFullyQualifiedNames: Set<FullyQualifiedName> = new Set(
-            names.fullyQualified.usedSymbols.map((name: any) => ({ source: name.source, symbol: name.symbol }))
-        )
-
-        const maxUsedFullyQualifiedNamesLength = 25
-
-        if (usedFullyQualifiedNames.size > maxUsedFullyQualifiedNamesLength) {
-            const usedFullyQualifiedNamesSorted = Array.from(usedFullyQualifiedNames).sort(
-                (name, other) => name.source.length + name.symbol.length - (other.source.length + other.symbol.length)
-            )
-            return {
-                usedFullyQualifiedNames: new Set<FullyQualifiedName>(
-                    usedFullyQualifiedNamesSorted.slice(0, maxUsedFullyQualifiedNamesLength)
-                ),
-                namesWereTruncated: true,
-            }
-        }
-
-        return {
-            usedFullyQualifiedNames,
-            namesWereTruncated: false,
-        }
-    }
-
-}
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/find-names.js b/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/find-names.js
deleted file mode 100644
index e14e589dab2..00000000000
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/find-names.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-import { Java, Python, TypeScript, Tsx } from '@aws/fully-qualified-names'
-
-export async function findNames(inputCode, languageId) {
-    const fqn = await import('@aws/fully-qualified-names')
-    switch (languageId) {
-        case 'java':
-            return await fqn.Java.findNames(inputCode);
-        case 'javascript':
-        case 'javascriptreact':
-        case 'typescriptreact':
-            return await fqn.Tsx.findNames(inputCode);
-        case 'python':
-            return await fqn.Python.findNames(inputCode);
-        case 'typescript':
-            return await fqn.TypeScript.findNames(inputCode);
-        default:
-            return {}
-    }
-}
-
-export class Selection {
-    startLine;
-    startColumn;
-    endLine;
-    endColumn;
-
-}
-
-
-export async function findNamesWithInExtent(fileText, languageId, startLine,startColumn, endLine, endColumn ){
-    const fqn = await import('@aws/fully-qualified-names')
-
-    const startLocation = new fqn.Location(startLine, startColumn)
-    const endLocation = new fqn.Location(endLine, endColumn)
-    const extent = new fqn.Extent(startLocation, endLocation)
-
-    switch (languageId) {
-        case 'java':
-            return await fqn.Java.findNamesWithInExtent(fileText, extent)
-        case 'javascript':
-        case 'javascriptreact':
-        case 'typescriptreact':
-            return await fqn.Tsx.findNamesWithInExtent(fileText, extent)
-        case 'python':
-            return await fqn.Python.findNamesWithInExtent(fileText, extent)
-        case 'typescript':
-            return await fqn.TypeScript.findNamesWithInExtent(fileText, extent)
-        default:
-            return {}
-    }
-}
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/java-import-reader.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/java-import-reader.ts
deleted file mode 100644
index 8209a444db3..00000000000
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/fqn/java-import-reader.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export interface JavaImport {
-    tld: string
-    organisation?: string
-    packages?: string[]
-}
-
-export function extractContextFromJavaImports(names: any): string[] {
-    return names.fullyQualified?.declaredSymbols
-        .map((symbol: any): JavaImport => {
-            const sourcesCount = symbol.source.length
-            return {
-                tld: symbol.source[0],
-                organisation: sourcesCount > 1 ? symbol.source[1] : undefined,
-                packages: sourcesCount > 2 ? symbol.source.slice(2) : undefined,
-            }
-        })
-        .map((javaImport: JavaImport): string => {
-            const importStatement = toString(javaImport)
-            if (commonJavaImportsPrefixesRegex.test(importStatement)) {
-                return ''
-            } else if (importStatement.startsWith(awsJavaSdkV1Prefix)) {
-                //@ts-ignore
-                return javaImport.packages?.at(1) ?? ''
-            } else if (importStatement.startsWith(awsJavaSdkV2Prefix)) {
-                //@ts-ignore
-                return javaImport.packages?.at(2) ?? ''
-            } else {
-                //@ts-ignore
-                return javaImport.packages?.at(0) ?? javaImport.organisation ?? javaImport.tld
-            }
-        })
-        .filter((context: string) => context !== '')
-}
-
-function toString(javaImport: JavaImport): string {
-    let importSegments: string[] = []
-    importSegments.push(javaImport.tld)
-    if (javaImport.organisation !== undefined) {
-        importSegments.push(javaImport.organisation)
-    }
-    if (javaImport.packages !== undefined) {
-        importSegments = importSegments.concat(javaImport.packages)
-    }
-    return importSegments.join('.') + '.'
-}
-
-const commonJavaImportsPrefixesRegex = new RegExp(
-    '^(java.|javax.|org.slf4j.|org.apache.log4j.|org.apache.logging.log4j.|org.junit.|org.testng.)'
-)
-
-const awsJavaSdkV1Prefix = 'com.amazonaws.services'
-
-const awsJavaSdkV2Prefix = 'software.amazon.awssdk.services'
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/index.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/index.ts
deleted file mode 100644
index 1658ec7e5b8..00000000000
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { FqnExtractor } from "./fqn/extractor";
-
-export * from "./ui/main";
-
-declare global {
-    interface Window { fqnExtractor: FqnExtractor; }
-}
-
-window.fqnExtractor = new FqnExtractor();
diff --git a/plugins/amazonq/mynah-ui/webpack.media.config.js b/plugins/amazonq/mynah-ui/webpack.media.config.js
index c11715ddf97..60bd564b664 100644
--- a/plugins/amazonq/mynah-ui/webpack.media.config.js
+++ b/plugins/amazonq/mynah-ui/webpack.media.config.js
@@ -3,60 +3,9 @@
 'use strict';
 
 const path = require('path');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 /**@type {import('webpack').Configuration}*/
-const config = {
-    plugins: [
-        new CopyWebpackPlugin({
-            patterns: [
-                { from: './node_modules/web-tree-sitter/tree-sitter.wasm', to: ''}
-            ]
-        })
-    ],
-    target: 'web',
-    entry: './src/mynah-ui/index.ts',
-    output: {
-        path: path.resolve(__dirname, 'build/assets/js'),
-        filename: 'mynah-ui.js',
-        library: 'mynahUI',
-        libraryTarget: 'var',
-        devtoolModuleFilenameTemplate: '../[resource-path]',
-    },
-    devtool: 'source-map',
-    resolve: {
-        extensions: ['.ts', '.js', '.wasm'],
-        fallback: {
-            fs: false,
-            path: false,
-            util: false
-        }
-    },
-    experiments: { asyncWebAssembly: true },
-    module: {
-        rules: [
-            {test: /\.(sa|sc|c)ss$/, use: ['style-loader', 'css-loader', 'sass-loader']},
-            {
-                test: /\.ts$/,
-                exclude: /node_modules/,
-                use: [
-                    {
-                        loader: 'ts-loader',
-                    },
-                ],
-            },
-        ],
-    },
-};
-
 const connectorAdapter = {
-    plugins: [
-        new CopyWebpackPlugin({
-            patterns: [
-                { from: './node_modules/web-tree-sitter/tree-sitter.wasm', to: ''}
-            ]
-        })
-    ],
     target: 'web',
     entry: './src/mynah-ui/connectorAdapter.ts',
     output: {
@@ -73,7 +22,7 @@ const connectorAdapter = {
             fs: false,
             path: false,
             util: false
-        }
+        },
     },
     experiments: { asyncWebAssembly: true },
     module: {
@@ -91,4 +40,5 @@ const connectorAdapter = {
         ],
     },
 };
-module.exports = [config, connectorAdapter];
+
+module.exports = [connectorAdapter];
diff --git a/plugins/amazonq/shared/jetbrains-community/build.gradle.kts b/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
index bb04cda998e..205c6806b86 100644
--- a/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
+++ b/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
@@ -1,6 +1,7 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import org.jetbrains.intellij.platform.gradle.models.Coordinates
 import software.aws.toolkits.gradle.intellij.IdeFlavor
 
 plugins {
@@ -14,6 +15,7 @@ intellijToolkit {
 dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
+        platformDependency(Coordinates(groupId = "com.jetbrains.intellij.rd", artifactId = "rd-platform"))
     }
 
     compileOnlyApi(project(":plugin-core:jetbrains-community"))
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
index 34a87e04737..9a211e8b7f6 100644
--- 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
@@ -126,7 +126,13 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
     }
 
     override fun showMessage(messageParams: MessageParams) {
-        notify(messageParams.type.toNotificationType(), message("q.window.title"), getCleanedContent(messageParams.message, true), project, emptyList())
+        notify(
+            messageParams.type.toNotificationType(),
+            message("toolwindow.stripe.amazon.q.window"),
+            getCleanedContent(messageParams.message, true),
+            project,
+            emptyList()
+        )
     }
 
     override fun showMessageRequest(requestParams: ShowMessageRequestParams): CompletableFuture<MessageActionItem?> {
@@ -137,7 +143,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
 
         notify(
             requestParams.type.toNotificationType(),
-            message("q.window.title"),
+            message("toolwindow.stripe.amazon.q.window"),
             getCleanedContent(requestParams.message, true),
             project,
             requestParams.actions.map { item ->
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
index 122ee65b787..991ca2e98d5 100644
--- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
+++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -1664,7 +1664,6 @@ q.sign.in=Get Started
 q.ui.prompt.transform=/transform
 q.unavailable=\  Amazon Q Chat is not supported in IDE versions <= v2024.2.1
 q.unavailable.node=Please update to the latest IDE version
-q.window.title=Amazon Q Chat
 rds.aurora=Aurora
 rds.iam_config=Connect with IAM...
 rds.iam_connection_display_name=AWS IAM
@@ -2118,5 +2117,6 @@ toolkit.sso_expire.dialog.no_button=Don't show again
 toolkit.sso_expire.dialog.title=Connection Expired
 toolkit.sso_expire.dialog.yes_button=Re-authenticate
 toolkit.sso_expire.dialog_message=Your Amazon Q connection has expired. Please re-authenticate.
+toolwindow.stripe.amazon.q.window=Amazon Q Chat
 toolwindow.stripe.aws.codewhisperer.codereference=Code Reference Log
 toolwindow.stripe.aws.codewhisperer.codetransform=Transformation Hub

From 7335f81073a9bd80509aac6d1a30a6b7bde790d2 Mon Sep 17 00:00:00 2001
From: Richard Li <742829+rli@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:32:30 -0700
Subject: [PATCH 12/12] feat(amazonq): limit remote to amzn-internal compute
 (#5993)

Per internal discussion, feature deemed not ready for external users due to https://youtrack.jetbrains.com/issue/IJPL-203169
---
 .../jetbrains/utils/RemoteEnvUtils.kt         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
index d955effc1b4..4a57bbd9813 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/RemoteEnvUtils.kt
@@ -5,6 +5,10 @@ package software.aws.toolkits.jetbrains.utils
 
 import com.intellij.idea.AppMode
 import com.intellij.ui.jcef.JBCefApp
+import software.aws.toolkits.core.utils.exists
+import software.aws.toolkits.core.utils.tryOrNull
+import software.aws.toolkits.jetbrains.isDeveloperMode
+import java.nio.file.Paths
 
 /**
  * @return true if running in any type of remote environment
@@ -16,4 +20,20 @@ fun isRunningOnRemoteBackend() = AppMode.isRemoteDevHost()
  */
 fun isCodeCatalystDevEnv() = System.getenv("__DEV_ENVIRONMENT_ID") != null
 
-fun isQWebviewsAvailable() = JBCefApp.isSupported()
+/**
+ * @return low fidelity "is internal compute". is not exact and may fail at any time
+ */
+private val isInternalAmznLinuxCompute by lazy {
+    tryOrNull {
+        Paths.get("/apollo").exists()
+    } ?: false
+}
+
+/**
+ * On remote, only enabled experimentally and for internal
+ */
+fun isQWebviewsAvailable() = JBCefApp.isSupported() && if (!isRunningOnRemoteBackend()) {
+    true
+} else {
+    isDeveloperMode() || isInternalAmznLinuxCompute
+}