Merge main into feature/flare-compaction

Author: aws-toolkit-automation

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -23,10 +23,6 @@
 
     <extensions defaultExtensionNs="amazon.q">
         <appFactory implementation="software.aws.toolkits.jetbrains.services.cwc.AppFactory" />
-        <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevAppFactory" />
-        <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqDoc.DocAppFactory" />
-        <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeScan.CodeScanChatAppFactory" />
-        <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeTestChatAppFactory" />
     </extensions>
 
     <actions>

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

@@ -145,24 +145,8 @@ class CodeWhispererCodeScanManager(val project: Project, private val defaultScop
      */
     fun isOnDemandScanInProgress(): Boolean = isOnDemandScanInProgress.get()
 
-    /**
-     * Code scan job is active when the [Job] is started and is in active state.
-     */
-    fun isCodeScanJobActive(): Boolean = this::codeScanJob.isInitialized && codeScanJob.isActive && isOnDemandScanInProgress()
-
-    fun getRunActionButtonIcon(): Icon = if (isOnDemandScanInProgress()) AllIcons.Process.Step_1 else AllIcons.Actions.Execute
-
     fun getActionButtonIconForExplorerNode(): Icon = if (isOnDemandScanInProgress()) AllIcons.Actions.Suspend else AllIcons.Actions.Execute
 
-    fun getActionButtonText(): String = if (!isOnDemandScanInProgress()) {
-        message(
-            "codewhisperer.codescan.run_scan",
-            INACTIVE_TEXT_COLOR
-        )
-    } else {
-        message("codewhisperer.codescan.stop_scan")
-    }
-
     private fun isIgnoredIssueTitle(title: String) = getIgnoredIssueTitles().contains(title)
 
     fun isIgnoredIssue(title: String, document: Document, file: VirtualFile, startLine: Int) = isIgnoredIssueTitle(title) ||

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

@@ -18,7 +18,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileMa
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererConnectOnGithubAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererLearnMoreAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererProvideFeedbackAction
-import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanRunAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.ActionProvider
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Customize
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Learn
@@ -41,7 +40,6 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
         override val customize = Customize()
         override val learn = Learn()
         override val openChatPanel = ActionManager.getInstance().getAction("q.openchat")
-        override val runScan = CodeWhispererCodeScanRunAction()
         override val pauseAutoScans = PauseCodeScans()
         override val resumeAutoScans = ResumeCodeScans()
         override val sendFeedback = CodeWhispererProvideFeedbackAction()

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt

@@ -20,7 +20,6 @@ interface ActionProvider<T> {
     val openChatPanel: T
     val pauseAutoScans: T
     val resumeAutoScans: T
-    val runScan: T
     val sendFeedback: T
     val connectOnGithub: T
     val documentation: T
@@ -53,7 +52,6 @@ fun <T> buildActionListForCodeScan(project: Project, actionProvider: ActionProvi
                 add(actionProvider.resumeAutoScans)
             }
         }
-        add(actionProvider.runScan)
     }
 
 fun <T> buildActionListForOtherFeatures(project: Project, actionProvider: ActionProvider<T>): List<T> =

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt

@@ -86,21 +86,9 @@ export class Connector {
     private processUserGuideLink(tabType: TabType, actionId: string) {
         let userGuideLink = ''
         switch (tabType) {
-            case 'codescan':
-                userGuideLink = codeScanUserGuide
-                break
-            case 'codetest':
-                userGuideLink = codeTestUserGuide
-                break
             case 'codetransform':
                 userGuideLink = codeTransformUserGuide
                 break
-            case 'doc':
-                userGuideLink = docUserGuide
-                break
-            case 'featuredev':
-                userGuideLink = featureDevUserGuide
-                break
         }
 
         // e.g. amazonq-explore-user-guide-featuredev

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/amazonqCommonsConnector.ts

@@ -1,14 +1,13 @@
-// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 import {ExtensionMessage} from "../commands";
 import {ChatPayload, ConnectorProps} from "../connector";
 import {FormButtonIds} from "../forms/constants";
 import {ChatItem, ChatItemAction, ChatItemType, FeedbackPayload, MynahIcons, MynahUIDataModel} from '@aws/mynah-ui-chat'
 import {CodeReference} from "./amazonqCommonsConnector";
-import {Status} from "@aws/mynah-ui-chat/dist/static";
-import {EmptyMynahUIDataModel} from "@aws/mynah-ui-chat/dist/helper/store";
-import {doesNotMatch} from "node:assert";
 
 export interface ICodeTestChatConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts

@@ -243,13 +243,6 @@ export class Connector {
             canBeVoted: false,
         })
 
-        this.onChatAnswerReceived(messageData.tabID, {
-            type: ChatItemType.SYSTEM_PROMPT,
-            body: undefined,
-            followUp: this.followUpGenerator.generateAuthFollowUps('doc', messageData.authType),
-            canBeVoted: false,
-        })
-
         return
     }
 
@@ -319,17 +312,6 @@ export class Connector {
             )
             return
         }
-
-        if (messageData.type === 'authNeededException') {
-            this.processAuthNeededException(messageData)
-            return
-        }
-
-        if (messageData.type === 'openNewTabMessage') {
-            this.onNewTab('doc')
-            return
-        }
-
         if (messageData.type === 'updatePromptProgress') {
             this.onUpdatePromptProgress(messageData.tabId, messageData.progressField)
         }

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/docChatConnector.ts

@@ -50,7 +50,6 @@ export class Connector {
     private readonly chatInputEnabled
     private readonly onUpdateAuthentication
     private readonly followUpGenerator: FollowUpGenerator
-    private readonly onNewTab
     private readonly onFileComponentUpdate
 
     constructor(props: ConnectorProps) {
@@ -64,7 +63,6 @@ export class Connector {
         this.chatInputEnabled = props.onChatInputEnabled
         this.onUpdateAuthentication = props.onUpdateAuthentication
         this.followUpGenerator = new FollowUpGenerator()
-        this.onNewTab = props.onNewTab
         this.onFileComponentUpdate = props.onFileComponentUpdate
     }
 
@@ -173,27 +171,6 @@ export class Connector {
         }
     }
 
-    private processAuthNeededException = async (messageData: any): Promise<void> => {
-        if (this.onChatAnswerReceived === undefined) {
-            return
-        }
-
-        this.onChatAnswerReceived(messageData.tabID, {
-            type: ChatItemType.ANSWER,
-            body: messageData.message,
-            followUp: undefined,
-            canBeVoted: false,
-        })
-
-        this.onChatAnswerReceived(messageData.tabID, {
-            type: ChatItemType.SYSTEM_PROMPT,
-            body: undefined,
-            followUp: this.followUpGenerator.generateAuthFollowUps('featuredev', messageData.authType),
-            canBeVoted: false,
-        })
-
-        return
-    }
 
     private createAnswer = (messageData: any): ChatItem => {
         return {
@@ -274,16 +251,6 @@ export class Connector {
             )
             return
         }
-
-        if (messageData.type === 'authNeededException') {
-            this.processAuthNeededException(messageData)
-            return
-        }
-
-        if (messageData.type === 'openNewTabMessage') {
-            this.onNewTab('featuredev')
-            return
-        }
     }
 
     onStopChatResponse = (tabID: string): void => {