Merge branch 'main' into feature-W-21207882-add-scapi-cors-support

Author: amit-kumar8-sf

.changeset/early-clubs-eat.md

@@ -0,0 +1,6 @@
+---
+'@salesforce/b2c-dx-mcp': patch
+'@salesforce/b2c-dx-docs': patch
+---
+
+MCP MRT Push now uses correct defaults based on detected project type

.changeset/reorganize-docs-navigation.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-dx-docs': patch
+---
+
+Reorganize documentation navigation into Guides, Reference, and SDK sections for clearer information architecture

.changeset/vscode-scaffold-generation.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-tooling-sdk': minor
+---
+
+Add `detectSourceFromPath()` for context-aware scaffold parameter detection, `cartridgePathForDestination()` export, and `builtInScaffoldsDir` option on `createScaffoldRegistry()` for bundled consumers

docs/.vitepress/config.mts

@@ -28,18 +28,18 @@ function getVersionItems() {
   ];
 }
 
-const guideSidebar = [
+const guidesSidebar = [
   {
     text: 'Getting Started',
     items: [
       {text: 'Introduction', link: '/guide/'},
-      {text: 'Installation', link: '/guide/installation'},
-      {text: 'Configuration', link: '/guide/configuration'},
+      {text: 'CLI Installation', link: '/guide/installation'},
+      {text: 'CLI Configuration', link: '/guide/configuration'},
       {text: 'Agent Skills & Plugins', link: '/guide/agent-skills'},
     ],
   },
   {
-    text: 'Guides',
+    text: 'How-To',
     items: [
       {text: 'Authentication Setup', link: '/guide/authentication'},
       {text: 'CI/CD with GitHub Actions', link: '/guide/ci-cd'},
@@ -55,8 +55,8 @@ const guideSidebar = [
     text: 'MCP Server',
     items: [
       {text: 'Overview', link: '/mcp/'},
-      {text: 'Installation', link: '/mcp/installation'},
-      {text: 'Configuration', link: '/mcp/configuration'},
+      {text: 'MCP Installation', link: '/mcp/installation'},
+      {text: 'MCP Configuration', link: '/mcp/configuration'},
       {text: 'Toolsets & Tools', link: '/mcp/toolsets'},
       {text: 'Figma Tools Setup', link: '/mcp/figma-tools-setup'},
     ],
@@ -68,34 +68,37 @@ const guideSidebar = [
       {text: '3rd Party Plugins', link: '/guide/third-party-plugins'},
     ],
   },
+];
+
+const referenceSidebar = [
   {
-    text: 'CLI Reference',
+    text: 'CLI Commands',
     items: [
       {text: 'Overview', link: '/cli/'},
-      {text: 'Code Commands', link: '/cli/code'},
-      {text: 'Content Commands', link: '/cli/content'},
-      {text: 'CIP Commands', link: '/cli/cip'},
-      {text: 'Job Commands', link: '/cli/jobs'},
-      {text: 'Logs Commands', link: '/cli/logs'},
-      {text: 'Sites Commands', link: '/cli/sites'},
-      {text: 'WebDAV Commands', link: '/cli/webdav'},
-      {text: 'Sandbox Commands', link: '/cli/sandbox'},
-      {text: 'MRT Commands', link: '/cli/mrt'},
-      {text: 'eCDN Commands', link: '/cli/ecdn'},
-      {text: 'SLAS Commands', link: '/cli/slas'},
+      {text: 'Account Manager', link: '/cli/account-manager'},
+      {text: 'Auth', link: '/cli/auth'},
+      {text: 'CIP', link: '/cli/cip'},
+      {text: 'Code', link: '/cli/code'},
+      {text: 'Content', link: '/cli/content'},
       {text: 'Custom APIs', link: '/cli/custom-apis'},
+      {text: 'Docs', link: '/cli/docs'},
+      {text: 'eCDN', link: '/cli/ecdn'},
+      {text: 'Jobs', link: '/cli/jobs'},
+      {text: 'Logs', link: '/cli/logs'},
+      {text: 'MRT', link: '/cli/mrt'},
+      {text: 'Sandbox', link: '/cli/sandbox'},
+      {text: 'Scaffold', link: '/cli/scaffold'},
       {text: 'SCAPI Schemas', link: '/cli/scapi-schemas'},
-      {text: 'SCAPI CORS Commands', link: '/cli/scapi-cors'},
-      {text: 'Setup Commands', link: '/cli/setup'},
-      {text: 'Scaffold Commands', link: '/cli/scaffold'},
-      {text: 'Docs Commands', link: '/cli/docs'},
-      {text: 'Auth Commands', link: '/cli/auth'},
-      {text: 'Account Manager Commands', link: '/cli/account-manager'},
+      {text: 'SCAPI Cors Preferences', link: '/cli/scapi-cors'},
+      {text: 'Setup', link: '/cli/setup'},
+      {text: 'Sites', link: '/cli/sites'},
+      {text: 'SLAS', link: '/cli/slas'},
+      {text: 'WebDAV', link: '/cli/webdav'},
       {text: 'Logging', link: '/cli/logging'},
     ],
   },
   {
-    text: 'Tools Reference',
+    text: 'MCP Tools',
     items: [
       {text: 'cartridge_deploy', link: '/mcp/tools/cartridge-deploy'},
       {text: 'mrt_bundle_push', link: '/mcp/tools/mrt-bundle-push'},
@@ -158,10 +161,10 @@ export default defineConfig({
       level: [2, 3],
     },
     nav: [
-      {text: 'Guide', link: '/guide/'},
-      {text: 'CLI Reference', link: '/cli/'},
-      {text: 'API Reference', link: '/api/'},
-      {text: 'MCP Server', link: '/mcp/'},
+      {text: 'Guides', link: '/guide/'},
+      {text: 'MCP', link: '/mcp/'},
+      {text: 'Reference', link: '/cli/'},
+      {text: 'SDK', link: '/api/'},
       {
         text: isDevBuild ? 'Dev' : 'Latest',
         items: getVersionItems(),
@@ -174,12 +177,13 @@ export default defineConfig({
     },
 
     sidebar: {
-      '/guide/': guideSidebar,
-      '/cli/': guideSidebar,
-      '/mcp/': guideSidebar,
+      '/mcp/tools/': referenceSidebar,
+      '/mcp/': guidesSidebar,
+      '/cli/': referenceSidebar,
+      '/guide/': guidesSidebar,
       '/api/': [
         {
-          text: 'API Reference',
+          text: 'SDK Reference',
           items: [{text: 'Overview', link: '/api/'}],
         },
         ...typedocSidebar,

docs/api-readme.md

@@ -1,8 +1,8 @@
 ---
-description: API reference for the B2C Tooling SDK with typed WebDAV and OCAPI clients for programmatic B2C Commerce operations.
+description: SDK reference for the B2C Tooling SDK with typed WebDAV and OCAPI clients for programmatic B2C Commerce operations.
 ---
 
-# API Reference
+# SDK Reference
 
 The `@salesforce/b2c-tooling-sdk` package provides TypeScript APIs for B2C Commerce development, including instance clients (WebDAV, OCAPI), platform service clients (SCAPI, SLAS, MRT, ODS), high-level operations, and developer utilities.
 

docs/guide/index.md

@@ -69,5 +69,5 @@ See the [MCP Server Installation Guide](/mcp/installation) for detailed setup in
 - [IDE Integration](./ide-integration) - Connect Prophet VS Code to B2C CLI configuration
 - [MCP Server](/mcp/) - AI-assisted development with Model Context Protocol
 - [CLI Reference](/cli/) - Browse available commands
-- [Tools Reference](/mcp/toolsets) - Explore MCP tools for cartridges, MRT, SCAPI, and so on
-- [API Reference](/api/) - Explore the SDK API
+- [MCP Tools](/mcp/toolsets) - Explore MCP tools for cartridges, MRT, SCAPI, and so on
+- [SDK Reference](/api/) - Explore the SDK

docs/index.md

@@ -13,15 +13,12 @@ hero:
     - theme: brand
       text: Get Started
       link: /guide/
-    - theme: alt
-      text: CLI Reference
-      link: /cli/
     - theme: alt
       text: MCP Server
       link: /mcp/
     - theme: alt
-      text: API Reference
-      link: /api/
+      text: Reference
+      link: /cli/
 
 features:
   - icon: "\U0001F680"
@@ -53,7 +50,7 @@ features:
     title: SDK Library
     details: Build custom integrations with @salesforce/b2c-tooling-sdk - the same SDK powering the CLI.
     link: /api/
-    linkText: API Reference
+    linkText: SDK Reference
   - icon: "\U0001F510"
     title: Account Management
     details: Manage users, roles, organizations, and API clients in Account Manager via CLI and SDK.

docs/mcp/tools/mrt-bundle-push.md

@@ -30,14 +30,38 @@ Requires Managed Runtime (MRT) credentials. See [MRT Credentials](../configurati
 
 ## Parameters
 
+Defaults for `buildDirectory`, `ssrOnly`, and `ssrShared` are chosen by detected project type (Storefront Next, PWA Kit v3, or generic). Explicit parameters override the project-type defaults.
+
 | Parameter | Type | Required | Default | Description |
 |-----------|------|----------|---------|-------------|
 | `buildDirectory` | string | No | `./build` | Path to build directory containing the built project files. Can be absolute or relative to the project directory. |
 | `message` | string | No | None | Deployment message to include with the bundle push. Useful for tracking deployments. |
-| `ssrOnly` | string | No | `ssr.js,ssr.mjs,server/**/*` | Comma-separated glob patterns for server-only files (SSR). These files are only included in the server bundle. |
-| `ssrShared` | string | No | `static/**/*,client/**/*` | Comma-separated glob patterns for shared files. These files are included in both server and client bundles. |
+| `ssrOnly` | string | No | Varies by project type | Glob patterns for server-only files (SSR), comma-separated or JSON array. These files are only included in the server bundle. |
+| `ssrShared` | string | No | Varies by project type | Glob patterns for shared files, comma-separated or JSON array. These files are included in both server and client bundles. |
 | `deploy` | boolean | No | `false` | Whether to deploy to an environment after push. When `true`, `environment` must be provided via `--environment` flag or `MRT_ENVIRONMENT`. |
 
+### Default values by project type
+
+When `buildDirectory`, `ssrOnly`, or `ssrShared` are omitted, the tool detects the project type and applies these defaults:
+
+**Generic** (used when no project type is detected; matches CLI `b2c mrt bundle deploy` defaults):
+
+- `buildDirectory`: `./build`
+- `ssrOnly`: `ssr.js`, `ssr.mjs`, `server/**/*`
+- `ssrShared`: `static/**/*`, `client/**/*`
+
+**PWA Kit v3**:
+
+- `buildDirectory`: `./build`
+- `ssrOnly`: `ssr.js`, `ssr.js.map`, `node_modules/**/*.*`
+- `ssrShared`: `static/ico/favicon.ico`, `static/robots.txt`, `**/*.js`, `**/*.js.map`, `**/*.json`
+
+**Storefront Next**:
+
+- `buildDirectory`: `./build`
+- `ssrOnly`: `server/**/*`, `loader.js`, `streamingHandler.{js,mjs,cjs}`, `streamingHandler.{js,mjs,cjs}.map`, `ssr.{js,mjs,cjs}`, `ssr.{js,mjs,cjs}.map`, `!static/**/*`, `sfnext-server-*.mjs`, plus exclusions for Storybook and test files
+- `ssrShared`: `client/**/*`, `static/**/*`, `**/*.css`, image/font extensions, plus exclusions for Storybook and test files
+
 ## Usage Examples
 
 ### Push Bundle Only