aws · aws-toolkit-automation · Mar 12, 2026 · Mar 19, 2026 · Mar 19, 2026 · Mar 20, 2026
@@ -0,0 +1,4 @@
+{
+  "type": "Bug Fix",
+  "description": "CodeCatalyst: Dev Environment connection token stored with insecure file permissions"
+}
@@ -0,0 +1,4 @@
+{
+    "type": "Removal",
+    "description": "No longer prompts users to install Amazon Q on startup"
+}
@@ -0,0 +1,4 @@
+{
+  "type": "bugfix",
+  "description": "Display AWS error message when importing CloudFormation resource state fails. Currently users only see 'Failed to import * resource(s)'."
+}
@@ -0,0 +1,4 @@
+{
+  "type": "Bug Fix",
+  "description": "Redshift SQL Notebook: Query results with HTML special characters in column names or cell values are now displayed safely instead of being interpreted as HTML."
+}
@@ -0,0 +1,4 @@
+{
+  "type": "Feature",
+  "description": "HyperPod: Supporting reconnection for hyperpod spaces connected through deeplink."
+}
@@ -0,0 +1,4 @@
+{
+  "type": "Feature",
+  "description": "HyperPod: Send correct IDE type (vscode-remote, cursor-remote, kiro-remote) when creating workspace connections, enabling proper multi-IDE support."
+}
@@ -1,5 +1,8 @@
-* @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
-packages/core/src/awsService/cloudformation/ @aws/cfn-dev-productivity
+packages/core/src/awsService/cloudformation/ @aws-cloudformation/cfn-dev-productivity
+packages/core/src/awsService/sagemaker/ @aws/sagemaker-code-editor
+packages/core/resources/sagemaker_connect* @aws/sagemaker-code-editor
+packages/core/resources/hyperpod_connect* @aws/sagemaker-code-editor
@@ -126,7 +126,7 @@ jobs:
             matrix:
                 node-version: [18.x]
                 vscode-version: [minimum, stable, insiders]
-                package: [amazonq, toolkit]
+                package: [toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
@@ -188,12 +188,28 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, macos-latest, windows-latest]
-                node-version: [18.x]
-                vscode-version: [stable]
+                # Windows runs on Node 20.x because the node-gyp@12 workaround below
+                # (needed for Visual Studio 2026) requires Node >= 20.17; ubuntu/macos
+                # stay on 18.x. See the node-gyp step below.
+                include:
+                    - os: ubuntu-latest
+                      node-version: 18.x
+                      vscode-version: stable
+                    - os: macos-latest
+                      node-version: 18.x
+                      vscode-version: stable
+                      test-user-dir: '/tmp/.vscode-test/user-data/'
+                    - os: windows-latest
+                      node-version: 20.x
+                      vscode-version: stable
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
+            # Keep the VS Code user-data-dir path short on the POSIX runners. The default
+            # path under the checkout dir exceeds the Unix-domain-socket path limit (~103
+            # on macOS), so VS Code fails to launch with "listen EINVAL".
+            # Honored by launchTestUtilities.ts (adds --user-data-dir); empty = unset.
+            AWS_TOOLKIT_TEST_USER_DIR: ${{ matrix.test-user-dir }}
         steps:
             - uses: actions/checkout@v4
             - name: Use Node.js ${{ matrix.node-version }}
@@ -203,6 +219,31 @@ jobs:
             - name: Setup CloudFormation LSP
               shell: bash
               run: bash packages/core/src/testE2E/cloudformation/setup-local-lsp.sh
+            # registry-js (a native dependency) builds via `prebuild-install ||
+            # node-gyp rebuild`. npm's bundled node-gyp (v10/11) cannot detect Visual
+            # Studio 2026 (version major 18 -> toolset v145); support landed in
+            # node-gyp 12.1.0, and the PowerShell VS-detection maxBuffer crash was
+            # fixed in 12.3.0 (Add-Type -IgnoreWarnings). npm_config_node_gyp is NOT
+            # honored for a package's own install script, and `npm install` inside
+            # npm's own dir fails (npm's internal deps aren't public), so install
+            # node-gyp@12 in isolation (nested deps = self-contained) and drop it onto
+            # the path npm resolves for native builds. node-gyp >= 12 needs Node >=
+            # 20.17 (hence Node 20.x above). Remove once npm bundles node-gyp >= 12.1.0.
+            - name: Replace npm's bundled node-gyp with v12 (Visual Studio 2026 support)
+              if: runner.os == 'Windows'
+              shell: bash
+              run: |
+                  set -eo pipefail
+                  WORK=/tmp/ng12
+                  rm -rf "$WORK"; mkdir -p "$WORK"
+                  ( cd "$WORK" && npm install node-gyp@12 --no-save --no-audit --no-fund --install-strategy=nested )
+                  NPM_DIR="$(dirname "$(command -v node)")/node_modules/npm"
+                  echo "Bundled npm dir: $NPM_DIR"
+                  test -d "$NPM_DIR/node_modules/node-gyp"
+                  rm -rf "$NPM_DIR/node_modules/node-gyp"
+                  cp -r "$WORK/node_modules/node-gyp" "$NPM_DIR/node_modules/node-gyp"
+                  echo "node-gyp version now in use:"
+                  node "$NPM_DIR/node_modules/node-gyp/bin/node-gyp.js" --version
             - run: npm ci
             - name: Run CloudFormation E2E Tests (Unix)
               if: runner.os != 'Windows'
