Merge master into feature/qOnly

.changes/next-release/tenant-id-local-invoke.json

@@ -0,0 +1,4 @@
+{
+    "type": "Feature",
+    "description": "Add conditional Tenant ID field to Local Invoke panel for multi-tenant Lambda functions. The field appears when SAM template contains TenancyConfig and passes the value to SAM CLI as --tenant-id argument."
+}

.changes/next-release/tenant-id-remote-invoke.json

@@ -0,0 +1,4 @@
+{
+    "type": "Feature",
+    "description": "Add conditional Tenant ID field to Remote Invoke panel for multi-tenant Lambda functions. The field appears when function has TenancyConfig and passes the value to AWS Lambda Invoke API."
+}

.github/workflows/release.yml

@@ -58,8 +58,10 @@ jobs:
             - name: vsix
               run: |
                   npm run createRelease -w packages/toolkit -w packages/amazonq  # Generate CHANGELOG.md
+                  npm run -w packages/sagemaker-ssh-kiro package  # Must be built before toolkit (toolkit embeds it)
                   npm run -w packages/toolkit package -- --feature "$FEAT_NAME"
                   npm run -w packages/amazonq package -- --feature "$FEAT_NAME"
+                  rm -f sagemaker-ssh-kiro-*.vsix  # Remove standalone VSIX; it's already embedded inside toolkit VSIX
             - uses: actions/upload-artifact@v4
               with:
                   name: artifacts

.gitignore

@@ -47,6 +47,7 @@ packages/toolkit/package.nls.json
 packages/toolkit/resources
 packages/amazonq/package.nls.json
 packages/amazonq/resources
