@salesforce/b2c-dx-mcp 0.4.13 → 0.5.0

package/README.md

@@ -82,9 +82,9 @@ See the [Configuration Guide](https://salesforcecommercecloud.github.io/b2c-deve
 |---------|-------|------|
 | CARTRIDGES | `cartridge_deploy` | [toolsets#cartridges](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#cartridges) |
 | MRT | `mrt_bundle_push` | [toolsets#mrt](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#mrt) |
-| SCAPI | `scapi_schemas_list`, `scapi_custom_apis_status`, `scapi_customapi_scaffold` | [toolsets#scapi](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#scapi) |
-| STOREFRONTNEXT | `storefront_next_development_guidelines`, `storefront_next_page_designer_decorator`, `storefront_next_site_theming`, `storefront_next_figma_to_component_workflow`, `storefront_next_generate_component`, `storefront_next_map_tokens_to_theme` | [toolsets#storefrontnext](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#storefrontnext) |
-| PWAV3 | `pwakit_development_guidelines` + SCAPI tools | [toolsets#pwav3](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#pwav3) |
+| SCAPI | `scapi_schemas_list`, `scapi_custom_apis_get_status`, `scapi_custom_api_generate_scaffold` | [toolsets#scapi](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#scapi) |
+| STOREFRONTNEXT | `sfnext_get_guidelines`, `sfnext_add_page_designer_decorator`, `sfnext_configure_theme`, `sfnext_start_figma_workflow`, `sfnext_analyze_component`, `sfnext_match_tokens_to_theme` | [toolsets#storefrontnext](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#storefrontnext) |
+| PWAV3 | `pwakit_get_guidelines` + SCAPI tools | [toolsets#pwav3](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/toolsets#pwav3) |
 
 ### cartridge_deploy
 
@@ -107,62 +107,62 @@ List or fetch SCAPI schemas (standard and custom). [Details](https://salesforcec
 - "Use the MCP tool to list all SCAPI schemas."
 - "Use the MCP tool to get the OpenAPI schema for shopper-baskets v1."
 
-### scapi_custom_apis_status
+### scapi_custom_apis_get_status
 
-Get custom API endpoint registration status. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/scapi-custom-apis-status)
+Get custom API endpoint registration status. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/scapi-custom-apis-get-status)
 
 - "Use the MCP tool to list custom API endpoints on my instance."
 - "Use the MCP tool to show which custom APIs are active vs not registered."
 
-### scapi_customapi_scaffold
+### scapi_custom_api_generate_scaffold
 
-Generate new custom SCAPI endpoint in a cartridge. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/scapi-custom-api-scaffold)
+Generate new custom SCAPI endpoint in a cartridge. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/scapi-custom-api-generate-scaffold)
 
 - "Use the MCP tool to scaffold a new custom API named my-products."
 - "Use the MCP tool to create a custom admin API called customer-trips."
 
-### storefront_next_development_guidelines
+### sfnext_get_guidelines
 
-Get Storefront Next guidelines and best practices. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-development-guidelines)
+Get Storefront Next guidelines and best practices. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-get-guidelines)
 
 - "Use the MCP tool to show me critical Storefront Next rules."
 - "Use the MCP tool to get data-fetching and component patterns."
 
-### storefront_next_page_designer_decorator
+### sfnext_add_page_designer_decorator
 
-Add Page Designer decorators to components. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-page-designer-decorator)
+Add Page Designer decorators to components. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-add-page-designer-decorator)
 
 - "Use the MCP tool to add Page Designer decorators to my component."
 
-### storefront_next_site_theming
+### sfnext_configure_theme
 
-Get theming guidelines, questions, and WCAG color validation for Storefront Next. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-site-theming)
+Get theming guidelines, questions, and WCAG color validation for Storefront Next. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-configure-theme)
 
 - "Use the MCP tool to help me apply my brand colors to my Storefront Next site."
 - "Use the MCP tool to validate my color combinations for accessibility."
 
-### storefront_next_figma_to_component_workflow
+### sfnext_start_figma_workflow
 
-Workflow orchestrator for Figma-to-component conversion. Parses Figma URL, returns step-by-step instructions for subsequent tool calls. Requires external Figma MCP server. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-figma-to-component-workflow) — [Figma Setup](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/figma-tools-setup)
+Workflow orchestrator for Figma-to-component conversion. Parses Figma URL, returns step-by-step instructions for subsequent tool calls. Requires external Figma MCP server. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-start-figma-workflow) — [Figma Setup](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/figma-tools-setup)
 
 - "Use the MCP tool to convert this Figma design to a Storefront Next component: [Figma URL with node-id]"
 - "Use the MCP tool to create this homepage from the Figma design: [Figma URL with node-id]"
 
-### storefront_next_generate_component
+### sfnext_analyze_component
 
-Analyze Figma design and discovered components to recommend REUSE, EXTEND, or CREATE strategy. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-generate-component)
+Analyze design and discovered components to recommend REUSE, EXTEND, or CREATE strategy. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-analyze-component)
 
 - "Use the MCP tool to analyze the Figma design and recommend whether to reuse, extend, or create a component."
 
-### storefront_next_map_tokens_to_theme
+### sfnext_match_tokens_to_theme
 
-Map Figma design tokens to existing theme tokens in app.css with confidence scores and suggestions. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/storefront-next-map-tokens-to-theme)
+Map design tokens to existing theme tokens in app.css with confidence scores and suggestions. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/sfnext-match-tokens-to-theme)
 
 - "Use the MCP tool to map these Figma design tokens to my theme."
 
