Merge master into feature/emr

aws-toolkit-automation · web-flow · commit 81bf2c9401ad · 2025-04-08T14:17:51.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b6e474f1-b7ef-4016-8e1c-c9e7e6a45cc2.json b/packages/amazonq/.changes/next-release/Bug Fix-b6e474f1-b7ef-4016-8e1c-c9e7e6a45cc2.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-4b7ab0af-2fe3-4e21-be78-5fcb1896257c.json b/packages/amazonq/.changes/next-release/Feature-4b7ab0af-2fe3-4e21-be78-5fcb1896257c.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML"
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-846afd38-d618-4bd1-a3aa-7c74597502f1.json b/packages/amazonq/.changes/next-release/Feature-846afd38-d618-4bd1-a3aa-7c74597502f1.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q Chat: Add @Code context for PHP, Ruby, Scala, Shell, and Swift projects"
+}
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/lsp/config.ts b/packages/core/src/amazonq/lsp/config.ts
@@ -16,7 +16,7 @@ export interface LspConfig {
 
 export const defaultAmazonQWorkspaceLspConfig: LspConfig = {
     manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json',
-    supportedVersions: '0.1.46',
+    supportedVersions: '0.1.47',
     id: 'AmazonQ-Workspace', // used across IDEs for identifying global storage/local disk locations. Do not change.
     suppressPromptPrefix: 'amazonQWorkspace',
     path: undefined,
diff --git a/packages/core/src/amazonq/lsp/lspClient.ts b/packages/core/src/amazonq/lsp/lspClient.ts
@@ -188,7 +188,7 @@ export class LspClient {
                 GetContextCommandPromptRequestType,
                 await this.encrypt(request)
             )
-            return resp
+            return resp || []
         } catch (e) {
             getLogger().error(`LspClient: getContextCommandPrompt error: ${e}`)
             throw e
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/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -973,12 +973,11 @@ export const createMynahUI = (
                     icon: MynahIcons.HISTORY,
                     description: 'View chat history',
                 },
-                /* Temporarily hide export chat button from tab bar
                 {
                     id: 'export_chat',
                     icon: MynahIcons.EXTERNAL,
                     description: 'Export chat',
-                }, */
+                },
             ],
         },
     })
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -577,13 +577,7 @@ export class ChatController {
                         id: contextCommandItem.id,
                         icon: 'folder' as MynahIconsType,
                     })
-                }
-                // TODO: Remove the limit of 25k once the performance issue of mynahUI in webview is fixed.
-                else if (
-                    contextCommandItem.symbol &&
-                    symbolsCmd.children &&
-                    symbolsCmd.children[0].commands.length < 25_000
-                ) {
+                } else if (contextCommandItem.symbol && symbolsCmd.children) {
                     symbolsCmd.children?.[0].commands.push({
                         command: contextCommandItem.symbol.name,
                         description: `${contextCommandItem.symbol.kind}, ${path.join(wsFolderName, contextCommandItem.relativePath)}, L${contextCommandItem.symbol.range.start.line}-${contextCommandItem.symbol.range.end.line}`,
@@ -638,7 +632,7 @@ export class ChatController {
                 title ? `${title}${promptFileExtension}` : `default${promptFileExtension}`
             )
             const newFileContent = new Uint8Array(Buffer.from(''))
-            await fs.writeFile(newFilePath, newFileContent)
+            await fs.writeFile(newFilePath, newFileContent, { mode: 0o600 })
             const newFileDoc = await vscode.workspace.openTextDocument(newFilePath)
             await vscode.window.showTextDocument(newFileDoc)
             telemetry.ui_click.emit({ elementId: 'amazonq_createSavedPrompt' })
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -90,7 +90,7 @@ export class Messenger {
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,
                     triggerID,
-                    messageID: '',
+                    messageID: triggerID,
                     userIntent: undefined,
                     codeBlockLanguage: undefined,
                     contextList: mergedRelevantDocuments,
diff --git a/packages/core/src/shared/db/chatDb/util.ts b/packages/core/src/shared/db/chatDb/util.ts
@@ -142,7 +142,7 @@ export class FileSystemAdapter implements LokiPersistenceAdapter {
             await this.ensureDirectory()
             const filename = path.join(this.directory, dbname)
 
-            await fs.writeFile(filename, dbstring, 'utf8')
+            await fs.writeFile(filename, dbstring, { mode: 0o600, encoding: 'utf8' })
             callback(undefined)
         } catch (err: any) {
             callback(err)
@@ -251,12 +251,11 @@ export function groupTabsByDate(tabs: Tab[]): DetailedListItemGroup[] {
 }
 
 const getConversationActions = (historyId: string): ChatItemButton[] => [
-    /* Temporarily hide export chat button from tab bar
     {
         text: 'Export',
         icon: 'external' as MynahIconsType,
         id: historyId,
-    }, */
+    },
     {
         text: 'Delete',
         icon: 'trash' as MynahIconsType,
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 change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
 +}