+packages/sagemaker-ssh-kiro/resources
 
 # Icons
 packages/*/resources/fonts/aws-toolkit-icons.woff

aws-toolkit-vscode.code-workspace

@@ -12,6 +12,9 @@
         {
             "path": "packages/amazonq",
         },
+        {
+            "path": "packages/sagemaker-ssh-kiro",
+        },
     ],
     "settings": {
         "typescript.tsdk": "node_modules/typescript/lib",

buildspec/packageTestVsix.yml

@@ -27,7 +27,9 @@ phases:
             - export HOME=/home/codebuild-user
             # Generate CHANGELOG.md
             - npm run createRelease -w packages/toolkit -w packages/amazonq
+            - npm run package -w packages/sagemaker-ssh-kiro # Must be built before toolkit (toolkit embeds it)
             - npm run package -w packages/toolkit -w packages/amazonq
+            - rm -f sagemaker-ssh-kiro-*.vsix # Remove standalone VSIX; it's already embedded inside toolkit VSIX
 
 artifacts:
     files:

package.json

@@ -29,7 +29,7 @@
         "testWeb": "npm run testWeb -w packages/ --if-present",
         "testE2E": "npm run testE2E -w packages/ --if-present",
         "testInteg": "npm run testInteg -w packages/ --if-present",
-        "package": "npm run package -w packages/toolkit -w packages/amazonq",
+        "package": "npm run package -w packages/sagemaker-ssh-kiro && npm run package -w packages/toolkit -w packages/amazonq && rm -f sagemaker-ssh-kiro-*.vsix",
         "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",

packages/amazonq/.changes/1.108.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2026-01-23",
+	"version": "1.108.0",
+	"entries": []
+}

packages/amazonq/.changes/1.109.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2026-01-29",
+	"version": "1.109.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: \"Fix All Issues\" now includes warnings when triggered from a warning diagnostic"
+		}
+	]
+}

packages/amazonq/.changes/1.110.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2026-02-16",
+	"version": "1.110.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix chat history restoration to display rich UI elements and persist user preferences"
+		}
+	]
+}

packages/amazonq/.changes/1.111.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2026-02-26",
+	"version": "1.111.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "fix: inline chat fails to revert to original state after users reject"
+		}
+	]
+}

packages/amazonq/.changes/1.112.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2026-03-06",
+	"version": "1.112.0",
+	"entries": []
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.112.0 2026-03-06
+
+- Miscellaneous non-user-facing changes
+
+## 1.111.0 2026-02-26
+
+- **Bug Fix** fix: inline chat fails to revert to original state after users reject
+
+## 1.110.0 2026-02-16
+
+- **Bug Fix** Amazon Q Chat: Fix chat history restoration to display rich UI elements and persist user preferences
+
+## 1.109.0 2026-01-29
+
+- **Bug Fix** Amazon Q: "Fix All Issues" now includes warnings when triggered from a warning diagnostic
+
+## 1.108.0 2026-01-23
+
+- Miscellaneous non-user-facing changes
+
 ## 1.107.0 2026-01-08
 
 - Miscellaneous non-user-facing changes

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.108.0-SNAPSHOT",
+    "version": "1.113.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -148,11 +148,6 @@
                     "markdownDescription": "%AWS.configuration.description.amazonq%",
                     "default": true
                 },
-                "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {
-                    "markdownDescription": "%AWS.configuration.description.featureDevelopment.allowRunningCodeAndTests%",
-                    "type": "object",
-                    "default": {}
-                },
                 "amazonQ.importRecommendationForInlineCodeSuggestions": {
                     "type": "boolean",
                     "description": "%AWS.configuration.description.amazonq.importRecommendation%",

packages/amazonq/src/inlineChat/controller/inlineChatController.ts

@@ -117,12 +117,14 @@ export class InlineChatController {
                 this.task
             )
         }
-        const insertions = task.diff.filter((diff) => diff.type === 'insertion')
+        // Revert to the original document text
+        const fullRange = new vscode.Range(
+            task.document.positionAt(0),
+            task.document.positionAt(task.document.getText().length)
+        )
         await editor.edit(
             (editBuilder) => {
-                for (const insertion of insertions) {
-                    editBuilder.delete(insertion.range)
-                }
+                editBuilder.replace(fullRange, task.originalDocumentText)
             },
             { undoStopAfter: false, undoStopBefore: false }
         )

packages/amazonq/src/inlineChat/controller/inlineTask.ts

@@ -47,6 +47,8 @@ export class InlineTask {
     public selectedText: string
     public languageName: string | undefined
 
+    public readonly originalDocumentText: string
+
     public partialSelectedText: string | undefined
     public partialSelectedTextRight: string | undefined
 
@@ -67,6 +69,7 @@ export class InlineTask {
     ) {
         this.selectedRange = textDocumentUtil.expandSelectionToFullLines(document, selection)
         this.selectedText = document.getText(this.selectedRange)
+        this.originalDocumentText = document.getText()
         this.languageName = extractLanguageNameFromFile(document)
     }
 

packages/amazonq/src/lsp/chat/autoDebug/codeActionsProvider.ts

@@ -53,8 +53,16 @@ export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider,
             // Add "Fix with Amazon Q" action
             actions.push(this.createFixWithQAction(document, range, diagnostics))
 
-            // Add "Fix All with Amazon Q" action
-            actions.push(this.createFixAllWithQAction(document))
+            // Check if any diagnostic is error or warning to show "Fix All Issues"
+            const hasErrorOrWarning = diagnostics.some(
+                (d) =>
+                    d.severity === vscode.DiagnosticSeverity.Error || d.severity === vscode.DiagnosticSeverity.Warning
+            )
+            if (hasErrorOrWarning) {
+                // If triggered from warning, include warnings; if from error, only errors
+                const hasWarning = diagnostics.some((d) => d.severity === vscode.DiagnosticSeverity.Warning)
+                actions.push(this.createFixAllWithQAction(document, hasWarning))
+            }
 
             // Add "Explain Problem" action
             actions.push(this.createExplainProblemAction(document, range, diagnostics))
@@ -84,12 +92,13 @@ export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider,
         return action
     }
 
-    private createFixAllWithQAction(document: vscode.TextDocument): vscode.CodeAction {
-        const action = new vscode.CodeAction('Amazon Q: Fix All Errors', vscode.CodeActionKind.QuickFix)
+    private createFixAllWithQAction(document: vscode.TextDocument, includeWarnings: boolean): vscode.CodeAction {
+        const action = new vscode.CodeAction('Amazon Q: Fix All Issues', vscode.CodeActionKind.QuickFix)
 
         action.command = {
             command: 'amazonq.02.fixAllWithQ',
-            title: 'Amazon Q: Fix All Errors',
+            title: 'Amazon Q: Fix All Issues',
+            arguments: [includeWarnings],
         }
 
         return action

packages/amazonq/src/lsp/chat/autoDebug/commands.ts

@@ -38,10 +38,10 @@ export class AutoDebugCommands implements vscode.Disposable {
             Commands.register(
                 {
                     id: 'amazonq.02.fixAllWithQ',
-                    name: 'Amazon Q: Fix All Errors',
+                    name: 'Amazon Q: Fix All Issues',
                 },
-                async () => {
-                    await this.fixAllWithAmazonQ()
+                async (includeWarnings?: boolean) => {
+                    await this.fixAllWithAmazonQ(includeWarnings)
                 }
             ),
 
@@ -124,9 +124,10 @@ export class AutoDebugCommands implements vscode.Disposable {
     }
 
     /**
-     * Fix All with Amazon Q - processes all errors in the current file
+     * Fix All with Amazon Q - processes issues in the current file
+     * @param includeWarnings - if true, fix errors and warnings; if false, fix only errors
      */
