Merge remote-tracking branch 'upstream/main' into W-22162268-OAuth-JWT-Client

Author: charithaT07

.agents/plugins/marketplace.json

@@ -27,6 +27,26 @@
         "authentication": "ON_INSTALL"
       },
       "category": "Productivity"
+    },
+    {
+      "name": "cap-dev",
+      "description": "Skills for scaffolding, packaging, validating, and submitting Commerce App Packages (CAPs) for Salesforce Commerce Cloud.",
+      "source": {
+        "source": "git-subdir",
+        "url": "SalesforceCommerceCloud/commerce-apps",
+        "path": ".claude",
+        "ref": "feature/codex-copilot-plugin-docs"
+      },
+      "interface": {
+        "displayName": "Commerce Apps Dev",
+        "shortDescription": "Scaffold, validate, package, and submit Commerce App Packages.",
+        "longDescription": "Skills for building Salesforce Commerce Cloud app packages — scaffold new apps (UI-only, backend-only, or fullstack), generate IMPEX configurations for services, custom objects, and site preferences, validate packages against registry requirements, and submit pull requests to the commerce-apps registry."
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity"
     }
   ]
 }

.changeset/RELEASE

@@ -1 +1 @@
-Wed Apr 22 00:26:31 UTC 2026
+Thu Apr 23 15:00:58 UTC 2026

.changeset/cap-skill-improvements.md

@@ -17,7 +17,7 @@
       "source": "./skills/b2c-cli",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.0"
+      "version": "1.1.3"
     },
     {
       "name": "b2c",
@@ -29,7 +29,7 @@
       "source": "./skills/b2c",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.0"
+      "version": "1.1.3"
     },
     {
       "name": "b2c-dx-mcp",
@@ -41,6 +41,36 @@
       "source": "./plugins/b2c-dx-mcp",
       "category": "productivity",
       "strict": false
+    },
+    {
+      "name": "cap-dev",
+      "description": "Skills for scaffolding, packaging, validating, and submitting Commerce App Packages (CAPs) for Salesforce Commerce Cloud.",
+      "author": {
+        "name": "Salesforce"
+      },
+      "homepage": "https://github.com/SalesforceCommerceCloud/commerce-apps",
+      "repository": "https://github.com/SalesforceCommerceCloud/commerce-apps",
+      "license": "Apache-2.0",
+      "source": {
+        "source": "git-subdir",
+        "url": "SalesforceCommerceCloud/commerce-apps",
+        "path": ".claude",
+        "ref": "feature/codex-copilot-plugin-docs"
+      },
+      "category": "productivity",
+      "keywords": [
+        "salesforce",
+        "commerce-apps",
+        "commerce-cloud",
+        "cap",
+        "impex"
+      ],
+      "interface": {
+        "displayName": "Commerce Apps Dev",
+        "shortDescription": "Scaffold, validate, package, and submit Commerce App Packages.",
+        "longDescription": "Skills for building Salesforce Commerce Cloud app packages — scaffold new apps (UI-only, backend-only, or fullstack), generate IMPEX configurations for services, custom objects, and site preferences, validate packages against registry requirements, and submit pull requests to the commerce-apps registry."
+      },
+      "strict": false
     }
   ]
 }

.claude-plugin/marketplace.json

@@ -76,9 +76,15 @@ jobs:
         working-directory: packages/b2c-cli
         run: pnpm run pretest && pnpm run test:ci && pnpm run lint
 
+      - name: Run MRT Utilities tests
+        id: mrt-test
+        if: always() && steps.cli-test.conclusion != 'cancelled'
+        working-directory: packages/mrt-utilities
+        run: pnpm run pretest && pnpm run test:ci && pnpm run lint
+
       - name: Run VS Extension checks
         id: vs-extension-test
-        if: always() && steps.cli-test.conclusion != 'cancelled'
+        if: always() && steps.mrt-test.conclusion != 'cancelled'
         working-directory: packages/b2c-vs-extension
         run: pnpm run typecheck:agent && pnpm run lint
 
@@ -167,8 +173,13 @@ jobs:
         # the Linux-calibrated 70% threshold even though the tests pass.
         # Coverage is still generated and uploaded for inspection.
         run: pnpm run pretest && pnpm run test:ci:win && pnpm run lint
-      - name: Run VS Extension checks
+      - name: Run MRT Utilities tests
+        id: mrt-test
         if: always() && steps.cli-test.conclusion != 'cancelled'
