Merge branch 'main' into W-22283814-local-dev-ach-header-forwarding

Author: kieran-sf

.changeset/RELEASE

@@ -1 +1 @@
-Thu May  7 23:56:57 UTC 2026
+Wed May 13 01:22:16 UTC 2026

.changeset/exclude-evals-from-skill-zips.md

@@ -17,7 +17,7 @@
       "source": "./skills/b2c-cli",
       "category": "productivity",
       "strict": false,
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "name": "b2c",
@@ -29,7 +29,7 @@
       "source": "./skills/b2c",
       "category": "productivity",
       "strict": false,
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "name": "b2c-dx-mcp",
@@ -52,7 +52,7 @@
       "source": "./skills/storefront-next",
       "category": "productivity",
       "strict": false,
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "name": "cap-dev",
@@ -77,11 +77,6 @@
         "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

@@ -6,11 +6,19 @@ on:
       - main
     paths:
       - 'packages/b2c-vs-extension/**'
+      - 'packages/b2c-tooling-sdk/**'
+      - 'pnpm-lock.yaml'
+      - 'pnpm-workspace.yaml'
+      - '.github/workflows/ci-vs-extension.yml'
   pull_request:
     branches:
       - main
     paths:
       - 'packages/b2c-vs-extension/**'
+      - 'packages/b2c-tooling-sdk/**'
+      - 'pnpm-lock.yaml'
+      - 'pnpm-workspace.yaml'
+      - '.github/workflows/ci-vs-extension.yml'
 
 permissions:
   contents: read
