Add support for Amazon Q chat on remote 242+

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
+}

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")

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

@@ -16,7 +16,6 @@
 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.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 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 @@
     }
 
     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"
     }
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt

@@ -18,6 +18,7 @@
 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 @@
 
     private fun loadWebView() {
         // load the web app
-        jcefBrowser.loadHTML(getWebviewHTML())
+        jcefBrowser.loadURL(LocalAssetJBCefRequestHandler(jcefBrowser).createResource("content.html", getWebviewHTML()))
     }
 
     private fun getWebviewHTML(): String {

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
@@ -14,6 +13,7 @@ import com.intellij.ui.dsl.gridLayout.VerticalAlign
 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,7 +66,7 @@ class AmazonQPanel(private val parent: Disposable) {
     private fun init() {
         if (!JBCefApp.isSupported()) {
             // Fallback to an alternative browser-less solution
-            if (AppMode.isRemoteDevHost()) {
+            if (isRunningOnRemoteBackend()) {
                 webviewContainer.add(JBTextArea("Amazon Q chat is not supported in remote dev environment."))
             } else {
                 webviewContainer.add(JBTextArea("JCEF not supported"))

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

@@ -7,10 +7,11 @@
 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 @@
 
     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 @@
         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 @@
         // 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 @@
         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 @@
     }
 
     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()
     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -122,7 +122,7 @@
 
         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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -194,7 +194,7 @@
 
         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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -219,7 +219,7 @@
     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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt

@@ -18,7 +18,7 @@
     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 {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt

@@ -26,7 +26,7 @@
     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 @@
             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 {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt

@@ -18,10 +18,10 @@
     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
         }
     }
 

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
 

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"))

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManagerNew.kt

@@ -3,14 +3,14 @@
 
 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
 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"))

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
@@ -87,7 +87,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)
         }
     }
@@ -223,7 +223,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)
         }
     }