+        working-directory: packages/mrt-utilities
+        run: pnpm run pretest && pnpm run test:ci && pnpm run lint
+      - name: Run VS Extension checks
+        if: always() && steps.mrt-test.conclusion != 'cancelled'
         working-directory: packages/b2c-vs-extension
         run: pnpm run typecheck:agent && pnpm run lint
       - name: Print Windows test failures

.github/workflows/ci.yml

@@ -394,7 +394,8 @@ jobs:
       - name: Create GitHub Release
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true'
         run: |
-          # Determine the release tag — prefer CLI as the user-facing product
+          # Determine the release tag — prefer CLI as the user-facing product.
+          # Plugins and VSX get their own dedicated releases, so they are excluded here.
           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
@@ -403,18 +404,24 @@ jobs:
             RELEASE_TAG="@salesforce/b2c-dx-mcp@${{ steps.packages.outputs.version_mcp }}"
           elif [[ "${{ steps.packages.outputs.publish_mrt }}" == "true" ]]; then
             RELEASE_TAG="@salesforce/mrt-utilities@${{ steps.packages.outputs.version_mrt }}"
-          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 }}"
-          elif [[ "${{ steps.packages.outputs.publish_plugins }}" == "true" ]]; then
-            RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
           else
-            echo "No packages published, skipping release"
+            echo "No non-VSX/non-plugins packages published, skipping main release"
             exit 0
           fi
 
-          gh release create "$RELEASE_TAG" --notes-file /tmp/release-notes.md
+          # Build a human-readable title from published package versions
+          TITLE_PARTS=()
+          [[ "${{ steps.packages.outputs.publish_cli }}" == "true" ]] && TITLE_PARTS+=("b2c-cli ${{ steps.packages.outputs.version_cli }}")
+          [[ "${{ steps.packages.outputs.publish_sdk }}" == "true" ]] && TITLE_PARTS+=("b2c-tooling-sdk ${{ steps.packages.outputs.version_sdk }}")
+          [[ "${{ steps.packages.outputs.publish_mcp }}" == "true" ]] && TITLE_PARTS+=("b2c-dx-mcp ${{ steps.packages.outputs.version_mcp }}")
+          [[ "${{ steps.packages.outputs.publish_mrt }}" == "true" ]] && TITLE_PARTS+=("mrt-utilities ${{ steps.packages.outputs.version_mrt }}")
+          [[ "${{ steps.packages.outputs.publish_vsx }}" == "true" ]] && TITLE_PARTS+=("b2c-vs-extension ${{ steps.packages.outputs.version_vsx }}")
+          [[ "${{ steps.packages.outputs.publish_docs }}" == "true" ]] && TITLE_PARTS+=("docs ${{ steps.packages.outputs.version_docs }}")
+          RELEASE_TITLE="Version Packages — $(IFS=', '; echo "${TITLE_PARTS[*]}")"
+
+          gh release create "$RELEASE_TAG" --title "$RELEASE_TITLE" --notes-file /tmp/release-notes.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -433,47 +440,13 @@ jobs:
       - name: Upload skills to release
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true' && steps.packages.outputs.publish_plugins == 'true'
         run: |
-          # Determine the release tag (same priority 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_mrt }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/mrt-utilities@${{ steps.packages.outputs.version_mrt }}"
-          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
-            RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
-          fi
+          RELEASE_TAG="b2c-agent-plugins@${{ steps.packages.outputs.version_plugins }}"
 
-          gh release upload "$RELEASE_TAG" b2c-skills.zip b2c-cli-skills.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          gh release create "$RELEASE_TAG" \
+            --title "Agent Plugins ${{ steps.packages.outputs.version_plugins }}" \
+            --notes "Skills artifacts for b2c-agent-plugins v${{ steps.packages.outputs.version_plugins }}"
 
-      - 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_mrt }}" == "true" ]]; then
-            RELEASE_TAG="@salesforce/mrt-utilities@${{ steps.packages.outputs.version_mrt }}"
-          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
+          gh release upload "$RELEASE_TAG" b2c-skills.zip b2c-cli-skills.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -483,6 +456,36 @@ jobs:
           && steps.packages.outputs.publish_vsx == 'true'
         run: |
           VSX_TAG="b2c-vs-extension@${{ steps.packages.outputs.version_vsx }}"
