Skip to content

Commit 1ca2650

Browse files
authored
Merge pull request aws#6914 from aws/autoMerge/feature/agentic-chat
Merge master into feature/agentic-chat
2 parents 1667c94 + 738d818 commit 1ca2650

File tree

56 files changed

+1830
-1369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1830
-1369
lines changed

package-lock.json

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
3434
"createRelease": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
3535
"lint": "npm run lint -w packages/ --if-present",
36-
"lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --ignore-pattern '**/resources/js/graphStateMachine.js' --fix --ext .ts packages plugins",
36+
"lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --fix --ext .ts packages plugins",
3737
"clean": "npm run clean -w packages/ -w plugins/",
3838
"reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"date": "2025-04-03",
3+
"version": "1.54.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q chat: `@prompts` not added to context"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Amazon Q chat: View and search chat history"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "SageMaker Unified Studio: Disable Sign out"
16+
},
17+
{
18+
"type": "Feature",
19+
"description": "SageMaker Unified Studio: Update Q Chat Introduction message"
20+
},
21+
{
22+
"type": "Feature",
23+
"description": "/review: automatically generate fix without clicking Generate Fix button"
24+
},
25+
{
26+
"type": "Feature",
27+
"description": "Amazon Q chat: Automatically persist chats between IDE sessions"
28+
},
29+
{
30+
"type": "Feature",
31+
"description": "Save user command execution logs to plugin output."
32+
},
33+
{
34+
"type": "Feature",
35+
"description": "Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside"
36+
}
37+
]
38+
}

packages/amazonq/.changes/next-release/Bug Fix-ccbc5e50-0a90-4340-b6d5-e57537949898.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Feature-390d2096-ea1e-43b9-a889-2494d6e9e6d3.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Feature-3c42f632-46b8-4e59-b5fa-75d638f3f08d.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Feature-e5ed7aac-542d-41ee-8abe-d32db5de73ae.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.54.0 2025-04-03
2+
3+
- **Bug Fix** Amazon Q chat: `@prompts` not added to context
4+
- **Feature** Amazon Q chat: View and search chat history
5+
- **Feature** SageMaker Unified Studio: Disable Sign out
6+
- **Feature** SageMaker Unified Studio: Update Q Chat Introduction message
7+
- **Feature** /review: automatically generate fix without clicking Generate Fix button
8+
- **Feature** Amazon Q chat: Automatically persist chats between IDE sessions
9+
- **Feature** Save user command execution logs to plugin output.
10+
- **Feature** Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside
11+
112
## 1.53.0 2025-03-28
213

314
- **Bug Fix** Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error

packages/amazonq/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.54.0-SNAPSHOT",
5+
"version": "1.55.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/amazonq/test/e2e/amazonq/review.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ describe('Amazon Q Code Review', function () {
181181
await validateInitialChatMessage()
182182
})
183183

184-
it('/review file gives correct critical and high security issues', async () => {
184+
it.skip('/review file gives correct critical and high security issues', async () => {
185185
const document = await vscode.workspace.openTextDocument(filePath)
186186
await vscode.window.showTextDocument(document)
187187

0 commit comments

Comments
 (0)