@salesforce/b2c-dx-mcp 0.3.2 → 0.4.1

package/README.md

@@ -22,16 +22,14 @@ The most important flag is **`--working-directory`** (or env var `SFCC_WORKING_D
 
 > **Important:** MCP clients like Cursor and Claude Desktop spawn servers from the home directory (`~`), not your project. Always set `--working-directory`.
 
-<!-- TODO: Update command to use npx once published to npm -->
-
 **Cursor** (supports `${workspaceFolder}`):
 
 ```json
 {
   "mcpServers": {
     "b2c-dx": {
-      "command": "node",
-      "args": ["/path/to/packages/b2c-dx-mcp/bin/dev.js", "--working-directory", "${workspaceFolder}", "--allow-non-ga-tools"]
+      "command": "npx",
+      "args": ["-y", "@salesforce/b2c-dx-mcp", "--working-directory", "${workspaceFolder}", "--allow-non-ga-tools"]
     }
   }
 }
@@ -43,8 +41,8 @@ The most important flag is **`--working-directory`** (or env var `SFCC_WORKING_D
 {
   "mcpServers": {
     "b2c-dx": {
-      "command": "node",
-      "args": ["/path/to/packages/b2c-dx-mcp/bin/dev.js", "--working-directory", "/path/to/your/project", "--allow-non-ga-tools"]
+      "command": "npx",
+      "args": ["-y", "@salesforce/b2c-dx-mcp", "--working-directory", "/path/to/your/project", "--allow-non-ga-tools"]
     }
   }
 }
@@ -57,7 +55,7 @@ The server analyzes your working directory and enables toolsets based on what it
 | Project Type | Detection | Toolsets Enabled |
 |--------------|-----------|------------------|
 | **PWA Kit v3** | `@salesforce/pwa-kit-*`, `@salesforce/retail-react-app`, or `ccExtensibility` in package.json | PWAV3, MRT, SCAPI |
-| **Storefront Next** | `@salesforce/storefront-next-*` in package.json | STOREFRONTNEXT, MRT, SCAPI |
+| **Storefront Next** | Root or a workspace package has `@salesforce/storefront-next*` dependency, or package name starting with `storefront-next`. | STOREFRONTNEXT, MRT, CARTRIDGES, SCAPI |
 | **Cartridges** | `.project` file in cartridge directory | CARTRIDGES, SCAPI |
 | **No project detected** | No B2C markers found | SCAPI (base toolset only) |
 
@@ -120,15 +118,38 @@ The `storefront_next_development_guidelines` tool provides critical architecture
 - ✅ "I'm starting a new PWA Kit project. Use the MCP tool to get the development guidelines."
 - ✅ "Use the MCP tool to create a new product listing page component in my PWA Kit project."
 - ✅ "Use the MCP tool to recommend React hooks for fetching product data in PWA Kit."
-- ✅ "Use the MCP tool to explore the SCAPI Shop API endpoints available for my PWA Kit storefront."
 
 ##### SCAPI Discovery
 
-**Good prompts:**
-- ✅ "Use the MCP tool to discover what SCAPI endpoints are available for product data."
-- ✅ "Use the MCP tool to discover custom SCAPI APIs in my B2C instance."
-- ✅ "Use the MCP tool to show me all available SCAPI endpoints and their capabilities."
-- ✅ "Use the MCP tool to scaffold a new custom SCAPI API for order management."
+Use **scapi_schemas_list** for both standard SCAPI (Shop, Admin, Shopper APIs) and custom APIs. Use **scapi_custom_apis_status** for endpoint-level registration status (active/not_registered).
+
+**SCAPI Schemas (tool: `scapi_schemas_list`):**
+
+Discover schema metadata and fetch OpenAPI specs for both standard and custom SCAPI:
+
+**Standard SCAPI:**
+- ✅ "Use the MCP tool to list all available SCAPI schemas." → list mode (no includeSchemas).
+- ✅ "Use the MCP tool to show me what checkout APIs exist." → list with apiFamily: checkout.
+- ✅ "Use the MCP tool to discover SCAPI product endpoints." → list with apiFamily: product.
+- ✅ "Use the MCP tool to get the OpenAPI schema for shopper-baskets v1." → fetch with apiFamily, apiName, apiVersion, includeSchemas: true.
+- ✅ "Use the MCP tool to show me the full OpenAPI spec for shopper-products v1." → fetch with includeSchemas: true, expandAll: true.
+
+**Custom APIs (use apiFamily: "custom"):**
+- ✅ "Use the MCP tool to list custom API definitions." → list with apiFamily: custom.
+- ✅ "Use the MCP tool to show me the loyalty-points custom API schema." → apiFamily: custom, apiName: loyalty-points, apiVersion: v1, includeSchemas: true.
+
+**Custom API Endpoint Status (tool: `scapi_custom_apis_status`):**
+
+Get registration status of custom API endpoints deployed on the instance (remote only). Returns individual HTTP endpoints (e.g., GET /hello, POST /items/{id}) with registration status (active/not_registered), one row per endpoint per site. Requires OAuth with `sfcc.custom-apis` scope.
+
+- ✅ "Use the MCP tool to list custom SCAPI endpoints on my instance."
+- ✅ "Use the MCP tool to show which custom APIs are active vs not registered."
+- ✅ "Use the MCP tool to list custom API endpoints grouped by site." → groupBy: site
+- ✅ "Use the MCP tool to list custom API endpoints grouped by type." → groupBy: type
+- ✅ "Use the MCP tool to list only active custom API endpoints." → status: active
+- ✅ "Use the MCP tool to find custom API endpoints that failed to register." → status: not_registered
+- ✅ "Use the MCP tool to show endpoint details with all fields." → extended: true
+- ✅ "Use the MCP tool to show only apiName and status for active endpoints." → status: active, columns: "apiName,status"
 
 ##### Cartridge Deployment
 
@@ -142,7 +163,7 @@ The `storefront_next_development_guidelines` tool provides critical architecture
 **Good prompts:**
 - ✅ "Use the MCP tool to build and push my Storefront Next bundle to staging."
 - ✅ "Use the MCP tool to push the bundle from ./build directory to Managed Runtime."
-- ✅ "Use the MCP tool to deploy my PWA Kit bundle to production with a deployment message."
+- ✅ "Use the MCP tool to deploy my PWA Kit or Storefront Next bundle to production with a deployment message."
 
 #### Tips for Better Results
 
@@ -157,7 +178,7 @@ Credentials can be provided via **config files** (recommended), **environment va
 
 | Toolset | Required Credentials |
 |---------|---------------------|
-| **SCAPI** | `hostname` + `client-id` + `client-secret` |
+| **SCAPI** | `hostname` + `client-id` + `client-secret` (for `scapi_custom_apis_status`: requires `sfcc.custom-apis` scope) |
 | **CARTRIDGES** | `hostname` + `username` + `password` (or OAuth) |
 | **MRT** | `api-key` + `project` (optionally `environment`) |
 | **PWAV3** | `--working-directory` only (+ MRT config for deployments) |
@@ -264,20 +285,19 @@ PWA Kit v3 development tools for building headless storefronts.
 | `pwakit_recommend_hooks` | Recommend appropriate React hooks for PWA Kit use cases |
 | `pwakit_run_site_test` | Run site tests for PWA Kit project |
 | `pwakit_install_agent_rules` | Install AI agent rules for PWA Kit development |
-| `pwakit_explore_scapi_shop_api` | Explore SCAPI Shop API endpoints and capabilities |
-| `scapi_discovery` | Discover available SCAPI endpoints and capabilities |
-| `scapi_custom_api_discovery` | Discover custom SCAPI API endpoints |
+| `scapi_schemas_list` | List or fetch SCAPI schemas (standard and custom). Use apiFamily: "custom" for custom APIs. |
+| `scapi_custom_apis_status` | Get registration status of custom API endpoints (active/not_registered). Remote only, requires OAuth. |
 | `mrt_bundle_push` | Build, push bundle (optionally deploy) |
 
 #### SCAPI
 Salesforce Commerce API discovery and exploration.
-- **Status:** 🚧 Placeholder
+- **Status:** 🚧 Early Access
 
 | Tool | Description |
 |------|-------------|
-| `scapi_discovery` | Discover available SCAPI endpoints and capabilities |
-| `scapi_customapi_scaffold` | Scaffold a new custom SCAPI API |
-| `scapi_custom_api_discovery` | Discover custom SCAPI API endpoints |
+| `scapi_schemas_list` | List or fetch SCAPI schemas (standard and custom). Use apiFamily: "custom" for custom APIs. |
+| `scapi_custom_apis_status` | Get registration status of custom API endpoints (active/not_registered). Remote only, requires OAuth. |
+| `scapi_customapi_scaffold` | Scaffold a new custom SCAPI API (not yet implemented) |
 
 #### STOREFRONTNEXT
 Storefront Next development tools for building modern storefronts.
@@ -290,13 +310,13 @@ Storefront Next development tools for building modern storefronts.
 | `storefront_next_figma_to_component_workflow` | Convert Figma designs to Storefront Next components |
 | `storefront_next_generate_component` | Generate a new Storefront Next component |
 | `storefront_next_map_tokens_to_theme` | Map design tokens to Storefront Next theme configuration |
-| `storefront_next_design_decorator` | Apply design decorators to Storefront Next components |
+| `storefront_next_page_designer_decorator` | Add Page Designer decorators to Storefront Next components |
 | `storefront_next_generate_page_designer_metadata` | Generate Page Designer metadata for Storefront Next components |
-| `scapi_discovery` | Discover available SCAPI endpoints and capabilities |
-| `scapi_custom_api_discovery` | Discover custom SCAPI API endpoints |
+| `scapi_schemas_list` | List or fetch SCAPI schemas (standard and custom). Use apiFamily: "custom" for custom APIs. |
+| `scapi_custom_apis_status` | Get registration status of custom API endpoints (active/not_registered). Remote only, requires OAuth. |
 | `mrt_bundle_push` | Build, push bundle (optionally deploy) |
 
-> **Note:** Some tools appear in multiple toolsets (e.g., `mrt_bundle_push`, `scapi_discovery`). When using multiple toolsets, tools are automatically deduplicated.
+> **Note:** Some tools appear in multiple toolsets (e.g., `mrt_bundle_push`, `scapi_schemas_list`, `scapi_custom_apis_status`). When using multiple toolsets, tools are automatically deduplicated.
 
 ## Telemetry
 
@@ -393,7 +413,7 @@ npx mcp-inspector --cli node bin/dev.js --toolsets all --allow-non-ga-tools --me
 # Call a specific tool
 npx mcp-inspector --cli node bin/dev.js --toolsets all --allow-non-ga-tools \
   --method tools/call \
-  --tool-name storefront_next_design_decorator
+  --tool-name storefront_next_page_designer_decorator
 ```
 
 #### 2. IDE Integration

package/content/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_design_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 `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`.
 
 ### After changes
 
@@ -50,7 +50,7 @@ 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_design_decorator` (STOREFRONTNEXT toolset)
+### 1. `storefront_next_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).
 
@@ -71,7 +71,7 @@ Packages the cartridge, uploads it to Commerce Cloud via WebDAV, and unpacks it
 
 ### Typical workflow
 
-1. **`storefront_next_design_decorator`** — Add decorators to the component (use autoMode for a quick first pass).
+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.
 3. **`cartridge_deploy`** — Deploy to Commerce Cloud so merchants can use the component in Business Manager.
 
@@ -81,6 +81,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_design_decorator` and `storefront_next_generate_page_designer_metadata` for faster development
+5. **Use MCP tools**: Leverage `storefront_next_page_designer_decorator` and `storefront_next_generate_page_designer_metadata` for faster development
 
 **Reference:** See README.md for complete Page Designer documentation and MCP tool setup.

package/dist/commands/mcp.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
 import type { ResolvedB2CConfig } from '@salesforce/b2c-tooling-sdk/config';
+import { Services } from '../services.js';
 /**
  * oclif Command that starts the B2C DX MCP server.
  *
@@ -41,10 +42,11 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        jsonl: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         lang: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         instance: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        'working-directory': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'project-directory': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'extra-query': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'extra-body': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'extra-headers': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -76,10 +78,20 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
      * Priority (highest to lowest):
      * 1. CLI flags (--server, --username, --api-key, etc.)
      * 2. Environment variables (SFCC_SERVER, SFCC_USERNAME, SFCC_MRT_API_KEY, etc.)
-     * 3. dw.json file (via --config flag or auto-discovered from --working-directory)
+     * 3. dw.json file (via --config flag or auto-discovered from --project-directory)
      * 4. ~/.mobify file (for MRT API key)
      */
     protected loadConfiguration(): ResolvedB2CConfig;
+    /**
+     * Loads configuration and creates a new Services instance.
+     *
+     * This method loads configuration files (dw.json, ~/.mobify) on each call,
+     * allowing tools to pick up changes to configuration between invocations.
+     * Flags remain the same (parsed once at startup).
+     *
+     * @returns A new Services instance with loaded configuration
+     */
+    protected loadServices(): Services;
     /**
      * Main entry point - starts the MCP server.
      *

package/dist/commands/mcp.js

@@ -47,7 +47,7 @@
  * ### Global Flags (inherited from BaseCommand)
  * | Flag | Env Variable | Description |
  * |------|--------------|-------------|
- * | `--working-directory` | `SFCC_WORKING_DIRECTORY` | Project working directory (see note below) |
+ * | `--project-directory` | `SFCC_PROJECT_DIRECTORY` | Project directory (see note below) |
  * | `--config` | `SFCC_CONFIG` | Path to dw.json config file (auto-discovered if not provided) |
  * | `--instance` | `SFCC_INSTANCE` | Instance name from configuration file |
  * | `--log-level` | `SFCC_LOG_LEVEL` | Set logging verbosity (trace, debug, info, warn, error, silent) |
@@ -55,13 +55,13 @@
  * | `--json` | - | Output logs as JSON lines |
  * | `--lang` | - | Language for messages |
  *
- * **Note on `--working-directory`**: Many MCP clients (Cursor, Claude Desktop) spawn servers from the
+ * **Note on `--project-directory`**: Many MCP clients (Cursor, Claude Desktop) spawn servers from the
  * user's home directory (`~`) rather than the project directory. This flag is used for:
  * - Auto-discovery (detecting project type when no `--toolsets` or `--tools` are provided)
  * - Scaffolding tools (creating files in the correct project location)
  * - Any tool that needs to operate on the project directory
  *
- * Use `--working-directory` or `SFCC_WORKING_DIRECTORY` env var to specify the actual project path.
+ * Use `--project-directory` or `SFCC_PROJECT_DIRECTORY` env var to specify the actual project path.
  *
  * ## Configuration
  *
@@ -233,7 +233,7 @@ export default class McpServerCommand extends BaseCommand {
      * Priority (highest to lowest):
      * 1. CLI flags (--server, --username, --api-key, etc.)
      * 2. Environment variables (SFCC_SERVER, SFCC_USERNAME, SFCC_MRT_API_KEY, etc.)
-     * 3. dw.json file (via --config flag or auto-discovered from --working-directory)
+     * 3. dw.json file (via --config flag or auto-discovered from --project-directory)
      * 4. ~/.mobify file (for MRT API key)
      */
     loadConfiguration() {
@@ -249,6 +249,19 @@ export default class McpServerCommand extends BaseCommand {
         };
         return loadConfig(flagConfig, options);
     }
+    /**
+     * Loads configuration and creates a new Services instance.
+     *
+     * This method loads configuration files (dw.json, ~/.mobify) on each call,
+     * allowing tools to pick up changes to configuration between invocations.
+     * Flags remain the same (parsed once at startup).
+     *
+     * @returns A new Services instance with loaded configuration
+     */
+    loadServices() {
+        const config = this.loadConfiguration();
+        return Services.fromResolvedConfig(config);
+    }
     /**
      * Main entry point - starts the MCP server.
      *
@@ -285,7 +298,7 @@ export default class McpServerCommand extends BaseCommand {
             allowNonGaTools: this.flags['allow-non-ga-tools'],
             configPath: this.flags.config,
             // Working directory for auto-discovery. oclif handles flag with env fallback.
-            workingDirectory: this.flags['working-directory'],
+            workingDirectory: this.flags['project-directory'],
         };
         // Add toolsets to telemetry attributes
         if (this.telemetry && startupFlags.toolsets) {
@@ -302,10 +315,9 @@ export default class McpServerCommand extends BaseCommand {
             },
             telemetry: this.telemetry,
         });
-        // Create services from already-resolved config (BaseCommand.init() already resolved it)
-        const services = Services.fromResolvedConfig(this.resolvedConfig);
-        // Register toolsets
-        await registerToolsets(startupFlags, server, services);
+        // Register toolsets with loader function that loads config and creates Services on each tool call
+        // This allows tools to pick up changes to config files (dw.json, ~/.mobify) between invocations
+        await registerToolsets(startupFlags, server, this.loadServices.bind(this));
         // Connect to stdio transport
         const transport = new StdioServerTransport();
         await server.connect(transport);

package/dist/registry.d.ts

@@ -11,10 +11,10 @@ export type ToolRegistry = Record<Toolset, McpTool[]>;
  * Tools are organized by their declared `toolsets` array, allowing
  * a single tool to appear in multiple toolsets.
  *
- * @param services - Services instance for dependency injection
+ * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Complete tool registry
  */
-export declare function createToolRegistry(services: Services): ToolRegistry;
+export declare function createToolRegistry(loadServices: () => Services): ToolRegistry;
 /**
  * Register tools with the MCP server based on startup flags.
  *
@@ -32,6 +32,6 @@ export declare function createToolRegistry(services: Services): ToolRegistry;
  *
  * @param flags - Startup flags from CLI
  * @param server - B2CDxMcpServer instance
- * @param services - Services instance
+ * @param loadServices - Function that loads configuration and returns Services instance
  */
-export declare function registerToolsets(flags: StartupFlags, server: B2CDxMcpServer, services: Services): Promise<void>;
+export declare function registerToolsets(flags: StartupFlags, server: B2CDxMcpServer, loadServices: () => Services): Promise<void>;

package/dist/registry.js

@@ -58,10 +58,10 @@ function getToolsetsForProjectTypes(projectTypes) {
  * Tools are organized by their declared `toolsets` array, allowing
  * a single tool to appear in multiple toolsets.
  *
- * @param services - Services instance for dependency injection
+ * @param loadServices - Function that loads configuration and returns Services instance
  * @returns Complete tool registry
  */
-export function createToolRegistry(services) {
+export function createToolRegistry(loadServices) {
     const registry = {
         CARTRIDGES: [],
         MRT: [],
@@ -71,11 +71,11 @@ export function createToolRegistry(services) {
     };
     // Collect all tools from all factories
     const allTools = [
-        ...createCartridgesTools(services),
-        ...createMrtTools(services),
-        ...createPwav3Tools(services),
-        ...createScapiTools(services),
-        ...createStorefrontNextTools(services),
+        ...createCartridgesTools(loadServices),
+        ...createMrtTools(loadServices),
+        ...createPwav3Tools(loadServices),
+        ...createScapiTools(loadServices),
+        ...createStorefrontNextTools(loadServices),
     ];
     // Organize tools by their declared toolsets (supports multi-toolset)
     for (const tool of allTools) {
@@ -95,13 +95,13 @@ export function createToolRegistry(services) {
  */
 async function performAutoDiscovery(flags, reason) {
     const logger = getLogger();
-    // Working directory from --working-directory flag or SFCC_WORKING_DIRECTORY env var
+    // Working directory from --project-directory flag or SFCC_PROJECT_DIRECTORY env var
     const workingDirectory = flags.workingDirectory ?? process.cwd();
     // Warn if working directory wasn't explicitly configured
     if (!flags.workingDirectory) {
-        logger.warn({ cwd: workingDirectory }, 'No --working-directory flag or SFCC_WORKING_DIRECTORY env var provided. ' +
+        logger.warn({ cwd: workingDirectory }, 'No --project-directory flag or SFCC_PROJECT_DIRECTORY env var provided. ' +
             'MCP clients like Cursor and Claude Desktop often spawn servers from ~ instead of the project directory. ' +
-            'Set --working-directory or SFCC_WORKING_DIRECTORY for reliable auto-discovery.');
+            'Set --project-directory or SFCC_PROJECT_DIRECTORY for reliable auto-discovery.');
     }
     const detectionResult = await detectWorkspaceType(workingDirectory);
     // Map all detected project types to MCP toolsets (union)
@@ -132,15 +132,15 @@ async function performAutoDiscovery(flags, reason) {
  *
  * @param flags - Startup flags from CLI
  * @param server - B2CDxMcpServer instance
- * @param services - Services instance
+ * @param loadServices - Function that loads configuration and returns Services instance
  */
-export async function registerToolsets(flags, server, services) {
+export async function registerToolsets(flags, server, loadServices) {
     const toolsets = flags.toolsets ?? [];
     const individualTools = flags.tools ?? [];
     const allowNonGaTools = flags.allowNonGaTools ?? false;
     const logger = getLogger();
     // Create the tool registry (all available tools)
-    const toolRegistry = createToolRegistry(services);
+    const toolRegistry = createToolRegistry(loadServices);
     // Build flat list of all tools for lookup
     const allTools = Object.values(toolRegistry).flat();
     const allToolsByName = new Map(allTools.map((tool) => [tool.name, tool]));

package/dist/services.d.ts

@@ -40,6 +40,7 @@ import fs from 'node:fs';
 import type { B2CInstance } from '@salesforce/b2c-tooling-sdk';
 import type { AuthStrategy } from '@salesforce/b2c-tooling-sdk/auth';
 import type { ResolvedB2CConfig } from '@salesforce/b2c-tooling-sdk/config';
+import { WebDavClient, type CustomApisClient, type ScapiSchemasClient } from '@salesforce/b2c-tooling-sdk/clients';
 /**
  * MRT (Managed Runtime) configuration.
  * Groups auth, project, environment, and origin settings.
@@ -62,6 +63,8 @@ export interface ServicesOptions {
     b2cInstance?: B2CInstance;
     /** Pre-resolved MRT configuration (auth, project, environment) */
     mrtConfig?: MrtConfig;
+    /** Resolved configuration for access to SCAPI settings */
+    resolvedConfig: ResolvedB2CConfig;
 }
 /**
  * Services class that provides utilities for MCP tools.
@@ -92,7 +95,13 @@ export declare class Services {
      * Resolved once at server startup from MrtCommand flags and ~/.mobify.
      */
     readonly mrtConfig: MrtConfig;
-    constructor(opts?: ServicesOptions);
+    /**
+     * Resolved configuration for accessing SCAPI settings.
+     * Provides access to shortCode, tenantId, and OAuth credentials.
+     * @private
+     */
+    private readonly resolvedConfig;
+    constructor(opts: ServicesOptions);
     /**
      * Creates a Services instance from an already-resolved configuration.
      *
@@ -113,6 +122,14 @@ export declare class Services {
      * @returns True if exists, false otherwise
      */
     exists(targetPath: string): boolean;
+    /**
+     * Get Custom APIs client for managing custom SCAPI endpoints.
+     * Requires shortCode, tenantId, and OAuth credentials to be configured.
+     *
+     * @throws Error if shortCode, tenantId, or OAuth credentials are missing
+     * @returns Typed Custom APIs client
+     */
+    getCustomApisClient(): CustomApisClient;
     /**
      * Get the current working directory.
      */
@@ -121,14 +138,62 @@ export declare class Services {
      * Get the user's home directory.
      */
     getHomeDir(): string;
+    /**
+     * Get organization ID for SCAPI API calls.
+     * Ensures the tenant ID has the required f_ecom_ prefix.
+     *
+     * @throws Error if tenantId is not configured
+     * @returns Organization ID with f_ecom_ prefix
+     */
+    getOrganizationId(): string;
     /**
      * Get OS platform information.
      */
     getPlatform(): NodeJS.Platform;
+    /**
+     * Get SCAPI Schemas client for discovering available SCAPI APIs.
+     * Requires shortCode, tenantId, and OAuth credentials to be configured.
+     *
+     * @throws Error if shortCode, tenantId, or OAuth credentials are missing
+     * @returns Typed SCAPI Schemas client
+     */
+    getScapiSchemasClient(): ScapiSchemasClient;
+    /**
+     * Get SCAPI shortCode from configuration.
+     * Returns undefined if not configured.
+     *
+     * @returns shortCode or undefined
+     */
+    getShortCode(): string | undefined;
+    /**
+     * Get tenant ID from configuration.
+     * Returns undefined if not configured.
+     *
+     * @returns tenantId or undefined
+     */
+    getTenantId(): string | undefined;
     /**
      * Get system temporary directory.
      */
     getTmpDir(): string;
+    /**
+     * Get WebDAV client for file operations on B2C instances.
+     * Requires hostname and WebDAV credentials to be configured.
+     *
+     * @throws Error if hostname or B2C instance is missing
+     * @returns WebDAV client instance
+     */
+    getWebDavClient(): WebDavClient;
+    /**
+     * Get the project working directory.
+     * Falls back to process.cwd() if not explicitly set.
+     *
+     * This is the directory where the project is located, which may differ from process.cwd()
+     * when MCP clients spawn servers from a different location (e.g., home directory).
+     *
+     * @returns Project working directory path
+     */
+    getWorkingDirectory(): string;
     /**
      * Join path segments.
      *
@@ -165,4 +230,13 @@ export declare class Services {
      * @returns File stats object
      */
     stat(targetPath: string): fs.Stats;
+    /**
+     * Get OAuth strategy from resolved configuration.
+     * Mirrors the pattern from OAuthCommand.getOAuthStrategy().
+     *
+     * @throws Error if OAuth credentials are not configured
+     * @returns OAuth auth strategy
+     * @private
+     */
+    private getOAuthStrategy;
 }