fix(amazonq): Merge from main (#8533)

laileni-aws · ashishrp-aws · web-flow · commit fbff0501b91f · 2026-01-27T14:49:29.000-08:00
- Merge Amazon Q necessary code from main. - Cherry picking commits a2849d0 and 53f02cf --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -126,7 +126,7 @@ jobs:
             matrix:
                 node-version: [18.x]
                 vscode-version: [minimum, stable, insiders]
-                package: [amazonq, toolkit]
+                package: [amazonq]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
@@ -181,67 +181,6 @@ jobs:
               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
@@ -251,7 +190,7 @@ jobs:
             matrix:
                 node-version: [18.x]
                 vscode-version: [stable, insiders]
-                package: [amazonq, toolkit]
+                package: [amazonq]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.108.0.json b/packages/amazonq/.changes/1.108.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2026-01-23",
+	"version": "1.108.0",
+	"entries": []
+}
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.108.0 2026-01-23
+
+- Miscellaneous non-user-facing changes
+
 ## 1.107.0 2026-01-08
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/amazonq/package.json b/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.109.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%",
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -20,7 +20,6 @@
     "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
     "AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files",
     "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
-    "AWS.configuration.description.featureDevelopment.allowRunningCodeAndTests": "Allow /dev to run code and test commands",
     "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.",
     "AWS.stepFunctions.publishStateMachine.error.invalidYAML": "Cannot publish invalid YAML file",
     "AWS.stepFunctions.publishStateMachine.info.creating": "Creating state machine '{0}' in {1}...",
diff --git a/packages/core/src/codewhisperer/util/codewhispererSettings.ts b/packages/core/src/codewhisperer/util/codewhispererSettings.ts
@@ -16,7 +16,6 @@ const description = {
     workspaceIndexMaxFileSize: Number,
     workspaceIndexCacheDirPath: String,
     workspaceIndexIgnoreFilePatterns: ArrayConstructor(String),
-    allowFeatureDevelopmentToRunCodeAndTests: Object,
     ignoredSecurityIssues: ArrayConstructor(String),
 }
 
@@ -74,18 +73,6 @@ export class CodeWhispererSettings extends fromExtensionManifest('amazonQ', desc
         return this.get('workspaceIndexIgnoreFilePatterns', [])
     }
 
-    public getAutoBuildSetting(): { [key: string]: boolean } {
-        return this.get('allowFeatureDevelopmentToRunCodeAndTests', {})
-    }
-
-    public async updateAutoBuildSetting(projectName: string, setting: boolean) {
-        const projects = this.getAutoBuildSetting()
-
-        projects[projectName] = setting
-
-        await this.update('allowFeatureDevelopmentToRunCodeAndTests', projects)
-    }
-
     public getIgnoredSecurityIssues(): string[] {
         return this.get('ignoredSecurityIssues', [])
     }
diff --git a/packages/core/src/shared/settings-amazonq.gen.ts b/packages/core/src/shared/settings-amazonq.gen.ts
@@ -26,7 +26,6 @@ export const amazonqSettings = {
         "amazonQSelectDeveloperProfile": {}
     },
     "amazonQ.showCodeWithReferences": {},
-    "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {},
     "amazonQ.importRecommendationForInlineCodeSuggestions": {},
     "amazonQ.shareContentWithAWS": {},
     "amazonQ.workspaceIndex": {},
diff --git a/packages/core/src/testLint/eslint.test.ts b/packages/core/src/testLint/eslint.test.ts
@@ -33,7 +33,6 @@ describe('eslint', function () {
                 '.ts',
                 '../amazonq',
                 '../core',
-                '../toolkit',
                 // TODO: fix lint issues in scripts/
                 // '../../scripts',
             ],
