Merge branch 'master' into ctlai95/update-zip-stream

Author: ctlai95

.eslintignore

@@ -11,9 +11,11 @@ src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
 src/codewhisperer/client/codewhispereruserclient.d.ts
 src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+src/auth/sso/oidcclientpkce.d.ts
 src/testFixtures/**
 packages/core/src/shared/telemetry/clienttelemetry.d.ts
 packages/core/src/codewhisperer/client/codewhispererclient.d.ts
 packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
 packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/core/src/auth/sso/oidcclientpkce.d.ts
 packages/core/src/testFixtures/**

.eslintrc.js

@@ -149,14 +149,27 @@ module.exports = {
             },
             { lineEndings: 'unix' },
         ],
+
         'aws-toolkits/no-only-in-tests': 'error',
-        // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
-        // "no-restricted-imports": [
-        //     "error",
-        //     {
-        //         "name": "fs-extra",
-        //         "message": "Avoid fs-extra, use FileSystemCommon. Notify the Toolkit team if your required functionality is not available."
-        //     }
-        // ],
+        'aws-toolkits/no-await-on-vscode-msg': 'error',
+
+        'no-restricted-imports': [
+            'error',
+            {
+                patterns: [
+                    {
+                        group: ['**/core/dist/*'],
+                        message:
+                            "Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports.",
+                    },
+                ],
+            },
+            // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
+            // {
+            //     name: 'fs-extra',
+            //     message:
+            //         'Avoid fs-extra, use FileSystemCommon. Notify the Toolkit team if your required functionality is not available.',
+            // },
+        ],
     },
 }

.github/CODEOWNERS

@@ -3,3 +3,4 @@ packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
 packages/core/src/codewhispererChat/ @aws/dexp
 packages/core/src/amazonq/ @aws/dexp
+packages/core/src/accessanalyzer/ @aws/access-analyzer

.github/ISSUE_TEMPLATE/bug_report.md

@@ -16,8 +16,9 @@ labels: bug
 
 ## Expected behavior
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for AWS Toolkit
+about: Suggest an idea for AWS Toolkit or Amazon Q
 labels: feature-request
 ---
 

.github/ISSUE_TEMPLATE/guidance_request.md

@@ -4,11 +4,12 @@ about: Ask for guidance, "how to", or other questions
 labels: guidance
 ---
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:
 
 ## Question
 

.github/workflows/release.yml

@@ -24,8 +24,10 @@ jobs:
         outputs:
             feature: ${{ steps.build.outputs.feature }}
             tagname: ${{ steps.build.outputs.tagname }}
-            version: ${{ steps.build.outputs.version }}
-            changes: ${{ steps.build.outputs.changes }}
+            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:
@@ -49,10 +51,11 @@ jobs:
                   echo "FEAT_NAME=" >> $GITHUB_ENV
                   echo "TAG_NAME=prerelease" >> $GITHUB_ENV
             - run: npm ci
-            - name: vsix # TODO: For packages/toolkit release only
+            - name: vsix
               run: |
-                  npm run createRelease  # Generate CHANGELOG.md
+                  npm run createRelease -w packages/toolkit -w packages/amazonq  # Generate CHANGELOG.md
                   npm run -w packages/toolkit package -- --feature "$FEAT_NAME"
+                  npm run -w packages/amazonq package -- --feature "$FEAT_NAME"
             - uses: actions/upload-artifact@v4
               with:
                   name: artifacts
@@ -61,28 +64,39 @@ jobs:
             - name: Export outputs
               id: build
               run: |
+                  write_package_info() {
+                      PKG_NAME=$1
+                      PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${PKG_NAME}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
+                      echo "${PKG_NAME}_version=$(grep -m 1 version packages/${PKG_NAME}/package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
+                      echo "${PKG_NAME}_changes<<EOF" >> $GITHUB_OUTPUT
+                      # Add extension display name to the topmost changelog section.
+                      cat packages/${PKG_NAME}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' | sed -e "1 s/## /## ${PKG_DISPLAY_NAME} - /" >> $GITHUB_OUTPUT
+                      echo 'EOF' >> $GITHUB_OUTPUT
+                  }
                   echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
                   echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
-                  echo "version=$(grep -m 1 version packages/toolkit/package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
-                  echo 'changes<<EOF' >> $GITHUB_OUTPUT
-                  cat CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' >> $GITHUB_OUTPUT
-                  echo 'EOF' >> $GITHUB_OUTPUT
+                  write_package_info toolkit
+                  write_package_info amazonq
 
     publish:
         needs: [package]
         runs-on: ubuntu-latest
         env:
+            #
             # For `gh`.
+            #
             GH_REPO: ${{ github.repository }}
-            # For `gh`.
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             FEAT_NAME: ${{ needs.package.outputs.feature }}
             TAG_NAME: ${{ needs.package.outputs.tagname }}
-            AWS_TOOLKIT_VERSION: ${{ needs.package.outputs.version }}
+            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 }}
-            # Used in release_notes.md
-            AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.changes }}
+            AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.toolkit_changes }}
+            AMAZON_Q_CHANGES: ${{ needs.package.outputs.amazonq_changes }}
         permissions:
             contents: write
         steps:
@@ -94,7 +108,7 @@ jobs:
               # "prerelease" (main branch) or "pre-<feature>"
               if: "env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-')"
               run: |
-                  echo "SUBJECT=AWS Toolkit ${AWS_TOOLKIT_VERSION}: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
+                  echo "SUBJECT=AWS IDE Extensions: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
                   gh release delete "$TAG_NAME" --cleanup-tag --yes || true
                   # git push origin :"$TAG_NAME" || true
             - name: Publish Prerelease

.github/workflows/release_notes.md

@@ -1,14 +1,19 @@
-_This is an **unsupported preview build** of the `${BRANCH}` branch of AWS Toolkit._
+This is an **unsupported preview build** of the `${BRANCH}` branch of AWS IDE Extensions for VSCode.
 
 # Install
 
-1. Download the vsix file from "Assets" below.
-2. In VSCode, run `Extensions: Install from VSIX...` and choose the vsix file.
+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).
 
 # Changes
 
 ${AWS_TOOLKIT_CHANGES}
 
+${AMAZON_Q_CHANGES}
+
 ## Previous changes
 
--   See [CHANGELOG.md](CHANGELOG.md)
+-   [AWS Toolkit changelog](/packages/toolkit/CHANGELOG.md)
+-   [Amazon Q changelog](/packages/amazonq/CHANGELOG.md)

.gitignore

@@ -38,11 +38,11 @@ packages/core/src/testFixtures/**/bin
 packages/core/src/testFixtures/**/obj
 
 # Generated by copyFiles.ts