@@ -249,9 +290,12 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                node-version: [18.x]
+                # node-gyp >= 12.1.0 is required to detect Visual Studio 2026, but
+                # node-gyp >= 12 requires Node >= 20.17, so this job runs on Node 20.x
+                # (the rest of the matrix stays on 18.x). See the node-gyp step below.
+                node-version: [20.x]
                 vscode-version: [stable, insiders]
-                package: [amazonq, toolkit]
+                package: [toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
@@ -261,6 +305,30 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: ${{ matrix.node-version }}
+            # registry-js (a native dependency) builds via `prebuild-install ||
+            # node-gyp rebuild`. npm's bundled node-gyp (v10/11) cannot detect Visual
+            # Studio 2026 (version major 18 -> toolset v145); support landed in
+            # node-gyp 12.1.0, and the PowerShell VS-detection maxBuffer crash was
+            # fixed in 12.3.0 (Add-Type -IgnoreWarnings). npm_config_node_gyp is NOT
+            # honored for a package's own install script, and `npm install` inside
+            # npm's own dir fails (npm's internal deps aren't public), so install
+            # node-gyp@12 in isolation (nested deps = self-contained) and drop it onto
+            # the path npm resolves for native builds. node-gyp >= 12 needs Node >=
+            # 20.17 (hence Node 20.x above). Remove once npm bundles node-gyp >= 12.1.0.
+            - name: Replace npm's bundled node-gyp with v12 (Visual Studio 2026 support)
+              shell: bash
+              run: |
+                  set -eo pipefail
+                  WORK=/tmp/ng12
+                  rm -rf "$WORK"; mkdir -p "$WORK"
+                  ( cd "$WORK" && npm install node-gyp@12 --no-save --no-audit --no-fund --install-strategy=nested )
+                  NPM_DIR="$(dirname "$(command -v node)")/node_modules/npm"
+                  echo "Bundled npm dir: $NPM_DIR"
+                  test -d "$NPM_DIR/node_modules/node-gyp"
+                  rm -rf "$NPM_DIR/node_modules/node-gyp"
+                  cp -r "$WORK/node_modules/node-gyp" "$NPM_DIR/node_modules/node-gyp"
+                  echo "node-gyp version now in use:"
+                  node "$NPM_DIR/node_modules/node-gyp/bin/node-gyp.js" --version
             - run: npm ci
             - name: Tests
               run: npm run test -w packages/${{ matrix.package }}

@@ -25,9 +25,7 @@ jobs:
             feature: ${{ steps.build.outputs.feature }}
             tagname: ${{ steps.build.outputs.tagname }}
             toolkit_version: ${{ steps.build.outputs.toolkit_version }}
-            amazonq_version: ${{ steps.build.outputs.amazonq_version }}
             toolkit_changes: ${{ steps.build.outputs.toolkit_changes }}
-            amazonq_changes: ${{ steps.build.outputs.amazonq_changes }}
         steps:
             - uses: actions/checkout@v4
               with:
@@ -57,9 +55,10 @@ jobs:
             - run: npm ci
             - name: vsix
               run: |
-                  npm run createRelease -w packages/toolkit -w packages/amazonq  # Generate CHANGELOG.md
+                  npm run createRelease -w packages/toolkit  # 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
@@ -80,7 +79,6 @@ jobs:
                   echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
                   echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
                   write_package_info toolkit
-                  write_package_info amazonq
 
     publish:
         needs: [package]
@@ -94,13 +92,11 @@ jobs:
             FEAT_NAME: ${{ needs.package.outputs.feature }}
             TAG_NAME: ${{ needs.package.outputs.tagname }}
             AWS_TOOLKIT_VERSION: ${{ needs.package.outputs.toolkit_version }}
-            AMAZON_Q_VERSION: ${{ needs.package.outputs.amazonq_version }}
             #
             # Used in release_notes.md
             #
             BRANCH: ${{ github.ref_name }}
             AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.toolkit_changes }}
