Merge branch 'feature/falcon' of github.com:leigaol/aws-toolkit-vscode into update_context_cmd

leigaol · leigaol · commit a68d84c9e3e0 · 2025-02-26T13:30:40.000-08:00
diff --git a/packages/amazonq/test/e2e/amazonq/chat.test.ts b/packages/amazonq/test/e2e/amazonq/chat.test.ts
@@ -11,7 +11,7 @@ import { MynahUIDataModel } from '@aws/mynah-ui'
 import { assertContextCommands, assertQuickActions } from './assert'
 import { registerAuthHook, using } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
-import { webviewConstants } from 'aws-core-vscode/amazonq'
+import { webviewConstants, webviewTabConstants } from 'aws-core-vscode/amazonq'
 
 describe('Amazon Q Chat', function () {
     let framework: qTestingFramework
@@ -60,7 +60,7 @@ describe('Amazon Q Chat', function () {
     })
 
     it('Shows placeholder', () => {
-        assert.deepStrictEqual(store.promptInputPlaceholder, 'Ask a question or enter "/" for quick actions')
+        assert.deepStrictEqual(store.promptInputPlaceholder, webviewTabConstants.commonTabData.placeholder)
     })
 
     it('Sends message', async () => {
diff --git a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts
@@ -40,6 +40,9 @@ export function injectJSDOM() {
         get() {
             return this.textContent
         },
+        set(value) {
+            this.textContent = value
+        },
     })
 
     // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -309,6 +309,11 @@
     "AWS.codewhisperer.customization.notification.new_customizations.learn_more": "Learn More",
     "AWS.amazonq.title": "Amazon Q",
     "AWS.amazonq.chat": "Chat",
+    "AWS.amazonq.savedPrompts.title": "Prompt name",
+    "AWS.amazonq.savedPrompts.create": "Create",
+    "AWS.amazonq.savedPrompts.action": "Create a new prompt",
+    "AWS.amazonq.savedPrompts.placeholder": "Enter prompt name",
+    "AWS.amazonq.savedPrompts.description": "Use this prompt by typing '@' followed by the prompt name.",
     "AWS.amazonq.chat.workspacecontext.enable.message": "Amazon Q: Workspace index is now enabled. You can disable it from Amazon Q settings.",
     "AWS.amazonq.security": "Code Issues",
     "AWS.amazonq.login": "Login",
diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts
@@ -26,6 +26,7 @@ export { init as testChatAppInit } from '../amazonqTest/app'
 export { init as docChatAppInit } from '../amazonqDoc/app'
 export { amazonQHelpUrl } from '../shared/constants'
 export * as webviewConstants from './webview/ui/texts/constants'
+export * as webviewTabConstants from './webview/ui/tabs/constants'
 export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
 export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
 export { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens'
diff --git a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
@@ -7,7 +7,6 @@ import { ChatItemButton, ChatItemFormItem, ChatItemType, MynahUIDataModel, Quick
 import { TabType } from '../storages/tabsStorage'
 import { CWCChatItem } from '../connector'
 import { BaseConnector, BaseConnectorProps } from './baseConnector'
-import { createPromptCommand } from '../tabs/constants'
 
 export interface ConnectorProps extends BaseConnectorProps {
     onCWCContextCommandMessage: (message: CWCChatItem, command?: string) => string | undefined
@@ -205,8 +204,7 @@ export class Connector extends BaseConnector {
             tabID,
             tabType: this.getTabType(),
         })
-
-        if (contextItem.command === createPromptCommand) {
+        if (contextItem.id === 'create-saved-prompt') {
             return false
         }
         return true
diff --git a/packages/core/src/amazonq/webview/ui/tabs/constants.ts b/packages/core/src/amazonq/webview/ui/tabs/constants.ts
@@ -13,8 +13,6 @@ export type TabTypeData = {
     contextCommands?: QuickActionCommandGroup[]
 }
 
-export const createPromptCommand = 'Create a new prompt'
-
 export const workspaceCommand: QuickActionCommandGroup = {
     groupName: 'Mention code',
     commands: [
@@ -25,9 +23,9 @@ export const workspaceCommand: QuickActionCommandGroup = {
     ],
 }
 
-const commonTabData: TabTypeData = {
+export const commonTabData: TabTypeData = {
     title: 'Chat',
-    placeholder: 'Ask a question or enter "/" for quick actions',
+    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. Add @workspace to the beginning of your message to include your entire workspace as context.`,
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -896,3 +896,28 @@ export enum SecurityScanStep {
 }
 
 export const amazonqCodeIssueDetailsTabTitle = 'Code Issue Details'
+
+export const testGenExcludePatterns = [
+    '**/annotation-generated-src/*',
+    '**/annotation-generated-tst/*',
+    '**/build/*',
+    '**/env/*',
+    '**/release-info/*',
+    '**/*.jar',
+    '**/*.exe',
+    '**/*.a',
+    '**/*.map',
+    '**/*.graph',
+    '**/*.so',
+    '**/*.csv',
+    '**/*.dylib',
+    '**/*.parquet',
+    '**/*.xlsx',
+    '**/*.tar.gz',
+    '**/*.tar',
+    '**/*.pack',
+    '**/*.pkg',
+    '**/*.pkl',
+    '**/*.deb',
+    '**/*.model',
+]
diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts
@@ -128,7 +128,7 @@ export const setSelectedCustomization = async (customization: Customization, isO
         return
     }
     if (isOverride) {
-        const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.override', String)
+        const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.overrideV2', String)
         if (customization.arn === previousOverride) {
             return
         }
@@ -143,7 +143,7 @@ export const setSelectedCustomization = async (customization: Customization, isO
 
     await globals.globalState.update('CODEWHISPERER_SELECTED_CUSTOMIZATION', selectedCustomizationObj)
     if (isOverride) {
-        await globals.globalState.update('aws.amazonq.customization.override', customization.arn)
+        await globals.globalState.update('aws.amazonq.customization.overrideV2', customization.arn)
     }
     vsCodeState.isFreeTierLimitReached = false
     await Commands.tryExecute('aws.amazonq.refreshStatusBar')
diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts
@@ -13,7 +13,7 @@ import { fs } from '../../shared/fs/fs'
 import { getLoggerForScope } from '../service/securityScanHandler'
 import { runtimeLanguageContext } from './runtimeLanguageContext'
 import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
-import { CurrentWsFolders, collectFiles } from '../../shared/utilities/workspaceUtils'
+import { CurrentWsFolders, collectFiles, defaultExcludePatterns } from '../../shared/utilities/workspaceUtils'
 import {
     FileSizeExceededError,
     NoActiveFileError,
@@ -412,11 +412,18 @@ export class ZipUtil {
 
         const sourceFiles = await collectFiles(
             projectPaths,
-            vscode.workspace.workspaceFolders as CurrentWsFolders,
+            (useCase === FeatureUseCase.TEST_GENERATION
+                ? [...(vscode.workspace.workspaceFolders ?? [])].sort(
+                      (a, b) => b.uri.fsPath.length - a.uri.fsPath.length
+                  )
+                : vscode.workspace.workspaceFolders) as CurrentWsFolders,
             {
                 maxSizeBytes: this.getProjectScanPayloadSizeLimitInBytes(),
-            },
-            useCase
+                excludePatterns:
+                    useCase === FeatureUseCase.TEST_GENERATION
+                        ? [...CodeWhispererConstants.testGenExcludePatterns, ...defaultExcludePatterns]
+                        : defaultExcludePatterns,
+            }
         )
         for (const file of sourceFiles) {
             const projectName = path.basename(file.workspaceFolder.uri.fsPath)
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -67,9 +67,10 @@ import globals from '../../../shared/extensionGlobals'
 import { MynahIconsType, MynahUIDataModel, QuickActionCommand } from '@aws/mynah-ui'
 import { LspClient } from '../../../amazonq/lsp/lspClient'
 import { ContextCommandItem, ContextCommandItemType } from '../../../amazonq/lsp/types'
-import { createPromptCommand, workspaceCommand } from '../../../amazonq/webview/ui/tabs/constants'
+import { workspaceCommand } from '../../../amazonq/webview/ui/tabs/constants'
 import fs from '../../../shared/fs/fs'
 import { FeatureConfigProvider, Features } from '../../../shared/featureConfig'
+import { i18n } from '../../../shared/i18n-helper'
 
 export interface ChatControllerMessagePublishers {
     readonly processPromptChatMessage: MessagePublisher<PromptMessage>
@@ -121,7 +122,7 @@ export interface ChatControllerMessageListeners {
     readonly processFileClick: MessageListener<FileClick>
 }
 
-const promptFileExtension = '.prompt.md'
+const promptFileExtension = '.md'
 
 const additionalContentInnerContextLimit = 8192
 
@@ -134,6 +135,8 @@ const getUserPromptsDirectory = () => {
     return path.join(fs.getUserHomeDir(), '.aws', 'amazonq', 'prompts')
 }
 
+const createSavedPromptCommandId = 'create-saved-prompt'
+
 export class ChatController {
     private readonly sessionStorage: ChatSessionStorage
     private readonly triggerEventsStorage: TriggerEventsStorage
@@ -456,9 +459,9 @@ export class ChatController {
                                 groupName: 'Prompts',
                                 actions: [
                                     {
-                                        id: 'create-prompt',
+                                        id: createSavedPromptCommandId,
                                         icon: 'plus',
-                                        description: 'Create new prompt',
+                                        description: i18n('AWS.amazonq.savedPrompts.action'),
                                     },
                                 ],
                                 commands: [],
@@ -503,7 +506,11 @@ export class ChatController {
         }
 
         // Add create prompt button to the bottom of the prompts list
-        promptsCmd.children?.[0].commands.push({ command: createPromptCommand, icon: 'list-add' as MynahIconsType })
+        promptsCmd.children?.[0].commands.push({
+            command: i18n('AWS.amazonq.savedPrompts.action'),
+            id: createSavedPromptCommandId,
+            icon: 'list-add' as MynahIconsType,
+        })
 
         const lspClientReady = await LspClient.instance.waitUntilReady()
         if (lspClientReady) {
@@ -542,21 +549,21 @@ export class ChatController {
                     id: 'prompt-name',
                     type: 'textinput',
                     mandatory: true,
-                    title: 'Prompt name',
-                    placeholder: 'Enter prompt name',
-                    description: `Use this prompt by typing \`@\` followed by the prompt name. Prompt will be saved in ${getUserPromptsDirectory()}.`,
+                    title: i18n('AWS.amazonq.savedPrompts.title'),
+                    placeholder: i18n('AWS.amazonq.savedPrompts.placeholder'),
+                    description: i18n('AWS.amazonq.savedPrompts.description'),
                 },
             ],
             [
-                { id: 'cancel-create-prompt', text: 'Cancel', status: 'clear' },
-                { id: 'submit-create-prompt', text: 'Create', status: 'main' },
+                { id: 'cancel-create-prompt', text: i18n('AWS.generic.cancel'), status: 'clear' },
+                { id: 'submit-create-prompt', text: i18n('AWS.amazonq.savedPrompts.create'), status: 'main' },
             ],
             `Create a saved prompt`
         )
     }
 
     private processQuickCommandGroupActionClicked(message: QuickCommandGroupActionClick) {
-        if (message.actionId === 'create-prompt') {
+        if (message.actionId === createSavedPromptCommandId) {
             this.handlePromptCreate(message.tabID)
         }
     }
@@ -578,7 +585,7 @@ export class ChatController {
     }
 
     private async processContextSelected(message: ContextSelectedMessage) {
-        if (message.tabID && message.contextItem.command === createPromptCommand) {
+        if (message.tabID && message.contextItem.id === createSavedPromptCommandId) {
             this.handlePromptCreate(message.tabID)
         }
     }
diff --git a/packages/core/src/shared/featureConfig.ts b/packages/core/src/shared/featureConfig.ts
@@ -33,7 +33,7 @@ export class FeatureContext {
     ) {}
 }
 
-const featureConfigPollIntervalInMs = 30 * 60 * 1000 // 30 mins
+const featureConfigPollIntervalInMs = 180 * 60 * 1000 // 180 mins
 
 export const Features = {
     customizationArnOverride: 'customizationArnOverride',
@@ -145,7 +145,8 @@ export class FeatureConfigProvider {
 
             const customizationArnOverride = this.featureConfigs.get(Features.customizationArnOverride)?.value
                 ?.stringValue
-            if (customizationArnOverride !== undefined) {
+            const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.overrideV2', String)
+            if (customizationArnOverride !== undefined && customizationArnOverride !== previousOverride) {
                 // Double check if server-side wrongly returns a customizationArn to BID users
                 if (isBuilderIdConnection(AuthUtil.instance.conn)) {
                     this.featureConfigs.delete(Features.customizationArnOverride)
diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts
@@ -45,7 +45,7 @@ export type globalKey =
     | 'aws.toolkit.amazonq.dismissed'
     | 'aws.toolkit.amazonqInstall.dismissed'
     | 'aws.amazonq.workspaceIndexToggleOn'
-    | 'aws.amazonq.customization.override'
+    | 'aws.amazonq.customization.overrideV2'
     // Deprecated/legacy names. New keys should start with "aws.".
     | '#sessionCreationDates' // Legacy name from `ssoAccessTokenProvider.ts`.
     | 'CODECATALYST_RECONNECT'
diff --git a/packages/core/src/shared/utilities/workspaceUtils.ts b/packages/core/src/shared/utilities/workspaceUtils.ts
@@ -20,7 +20,6 @@ import fs from '../fs/fs'
 import { ChildProcess } from './processUtils'
 import { isWin } from '../vscode/env'
 import { maxRepoSizeBytes } from '../../amazonqFeatureDev/constants'
-import { FeatureUseCase } from '../../codewhisperer/models/constants'
 
 type GitIgnoreRelativeAcceptor = {
     folderPath: string
@@ -224,18 +223,12 @@ export function getWorkspaceRelativePath(
         workspaceFolders?: readonly vscode.WorkspaceFolder[]
     } = {
         workspaceFolders: vscode.workspace.workspaceFolders,
-    },
-    useCase?: FeatureUseCase
+    }
 ): { relativePath: string; workspaceFolder: vscode.WorkspaceFolder } | undefined {
     if (!override.workspaceFolders) {
         return
     }
-    let folders = override.workspaceFolders
-    if (useCase && useCase === FeatureUseCase.TEST_GENERATION) {
-        // Sort workspace folders by path length (descending) to prioritize deeper paths
-        // TODO: Need to enable this for entire Q
-        folders = [...override.workspaceFolders].sort((a, b) => b.uri.fsPath.length - a.uri.fsPath.length)
-    }
+    const folders = override.workspaceFolders
 
     for (const folder of folders) {
         if (isInDirectory(folder.uri.fsPath, childPath)) {
@@ -361,8 +354,7 @@ export async function collectFiles(
         excludeByGitIgnore?: boolean // default true
         excludePatterns?: string[] // default defaultExcludePatterns
         filterFn?: CollectFilesFilter
-    },
-    useCase?: FeatureUseCase
+    }
 ): Promise<CollectFilesResultItem[]> {
     const storage: Awaited<CollectFilesResultItem[]> = []
 
@@ -408,7 +400,7 @@ export async function collectFiles(
         const files = excludeByGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles, false) : allFiles
 
         for (const file of files) {
-            const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders }, useCase)
+            const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })
             if (!relativePath) {
                 continue
             }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ export const setSelectedCustomization = async (customization: Customization, isO`
`128`	`128`	`return`
`129`	`129`	`}`
`130`	`130`	`if (isOverride) {`
`131`		`- const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.override', String)`
	`131`	`+ const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.overrideV2', String)`
`132`	`132`	`if (customization.arn === previousOverride) {`
`133`	`133`	`return`
`134`	`134`	`}`
`@@ -143,7 +143,7 @@ export const setSelectedCustomization = async (customization: Customization, isO`
`143`	`143`
`144`	`144`	`await globals.globalState.update('CODEWHISPERER_SELECTED_CUSTOMIZATION', selectedCustomizationObj)`
`145`	`145`	`if (isOverride) {`
`146`		`- await globals.globalState.update('aws.amazonq.customization.override', customization.arn)`
	`146`	`+ await globals.globalState.update('aws.amazonq.customization.overrideV2', customization.arn)`
`147`	`147`	`}`
`148`	`148`	`vsCodeState.isFreeTierLimitReached = false`
`149`	`149`	`await Commands.tryExecute('aws.amazonq.refreshStatusBar')`