fix(amazonq): fix code issues tab not appearing in remote

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -22,7 +22,7 @@ object IdeVersions {
     private val commonPlugins = listOf(
         "Git4Idea",
         "org.jetbrains.plugins.terminal",
-        "org.jetbrains.plugins.yaml"
+        "org.jetbrains.plugins.yaml",
     )
 
     private val ideProfiles = listOf(
@@ -34,6 +34,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:242.20224.155",
@@ -71,6 +72,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "org.toml.lang:243.21565.122",
@@ -112,6 +114,7 @@ object IdeVersions {
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
+                    "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
                     "PythonCore:251.23774.460",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -3,13 +3,13 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.codescan
 
-import com.intellij.analysis.problemsView.toolWindow.ProblemsView
 import com.intellij.codeHighlighting.HighlightDisplayLevel
 import com.intellij.codeInspection.util.InspectionMessage
 import com.intellij.icons.AllIcons
 import com.intellij.lang.Commenter
 import com.intellij.lang.Language
 import com.intellij.lang.LanguageCommenters
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -36,8 +36,10 @@
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.isFile
+import com.intellij.openapi.wm.ToolWindow
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.refactoring.suggested.range
+import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentManagerEvent
 import com.intellij.ui.content.ContentManagerListener
 import com.intellij.ui.treeStructure.Tree
@@ -60,6 +62,7 @@
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.ProblemsViewMutator
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineUiContext
 import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
@@ -107,26 +110,10 @@
 
 private val LOG = getLogger<CodeWhispererCodeScanManager>()
 
-class CodeWhispererCodeScanManager(val project: Project) {
-    private val defaultScope = projectCoroutineScope(project)
+class CodeWhispererCodeScanManager(val project: Project, private val defaultScope: CoroutineScope) : Disposable {
     private val codeScanResultsPanel by lazy {
         CodeWhispererCodeScanResultsView(project, defaultScope)
     }
-    private val codeScanIssuesContent by lazy {
-        val contentManager = getProblemsWindow().contentManager
-        contentManager.factory.createContent(
-            codeScanResultsPanel,
-            message("codewhisperer.codescan.scan_display"),
-            false
-        ).also {
-            Disposer.register(contentManager, it)
-            contentManager.addContentManagerListener(object : ContentManagerListener {
-                override fun contentRemoved(event: ContentManagerEvent) {
-                    if (event.content == it) reset()
-                }
-            })
-        }
-    }
 
     private var autoScanIssues = emptyList<CodeWhispererCodeScanIssue>()
     private var ondemandScanIssues = emptyList<CodeWhispererCodeScanIssue>()
@@ -507,12 +494,19 @@
     private fun refreshUi() {
         val codeScanTreeModel = CodeWhispererCodeScanTreeModel(codeScanTreeNodeRoot)
         val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
-        if (totalIssuesCount > 0) {
-            codeScanIssuesContent.displayName =
-                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+        val displayName = if (totalIssuesCount > 0) {
+            message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
         } else {
-            codeScanIssuesContent.displayName = message("codewhisperer.codescan.scan_display")
+            message("codewhisperer.codescan.scan_display")
         }
+
+        withToolWindow { window ->
+            window.contentManager.contents.filter { it.isCodeScanView() }
+                .forEach {
+                    it.displayName = displayName
+                }
+        }
+
         codeScanResultsPanel.refreshUIWithUpdatedModel(codeScanTreeModel)
     }
 
@@ -650,26 +644,45 @@
      * This method adds code content to the problems view if not already added.
      */
     fun buildCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        if (!problemsWindow.contentManager.contents.contains(codeScanIssuesContent)) {
-            problemsWindow.contentManager.addContent(codeScanIssuesContent)
-            codeScanIssuesContent.displayName = message("codewhisperer.codescan.scan_display")
+        withToolWindow { problemsWindow ->
+            val contentManager = problemsWindow.contentManager
+            if (!contentManager.contents.any { it.isCodeScanView() }) {
+                contentManager.addContent(
+                    contentManager.factory.createContent(
+                        codeScanResultsPanel,
+                        message("codewhisperer.codescan.scan_display"),
+                        false
+                    ).also {
+                        it.tabName = message("codewhisperer.codescan.scan_display")
+                        Disposer.register(contentManager, it)
+                        contentManager.addContentManagerListener(object : ContentManagerListener {
+                            override fun contentRemoved(event: ContentManagerEvent) {
+                                if (event.content == it) reset()
+                            }
+                        })
+                    }
+                )
+            }
         }
     }
 
     /**
      * This method shows the code content panel in problems view
      */
     fun showCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        problemsWindow.contentManager.setSelectedContent(codeScanIssuesContent)
-        problemsWindow.show()
+        withToolWindow { problemsWindow ->
+            problemsWindow.contentManager.contents.firstOrNull { it.isCodeScanView() }
+                ?.let { problemsWindow.contentManager.setSelectedContent(it) }
+            problemsWindow.show()
+        }
     }
 
     fun removeCodeScanUI() = runInEdt {
-        val problemsWindow = getProblemsWindow()
-        if (problemsWindow.contentManager.contents.contains(codeScanIssuesContent)) {
-            problemsWindow.contentManager.removeContent(codeScanIssuesContent, false)
+        withToolWindow { problemsWindow ->
+            problemsWindow.contentManager.contents.filter { it.isCodeScanView() }
+                .forEach {
+                    problemsWindow.contentManager.removeContent(it, true)
+                }
         }
     }
 
@@ -735,8 +748,13 @@
         )
     }
 
-    private fun getProblemsWindow() = ProblemsView.getToolWindow(project)
-        ?: error(message("codewhisperer.codescan.problems_window_not_found"))
+    private fun withToolWindow(runnable: (ToolWindow) -> Unit) {
+        ProblemsViewMutator.EP.forEachExtensionSafe { mutator ->
+            mutator.mutateProblemsView(project, runnable)
+        }
+    }
+
+    private fun Content.isCodeScanView() = component == codeScanResultsPanel
 
     private fun reset() = runInEdt {
         // clear the codeScanTreeNodeRoot
@@ -765,7 +783,7 @@
             editorFactory.addEditorFactoryListener(fileListener, project)
             editorFactory.eventMulticaster.addEditorMouseMotionListener(
                 editorMouseListener,
-                codeScanIssuesContent
+                this
             )
         }
     }
@@ -955,8 +973,12 @@
         val codeScanTreeModel = CodeWhispererCodeScanTreeModel(codeScanTreeNodeRoot)
         val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
         if (totalIssuesCount > 0) {
-            codeScanIssuesContent.displayName =
-                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+            withToolWindow { problemsWindow ->
+                problemsWindow.contentManager.contents.filter { it.isCodeScanView() }
+                    .forEach {
+                        it.displayName = message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                    }
+            }
         }
         codeScanResultsPanel.refreshUIWithUpdatedModel(codeScanTreeModel)
     }
@@ -971,8 +993,13 @@
             val codeScanTreeModel = CodeWhispererCodeScanTreeModel(root)
             val totalIssuesCount = codeScanTreeModel.getTotalIssuesCount()
             if (totalIssuesCount > 0) {
-                codeScanIssuesContent.displayName =
-                    message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                withToolWindow { window ->
+                    window.contentManager.contents.filter { it.isCodeScanView() }
+                        .forEach {
+                            it.displayName =
+                                message("codewhisperer.codescan.scan_display_with_issues", totalIssuesCount, INACTIVE_TEXT_COLOR)
+                        }
+                }
             }
             codeScanResultsPanel.updateAndDisplayScanResults(codeScanTreeModel, scannedFiles, scope)
         }
@@ -1004,6 +1031,9 @@
         return isInsideWorkTree(projectDir)
     }
 
