Merge master into feature/q-utg

aws-toolkit-automation · web-flow · commit 2b8ecf6dc2a2 · 2025-04-01T07:56:53.000-04:00
diff --git a/packages/amazonq/src/lsp/chat/webviewProvider.ts b/packages/amazonq/src/lsp/chat/webviewProvider.ts
@@ -13,6 +13,7 @@ import {
     Uri,
 } from 'vscode'
 import { LanguageServerResolver } from 'aws-core-vscode/shared'
+import { QuickActionCommandGroup } from '@aws/mynah-ui'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.AmazonQChatView'
@@ -21,6 +22,24 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
 
     webview: Webview | undefined
 
+    private readonly quickActionCommands: QuickActionCommandGroup[] = [
+        {
+            groupName: 'Quick Actions',
+            commands: [
+                {
+                    command: '/help',
+                    icon: 'help',
+                    description: 'Learn more about Amazon Q',
+                },
+                {
+                    command: '/clear',
+                    icon: 'trash',
+                    description: 'Clear this session',
+                },
+            ],
+        },
+    ]
+
     constructor(private readonly mynahUIPath: string) {}
 
     public resolveWebviewView(webviewView: WebviewView, context: WebviewViewResolveContext, _token: CancellationToken) {
@@ -34,40 +53,40 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         }
 
         const uiPath = webviewView.webview.asWebviewUri(Uri.parse(this.mynahUIPath)).toString()
-        webviewView.webview.html = getWebviewContent(uiPath)
+        webviewView.webview.html = this.getWebviewContent(uiPath)
 
         this.onDidResolveWebviewEmitter.fire()
     }
-}
 
-function getWebviewContent(mynahUIPath: string) {
-    return `
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Chat</title>
-        <style>
-            body,
-            html {
-                background-color: var(--mynah-color-bg);
-                color: var(--mynah-color-text-default);
-                height: 100%;
-                width: 100%;
-                overflow: hidden;
-                margin: 0;
-                padding: 0;
-            }
-        </style>
-    </head>
-    <body>
-        <script type="text/javascript" src="${mynahUIPath.toString()}" defer onload="init()"></script>
-        <script type="text/javascript">
-            const init = () => {
-                amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: false});
-            }
-        </script>
-    </body>
-    </html>`
+    private getWebviewContent(mynahUIPath: string) {
+        return `
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Chat</title>
+            <style>
+                body,
+                html {
+                    background-color: var(--mynah-color-bg);
+                    color: var(--mynah-color-text-default);
+                    height: 100%;
+                    width: 100%;
+                    overflow: hidden;
+                    margin: 0;
+                    padding: 0;
+                }
+            </style>
+        </head>
+        <body>
+            <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)}});
+                }
+            </script>
+        </body>
+        </html>`
+    }
 }
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -93,14 +93,7 @@ export async function startLanguageServer(
     const auth = new AmazonQLspAuth(client)
 
     return client.onReady().then(async () => {
-        await auth.init()
-        const inlineManager = new InlineCompletionManager(client)
-        inlineManager.registerInlineCompletion()
-        if (Experiments.instance.get('amazonqChatLSP', false)) {
-            activate(client, encryptionKey, resourcePaths.mynahUI)
-        }
-
-        // Request handler for when the server wants to know about the clients auth connnection
+        // Request handler for when the server wants to know about the clients auth connnection. Must be registered before the initial auth init call
         client.onRequest<ConnectionMetadata, Error>(notificationTypes.getConnectionMetadata.method, () => {
             return {
                 sso: {
@@ -109,6 +102,13 @@ export async function startLanguageServer(
             }
         })
 
+        await auth.init()
+        const inlineManager = new InlineCompletionManager(client)
+        inlineManager.registerInlineCompletion()
+        if (Experiments.instance.get('amazonqChatLSP', false)) {
+            activate(client, encryptionKey, resourcePaths.mynahUI)
+        }
+
         // Temporary code for pen test. Will be removed when we switch to the real flare auth
         const authInterval = setInterval(async () => {
             try {
