Merge master into feature/agentic-chat

package.json

@@ -33,7 +33,7 @@
         "newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
         "createRelease": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
         "lint": "npm run lint -w packages/ --if-present",
-        "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",
+        "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",
         "clean": "npm run clean -w packages/ -w plugins/",
         "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",

packages/amazonq/.changes/1.54.0.json

@@ -0,0 +1,38 @@
+{
+	"date": "2025-04-03",
+	"version": "1.54.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: `@prompts` not added to context"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: View and search chat history"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker Unified Studio: Disable Sign out"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker Unified Studio: Update Q Chat Introduction message"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: automatically generate fix without clicking Generate Fix button"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Automatically persist chats between IDE sessions"
+		},
+		{
+			"type": "Feature",
+			"description": "Save user command execution logs to plugin output."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside"
+		}
+	]
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.54.0 2025-04-03
+
+- **Bug Fix** Amazon Q chat: `@prompts` not added to context
+- **Feature** Amazon Q chat: View and search chat history
+- **Feature** SageMaker Unified Studio: Disable Sign out
+- **Feature** SageMaker Unified Studio: Update Q Chat Introduction message
+- **Feature** /review: automatically generate fix without clicking Generate Fix button
+- **Feature** Amazon Q chat: Automatically persist chats between IDE sessions
+- **Feature** Save user command execution logs to plugin output.
+- **Feature** Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside
+
 ## 1.53.0 2025-03-28
 
 - **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

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.54.0-SNAPSHOT",
+    "version": "1.55.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

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

@@ -181,7 +181,7 @@ describe('Amazon Q Code Review', function () {
                 await validateInitialChatMessage()
             })
 
-            it('/review file gives correct critical and high security issues', async () => {
+            it.skip('/review file gives correct critical and high security issues', async () => {
                 const document = await vscode.workspace.openTextDocument(filePath)
                 await vscode.window.showTextDocument(document)
 

packages/core/package.json

@@ -455,6 +455,7 @@
         "@types/js-yaml": "^4.0.5",
         "@types/jsdom": "^21.1.6",
         "@types/lodash": "^4.14.180",
+        "@types/lokijs": "^1.5.14",
         "@types/markdown-it": "^13.0.2",
         "@types/mime-types": "^2.1.4",
         "@types/mocha": "^10.0.6",
@@ -556,6 +557,7 @@
         "js-yaml": "^4.1.0",
         "jsonc-parser": "^3.2.0",
         "lodash": "^4.17.21",
+        "lokijs": "^1.5.12",
         "markdown-it": "^13.0.2",
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",