Merge aws#6951 from justinmk3/fixdisclaimer

justinmk3 · web-flow · commit 2f6d43752e2c · 2025-04-08T11:10:29.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -127,6 +127,10 @@
                         "amazonQWorkspaceLspManifestMessage": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQChatDisclaimer": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
diff --git a/packages/amazonq/src/app/inline/sessionManager.ts b/packages/amazonq/src/app/inline/sessionManager.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types/inlineCompletionWithReferences'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types'
 
 // TODO: add more needed data to the session interface
 interface CodeWhispererSession {
diff --git a/packages/amazonq/src/lsp/chat/messages.ts b/packages/amazonq/src/lsp/chat/messages.ts
@@ -10,6 +10,7 @@ import {
     CHAT_OPTIONS,
     COPY_TO_CLIPBOARD,
     AuthFollowUpType,
+    DISCLAIMER_ACKNOWLEDGED,
 } from '@aws/chat-client-ui-types'
 import {
     ChatResult,
@@ -27,6 +28,7 @@ import { Disposable, LanguageClient, Position, State, TextDocumentIdentifier } f
 import * as jose from 'jose'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { AmazonQPromptSettings } from 'aws-core-vscode/shared'
 
 export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
     languageClient.onDidChangeState(({ oldState, newState }) => {
@@ -106,6 +108,10 @@ export function registerMessageListeners(
                 }
                 break
             }
+            case DISCLAIMER_ACKNOWLEDGED: {
+                void AmazonQPromptSettings.instance.disablePrompt('amazonQChatDisclaimer')
+                break
+            }
             case chatRequestType.method: {
                 const partialResultToken = uuidv4()
                 const chatDisposable = languageClient.onProgress(chatRequestType, partialResultToken, (partialResult) =>
diff --git a/packages/amazonq/src/lsp/chat/webviewProvider.ts b/packages/amazonq/src/lsp/chat/webviewProvider.ts
@@ -12,9 +12,9 @@ import {
     WebviewViewResolveContext,
     Uri,
 } from 'vscode'
-import { LanguageServerResolver } from 'aws-core-vscode/shared'
 import { QuickActionCommandGroup } from '@aws/mynah-ui'
 import * as path from 'path'
+import { AmazonQPromptSettings, LanguageServerResolver } from 'aws-core-vscode/shared'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.AmazonQChatView'
@@ -43,7 +43,11 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
 
     constructor(private readonly mynahUIPath: string) {}
 
-    public resolveWebviewView(webviewView: WebviewView, context: WebviewViewResolveContext, _token: CancellationToken) {
+    public async resolveWebviewView(
+        webviewView: WebviewView,
+        context: WebviewViewResolveContext,
+        _token: CancellationToken
+    ) {
         this.webview = webviewView.webview
 
         const lspDir = Uri.parse(LanguageServerResolver.defaultDir)
@@ -54,12 +58,13 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         }
 
         const uiPath = webviewView.webview.asWebviewUri(Uri.parse(this.mynahUIPath)).toString()
-        webviewView.webview.html = this.getWebviewContent(uiPath)
+        webviewView.webview.html = await this.getWebviewContent(uiPath)
 
         this.onDidResolveWebviewEmitter.fire()
     }
 
-    private getWebviewContent(mynahUIPath: string) {
+    private async getWebviewContent(mynahUIPath: string) {
+        const disclaimerAcknowledged = AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
         return `
         <!DOCTYPE html>
         <html lang="en">
@@ -84,7 +89,7 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
             <script type="text/javascript" src="${mynahUIPath.toString()}" defer onload="init()"></script>
             <script type="text/javascript">
                 const init = () => {
-                    amazonQChat.createChat(acquireVsCodeApi(), { disclaimerAcknowledged: false, quickActionCommands: ${JSON.stringify(this.quickActionCommands)}});
+                    amazonQChat.createChat(acquireVsCodeApi(), { disclaimerAcknowledged: ${disclaimerAcknowledged}, quickActionCommands: ${JSON.stringify(this.quickActionCommands)}});
                 }
             </script>
         </body>
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -440,7 +440,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws/chat-client-ui-types": "^0.0.8",
+        "@aws/chat-client-ui-types": "^0.1.12",
         "@aws/language-server-runtimes": "^0.2.49",
         "@aws/language-server-runtimes-types": "^0.1.10",
         "@cspotcode/source-map-support": "^0.8.1",
diff --git a/packages/core/src/amazonq/webview/generators/webViewContent.ts b/packages/core/src/amazonq/webview/generators/webViewContent.ts
@@ -9,6 +9,7 @@ import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { FeatureConfigProvider, FeatureContext } from '../../../shared/featureConfig'
 import globals from '../../../shared/extensionGlobals'
 import { isSageMaker } from '../../../shared/extensionUtilities'
+import { AmazonQPromptSettings } from '../../../shared/settings'
 
 export class WebViewContentGenerator {
     private async generateFeatureConfigsData(): Promise<string> {
@@ -82,8 +83,7 @@ export class WebViewContentGenerator {
         const isSMUS = isSageMaker('SMUS')
 
         const disabledCommandsString = isSM ? `['/dev', '/transform', '/test', '/review', '/doc']` : '[]'
-        const disclaimerAcknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
-
+        const disclaimerAcknowledged = !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
         const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
 
         return `
diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts
@@ -15,6 +15,7 @@ import { isClickTelemetry, isOpenAgentTelemetry } from '../ui/telemetry/actions'
 import globals from '../../../shared/extensionGlobals'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { DefaultAmazonQAppInitContext } from '../../apps/initContext'
+import { AmazonQPromptSettings } from '../../../shared/settings'
 
 const qChatModuleName = 'amazonqChat'
 
@@ -77,7 +78,7 @@ export function dispatchWebViewMessagesToApps(
                 return
             }
             case 'disclaimer-acknowledged': {
-                globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', true)
+                void AmazonQPromptSettings.instance.disablePrompt('amazonQChatDisclaimer')
                 return
             }
             case 'update-welcome-count': {
diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts
@@ -35,7 +35,7 @@ export type globalKey =
     | 'aws.amazonq.codescan.groupingStrategy'
     | 'aws.amazonq.notifications'
     | 'aws.amazonq.welcomeChatShowCount'
-    | 'aws.amazonq.disclaimerAcknowledged'
+    | 'aws.amazonq.disclaimerAcknowledged' // Legacy, use `AmazonQPromptSettings` instead.
     | 'aws.notifications'
     | 'aws.notifications.dev' // keys to store notifications for testing
     | 'aws.downloadPath'
diff --git a/packages/core/src/shared/index.ts b/packages/core/src/shared/index.ts
@@ -13,7 +13,7 @@ export { activate as activateLogger } from './logger/activation'
 export { activate as activateTelemetry } from './telemetry/activation'
 export { DefaultAwsContext } from './awsContext'
 export { DefaultAWSClientBuilder, ServiceOptions } from './awsClientBuilder'
-export { Settings, Experiments, DevSettings } from './settings'
+export { Settings, Experiments, DevSettings, AmazonQPromptSettings } from './settings'
 export * from './extensionUtilities'
 export * from './extensionStartup'
 export { RegionProvider } from './regions/regionProvider'
diff --git a/packages/core/src/shared/settings-amazonq.gen.ts b/packages/core/src/shared/settings-amazonq.gen.ts
@@ -20,7 +20,8 @@ export const amazonqSettings = {
         "minIdeVersion": {},
         "ssoCacheError": {},
         "amazonQLspManifestMessage": {},
-        "amazonQWorkspaceLspManifestMessage": {}
+        "amazonQWorkspaceLspManifestMessage": {},
+        "amazonQChatDisclaimer": {}
     },
     "amazonQ.showCodeWithReferences": {},
     "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {},
diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts
@@ -662,6 +662,15 @@ export class AmazonQPromptSettings
 {
     public isPromptEnabled(promptName: amazonQPromptName): boolean {
         try {
+            // Legacy migration for old globalState settings:
+            if (promptName === 'amazonQChatDisclaimer') {
+                const acknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
+                if (acknowledged) {
+                    void this.update(promptName, true)
+                    globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', undefined)
+                }
+            }
+
             return !this._getOrThrow(promptName, false)
         } catch (e) {
             this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import { isClickTelemetry, isOpenAgentTelemetry } from '../ui/telemetry/actions'`
`15`	`15`	`import globals from '../../../shared/extensionGlobals'`
`16`	`16`	`import { openUrl } from '../../../shared/utilities/vsCodeUtils'`
`17`	`17`	`import { DefaultAmazonQAppInitContext } from '../../apps/initContext'`
	`18`	`+import { AmazonQPromptSettings } from '../../../shared/settings'`
`18`	`19`
`19`	`20`	`const qChatModuleName = 'amazonqChat'`
`20`	`21`
`@@ -77,7 +78,7 @@ export function dispatchWebViewMessagesToApps(`
`77`	`78`	`return`
`78`	`79`	`}`
`79`	`80`	`case 'disclaimer-acknowledged': {`
`80`		`- globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', true)`
	`81`	`+ void AmazonQPromptSettings.instance.disablePrompt('amazonQChatDisclaimer')`
`81`	`82`	`return`
`82`	`83`	`}`
`83`	`84`	`case 'update-welcome-count': {`