-packages/*/CHANGELOG.md
 packages/*/LICENSE
 packages/*/NOTICE
 packages/toolkit/package.nls.json
 packages/toolkit/resources
+packages/amazonq/package.nls.json
 packages/amazonq/resources
 
 # Icons

CONTRIBUTING.md

@@ -315,9 +315,14 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
 
 ### Logging
 
--   Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can easily
-    follow and filter the logfile using shell tools like `tail` and `grep`. For example in
-    settings.json,
+-   Use `getLogger()` to log debugging messages, warnings, etc.
+    -   Example: `getLogger().error('topic: widget failed: %O', { foo: 'bar', baz: 42 })`
+-   Log messages are written to the extension Output channel, which you can view in vscode by visiting the "Output" panel and selecting `AWS Toolkit Logs` or `Amazon Q Logs`.
+-   While viewing the Output channel (`AWS Toolkit Logs` or `Amazon Q Logs`) in vscode:
+    -   Click the "gear" icon to [select a log level](https://github.com/aws/aws-toolkit-vscode/pull/4859) ("Debug", "Info", "Error", …).
+    -   Click the "..." icon to open the log file.
+-   Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can follow
+    and filter logs using shell tools like `tail` and `grep`. For example in settings.json,
     ```
     "aws.dev.logfile": "~/awstoolkit.log",
     ```
@@ -328,7 +333,6 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
 -   Use the `AWS (Developer): Watch Logs` command to watch and filter Toolkit logs (including
     telemetry) in VSCode.
     -   Only available if you enabled "dev mode" (`aws.dev.forceDevMode` setting, see above).
-    -   Sets `aws.logLevel` to "debug".
     -   Enter text in the Debug Console filter box to show only log messages with that text. <br/>
         <img src="./docs/images/debug-console-filter.png" alt="VSCode Debug Console" width="320"/>