Adds capability to send new context commands to AB groups

Author: spfink

packages/amazonq/.changes/next-release/Feature-37eb706c-57a1-4751-888d-220b2f68ee4d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Adds capability to send new context commands to AB groups"
+}

packages/core/src/amazonq/webview/ui/main.ts

@@ -106,13 +106,19 @@ export const createMynahUI = (
 
     let isDocEnabled = amazonQEnabled
 
+    // @ts-ignore
+    let featureConfigs: Map<string, FeatureContext> = tryNewMap(featureConfigsSerialized)
+
+    const highlightCommand = featureConfigs.get('highlightCommand')
+
     let tabDataGenerator = new TabDataGenerator({
         isFeatureDevEnabled,
         isGumbyEnabled,
         isScanEnabled,
         isTestEnabled,
         isDocEnabled,
         disabledCommands,
+        highlightCommand,
     })
 
     // eslint-disable-next-line prefer-const
@@ -124,9 +130,6 @@ export const createMynahUI = (
     // eslint-disable-next-line prefer-const
     let messageController: MessageController
 
-    // @ts-ignore
-    let featureConfigs: Map<string, FeatureContext> = tryNewMap(featureConfigsSerialized)
-
     function getCodeBlockActions(messageData: any) {
         // Show ViewDiff and AcceptDiff for allowedCommands in CWC
         const isEnabled = featureConfigs.get('ViewDiffInChat')?.variation === 'TREATMENT'
@@ -199,6 +202,7 @@ export const createMynahUI = (
                 isTestEnabled,
                 isDocEnabled,
                 disabledCommands,
+                highlightCommand,
             })
 
             featureConfigs = tryNewMap(featureConfigsSerialized)

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -3,12 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChatItemType, MynahUIDataModel } from '@aws/mynah-ui'
+import { ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/mynah-ui'
 import { TabType } from '../storages/tabsStorage'
 import { FollowUpGenerator } from '../followUps/generator'
 import { QuickActionGenerator } from '../quickActions/generator'
 import { TabTypeDataMap } from './constants'
 import { agentWalkthroughDataModel } from '../walkthrough/agent'
+import { FeatureContext } from '../../../../shared'
 
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean
@@ -17,11 +18,13 @@ export interface TabDataGeneratorProps {
     isTestEnabled: boolean
     isDocEnabled: boolean
     disabledCommands?: string[]
+    highlightCommand?: FeatureContext
 }
 
 export class TabDataGenerator {
     private followUpsGenerator: FollowUpGenerator
     public quickActionsGenerator: QuickActionGenerator
+    private highlightCommand?: FeatureContext
 
     constructor(props: TabDataGeneratorProps) {
         this.followUpsGenerator = new FollowUpGenerator()
@@ -33,6 +36,7 @@ export class TabDataGenerator {
             isDocEnabled: props.isDocEnabled,
             disableCommands: props.disabledCommands,
         })
+        this.highlightCommand = props.highlightCommand
     }
 
     public getTabData(tabType: TabType, needWelcomeMessages: boolean, taskName?: string): MynahUIDataModel {
@@ -50,7 +54,7 @@ export class TabDataGenerator {
                 'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
             quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
             promptInputPlaceholder: TabTypeDataMap[tabType].placeholder,
-            contextCommands: TabTypeDataMap[tabType].contextCommands,
+            contextCommands: this.getContextCommands(tabType),
             chatItems: needWelcomeMessages
                 ? [
                       {
@@ -66,4 +70,32 @@ export class TabDataGenerator {
         }
         return tabData
     }
+
+    private getContextCommands(tabType: TabType): QuickActionCommandGroup[] | undefined {
+        if (tabType === 'agentWalkthrough' || tabType === 'welcome') {
+            return
+        }
+
+        const commandName = this.highlightCommand?.value.stringValue
+        if (commandName === undefined || commandName === '') {
+            return TabTypeDataMap[tabType].contextCommands
+        } else {
+            const commandHighlight: QuickActionCommandGroup = {
+                groupName: 'Additional Commands',
+                commands: [
+                    {
+                        command: commandName,
+                        description: this.highlightCommand?.variation,
+                    },
+                ],
+            }
+
+            const contextCommands = TabTypeDataMap[tabType].contextCommands
+            if (contextCommands === undefined) {
+                return [commandHighlight]
+            } else {
+                return [...contextCommands, commandHighlight]
+            }
+        }
+    }
 }

packages/core/src/test/amazonq/generator.test.ts

@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { QuickActionCommandGroup } from '@aws/mynah-ui'
+import { FeatureContext } from '../../shared'
+import { TabDataGenerator, TabDataGeneratorProps } from '../../amazonq/webview/ui/tabs/generator'
+
+describe('TabDataGenerator', () => {
+    let highlightCommand: FeatureContext
+    let expectedTabCommand: QuickActionCommandGroup
+    let props: TabDataGeneratorProps
+    const tabType = 'cwc'
+
+    beforeEach(async () => {
+        highlightCommand = {
+            name: 'featureCustomizationName',
+            value: {
+                stringValue: 'featureCustomizationArn',
+            },
+            variation: 'featureCustomizationName',
+        }
+
+        expectedTabCommand = {
+            groupName: 'Additional Commands',
+            commands: [
+                {
+                    command: highlightCommand.value.stringValue!,
+                    description: highlightCommand?.variation,
+                },
+            ],
+        }
+
+        props = {
+            isDocEnabled: false,
+            isFeatureDevEnabled: false,
+            isGumbyEnabled: false,
+            isScanEnabled: false,
+            isTestEnabled: false,
+        }
+    })
+
+    it('insert code when left hand size has no non empty character', async () => {
+        props.highlightCommand = highlightCommand
+        const tabGenerator = new TabDataGenerator(props)
+        const tabData = tabGenerator.getTabData(tabType, false)
+
+        assert.equal(tabData.contextCommands?.includes(expectedTabCommand), true)
+    })
+
+    it('insert code when left hand size has no non empty character2', async () => {
+        props.highlightCommand = undefined
+        const tabGenerator = new TabDataGenerator(props)
+        const tabData = tabGenerator.getTabData(tabType, false)
+
+        assert.equal(tabData.contextCommands?.includes(expectedTabCommand), false)
+    })
+})