@W-21199544 MCP respect working-directory flag in cartidge and mrt tools

Author: patricksullivansf

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

@@ -313,6 +313,19 @@ export class Services {
     return this.b2cInstance.webdav;
   }
 
+  /**
+   * Get the project working directory.
+   * Falls back to process.cwd() if not explicitly set.
+   *
+   * This is the directory where the project is located, which may differ from process.cwd()
+   * when MCP clients spawn servers from a different location (e.g., home directory).
+   *
+   * @returns Project working directory path
+   */
+  public getWorkingDirectory(): string {
+    return this.resolvedConfig.values.startDir ?? process.cwd();
+  }
+
   /**
    * Join path segments.
    *

packages/b2c-dx-mcp/src/tools/cartridges/index.ts

@@ -106,7 +106,7 @@ function createCartridgeDeployTool(services: Services, injections?: CartridgeToo
         const instance = context.b2cInstance!;
 
         // Default directory to current directory
-        const directory = args.directory || '.';
+        const directory = args.directory || services.getWorkingDirectory();
 
         // Parse options
         const options: DeployOptions = {

packages/b2c-dx-mcp/src/tools/mrt/index.ts

@@ -12,6 +12,7 @@
  * @module tools/mrt
  */
 
+import path from 'node:path';
 import {z} from 'zod';
 import type {McpTool} from '../../utils/index.js';
 import type {Services} from '../../services.js';
@@ -96,7 +97,7 @@ function createMrtBundlePushTool(services: Services, injections?: MrtToolInjecti
         // 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 = args.buildDirectory || './build';
+        const buildDirectory = args.buildDirectory || path.join(services.getWorkingDirectory(), 'build');
 
         // Log all computed variables before pushing bundle
         const logger = getLogger();

packages/b2c-dx-mcp/test/services.test.ts

@@ -172,6 +172,38 @@ describe('services', () => {
     });
   });
 
+  describe('getWorkingDirectory', () => {
+    it('should return working directory when provided in config', () => {
+      const workingDir = '/path/to/project';
+      const config = createMockResolvedConfig({startDir: workingDir});
+      const services = new Services({resolvedConfig: config});
+
+      expect(services.getWorkingDirectory()).to.equal(workingDir);
+    });
+
+    it('should fall back to process.cwd() when not provided', () => {
+      const config = createMockResolvedConfig();
+      const services = new Services({resolvedConfig: config});
+
+      expect(services.getWorkingDirectory()).to.equal(process.cwd());
+    });
+
+    it('should return working directory from fromResolvedConfig when provided in config', () => {
+      const workingDir = '/path/to/project';
+      const config = createMockResolvedConfig({startDir: workingDir});
+      const services = Services.fromResolvedConfig(config);
+
+      expect(services.getWorkingDirectory()).to.equal(workingDir);
+    });
+
+    it('should fall back to process.cwd() from fromResolvedConfig when not provided in config', () => {
+      const config = createMockResolvedConfig();
+      const services = Services.fromResolvedConfig(config);
+
+      expect(services.getWorkingDirectory()).to.equal(process.cwd());
+    });
+  });
+
   describe('getHomeDir', () => {
     it('should return home directory', () => {
       const config = createMockResolvedConfig();

packages/b2c-dx-mcp/test/tools/cartridges/index.test.ts

@@ -118,8 +118,6 @@ describe('tools/cartridges', () => {
 
   describe('cartridge_deploy execution', () => {
     it('should call findAndDeployCartridges with instance and default directory', async () => {
-      const directory = '.';
-
       const mockResult: DeployResult = {
         cartridges: [{name: 'app_storefront_base', src: '/path/to/app_storefront_base', dest: 'app_storefront_base'}],
         codeVersion: 'v1',
@@ -143,7 +141,7 @@ describe('tools/cartridges', () => {
         DeployOptions,
       ];
       expect(instance).to.equal(mockInstance);
-      expect(dir).to.equal(directory);
+      expect(dir).to.equal(services.getWorkingDirectory());
       expect(options.include).to.be.undefined;
       expect(options.exclude).to.be.undefined;
       expect(options.reload).to.be.undefined;

packages/b2c-tooling-sdk/src/cli/config.ts

@@ -236,10 +236,11 @@ export function loadConfig(
 ): ResolvedB2CConfig {
   const logger = getLogger();
 
-  // Preserve instanceName from options.instance if not already in flags
+  // Preserve instanceName and startDir from options if not already in flags
   const effectiveFlags = {
     ...flags,
     instanceName: flags.instanceName ?? options.instance,
+    startDir: flags.startDir ?? options.startDir,
   };
 
   const resolved = resolveConfig(effectiveFlags, {

packages/b2c-tooling-sdk/src/config/mapping.ts

@@ -316,6 +316,7 @@ export function mergeConfigsWithProtection(
       cipHost: overrides.cipHost ?? base.cipHost,
       sandboxApiHost: overrides.sandboxApiHost ?? base.sandboxApiHost,
       instanceName: overrides.instanceName ?? base.instanceName,
+      startDir: overrides.startDir ?? base.startDir,
       mrtProject: overrides.mrtProject ?? base.mrtProject,
       mrtEnvironment: overrides.mrtEnvironment ?? base.mrtEnvironment,
       mrtApiKey: overrides.mrtApiKey ?? base.mrtApiKey,

packages/b2c-tooling-sdk/src/config/types.ts

@@ -79,6 +79,8 @@ export interface NormalizedConfig {
   // Metadata
   /** Instance name (from multi-config supporting sources) */
   instanceName?: string;
+  /** Starting directory for config file search and project-relative operations */
+  startDir?: string;
 
   // TLS/mTLS
   /** Path to PKCS12 certificate file for client mTLS (two-factor auth) */