-            AMAZON_Q_CHANGES: ${{ needs.package.outputs.amazonq_changes }}
         permissions:
             contents: write
         steps:

@@ -3,7 +3,6 @@ This is an **unsupported preview build** of the `${BRANCH}` branch of AWS IDE Ex
 # Install
 
 1. Download the vsix file(s) from "Assets" below.
-    - Amazon Q $AMAZON_Q_VERSION is provided by `amazon-q-vscode….vsix`
     - AWS Toolkit $AWS_TOOLKIT_VERSION is provided by `aws-toolkit-vscode….vsix`
 2. Run `Extensions: Install from VSIX...` from the VSCode [command palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette) and choose the vsix file(s).
 
@@ -16,4 +15,3 @@ ${AMAZON_Q_CHANGES}
 ## Previous changes
 
 -   [AWS Toolkit changelog](/packages/toolkit/CHANGELOG.md)
--   [Amazon Q changelog](/packages/amazonq/CHANGELOG.md)
@@ -45,8 +45,6 @@ packages/*/LICENSE
 packages/*/NOTICE
 packages/toolkit/package.nls.json
 packages/toolkit/resources
-packages/amazonq/package.nls.json
-packages/amazonq/resources
 
 # Icons
 packages/*/resources/fonts/aws-toolkit-icons.woff

@@ -230,7 +230,7 @@ more options.
 
 ### Coverage report
 
-You can find the coverage report at `./coverage/amazonq/lcov-report/index.html` and `./coverage/toolkit/lcov-report/index.html` after running the tests. Tests ran from the workspace launch config won't generate a coverage report automatically because it can break file watching.
+You can find the coverage report at `./coverage/toolkit/lcov-report/index.html` after running the tests. Tests ran from the workspace launch config won't generate a coverage report automatically because it can break file watching.
 
 ### CodeCatalyst Blueprints
 

@@ -5,19 +5,6 @@
 This project is open source. We encourage issues, feature requests, code reviews, pull requests or
 any positive contribution. See [CONTRIBUTING.md](CONTRIBUTING.md) to get started.
 
-### Amazon Q
-
-[![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.amazon-q-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.amazon-q-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode)
-
-Amazon Q for VS Code is a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode) for connecting your IDE to [Amazon Q](https://aws.amazon.com/q/developer/) and leveraging generative AI to accelerate your software development.
-
--   Code faster with inline code suggestions as you type
--   Chat with [Amazon Q](https://aws.amazon.com/q/developer/) to generate code, explain code, and get answers to questions about software development
--   Analyze and fix security vulnerabilities in your project
--   Upgrade your Java applications
-
-[Project Directory](https://github.com/aws/aws-toolkit-vscode/tree/master/packages/amazonq)
-
 ### AWS Toolkit
 
 [![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.aws-toolkit-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.aws-toolkit-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode)
@@ -30,7 +17,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 +29,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)

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

@@ -43,7 +43,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/toolkit/lcov.info
         finally:
             - rm -rf ~/.aws/sso/cache || true
 reports:

@@ -96,7 +96,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/toolkit/lcov.info
     post_build:
         commands:
             # Destroy .netrc to avoid leaking $GITHUB_READONLY_TOKEN.

@@ -48,7 +48,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/toolkit/lcov.info || true
 
 reports:
     unit-test:

@@ -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:

@@ -31,7 +31,6 @@ coverage:
                 paths:
                     - 'packages/core/src/codewhisperer/'
                     - 'packages/core/src/amazonq*/*'
-                    - 'packages/amazonq/src/'
                 flags:
                     - 'codewhisperer'
                 target: 80
@@ -104,7 +103,6 @@ flags:
         paths:
             - 'packages/core/src/codewhisperer/'
             - 'packages/core/src/amazonq*/*'
-            - 'packages/amazonq/src/'
     amazonqFeatureDev:
         paths:
             - 'packages/core/src/amazonqFeatureDev/'
@@ -20,7 +20,6 @@ If you must define a new key (is it _really_ necessary?), follow these guideline
 -   Choose a prefix as follows (as [recommended](https://code.visualstudio.com/api/extension-guides/command#using-a-custom-when-clause-context)):
     -   `packages/core/` should use `aws.` prefix
     -   `packages/toolkit/` should use `aws.toolkit.` prefix
-    -   `packages/amazonq/` should use `amazonq.` prefix
 -   Use brevity. Less is more.
 -   Document it in the list below.
 
@@ -45,10 +44,6 @@ toolkit/ or amazonq/ if appropriate.
 
 -   TODO
 
-#### setContext keys owned by packages/amazonq/
-
--   TODO
-
 ## How our components communicate
 
 TODO: vscode events; the "globals" module; activate(); EventEmitters; ...?