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

Author: charithaT07

.agents/plugins/marketplace.json

@@ -28,6 +28,19 @@
       },
       "category": "Productivity"
     },
+    {
+      "name": "storefront-next",
+      "description": "Storefront Next development skills for building React 19 storefronts on Salesforce B2C Commerce.",
+      "source": {
+        "source": "local",
+        "path": "./skills/storefront-next"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Productivity"
+    },
     {
       "name": "cap-dev",
       "description": "Skills for scaffolding, packaging, validating, and submitting Commerce App Packages (CAPs) for Salesforce Commerce Cloud.",

.changeset/RELEASE

@@ -1 +1 @@
-Thu Apr 23 15:00:58 UTC 2026
+Fri Apr 24 15:56:51 UTC 2026

.claude-plugin/marketplace.json

@@ -17,7 +17,7 @@
       "source": "./skills/b2c-cli",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.3"
+      "version": "1.2.0"
     },
     {
       "name": "b2c",
@@ -29,7 +29,7 @@
       "source": "./skills/b2c",
       "category": "productivity",
       "strict": false,
-      "version": "1.1.3"
+      "version": "1.2.0"
     },
     {
       "name": "b2c-dx-mcp",
@@ -42,6 +42,18 @@
       "category": "productivity",
       "strict": false
     },
+    {
+      "name": "storefront-next",
+      "description": "Storefront Next development skills for building React 19 storefronts on Salesforce B2C Commerce.",
+      "author": {
+        "name": "Salesforce"
+      },
+      "license": "Apache-2.0",
+      "source": "./skills/storefront-next",
+      "category": "productivity",
+      "strict": false,
+      "version": "1.2.0"
+    },
     {
       "name": "cap-dev",
       "description": "Skills for scaffolding, packaging, validating, and submitting Commerce App Packages (CAPs) for Salesforce Commerce Cloud.",

.github/workflows/changesets.yml

@@ -48,6 +48,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Trigger checks on PR branch
+        if: steps.changesets.outputs.pullRequestNumber
+        run: |
+          PR_BRANCH=$(gh pr view ${{ steps.changesets.outputs.pullRequestNumber }} --json headRefName -q '.headRefName')
+          git remote set-url origin https://x-access-token:${{ secrets.CHANGESETS_TOKEN }}@github.com/${{ github.repository }}
+          git fetch origin "$PR_BRANCH"
+          git checkout "$PR_BRANCH"
+          git commit --allow-empty -m "chore: trigger CI checks"
+          git push origin "$PR_BRANCH"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Add release label to PR
         if: steps.changesets.outputs.pullRequestNumber
         run: gh pr edit ${{ steps.changesets.outputs.pullRequestNumber }} --add-label release

.github/workflows/publish.yml

@@ -434,6 +434,9 @@ jobs:
           # Create b2c-cli-skills.zip containing skills/b2c-cli/skills/
           cd skills/b2c-cli && zip -r ../../b2c-cli-skills.zip skills/
           cd ../..
+          # Create storefront-next-skills.zip containing skills/storefront-next/skills/
+          cd skills/storefront-next && zip -r ../../storefront-next-skills.zip skills/
+          cd ../..
           echo "Created skills artifacts:"
           ls -la *.zip
 
@@ -446,7 +449,7 @@ jobs:
             --title "Agent Plugins ${{ steps.packages.outputs.version_plugins }}" \
             --notes "Skills artifacts for b2c-agent-plugins v${{ steps.packages.outputs.version_plugins }}"
 
-          gh release upload "$RELEASE_TAG" b2c-skills.zip b2c-cli-skills.zip
+          gh release upload "$RELEASE_TAG" b2c-skills.zip b2c-cli-skills.zip storefront-next-skills.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

AGENTS.md

@@ -186,7 +186,7 @@ Changeset guidelines:
   - HOW a consumer should update their code
 - Good changesets are brief and user-focused (not contributor); they are generally 1 line or two; The content of the changeset is used in CHANGELOG and release notes. You do not need to list internal implementation details or all details of commands; just the high level summary for users.
 
-Valid changeset packages: `@salesforce/b2c-cli`, `@salesforce/b2c-tooling-sdk`, `@salesforce/b2c-dx-mcp`, `@salesforce/mrt-utilities`, `b2c-vs-extension`, `@salesforce/b2c-dx-docs`
+Valid changeset packages: `@salesforce/b2c-cli`, `@salesforce/b2c-tooling-sdk`, `@salesforce/b2c-dx-mcp`, `@salesforce/mrt-utilities`, `b2c-vs-extension`, `@salesforce/b2c-dx-docs`, `@salesforce/b2c-agent-plugins`
 
 Create a changeset file directly in `.changeset/` with a unique filename (e.g., `descriptive-change-name.md`):
 
@@ -201,3 +201,4 @@ Description of the change explaining WHAT, WHY, and HOW to update
 
 - Include only the packages that were directly modified
 - For doc-only changes, target `@salesforce/b2c-dx-docs` instead of the CLI/SDK/MCP packages
+- For changes to agent skills/plugins in `skills/` (adding or updating skill content, adding a new plugin), target `@salesforce/b2c-agent-plugins`

docs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @salesforce/b2c-dx-docs
 
+## 0.2.19
+
+### Patch Changes
+
+- [`3ffd72d`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/3ffd72d6c43f2ac812559e7ea22de3206cf6df9d) - Update agent skills guide and CLI setup reference for storefront-next plugin (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 0.2.18
 
 ### Patch Changes

docs/cli/setup.md

@@ -371,7 +371,7 @@ b2c setup skills [SKILLSET]
 
 | Argument   | Description                              | Default                |
 | ---------- | ---------------------------------------- | ---------------------- |
-| `SKILLSET` | Skill set to install: `b2c` or `b2c-cli` | Prompted interactively |
+| `SKILLSET` | Skill set to install: `b2c`, `b2c-cli`, `storefront-next`, or `cap-dev` | Prompted interactively |
 
 ### Flags
 
@@ -411,6 +411,7 @@ b2c setup skills
 # List available skills in a skillset
 b2c setup skills b2c --list
 b2c setup skills b2c-cli --list
+b2c setup skills storefront-next --list
 
 # Install b2c skills to Cursor (project scope)
 b2c setup skills b2c --ide cursor
@@ -447,7 +448,7 @@ b2c setup skills b2c --list --json
 
 When run without `--force`, the command provides an interactive experience:
 
-1. Prompts you to select skill set(s) (if not provided as argument) - you can select both `b2c` and `b2c-cli`
+1. Prompts you to select skill set(s) (if not provided as argument) - you can select multiple sets
 2. Downloads skills from the latest release (or specified version)
 3. Auto-detects installed IDEs
 4. Prompts you to select target IDEs
@@ -465,6 +466,7 @@ For Claude Code users, we recommend using the plugin marketplace for automatic u
 claude plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
 claude plugin install b2c-cli
 claude plugin install b2c
+claude plugin install storefront-next
 ```
 
 The marketplace provides:
@@ -477,10 +479,12 @@ Use `--ide manual` if you prefer manual installation, or `--ide agentforce-vibes
 
 ### Skill Sets
 
-| Skill Set | Description                                     |
-| --------- | ----------------------------------------------- |
-| `b2c`     | B2C Commerce development patterns and practices |
-| `b2c-cli` | B2C CLI commands and operations                 |
+| Skill Set          | Description                                                    |
+| ------------------ | -------------------------------------------------------------- |
+| `b2c`              | B2C Commerce development patterns and practices                |
+| `b2c-cli`          | B2C CLI commands and operations                                |
+| `storefront-next`  | Storefront Next development — routing, components, deployment  |
+| `cap-dev`          | Commerce App Package scaffolding, validation, and submission   |
 
 ### Output
 

docs/guide/agent-skills.md

@@ -17,6 +17,7 @@ claude plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
 # Use --scope project to install for current project only
 claude plugin install b2c-cli
 claude plugin install b2c
+claude plugin install storefront-next
 ```
 
 ```text [Copilot (VS Code)]
@@ -30,6 +31,7 @@ Then enter:
 copilot plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
 copilot plugin install b2c-cli@b2c-developer-tooling
 copilot plugin install b2c@b2c-developer-tooling
+copilot plugin install storefront-next@b2c-developer-tooling
 ```
 
 ```bash [Codex]
@@ -68,6 +70,10 @@ npx @salesforce/b2c-cli setup skills
       <td><a href="https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/tree/main/skills/b2c/skills"><code>b2c</code></a></td>
       <td>B2C Commerce development patterns — controllers, ISML, forms, localization, logging, metadata, web services, custom job steps, Page Designer, Business Manager extensions, Custom APIs</td>
     </tr>
+    <tr>
+      <td><a href="https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/tree/main/skills/storefront-next/skills"><code>storefront-next</code></a></td>
+      <td>Storefront Next development — project setup, routing, data fetching, components, Page Designer, authentication, i18n, extensions, testing, and deployment to Managed Runtime</td>
+    </tr>
     <tr>
       <td><a href="/mcp/"><code>b2c-dx-mcp</code></a></td>
       <td>Automatic project type detection and B2C Commerce workflows for your AI assistant. See <a href="/mcp/installation">MCP Installation</a></td>
@@ -90,12 +96,14 @@ Install plugins at your preferred scope:
 ```bash [User Scope (default)]
 claude plugin install b2c-cli
 claude plugin install b2c
+claude plugin install storefront-next
 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 storefront-next --scope project
 claude plugin install b2c-dx-mcp --scope project
 ```
 
@@ -107,6 +115,7 @@ Verify, update, or uninstall:
 claude plugin list
 claude plugin marketplace update
 claude plugin update b2c-cli@b2c-developer-tooling
+claude plugin update storefront-next@b2c-developer-tooling
 claude plugin uninstall b2c-cli@b2c-developer-tooling
 claude plugin marketplace remove b2c-developer-tooling
 ```
@@ -145,6 +154,7 @@ List available skills:
 ```bash
 b2c setup skills b2c --list
 b2c setup skills b2c-cli --list
+b2c setup skills storefront-next --list
 ```
 
 Install to specific IDEs:
@@ -240,3 +250,7 @@ Once installed, ask your AI assistant:
 - "Help me create a Custom API for loyalty information"
 - "Add logging to my checkout controller"
 - "Create an HTTP service to call the payment gateway API"
+- "Set up a new Storefront Next project"
+- "Add a new route with a loader to my Storefront Next app"
+- "Deploy my Storefront Next storefront to Managed Runtime"
+- "Add Page Designer support to my storefront component"

docs/package.json

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