@salesforce/b2c-dx-mcp 1.9.3 → 1.10.1

package/dist/services.d.ts

@@ -167,6 +167,16 @@ export declare class Services {
      * Get OS platform information.
      */
     getPlatform(): NodeJS.Platform;
+    /**
+     * Get the resolved configuration (values, sources, warnings).
+     *
+     * Exposed for the `config_inspect` tool so agents can see the effective,
+     * source-attributed configuration the server resolved. Callers displaying
+     * these values must redact secrets (see `redactConfigValues`).
+     *
+     * @returns The resolved B2C configuration
+     */
+    getResolvedConfig(): ResolvedB2CConfig;
     /**
      * Get SCAPI Schemas client for discovering available SCAPI APIs.
      * Requires shortCode, tenantId, and OAuth credentials to be configured.
@@ -230,16 +240,48 @@ export declare class Services {
      * @returns Absolute path
      */
     resolvePath(...segments: string[]): string;
+    /**
+     * Resolve the effective project directory for a tool call, reporting which
+     * source it came from.
+     *
+     * MCP clients disagree on the working directory a stdio server is spawned
+     * with (Claude Code / Cursor often use the user's home directory rather than
+     * the open project — see https://agent-plugins.org/plugin-authors/mcp-servers),
+     * so the resolved value is deliberately explicit. Precedence:
+     *
+     *   1. `override` — a per-call `projectDirectory` tool argument (highest)
+     *   2. `projectDirectory` from `--project-directory` / `SFCC_PROJECT_DIRECTORY`
+     *   3. `process.cwd()` (fallback; unreliable across clients)
+     *
+     * Tools should surface the returned `{path, source}` in their output so the
+     * agent can see which directory was used when it did not pass one explicitly.
+     *
+     * The `override` and configured values are returned as-supplied (not
+     * re-resolved against cwd); callers pass absolute paths, and `path.resolve`
+     * would otherwise drive-prefix a POSIX-style path on Windows.
+     *
+     * @param override - Optional explicit project directory from a tool argument
+     * @returns The project directory and the source it was resolved from
+     */
+    resolveProjectDirectory(override?: string): {
+        path: string;
+        source: 'argument' | 'config' | 'cwd';
+    };
     /**
      * Resolve a path relative to the project directory.
      * If path is not supplied, returns the project directory.
      * If path is absolute, returns it as-is.
      * If path is relative, resolves it relative to the project directory.
      *
+     * An optional explicit project-directory override (typically a per-call
+     * `projectDirectory` tool argument) takes precedence over the configured
+     * project directory and cwd — see {@link Services.resolveProjectDirectory}.
+     *
      * @param pathArg - Optional path to resolve
+     * @param projectDirectoryOverride - Optional explicit project directory to resolve against
      * @returns Resolved absolute path
      */
-    resolveWithProjectDirectory(pathArg?: string): string;
+    resolveWithProjectDirectory(pathArg?: string, projectDirectoryOverride?: string): string;
     /**
      * Get file or directory stats.
      *

package/dist/services.js

@@ -206,6 +206,18 @@ export class Services {
     getPlatform() {
         return os.platform();
     }
+    /**
+     * Get the resolved configuration (values, sources, warnings).
+     *
+     * Exposed for the `config_inspect` tool so agents can see the effective,
+     * source-attributed configuration the server resolved. Callers displaying
+     * these values must redact secrets (see `redactConfigValues`).
+     *
+     * @returns The resolved B2C configuration
+     */
+    getResolvedConfig() {
+        return this.resolvedConfig;
+    }
     /**
      * Get SCAPI Schemas client for discovering available SCAPI APIs.
      * Requires shortCode, tenantId, and OAuth credentials to be configured.
@@ -302,17 +314,55 @@ export class Services {
     resolvePath(...segments) {
         return path.resolve(...segments);
     }
+    /**
+     * Resolve the effective project directory for a tool call, reporting which
+     * source it came from.
+     *
+     * MCP clients disagree on the working directory a stdio server is spawned
+     * with (Claude Code / Cursor often use the user's home directory rather than
+     * the open project — see https://agent-plugins.org/plugin-authors/mcp-servers),
+     * so the resolved value is deliberately explicit. Precedence:
+     *
+     *   1. `override` — a per-call `projectDirectory` tool argument (highest)
+     *   2. `projectDirectory` from `--project-directory` / `SFCC_PROJECT_DIRECTORY`
+     *   3. `process.cwd()` (fallback; unreliable across clients)
+     *
+     * Tools should surface the returned `{path, source}` in their output so the
+     * agent can see which directory was used when it did not pass one explicitly.
+     *
+     * The `override` and configured values are returned as-supplied (not
+     * re-resolved against cwd); callers pass absolute paths, and `path.resolve`
+     * would otherwise drive-prefix a POSIX-style path on Windows.
+     *
+     * @param override - Optional explicit project directory from a tool argument
+     * @returns The project directory and the source it was resolved from
+     */
+    resolveProjectDirectory(override) {
+        if (override) {
+            return { path: override, source: 'argument' };
+        }
+        const configured = this.resolvedConfig.values.projectDirectory;
+        if (configured) {
+            return { path: configured, source: 'config' };
+        }
+        return { path: process.cwd(), source: 'cwd' };
+    }
     /**
      * Resolve a path relative to the project directory.
      * If path is not supplied, returns the project directory.
      * If path is absolute, returns it as-is.
      * If path is relative, resolves it relative to the project directory.
      *
+     * An optional explicit project-directory override (typically a per-call
+     * `projectDirectory` tool argument) takes precedence over the configured
+     * project directory and cwd — see {@link Services.resolveProjectDirectory}.
+     *
      * @param pathArg - Optional path to resolve
+     * @param projectDirectoryOverride - Optional explicit project directory to resolve against
      * @returns Resolved absolute path
      */
-    resolveWithProjectDirectory(pathArg) {
-        const projectDir = this.resolvedConfig.values.projectDirectory ?? process.cwd();
+    resolveWithProjectDirectory(pathArg, projectDirectoryOverride) {
+        const projectDir = this.resolveProjectDirectory(projectDirectoryOverride).path;
         if (!pathArg) {
             return projectDir;
         }

package/dist/tools/cartridges/index.js

@@ -106,6 +106,7 @@ function createCartridgeDeployTool(loadServices, injections) {
                 const result = await findAndDeployCartridgesFn(instance, directory, options);
                 return {
                     ...result,
+                    resolvedDirectory: directory,
                     postInstructions: CARTRIDGE_PATH_REMINDER,
                 };
             }

package/dist/tools/diagnostics/config-inspect.d.ts

@@ -0,0 +1,12 @@
+import type { McpTool } from '../../utils/index.js';
+import type { Services } from '../../services.js';
+/**
+ * Creates the `config_inspect` tool — the MCP equivalent of the CLI
+ * `b2c setup inspect` command. Reports the resolved configuration (with secrets
+ * redacted by default), the sources that contributed, and — importantly for
+ * agents — the effective project directory and how it was resolved.
+ *
+ * @param loadServices - Function that loads configuration and returns Services instance
+ * @returns The config_inspect MCP tool
+ */
+export declare function createConfigInspectTool(loadServices: () => Promise<Services> | Services): McpTool;

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025, Salesforce, Inc.
+ * 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 { z } from 'zod';
+import { redactConfigValues } from '@salesforce/b2c-tooling-sdk/config';
+import { createToolAdapter, jsonResult } from '../adapter.js';
+/**
+ * Creates the `config_inspect` tool — the MCP equivalent of the CLI
+ * `b2c setup inspect` command. Reports the resolved configuration (with secrets
+ * redacted by default), the sources that contributed, and — importantly for
+ * agents — the effective project directory and how it was resolved.
+ *
+ * @param loadServices - Function that loads configuration and returns Services instance
+ * @returns The config_inspect MCP tool
+ */
+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. ' +
+            'The output includes the effective projectDirectory and how it was resolved (explicit --project-directory / SFCC_PROJECT_DIRECTORY vs. the process working directory), 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.',
+        toolsets: ['DIAGNOSTICS'],
+        isGA: true,
+        requiresInstance: false,
+        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.'),
+        },
+        async execute(args, { services }) {
+            const resolved = services.getResolvedConfig();
+            const projectDirectory = services.resolveProjectDirectory();
+            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,
+            };
+        },
+        formatOutput: (output) => jsonResult(output),
+    }, loadServices);
+}
+//# sourceMappingURL=config-inspect.js.map

