@W-20591366 add tool adapter layer

Author: yhsieh1

packages/b2c-dx-mcp/README.md

@@ -22,6 +22,13 @@ Since the package is not yet published to npm, see the [Development](#developmen
 | `--tools` | Comma-separated individual tools to enable (case-insensitive) |
 | `--allow-non-ga-tools` | Enable experimental (non-GA) tools |
 
+#### Auth Flags
+
+| Flag | Env Variable | Description |
+|------|--------------|-------------|
+| `--mrt-api-key` | `SFCC_MRT_API_KEY` | MRT API key for Managed Runtime operations |
+| `--mrt-cloud-origin` | `SFCC_MRT_CLOUD_ORIGIN` | MRT cloud origin URL (default: https://cloud.mobify.com). See [Environment-Specific Config Files](#environment-specific-config-files) |
+
 #### Global Flags (inherited from SDK)
 
 | Flag | Description |
@@ -48,6 +55,13 @@ Since the package is not yet published to npm, see the [Development](#developmen
 // Explicit config file path
 "args": ["--toolsets", "all", "--config", "/path/to/dw.json"]
 
+// MRT tools with API key
+"args": ["--toolsets", "MRT", "--mrt-api-key", "your-api-key"]
+
+// Or use environment variable in mcp.json
+"args": ["--toolsets", "MRT"],
+"env": { "SFCC_MRT_API_KEY": "your-api-key" }
+
 // Enable experimental tools (required for placeholder tools)
 "args": ["--toolsets", "all", "--allow-non-ga-tools"]
 
@@ -211,7 +225,20 @@ Configure your IDE to use the local MCP server. Add this to your IDE's MCP confi
 }
 ```
 
-> **Note:** Restart the MCP server in your IDE to pick up code changes.
+**Production Mode** (uses compiled JavaScript - run `pnpm run build` first):
+
+```json
+{
+  "mcpServers": {
+    "b2c-dx-local": {
+      "command": "node",
+      "args": ["/full/path/to/packages/b2c-dx-mcp/bin/run.js", "--toolsets", "all", "--allow-non-ga-tools"]
+    }
+  }
+}
+```
+
+> **Note:** For production mode, run `pnpm run build` after code changes and restart your IDE. Development mode picks up changes automatically.
 
 #### 3. JSON-RPC via stdin
 
@@ -267,6 +294,76 @@ Create a `dw.json` file in your project root (auto-discovered by searching upwar
 
 > **Note:** Environment variables take precedence over `dw.json` values.
 
+#### MRT API Key
+
+MRT (Managed Runtime) operations require an API key from the [Runtime Admin](https://runtime.commercecloud.com/) dashboard.
+
+**Priority order** (highest to lowest):
+
+1. `--mrt-api-key` flag
+2. `SFCC_MRT_API_KEY` environment variable
+3. `~/.mobify` config file (or `~/.mobify--[hostname]` if `--mrt-cloud-origin` is set)
+
+**Option A: Flag or environment variable**
+
+```json
+// mcp.json - using flag
+{
+  "mcpServers": {
+    "b2c-dx": {
+      "command": "b2c-dx-mcp",
+      "args": ["--toolsets", "MRT", "--mrt-api-key", "your-api-key"]
+    }
+  }
+}
+
+// mcp.json - using env var
+{
+  "mcpServers": {
+    "b2c-dx": {
+      "command": "b2c-dx-mcp",
+      "args": ["--toolsets", "MRT"],
+      "env": {
+        "SFCC_MRT_API_KEY": "your-api-key"
+      }
+    }
+  }
+}
+```
+
+**Option B: ~/.mobify file (legacy)**
+
+If you already use the `b2c` CLI for MRT operations, you may have a `~/.mobify` file configured:
+
+```json
+{
+  "username": "your.email@example.com",
+  "api_key": "your-api-key"
+}
+```
+
+The MCP server will automatically use this file as a fallback if no flag or environment variable is set.
+
+##### Environment-Specific Config Files
+
+When using `~/.mobify` config files (i.e., no `--mrt-api-key` flag or `SFCC_MRT_API_KEY` env var), you can use `--mrt-cloud-origin` to select an environment-specific config file:
+
+```bash
+# Uses ~/.mobify--cloud-staging.mobify.com for API key
+b2c-dx-mcp --toolsets MRT --mrt-cloud-origin https://cloud-staging.mobify.com
+
+# Or via environment variable
+SFCC_MRT_CLOUD_ORIGIN=https://cloud-staging.mobify.com b2c-dx-mcp --toolsets MRT
+```
+
+| Cloud Origin | Config File |
+|--------------|-------------|
+| (default) | `~/.mobify` |
+| `https://cloud-staging.mobify.com` | `~/.mobify--cloud-staging.mobify.com` |
+| `https://cloud-dev.mobify.com` | `~/.mobify--cloud-dev.mobify.com` |
+
+> **Note:** `--mrt-cloud-origin` is only relevant when the API key is resolved from a config file. If `--mrt-api-key` or `SFCC_MRT_API_KEY` is provided, this flag is ignored.
+
 ## License
 
 Apache-2.0

packages/b2c-dx-mcp/bin/run.js

@@ -13,8 +13,6 @@
  * - Uses compiled JavaScript from dist/
  * - Loads .env file if present for local configuration
  *
- * Run directly: ./bin/run.js mcp --toolsets all
- * Or with node: node bin/run.js mcp --toolsets all
  */
 
 // Load .env file if present (Node.js native support)

packages/b2c-dx-mcp/src/commands/mcp.ts

@@ -20,6 +20,11 @@
  * | `--tools` | Comma-separated individual tools to enable (case-insensitive) |
  * | `--allow-non-ga-tools` | Enable experimental/non-GA tools |
  *
+ * ### Auth Flags
+ * | Flag | Description |
+ * |------|-------------|
+ * | `--mrt-api-key` | MRT API key for Managed Runtime operations |
+ *
  * ### Global Flags (inherited from BaseCommand)
  * | Flag | Description |
  * |------|-------------|
@@ -32,10 +37,16 @@
  *
  * ## Configuration Priority
  *
+ * ### B2C Instance Configuration (dw.json)
  * 1. Environment variables (SFCC_*) - highest priority, override dw.json
  * 2. dw.json file (explicit path via --config, or auto-discovered)
  * 3. Auto-discovery (searches upward from cwd)
  *
+ * ### MRT API Key
+ * 1. `--mrt-api-key` flag (highest priority)
+ * 2. `SFCC_MRT_API_KEY` environment variable
+ * 3. `~/.mobify` config file (or `~/.mobify--[hostname]` if `--mrt-cloud-origin` is set)
+ *
  * ## Toolset Validation
  *
  * - Invalid toolsets are ignored with a warning (server still starts)
@@ -66,6 +77,11 @@
  * b2c-dx-mcp --toolsets all --config /path/to/dw.json
  * ```
  *
+ * @example Start MRT tools with API key
+ * ```bash
+ * b2c-dx-mcp --toolsets MRT --mrt-api-key your-api-key
+ * ```
+ *
  * @example Enable debug logging
  * ```bash
  * b2c-dx-mcp --toolsets all --debug
@@ -74,6 +90,7 @@
 
 import {Flags} from '@oclif/core';
 import {BaseCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {DEFAULT_MRT_ORIGIN} from '@salesforce/b2c-tooling-sdk/clients';
 import {StdioServerTransport} from '@modelcontextprotocol/sdk/server/stdio.js';
 import {B2CDxMcpServer} from '../server.js';
 import {Services} from '../services.js';
@@ -116,6 +133,18 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
       parse: async (input) => input.toLowerCase(),
     }),
 
+    // Auth flags
+    'mrt-api-key': Flags.string({
+      description: 'MRT API key for Managed Runtime operations',
+      env: 'SFCC_MRT_API_KEY',
+      helpGroup: 'AUTH',
+    }),
+    'mrt-cloud-origin': Flags.string({
+      description: `MRT cloud origin URL (default: ${DEFAULT_MRT_ORIGIN})`,
+      env: 'SFCC_MRT_CLOUD_ORIGIN',
+      helpGroup: 'AUTH',
+    }),
+
     // Feature flags
     'allow-non-ga-tools': Flags.boolean({
       description: 'Enable non-GA (experimental) tools',
@@ -131,7 +160,7 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
    * 1. BaseCommand.init() parses flags and loads config
    * 2. Filter and validate toolsets (invalid ones are skipped with warning)
    * 3. Create B2CDxMcpServer instance
-   * 4. Create Services for dependency injection (config, file system access)
+   * 4. Create Services via Services.create() which resolves MRT auth from flags/env/config
    * 5. Register tools based on --toolsets and --tools flags
    * 6. Connect to stdio transport (JSON-RPC over stdin/stdout)
    * 7. Log startup message to stderr
@@ -188,10 +217,11 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
       },
     );
 
-    // Create services for dependency injection
-    // Pass the config path for tools that need to load configuration
-    const services = new Services({
+    // Create services with MRT auth resolved from flags/env/config
+    const services = Services.create({
       configPath: this.flags.config,
+      mrtApiKey: this.flags['mrt-api-key'],
+      mrtCloudOrigin: this.flags['mrt-cloud-origin'],
     });
 
     // Register toolsets
@@ -202,7 +232,6 @@ export default class McpServerCommand extends BaseCommand<typeof McpServerComman
     await server.connect(transport);
 
     // Log startup message using the structured logger
-    this.logger.info({version: this.config.version, toolsets: TOOLSETS}, 'MCP Server running on stdio');
-    this.logger.info({enabled: startupFlags.toolsets ?? []}, 'Enabled toolsets');
+    this.logger.info({version: this.config.version}, 'MCP Server running on stdio');
   }
 }

packages/b2c-dx-mcp/src/registry.ts

@@ -4,7 +4,7 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import {EOL} from 'node:os';
+import {getLogger} from '@salesforce/b2c-tooling-sdk/logging';
 import type {McpTool, Toolset, StartupFlags} from './utils/index.js';
 import {ALL_TOOLSETS, TOOLSETS, VALID_TOOLSET_NAMES} from './utils/index.js';
 import type {B2CDxMcpServer} from './server.js';
@@ -83,28 +83,30 @@ export async function registerToolsets(flags: StartupFlags, server: B2CDxMcpServ
   // Create the tool registry (all available tools)
   const toolRegistry = createToolRegistry(services);
 
-  // Build flat list of all tools for validation and lookup
+  // Build flat list of all tools for lookup
   const allTools = Object.values(toolRegistry).flat();
   const allToolsByName = new Map(allTools.map((tool) => [tool.name, tool]));
   const existingToolNames = new Set(allToolsByName.keys());
 
+  const logger = getLogger();
+
   // Warn about invalid --tools names (but continue with valid ones)
   const invalidTools = individualTools.filter((name) => !existingToolNames.has(name));
   if (invalidTools.length > 0) {
-    console.error(
-      `⚠️  Ignoring invalid tool name(s): "${invalidTools.join('", "')}"${EOL}` +
-        `   Valid tools: ${[...existingToolNames].join(', ')}`,
+    logger.warn(
+      {invalidTools, validTools: [...existingToolNames]},
+      `Ignoring invalid tool name(s): "${invalidTools.join('", "')}"`,
     );
   }
 
-  // Validate --toolsets names
+  // Warn about invalid --toolsets names (but continue with valid ones)
   const invalidToolsets = toolsets.filter(
     (t) => !VALID_TOOLSET_NAMES.includes(t as (typeof VALID_TOOLSET_NAMES)[number]),
   );
   if (invalidToolsets.length > 0) {
-    console.error(
-      `⚠️  Ignoring invalid toolset(s): "${invalidToolsets.join('", "')}"\n` +
-        `   Valid toolsets: ${VALID_TOOLSET_NAMES.join(', ')}`,
+    logger.warn(
+      {invalidToolsets, validToolsets: VALID_TOOLSET_NAMES},
+      `Ignoring invalid toolset(s): "${invalidToolsets.join('", "')}"`,
     );
   }
 

packages/b2c-dx-mcp/src/server.ts

@@ -67,11 +67,11 @@ export class B2CDxMcpServer extends McpServer {
       args: Record<string, unknown>,
       _extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
     ): Promise<CallToolResult> => {
-      const startTime = Date.now();
+      // TODO: Telemetry - Track timing and send TOOL_CALLED event
+      // const startTime = Date.now();
       const result = await handler(args);
-      // TODO: Telemetry - Send TOOL_CALLED event with { name, _runtimeMs, isError: result.isError }
-      // @ts-expect-error Ignore unused variable
-      const _runtimeMs = Date.now() - startTime;
+      // const runtimeMs = Date.now() - startTime;
+      // telemetry.sendEvent('TOOL_CALLED', { name, runtimeMs, isError: result.isError });
 
       return result;
     };