@salesforce/b2c-dx-mcp 2.0.0 → 2.1.1

package/dist/tools/adapter.js

@@ -70,7 +70,7 @@
  * ```
  */
 import { z } from 'zod';
-import { projectContextInputSchema } from './project-context.js';
+import { createProjectContextInputSchema, } from './project-context.js';
 /**
  * Creates a text-only success result.
  *
@@ -121,6 +121,25 @@ export function jsonResult(data, indent = 2) {
         content: [{ type: 'text', text: JSON.stringify(data, null, indent) }],
     };
 }
+/** Attach compact resolution provenance while preserving existing tool output. */
+export function attachResolution(result, resolution) {
+    let content = result.content;
+    let structuredContent = { ...result.structuredContent, resolution };
+    if (content.length === 1 && content[0]?.type === 'text') {
+        try {
+            const parsed = JSON.parse(content[0].text);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                const output = { ...parsed, resolution };
+                content = [{ ...content[0], text: JSON.stringify(output, null, 2) }];
+                structuredContent = { ...output, ...result.structuredContent, resolution };
+            }
+        }
+        catch {
+            // Plain-text tools expose resolution through structuredContent only.
+        }
+    }
+    return { ...result, content, structuredContent };
+}
 /**
  * Formats Zod validation errors into a human-readable string.
  *
@@ -170,10 +189,17 @@ function formatZodErrors(error) {
  * ```
  */
 export function createToolAdapter(options, loadServices, serverContext) {
-    const { name, description, inputSchema, toolsets, isGA = true, requiresInstance = false, requiresMrtAuth = false, usesProjectContext = false, execute, formatOutput, } = options;
-    const effectiveUsesProjectContext = usesProjectContext || requiresInstance || requiresMrtAuth;
-    const effectiveInputSchema = effectiveUsesProjectContext
-        ? { ...projectContextInputSchema, ...inputSchema }
+    const { name, description, inputSchema, toolsets, isGA = true, requiresInstance = false, requiresMrtAuth = false, usesProjectContext = false, usesConfigurationContext = false, execute, formatOutput, } = options;
+    const projectContextKind = requiresInstance || requiresMrtAuth || usesConfigurationContext
+        ? 'configuration'
+        : usesProjectContext
+            ? 'project'
+            : undefined;
+    const effectiveInputSchema = projectContextKind
+        ? {
+            ...createProjectContextInputSchema(projectContextKind),
+            ...inputSchema,
+        }
         : inputSchema;
     // Create Zod schema from inputSchema definition
     const zodSchema = z.object(effectiveInputSchema);
@@ -190,15 +216,21 @@ export function createToolAdapter(options, loadServices, serverContext) {
                 return errorResult(`Invalid input: ${formatZodErrors(parseResult.error)}`);
             }
             const args = parseResult.data;
+            let resolution;
             try {
                 // 2. Load Services to get fresh configuration (re-reads config files)
-                const projectContext = effectiveUsesProjectContext ? args : undefined;
+                const projectContext = projectContextKind ? args : undefined;
                 const services = await loadServices(projectContext);
+                const executionResolution = services.getResolution();
+                if (projectContextKind === 'project') {
+                    delete executionResolution.configuration;
+                }
+                resolution = projectContextKind ? executionResolution : undefined;
                 // 3. Get B2CInstance if required (loaded on each call)
                 let b2cInstance;
                 if (requiresInstance) {
                     if (!services.b2cInstance) {
-                        return errorResult('B2C instance error: Instance configuration required. Provide --server flag, set SFCC_SERVER environment variable, or configure dw.json');
+                        return attachResolution(errorResult('B2C instance error: Instance configuration required. Provide --server flag, set SFCC_SERVER environment variable, or configure dw.json'), executionResolution);
                     }
                     b2cInstance = services.b2cInstance;
                 }
@@ -206,7 +238,7 @@ export function createToolAdapter(options, loadServices, serverContext) {
                 let mrtConfig;
                 if (requiresMrtAuth) {
                     if (!services.mrtConfig.auth) {
-                        return errorResult('MRT auth error: MRT API key required. Provide --api-key, set MRT_API_KEY environment variable, or configure ~/.mobify');
+                        return attachResolution(errorResult('MRT auth error: MRT API key required. Provide --api-key, set MRT_API_KEY environment variable, or configure ~/.mobify'), executionResolution);
                     }
                     mrtConfig = {
                         auth: services.mrtConfig.auth,
@@ -221,15 +253,22 @@ export function createToolAdapter(options, loadServices, serverContext) {
                     mrtConfig,
                     services,
                     serverContext,
+                    resolution: executionResolution,
+                    setResolvedDirectory(name, value) {
+                        executionResolution.directories ??= {};
+                        executionResolution.directories[name] = value;
+                    },
                 };
                 const output = await execute(args, context);
                 // 6. Format output
-                return formatOutput(output);
+                const result = formatOutput(output);
+                return resolution ? attachResolution(result, executionResolution) : result;
             }
             catch (error) {
                 // Handle execution errors
                 const message = error instanceof Error ? error.message : String(error);
-                return errorResult(`Execution error: ${message}`);
+                const result = errorResult(`Execution error: ${message}`);
+                return resolution ? attachResolution(result, resolution) : result;
             }
         },
     };

package/dist/tools/cartridges/index.js

@@ -35,38 +35,27 @@ function createCartridgeDeployTool(loadServices, injections) {
     const getActiveCodeVersionFn = injections?.getActiveCodeVersion || getActiveCodeVersion;
     return createToolAdapter({
         name: 'cartridge_deploy',
-        description: 'Finds and deploys cartridges to a B2C Commerce instance via WebDAV. ' +
-            '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. ' +
-            "After deploy, add new cartridges to your site's cartridge path in Business Manager: Sites → Manage Sites → [site] → Settings tab → Cartridges.",
+        description: 'Find and deploy cartridges to B2C Commerce via WebDAV. Supports include/exclude filters and code-version reload. ' +
+            "After deployment, add new cartridges to the site's cartridge path in Business Manager: Sites → Manage Sites → Settings tab → Cartridges.",
         toolsets: ['CARTRIDGES'],
         isGA: true,
         requiresInstance: true,
         usesProjectContext: true,
         inputSchema: {
+            cartridgeDirectory: z
+                .string()
+                .optional()
+                .describe('Optional cartridge discovery root. Relative paths resolve from projectDirectory. Defaults to projectDirectory.'),
             directory: z
                 .string()
                 .optional()
-                .describe('Path to directory to search for cartridges. Defaults to current project directory if not specified. ' +
-                'The tool will recursively search this directory for .project files to identify cartridges.'),
+                .describe('Deprecated alias for cartridgeDirectory. cartridgeDirectory takes precedence when both are supplied.'),
             cartridges: z
                 .array(z.string())
                 .optional()
-                .describe('Array of cartridge names to include in the deployment. If not specified, all cartridges found in the directory are deployed. ' +
-                'Use this to selectively deploy specific cartridges when you have multiple cartridges but only want to update some.'),
-            exclude: z
-                .array(z.string())
-                .optional()
-                .describe('Array of cartridge names to exclude from the deployment. Use this to skip deploying certain cartridges, ' +
-                'such as third-party or unchanged cartridges. Applied after the include filter.'),
-            reload: z
-                .boolean()
-                .optional()
-                .describe('Whether to reload (re-activate) the code version after deployment. ' +
-                'Set to true to make the deployed code immediately active on the instance. ' +
-                'Defaults to false. Use this when you want changes to take effect right away.'),
+                .describe('Cartridge names to deploy; omit for all discovered cartridges.'),
+            exclude: z.array(z.string()).optional().describe('Cartridge names to exclude after the include filter.'),
+            reload: z.boolean().optional().describe('Reload the code version after deployment. Default: false.'),
         },
         async execute(args, context) {
             // Get instance from context (guaranteed by adapter when requiresInstance is true)
@@ -89,7 +78,12 @@ function createCartridgeDeployTool(loadServices, injections) {
                 }
                 // Resolve directory path: relative paths are resolved relative to project directory, absolute paths are used as-is
                 const projectDirectory = context.services.resolveProjectDirectory(args.projectDirectory);
-                const directory = context.services.resolveWithProjectDirectory(args.directory, args.projectDirectory);
+                const directoryArgument = args.cartridgeDirectory ?? args.directory;
+                const directory = context.services.resolveWithProjectDirectory(directoryArgument, args.projectDirectory);
+                context.setResolvedDirectory('cartridgeDirectory', {
+                    path: directory,
+                    source: directoryArgument ? 'argument' : 'projectDirectory',
+                });
                 // Parse options
                 const options = {
                     include: args.cartridges,

package/dist/tools/diagnostics/config-inspect.js

@@ -18,26 +18,22 @@ import { createToolAdapter, jsonResult } from '../adapter.js';
 export function createConfigInspectTool(loadServices) {
     return createToolAdapter({
         name: 'config_inspect',
-        description: 'Inspect the resolved B2C Commerce configuration the MCP server is using — instance hostname, auth, SCAPI, MRT, and other settings — along with which source (dw.json, environment variables, flags) provided each value. ' +
-            'Secrets (passwords, client secrets, API keys) are redacted by default. ' +
-            'Pass projectDirectory and/or configPath to inspect the same project and dw.json-format file a CLI command would use. The output includes the effective projectDirectory and source provenance, which is useful for diagnosing why the server targets the wrong instance or cannot find a project. ' +
-            'Use this first when configuration seems wrong, auth is failing, or the server appears to be operating in the wrong directory.',
+        description: 'Inspect resolved B2C configuration, source provenance, warnings, and paths. Secrets are redacted unless unmask=true. ' +
+            'Use to diagnose configuration, authentication, or project-context issues.',
         toolsets: ['DIAGNOSTICS'],
         isGA: true,
         requiresInstance: false,
-        usesProjectContext: true,
+        usesConfigurationContext: true,
         inputSchema: {
             unmask: z
                 .boolean()
                 .optional()
-                .describe('Show sensitive values (passwords, secrets, API keys) unmasked. Defaults to false — secrets are redacted. Only set this when the user explicitly needs the raw secret values.'),
+                .describe('Return secrets unmasked. Default: false; use only when explicitly requested.'),
         },
         async execute(args, { services }) {
             const resolved = services.getResolvedConfig();
-            const projectDirectory = services.resolveProjectDirectory(args.projectDirectory);
             return {
                 config: redactConfigValues(resolved.values, { unmask: args.unmask ?? false }),
-                projectDirectory,
                 sources: resolved.sources,
                 warnings: resolved.warnings.length > 0 ? resolved.warnings.map((w) => w.message) : undefined,
             };

package/dist/tools/diagnostics/debug-capture-at-breakpoint.js

@@ -15,10 +15,8 @@ const TIMEOUT_HINT = 'Breakpoint not hit. First confirm the triggered request ac
 export function createDebugCaptureAtBreakpointTool(loadServices, serverContext) {
     return createToolAdapter({
         name: 'debug_capture_at_breakpoint',
-        description: 'Set a breakpoint, optionally trigger an HTTP request, wait for the breakpoint to be hit, and capture a diagnostic snapshot (stack, variables, expression results). ' +
-            'Use trigger_url to have the tool fire the request itself (recommended) — this avoids needing to coordinate a separate request while the tool blocks. ' +
-            'Without trigger_url, the tool BLOCKS until the breakpoint is hit or timeout expires and requires the user to trigger a request externally. ' +
-            'For more control, use the non-blocking workflow: debug_set_breakpoints → trigger request → debug_list_sessions (check halted_threads) → debug_get_variables.',
+        description: 'Set a breakpoint, optionally GET trigger_url, wait for a halt, and return stack, variables, and expressions. ' +
+            'Without trigger_url, blocks until an external request hits the breakpoint or timeout expires.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'SCAPI'],
         inputSchema: {
             session_id: z.string().describe('Session ID returned by debug_start_session.'),
@@ -37,11 +35,7 @@ export function createDebugCaptureAtBreakpointTool(loadServices, serverContext)
                 .boolean()
                 .optional()
                 .describe('If true, resume the thread after capturing the snapshot. Defaults to false.'),
-            trigger_url: z
-                .string()
-                .optional()
-                .describe('URL to request after arming the breakpoint. The tool fires this HTTP GET in the background, then waits for the breakpoint to halt. ' +
-                'This is the recommended approach — it avoids needing to coordinate a separate request while the tool blocks.'),
+            trigger_url: z.string().optional().describe('HTTP GET URL to invoke after arming the breakpoint.'),
         },
         async execute(args, context) {
             const entry = getSessionEntry(context, args.session_id);

package/dist/tools/diagnostics/debug-list-sessions.js

@@ -30,6 +30,7 @@ export function createDebugListSessionsTool(loadServices, serverContext) {
                         session_cookie: dwsid ? { name: 'dwsid', value: dwsid } : null,
                         created_at: new Date(entry.createdAt).toISOString(),
                         last_activity_at: new Date(entry.lastActivityAt).toISOString(),
+                        resolution: entry.resolution,
                     };
                 }),
             };

package/dist/tools/diagnostics/debug-start-session.js

@@ -12,18 +12,16 @@ import { getRegistry } from './session-registry.js';
 export function createDebugStartSessionTool(loadServices, serverContext) {
     return createToolAdapter({
         name: 'debug_start_session',
-        description: 'Start a script debugger session on a B2C Commerce instance to debug SFRA controllers, custom API scripts, hooks, jobs, or any server-side script. ' +
-            'Uses projectDirectory to load project configuration and discover cartridges. cartridgeDirectory may override only the cartridge discovery/source-mapping root. ' +
-            'Returns a session_id for use with other debug tools, plus discovered cartridge mappings. ' +
-            'WARNING: Debug sessions halt remote request threads on the instance. Always call debug_end_session when finished.',
+        description: 'Start a B2C script debugger session and discover cartridge mappings. Returns session_id for follow-up tools. ' +
+            'Debugging halts remote request threads; always call debug_end_session.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'SCAPI'],
         inputSchema: {
             cartridgeDirectory: z
                 .string()
                 .optional()
-                .describe('Optional cartridge discovery and debugger source-mapping root. Relative paths resolve from projectDirectory. Defaults to projectDirectory.'),
+                .describe('Cartridge discovery and source-mapping root; relative to projectDirectory.'),
         },
-        usesProjectContext: true,
+        usesConfigurationContext: true,
         async execute(args, context) {
             const registry = getRegistry(context);
             const credentials = context.services.getBasicAuthCredentials();
@@ -33,8 +31,11 @@ export function createDebugStartSessionTool(loadServices, serverContext) {
             }
             const { hostname, username, password } = credentials;
             const clientId = `b2c-dx-mcp-${randomUUID()}`;
-            const projectDirectory = context.services.resolveProjectDirectory(args.projectDirectory);
             const cartridgeDir = context.services.resolveWithProjectDirectory(args.cartridgeDirectory, args.projectDirectory);
+            context.setResolvedDirectory('cartridgeDirectory', {
+                path: cartridgeDir,
+                source: args.cartridgeDirectory ? 'argument' : 'projectDirectory',
+            });
             const cartridges = findCartridges(cartridgeDir);
             const warnings = [];
             if (cartridges.length === 0) {
@@ -55,7 +56,14 @@ export function createDebugStartSessionTool(loadServices, serverContext) {
             };
             const manager = new DebugSessionManager({ hostname, username, password, clientId, cartridgeRoots: cartridges }, callbacks);
             await manager.connect();
-            const entry = registry.registerSession({ hostname, clientId, manager, sourceMapper, cartridges });
+            const entry = registry.registerSession({
+                hostname,
+                clientId,
+                manager,
+                sourceMapper,
+                cartridges,
+                resolution: structuredClone(context.resolution),
+            });
             const cartridgeMappings = {};
             for (const c of cartridges)
                 cartridgeMappings[c.name] = c.src;
@@ -70,7 +78,6 @@ export function createDebugStartSessionTool(loadServices, serverContext) {
                 cartridge_mappings: cartridgeMappings,
                 session_cookie: dwsid ? { name: 'dwsid', value: dwsid } : null,
                 warnings,
-                projectDirectory,
                 cartridgeDirectory: cartridgeDir,
             };
         },

package/dist/tools/diagnostics/debug-wait-for-stop.js

@@ -15,9 +15,7 @@ const TIMEOUT_HINT = 'Breakpoint not hit. First confirm the request actually exe
 export function createDebugWaitForStopTool(loadServices, serverContext) {
     return createToolAdapter({
         name: 'debug_wait_for_stop',
-        description: 'Wait for a thread to halt at a breakpoint or step. ' +
-            'Returns immediately if a thread is already halted; otherwise BLOCKS until a halt occurs or the timeout expires. ' +
-            'Preferred non-blocking alternative: after debug_set_breakpoints, trigger the request yourself, then use debug_list_sessions to check halted_threads before calling debug_get_stack/debug_get_variables.',
+        description: 'Wait for a debugger thread to halt. Returns immediately if already halted; otherwise blocks until a halt or timeout.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'SCAPI'],
         inputSchema: {
             session_id: z.string().describe('Session ID returned by debug_start_session.'),

package/dist/tools/diagnostics/log-watch-registry.d.ts

@@ -1,5 +1,6 @@
 import type { LogEntry, LogFile, TailLogsResult } from '@salesforce/b2c-tooling-sdk/operations/logs';
 import type { ToolExecutionContext } from '../adapter.js';
+import type { ToolResolution } from '../project-context.js';
 /** Maximum number of buffered entries before oldest are evicted. */
 export declare const DEFAULT_BUFFER_CAP = 5000;
 /**
@@ -38,6 +39,7 @@ export interface LogWatchEntry {
     createdAt: number;
     lastActivityAt: number;
     stopped: boolean;
+    resolution?: ToolResolution;
 }
 export interface RegisterWatchOptions {
     hostname: string;
@@ -45,6 +47,7 @@ export interface RegisterWatchOptions {
     tailResult: TailLogsResult;
     bufferCap?: number;
     bufferBytesCap?: number;
+    resolution?: ToolResolution;
 }
 export declare class LogWatchRegistry {
     private cleanupTimer;

package/dist/tools/diagnostics/log-watch-registry.js

@@ -194,6 +194,7 @@ export class LogWatchRegistry {
             stopped: false,
             totalEntriesSeen: 0,
             watchId,
+            resolution: opts.resolution,
         };
         this.watches.set(watchId, entry);
         return entry;

package/dist/tools/diagnostics/logs-get-recent.js

@@ -12,17 +12,14 @@ export function createLogsGetRecentTool(loadServices, serverContext, injections)
     const getRecentLogsFn = injections?.getRecentLogs ?? getRecentLogs;
     return createToolAdapter({
         name: 'logs_get_recent',
-        description: 'Fetch recent log entries from the configured B2C Commerce instance in a single request/response. ' +
-            'Best for quick lookups of the most recent errors. For monitoring across an action you trigger, ' +
-            'use logs_watch_start + logs_watch_poll instead so entries are not missed between calls. ' +
-            'Filters (since, level, search) are applied client-side after fetching.',
+        description: 'Fetch recent B2C instance logs. Use for quick lookups; start a log watch before actions whose entries must not be missed.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'SCAPI'],
         requiresInstance: true,
         inputSchema: {
             prefixes: z
                 .array(z.string())
                 .optional()
-                .describe('Log prefixes to read. Defaults to ["error", "customerror"]. Use a path like "internal/server" to read logs from a subdirectory.'),
+                .describe('Log prefixes. Default: ["error", "customerror"]; paths may include subdirectories.'),
             count: z.number().int().positive().optional().describe('Maximum number of entries to return. Defaults to 50.'),
             since: z
                 .string()

package/dist/tools/diagnostics/logs-list-files.js

@@ -18,7 +18,7 @@ export function createLogsListFilesTool(loadServices, serverContext, injections)
             prefixes: z
                 .array(z.string())
                 .optional()
-                .describe('Filter by log prefixes (e.g., ["error", "customerror"]). Returns all when omitted. Use a path like "internal/server" to list logs in a subdirectory.'),
+                .describe('Log-prefix filter; omit for all. Paths may include subdirectories.'),
             sort_by: z.enum(['date', 'name', 'size']).optional().describe('Sort field. Defaults to "date".'),
             sort_order: z.enum(['asc', 'desc']).optional().describe('Sort order. Defaults to "desc".'),
         },

package/dist/tools/diagnostics/logs-watch-list.js

@@ -27,6 +27,7 @@ export function createLogsWatchListTool(loadServices, serverContext) {
                     stopped: w.stopped,
                     total_entries_seen: w.totalEntriesSeen,
                     watch_id: w.watchId,
+                    resolution: w.resolution,
                 })),
             };
         },

package/dist/tools/diagnostics/logs-watch-start.js

@@ -12,26 +12,21 @@ export function createLogsWatchStartTool(loadServices, serverContext, injections
     const tailLogsFn = injections?.tailLogs ?? tailLogs;
     return createToolAdapter({
         name: 'logs_watch_start',
-        description: 'Start a background log watch on the configured B2C Commerce instance. Returns a watch_id immediately. ' +
-            'Recommended workflow: call logs_watch_start BEFORE triggering the action that should produce logs ' +
-            '(e.g., a storefront request, a job, a debug session). Then call logs_watch_poll to drain buffered ' +
-            'entries (it blocks up to timeout_ms). Always call logs_watch_stop when done. ' +
-            'Only one active watch per hostname at a time — use logs_watch_list to find an existing one.',
+        description: 'Start a B2C log watch and return watch_id. Start before the target action, poll with logs_watch_poll, ' +
+            'and always stop with logs_watch_stop. One active watch per hostname.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'SCAPI'],
         requiresInstance: true,
         inputSchema: {
             prefixes: z
                 .array(z.string())
                 .optional()
-                .describe('Log prefixes to watch. Defaults to ["error", "customerror"]. Use a path like "internal/server" to watch logs in a subdirectory.'),
+                .describe('Log prefixes. Default: ["error", "customerror"]; paths may include subdirectories.'),
             last_entries: z
                 .number()
                 .int()
                 .min(0)
                 .optional()
-                .describe('Number of pre-existing entries per file to emit on startup. Defaults to 0 so a fresh ' +
-                'watch only captures NEW entries (matches the recommended "start before triggering" workflow). ' +
-                'Set >0 to include recent context.'),
+                .describe('Existing entries per file to emit at startup. Default: 0.'),
             poll_interval_ms: z
                 .number()
                 .int()
@@ -97,7 +92,12 @@ export function createLogsWatchStartTool(loadServices, serverContext, injections
             // it isn't orphaned (it would otherwise poll WebDAV until process exit).
             let entry;
             try {
-                entry = registry.registerWatch({ hostname, prefixes, tailResult });
+                entry = registry.registerWatch({
+                    hostname,
+                    prefixes,
+                    tailResult,
+                    resolution: structuredClone(context.resolution),
+                });
             }
             catch (error) {
                 await tailResult.stop().catch(() => { });

package/dist/tools/diagnostics/mrt-log-watch-registry.d.ts

@@ -1,5 +1,6 @@
 import type { MrtLogEntry, TailMrtLogsResult } from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import type { ToolExecutionContext } from '../adapter.js';
+import type { ToolResolution } from '../project-context.js';
 /** Maximum number of buffered entries before oldest are evicted. */
 export declare const DEFAULT_BUFFER_CAP = 5000;
 /**
@@ -42,6 +43,7 @@ export interface MrtLogWatchEntry {
      * watch keeps its buffered entries until drained or idle-reaped.
      */
     stopped: boolean;
+    resolution?: ToolResolution;
 }
 export interface RegisterMrtWatchOptions {
     project: string;
@@ -50,6 +52,7 @@ export interface RegisterMrtWatchOptions {
     tailResult: TailMrtLogsResult;
     bufferCap?: number;
     bufferBytesCap?: number;
+    resolution?: ToolResolution;
 }
 /**
  * Stable dedup key for an MRT log watch. A developer may tail several

package/dist/tools/diagnostics/mrt-logs-watch-list.js

@@ -27,6 +27,7 @@ export function createMrtLogsWatchListTool(loadServices, serverContext) {
                     stopped: w.stopped,
                     total_entries_seen: w.totalEntriesSeen,
                     watch_id: w.watchId,
+                    resolution: w.resolution,
                 })),
             };
         },

package/dist/tools/diagnostics/mrt-logs-watch-poll.js

@@ -11,11 +11,8 @@ const DEFAULT_MAX_ENTRIES = 200;
 export function createMrtLogsWatchPollTool(loadServices, serverContext) {
     return createToolAdapter({
         name: 'mrt_logs_watch_poll',
-        description: 'Drain buffered entries from an MRT log watch. If the buffer is empty, blocks up to timeout_ms waiting for ' +
-            'new entries. Returns immediately if entries are already buffered or the stream has stopped. Set ' +
-            'truncated=true if there are more entries beyond max_entries — call again to get the rest. When ' +
-            'stopped=true the underlying WebSocket has closed (stopped, idle-timed-out, or connection lost); check ' +
-            'errors for the reason.',
+        description: 'Drain buffered MRT logs, blocking up to timeout_ms when empty. Repeat if truncated=true. ' +
+            'stopped=true means the stream closed; inspect errors.',
         toolsets: ['DIAGNOSTICS', 'PWAV3', 'STOREFRONTNEXT'],
         inputSchema: {
             watch_id: z.string().describe('Watch id from mrt_logs_watch_start.'),

package/dist/tools/diagnostics/mrt-logs-watch-start.js

@@ -25,13 +25,8 @@ export function createMrtLogsWatchStartTool(loadServices, serverContext, injecti
     const getProfileFn = injections?.getProfile ?? getProfile;
     return createToolAdapter({
         name: 'mrt_logs_watch_start',
-        description: "Start a background tail of a Managed Runtime (MRT) environment's application logs over a WebSocket. " +
-            'Returns a watch_id immediately. MRT logs are always a live stream — there is no historical fetch — so ' +
-            'call mrt_logs_watch_start BEFORE triggering the request/SSR action you want to capture, then call ' +
-            'mrt_logs_watch_poll to drain buffered entries (it blocks up to timeout_ms). Always call ' +
-            'mrt_logs_watch_stop when done. Requires MRT project + environment (from --project/--environment flags, ' +
-            'MRT_PROJECT/MRT_ENVIRONMENT env vars, or dw.json). Only one active watch per project/environment/origin ' +
-            '— use mrt_logs_watch_list to find an existing one.',
+        description: 'Start a live MRT application-log stream and return watch_id. Start before the target action, poll with ' +
+            'mrt_logs_watch_poll, and always stop with mrt_logs_watch_stop. Requires MRT project and environment.',
         toolsets: ['DIAGNOSTICS', 'PWAV3', 'STOREFRONTNEXT'],
         requiresMrtAuth: true,
         inputSchema: {
@@ -113,7 +108,13 @@ export function createMrtLogsWatchStartTool(loadServices, serverContext, injecti
             // exit).
             let entry;
             try {
-                entry = registry.registerWatch({ project, environment, origin, tailResult });
+                entry = registry.registerWatch({
+                    project,
+                    environment,
+                    origin,
+                    tailResult,
+                    resolution: structuredClone(context.resolution),
+                });
             }
             catch (error) {
                 tailResult.stop();

package/dist/tools/diagnostics/session-registry.d.ts

@@ -1,6 +1,7 @@
 import type { DebugSessionManager, SourceMapper, SdapiBreakpoint, SdapiScriptThread } from '@salesforce/b2c-tooling-sdk/operations/debug';
 import type { CartridgeMapping } from '@salesforce/b2c-tooling-sdk/operations/code';
 import type { ToolExecutionContext } from '../adapter.js';
+import type { ToolResolution } from '../project-context.js';
 export interface HaltWaiter {
     resolve: (thread: SdapiScriptThread) => void;
     reject: (error: Error) => void;
@@ -17,6 +18,7 @@ export interface DebugSessionEntry {
     haltWaiters: HaltWaiter[];
     createdAt: number;
     lastActivityAt: number;
+    resolution?: ToolResolution;
 }
 export interface RegisterSessionOptions {
     hostname: string;
@@ -24,6 +26,7 @@ export interface RegisterSessionOptions {
     manager: DebugSessionManager;
     sourceMapper: SourceMapper;
     cartridges: CartridgeMapping[];
+    resolution?: ToolResolution;
 }
 export declare class DebugSessionRegistry {
     private cleanupTimer;

package/dist/tools/diagnostics/session-registry.js

@@ -64,7 +64,7 @@ export class DebugSessionRegistry {
         return [...this.sessions.values()];
     }
     registerSession(opts) {
-        const { hostname, clientId, manager, sourceMapper, cartridges } = opts;
+        const { hostname, clientId, manager, sourceMapper, cartridges, resolution } = opts;
         const existing = this.findByHostAndClientId(hostname, clientId);
         if (existing) {
             throw new Error(`A debug session already exists for ${hostname} ` +
@@ -84,6 +84,7 @@ export class DebugSessionRegistry {
             haltWaiters: [],
             createdAt: now,
             lastActivityAt: now,
+            resolution,
         };
         this.sessions.set(sessionId, entry);
         return entry;

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

@@ -17,10 +17,9 @@ function toListEntry(entry) {
 export function createDocsListTool(loadServices, detectedWorkspaces = [], enabledCategories) {
     return createToolAdapter({
         name: 'docs_list',
-        description: 'Enumerate B2C Commerce documentation entries (id + title + category only) for a category or workspace. ' +
-            'Prefer docs_search for questions — this tool is for browsing a known category. Without a category or ' +
-            'workspace it returns just a category directory (counts), not the full corpus. Results are a table of ' +
-            'contents; paginated via limit/offset. Use docs_read for content.' +
+        description: 'List IDs and titles for B2C Commerce (SFCC/Demandware) Script API, job steps, developer guides, admin/merchant help, and tooling docs. ' +
+            'Without a filter, returns category counts. ' +
+            'Use docs_search for questions and docs_read for content.' +
             enabledCategoriesNote(enabledCategories) +
             detectedWorkspaceNote(detectedWorkspaces),
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
@@ -32,8 +31,7 @@ export function createDocsListTool(loadServices, detectedWorkspaces = [], enable
             workspace: z
                 .enum(WORKSPACE_VALUES)
                 .optional()
-                .describe('Limit to a workspace\'s relevant categories. "auto" uses the auto-detected workspace; ' +
-                'or name a type. Omit for the category directory.'),
+                .describe('Workspace filter. "auto" uses startup workspace; omit for category directory.'),
             limit: z.number().int().positive().optional().describe(`Max entries per page. Defaults to ${DEFAULT_LIMIT}.`),
             offset: z.number().int().nonnegative().optional().describe('Number of entries to skip (for pagination).'),
         },

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

@@ -12,15 +12,8 @@ const DEFAULT_MAX_LENGTH = 12_000;
 export function createDocsReadTool(loadServices, enabledCategories, detectedWorkspaces = []) {
     return createToolAdapter({
         name: 'docs_read',
-        description: 'Read B2C Commerce documentation (markdown) for a class, module, job step, guide, or Help article. ' +
-            'Accepts an exact id (e.g. "dw.catalog.ProductMgr", "sfnext/sfnext-get-started") or a fuzzy ' +
-            'query — best match wins (a fuzzy query favors the detected workspace, matching docs_search). ' +
-            'Job-step content is bundled; Script API, Developer Center guide, and Salesforce Help content is ' +
-            'fetched from its published URL on demand and cached locally (with a summary/headings fallback if ' +
-            'the network is unavailable). If you do not know the id, call docs_search first. Long docs are ' +
-            'truncated to maxLength chars; page with offset when truncated=true. The returned entry ' +
-            'includes the canonical url for citation and relatedEntries ids for directly connected Help or ' +
-            'Developer Center articles.' +
+        description: 'Read a B2C Commerce (SFCC/Demandware) Script API reference, job step, developer guide, admin/merchant help article, or tooling doc by ID or fuzzy query. ' +
+            'Use docs_search to find IDs.' +
             enabledCategoriesNote(enabledCategories),
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         inputSchema: {

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

@@ -8,7 +8,7 @@ import { createToolAdapter, jsonResult } from '../adapter.js';
 export function createDocsSchemaListTool(loadServices) {
     return createToolAdapter({
         name: 'docs_schema_list',
-        description: 'List every available B2C Commerce XSD schema id. Use to discover schema names for docs_schema_read.',
+        description: 'List bundled B2C Commerce (SFCC/Demandware) XSD schema IDs for docs_schema_read.',
         toolsets: ['CARTRIDGES', 'DIAGNOSTICS', 'MRT', 'PWAV3', 'SCAPI', 'STOREFRONTNEXT'],
         inputSchema: {},
         async execute() {