Add support for Amazon Q chat on remote 242+ #4825

rli · 2024-08-21T20:38:39Z

This enables webviews to work over thin client instances by working around registerSchemeHandlerFactory being a no-op as described in IJPL-170861.

~~Open issues:~~

~~This should only be enabled on remote if 242+~~
~~registerSchemeHandlerFactory not working correctly -- need further evaluation~~
~~FQN WASM code doesn't seem to be invoked properly~~
~~double check that FileEditorManager.getInstance(project).selectedFiles.first().name and editor.virtualFile.name are equivalent~~
~~Should we just do FileEditorManager#selectedTextEditorWithRemotes? that is what inline suggestions is using~~
- ~~consolidate on decision. ChatController/FeatureDevController processInsertCodeAtCursorPosition need to be migrated too~~
~~Figure out why error in FocusAreaContextExtractor is not surfaced anywhere~~

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

Conflicts: plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

…rains into rli/remote-chat-wip

github-actions · 2025-01-22T01:01:41Z

Qodana Community for JVM

12 new problems were found

Inspection name	Severity	Problems
`Unstable API Usage`	🔶 Warning	6
`ActionUpdateThread is missing`	🔶 Warning	1
`Unused symbol`	🔶 Warning	1
`Private property naming convention`	◽️ Notice	2
`Leaking 'this' in constructor`	◽️ Notice	1
`Boolean expression can be simplified`	◽️ Notice	1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

github-advanced-security

QDJVMC found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

...src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt

...rains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt

+) : CefRequestHandlerAdapter() {
+    private val myResources: MutableMap<String, () -> CefResourceHandler?> = HashMap()
+
+    private val REJECTING_RESOURCE_HANDLER: CefResourceHandler = object : CefResourceHandlerAdapter() {


...rains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt

+        }
+    }
+
+    private val RESOURCE_REQUEST_HANDLER = resourceHandlerWrapper { path ->


...ins-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefStreamResourceHandler.kt

+    private val headers: Map<String, String> = mapOf(),
+) : CefResourceHandler, Disposable {
+    init {
+        Disposer.register(parent, this)


...-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt

+    private fun streamHandler(path: String, stream: InputStream) =
+        JBCefStreamResourceHandler(
+            stream,
+            if (path.endsWith(".wasm") == true) "application/wasm" else URLConnection.getFileNameMap().getContentTypeFor(path),


...-community/src/software/aws/toolkits/jetbrains/core/webview/LocalAssetJBCefRequestHandler.kt

+        }
+    }
+
+    fun addResource(path: String, stream: InputStream?) =


andrewyuq · 2025-03-06T00:59:52Z

...oftware/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()


does this api also work in local ?

...oftware/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


...ains-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


...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()


...re/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()


.../src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt

@@ -18,7 +18,7 @@
    private var selectionListener: InlineChatSelectionListener? = null

    init {
-        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditor }
+        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditorWithRemotes.firstOrNull() }


Conflicts: plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

bryceitoc9 · 2025-02-26T01:56:39Z

Confirmed Windows Local works after the latest change (at least, log in + asking a basic chat question)

manodnyab · 2025-03-04T18:50:25Z

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 # Toolkit Version
-toolkitVersion=3.58-SNAPSHOT
+toolkitVersion=3.58-SNAPSHOT-ASBX_TEST_0228


Should we revert this?

We can probably revert this for now--this is for differentiating the build, and we may need to re-add it (or something equivalent) whenever we ship a new test build.

manodnyab · 2025-03-04T18:51:47Z

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

+            QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/getStart.js")
+        )
+
+        jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))


nit: can we assign the file names to consts

manodnyab · 2025-03-04T18:52:56Z

...jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QOpenPanelAction.kt

        val project = e.getRequiredData(CommonDataKeys.PROJECT)
        UiTelemetry.click(project, "q_openChat")
        ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true)
        if (e.getData(runScanKey) == true) {
            AmazonQToolWindow.openScanTab(project)
        }
    }
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabled = e.getData(CommonDataKeys.PROJECT) != null


What is the situation when this option is shown and project is null?

the action is not available if the project is null

manodnyab · 2025-03-04T18:53:53Z

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