+    override fun dispose() {
+    }
+
     companion object {
         fun getInstance(project: Project): CodeWhispererCodeScanManager = project.service()
     }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -31,6 +31,7 @@
 import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnalysisResponse
 import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.core.utils.debug
+import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
@@ -291,7 +292,7 @@
                 .build()
         )
     } catch (e: Exception) {
-        LOG.debug { "Getting code review failed: ${e.message}" }
+        LOG.error(e) { "Getting code review failed: ${e.message}" }
         val errorMessage = getTelemetryErrorMessage(e, featureUseCase = CodeWhispererConstants.FeatureName.CODE_REVIEW)
         throw codeScanServerException("GetCodeReviewException: $errorMessage")
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt

@@ -0,0 +1,19 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.analysis.problemsView.toolWindow.ProblemsView
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+import com.jetbrains.rdserver.toolWindow.BackendToolWindowHost
+
+class CwmProblemsViewMutator : ProblemsViewMutator {
+    override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
+        BackendToolWindowHost.getAllInstances(project).forEach { host ->
+            host.getToolWindow(ProblemsView.ID)?.let {
+                runnable(it)
+            }
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/DefaultProblemsViewMutator.kt

@@ -0,0 +1,14 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.analysis.problemsView.toolWindow.ProblemsView
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+
+class DefaultProblemsViewMutator : ProblemsViewMutator {
+    override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
+        ProblemsView.getToolWindow(project)?.let { runnable(it) }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ProblemsViewMutator.kt

@@ -0,0 +1,16 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains
+
+import com.intellij.openapi.extensions.ExtensionPointName
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+
+interface ProblemsViewMutator {
+    fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit)
+
+    companion object {
+        val EP = ExtensionPointName<ProblemsViewMutator>("software.aws.toolkits.jetbrains.problemsViewMutator")
+    }
+}

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-codewithme.xml

@@ -0,0 +1,8 @@
+<!-- Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
+<idea-plugin>
+    <extensions defaultExtensionNs="software.aws.toolkits.jetbrains">
+        <problemsViewMutator implementation="software.aws.toolkits.jetbrains.CwmProblemsViewMutator"/>
+    </extensions>
+</idea-plugin>

plugins/amazonq/src/main/resources/META-INF/plugin.xml

@@ -58,6 +58,8 @@
     <depends>aws.toolkit.core</depends>
     <depends>com.intellij.modules.lang</depends>
 
+    <depends optional="true" config-file="amazonq-ext-codewithme.xml">com.jetbrains.codeWithMe</depends>
+
     <depends optional="true" config-file="amazonq-ext-dart.xml">Dart</depends>
     <depends optional="true" config-file="amazonq-ext-datagrip.xml">com.intellij.database</depends>
     <depends optional="true" config-file="amazonq-ext-go.xml">org.jetbrains.plugins.go</depends>
@@ -97,8 +99,16 @@
         <extensionPoint qualifiedName="software.aws.toolkits.jetbrains.moduleDependencyProvider"
                         interface="software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider"
                         dynamic="true"/>
+
+        <extensionPoint qualifiedName="software.aws.toolkits.jetbrains.problemsViewMutator"
+                        interface="software.aws.toolkits.jetbrains.ProblemsViewMutator"
+                        dynamic="true" />
     </extensionPoints>
 
+    <extensions defaultExtensionNs="software.aws.toolkits.jetbrains">
+        <problemsViewMutator implementation="software.aws.toolkits.jetbrains.DefaultProblemsViewMutator"/>
+    </extensions>
+
     <xi:include href="/META-INF/module-amazonq.xml" />
 
     <xi:include href="/META-INF/change-notes.xml" xpointer="xpointer(/idea-plugin/*)">