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 2e4d45b570..d7b079b116 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 f3caa6e678..4985f69e76 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 bc594209fb..a314ea8d49 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 de01e99bad..cab5e06d31 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 afb490b9f1..3e81b2c836 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 396057bc9a..a0e18e1038 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 cc39985dd3..b51ebec12a 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().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 9dcb77b67d..8faf16cfd9 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
@@ -122,7 +122,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 fa027cbb72..8b3479dd36 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 fc5450e247..254fe8d2f9 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
@@ -219,7 +219,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 888bdb198b..288a699109 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 b494ddbae4..0d421d4541 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 96e2262a0e..653967c821 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 270ac2820b..7cb026406b 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 614c5e18b1..d1a9208c24 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 a827a4bab8..c2038db7a8 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 c2d256c05d..e86fab4b40 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 612594289e..0000000000
--- 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 4d58c8be1e..0000000000
--- 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 2fa6f8c709..0000000000
--- 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 cf342acf4c..5a57172284 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 e72269ce2f..11fb8f2d61 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 339b5aa8df..020b016e99 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 b859d4d7b1..9b99abf9da 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 cd6d4bea4d..2a18bc48a4 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 4402b684d9..2ecf429a92 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
@@ -6,7 +6,6 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.popup
 import com.intellij.codeInsight.hint.ParameterInfoController
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.codeInsight.lookup.LookupManagerListener
-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.application.ApplicationManager
@@ -72,6 +71,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhis
 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
@@ -307,7 +307,7 @@ class CodeWhispererPopupManager {
         }
 
         // 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
@@ -326,12 +326,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()) {
                 if (visible && !noEnoughSpaceForPopup) {
                     // TODO: will move to a keybinding listener once I found one
                     popupComponents.prevButton.text = popupComponents.prevButtonText()
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 3bd7a19ffc..1f69b5c30b 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 2e42b47f65..2ee5f8be67 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 a0a8d59ee2..f5870f609d 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 24ce8c0ad9..c1596603f5 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 0000000000..dcbac7c531
--- /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 0000000000..d2b5da2426
--- /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 0000000000..1a540b288b
--- /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 86970a2dfd..eb5693ef92 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 174e63b188..0000000000
--- 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 b868718c21..d955effc1b 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 0ee085f52e..0ed59f70c4 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 8ea17eceaa..9376f50601 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 7d1c55e021..772a37c109 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