feat(amazonq): Handle disclaimer acknowledgement

jpinkney-aws · jpinkney-aws · commit 195e365cfab7 · 2025-03-21T08:47:14.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/src/lsp/chat/messages.ts b/packages/amazonq/src/lsp/chat/messages.ts
@@ -9,6 +9,7 @@ import {
     AUTH_FOLLOW_UP_CLICKED,
     CHAT_OPTIONS,
     COPY_TO_CLIPBOARD,
+    DISCLAIMER_ACKNOWLEDGED,
 } from '@aws/chat-client-ui-types'
 import {
     ChatResult,
@@ -25,6 +26,7 @@ import { window } from 'vscode'
 import { Disposable, LanguageClient, Position, State, TextDocumentIdentifier } from 'vscode-languageclient'
 import * as jose from 'jose'
 import { AmazonQChatViewProvider } from './webviewProvider'
+import { globals } from 'aws-core-vscode/shared'
 
 export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
     languageClient.onDidChangeState(({ oldState, newState }) => {
@@ -81,6 +83,9 @@ export function registerMessageListeners(
                 // TODO hook this into auth
                 languageClient.info('[VSCode Client] AuthFollowUp clicked')
                 break
+            case DISCLAIMER_ACKNOWLEDGED:
+                globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', true)
+                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,7 +12,7 @@ import {
     WebviewViewResolveContext,
     Uri,
 } from 'vscode'
-import { LanguageServerResolver } from 'aws-core-vscode/shared'
+import { globals, LanguageServerResolver } from 'aws-core-vscode/shared'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.AmazonQChatView'
@@ -34,13 +34,14 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         }
 
         const uiPath = webviewView.webview.asWebviewUri(Uri.parse(this.mynahUIPath)).toString()
-        webviewView.webview.html = getWebviewContent(uiPath)
+        const disclaimerAcknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
+        webviewView.webview.html = getWebviewContent(uiPath, disclaimerAcknowledged)
 
         this.onDidResolveWebviewEmitter.fire()
     }
 }
 
-function getWebviewContent(mynahUIPath: string) {
+function getWebviewContent(mynahUIPath: string, disclaimerAcknowledged: boolean) {
     return `
     <!DOCTYPE html>
     <html lang="en">
@@ -65,7 +66,7 @@ function getWebviewContent(mynahUIPath: string) {
         <script type="text/javascript" src="${mynahUIPath.toString()}" defer onload="init()"></script>
         <script type="text/javascript">
             const init = () => {
-                amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: false});
+                amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: ${disclaimerAcknowledged}});
             }
         </script>
     </body>
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -440,7 +440,7 @@
     },
     "devDependencies": {
         "@aws/language-server-runtimes": "^0.2.27",
-        "@aws/chat-client-ui-types": "^0.0.8",
+        "@aws/chat-client-ui-types": "^0.1.7",
         "@aws-sdk/types": "^3.13.1",
         "@aws/fully-qualified-names": "^2.1.4",
         "@cspotcode/source-map-support": "^0.8.1",