@@ -51,12 +59,25 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
+      - name: Cache VS Code test binary
+        uses: actions/cache@v5
+        with:
+          path: packages/b2c-vs-extension/.vscode-test
+          key: ${{ runner.os }}-vscode-test-${{ hashFiles('packages/b2c-vs-extension/.vscode-test.mjs', 'pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-vscode-test-
+
       - 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
+      # Temporarily disabled: SDK dist/cjs emits ESM syntax (tsc with module: Node16
+      # respects the SDK's "type": "module"), which Node's CJS loader rejects when
+      # vscode-test requires it transitively from out/test/*.js. The production VSIX
+      # is unaffected because esbuild bundles the SDK directly. Re-enable once the
+      # SDK CJS emit is fixed.
+      # - name: Run VS Extension tests
+      #   working-directory: packages/b2c-vs-extension
+      #   run: xvfb-run -a pnpm run test

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

@@ -27,6 +27,7 @@ docs/.vitepress/cache
 docs/api/
 
 *dw.json*
+!packages/b2c-vs-extension/src/test/fixtures/**/dw.json
 .env
 .config/wt.toml
 .b2c/

.gitignore

@@ -76,6 +76,14 @@ const guidesSidebar = [
       {text: 'Commerce Apps (CAPs)', link: '/guide/commerce-apps'},
     ],
   },
+  {
+    text: 'VS Code Extension',
+    items: [
+      {text: 'Overview', link: '/vscode-extension/'},
+      {text: 'Installation', link: '/vscode-extension/installation'},
+      {text: 'Configuration', link: '/vscode-extension/configuration'},
+    ],
+  },
   {
     text: 'MCP Server',
     items: [
@@ -197,7 +205,7 @@ document.addEventListener('click', (e) => {
 
 export default defineConfig({
   title: 'B2C Developer Toolkit',
-  description: 'Agentic B2C Developer Toolkit — CLI, Agent Skills, MCP Server, SDK, and IDE extensions for Salesforce B2C Commerce',
+  description: 'Agentic B2C Developer Toolkit — CLI, Agent Skills, MCP Server, SDK, and the B2C DX VS Code Extension for Salesforce B2C Commerce',
   base: basePath,
 
   head: [['script', {}, versionSwitchScript]],
@@ -263,6 +271,7 @@ export default defineConfig({
     nav: [
       {text: 'Guides', link: '/guide/'},
       {text: 'Skills', link: '/guide/agent-skills'},
+      {text: 'VS Code', link: '/vscode-extension/'},
       {text: 'MCP', link: '/mcp/'},
       {text: 'Reference', link: '/cli/'},
       {text: 'SDK', link: '/api/'},
@@ -280,6 +289,7 @@ export default defineConfig({
     sidebar: {
       '/mcp/tools/': referenceSidebar,
       '/mcp/': guidesSidebar,
+      '/vscode-extension/': guidesSidebar,
       '/cli/': referenceSidebar,
       '/guide/': guidesSidebar,
       '/api/': [

docs/.vitepress/config.mts

@@ -1,5 +1,11 @@
 # @salesforce/b2c-dx-docs
 
+## 0.3.1
+
+### Patch Changes
+
+- [#409](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/pull/409) [`ec31234`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/ec312342e14080fb5d51b72243e763030c429f80) - Document the B2C DX VS Code Extension. New `/vscode-extension/` section with overview, installation (with a dynamic download link to the latest VSIX release), configuration reference, and a feature tour covering Sandbox Realm Explorer, Cartridge Code Sync, WebDAV Browser, Content Libraries, SCAPI API Browser, B2C Script Debugger, scaffold/CAP install, log tailing, and B2C CLI plugin support. (Thanks [@clavery](https://github.com/clavery)!)
+
 ## 0.3.0
 
 ### Minor Changes

docs/CHANGELOG.md

@@ -53,7 +53,7 @@ In addition to [global flags](./index#global-flags):
 |------|-------------|---------|
 | `--library` | Library ID or site ID. Also configurable via `content-library` in dw.json. | |
 | `--output`, `-o` | Output directory | `content-<timestamp>` |
-| `--site-library` | Treat the library as a site-private library | `false` |
+| `--site-library` / `--no-site-library` | Treat the library as a site-private library. Defaults from a matching `libraries` config entry, otherwise `false` | from config |
 | `--asset-query`, `-q` | JSON dot-paths for static asset extraction (can be repeated) | `image.path` |
 | `--regex`, `-r` | Treat page IDs as regular expressions | `false` |
 | `--folder` | Filter by folder classification (can be repeated) | |
@@ -102,6 +102,38 @@ export SFCC_SERVER=my-sandbox.demandware.net
 export SFCC_CLIENT_ID=your-client-id
 export SFCC_CLIENT_SECRET=your-client-secret
 b2c content export homepage
+
+# With a libraries config entry (see below) marking the site library as
+# site-private, --site-library is inferred automatically:
+b2c content export homepage --library SiteGenesis
+```
+
+### Configuring multiple libraries
+
+Listing libraries under `b2c.libraries` in `package.json` (or `libraries` in `dw.json`) lets the CLI pick a default library and infer `--site-library` per entry. Bare strings are shared libraries; `{id, siteLibrary: true}` marks a site-private library. Both forms can be mixed:
+
+```json
+{
+  "b2c": {
+    "libraries": [
+      "RefArchSharedLibrary",
+      { "id": "SiteGenesis", "siteLibrary": true }
+    ]
+  }
+}
+```
+
+With this config:
+
+```bash
+# Uses RefArchSharedLibrary (first entry) as the default library
+b2c content export hero-banner
+
+# --site-library is inferred from the matching entry
+b2c content export homepage --library SiteGenesis
+
+# Explicit flag still overrides the config
+b2c content export homepage --library SiteGenesis --no-site-library
 ```
 
 ### Output
@@ -116,7 +148,7 @@ With `--json`, returns a structured result including the library tree, output pa
 
 ### Notes
 
-- The `--library` flag can be set in `dw.json` as `content-library` or in `package.json` under `b2c.contentLibrary` to avoid passing it every time
+- The `--library` flag can be set in `dw.json` as `content-library` or in `package.json` under `b2c.contentLibrary` to avoid passing it every time. You can also list libraries under `b2c.libraries` (mixed strings or `{id, siteLibrary?}` objects); when the resolved library matches an entry marked `siteLibrary: true`, `--site-library` defaults to true automatically. The CLI flag still wins when passed explicitly
 - Use `b2c content list` to discover available page IDs before exporting
 - You can export pages, content assets, or individual components by their content ID. When a component ID is specified, it is promoted to the root of the export with its full child tree
 - The `--asset-query` flag specifies JSON dot-notation paths within component data to extract static asset references. The default `image.path` covers the common Page Designer image component pattern
@@ -141,7 +173,7 @@ In addition to [global flags](./index#global-flags):
 | Flag | Description | Default |
 |------|-------------|---------|
 | `--library` | Library ID or site ID. Also configurable via `content-library` in dw.json. | |
-| `--site-library` | Treat the library as a site-private library | `false` |
+| `--site-library` / `--no-site-library` | Treat the library as a site-private library. Defaults from a matching `libraries` config entry, otherwise `false` | from config |
 | `--library-file` | Use a local library XML file instead of fetching from instance | |
 | `--type` | Filter by node type: `page`, `content`, or `component` | |
 | `--components` | Include components in table output | `false` |
@@ -166,6 +198,11 @@ b2c content list --library SharedLibrary --tree
 # List from a site-private library
 b2c content list --library RefArch --site-library
 
+# With a libraries config entry marking the site library as site-private,
+# --site-library is inferred automatically (see "b2c content export"
+# above for an example b2c.libraries config):
+b2c content list --library SiteGenesis
+
 # List from a local XML file
 b2c content list --library SharedLibrary --library-file ./library.xml
 

docs/cli/content.md

@@ -27,10 +27,6 @@ Then enter:
   SalesforceCommerceCloud/b2c-developer-tooling
 ```
 
-::: tip Updating Copilot Skills in VS Code
-To update the extension marketplace for the latest skills, open the Extensions view sidebar, click **`···`** (the ellipsis menu), and select **Check for Extension Updates**.
-:::
-
 ```bash [Copilot CLI]
 copilot plugin marketplace add SalesforceCommerceCloud/b2c-developer-tooling
 copilot plugin install b2c-cli@b2c-developer-tooling

docs/guide/agent-skills.md

@@ -258,8 +258,11 @@ For the full command reference with all flags, see [Setup Commands](/cli/setup).
 | `account-manager-host`   | Account Manager hostname for OAuth                                                                                                  |
 | `shortCode`              | SCAPI short code. Also accepts `short-code` or `scapi-shortcode`.                                                                   |
 | `content-library`        | Default content library ID for `content export` and `content list` commands                                                         |
+| `libraries`              | Library IDs for the WebDAV browser and Content Libraries tree. Accepts `string[]` or `[{id, siteLibrary?}]`; elements may be mixed  |
+| `asset-query`            | JSON dot-paths used to extract static asset URLs during content library parsing (default `["image.path"]`). Also accepts `assetQuery` |
 | `tenant-id`              | Organization/tenant ID for SCAPI                                                                                                    |
 | `sandbox-api-host`       | ODS (sandbox) API hostname                                                                                                          |
+| `realm`                  | Default ODS realm for sandbox operations                                                                                            |
 | `cip-host`               | CIP analytics host override                                                                                                         |
 | `mrtApiKey`              | MRT API key                                                                                                                         |
 | `mrtProject`             | MRT project slug                                                                                                                    |
@@ -319,15 +322,18 @@ You can store project-level defaults in your `package.json` file under the `b2c`
 
 Only non-sensitive, project-level fields can be configured in `package.json`. Both camelCase and kebab-case are accepted (e.g., `shortCode` or `short-code`):
 
-| Field                | Description                                                                 |
-| -------------------- | --------------------------------------------------------------------------- |
-| `shortCode`          | SCAPI short code                                                            |
-| `clientId`           | OAuth client ID (for implicit login discovery)                              |
-| `contentLibrary`     | Default content library ID for `content export` and `content list` commands |
-| `mrtProject`         | MRT project slug                                                            |
-| `mrtOrigin`          | MRT API origin URL override                                                 |
-| `accountManagerHost` | Account Manager hostname for OAuth                                          |
-| `sandboxApiHost`     | ODS (sandbox) API hostname                                                  |
+| Field                | Description                                                                                                                              |
+| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `shortCode`          | SCAPI short code                                                                                                                         |
+| `clientId`           | OAuth client ID (for implicit login discovery)                                                                                           |
+| `contentLibrary`     | Default content library ID for `content export` and `content list` commands                                                              |
+| `libraries`          | Library IDs for the WebDAV browser and Content Libraries tree. Accepts `string[]` or `[{id, siteLibrary?}]`; elements may be mixed       |
+| `assetQuery`         | JSON dot-paths used to extract static asset URLs during content library parsing (default `["image.path"]`)                               |
+| `mrtProject`         | MRT project slug                                                                                                                         |
+| `mrtOrigin`          | MRT API origin URL override                                                                                                              |
+| `accountManagerHost` | Account Manager hostname for OAuth                                                                                                       |
+| `sandboxApiHost`     | ODS (sandbox) API hostname                                                                                                               |
+| `realm`              | Default ODS realm for sandbox operations                                                                                                 |
 
 ::: warning Security Note
 Sensitive fields like `hostname`, `password`, `clientSecret`, `username`, and `mrtApiKey` are intentionally **not** supported in `package.json`. These should be configured via `dw.json` (which should be in `.gitignore`), environment variables, or secure credential stores.
@@ -337,6 +343,30 @@ Sensitive fields like `hostname`, `password`, `clientSecret`, `username`, and `m
 `package.json` has the lowest priority of all configuration sources. Values from `dw.json`, environment variables, or CLI flags will always override `package.json` settings. This makes it ideal for project defaults that can be overridden per-environment.
 :::
 
+### Content Libraries Example
+
+The `libraries` field can list the content libraries your project works with so that the VS Code Content Libraries tree auto-loads them and `b2c content list/export` can default `--site-library` based on the entry.
+
+A bare string is treated as a shared library; an object can mark a library as site-private. Both forms can appear in the same array:
+
+```json
+{
+  "b2c": {
+    "libraries": [
+      "RefArchSharedLibrary",
+      { "id": "SiteGenesis", "siteLibrary": true }
+    ]
+  }
+}
+```
+
+With this config:
+
+- `b2c content list --library SiteGenesis` calls the site-library API automatically (no need to pass `--site-library`); the library ID is the site ID.
+- `b2c content list --library RefArchSharedLibrary` treats `RefArchSharedLibrary` as a shared library.
+- `--site-library` / `--no-site-library` on the command line still wins over the config default.
+- The VS Code Content Libraries tree shows both entries on activation, with `SiteGenesis` marked `[site]`.
+
 ### Resolution Priority
 
 Configuration is resolved with the following precedence (highest to lowest):