Merge master into feature/q-region-expansion

Author: justinmk3

CONTRIBUTING.md

@@ -439,6 +439,7 @@ Example:
     "supportedVersions": "4.0.0",
     "id": "AmazonQ",
     "path": "/custom/path/to/local/lsp/folder",
+    "ui": "/custom/path/to/chat-client/ui"
 }
 ```
 
@@ -503,11 +504,12 @@ Unlike the user setting overrides, not all of these environment variables have t
 -   `__AMAZONQLSP_MANIFEST_URL`: for aws.dev.amazonqLsp.manifestUrl
 -   `__AMAZONQLSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqLsp.supportedVersions
 -   `__AMAZONQLSP_ID`: for aws.dev.amazonqLsp.id
--   `__AMAZONQLSP_PATH`: for aws.dev.amazonqWorkspaceLsp.locationOverride
+-   `__AMAZONQLSP_PATH`: for aws.dev.amazonqLsp.path
+-   `__AMAZONQLSP_UI`: for aws.dev.amazonqLsp.ui
 -   `__AMAZONQWORKSPACELSP_MANIFEST_URL`: for aws.dev.amazonqWorkspaceLsp.manifestUrl
 -   `__AMAZONQWORKSPACELSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqWorkspaceLsp.supportedVersions
 -   `__AMAZONQWORKSPACELSP_ID`: for aws.dev.amazonqWorkspaceLsp.id
--   `__AMAZONQWORKSPACELSP_PATH`: for aws.dev.amazonqWorkspaceLsp.locationOverride
+-   `__AMAZONQWORKSPACELSP_PATH`: for aws.dev.amazonqWorkspaceLsp.path
 
 #### Lambda
 

docs/lsp.md

@@ -45,8 +45,17 @@ sequenceDiagram
     npm run package
     ```
     to get the project setup
-3. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
-4. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+3. Enable the lsp experiment:
+    ```
+    "aws.experiments": {
+      "amazonqLSP": true,
+      "amazonqLSPInline": true, // optional: enables inline completion from flare
+      "amazonqLSPChat": true // optional: enables chat from flare
+    }
+    ```
+4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
+    1. Uncomment the `__AMAZONQLSP_UI` variable in `amazonq/.vscode/launch.json` Extension configuration if you want to debug the flare chat-client as well
+5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
 
 ## Amazon Q Inline Activation
 

package-lock.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",

package.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/.changes/1.54.0.json

@@ -15,6 +15,7 @@
                 "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
                 "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
                 // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/token-standalone.js",
+                // "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
             },
             "envFile": "${workspaceFolder}/.local.env",
             "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],

packages/amazonq/.vscode/launch.json

@@ -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/CHANGELOG.md

@@ -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"
     ],
@@ -119,6 +119,14 @@
                         "ssoCacheError": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWorkspaceLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -356,7 +364,7 @@
                 },
                 {
                     "command": "aws.amazonq.signout",
-                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
                     "group": "2_amazonQ@4"
                 },
                 {
@@ -638,7 +646,7 @@
                 "title": "%AWS.command.codewhisperer.signout%",
                 "category": "%AWS.amazonq.title%",
                 "icon": "$(debug-disconnect)",
-                "enablement": "aws.codewhisperer.connected"
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio"
             },
             {
                 "command": "aws.amazonq.learnMore",

packages/amazonq/package.json

@@ -29,6 +29,7 @@ import {
     ReferenceHoverProvider,
     ReferenceInlineProvider,
     ReferenceLogViewProvider,
+    ImportAdderProvider,
 } from 'aws-core-vscode/codewhisperer'
 
 export class InlineCompletionManager implements Disposable {
@@ -66,6 +67,7 @@ export class InlineCompletionManager implements Disposable {
             item: InlineCompletionItemWithReferences,
             editor: TextEditor,
             requestStartTime: number,
+            startLine: number,
             firstCompletionDisplayLatency?: number
         ) => {
             // TODO: also log the seen state for other suggestions in session
@@ -96,6 +98,9 @@ export class InlineCompletionManager implements Disposable {
                 ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
                 ReferenceHoverProvider.instance.addCodeReferences(item.insertText as string, item.references)
             }
+            if (item.mostRelevantMissingImports?.length) {
+                await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
+            }
         }
         commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)
 
@@ -200,6 +205,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                     item,
                     editor,
                     session.requestStartTime,
+                    position.line,
                     session.firstCompletionDisplayLatency,
                 ],
             }
@@ -208,6 +214,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 item.insertText as string,
                 item.references
             )
+            ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
         }
         return items as InlineCompletionItem[]
     }

packages/amazonq/src/app/inline/completion.ts

@@ -32,6 +32,7 @@ import {
     setupUninstallHandler,
     maybeShowMinVscodeWarning,
     Experiments,
+    isSageMaker,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -120,7 +121,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     await activateCodeWhisperer(extContext as ExtContext)
     if (Experiments.instance.get('amazonqLSP', false)) {
         await activateAmazonqLsp(context)
-    } else {
+    }
+
+    if (!Experiments.instance.get('amazonqLSPInline', false)) {
         await activateInlineCompletion()
     }
 
@@ -144,6 +147,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     // Hide the Amazon Q tree in toolkit explorer
     await setContext('aws.toolkit.amazonq.dismissed', true)
 
+    // set context var to check if its SageMaker Unified Studio or not
+    await setContext('aws.isSageMakerUnifiedStudio', isSageMaker('SMUS'))
+
     // reload webviews
     await vscode.commands.executeCommand('workbench.action.webview.reloadWebviewAction')
 
@@ -157,7 +163,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
 
     context.subscriptions.push(
         Experiments.instance.onDidChange(async (event) => {
-            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP') {
+            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP' || event.key === 'amazonqLSPInline') {
                 await vscode.window
                     .showInformationMessage(
                         'Amazon Q LSP setting has changed. Reload VS Code for the changes to take effect.',