Merge remote-tracking branch 'origin/main' into t/commerce/release-prep

Author: yhsieh1

.changeset/many-knives-attend.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-dx-docs': minor
+---
+
+Added MCP Server documentation

.github/workflows/ci-vs-extension.yml

@@ -0,0 +1,64 @@
+name: VS Extension Tests
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'packages/b2c-vs-extension/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'packages/b2c-vs-extension/**'
+
+permissions:
+  contents: read
+
+env:
+  SFCC_DISABLE_TELEMETRY: ${{ vars.SFCC_DISABLE_TELEMETRY }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [22.x]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.17.1
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build packages
+        run: pnpm -r run build
+
+      - name: Run VS Extension tests
+        working-directory: packages/b2c-vs-extension
+        run: xvfb-run -a pnpm run test

.github/workflows/ci.yml

@@ -80,12 +80,11 @@ jobs:
         working-directory: packages/b2c-cli
         run: pnpm run pretest && pnpm run test:ci && pnpm run lint
 
-      - name: Run VS Extension lint
+      - name: Run VS Extension checks
         id: vs-extension-test
-        if: always() && steps.vs-extension-test.conclusion != 'cancelled'
+        if: always() && steps.cli-test.conclusion != 'cancelled'
         working-directory: packages/b2c-vs-extension
-        # Testing not currently supported on CI
-        run: pnpm run lint
+        run: pnpm run typecheck:agent && pnpm run lint
 
       - name: Test Report
         uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8  # v2.3.0

.github/workflows/publish.yml

@@ -153,6 +153,17 @@ jobs:
           check_package "@salesforce/b2c-cli" "packages/b2c-cli" "cli"
           check_package "@salesforce/b2c-dx-mcp" "packages/b2c-dx-mcp" "mcp"
 
+          # VS Code extension — compare against git tags (not npm)
+          LOCAL_VSX_VERSION=$(node -p "require('./packages/b2c-vs-extension/package.json').version")
+          LAST_VSX_TAG=$(git tag -l "b2c-vs-extension@*" --sort=-v:refname | head -1 | sed 's/b2c-vs-extension@//')
+          echo "b2c-vs-extension: local=${LOCAL_VSX_VERSION} tag=${LAST_VSX_TAG:-none}"
+          if [ "$LOCAL_VSX_VERSION" != "$LAST_VSX_TAG" ]; then
+            echo "publish_vsx=true" >> $GITHUB_OUTPUT
+            echo "version_vsx=${LOCAL_VSX_VERSION}" >> $GITHUB_OUTPUT
+          else
+            echo "publish_vsx=false" >> $GITHUB_OUTPUT
+          fi
+
           # Check if docs version changed (private package — not published to npm, uses git tag)
           DOCS_VERSION=$(node -p "require('./docs/package.json').version")
           if git rev-parse "docs@${DOCS_VERSION}" >/dev/null 2>&1; then
@@ -204,6 +215,11 @@ jobs:
           pnpm --filter @salesforce/b2c-dx-mcp publish --provenance --no-git-checks
           --tag ${{ steps.release-type.outputs.type == 'nightly' && 'nightly' || steps.packages.outputs.tag_mcp }}
 
+      - name: Package VS Code extension
+        if: steps.release-type.outputs.type == 'stable' && steps.packages.outputs.publish_vsx == 'true'
+        working-directory: packages/b2c-vs-extension
+        run: pnpm run package
+
       - name: Create git tags
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true'
         run: |
@@ -230,6 +246,12 @@ jobs:
             TAGS_CREATED="$TAGS_CREATED $TAG"
           fi
 
+          if [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]]; then
+            TAG="b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
+            git tag "$TAG"
+            TAGS_CREATED="$TAGS_CREATED $TAG"
+          fi
+
           if [ -n "$TAGS_CREATED" ]; then
             git push origin $TAGS_CREATED
             echo "Created tags:$TAGS_CREATED"
@@ -279,6 +301,13 @@ jobs:
               echo ""
             fi
 
+            if [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]]; then
+              echo "## b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
+              echo ""
+              extract_latest packages/b2c-vs-extension/CHANGELOG.md
+              echo ""
+            fi
+
             if [[ "${{ steps.packages.outputs.publish_docs }}" == "true" && -f docs/CHANGELOG.md ]]; then
               echo "## Documentation"
               echo ""
@@ -297,6 +326,8 @@ jobs:
             RELEASE_TAG="@salesforce/b2c-tooling-sdk@${{ steps.packages.outputs.version_sdk }}"
           elif [[ "${{ steps.packages.outputs.publish_mcp }}" == "true" ]]; then
             RELEASE_TAG="@salesforce/b2c-dx-mcp@${{ steps.packages.outputs.version_mcp }}"
+          elif [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]]; then
+            RELEASE_TAG="b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
           elif [[ "${{ steps.packages.outputs.publish_docs }}" == "true" ]]; then
             RELEASE_TAG="docs@${{ steps.packages.outputs.version_docs }}"
           else
@@ -330,6 +361,8 @@ jobs:
             RELEASE_TAG="@salesforce/b2c-tooling-sdk@${{ steps.packages.outputs.version_sdk }}"
           elif [[ "${{ steps.packages.outputs.publish_mcp }}" == "true" ]]; then
             RELEASE_TAG="@salesforce/b2c-dx-mcp@${{ steps.packages.outputs.version_mcp }}"
+          elif [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]]; then
+            RELEASE_TAG="b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
           else
             echo "No package release to upload to"
             exit 0
@@ -339,6 +372,27 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Upload VS Code extension to release
+        if: steps.release-type.outputs.type == 'stable' && steps.packages.outputs.publish_vsx == 'true'
+        run: |
+          # Determine the release tag (same logic as Create GitHub Release)
+          if [[ "${{ steps.packages.outputs.publish_cli }}" == "true" ]]; then
+            RELEASE_TAG="@salesforce/b2c-cli@${{ steps.packages.outputs.version_cli }}"
+          elif [[ "${{ steps.packages.outputs.publish_sdk }}" == "true" ]]; then
+            RELEASE_TAG="@salesforce/b2c-tooling-sdk@${{ steps.packages.outputs.version_sdk }}"
+          elif [[ "${{ steps.packages.outputs.publish_mcp }}" == "true" ]]; then
+            RELEASE_TAG="@salesforce/b2c-dx-mcp@${{ steps.packages.outputs.version_mcp }}"
+          elif [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]]; then
+            RELEASE_TAG="b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
+          else
+            echo "No release to upload to"
+            exit 0
+          fi
+
+          gh release upload "$RELEASE_TAG" packages/b2c-vs-extension/*.vsix
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Trigger documentation deployment
         if: >-
           steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true'

CONTRIBUTING.md

@@ -44,7 +44,7 @@ Issues labelled `good first contribution`.
 
 # Running the MCP server from source
 
-When developing the B2C DX MCP package (`packages/b2c-dx-mcp`), use `node` with the path to `bin/dev.js` in args. Build to latest (`pnpm run build` from the repo root) so changes that require a rebuild are reflected when you run the server.
+For information on running the MCP server from source and local development, see [packages/b2c-dx-mcp/CONTRIBUTING.md](packages/b2c-dx-mcp/CONTRIBUTING.md).
 
 # Contribution Checklist
 

README.md

@@ -5,7 +5,7 @@
 > [!NOTE]
 > This project is currently in **Developer Preview**. Not all features are implemented, and the API may change in future releases. Please provide feedback via GitHub issues and Unofficial Slack.
 
-Salesforce Commerce Cloud B2C Command Line Tools.
+Salesforce B2C Commerce Command Line Tools.
 
 > [!TIP]
 > **Just looking for the B2C CLI or MCP install instructions?** Visit the documentation site at [https://salesforcecommercecloud.github.io/b2c-developer-tooling/](https://salesforcecommercecloud.github.io/b2c-developer-tooling/) for the latest install guide and CLI reference.

docs/.vitepress/config.mts

@@ -51,6 +51,15 @@ const guideSidebar = [
       {text: 'Storefront Next', link: '/guide/storefront-next'},
     ],
   },
+  {
+    text: 'MCP Server',
+    items: [
+      {text: 'Overview', link: '/mcp/'},
+      {text: 'Installation', link: '/mcp/installation'},
+      {text: 'Configuration', link: '/mcp/configuration'},
+      {text: 'Toolsets & Tools', link: '/mcp/toolsets'},
+    ],
+  },
   {
     text: 'Extending',
     items: [
@@ -83,6 +92,16 @@ const guideSidebar = [
       {text: 'Logging', link: '/cli/logging'},
     ],
   },
+  {
+    text: 'Tools Reference',
+    items: [
+      {text: 'cartridge_deploy', link: '/mcp/tools/cartridge-deploy'},
+      {text: 'mrt_bundle_push', link: '/mcp/tools/mrt-bundle-push'},
+      {text: 'scapi_schemas_list', link: '/mcp/tools/scapi-schemas-list'},
+      {text: 'scapi_custom_apis_status', link: '/mcp/tools/scapi-custom-apis-status'},
+      {text: 'storefront_next_page_designer_decorator', link: '/mcp/tools/storefront-next-page-designer-decorator'},
+    ],
+  },
 ];
 
 // Script to force hard navigation for version switching links
@@ -111,7 +130,7 @@ document.addEventListener('click', (e) => {
 
 export default defineConfig({
   title: 'B2C DX',
-  description: 'Salesforce Commerce Cloud B2C Developer Experience - CLI, MCP Server, and SDK',
+  description: 'Salesforce B2C Commerce Developer Experience - CLI, MCP Server, and SDK',
   base: basePath,
 
   head: [['script', {}, versionSwitchScript]],
@@ -132,6 +151,7 @@ export default defineConfig({
     nav: [
       {text: 'Guide', link: '/guide/'},
       {text: 'CLI Reference', link: '/cli/'},
+      {text: 'MCP Server', link: '/mcp/'},
       {text: 'API Reference', link: '/api/'},
       {
         text: isDevBuild ? 'Dev' : 'Latest',
@@ -147,6 +167,7 @@ export default defineConfig({
     sidebar: {
       '/guide/': guideSidebar,
       '/cli/': guideSidebar,
+      '/mcp/': guideSidebar,
       '/api/': [
         {
           text: 'API Reference',

docs/guide/account-manager.md

@@ -1,22 +1,22 @@
 ---
-description: Managing Account Manager users, roles, organizations, and API clients with the B2C CLI — including authentication options, CI/CD automation, and common workflows.
+description: Manage Account Manager users, roles, organizations, and API clients with the B2C CLI, including authentication options, CI/CD automation, and common workflows.
 ---
 
 # Account Manager Guide
 
-The B2C CLI provides commands for managing Account Manager resources — users, roles, organizations, and API clients — directly from the terminal. This guide covers authentication setup, common workflows, and CI/CD automation.
+The B2C CLI provides commands for managing Account Manager resources—users, roles, organizations, and API clients—directly from the terminal. This guide covers authentication setup, common workflows, and CI/CD automation.
 
 ::: tip
 For the full command reference with all flags and options, see [Account Manager Commands](/cli/account-manager).
 :::
 
 ## Authentication
 
-Account Manager commands work out of the box — no configuration required. The CLI uses a built-in public client that authenticates via browser login. For automation, you can provide your own API client credentials.
+Account Manager commands work out of the box—no configuration is required. The CLI uses a built—in public client that authenticates via browser login. For automation, you can provide your own API client credentials.
 
 ### Zero-Config (Default)
 
-Just run commands. The CLI opens a browser for login using the built-in client:
+Just run the commands without configuring any settings. The CLI opens a browser for login using the built-in client.
 
 ```bash
 # Works immediately — opens browser for login
@@ -40,7 +40,7 @@ b2c am orgs list --user-auth
 
 ### Client Credentials
 
-Uses the API client's secret for non-interactive authentication. Best for CI/CD pipelines, scripts, and automation.
+Uses the API client's secret for non-interactive authentication. This option is best for CI/CD pipelines, scripts, and automation.
 
 ```bash
 # List users with client credentials
@@ -53,11 +53,11 @@ Requirements:
 
 ### Authentication Order
 
-By default, the CLI tries client credentials first (if `--client-secret` is provided), then falls back to browser-based user authentication (using either your configured `--client-id` or the built-in public client). To force browser-based login, pass `--user-auth`.
+By default, the CLI tries client credentials first (if `--client-secret` is provided), then falls back to browser-based user authentication by using either your configured `--client-id` or the built-in public client. To force browser-based login, pass `--user-auth`.
 
 ### Role Requirements
 
-Different operations require different roles, and the required roles depend on how you authenticate:
+Different operations require different roles, and the required roles depend on how you authenticate.
 
 | Operations | Client Credentials (roles on API client) | User Auth (roles on user account) |
 |---|---|---|
@@ -75,18 +75,18 @@ If authentication fails, the CLI provides contextual error messages recommending
 
 ### For Interactive Use
 
-No setup required. Account Manager commands use the CLI's built-in public client by default:
+No setup required. Account Manager commands use the CLI's built-in public client by default.
 
 ```bash
 b2c am users list
 ```
 
-If you need to use your own API client (for specific scopes or organization restrictions):
+If you need to use your own API client for specific scopes or organization restrictions:
 
-1. In [Account Manager](https://account.demandware.com), find or create an API client
-2. Under **Redirect URLs**, add `http://localhost:8080`
-3. Under **Allowed Scopes**, add: `mail roles tenantFilter openid`
-4. Set **Default Scopes** to: `mail roles tenantFilter openid`
+1. In [Account Manager](https://account.demandware.com), find or create an API client.
+2. Under **Redirect URLs**, add `http://localhost:8080`.
+3. Under **Allowed Scopes**, add: `mail roles tenantFilter openid`.
+4. Set **Default Scopes** to: `mail roles tenantFilter openid`.
 
 ```bash
 export SFCC_CLIENT_ID=your-client-id
@@ -95,12 +95,12 @@ b2c am users list --user-auth
 
 ### For CI/CD and Automation
 
-1. In [Account Manager](https://account.demandware.com), create a dedicated API client
-2. Set a strong password (client secret) and save it securely
-3. Set **Token Endpoint Auth Method** to `client_secret_post`
-4. Under **Roles**, add **User Administrator** (for user/role management)
-5. Under **Allowed Scopes**, add: `mail roles tenantFilter openid`
-6. Set **Default Scopes** to: `mail roles tenantFilter openid`
+1. In [Account Manager](https://account.demandware.com), create a dedicated API client.
+2. Set a strong password (client secret) and save it securely.
+3. Set **Token Endpoint Auth Method** to `client_secret_post`.
+4. Under **Roles**, add **User Administrator** (for user/role management).
+5. Under **Allowed Scopes**, add: `mail roles tenantFilter openid`.
+6. Set **Default Scopes** to: `mail roles tenantFilter openid`.
 
 Then configure your CI/CD environment:
 
@@ -110,7 +110,7 @@ export SFCC_CLIENT_SECRET=your-client-secret
 ```
 
 ::: tip
-Store the client secret in your CI/CD system's secrets manager — never commit it to source control.
+Store the client secret in your CI/CD system's secrets manager—never commit it to source control.
 :::
 
 ## Common Workflows
@@ -236,7 +236,7 @@ The CLI will suggest the specific role or auth method needed. Common fixes:
 
 ### "No valid auth method available"
 
-The CLI could not find credentials for any allowed auth method:
+The CLI couldn't find credentials for any allowed auth method:
 
 - Verify `--client-id` is set (or `SFCC_CLIENT_ID` environment variable)
 - For client credentials, verify `--client-secret` is set