+          VSX_VERSION="${{ steps.packages.outputs.version_vsx }}"
+
+          # Extract extension changelog for the dedicated release
+          extract_latest() {
+            awk '
+              /^## / { if (found) exit; found=1; next }
+              found { print }
+            ' "$1"
+          }
+
+          VSX_CHANGELOG=$(extract_latest packages/b2c-vs-extension/CHANGELOG.md)
+
+          {
+            cat <<HEADER
+          ## B2C DX VS Code Extension v${VSX_VERSION}
+
+          Download the \`.vsix\` file below and install via:
+          \`\`\`
+          code --install-extension b2c-vs-extension-${VSX_VERSION}.vsix
+          \`\`\`
+
+          Or in VS Code: Extensions → ⋯ → Install from VSIX...
+
+          ---
+
+          ### Changelog
+
+          HEADER
+            echo "$VSX_CHANGELOG"
+          } | sed 's/^          //' > /tmp/vsx-release-notes.md
 
           # Create a dedicated release for the extension (not latest — main releases own that)
           # Use --clobber on upload in case a previous run partially completed
@@ -491,21 +494,10 @@ jobs:
             gh release upload "$VSX_TAG" packages/b2c-vs-extension/*.vsix --clobber
           else
             gh release create "$VSX_TAG" \
-              --title "VS Code Extension ${{ steps.packages.outputs.version_vsx }}" \
+              --title "VS Code Extension ${VSX_VERSION}" \
               --latest=false \
-              --notes "$(cat <<'NOTES'
-          ## B2C DX VS Code Extension v${{ steps.packages.outputs.version_vsx }}
-
-          Download the `.vsix` file below and install via:
-          ```
-          code --install-extension b2c-vs-extension-${{ steps.packages.outputs.version_vsx }}.vsix
-          ```
-
-          Or in VS Code: Extensions → ⋯ → Install from VSIX...
-          NOTES
-          )"
+              --notes-file /tmp/vsx-release-notes.md
 
-            # Upload the VSIX to the dedicated release
             gh release upload "$VSX_TAG" packages/b2c-vs-extension/*.vsix
           fi
         env:

.github/workflows/publish.yml

@@ -1,5 +1,11 @@
 # @salesforce/b2c-dx-docs
 
+## 0.2.18
+
+### Patch Changes
+
+- [`c5edd5d`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/c5edd5dccc5e472528c08c3fb2fc12b1872440c6) - Updated plugin install examples to default to user scope (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 0.2.17
 
 ### Patch Changes

docs/CHANGELOG.md

@@ -14,9 +14,9 @@ Skills follow the open [Agent Skills](https://agentskills.io/home) standard and
 
 ```bash [Claude Code]
 claude plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
-# Use --scope user to install globally (available in all projects)
-claude plugin install b2c-cli --scope project
-claude plugin install b2c --scope project
+# Use --scope project to install for current project only
+claude plugin install b2c-cli
+claude plugin install b2c
 ```
 
 ```text [Copilot (VS Code)]
@@ -87,18 +87,18 @@ Install plugins at your preferred scope:
 
 ::: code-group
 
+```bash [User Scope (default)]
+claude plugin install b2c-cli
+claude plugin install b2c
+claude plugin install b2c-dx-mcp
+```
+
 ```bash [Project Scope]
 claude plugin install b2c-cli --scope project
 claude plugin install b2c --scope project
 claude plugin install b2c-dx-mcp --scope project
 ```
 
-```bash [User Scope]
-claude plugin install b2c-cli --scope user
-claude plugin install b2c --scope user
-claude plugin install b2c-dx-mcp --scope user
-```
-
 :::
 
 Verify, update, or uninstall:

docs/guide/agent-skills.md

@@ -77,9 +77,9 @@ Detailed setup: [Claude Code](/guide/agent-skills#claude-code) · [Codex](/guide
 
 ```bash [Claude Code]
 claude plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
-# Use --scope user to install globally (available in all projects)
-claude plugin install b2c-cli --scope project
-claude plugin install b2c --scope project
+# Use --scope project to install for current project only
+claude plugin install b2c-cli
+claude plugin install b2c
 ```
 
 ```text [Copilot (VS Code)]

docs/index.md

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/b2c-dx-docs",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "private": true,
   "description": "Documentation for B2C Developer Tooling",
   "scripts": {