+
+    init {
+        assetRequestHandler.addWildcardHandler("mynah") { path ->
+            val asset = path.replaceFirst("mynah/", "/mynah-ui/assets/")


Should we test this?

follow up later

manodnyab · 2025-03-04T19:01:09Z

...brains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt

@@ -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(


duplicated code, maybe could be converted to a function?

the classloader is important so it might become more complicated

manodnyab · 2025-03-04T19:03:18Z

...rains-community/src/contrib/org/intellij/images/editor/impl/jcef/JBCefLocalRequestHandler.kt

+ * @param myProtocol The protocol to handle (e.g., "http", "file").
+ * @param myAuthority The authority of the requests (e.g., "localhost", "mydomain").
+ */
+open class JBCefLocalRequestHandler(


can this be used directly?

this is a straight copy from jetbrains so we should keep it slim to make it easy to copy over any changes later

Conflicts: plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

manodnyab · 2025-03-06T18:30:08Z

Before merging to main, can we add a changelog?

bryceitoc9 · 2025-03-06T19:12:38Z

@manodnyab We're planning on turning this into a feature branch

rli and others added 7 commits August 21, 2024 13:35

Add support for Amazon Q chat on remote 242+

47706df

Merge remote-tracking branch 'origin/main' into rli/remote-chat-wip

7f82602

Merge branch 'main' into rli/remote-chat-wip

1c06ff9

aaaaaaa

9f37025

Merge branch 'rli/remote-chat-wip' of github.com:aws/aws-toolkit-jetb…

4f4e3d2

…rains into rli/remote-chat-wip

wip

9c49a0a

github-advanced-security bot found potential problems Jan 22, 2025

View reviewed changes

rli added 2 commits January 22, 2025 13:25

cleanup

f46f20d

revert

205251b

github-advanced-security bot found potential problems Jan 22, 2025

View reviewed changes

rli and others added 3 commits January 24, 2025 12:10

cleanup

6257981

Merge branch 'main' into rli/remote-chat-wip

5ac379e

cleanup

f94e290

rli marked this pull request as ready for review January 24, 2025 20:26

rli requested review from a team as code owners January 24, 2025 20:26

github-advanced-security bot found potential problems Jan 24, 2025

View reviewed changes

rli and others added 3 commits January 27, 2025 10:29

Merge branch 'main' into rli/remote-chat-wip

f9fa72e

Merge remote-tracking branch 'origin/main' into rli/remote-chat-wip

c1b9d17

Conflicts: plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

delete unnecessary remote environment checks

baa8e8c

rli requested a review from a team as a code owner January 31, 2025 22:01

rli and others added 4 commits February 3, 2025 10:50

lint

b7a8e2c

Merge branch 'main' into rli/remote-chat-wip

f5bb9bb

Update codetransform-ext-java.xml

5f1a27a

Update Browser.kt

fa2353e

Merge branch 'main' into rli/remote-chat-wip

e164b90

Update gradle.properties

a878739

manodnyab reviewed Mar 4, 2025

View reviewed changes

rli added 2 commits March 5, 2025 15:50

Merge remote-tracking branch 'origin/main' into rli/remote-chat-wip

3a3671b

Conflicts: plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

revert

cc47655

manodnyab approved these changes Mar 6, 2025

View reviewed changes

rli changed the base branch from main to feature/remote-chat March 6, 2025 19:31

rli merged commit 6caa149 into feature/remote-chat Mar 6, 2025
14 of 18 checks passed

rli deleted the rli/remote-chat-wip branch March 6, 2025 19:32

rli added a commit that referenced this pull request Mar 6, 2025

fix: follow up comments on #4825

6b43a84

rli added a commit that referenced this pull request Mar 10, 2025

fix: follow up comments on #4825 (#5450)

dc43b09

Add support for Amazon Q chat on remote 242+ #4825

Add support for Amazon Q chat on remote 242+ #4825

Uh oh!

Conversation

rli commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

License

Uh oh!

github-actions bot commented Jan 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Qodana Community for JVM

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check warning

Check warning

Choose a reason for hiding this comment

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

bryceitoc9 commented Feb 26, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

manodnyab commented Mar 6, 2025

Uh oh!

bryceitoc9 commented Mar 6, 2025

Uh oh!

Uh oh!

Uh oh!

rli commented Aug 21, 2024 •

edited

Loading

github-actions bot commented Jan 22, 2025 •

edited

Loading