Merge master into feature/ui-e2e-tests

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @aws/aws-ides-team
+* @aws/aws-toolkits-team
 packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
 packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

.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

README.md

@@ -30,7 +30,7 @@ AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemde
 -   Connect VSCode to your EC2 instances
 -   Connect to your [CodeCatalyst](https://codecatalyst.aws/) Dev Environments
 -   Debug your Lambda functions using [SAM CLI](https://github.com/aws/aws-sam-cli)
--   Check and autocomplete code in SAM/CFN (CloudFormation) `template.yaml` files
+-   Author, validate, and deploy CloudFormation templates with the [CloudFormation Language Server](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/ide-extension.html)
 -   `Open Terminal` on your EC2 instances or ECS tasks
 -   `Search Log Group` on your CloudWatch logs
 -   Browse your AWS resources
@@ -42,6 +42,7 @@ AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemde
 -   Quick Start Guides for...
     -   [Amazon Q](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.amazon-q-vscode)
     -   [AWS Toolkit](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode)
+        -   [AWS CloudFormation Language Server](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/ide-extension.html)
 -   [FAQ / Troubleshooting](./docs/faq-credentials.md)
 -   [User Guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome)
 -   General info about [AWS SDKs and Tools](https://docs.aws.amazon.com/sdkref/latest/guide/overview.html)

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.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,11 @@
+## 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

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.111.0-SNAPSHOT",
+    "version": "1.113.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

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/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/core/package.nls.json

@@ -88,7 +88,7 @@
     "AWS.configuration.description.awssam.debug.snippets.api.label.cn": "Amazon SAM: API Gateway lambda invoke",
     "AWS.configuration.description.awssam.debug.snippets.api.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template, simulating API Gateway",
     "AWS.configuration.description.amazonq": "Amazon Q creates a code reference when you insert a code suggestion from Amazon Q that is similar to training data. When unchecked, Amazon Q will not show code suggestions that have code references. If you authenticate through IAM Identity Center, this setting is controlled by your Amazon Q administrator. [Learn More](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-reference.html)",
-    "AWS.configuration.description.amazonq.shareContentWithAWS": "When checked, your content processed by Amazon Q may be used for service improvement (except for content processed for users with the Amazon Q Developer Pro Tier). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the Amazon Q service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more details.",
+    "AWS.configuration.description.amazonq.shareContentWithAWS": "When checked, your content processed by Amazon Q may be used for service improvement (except for content processed for users with the Amazon Q Developer Pro Tier and Amazon Q in SageMaker). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the Amazon Q service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more details.",
     "AWS.configuration.description.amazonq.importRecommendation": "Amazon Q will add import statements with inline code suggestions when necessary.",
     "AWS.configuration.description.amazonq.workspaceIndex": "When you add @workspace to your question in Amazon Q chat, Amazon Q will index your workspace files locally to use as context for its response. Extra CPU usage is expected while indexing a workspace. This will not impact Amazon Q features or your IDE, but you may manage CPU usage by setting the number of local threads in 'Local Workspace Index Threads'.",
     "AWS.configuration.description.amazonq.workspaceIndexWorkerThreads": "Number of worker threads of Amazon Q local index process. '0' will use the system default worker threads for balance performance. You may increase this number to more quickly index your workspace, but only up to your hardware's number of CPU cores. Please restart VS Code or reload the VS Code window after changing worker threads.",