Merge remote-tracking branch 'upstream/main' into W-21112167-Replications-API

Author: charithaT07

.changeset/docs-mcp-preview-update.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-dx-docs': patch
+---
+
+MCP docs: preview release wording, sidebar nav, remove placeholder tool references

.changeset/unregister-placeholder-tools.md

@@ -0,0 +1,9 @@
+---
+'@salesforce/b2c-dx-mcp': patch
+---
+
+Unregister placeholder tools and update README for preview release
+
+- Remove placeholder tools (PWA Kit, Storefront Next) so users only see implemented tools at startup
+- Update README: preview release wording, accurate tool tables, credential notes, example prompts
+- Fix package license to Apache-2.0

.github/CODEOWNERS

@@ -2,4 +2,6 @@
 *       @clavery
 /packages/b2c-dx-mcp/       @yhsieh1 @patricksullivansf @wei-liu-sf
 /packages/b2c-vs-extension/    @wei-liu-sf
+/docs/mcp/       @wei-liu-sf @yhsieh1 @patricksullivansf
+/docs/.vitepress/       @wei-liu-sf @yhsieh1 @patricksullivansf
 

.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

@@ -112,7 +112,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]],

docs/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @salesforce/b2c-dx-docs
+
+## 0.2.0
+
+### Minor Changes
+
+- [#172](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/pull/172) [`f82eaaf`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/f82eaaf83b9d80636eaa03c746a5594db25a9c43) - Added MCP Server documentation (Thanks [@patricksullivansf](https://github.com/patricksullivansf)!)