@salesforce/b2c-dx-mcp 2.0.0 → 2.1.1

package/dist/tools/docs/docs-schema-read.js

@@ -9,9 +9,8 @@ import { createToolAdapter, errorResult, jsonResult } from '../adapter.js';
 export function createDocsSchemaReadTool(loadServices) {
     return createToolAdapter({
         name: 'docs_schema_read',
-        description: 'Read the contents of a bundled B2C Commerce XSD schema (raw XML). ' +
-            'Accepts an exact id or fuzzy query. Returns the schema body plus the on-disk path. ' +
-            'Schemas can be large; if you do not know the id, call docs_schema_search first.',
+        description: 'Read a bundled B2C Commerce (SFCC/Demandware) XSD schema as XML by ID or fuzzy query. ' +
+            'Use docs_schema_search to find IDs.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         inputSchema: {
             query: z.string().min(1).describe('Schema name or partial match.'),

package/dist/tools/docs/docs-schema-search.js

@@ -9,8 +9,8 @@ import { createToolAdapter, jsonResult } from '../adapter.js';
 export function createDocsSchemaSearchTool(loadServices) {
     return createToolAdapter({
         name: 'docs_schema_search',
-        description: 'Fuzzy-search bundled B2C Commerce XSD schemas by id (e.g., "catalog", "order", "system-objecttype"). ' +
-            'Returns matching schema ids + relevance score. Use BEFORE docs_schema_read when the exact id is unknown.',
+        description: 'Search bundled B2C Commerce (SFCC/Demandware) XSD schemas by ID. ' +
+            'Returns matching IDs and scores; use docs_schema_read for content.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         inputSchema: {
             query: z.string().min(1).describe('Schema name or partial match (e.g., "catalog", "order").'),

package/dist/tools/docs/docs-search.js

@@ -38,13 +38,8 @@ function leanResult(entry, score, verbose) {
 export function createDocsSearchTool(loadServices, detectedWorkspaces = [], enabledCategories) {
     return createToolAdapter({
         name: 'docs_search',
-        description: 'PRIMARY entry point for B2C Commerce docs: Script API reference (e.g. "ProductMgr"), standard job steps, ' +
-            'Developer Center guides (commerce-api, pwa-kit-managed-runtime, sfnext, sfra, b2c-commerce), and this ' +
-            "tooling's own guides. Use for ANY B2C Commerce developer or admin question not already grounded in a " +
-            'loaded skill or the current project. Content-aware ranking — pass a natural-language query (prefer this ' +
-            'over docs_list, which only enumerates). Optionally restrict by category or workspace. Returns id, title, ' +
-            'category, summary, and score for triage; pass verbose=true for keywords+url. Call this BEFORE docs_read ' +
-            'when you do not know the exact id.' +
+        description: 'Search B2C Commerce (SFCC/Demandware) Script API, job steps, developer guides, admin/merchant help, and tooling docs. ' +
+            'Use for natural-language queries or unknown IDs; call docs_read with a result ID.' +
             enabledCategoriesNote(enabledCategories) +
             detectedWorkspaceNote(detectedWorkspaces),
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
@@ -54,8 +49,7 @@ export function createDocsSearchTool(loadServices, detectedWorkspaces = [], enab
             workspace: z
                 .enum(WORKSPACE_VALUES)
                 .optional()
-                .describe('Workspace context. "auto" (default) favors the auto-detected workspace\'s docs; ' +
-                '"all" disables the preference; or name a type (cartridges, sfra, pwa-kit-v3, storefront-next).'),
+                .describe('"auto" uses startup workspace; "all" disables weighting; or select a workspace type.'),
             limit: z
                 .number()
                 .int()

package/dist/tools/docs/storefront.js

@@ -9,8 +9,8 @@
  */
 export const PROJECT_TYPE_LABELS = {
     cartridges: 'Cartridges',
-    sfra: 'SFRA (cartridges)',
-    'pwa-kit-v3': 'PWA Kit (Composable Storefront)',
+    sfra: 'SFRA',
+    'pwa-kit-v3': 'PWA Kit',
     'storefront-next': 'Storefront Next',
 };
 /**
@@ -43,6 +43,6 @@ export function detectedWorkspaceNote(detected) {
     if (detected.length === 0)
         return '';
     const labels = detected.map((t) => PROJECT_TYPE_LABELS[t] ?? t).join(' + ');
-    return ` Detected workspace: ${labels} — by default results favor this workspace's docs (pass workspace="all" to disable).`;
+    return ` Workspace at startup: ${labels}.`;
 }
 //# sourceMappingURL=storefront.js.map

package/dist/tools/docs/topics.js

@@ -33,6 +33,8 @@ export function categoryEnumValues(enabledCategories) {
 export function enabledCategoriesNote(enabledCategories) {
     if (!enabledCategories || enabledCategories.length === 0)
         return '';
-    return ` Documentation is restricted at startup to: ${enabledCategories.join(', ')}.`;
+    if (DOC_CATEGORIES.every((category) => enabledCategories.includes(category)))
+        return '';
+    return ` Topics: ${enabledCategories.join(', ')}.`;
 }
 //# sourceMappingURL=topics.js.map

package/dist/tools/index.d.ts

@@ -14,4 +14,3 @@ export * from './docs/index.js';
 export * from './mrt/index.js';
 export * from './pwav3/index.js';
 export * from './scapi/index.js';
-export * from './storefrontnext/index.js';

package/dist/tools/index.js

@@ -21,5 +21,4 @@ export * from './docs/index.js';
 export * from './mrt/index.js';
 export * from './pwav3/index.js';
 export * from './scapi/index.js';
-export * from './storefrontnext/index.js';
 //# sourceMappingURL=index.js.map

package/dist/tools/mrt/index.js

@@ -137,11 +137,11 @@ function createMrtBundlePushTool(loadServices, injections) {
             ssrOnly: z
                 .string()
                 .optional()
-                .describe('Glob patterns for server-only files (comma-separated or JSON array). Defaults vary by project type: Storefront Next, PWA Kit v3, or generic.'),
+                .describe('Server-only globs; comma-separated or JSON array. Defaults by project type.'),
             ssrShared: z
                 .string()
                 .optional()
-                .describe('Glob patterns for shared files (comma-separated or JSON array). Defaults vary by project type: Storefront Next, PWA Kit v3, or generic.'),
+                .describe('Shared-file globs; comma-separated or JSON array. Defaults by project type.'),
             deploy: z
                 .boolean()
                 .optional()
@@ -175,6 +175,10 @@ function createMrtBundlePushTool(loadServices, injections) {
             const ssrOnly = args.ssrOnly ? parseGlobPatterns(args.ssrOnly) : defaults.ssrOnly;
             const ssrShared = args.ssrShared ? parseGlobPatterns(args.ssrShared) : defaults.ssrShared;
             const buildDirectory = context.services.resolveWithProjectDirectory(args.buildDirectory ?? defaults.buildDirectory, args.projectDirectory);
+            context.setResolvedDirectory('buildDirectory', {
+                path: buildDirectory,
+                source: args.buildDirectory ? 'argument' : 'projectDirectory',
+            });
             // Log all computed variables before pushing bundle
             const logger = getLogger();
             logger.debug({

package/dist/tools/project-context.d.ts

@@ -1,22 +1,49 @@
-import { z } from 'zod';
+import { z, type ZodRawShape } from 'zod';
 /** Input shared by MCP tools that resolve files or configuration from a project. */
 export interface ProjectContextInput {
     /** Per-call project directory override. */
     projectDirectory?: string;
-    /** Per-call explicit dw.json-format configuration path. */
+    /** Per-call explicit primary dw.json-format configuration path. */
     configPath?: string;
+    /** Per-call named instance selection. */
+    instanceName?: string;
 }
 /** Effective project directory and the source that selected it. */
 export interface ProjectDirectoryInfo {
     path: string;
     source: 'argument' | 'config' | 'cwd';
 }
-/** Shared schema field injected into every project-aware MCP tool. */
-export declare const projectDirectoryInput: z.ZodOptional<z.ZodString>;
-/** Shared explicit dw.json path field injected into every project-aware MCP tool. */
-export declare const configPathInput: z.ZodOptional<z.ZodString>;
-/** Shared schema fields injected into every project-aware MCP tool. */
-export declare const projectContextInputSchema: {
-    projectDirectory: z.ZodOptional<z.ZodString>;
-    configPath: z.ZodOptional<z.ZodString>;
-};
+/** How the selected dw.json file entered the configuration resolver. */
+export type ConfigurationResolutionSource = 'argument' | 'globalDefault' | 'none' | 'projectDirectory' | 'projectEnvironment' | 'server';
+/** Compact selected-configuration provenance returned by project-aware tools. */
+export interface ConfigurationResolutionInfo {
+    hostname?: string;
+    instanceName?: string;
+    path?: string;
+    source: ConfigurationResolutionSource;
+}
+/** Provenance for a specialized project-relative directory. */
+export interface DirectoryResolutionInfo {
+    path: string;
+    source: 'argument' | 'projectDirectory';
+}
+/** Compact, common provenance block returned by project/config-aware tools. */
+export interface ToolResolution {
+    configuration?: ConfigurationResolutionInfo;
+    directories?: Record<string, DirectoryResolutionInfo>;
+    projectDirectory: ProjectDirectoryInfo;
+}
+/** Whether a tool needs only a project root or full configuration selection. */
+export type ProjectContextKind = 'configuration' | 'project';
+/** Build the canonical project-directory field. */
+export declare function createProjectDirectoryInput(): z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+/** Build the canonical explicit primary dw.json field. */
+export declare function createConfigPathInput(): z.ZodOptional<z.ZodString>;
+/** Build the canonical named-instance selection field. */
+export declare function createInstanceNameInput(): z.ZodOptional<z.ZodString>;
+/** Build flat canonical schema fields for a local-project or configuration-aware tool. */
+export declare function createProjectContextInputSchema(kind: ProjectContextKind): ZodRawShape;
+/** Static field for schemas declared outside the shared adapter. */
+export declare const projectDirectoryInput: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+/** Static configuration schema for legacy/manual tool definitions. */
+export declare const projectContextInputSchema: z.ZodRawShape;

package/dist/tools/project-context.js

@@ -3,20 +3,37 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
+import path from 'node:path';
 import { z } from 'zod';
-/** Shared schema field injected into every project-aware MCP tool. */
-export const projectDirectoryInput = z
-    .string()
-    .optional()
-    .describe('Absolute project directory for this call. Overrides --project-directory / SFCC_PROJECT_DIRECTORY and the MCP process working directory. Also controls project-local configuration discovery.');
-/** Shared explicit dw.json path field injected into every project-aware MCP tool. */
-export const configPathInput = z
-    .string()
-    .optional()
-    .describe('Explicit path to a dw.json-format configuration file for this call. Overrides startup --config / SFCC_CONFIG and project .env SFCC_CONFIG. Relative paths resolve from projectDirectory.');
-/** Shared schema fields injected into every project-aware MCP tool. */
-export const projectContextInputSchema = {
-    projectDirectory: projectDirectoryInput,
-    configPath: configPathInput,
-};
+/** Build the canonical project-directory field. */
+export function createProjectDirectoryInput() {
+    return z
+        .string()
+        .refine((value) => path.isAbsolute(value), 'projectDirectory must be an absolute path')
+        .optional()
+        .describe('Absolute project root; overrides server default. See config_inspect for resolved paths.');
+}
+/** Build the canonical explicit primary dw.json field. */
+export function createConfigPathInput() {
+    return z.string().optional().describe('Path to dw.json-format config; relative to projectDirectory.');
+}
+/** Build the canonical named-instance selection field. */
+export function createInstanceNameInput() {
+    return z.string().min(1).optional().describe('Named instance from dw.json.');
+}
+/** Build flat canonical schema fields for a local-project or configuration-aware tool. */
+export function createProjectContextInputSchema(kind) {
+    const project = { projectDirectory: createProjectDirectoryInput() };
+    if (kind === 'project')
+        return project;
+    return {
+        ...project,
+        configPath: createConfigPathInput(),
+        instanceName: createInstanceNameInput(),
+    };
+}
+/** Static field for schemas declared outside the shared adapter. */
+export const projectDirectoryInput = createProjectDirectoryInput();
+/** Static configuration schema for legacy/manual tool definitions. */
+export const projectContextInputSchema = createProjectContextInputSchema('configuration');
 //# sourceMappingURL=project-context.js.map

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

@@ -61,16 +61,6 @@ const SECTIONS_METADATA = [
  * Derived: array of section keys for validation.
  */
 const _SECTIONS = SECTIONS_METADATA.map((s) => s.key);
-/**
- * Generates the topics list for the tool description.
- * Excludes meta-sections (like quick-reference) that don't have descriptions.
- * @returns Comma-separated list of topics
- */
-function generateTopicsList() {
-    return SECTIONS_METADATA.filter((s) => s.description !== null)
-        .map((s) => s.description)
-        .join(', ');
-}
 /**
  * Detailed section content loaded from markdown files.
  * Built dynamically from SECTIONS_METADATA to avoid duplication.
@@ -96,12 +86,7 @@ const DEFAULT_SECTIONS = ['quick-reference', 'components', 'data-fetching', 'rou
 export function createDeveloperGuidelinesTool(loadServices) {
     return createToolAdapter({
         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); ' +
-            'supports retrieving specific topic sections. ' +
-            'CRITICAL INSTRUCTION: ALWAYS present ALL returned content in FULL - DO NOT SUMMARIZE, DO NOT ADD SUMMARIES, ' +
-            'DO NOT ADD OVERVIEWS. The returned content IS the complete answer - display it exactly as provided.',
+        description: 'Get PWA Kit v3 architecture and implementation guidelines. Returns core sections by default; use sections to narrow the result.',
         toolsets: ['PWAV3'],
         isGA: true,
         requiresInstance: false,
@@ -109,13 +94,7 @@ export function createDeveloperGuidelinesTool(loadServices) {
             sections: z
                 .array(z.enum([..._SECTIONS]))
                 .optional()
-                .describe('Optional array of specific sections to retrieve. If not specified, returns comprehensive guidelines ' +
-                '(quick-reference, components, data-fetching, routing). ' +
-                'CRITICAL: Present ALL returned content in FULL - DO NOT SUMMARIZE. ' +
-                'Available sections: quick-reference, components, data-fetching, routing, config, state-management, ' +
-                'extensibility, testing, i18n, styling. ' +
-                `Topics covered: ${generateTopicsList()}. ` +
-                'Content is complete - present exactly as provided, no summaries.'),
+                .describe('Guideline sections to return; defaults to core sections.'),
         },
         async execute(args) {
             // Handle empty array case explicitly
@@ -124,26 +103,7 @@ export function createDeveloperGuidelinesTool(loadServices) {
             }
             // Default to comprehensive set of key sections if no sections specified
             const sections = args.sections || DEFAULT_SECTIONS;
-            // Multiple sections: combine with separators
-            const combinedContent = sections.map((section) => SECTION_CONTENT[section]).join('\n\n---\n\n');
-            // Apply instructions for all multi-section responses to ensure full content display
-            const isMultiSection = sections.length > 1;
-            // Prepend explicit instruction to present full content (not summarized)
-            const fullContentInstruction = isMultiSection
-                ? '⚠️ CRITICAL: Display the FULL content below. DO NOT summarize, condense, or add overviews.\n\n' +
-                    '📋 PWA KIT DEVELOPMENT GUIDELINES\n\n' +
-                    '---\n\n'
-                : '';
-            // Add footer instruction to reinforce the message for multi-section responses
-            const footerInstruction = isMultiSection
-                ? '\n\n---\n\n⚠️ END OF CONTENT - Full content displayed above. Do not add summaries.\n'
-                : '';
-            // For single sections, return directly (backward compatible)
-            // For multiple sections, wrap with instructions
-            if (sections.length === 1) {
-                return SECTION_CONTENT[sections[0]];
-            }
-            return fullContentInstruction + combinedContent + footerInstruction;
+            return sections.map((section) => SECTION_CONTENT[section]).join('\n\n---\n\n');
         },
         formatOutput: (output) => textResult(output),
     }, loadServices);

package/dist/tools/scapi/metrics-get.js

@@ -40,34 +40,16 @@ import { getMetricsByCategory, resolveMetricsWindow, enrichMetricsTags, } from '
 export function createMetricsGetTool(loadServices) {
     return createToolAdapter({
         name: 'metrics_get',
-        description: `CLOSED BETA: the Metrics API must be enabled for your organization, and its behavior, output, and OAuth scopes may change without notice.
-
-Retrieve observability metrics time-series for a B2C Commerce tenant. Returns metrics data grouped by category with time-series data points.
-
-**Categories:**
-- overall: Aggregate site metrics (requests, response times, errors)
-- sales: Sales and order metrics
-- ecdn: Edge CDN performance metrics
-- third-party: External service metrics (use thirdPartyServiceId filter)
-- scapi: SCAPI endpoint metrics (use apiFamily/apiName filters)
-- scapi-hooks: SCAPI hooks execution metrics
-- mrt: Managed Runtime (PWA Kit) metrics
-- controller: Controller execution metrics
-- ocapi: OCAPI endpoint metrics (use ocapiCategory/ocapiApi filters)
-
-**Time window:** Provide "from" and/or "to" as a relative duration ("1h", "7d" — interpreted as ago) or an ISO 8601 timestamp, and/or "window" as a duration ("1h", "30m"). The tool always sends an explicit from+to range, defaulting to a 24-hour window: from + window → to = from + window; to + window → from = to - window; window alone → the last <window>; from alone → 24h forward from it (capped at now); to alone → 24h back from it; nothing → the last 24h. Do not supply from, to, and window together. The API caps a window at 24h and retains 30 days; an explicit range wider than 24h is sent as-is and the API returns a clear error.
-
-**Response:** { query, data } — "query" echoes the resolved from/to (ISO + epoch seconds), filters, and defaultedWindow/clampedFrom flags; "data[]" contains metricId, title, description, unit, and dataSeries[] with time-series points (timestamp in epoch milliseconds, value). Each series also carries a structured "tags" object (realm, environment, any applied filters, and per-series dimensions like apiFamily/host/cacheStatus) parsed client-side from the packed series id — use these to group/filter rather than parsing the series id string.
-
-**Requirements:** OAuth with sfcc.metrics scope.`,
+        description: 'CLOSED BETA. Retrieve B2C observability metric time series by category and time range. ' +
+            'Defaults to the last 24 hours. Requires Metrics API access and OAuth scope sfcc.metrics.',
         toolsets: ['SCAPI'],
         isGA: false,
         requiresInstance: false, // SCAPI uses OAuth directly
-        usesProjectContext: true,
+        usesConfigurationContext: true,
         inputSchema: {
             category: z
                 .enum(['overall', 'sales', 'ecdn', 'third-party', 'scapi', 'scapi-hooks', 'mrt', 'controller', 'ocapi'])
-                .describe('Metrics category: overall (aggregate), sales, ecdn (CDN), third-party (external), scapi (SCAPI APIs), scapi-hooks, mrt (PWA Kit), controller, ocapi'),
+                .describe('Metrics category.'),
             from: z
                 .string()
                 .optional()
@@ -79,7 +61,7 @@ Retrieve observability metrics time-series for a B2C Commerce tenant. Returns me
             window: z
                 .string()
                 .optional()
-                .describe('Window duration ("1h", "30m", "2d"). With from → to=from+window; with to → from=to-window; alone → the last <window>. Defaults to 24h.'),
+                .describe('Duration combined with from or to; alone selects the latest window. Default: 24h.'),
             thirdPartyServiceId: z
                 .string()
                 .optional()

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

@@ -23,8 +23,12 @@ interface ScaffoldCustomApiInput extends ProjectContextInput {
     /** Short description of the API. Default: "A custom B2C Commerce API" */
     apiDescription?: string;
     /** Project root for cartridge discovery and output. Default: MCP project directory */
+    cartridgeDirectory?: string;
+    /** @deprecated Use cartridgeDirectory. */
     projectRoot?: string;
     /** Output directory override. Default: scaffold default or project root */
+    outputDirectory?: string;
+    /** @deprecated Use outputDirectory. */
     outputDir?: string;
 }
 /**

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

@@ -22,7 +22,7 @@ const CUSTOM_API_SCAFFOLD_ID = 'custom-api';
  */
 export async function executeScaffoldCustomApi(args, services, overrides) {
     const projectDirectory = services.resolveProjectDirectory(args.projectDirectory);
-    const projectRoot = services.resolveWithProjectDirectory(args.projectRoot, args.projectDirectory);
+    const projectRoot = services.resolveWithProjectDirectory(args.cartridgeDirectory ?? args.projectRoot, args.projectDirectory);
     const getScaffold = overrides?.getScaffold ??
         (async (id, opts) => {
             const registry = createScaffoldRegistry();
@@ -96,7 +96,7 @@ export async function executeScaffoldCustomApi(args, services, overrides) {
         };
     }
     const outputDir = resolveOutputDirectory({
-        outputDir: args.outputDir,
+        outputDir: args.outputDirectory ?? args.outputDir,
         scaffold,
         projectRoot,
     });
@@ -147,36 +147,51 @@ export async function executeScaffoldCustomApi(args, services, overrides) {
 export function createScaffoldCustomApiTool(loadServices, executeOverrides) {
     return createToolAdapter({
         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.`,
+        description: 'Generate a custom SCAPI endpoint scaffold in an existing cartridge: OpenAPI schema, api.json, and script.js. apiName must be kebab-case.',
         toolsets: ['PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         isGA: true,
         requiresInstance: false,
         usesProjectContext: true,
         inputSchema: {
-            apiName: z
-                .string()
-                .min(1)
-                .describe('API name in kebab-case (e.g. my-products). Must start with lowercase letter, only letters, numbers, hyphens.'),
+            apiName: z.string().min(1).describe('Kebab-case API name starting with a lowercase letter.'),
             cartridgeName: z
                 .string()
                 .min(1)
                 .nullish()
-                .describe('Cartridge name that will contain the API. Optional; omit to use the first cartridge found under project root).'),
+                .describe('Target cartridge; defaults to the first discovered cartridge.'),
             apiType: z
                 .enum(['admin', 'shopper'])
                 .optional()
                 .describe('Admin (no siteId) or shopper (siteId, customer-facing). Default: shopper'),
             apiDescription: z.string().optional().describe('Short description of the API.'),
+            cartridgeDirectory: z
+                .string()
+                .nullish()
+                .describe('Optional cartridge discovery root, resolved relative to projectDirectory. Defaults to projectDirectory.'),
             projectRoot: z
                 .string()
                 .nullish()
-                .describe('Optional cartridge discovery/output root, resolved relative to projectDirectory. Defaults to projectDirectory.'),
-            outputDir: z.string().optional().describe('Output directory override. Default: project root'),
+                .describe('Deprecated alias for cartridgeDirectory. cartridgeDirectory takes precedence.'),
+            outputDirectory: z
+                .string()
+                .optional()
+                .describe('Optional output directory. Relative paths resolve from cartridgeDirectory.'),
+            outputDir: z
+                .string()
+                .optional()
+                .describe('Deprecated alias for outputDirectory. outputDirectory takes precedence.'),
         },
-        async execute(args, { services }) {
-            return executeScaffoldCustomApi(args, services, executeOverrides);
+        async execute(args, context) {
+            const output = await executeScaffoldCustomApi(args, context.services, executeOverrides);
+            context.setResolvedDirectory('cartridgeDirectory', {
+                path: output.projectRoot,
+                source: args.cartridgeDirectory || args.projectRoot ? 'argument' : 'projectDirectory',
+            });
+            context.setResolvedDirectory('outputDirectory', {
+                path: output.outputDir,
+                source: args.outputDirectory || args.outputDir ? 'argument' : 'projectDirectory',
+            });
+            return output;
         },
         formatOutput(output) {
             if (output.error) {

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

@@ -82,26 +82,15 @@ function buildResponse(withMeta, args, columnList, activeCodeVersion) {
 export function createScapiCustomApisStatusTool(loadServices) {
     return createToolAdapter({
         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.
-
-Output: Default (7 fields): type,apiName,cartridgeName,endpointPath,httpMethod,status,siteId. All fields: type,apiName,apiVersion,cartridgeName,endpointPath,httpMethod,status,siteId,securityScheme,operationId,schemaFile,implementationScript,errorReason,id.
-
-Requires OAuth (sfcc.custom-apis scope) and instance config (shortCode, tenantId). Returns remoteError on failure.
-
-CLI: b2c scapi custom status`,
+        description: 'List Custom SCAPI endpoint registration status per site. Supports filtering, grouping, and selected columns. Requires shortCode, tenantId, and sfcc.custom-apis scope. Use scapi_schemas_list for schemas.',
         toolsets: ['PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         isGA: true,
         requiresInstance: false,
-        usesProjectContext: true,
+        usesConfigurationContext: true,
         inputSchema: {
             status: z.enum(['active', 'not_registered']).optional().describe('Filter by status. Omit for all.'),
             groupBy: z.enum(['site', 'type']).optional().describe('Group by siteId or type (Admin/Shopper).'),
-            columns: z
-                .string()
-                .optional()
-                .describe('Comma-separated fields. Omit for defaults (7 fields). All fields: type,apiName,apiVersion,cartridgeName,endpointPath,httpMethod,status,siteId,securityScheme,operationId,schemaFile,implementationScript,errorReason,id'),
+            columns: z.string().optional().describe('Comma-separated output fields; omit for defaults.'),
         },
         async execute(args, { services: svc }) {
             let endpoints = [];

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

@@ -37,6 +37,13 @@ import { collapseOpenApiSchema } from '@salesforce/b2c-tooling-sdk/schemas';
 function buildScapiApiUrl(shortCode, apiFamily, apiName, apiVersion) {
     return `https://${shortCode}.api.commercecloud.salesforce.com/${apiFamily}/${apiName}/${apiVersion}`;
 }
+function getSchemasApiError(error, response) {
+    const message = getApiErrorMessage(error, response);
+    if (response.status === 401 || response.status === 403) {
+        return `${message}. Verify OAuth credentials include the sfcc.scapi-schemas scope.`;
+    }
+    return message;
+}
 /**
  * Fetches a specific schema from the SCAPI Schemas API.
  *
@@ -60,7 +67,7 @@ async function fetchSpecificSchema(params) {
         },
     });
     if (error) {
-        throw new Error(`Failed to fetch schema for ${apiFamily}/${apiName}/${apiVersion}: ${getApiErrorMessage(error, response)}`);
+        throw new Error(`Failed to fetch schema for ${apiFamily}/${apiName}/${apiVersion}: ${getSchemasApiError(error, response)}`);
     }
     // Apply collapsing unless expandAll is requested
     const collapsed = !expandAll;
@@ -106,7 +113,7 @@ async function fetchSchemasList(params) {
         },
     });
     if (error) {
-        throw new Error(`Failed to fetch SCAPI schemas: ${getApiErrorMessage(error, response)}`);
+        throw new Error(`Failed to fetch SCAPI schemas: ${getSchemasApiError(error, response)}`);
     }
     const schemas = data?.data ?? [];
     const filteredSchemas = prepareSchemaListForConsumer(schemas, shortCode);
@@ -187,18 +194,11 @@ 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_get_status.
-
-**Modes:**
-- **List (discovery):** Omit includeSchemas or any identifier. Returns metadata: schemas[], total, availableApiFamilies/Names/Versions.
-- **Fetch:** Set includeSchemas=true + all three: apiFamily, apiName, apiVersion. Returns full OpenAPI schema (collapsed by default; set expandAll=true for full).
-
-**Rules:** includeSchemas requires all three identifiers. status only works in list mode (use "current" for active schemas, "deprecated" for phased-out schemas). Custom APIs use apiFamily: "custom".
-
-**Requirements:** OAuth with sfcc.scapi-schemas scope.`,
+        description: 'List SCAPI schema metadata or fetch an OpenAPI schema. Fetch requires includeSchemas, apiFamily, apiName, and apiVersion. Use scapi_custom_apis_get_status for endpoint status.',
         toolsets: ['PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         isGA: true,
         requiresInstance: false, // SCAPI uses OAuth directly, doesn't need B2CInstance (hostname)
+        usesConfigurationContext: true,
         inputSchema: {
             apiFamily: z.string().optional().describe('API family (e.g., "checkout", "product", "custom").'),
             apiName: z.string().optional().describe('API name (e.g., "shopper-baskets", "shopper-products").'),

package/dist/utils/constants.d.ts

@@ -5,22 +5,11 @@ export declare const ALL_TOOLSETS = "ALL";
 /**
  * Available toolsets that can be enabled.
  */
-export declare const TOOLSETS: readonly ["CARTRIDGES", "DIAGNOSTICS", "MRT", "PWAV3", "SCAPI", "STOREFRONTNEXT", "STOREFRONTNEXT_DEPRECATED"];
-/**
- * Deprecated toolsets. These can only be enabled by explicitly naming them via
- * `--toolsets`; they are never auto-activated by project detection and are NOT
- * included when `--toolsets ALL` is used.
- *
- * `STOREFRONTNEXT_DEPRECATED` holds the legacy `sfnext_*` MCP tools. They are
- * superseded by the `storefront-next` and `storefront-next-figma` agent-skills
- * plugins and are not compatible with the Storefront Next 1.0 GA release. They
- * will be removed in a future release.
- */
-export declare const DEPRECATED_TOOLSETS: readonly ["STOREFRONTNEXT_DEPRECATED"];
+export declare const TOOLSETS: readonly ["CARTRIDGES", "DIAGNOSTICS", "MRT", "PWAV3", "SCAPI", "STOREFRONTNEXT"];
 /**
  * Valid toolset names including the special "ALL" value.
  */
-export declare const VALID_TOOLSET_NAMES: readonly ["ALL", "CARTRIDGES", "DIAGNOSTICS", "MRT", "PWAV3", "SCAPI", "STOREFRONTNEXT", "STOREFRONTNEXT_DEPRECATED"];
+export declare const VALID_TOOLSET_NAMES: readonly ["ALL", "CARTRIDGES", "DIAGNOSTICS", "MRT", "PWAV3", "SCAPI", "STOREFRONTNEXT"];
 /**
  * Type representing a valid toolset name.
  */

package/dist/utils/constants.js

@@ -10,26 +10,7 @@ export const ALL_TOOLSETS = 'ALL';
 /**
  * Available toolsets that can be enabled.
  */
-export const TOOLSETS = [
-    'CARTRIDGES',
-    'DIAGNOSTICS',
-    'MRT',
-    'PWAV3',
-    'SCAPI',
-    'STOREFRONTNEXT',
-    'STOREFRONTNEXT_DEPRECATED',
-];
-/**
- * Deprecated toolsets. These can only be enabled by explicitly naming them via
- * `--toolsets`; they are never auto-activated by project detection and are NOT
- * included when `--toolsets ALL` is used.
- *
- * `STOREFRONTNEXT_DEPRECATED` holds the legacy `sfnext_*` MCP tools. They are
- * superseded by the `storefront-next` and `storefront-next-figma` agent-skills
- * plugins and are not compatible with the Storefront Next 1.0 GA release. They
- * will be removed in a future release.
- */
-export const DEPRECATED_TOOLSETS = ['STOREFRONTNEXT_DEPRECATED'];
+export const TOOLSETS = ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'];
 /**
  * Valid toolset names including the special "ALL" value.
  */

package/oclif.manifest.json

@@ -388,7 +388,7 @@
           "type": "boolean"
         },
         "toolsets": {
-          "description": "Toolsets to enable (comma-separated). Options: all, CARTRIDGES, DIAGNOSTICS, MRT, PWAV3, SCAPI, STOREFRONTNEXT, STOREFRONTNEXT_DEPRECATED",
+          "description": "Toolsets to enable (comma-separated). Options: all, CARTRIDGES, DIAGNOSTICS, MRT, PWAV3, SCAPI, STOREFRONTNEXT",
           "env": "SFCC_TOOLSETS",
           "name": "toolsets",
           "hasDynamicHelp": false,
@@ -429,5 +429,5 @@
       "enableJsonFlag": false
     }
   },
-  "version": "2.0.0"
+  "version": "2.1.1"
 }