user wont see the programmer mode card after they close it

Author: Randall-Jiang

packages/core/src/amazonq/index.ts

@@ -61,7 +61,8 @@ export function createMynahUI(
     amazonQEnabled: boolean,
     featureConfigsSerialized: [string, FeatureContext][],
     welcomeCount: number,
-    disabledCommands?: string[]
+    disabledCommands?: string[],
+    dismissedCards?: boolean
 ) {
     if (typeof window !== 'undefined') {
         const mynahUI = require('./webview/ui/main')

packages/core/src/amazonq/webview/generators/webViewContent.ts

@@ -86,6 +86,7 @@ export class WebViewContentGenerator {
         const disabledCommandsString = isSM ? `['/dev', '/transform', '/test', '/review', '/doc']` : '[]'
         const disclaimerAcknowledged = !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
         const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+        const dismissedCards = globals.globalState.tryGet('aws.amazonq.dismissedCards', Boolean, false)
 
         // only show profile card when the two conditions
         //  1. profile count >= 2
@@ -112,7 +113,8 @@ export class WebViewContentGenerator {
                     ${regionProfileString},
                     ${disabledCommandsString},
                     ${isSMUS},
-                    ${isSM}
+                    ${isSM},
+                    ${dismissedCards}
                 );
             }
         </script>

packages/core/src/amazonq/webview/messages/messageDispatcher.ts

@@ -86,6 +86,14 @@ export function dispatchWebViewMessagesToApps(
                 void globals.globalState.tryUpdate('aws.amazonq.welcomeChatShowCount', currentLoadCount + 1)
                 return
             }
+            case 'message-dismissed': {
+                // eslint-disable-next-line aws-toolkits/no-console-log
+                console.log('message-dismissed', msg)
+                if (msg.messageId === 'programmerModeCardId') {
+                    void globals.globalState.tryUpdate('aws.amazonq.dismissedCards', true)
+                }
+                return
+            }
         }
 
         if (msg.type === 'error') {

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

@@ -52,5 +52,6 @@ type MessageCommand =
     | 'detailed-list-filter-change'
     | 'detailed-list-item-select'
     | 'detailed-list-action-click'
+    | 'message-dismissed'
 
 export type ExtensionMessage = Record<string, any> & { command: MessageCommand }

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

@@ -119,6 +119,7 @@ export interface ConnectorProps {
     }
     onSelectTab: (tabID: string, eventID: string) => void
     onExportChat: (tabID: string, format: 'markdown' | 'html') => string
+    onMessageDismiss?: (tabId: string, messageId: string) => void
     tabsStorage: TabsStorage
 }
 
@@ -707,6 +708,15 @@ export class Connector {
         return false
     }
 
+    onMessageDismiss = (tabId: string, messageId: string): void => {
+        this.sendMessageToExtension({
+            command: 'message-dismissed',
+            tabId: tabId,
+            messageId,
+            tabType: this.tabsStorage.getTab(tabId)?.type,
+        })
+    }
+
     onTabBarButtonClick = async (tabId: string, buttonId: string, eventId?: string) => {
         this.sendMessageToExtension({
             command: 'tab-bar-button-clicked',

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

@@ -52,7 +52,8 @@ export const createMynahUI = (
     regionProfile: RegionProfile | undefined,
     disabledCommands?: string[],
     isSMUS?: boolean,
-    isSM?: boolean
+    isSM?: boolean,
+    dismissedCards?: boolean
 ) => {
     let disclaimerCardActive = !disclaimerAcknowledged
     // eslint-disable-next-line prefer-const
@@ -166,6 +167,7 @@ export const createMynahUI = (
         disabledCommands,
         commandHighlight: highlightCommand,
         regionProfile,
+        dismissedCards,
     })
 
     // eslint-disable-next-line prefer-const
@@ -251,6 +253,7 @@ export const createMynahUI = (
                 disabledCommands,
                 commandHighlight: highlightCommand,
                 regionProfile,
+                dismissedCards,
             })
 
             featureConfigs = tryNewMap(featureConfigsSerialized)
@@ -989,6 +992,9 @@ export const createMynahUI = (
         onPromptInputOptionChange: (tabId, optionsValues) => {
             connector.onPromptInputOptionChange(tabId, optionsValues)
         },
+        onMessageDismiss: (tabId, messageId) => {
+            connector.onMessageDismiss(tabId, messageId)
+        },
         onFileClick: connector.onFileClick,
         tabs: {
             'tab-1': {

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

@@ -11,13 +11,13 @@ import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
 import { agentWalkthroughDataModel } from '../walkthrough/agent'
 import { FeatureContext } from '../../../../shared/featureConfig'
 import { RegionProfile } from '../../../../codewhisperer/models/model'
-
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
     isScanEnabled: boolean
     isTestEnabled: boolean
     isDocEnabled: boolean
+    dismissedCards?: boolean
     disabledCommands?: string[]
     commandHighlight?: FeatureContext
     regionProfile?: RegionProfile
@@ -28,6 +28,7 @@ export class TabDataGenerator {
     public quickActionsGenerator: QuickActionGenerator
     private highlightCommand?: FeatureContext
     private regionProfile?: RegionProfile
+    private dismissedCards?: boolean
 
     constructor(props: TabDataGeneratorProps) {
         this.followUpsGenerator = new FollowUpGenerator()
@@ -41,6 +42,7 @@ export class TabDataGenerator {
         })
         this.highlightCommand = props.commandHighlight
         this.regionProfile = props.regionProfile
+        this.dismissedCards = props.dismissedCards
     }
 
     public getTabData(
@@ -49,25 +51,36 @@ export class TabDataGenerator {
         taskName?: string,
         isSMUS?: boolean
     ): MynahUIDataModel {
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.log('tabType', tabType)
         if (tabType === 'agentWalkthrough') {
             return agentWalkthroughDataModel
         }
 
         if (tabType === 'welcome') {
             return {}
         }
-        const programmerModeCard: ChatItem | undefined = {
-            type: ChatItemType.ANSWER,
-            title: 'NEW FEATURE',
-            header: {
-                icon: 'code-block',
-                iconStatus: 'primary',
-                body: '## Pair Programmer',
-            },
-            fullWidth: true,
-            canBeDismissed: true,
-            body: 'Amazon Q Developer chat can now write code and run shell commands on your behalf. Disable Pair Programmer if you prefer a read-only experience.',
-        }
+
+        const programmerModeCardId = 'programmerModeCardId'
+
+        const isProgrammerModeCardDismissed = this.dismissedCards
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.log('trueOrFalse', isProgrammerModeCardDismissed)
+        const programmerModeCard: ChatItem | undefined = !isProgrammerModeCardDismissed
+            ? ({
+                  type: ChatItemType.ANSWER,
+                  title: 'NEW FEATURE',
+                  messageId: programmerModeCardId,
+                  header: {
+                      icon: 'code-block',
+                      iconStatus: 'primary',
+                      body: '## Pair Programmer',
+                  },
+                  fullWidth: true,
+                  canBeDismissed: true,
+                  body: 'Amazon Q Developer chat can now write code and run shell commands on your behalf. Disable Pair Programmer if you prefer a read-only experience.',
+              } as ChatItem)
+            : undefined
 
         const regionProfileCard: ChatItem | undefined =
             this.regionProfile === undefined
@@ -97,7 +110,11 @@ Enter \`/\` to view quick actions. Use \`@\` to add saved prompts, files, folder
             contextCommands: this.getContextCommands(tabType),
             chatItems: needWelcomeMessages
                 ? [
-                      ...(tabType === 'cwc' || tabType === 'unknown' ? [programmerModeCard] : []),
+                      ...(tabType === 'cwc' || tabType === 'unknown'
+                          ? programmerModeCard
+                              ? [programmerModeCard]
+                              : []
+                          : []),
                       ...(regionProfileCard ? [regionProfileCard] : []),
                       {
                           type: ChatItemType.ANSWER,

packages/core/src/shared/globalState.ts

@@ -77,6 +77,7 @@ export type globalKey =
     | 'aws.toolkit.lambda.walkthroughSelected'
     | 'aws.toolkit.lambda.walkthroughCompleted'
     | 'aws.toolkit.appComposer.templateToOpenOnStart'
+    | 'aws.amazonq.dismissedCards'
 
 /**
  * Extension-local (not visible to other vscode extensions) shared state which persists after IDE