package/dist/tools/diagnostics/index.js

@@ -3,6 +3,7 @@
  * 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 { createConfigInspectTool } from './config-inspect.js';
 import { createDebugListSessionsTool } from './debug-list-sessions.js';
 import { createDebugStartSessionTool } from './debug-start-session.js';
 import { createDebugEndSessionTool } from './debug-end-session.js';
@@ -26,6 +27,7 @@ import { createMrtLogsWatchStopTool } from './mrt-logs-watch-stop.js';
 import { createMrtLogsWatchListTool } from './mrt-logs-watch-list.js';
 export function createDiagnosticsTools(loadServices, serverContext, injections) {
     return [
+        createConfigInspectTool(loadServices),
         createDebugListSessionsTool(loadServices, serverContext),
         createDebugStartSessionTool(loadServices, serverContext),
         createDebugEndSessionTool(loadServices, serverContext),

package/oclif.manifest.json

@@ -252,6 +252,7 @@
           "options": [
             "client-credentials",
             "jwt",
+            "user",
             "implicit",
             "basic",
             "api-key"
@@ -259,7 +260,7 @@
           "type": "option"
         },
         "user-auth": {
-          "description": "Use browser-based user authentication (implicit OAuth flow)",
+          "description": "Use browser-based user authentication (Authorization Code + PKCE flow)",
           "exclusive": [
             "auth-methods"
           ],
@@ -428,5 +429,5 @@
       "enableJsonFlag": false
     }
   },
-  "version": "1.9.3"
+  "version": "1.10.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-dx-mcp",
   "description": "MCP server for B2C Commerce developer experience tools",
-  "version": "1.9.3",
+  "version": "1.10.1",
   "author": "Salesforce",
   "license": "Apache-2.0",
   "repository": "SalesforceCommerceCloud/b2c-developer-tooling",
@@ -80,7 +80,7 @@
     "yaml": "2.9.0",
     "postcss": "8.5.15",
     "zod": "3.25.76",
-    "@salesforce/b2c-tooling-sdk": "1.21.3"
+    "@salesforce/b2c-tooling-sdk": "1.23.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1",