@salesforce/b2c-dx-mcp 0.4.6 → 0.4.8

package/dist/tools/cartridges/index.js

@@ -14,6 +14,9 @@ import { z } from 'zod';
 import { createToolAdapter, jsonResult } from '../adapter.js';
 import { findAndDeployCartridges, getActiveCodeVersion } from '@salesforce/b2c-tooling-sdk/operations/code';
 import { getLogger } from '@salesforce/b2c-tooling-sdk/logging';
+/** Reminder shown after deploy so users add cartridges to the site cartridge path. */
+const CARTRIDGE_PATH_REMINDER = "If this is a new or updated cartridge, add it to your site's cartridge path in Business Manager: " +
+    'Sites → Manage Sites → [your site] → Settings tab → Cartridges field.';
 /**
  * Creates the cartridge_deploy tool.
  *
@@ -36,7 +39,8 @@ function createCartridgeDeployTool(loadServices, injections) {
             'Searches the directory for cartridges (by .project files), applies include/exclude filters, ' +
             'creates a zip archive, uploads via WebDAV, and optionally reloads the code version. ' +
             'Use this tool to deploy custom code cartridges for SFRA or other B2C Commerce code. ' +
-            'Requires the instance to have a code version configured.',
+            'Requires the instance to have a code version configured. ' +
+            "After deploy, add new cartridges to your site's cartridge path in Business Manager: Sites → Manage Sites → [site] → Settings tab → Cartridges.",
         toolsets: ['CARTRIDGES'],
         isGA: false,
         requiresInstance: true,
@@ -100,7 +104,10 @@ function createCartridgeDeployTool(loadServices, injections) {
                 }, '[Cartridges] Deploying cartridges with computed options');
                 // Deploy cartridges
                 const result = await findAndDeployCartridgesFn(instance, directory, options);
-                return result;
+                return {
+                    ...result,
+                    postInstructions: CARTRIDGE_PATH_REMINDER,
+                };
             }
             catch (error) {
                 // Handle communication and authentication errors

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

@@ -2,12 +2,17 @@ import type { McpTool } from '../../utils/index.js';
 import type { Services } from '../../services.js';
 import type { PushResult, PushOptions } from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import type { AuthStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+import { type ProjectType } from '@salesforce/b2c-tooling-sdk/discovery';
 /**
  * Optional dependency injections for testing.
  */
 interface MrtToolInjections {
     /** Mock pushBundle function for testing */
     pushBundle?: (options: PushOptions, auth: AuthStrategy) => Promise<PushResult>;
+    /** Mock detectWorkspaceType function for testing */
+    detectWorkspaceType?: (path: string) => Promise<{
+        projectTypes: ProjectType[];
+    }>;
 }
 /**
  * Creates all tools for the MRT toolset.

package/dist/tools/mrt/index.js

@@ -13,7 +13,98 @@
 import { z } from 'zod';
 import { createToolAdapter, jsonResult } from '../adapter.js';
 import { pushBundle } from '@salesforce/b2c-tooling-sdk/operations/mrt';
+import { detectWorkspaceType } from '@salesforce/b2c-tooling-sdk/discovery';
 import { getLogger } from '@salesforce/b2c-tooling-sdk/logging';
+/**
+ * Parses a glob pattern string into an array of patterns.
+ * Accepts either a JSON array (e.g. '["server/**\/*", "ssr.{js,mjs}"]')
+ * or a comma-separated string (e.g. 'server/**\/*,ssr.js').
+ * JSON array format supports brace expansion in individual patterns.
+ */
+function parseGlobPatterns(value) {
+    const trimmed = value.trim();
+    if (trimmed.startsWith('[')) {
+        const parsed = JSON.parse(trimmed);
+        if (!Array.isArray(parsed) || !parsed.every((item) => typeof item === 'string')) {
+            throw new Error('Invalid glob pattern array: expected an array of strings');
+        }
+        return parsed.map((s) => s.trim()).filter(Boolean);
+    }
+    return trimmed
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
+const MRT_DEFAULTS = {
+    'storefront-next': {
+        // ssrEntryPoint is 'streamingHandler' (production + MRT_BUNDLE_TYPE!=='ssr') or 'ssr' otherwise.
+        // Include both patterns so the bundle works regardless of MRT_BUNDLE_TYPE / mode.
+        ssrOnly: [
+            'server/**/*',
+            'loader.js',
+            'streamingHandler.{js,mjs,cjs}',
+            'streamingHandler.{js,mjs,cjs}.map',
+            'ssr.{js,mjs,cjs}',
+            'ssr.{js,mjs,cjs}.map',
+            '!static/**/*',
+            'sfnext-server-*.mjs',
+            '!**/*.stories.tsx',
+            '!**/*.stories.ts',
+            '!**/*-snapshot.tsx',
+            '!.storybook/**/*',
+            '!storybook-static/**/*',
+            '!**/__mocks__/**/*',
+            '!**/__snapshots__/**/*',
+        ],
+        ssrShared: [
+            'client/**/*',
+            'static/**/*',
+            '**/*.css',
+            '**/*.png',
+            '**/*.jpg',
+            '**/*.jpeg',
+            '**/*.gif',
+            '**/*.svg',
+            '**/*.ico',
+            '**/*.woff',
+            '**/*.woff2',
+            '**/*.ttf',
+            '**/*.eot',
+            '!**/*.stories.tsx',
+            '!**/*.stories.ts',
+            '!**/*-snapshot.tsx',
+            '!.storybook/**/*',
+            '!storybook-static/**/*',
+            '!**/__mocks__/**/*',
+            '!**/__snapshots__/**/*',
+        ],
+        buildDirectory: 'build',
+    },
+    'pwa-kit-v3': {
+        ssrOnly: ['ssr.js', 'ssr.js.map', 'node_modules/**/*.*'],
+        ssrShared: ['static/ico/favicon.ico', 'static/robots.txt', '**/*.js', '**/*.js.map', '**/*.json'],
+        buildDirectory: 'build',
+    },
+    default: {
+        ssrOnly: ['ssr.js', 'ssr.mjs', 'server/**/*'],
+        ssrShared: ['static/**/*', 'client/**/*'],
+        buildDirectory: 'build',
+    },
+};
+/**
+ * Returns MRT bundle defaults for the given project types.
+ * For hybrid projects (multiple types detected), prefers storefront-next over pwa-kit-v3.
+ *
+ * @param projectTypes - Detected project types from workspace discovery
+ * @returns Defaults for ssrOnly, ssrShared, and buildDirectory
+ */
+function getDefaultsForProjectTypes(projectTypes) {
+    if (projectTypes.includes('storefront-next'))
+        return MRT_DEFAULTS['storefront-next'];
+    if (projectTypes.includes('pwa-kit-v3'))
+        return MRT_DEFAULTS['pwa-kit-v3'];
+    return MRT_DEFAULTS.default;
+}
 /**
  * Creates the mrt_bundle_push tool.
  *
@@ -28,6 +119,7 @@ import { getLogger } from '@salesforce/b2c-tooling-sdk/logging';
  */
 function createMrtBundlePushTool(loadServices, injections) {
     const pushBundleFn = injections?.pushBundle || pushBundle;
+    const detectWorkspaceTypeFn = injections?.detectWorkspaceType ?? detectWorkspaceType;
     return createToolAdapter({
         name: 'mrt_bundle_push',
         description: 'Bundle a pre-built PWA Kit or Storefront Next project and push to Managed Runtime. Optionally deploy to a target environment.',
@@ -36,16 +128,19 @@ function createMrtBundlePushTool(loadServices, injections) {
         // MRT operations use ApiKeyStrategy from MRT_API_KEY or ~/.mobify
         requiresMrtAuth: true,
         inputSchema: {
-            buildDirectory: z.string().optional().describe('Path to build directory (default: ./build)'),
+            buildDirectory: z
+                .string()
+                .optional()
+                .describe('Path to build directory. Defaults vary by project type: Storefront Next, PWA Kit v3, or generic (./build).'),
             message: z.string().optional().describe('Deployment message'),
             ssrOnly: z
                 .string()
                 .optional()
-                .describe('Glob patterns for server-only files, comma-separated (default: ssr.js,ssr.mjs,server/**/*)'),
+                .describe('Glob patterns for server-only files (comma-separated or JSON array). Defaults vary by project type: Storefront Next, PWA Kit v3, or generic.'),
             ssrShared: z
                 .string()
                 .optional()
-                .describe('Glob patterns for shared files, comma-separated (default: static/**/*,client/**/*)'),
+                .describe('Glob patterns for shared files (comma-separated or JSON array). Defaults vary by project type: Storefront Next, PWA Kit v3, or generic.'),
             deploy: z
                 .boolean()
                 .optional()
@@ -71,10 +166,13 @@ function createMrtBundlePushTool(loadServices, injections) {
             }
             // Get origin from --cloud-origin flag or mrtOrigin config (optional)
             const origin = context.mrtConfig?.origin;
-            // Parse comma-separated glob patterns (same as CLI defaults)
-            const ssrOnly = (args.ssrOnly || 'ssr.js,ssr.mjs,server/**/*').split(',').map((s) => s.trim());
-            const ssrShared = (args.ssrShared || 'static/**/*,client/**/*').split(',').map((s) => s.trim());
-            const buildDirectory = context.services.resolveWithProjectDirectory(args.buildDirectory || 'build');
+            // Detect project type and get project-type-aware defaults
+            const projectDir = context.services.resolveWithProjectDirectory();
+            const { projectTypes } = await detectWorkspaceTypeFn(projectDir);
+            const defaults = getDefaultsForProjectTypes(projectTypes);
+            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);
             // Log all computed variables before pushing bundle
             const logger = getLogger();
             logger.debug({
@@ -83,6 +181,7 @@ function createMrtBundlePushTool(loadServices, injections) {
                 origin,
                 buildDirectory,
                 message: args.message,
+                projectTypes,
                 ssrOnly,
                 ssrShared,
             }, '[MRT] Pushing bundle with computed options');

package/oclif.manifest.json

@@ -390,5 +390,5 @@
       "enableJsonFlag": false
     }
   },
-  "version": "0.4.6"
+  "version": "0.4.8"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-dx-mcp",
   "description": "MCP server for B2C Commerce developer experience tools",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
@@ -80,7 +80,7 @@
     "yaml": "2.8.1",
     "postcss": "8.5.6",
     "zod": "3.25.76",
-    "@salesforce/b2c-tooling-sdk": "0.5.5"
+    "@salesforce/b2c-tooling-sdk": "0.7.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1",