Merge master into feature/stepfunctions-execution

.github/CODEOWNERS

@@ -2,3 +2,4 @@
 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

.github/workflows/node.js.yml

@@ -181,7 +181,68 @@
               with:
                   run: npm run testWeb
 
+    cloudformation-integ:
+        needs: lint-commits
+        name: CloudFormation LSP E2E Tests
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ubuntu-latest, macos-latest, windows-latest]
+                node-version: [18.x]
+                vscode-version: [stable]
+        env:
+            VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
+            NODE_OPTIONS: '--max-old-space-size=8192'
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Setup CloudFormation LSP
+              shell: bash
+              run: bash packages/core/src/testE2E/cloudformation/setup-local-lsp.sh
+            - run: npm ci
+            - name: Run CloudFormation E2E Tests (Unix)
+              if: runner.os != 'Windows'
+              uses: coactions/setup-xvfb@v1
+              with:
+                  run: npm run testE2ECfn -w packages/toolkit
+            - name: Run CloudFormation E2E Tests (Windows)
+              if: runner.os == 'Windows'
+              run: npm run testE2ECfn -w packages/toolkit
+            - name: Print Extension Logs
+              if: failure()
+              shell: bash
+              run: |
+                  echo "=== AWS Toolkit Extension Logs ==="
+                  find packages/toolkit/.vscode-test/user-data/logs -name "*.log" -type f 2>/dev/null | while read logfile; do
+                    echo "--- $logfile ---"
+                    cat "$logfile" || echo "Could not read log file"
+                  done || echo "No extension logs found"
+
+                  echo ""
+                  echo "=== CloudFormation LSP Server Logs ==="
+                  echo "LSP Path: $__CLOUDFORMATIONLSP_PATH"
+                  if [ -n "$__CLOUDFORMATIONLSP_PATH" ]; then
+                    LSP_LOG_DIR="$__CLOUDFORMATIONLSP_PATH/.aws-cfn-storage/logs"
+                    echo "Checking directory: $LSP_LOG_DIR"
+                    if [ -d "$LSP_LOG_DIR" ]; then
+                      find "$LSP_LOG_DIR" -name "*.log" -type f 2>/dev/null | while read logfile; do
+                        echo "--- $logfile ---"
+                        cat "$logfile" || echo "Could not read log file"
+                      done
+                    else
+                      echo "LSP logs directory does not exist: $LSP_LOG_DIR"
+                      echo "Contents of LSP path:"
+                      ls -la "$__CLOUDFORMATIONLSP_PATH" 2>/dev/null || echo "Cannot list LSP path"
+                    fi
+                  else
+                    echo "Environment variable __CLOUDFORMATIONLSP_PATH is not set"
+                  fi
+
     windows:
         needs: lint-commits
         name: test Windows
         runs-on: windows-latest

.gitignore

@@ -34,6 +34,7 @@ src.gen/*
 **/src/auth/sso/oidcclientpkce.d.ts
 **/src/sagemakerunifiedstudio/shared/client/gluecatalogapi.d.ts
 **/src/sagemakerunifiedstudio/shared/client/sqlworkbench.d.ts
+**/src/sagemakerunifiedstudio/shared/client/datazonecustomclient.d.ts
 
 # Generated by tests
 **/src/testFixtures/**/bin

CONTRIBUTING.md

@@ -527,6 +527,11 @@ Unlike the user setting overrides, not all of these environment variables have t
 
 -   `SSMDOCUMENT_LANGUAGESERVER_PORT`: The port the ssm document language server should start debugging on
 
+#### CloudFormation LSP
+
+-   `__CLOUDFORMATIONLSP_PATH`: for aws.dev.cloudformationLsp.path
+-   `__CLOUDFORMATIONLSP_CLOUDFORMATION_ENDPOINT`: for aws.dev.cloudformationLsp.cloudformationEndpoint
+
 #### CI/Testing
 
 -   `GITHUB_ACTION`: The name of the current GitHub Action workflow step that is running

package.json

@@ -42,7 +42,7 @@
         "scan-licenses": "ts-node ./scripts/scan-licenses.ts"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.329",
+        "@aws-toolkits/telemetry": "^1.0.338",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",
@@ -75,7 +75,7 @@
         "webpack-merge": "^5.10.0"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.128",
+        "@aws/language-server-runtimes": "^0.3.5",
         "@types/node": "^22.7.5",
         "jaro-winkler": "^0.2.8",
         "vscode-nls": "^5.2.0",

packages/amazonq/.changes/1.101.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-22",
+	"version": "1.101.0",
+	"entries": []
+}

packages/amazonq/.changes/1.102.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-30",
+	"version": "1.102.0",
+	"entries": []
+}

packages/amazonq/.changes/1.103.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-11-06",
+	"version": "1.103.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Q CodeTransformation: add more job metadata to history table"
+		}
+	]
+}

packages/amazonq/.changes/1.104.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-11-15",
+	"version": "1.104.0",
+	"entries": []
+}

packages/amazonq/.changes/1.105.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-11-19",
+	"version": "1.105.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Remove show logs menu item for non Q views"
+		}
+	]
+}

packages/amazonq/.changes/1.106.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-11-21",
+	"version": "1.106.0",
+	"entries": []
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.106.0 2025-11-21
+
+- Miscellaneous non-user-facing changes
+
+## 1.105.0 2025-11-19
+
+- **Bug Fix** Remove show logs menu item for non Q views
+
+## 1.104.0 2025-11-15
+
+- Miscellaneous non-user-facing changes
+
+## 1.103.0 2025-11-06
+
+- **Feature** Q CodeTransformation: add more job metadata to history table
+
+## 1.102.0 2025-10-30
+
+- Miscellaneous non-user-facing changes
+
+## 1.101.0 2025-10-22
+
+- Miscellaneous non-user-facing changes
+
 ## 1.100.0 2025-10-16
 
 - Miscellaneous non-user-facing changes