Update Q Chat Introduction message and disable Q Signout option for SMUS based CodeEditor App

Author: parameja1

packages/amazonq/package.json

@@ -351,7 +351,7 @@
                 },
                 {
                     "command": "aws.amazonq.signout",
-                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.amazonq.isSagemakerStudio",
                     "group": "2_amazonQ@4"
                 },
                 {
@@ -627,7 +627,7 @@
                 "title": "%AWS.command.codewhisperer.signout%",
                 "category": "%AWS.amazonq.title%",
                 "icon": "$(debug-disconnect)",
-                "enablement": "aws.codewhisperer.connected"
+                "enablement": "aws.codewhisperer.connected && !aws.amazonq.isSagemakerStudio"
             },
             {
                 "command": "aws.amazonq.learnMore",

packages/amazonq/src/app/chat/activation.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { ExtensionContext, window } from 'vscode'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
-import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
+import { Commands, placeholder, funcUtil, getLogger, setContext } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
 import { scanChatAppInit } from '../amazonqScan'
 import { init as inlineChatInit } from '../../inlineChat/app'
@@ -16,6 +16,11 @@ export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
 
     registerApps(appInitContext, context)
+    const serviceName = process.env.SERVICE_NAME ?? 'SageMakerUnifiedStudio' // Fallback service name to a generic name AmazonQ
+    const amazonQState = amazonq.AmazonQState.initialize(serviceName)
+    getLogger().info(`In Extension activation - q state is initialized ${amazonQState.serviceName}`)
+    // Create a context key for SageMaker Studio state and set in context
+    await setContext('aws.amazonq.isSagemakerStudio', amazonQState.isSageMakerUnifiedStudio())
 
     const provider = new amazonq.AmazonQChatViewProvider(
         context,

packages/core/src/amazonq/index.ts

@@ -43,6 +43,7 @@ export { ChatItemType } from './commons/model'
 export { ExtensionMessage } from '../amazonq/webview/ui/commands'
 export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { extractAuthFollowUp } from './util/authUtils'
+export { AmazonQState } from './util/amazonQState'
 export { Messenger } from './commons/connector/baseMessenger'
 export * from './lsp/config'
 export * as WorkspaceLspInstaller from './lsp/workspaceInstaller'

packages/core/src/amazonq/util/amazonQState.ts

@@ -0,0 +1,30 @@
+export class AmazonQState {
+    private static _instance: AmazonQState | undefined
+    private readonly _serviceName: string
+
+    private constructor(serviceName: string) {
+        this._serviceName = serviceName
+    }
+
+    public static initialize(serviceName: string): AmazonQState {
+        if (!this._instance) {
+            this._instance = new AmazonQState(serviceName)
+        }
+        return this._instance
+    }
+
+    public static get instance(): AmazonQState {
+        if (!this._instance) {
+            throw new Error('AmazonQState not initialized. Call initialize() first')
+        }
+        return this._instance
+    }
+
+    public get serviceName(): string {
+        return this._serviceName
+    }
+
+    public isSageMakerUnifiedStudio(): boolean {
+        return this._serviceName === 'SageMakerUnifiedStudio'
+    }
+}

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

@@ -83,6 +83,7 @@ export class WebViewContentGenerator {
         const disclaimerAcknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
 
         const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+        const serviceName = process.env.SERVICE_NAME ?? ''
 
         return `
         <script type="text/javascript" src="${javascriptEntrypoint.toString()}" defer onload="init()"></script>
@@ -91,7 +92,7 @@ export class WebViewContentGenerator {
             const init = () => {
                 createMynahUI(acquireVsCodeApi(), ${
                     (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'
-                },${featureConfigsString},${welcomeLoadCount},${disclaimerAcknowledged},${disabledCommandsString});
+                },${featureConfigsString},${welcomeLoadCount},${disclaimerAcknowledged},${disabledCommandsString}, '${serviceName}');
             }
         </script>
         `

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

@@ -47,7 +47,8 @@ export const createMynahUI = (
     featureConfigsSerialized: [string, FeatureContext][],
     welcomeCount: number,
     disclaimerAcknowledged: boolean,
-    disabledCommands?: string[]
+    disabledCommands?: string[],
+    service?: string
 ) => {
     let disclaimerCardActive = !disclaimerAcknowledged
     // eslint-disable-next-line prefer-const
@@ -58,6 +59,7 @@ export const createMynahUI = (
     const responseMetadata = new Map<string, string[]>()
 
     let savedContextCommands: MynahUIDataModel['contextCommands'] = []
+    const serviceName = service ?? ''
 
     window.addEventListener('error', (e) => {
         const { error, message } = e
@@ -624,7 +626,7 @@ export const createMynahUI = (
                 tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
                 mynahUI?.updateTabDefaults({
                     store: {
-                        ...tabDataGenerator.getTabData('cwc', true),
+                        ...tabDataGenerator.getTabData('cwc', true, undefined, serviceName),
                         tabHeaderDetails: void 0,
                         compactMode: false,
                         tabBackground: false,
@@ -931,15 +933,15 @@ export const createMynahUI = (
                 store: {
                     ...(showWelcomePage()
                         ? welcomeScreenTabData(tabDataGenerator).store
-                        : tabDataGenerator.getTabData('cwc', true)),
+                        : tabDataGenerator.getTabData('cwc', true, undefined, serviceName)),
                     ...(disclaimerCardActive ? { promptInputStickyCard: disclaimerCard } : {}),
                 },
             },
         },
         defaults: {
             store: showWelcomePage()
                 ? welcomeScreenTabData(tabDataGenerator).store
-                : tabDataGenerator.getTabData('cwc', true),
+                : tabDataGenerator.getTabData('cwc', true, undefined, serviceName),
         },
         config: {
             maxTabs: 10,

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

@@ -6,13 +6,23 @@ import { TabType } from '../storages/tabsStorage'
 import { QuickActionCommandGroup } from '@aws/mynah-ui'
 import { userGuideURL } from '../texts/constants'
 
+const qChatIntroMessage = `Hi, I'm Amazon Q. I can answer your software development questions.
+  Ask me to explain, debug, or optimize your code.
+  You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.`
+
 export type TabTypeData = {
     title: string
     placeholder: string
     welcome: string
     contextCommands?: QuickActionCommandGroup[]
 }
 
+export const qChatIntroMessageForSMUS = `Hi, I'm Amazon Q. I can answer your software development questions.\n\
+Ask me to explain, debug, or optimize your code.\n\
+You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.
+You are now using Q free tier.\n\
+`
+
 export const workspaceCommand: QuickActionCommandGroup = {
     groupName: 'Mention code',
     commands: [
@@ -26,9 +36,7 @@ export const workspaceCommand: QuickActionCommandGroup = {
 export const commonTabData: TabTypeData = {
     title: 'Chat',
     placeholder: 'Ask a question. Use @ to add context, / for quick actions',
-    welcome: `Hi, I'm Amazon Q. I can answer your software development questions.
-  Ask me to explain, debug, or optimize your code.
-  You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.`,
+    welcome: qChatIntroMessage,
     contextCommands: [workspaceCommand],
 }
 

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

@@ -7,7 +7,7 @@ import { ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/my
 import { TabType } from '../storages/tabsStorage'
 import { FollowUpGenerator } from '../followUps/generator'
 import { QuickActionGenerator } from '../quickActions/generator'
-import { TabTypeDataMap } from './constants'
+import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
 import { agentWalkthroughDataModel } from '../walkthrough/agent'
 import { FeatureContext } from '../../../../shared/featureConfig'
 
@@ -39,7 +39,12 @@ export class TabDataGenerator {
         this.highlightCommand = props.commandHighlight
     }
 
-    public getTabData(tabType: TabType, needWelcomeMessages: boolean, taskName?: string): MynahUIDataModel {
+    public getTabData(
+        tabType: TabType,
+        needWelcomeMessages: boolean,
+        taskName?: string,
+        serviceName?: string
+    ): MynahUIDataModel {
         if (tabType === 'agentWalkthrough') {
             return agentWalkthroughDataModel
         }
@@ -48,6 +53,8 @@ export class TabDataGenerator {
             return {}
         }
 
+        const isSMUSProTier = serviceName ? serviceName === 'SageMakerUnifiedStudio' : false
+
         const tabData: MynahUIDataModel = {
             tabTitle: taskName ?? TabTypeDataMap[tabType].title,
             promptInputInfo:
@@ -59,7 +66,7 @@ export class TabDataGenerator {
                 ? [
                       {
                           type: ChatItemType.ANSWER,
-                          body: TabTypeDataMap[tabType].welcome,
+                          body: isSMUSProTier ? qChatIntroMessageForSMUS : TabTypeDataMap[tabType].welcome,
                       },
                       {
                           type: ChatItemType.ANSWER,

packages/core/src/codewhisperer/ui/statusBarMenu.ts

@@ -30,6 +30,7 @@ import { Commands } from '../../shared/vscode/commands2'
 import { createExitButton } from '../../shared/ui/buttons'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { getLogger } from '../../shared/logger/logger'
+import { AmazonQState } from '../../amazonq/util/amazonQState'
 
 function getAmazonQCodeWhispererNodes() {
     const autoTriggerEnabled = CodeSuggestionsState.instance.isSuggestionsEnabled()
@@ -92,7 +93,11 @@ export function getQuickPickItems(): DataQuickPickItem<string>[] {
         // Add settings and signout
         createSeparator(),
         createSettingsNode(),
-        ...(AuthUtil.instance.isConnected() && !hasVendedIamCredentials() ? [createSignout()] : []),
+        ...(AuthUtil.instance.isConnected() &&
+        !hasVendedIamCredentials() &&
+        !AmazonQState.instance.isSageMakerUnifiedStudio()
+            ? [createSignout()]
+            : []),
     ]
 
     return children

packages/core/src/shared/vscode/setContext.ts

@@ -37,6 +37,7 @@ export type contextKey =
     | 'gumby.wasQCodeTransformationUsed'
     | 'amazonq.inline.codelensShortcutEnabled'
     | 'aws.toolkit.lambda.walkthroughSelected'
+    | 'aws.amazonq.isSagemakerStudio'
 
 const contextMap: Partial<Record<contextKey, any>> = {}