Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Feature",
"description": "Amazon Q chat: Use `@` to add folders, files, and saved prompts as context"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Feature",
"description": "Amazon Q chat: Show list of files sent as context in chat response"
}
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@
"@aws-sdk/property-provider": "<3.696.0",
"@aws-sdk/smithy-client": "<3.696.0",
"@aws-sdk/util-arn-parser": "<3.696.0",
"@aws/mynah-ui": "^4.23.0-beta.14",
"@aws/mynah-ui": "^4.23.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR to make this change in master: #6705

"@gerhobbelt/gitignore-parser": "^0.2.0-9",
"@iarna/toml": "^2.2.5",
"@smithy/middleware-retry": "^3.0.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/core/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@
"AWS.codewhisperer.customization.notification.new_customizations.learn_more": "Learn More",
"AWS.amazonq.title": "Amazon Q",
"AWS.amazonq.chat": "Chat",
"AWS.amazonq.context.folders.title": "Folders",
"AWS.amazonq.context.folders.description": "Add all files in a folder to context",
"AWS.amazonq.context.files.title": "Files",
"AWS.amazonq.context.files.description": "Add a file to context",
"AWS.amazonq.context.prompts.title": "Prompts",
"AWS.amazonq.context.prompts.description": "Add a saved prompt to context",
"AWS.amazonq.savedPrompts.title": "Prompt name",
"AWS.amazonq.savedPrompts.create": "Create",
"AWS.amazonq.savedPrompts.action": "Create a new prompt",
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/amazonq/webview/ui/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ export const createMynahUI = (
fileTreeTitle: '',
filePaths: item.contextList.map((file) => file.relativeFilePath),
rootFolderTitle: 'Context',
flatList: true,
collapsed: true,
hideFileCount: true,
details: Object.fromEntries(
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/amazonq/webview/ui/tabs/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const commonTabData: TabTypeData = {
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.`,
You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.`,
contextCommands: [workspaceCommand],
}

Expand Down
25 changes: 9 additions & 16 deletions packages/core/src/codewhispererChat/controllers/chat/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -424,43 +424,36 @@ export class ChatController {
commands: [
...workspaceCommand.commands,
{
command: 'folder',
command: i18n('AWS.amazonq.context.folders.title'),
children: [
{
groupName: 'Folders',
groupName: i18n('AWS.amazonq.context.folders.title'),
commands: [],
},
],
description: 'All files within a specific folder',
description: i18n('AWS.amazonq.context.folders.description'),
icon: 'folder' as MynahIconsType,
},
{
command: 'file',
command: i18n('AWS.amazonq.context.files.title'),
children: [
{
groupName: 'Files',
groupName: i18n('AWS.amazonq.context.files.title'),
commands: [],
},
],
description: 'File',
description: i18n('AWS.amazonq.context.files.description'),
icon: 'file' as MynahIconsType,
},
{
command: 'prompts',
command: i18n('AWS.amazonq.context.prompts.title'),
children: [
{
groupName: 'Prompts',
actions: [
{
id: createSavedPromptCommandId,
icon: 'plus',
description: i18n('AWS.amazonq.savedPrompts.action'),
},
],
groupName: i18n('AWS.amazonq.context.prompts.title'),
commands: [],
},
],
description: 'Prompts',
description: i18n('AWS.amazonq.context.prompts.description'),
icon: 'magic' as MynahIconsType,
},
],
Expand Down