-### pwakit_development_guidelines
+### pwakit_get_guidelines
 
-Get PWA Kit v3 guidelines. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/pwakit-development-guidelines)
+Get PWA Kit v3 guidelines. [Details](https://salesforcecommercecloud.github.io/b2c-developer-tooling/mcp/tools/pwakit-get-guidelines)
 
 - "Use the MCP tool to get PWA Kit development guidelines."
 

package/content/sfnext/page-designer.md

@@ -35,7 +35,7 @@ To add a new content page: define a page type and ID in Commerce Cloud, then in
 
 - **Add a metadata class** with `@Component('typeId', { name, description })` and `@AttributeDefinition()` (and optionally `@AttributeDefinition({ type: 'image' })`, `type: 'url'`, etc.) for each prop you want editable in Page Designer. Use `@RegionDefinition([...])` if the component has nested regions (e.g. a grid with slots).
 - **Implement the React component** so it accepts those props (and strips Page Designer–only props like `component`, `page`, `componentData`, `designMetadata` before spreading to the DOM). If the component needs server data (e.g. products for a carousel), export a `loader({ componentData, context })` and optionally a `fallback` component; the registry calls the loader during `collectComponentDataPromises` and passes resolved data as the `data` prop.
-- **Use the MCP tool `storefront_next_page_designer_decorator`** to generate decorators instead of writing them by hand. Example components: `components/hero/index.tsx`, `components/content-card/index.tsx`, `components/product-carousel/index.tsx`.
+- **Use the MCP tool `sfnext_add_page_designer_decorator`** to generate decorators instead of writing them by hand. Example components: `components/hero/index.tsx`, `components/content-card/index.tsx`, `components/product-carousel/index.tsx`.
 
 ### After changes
 
@@ -50,29 +50,21 @@ To add a new content page: define a page type and ID in Commerce Cloud, then in
 
 Use the **B2C DX MCP server** for Page Designer work instead of hand-writing decorators and metadata. Configure the B2C DX MCP server in your IDE (e.g. in MCP settings) so these tools are available.
 
-### 1. `storefront_next_page_designer_decorator` (STOREFRONTNEXT toolset)
+### 1. `sfnext_add_page_designer_decorator` (STOREFRONTNEXT toolset)
 
 Adds Page Designer decorators to an existing React component so it can be used in Business Manager. The tool analyzes the component, picks suitable props, infers types (e.g. `*Url`/`*Link` → url, `*Image` → image, `is*`/`show*` → boolean), and generates `@Component('typeId', { name, description })`, `@AttributeDefinition()` on a metadata class, and optionally `@RegionDefinition([...])` for nested regions. It skips complex or UI-only props (e.g. className, style, callbacks).
 
 - **Auto mode** (fast): Ask in your IDE: *"Add Page Designer support to [ComponentName] with autoMode"*. The tool runs in one turn with no prompts.
 - **Interactive mode** (control): Ask *"Add Page Designer support to [ComponentName]"* and answer questions about typeId, which props to expose, types, and optional nested regions.
 
-### 2. `storefront_next_generate_page_designer_metadata` (STOREFRONTNEXT toolset)
+### 2. `cartridge_deploy` (CARTRIDGES toolset)
 
-Generates Page Designer metadata JSON from decorated components, page types, and aspects. Writes files under the cartridge experience folder (e.g. `cartridges/app_storefrontnext_base/cartridge/experience/`). Use after adding or changing decorators so Business Manager has up-to-date component and page-type definitions.
-
-- **Full scan**: Run with no file list to process the whole project.
-- **Incremental**: Pass specific file paths to regenerate only those components.
-- **Dry run**: Use `dryRun: true` to see what would be generated without writing files.
-
-### 3. `cartridge_deploy` (CARTRIDGES toolset)
-
-Packages the cartridge, uploads it to Commerce Cloud via WebDAV, and unpacks it on the server. Requires Commerce Cloud credentials (e.g. `dw.json` or explicit config). Use after generating metadata so the new/updated metadata is available in Business Manager.
+Packages the cartridge, uploads it to Commerce Cloud via WebDAV, and unpacks it on the server. **Run `pnpm generate:cartridge` or `pnpm build` before `cartridge_deploy`.** Requires Commerce Cloud credentials (e.g. `dw.json` or explicit config). Use after generating metadata so the new/updated metadata is available in Business Manager.
 
 ### Typical workflow
 
-1. **`storefront_next_page_designer_decorator`** — Add decorators to the component (use autoMode for a quick first pass).
-2. **`storefront_next_generate_page_designer_metadata`** — Generate metadata JSON so the component and regions appear in Page Designer.
+1. **`sfnext_add_page_designer_decorator`** — Add decorators to the component (use autoMode for a quick first pass).
+2. **Rebuild** — The static registry is auto-generated at build time by the staticRegistry Vite plugin.
 3. **`cartridge_deploy`** — Deploy to Commerce Cloud so merchants can use the component in Business Manager.
 
 ## Best Practices
@@ -81,6 +73,6 @@ Packages the cartridge, uploads it to Commerce Cloud via WebDAV, and unpacks it
 2. **Use registry for components**: Register all Page Designer components with proper `typeId`
 3. **Handle design mode**: Adapt UI when `pageDesignerMode` is `'EDIT'` or `'PREVIEW'`
 4. **Rebuild after registry changes**: Static registry is generated at build time
-5. **Use MCP tools**: Leverage `storefront_next_page_designer_decorator` and `storefront_next_generate_page_designer_metadata` for faster development
+5. **Use MCP tools**: Leverage `sfnext_add_page_designer_decorator` for faster development
 
 **Reference:** See README.md for complete Page Designer documentation and MCP tool setup.

package/content/sfnext/quick-reference.md

@@ -196,7 +196,7 @@ import { Card } from '@/components/ui/card';
 
 ## 🔍 Get Detailed Guidelines
 
-Use the `storefront_next_development_guidelines` MCP tool with specific sections:
+Use the `sfnext_get_guidelines` MCP tool with specific sections:
 
 ```json
 {

package/dist/commands/mcp.d.ts

@@ -81,7 +81,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
      * 3. dw.json file (via --config flag or auto-discovered from --project-directory)
      * 4. ~/.mobify file (for MRT API key)
      */
-    protected loadConfiguration(): ResolvedB2CConfig;
+    protected loadConfiguration(): Promise<ResolvedB2CConfig>;
     /**
      * Loads configuration and creates a new Services instance.
      *
@@ -91,7 +91,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
      *
      * @returns A new Services instance with loaded configuration
      */
-    protected loadServices(): Services;
+    protected loadServices(): Promise<Services>;
     /**
      * Main entry point - starts the MCP server.
      *

package/dist/commands/mcp.js

@@ -236,7 +236,7 @@ export default class McpServerCommand extends BaseCommand {
      * 3. dw.json file (via --config flag or auto-discovered from --project-directory)
      * 4. ~/.mobify file (for MRT API key)
      */
-    loadConfiguration() {
+    async loadConfiguration() {
         const mrt = extractMrtFlags(this.flags);
         const options = {
             ...this.getBaseConfigOptions(),
@@ -258,8 +258,8 @@ export default class McpServerCommand extends BaseCommand {
      *
      * @returns A new Services instance with loaded configuration
      */
-    loadServices() {
-        const config = this.loadConfiguration();
+    async loadServices() {
+        const config = await this.loadConfiguration();
         return Services.fromResolvedConfig(config);
     }
     /**

package/dist/registry.d.ts

@@ -14,7 +14,7 @@ export type ToolRegistry = Record<Toolset, McpTool[]>;
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Complete tool registry
  */
-export declare function createToolRegistry(loadServices: () => Services): ToolRegistry;
+export declare function createToolRegistry(loadServices: () => Promise<Services> | Services): ToolRegistry;
 /**
  * Register tools with the MCP server based on startup flags.
  *
@@ -34,4 +34,4 @@ export declare function createToolRegistry(loadServices: () => Services): ToolRe
  * @param server - B2CDxMcpServer instance
  * @param loadServices - Function that loads configuration and returns Services instance
  */
-export declare function registerToolsets(flags: StartupFlags, server: B2CDxMcpServer, loadServices: () => Services): Promise<void>;
+export declare function registerToolsets(flags: StartupFlags, server: B2CDxMcpServer, loadServices: () => Promise<Services> | Services): Promise<void>;

package/dist/tools/adapter.d.ts

@@ -206,4 +206,4 @@ export declare function jsonResult(data: unknown, indent?: number): ToolResult;
  * }, loadServices);
  * ```
  */
-export declare function createToolAdapter<TInput, TOutput>(options: ToolAdapterOptions<TInput, TOutput>, loadServices: () => Services): McpTool;
+export declare function createToolAdapter<TInput, TOutput>(options: ToolAdapterOptions<TInput, TOutput>, loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/adapter.js

@@ -187,7 +187,7 @@ export function createToolAdapter(options, loadServices) {
             const args = parseResult.data;
             try {
                 // 2. Load Services to get fresh configuration (re-reads config files)
-                const services = loadServices();
+                const services = await loadServices();
                 // 3. Get B2CInstance if required (loaded on each call)
                 let b2cInstance;
                 if (requiresInstance) {

package/dist/tools/cartridges/index.d.ts

@@ -18,5 +18,5 @@ interface CartridgeToolInjections {
  * @param injections - Optional dependency injections for testing
  * @returns Array of MCP tools
  */
-export declare function createCartridgesTools(loadServices: () => Services, injections?: CartridgeToolInjections): McpTool[];
+export declare function createCartridgesTools(loadServices: () => Promise<Services> | Services, injections?: CartridgeToolInjections): McpTool[];
 export {};

package/dist/tools/mrt/index.d.ts

@@ -21,5 +21,5 @@ interface MrtToolInjections {
  * @param injections - Optional dependency injections for testing
  * @returns Array of MCP tools
  */
-export declare function createMrtTools(loadServices: () => Services, injections?: MrtToolInjections): McpTool[];
+export declare function createMrtTools(loadServices: () => Promise<Services> | Services, injections?: MrtToolInjections): McpTool[];
 export {};

package/dist/tools/pwav3/index.d.ts

@@ -19,4 +19,4 @@ import type { Services } from '../../services.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Array of MCP tools
  */
-export declare function createPwav3Tools(loadServices: () => Services): McpTool[];
+export declare function createPwav3Tools(loadServices: () => Promise<Services> | Services): McpTool[];

package/dist/tools/pwav3/pwa-kit-development-guidelines.d.ts

@@ -6,4 +6,4 @@ import type { Services } from '../../services.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns The configured MCP tool
  */
-export declare function createDeveloperGuidelinesTool(loadServices: () => Services): McpTool;
+export declare function createDeveloperGuidelinesTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/pwav3/pwa-kit-development-guidelines.js

@@ -95,7 +95,7 @@ const DEFAULT_SECTIONS = ['quick-reference', 'components', 'data-fetching', 'rou
  */
 export function createDeveloperGuidelinesTool(loadServices) {
     return createToolAdapter({
-        name: 'pwakit_development_guidelines',
+        name: 'pwakit_get_guidelines',
         description: 'ESSENTIAL FIRST STEP for PWA Kit v3 development. Returns critical architecture rules, coding standards, and best practices. ' +
             'Use this tool FIRST before writing any PWA Kit code to understand non-negotiable patterns for React components, ' +
             'data fetching, routing, configuration, and framework constraints. Returns comprehensive guidelines by default (quick-reference + key sections); ' +

package/dist/tools/scapi/index.d.ts

@@ -14,4 +14,4 @@ import type { Services } from '../../services.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Array of MCP tools
  */
-export declare function createScapiTools(loadServices: () => Services): McpTool[];
+export declare function createScapiTools(loadServices: () => Promise<Services> | Services): McpTool[];

package/dist/tools/scapi/index.js

@@ -4,8 +4,8 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 import { createScapiSchemasListTool } from './scapi-schemas-list.js';
-import { createScapiCustomApisStatusTool } from './scapi-custom-apis-status.js';
-import { createScaffoldCustomApiTool } from './scapi-custom-api-scaffold.js';
+import { createScapiCustomApisStatusTool } from './scapi-custom-apis-get-status.js';
+import { createScaffoldCustomApiTool } from './scapi-custom-api-generate-scaffold.js';
 /**
  * Creates all tools for the SCAPI toolset.
  *

package/dist/tools/scapi/{scapi-custom-api-scaffold.d.ts → scapi-custom-api-generate-scaffold.d.ts}

@@ -9,7 +9,7 @@ export interface ScaffoldCustomApiExecuteOverrides {
     resolveScaffoldParameters?: (scaffold: Scaffold, opts: ResolveParametersOptions) => Promise<ResolvedParameters>;
 }
 /**
- * Input schema for scapi_custom_api_scaffold tool.
+ * Input schema for scapi_custom_api_generate_scaffold tool.
  * Parameters match the custom-api scaffold: apiName, apiType, cartridgeName, etc.
  */
 interface ScaffoldCustomApiInput {
@@ -27,7 +27,7 @@ interface ScaffoldCustomApiInput {
     outputDir?: string;
 }
 /**
- * Output schema for scapi_custom_api_scaffold tool.
+ * Output schema for scapi_custom_api_generate_scaffold tool.
  */
 interface ScaffoldCustomApiOutput {
     scaffold: string;
@@ -47,7 +47,7 @@ interface ScaffoldCustomApiOutput {
  */
 export declare function executeScaffoldCustomApi(args: ScaffoldCustomApiInput, services: Services, overrides?: ScaffoldCustomApiExecuteOverrides): Promise<ScaffoldCustomApiOutput>;
 /**
- * Creates the scapi_custom_api_scaffold tool.
+ * Creates the scapi_custom_api_generate_scaffold tool.
  *
  * Uses @salesforce/b2c-tooling-sdk scaffold: registry, resolveScaffoldParameters,
  * resolveOutputDirectory, generateFromScaffold. cartridgeName must be a cartridge
@@ -56,5 +56,5 @@ export declare function executeScaffoldCustomApi(args: ScaffoldCustomApiInput, s
  * @param loadServices - Function that returns Services (used by adapter on each call).
  * @param executeOverrides - Optional overrides for testing (getScaffold, resolveScaffoldParameters).
  */
-export declare function createScaffoldCustomApiTool(loadServices: () => Services, executeOverrides?: ScaffoldCustomApiExecuteOverrides): McpTool;
+export declare function createScaffoldCustomApiTool(loadServices: () => Promise<Services> | Services, executeOverrides?: ScaffoldCustomApiExecuteOverrides): McpTool;
 export {};

package/dist/tools/scapi/{scapi-custom-api-scaffold.js → scapi-custom-api-generate-scaffold.js}

@@ -4,12 +4,12 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 /**
- * SCAPI Custom API Scaffold tool.
+ * SCAPI Custom API Generate Scaffold tool.
  *
  * Generates a new custom SCAPI endpoint using the SDK's custom-api scaffold
  * (schema.yaml, api.json, script.js).
  *
- * @module tools/scapi/scapi-custom-api-scaffold
+ * @module tools/scapi/scapi-custom-api-generate-scaffold
  */
 import { z } from 'zod';
 import { createToolAdapter, jsonResult, errorResult } from '../adapter.js';
@@ -122,7 +122,7 @@ export async function executeScaffoldCustomApi(args, services, overrides) {
     }
 }
 /**
- * Creates the scapi_custom_api_scaffold tool.
+ * Creates the scapi_custom_api_generate_scaffold tool.
  *
  * Uses @salesforce/b2c-tooling-sdk scaffold: registry, resolveScaffoldParameters,
  * resolveOutputDirectory, generateFromScaffold. cartridgeName must be a cartridge
@@ -133,7 +133,7 @@ export async function executeScaffoldCustomApi(args, services, overrides) {
  */
 export function createScaffoldCustomApiTool(loadServices, executeOverrides) {
     return createToolAdapter({
-        name: 'scapi_custom_api_scaffold',
+        name: 'scapi_custom_api_generate_scaffold',
         description: `Generate a new custom SCAPI endpoint (OAS 3.0 schema, api.json, script.js) in an existing cartridge. \
 Required: apiName (kebab-case). Optional: cartridgeName (defaults to first cartridge found in project), apiType (shopper|admin) default to shopper, \
 apiDescription, projectRoot, outputDir.`,
@@ -172,4 +172,4 @@ apiDescription, projectRoot, outputDir.`,
         },
     }, loadServices);
 }
-//# sourceMappingURL=scapi-custom-api-scaffold.js.map
+//# sourceMappingURL=scapi-custom-api-generate-scaffold.js.map

package/dist/tools/scapi/{scapi-custom-apis-status.d.ts → scapi-custom-apis-get-status.d.ts}

@@ -1,9 +1,9 @@
 import type { Services } from '../../services.js';
 import type { McpTool } from '../../utils/index.js';
 /**
- * Creates the scapi_custom_apis_status tool.
+ * Creates the scapi_custom_apis_get_status tool.
  *
  * Mirrors CLI: b2c scapi custom status. All flags supported; agent chooses what to use.
  * See: https://salesforcecommercecloud.github.io/b2c-developer-tooling/cli/custom-apis.html#b2c-scapi-custom-status
  */
-export declare function createScapiCustomApisStatusTool(loadServices: () => Services): McpTool;
+export declare function createScapiCustomApisStatusTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/scapi/{scapi-custom-apis-status.js → scapi-custom-apis-get-status.js}

@@ -9,7 +9,7 @@
  * Mirrors CLI: b2c scapi custom status. All CLI flags are supported; let the agent decide what to use.
  * Returns raw endpoints from the API (no roll-up). Remote only.
  *
- * @module tools/scapi/scapi-custom-apis-status
+ * @module tools/scapi/scapi-custom-apis-get-status
  */
 import { z } from 'zod';
 import { createToolAdapter, jsonResult } from '../adapter.js';
@@ -74,14 +74,14 @@ function buildResponse(withMeta, args, columnList, activeCodeVersion) {
     };
 }
 /**
- * Creates the scapi_custom_apis_status tool.
+ * Creates the scapi_custom_apis_get_status tool.
  *
  * Mirrors CLI: b2c scapi custom status. All flags supported; agent chooses what to use.
  * See: https://salesforcecommercecloud.github.io/b2c-developer-tooling/cli/custom-apis.html#b2c-scapi-custom-status
  */
 export function createScapiCustomApisStatusTool(loadServices) {
     return createToolAdapter({
-        name: 'scapi_custom_apis_status',
+        name: 'scapi_custom_apis_get_status',
         description: `List Custom SCAPI endpoint registration status (active/not_registered). Returns one row per endpoint per site. For schemas, use scapi_schemas_list with apiFamily: "custom".
 
 Use cases: Check endpoint status, verify deployment, get per-site details. Use status: "active" to filter, groupBy: "site" to group, columns: "field1,field2" for specific fields, or omit columns for defaults.
@@ -149,4 +149,4 @@ CLI: b2c scapi custom status`,
         formatOutput: (output) => jsonResult(output),
     }, loadServices);
 }
-//# sourceMappingURL=scapi-custom-apis-status.js.map
+//# sourceMappingURL=scapi-custom-apis-get-status.js.map

package/dist/tools/scapi/scapi-schemas-list.d.ts

@@ -9,4 +9,4 @@ import type { McpTool } from '../../utils/index.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for listing/fetching SCAPI schemas
  */
-export declare function createScapiSchemasListTool(loadServices: () => Services): McpTool;
+export declare function createScapiSchemasListTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/scapi/scapi-schemas-list.js

@@ -187,7 +187,7 @@ function getAvailableFilters(schemas) {
 export function createScapiSchemasListTool(loadServices) {
     return createToolAdapter({
         name: 'scapi_schemas_list',
-        description: `List or fetch SCAPI schema metadata and OpenAPI specs for standard SCAPI (Shop/Admin/Shopper) and custom APIs (apiFamily: "custom"). For endpoint registration status, use scapi_custom_apis_status.
+        description: `List or fetch SCAPI schema metadata and OpenAPI specs for standard SCAPI (Shop/Admin/Shopper) and custom APIs (apiFamily: "custom"). For endpoint registration status, use scapi_custom_apis_get_status.
 
 **Modes:**
 - **List (discovery):** Omit includeSchemas or any identifier. Returns metadata: schemas[], total, availableApiFamilies/Names/Versions.

package/dist/tools/storefrontnext/figma/figma-to-component/index.d.ts

@@ -34,9 +34,9 @@ export interface WorkflowConfig {
  */
 export declare function generateWorkflowResponse(figmaUrl: string, workflowFilePath?: string): string;
 /**
- * Creates the storefront_next_figma_to_component_workflow MCP tool.
+ * Creates the sfnext_start_figma_workflow MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for workflow orchestration
  */
-export declare function createFigmaToComponentTool(loadServices: () => Services): McpTool;
+export declare function createFigmaToComponentTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/figma/figma-to-component/index.js

@@ -224,7 +224,7 @@ function formatNextStepsReminder() {
 
 This tool has provided workflow instructions only. You MUST now execute ALL steps below.
 
-**EXPECTED FINAL OUTPUT:** A recommendation with confidence score from generate_component tool AND a token mapping summary from map_tokens_to_theme tool.
+**EXPECTED FINAL OUTPUT:** A recommendation with confidence score from sfnext_analyze_component tool AND a token mapping summary from sfnext_match_tokens_to_theme tool.
 
 ### Step 1: Fetch Figma Design Data (Parallel Calls)
 Call these Figma MCP tools with the parameters above:
@@ -240,7 +240,7 @@ Use your tools to find existing components:
 - Score each match (0-100) based on similarity
 
 ### Step 3: Analyze Component Strategy (CRITICAL - DO NOT SKIP)
-You MUST call \`generate_component\` tool with:
+You MUST call \`sfnext_analyze_component\` tool with:
 - figmaMetadata (from step 1, or empty string if not fetched)
 - figmaCode (from step 1)
 - componentName (extracted from Figma)
@@ -249,14 +249,14 @@ You MUST call \`generate_component\` tool with:
 This tool returns the recommendation with confidence score that MUST be shown to the user.
 
 ### Step 4: Map Design Tokens (CRITICAL - DO NOT SKIP)
-You MUST call \`map_tokens_to_theme\` tool with tokens extracted from Figma design.
+You MUST call \`sfnext_match_tokens_to_theme\` tool with tokens extracted from Figma design.
 
 This tool returns the token mapping summary that MUST be shown to the user.
 
 ### Step 5: Implement
 After showing the recommendation and token mapping to the user, wait for approval then implement the code changes. Use the downloaded asset paths from Step 1 for any img src or imageUrl props—do not use placeholder paths.
 
-**DO NOT STOP until you have called generate_component AND map_tokens_to_theme and shown their outputs to the user.**
+**DO NOT STOP until you have called sfnext_analyze_component AND sfnext_match_tokens_to_theme and shown their outputs to the user.**
 `;
 }
 function formatErrorResponse(details) {
@@ -297,20 +297,20 @@ export function generateWorkflowResponse(figmaUrl, workflowFilePath) {
     return response;
 }
 /**
- * Creates the storefront_next_figma_to_component_workflow MCP tool.
+ * Creates the sfnext_start_figma_workflow MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for workflow orchestration
  */
 export function createFigmaToComponentTool(loadServices) {
     return createToolAdapter({
-        name: 'storefront_next_figma_to_component_workflow',
+        name: 'sfnext_start_figma_workflow',
         description: 'WORKFLOW ORCHESTRATOR: Call this tool FIRST when converting Figma designs. ' +
             'Parses Figma URL to extract fileKey and nodeId, returns step-by-step workflow instructions ' +
             'and parameters for subsequent tool calls. ' +
             'CRITICAL: This is only the FIRST step. After calling this tool, you MUST continue executing ' +
             'the complete workflow: 1) Call Figma MCP tools, 2) Discover similar components, ' +
-            '3) Call generate_component tool, 4) Call map_tokens_to_theme tool, ' +
+            '3) Call sfnext_analyze_component tool, 4) Call sfnext_match_tokens_to_theme tool, ' +
             '5) Show both outputs to the user then implement the recommended approach.',
         toolsets: ['STOREFRONTNEXT'],
         isGA: false,

package/dist/tools/storefrontnext/figma/generate-component/index.d.ts

@@ -106,9 +106,9 @@ export interface ComponentAnalysisResult {
  */
 export declare function generateComponentRecommendation(input: GenerateComponentInput): string;
 /**
- * Creates the storefront_next_generate_component MCP tool.
+ * Creates the sfnext_analyze_component MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for component analysis and recommendation
  */
-export declare function createGenerateComponentTool(loadServices: () => Services): McpTool;
+export declare function createGenerateComponentTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/figma/generate-component/index.js

@@ -68,14 +68,14 @@ export function generateComponentRecommendation(input) {
     }
 }
 /**
- * Creates the storefront_next_generate_component MCP tool.
+ * Creates the sfnext_analyze_component MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for component analysis and recommendation
  */
 export function createGenerateComponentTool(loadServices) {
     return createToolAdapter({
-        name: 'storefront_next_generate_component',
+        name: 'sfnext_analyze_component',
         description: 'Analyzes Figma design and discovered components to recommend component generation strategy. ' +
             'Workflow: 1) Discover similar components using Glob/Grep/Read tools, ' +
             '2) Call this tool with the discoveredComponents parameter, ' +

package/dist/tools/storefrontnext/figma/map-tokens/index.d.ts

@@ -53,9 +53,9 @@ export type MapTokensToThemeInput = z.infer<typeof mapTokensToThemeSchema>;
  */
 export declare function mapFigmaTokensToTheme(args: MapTokensToThemeInput, workspaceRoot?: string): string;
 /**
- * Creates the storefront_next_map_tokens_to_theme MCP tool.
+ * Creates the sfnext_match_tokens_to_theme MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for token mapping
  */
-export declare function createMapTokensToThemeTool(loadServices: () => Services): McpTool;
+export declare function createMapTokensToThemeTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/figma/map-tokens/index.js

@@ -208,14 +208,14 @@ export function mapFigmaTokensToTheme(args, workspaceRoot) {
     }
 }
 /**
- * Creates the storefront_next_map_tokens_to_theme MCP tool.
+ * Creates the sfnext_match_tokens_to_theme MCP tool.
  *
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns MCP tool for token mapping
  */
 export function createMapTokensToThemeTool(loadServices) {
     return createToolAdapter({
-        name: 'storefront_next_map_tokens_to_theme',
+        name: 'sfnext_match_tokens_to_theme',
         description: 'Maps Figma design tokens to existing StorefrontNext theme tokens in app.css. ' +
             'Analyzes Figma design tokens (colors, spacing, radius, etc.) and finds exact matches, ' +
             'provides fuzzy matches with confidence scores, suggests new token names for unmatched values, ' +

package/dist/tools/storefrontnext/index.d.ts

@@ -4,12 +4,12 @@
  * This toolset provides MCP tools for Storefront Next development.
  *
  * **Implemented Tools:**
- * - `storefront_next_development_guidelines` - Get development guidelines and best practices
- * - `storefront_next_page_designer_decorator` - Add Page Designer decorators to React components
- * - `storefront_next_site_theming` - Get theming guidelines, questions, and validation
- * - `storefront_next_figma_to_component_workflow` - Convert Figma to components
- * - `storefront_next_generate_component` - Generate new components
- * - `storefront_next_map_tokens_to_theme` - Map design tokens
+ * - `sfnext_get_guidelines` - Get development guidelines and best practices
+ * - `sfnext_add_page_designer_decorator` - Add Page Designer decorators to React components
+ * - `sfnext_configure_theme` - Get theming guidelines, questions, and validation
+ * - `sfnext_start_figma_workflow` - Convert Figma to components
+ * - `sfnext_analyze_component` - Analyze design and recommend REUSE/EXTEND/CREATE
+ * - `sfnext_match_tokens_to_theme` - Match design tokens to theme
  *
  * Note: mrt_bundle_push is defined in the MRT toolset and appears in STOREFRONTNEXT.
  *
@@ -27,4 +27,4 @@ import type { Services } from '../../services.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Array of MCP tools
  */
-export declare function createStorefrontNextTools(loadServices: () => Services): McpTool[];
+export declare function createStorefrontNextTools(loadServices: () => Promise<Services> | Services): McpTool[];

package/dist/tools/storefrontnext/page-designer-decorator/analyzer.js

@@ -7,6 +7,21 @@ import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { globSync } from 'glob';
 import { Project, InterfaceDeclaration, PropertySignature } from 'ts-morph';
+/**
+ * Lazily-initialized, reusable ts-morph Project for component analysis.
+ * Creating a new Project (~40ms) on every analyzeComponent call is expensive;
+ * reusing one with an in-memory file system avoids repeated TypeScript compiler init.
+ */
+let cachedProject;
+function getProject() {
+    if (!cachedProject) {
+        cachedProject = new Project({
+            useInMemoryFileSystem: true,
+            skipAddingFilesFromTsConfig: true,
+        });
+    }
+    return cachedProject;
+}
 // ============================================================================
 // TYPE INFERENCE
 // ============================================================================
@@ -279,43 +294,45 @@ function parseComponentFile(filePath) {
             filePath,
         };
     }
-    const project = new Project({
-        useInMemoryFileSystem: true,
-        skipAddingFilesFromTsConfig: true,
-    });
-    const sourceFile = project.createSourceFile(filePath, content);
-    const interfaces = sourceFile.getInterfaces();
-    const propsInterface = interfaces.find((i) => i.getName().includes('Props'));
-    if (!propsInterface) {
+    const project = getProject();
+    const sourceFile = project.createSourceFile(filePath, content, { overwrite: true });
+    try {
+        const interfaces = sourceFile.getInterfaces();
+        const propsInterface = interfaces.find((i) => i.getName().includes('Props'));
+        if (!propsInterface) {
+            return {
+                componentName: extractComponentName(content),
+                interfaceName: null,
+                hasDecorators: false,
+                props: [],
+                exportType: detectExportType(content),
+                filePath,
+            };
+        }
+        const props = propsInterface.getProperties().map((prop) => {
+            const name = prop.getName();
+            const type = prop.getType().getText();
+            const optional = prop.hasQuestionToken();
+            return {
+                name,
+                type,
+                optional,
+                isComplex: isComplexType(type),
+                isUIOnly: isUIOnlyProp(name),
+            };
+        });
         return {
             componentName: extractComponentName(content),
-            interfaceName: null,
+            interfaceName: propsInterface.getName(),
             hasDecorators: false,
-            props: [],
+            props,
             exportType: detectExportType(content),
             filePath,
         };
     }
-    const props = propsInterface.getProperties().map((prop) => {
-        const name = prop.getName();
-        const type = prop.getType().getText();
-        const optional = prop.hasQuestionToken();
-        return {
-            name,
-            type,
-            optional,
-            isComplex: isComplexType(type),
-            isUIOnly: isUIOnlyProp(name),
-        };
-    });
-    return {
-        componentName: extractComponentName(content),
-        interfaceName: propsInterface.getName(),
-        hasDecorators: false,
-        props,
-        exportType: detectExportType(content),
-        filePath,
-    };
+    finally {
+        project.removeSourceFile(sourceFile);
+    }
 }
 // ============================================================================
 // COMPONENT ANALYZER

package/dist/tools/storefrontnext/page-designer-decorator/index.d.ts

@@ -249,4 +249,4 @@ export type PageDesignerDecoratorInput = z.infer<typeof pageDesignerDecoratorSch
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns The configured MCP tool
  */
-export declare function createPageDesignerDecoratorTool(loadServices: () => Services): McpTool;
+export declare function createPageDesignerDecoratorTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/page-designer-decorator/index.js

@@ -527,7 +527,7 @@ function handleAutoMode(args, workspaceRoot) {
  */
 export function createPageDesignerDecoratorTool(loadServices) {
     return {
-        name: 'storefront_next_page_designer_decorator',
+        name: 'sfnext_add_page_designer_decorator',
         description: 'Adds Page Designer decorators (@Component, @AttributeDefinition, @RegionDefinition) to React components. ' +
             'Two modes: autoMode=true for quick setup with defaults, or interactive mode via conversationContext.step. ' +
             'Component discovery uses --project-directory flag or SFCC_PROJECT_DIRECTORY env var. ' +
@@ -542,7 +542,7 @@ export function createPageDesignerDecoratorTool(loadServices) {
                 const validatedArgs = pageDesignerDecoratorSchema.parse(args);
                 // Use projectDirectory from services to ensure we search in the correct project directory
                 // This prevents searches in the home folder when MCP clients spawn servers from ~
-                const services = loadServices();
+                const services = await loadServices();
                 const workspaceRoot = services.resolveWithProjectDirectory();
                 if (validatedArgs.autoMode === undefined && !validatedArgs.conversationContext) {
                     const fullPath = resolveComponent(validatedArgs.component, workspaceRoot, validatedArgs.searchPaths);

package/dist/tools/storefrontnext/page-designer-decorator/templates/decorator-generator.d.ts

@@ -67,7 +67,7 @@ export interface MetadataContext {
  * **Generated code must be:**
  * - Added to the component file (after imports, before component)
  * - Compiled with TypeScript
- * - Used by `generate_page_designer_metadata` tool to create JSON metadata
+ * - Used by the staticRegistry Vite plugin to generate the component registry
  *
  * @param context - Complete metadata context
  * @returns TypeScript code string ready to paste into component file

package/dist/tools/storefrontnext/page-designer-decorator/templates/decorator-generator.js

@@ -284,7 +284,7 @@ function generateRegionDefinition(context) {
  * **Generated code must be:**
  * - Added to the component file (after imports, before component)
  * - Compiled with TypeScript
- * - Used by `generate_page_designer_metadata` tool to create JSON metadata
+ * - Used by the staticRegistry Vite plugin to generate the component registry
  *
  * @param context - Complete metadata context
  * @returns TypeScript code string ready to paste into component file

package/dist/tools/storefrontnext/sfnext-development-guidelines.d.ts

@@ -6,4 +6,4 @@ import type { Services } from '../../services.js';
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns The configured MCP tool
  */
-export declare function createDeveloperGuidelinesTool(loadServices: () => Services): McpTool;
+export declare function createDeveloperGuidelinesTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/sfnext-development-guidelines.js

@@ -82,7 +82,7 @@ const DEFAULT_SECTIONS = ['quick-reference', 'data-fetching', 'components', 'tes
  */
 export function createDeveloperGuidelinesTool(loadServices) {
     return createToolAdapter({
-        name: 'storefront_next_development_guidelines',
+        name: 'sfnext_get_guidelines',
         description: 'ESSENTIAL FIRST STEP for Storefront Next development. Returns critical architecture rules, coding standards, and best practices. ' +
             'Use this tool FIRST before writing any Storefront Next code to understand non-negotiable patterns for React Server Components, ' +
             'data loading, and framework constraints. Returns comprehensive guidelines by default (quick-reference + key sections); ' +

package/dist/tools/storefrontnext/site-theming/index.d.ts

@@ -11,4 +11,4 @@ export type { ColorEntry, ColorMapping, CollectedAnswers, ConversationContext, F
  * @param loadServices - Function that loads configuration and returns Services instance
  * @returns The configured MCP tool
  */
-export declare function createSiteThemingTool(loadServices: () => Services): McpTool;
+export declare function createSiteThemingTool(loadServices: () => Promise<Services> | Services): McpTool;

package/dist/tools/storefrontnext/site-theming/index.js

@@ -28,7 +28,7 @@ import { generateResponse } from './response-builder.js';
  */
 export function createSiteThemingTool(loadServices) {
     return createToolAdapter({
-        name: 'storefront_next_site_theming',
+        name: 'sfnext_configure_theme',
         description: '⚠️ MANDATORY: Call this tool FIRST before implementing any theming changes. ' +
             'Provides theming guidelines, questions, and automatic validation. ' +
             'CRITICAL RULES: Call immediately when user requests theming (even if colors/fonts provided). ' +

package/oclif.manifest.json

@@ -390,5 +390,5 @@
       "enableJsonFlag": false
     }
   },
-  "version": "0.4.13"
+  "version": "0.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-dx-mcp",
   "description": "MCP server for B2C Commerce developer experience tools",
-  "version": "0.4.13",
+  "version": "0.5.0",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
@@ -76,11 +76,11 @@
     "@modelcontextprotocol/sdk": "1.26.0",
     "@oclif/core": "4.8.0",
     "glob": "13.0.0",
-    "ts-morph": "^27.0.0",
+    "ts-morph": "27.0.2",
     "yaml": "2.8.1",
     "postcss": "8.5.6",
     "zod": "3.25.76",
-    "@salesforce/b2c-tooling-sdk": "0.8.3"
+    "@salesforce/b2c-tooling-sdk": "0.9.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1",