-    private async fixAllWithAmazonQ(): Promise<void> {
+    private async fixAllWithAmazonQ(includeWarnings: boolean = false): Promise<void> {
         autoDebugTelemetry.recordCommandInvocation('fixAllWithQ')
 
         await this.executeWithErrorHandling(
@@ -139,7 +140,7 @@ export class AutoDebugCommands implements vscode.Disposable {
                 if (!saved) {
                     throw new Error('Failed to save document')
                 }
-                const problemCount = await this.controller.fixAllProblemsInFile(10) // 10 errors per batch
+                const problemCount = await this.controller.fixAllProblemsInFile(includeWarnings)
                 autoDebugTelemetry.recordCommandSuccess('fixAllWithQ', problemCount)
             },
             'Fix All with Amazon Q',

packages/amazonq/src/lsp/chat/autoDebug/controller.ts

@@ -75,11 +75,14 @@ export class AutoDebugController implements vscode.Disposable {
     }
 
     /**
-     * Filter diagnostics to only errors and apply source filtering
+     * Filter diagnostics by severity and apply source filtering
      */
-    private filterErrorDiagnostics(diagnostics: vscode.Diagnostic[]): vscode.Diagnostic[] {
+    private filterDiagnostics(diagnostics: vscode.Diagnostic[], includeWarnings: boolean = false): vscode.Diagnostic[] {
         return diagnostics.filter((d) => {
-            if (d.severity !== vscode.DiagnosticSeverity.Error) {
+            // Filter by severity: errors always, warnings only if includeWarnings
+            const isError = d.severity === vscode.DiagnosticSeverity.Error
+            const isWarning = d.severity === vscode.DiagnosticSeverity.Warning
+            if (!isError && !(includeWarnings && isWarning)) {
                 return false
             }
             // Apply source filtering
@@ -108,9 +111,11 @@ export class AutoDebugController implements vscode.Disposable {
     }
 
     /**
-     * Fix with Amazon Q - sends up to 15 error messages one time when user clicks the button
+     * Fix with Amazon Q - sends up to maxProblems issues when user clicks the button
+     * @param includeWarnings - if true, fix both errors and warnings; if false, fix only errors
+     * @param maxProblems - maximum number of problems to fix (default 10)
      */
-    public async fixAllProblemsInFile(maxProblems: number = 15): Promise<number> {
+    public async fixAllProblemsInFile(includeWarnings: boolean = false, maxProblems: number = 10): Promise<number> {
         try {
             const editor = vscode.window.activeTextEditor
             if (!editor) {
@@ -120,13 +125,13 @@ export class AutoDebugController implements vscode.Disposable {
 
             // Get all diagnostics for the current file
             const allDiagnostics = vscode.languages.getDiagnostics(editor.document.uri)
-            const errorDiagnostics = this.filterErrorDiagnostics(allDiagnostics)
-            if (errorDiagnostics.length === 0) {
+            const filteredDiagnostics = this.filterDiagnostics(allDiagnostics, includeWarnings)
+            if (filteredDiagnostics.length === 0) {
                 return 0
             }
 
-            // Take up to maxProblems errors (15 by default)
-            const diagnosticsToFix = errorDiagnostics.slice(0, maxProblems)
+            // Take up to maxProblems
+            const diagnosticsToFix = filteredDiagnostics.slice(0, maxProblems)
             const result = await this.getProblemsFromDiagnostics(undefined, diagnosticsToFix)
             if (!result) {
                 return 0

packages/amazonq/src/lsp/chat/messages.ts

@@ -641,17 +641,20 @@ export function registerMessageListeners(
             params: params,
         })
     })
+
     languageClient.onNotification(
         pinnedContextNotificationType.method,
         (params: ContextCommandParams & { tabId: string; textDocument?: TextDocumentIdentifier }) => {
             const editor = vscode.window.activeTextEditor
             let textDocument = undefined
+            let cursorState = undefined
             if (editor && isTextEditor(editor)) {
-                textDocument = { uri: vscode.workspace.asRelativePath(editor.document.uri) }
+                textDocument = { uri: editor.document.uri.toString() }
+                cursorState = getCursorState(editor.selections)
             }
             void provider.webview?.postMessage({
                 command: pinnedContextNotificationType.method,
-                params: { ...params, textDocument },
+                params: { ...params, textDocument, cursorState },
             })
         }
     )

packages/amazonq/test/e2e/index.ts

@@ -4,10 +4,10 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID.amazonq, [
+    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID_CONSTANTS.amazonq, [
         '../../core/dist/src/testInteg/globalSetup.test.ts',
     ])
 }

packages/amazonq/test/unit/index.ts

@@ -4,10 +4,10 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID.amazonq, [
+    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID_CONSTANTS.amazonq, [
         '../../core/dist/src/test/globalSetup.test.ts',
     ])
 }

packages/amazonq/test/web/testRunner.ts

@@ -7,7 +7,7 @@
  * The following was influenced by this guide: https://code.visualstudio.com/api/extension-guides/web-extensions
  */
 
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 import 'mocha' // Imports mocha for the browser, defining the `mocha` global.
 import * as vscode from 'vscode'
 
@@ -47,12 +47,12 @@ function gatherTestFiles() {
  * So this function ensures the extension has fully activated.
  */
 async function activateExtension() {
-    const extId = VSCODE_EXTENSION_ID.amazonq
+    const extId = VSCODE_EXTENSION_ID_CONSTANTS.amazonq
     const ext = vscode.extensions.getExtension(extId)
     if (!ext) {
         throw new Error(`Extension '${extId}' not found, can't activate it to run tests.`)
     }
-    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.amazonq)?.activate()
+    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID_CONSTANTS.amazonq)?.activate()
 }
 
 function runMochaTests(resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) {