Merge main into feature/disable-sspc

.changes/3.103.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2026-02-12",
+  "version" : "3.103",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q Chat: Fix chat history restoration to display rich UI elements and persist user preferences"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix LSP server startup failure when Node.js runtime path is configured as a directory instead of the executable path"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix race condition causing \"Can't remove document listener\" error during LSP restart"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2025.2 and for IDEs based on the 2024.3 platform"
+  } ]
+}

.changes/3.104.json

@@ -0,0 +1,5 @@
+{
+  "date" : "2026-02-27",
+  "version" : "3.104",
+  "entries" : [ ]
+}

.changes/3.105.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2026-03-06",
+  "version" : "3.105",
+  "entries" : [ {
+    "type" : "removal",
+    "description" : "Removed support for 2024.3.x IDEs and Gateway 2025.2"
+  } ]
+}

.changes/3.106.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2026-03-13",
+  "version" : "3.106",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Added support for validating and deploying CloudFormation templates to new or existing stacks"
+  }, {
+    "type" : "feature",
+    "description" : "Added intelligent authoring support for CloudFormation templates."
+  }, {
+    "type" : "feature",
+    "description" : "Added support for viewing CloudFormation stack details such as resources and events"
+  } ]
+}

.changes/3.107.json

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

.changes/3.108.json

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

.changes/4.0.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2026-04-10",
+  "version" : "4.0",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Removed dependency on the AWS Core plugin. AWS Toolkit no longer requires AWS Core to be installed."
+  } ]
+}

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @aws/aws-ides-team
+* @aws/aws-toolkits-team
 
 chat/ @aws/codewhisperer-team
 codemodernizer/ @aws/elastic-gumby

.github/workflows/cfn-lsp-integ.yml

@@ -0,0 +1,36 @@
+name: CloudFormation LSP Integration Test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main, feature/* ]
+    paths:
+      - '.github/workflows/cfn-lsp-integ.yml'
+      - 'plugins/toolkit/jetbrains-core/src*/**/cfnlsp/**'
+      - 'plugins/toolkit/jetbrains-core/it-253+/**/cfnlsp/**'
+
+jobs:
+  build:
+    name: ${{ matrix.os }}
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - name: Support longpaths
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: git config --system core.longpaths true
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run CloudFormation LSP Integration Tests
+        run: ./gradlew :plugin-toolkit:jetbrains-core:integrationTest --info --full-stacktrace --console plain --tests "software.aws.toolkits.jetbrains.services.cfnlsp.CfnLspIntegrationTest"

.github/workflows/generateUpdatesXml.py

@@ -21,12 +21,7 @@
     versionRegex = r'.*?\-(\d.*[.-]\d{3})\.zip$'
     for asset in data['assets']:
         name = asset['name']
-        if ('plugin-amazonq' in name):
-            plugin = 'amazon.q'
-        elif ('plugin-core' in name):
-            plugin = 'aws.toolkit.core'
-        else:
-            plugin = 'aws.toolkit'
+        plugin = 'aws.toolkit'
         build = re.match(buildRegex, name)
         if build == None:
             continue

.github/workflows/mac.yml

@@ -16,11 +16,13 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 21
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
-        java-version: 21
+        distribution: 'corretto'
+        java-version: '21'
+        cache: 'gradle'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

.github/workflows/prerelease.yml

@@ -17,8 +17,8 @@ jobs:
   generate_artifact:
     strategy:
       matrix:
-        build_target: [ ':plugin-core:buildPlugin', ':plugin-toolkit:intellij-standalone:buildPlugin', ':plugin-amazonq:buildPlugin' ]
-        version: [ '2024.3', '2025.1', '2025.2', '2025.3' ]
+        build_target: [ ':plugin-toolkit:intellij-standalone:buildPlugin' ]
+        version: [ '2025.1', '2025.2', '2025.3', '2026.1' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.run/Run AWS Toolkit - Community [2024.3].run.xml → .run/Run AWS Toolkit - Community [2026.1].run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run AWS Toolkit - Community [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2024.3/log/idea.log" />
+  <configuration default="false" name="Run AWS Toolkit - Community [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2026.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2024.3" />
+      <option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2026.1" />
       <option name="taskDescriptions">
         <list />
       </option>

.run/Run AWS Toolkit - Gateway [2025.2].run.xml → .run/Run AWS Toolkit - Gateway [2026.1].run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run AWS Toolkit - Gateway [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2025.2/log/idea.log" />
+  <configuration default="false" name="Run AWS Toolkit - Gateway [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2026.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value=" -PideProfileName=2025.2" />
+      <option name="scriptParameters" value=" -PideProfileName=2026.1" />
       <option name="taskDescriptions">
         <list />
       </option>

.run/Run AWS Toolkit - Rider [2024.3].run.xml → .run/Run AWS Toolkit - Rider [2026.1].run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run AWS Toolkit - Rider [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2024.3/log/idea.log" />
+  <configuration default="false" name="Run AWS Toolkit - Rider [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2026.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2024.3" />
+      <option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2026.1" />
       <option name="taskDescriptions">
         <list />
       </option>

.run/Run AWS Toolkit - Ultimate [2024.3].run.xml → .run/Run AWS Toolkit - Ultimate [2026.1].run.xml

@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run AWS Toolkit - Ultimate [2024.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.3">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2024.3/log/idea.log" />
+  <configuration default="false" name="Run AWS Toolkit - Ultimate [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2026.1/log/idea.log" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2024.3" />
+      <option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2026.1" />
       <option name="taskDescriptions">
         <list />
       </option>