@W-21199544 aggressively rename startDir as workingDirectory

Author: patricksullivansf

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

@@ -323,7 +323,7 @@ export class Services {
    * @returns Project working directory path
    */
   public getWorkingDirectory(): string {
-    return this.resolvedConfig.values.startDir ?? process.cwd();
+    return this.resolvedConfig.values.workingDirectory ?? process.cwd();
   }
 
   /**

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

@@ -175,7 +175,7 @@ describe('services', () => {
   describe('getWorkingDirectory', () => {
     it('should return working directory when provided in config', () => {
       const workingDir = '/path/to/project';
-      const config = createMockResolvedConfig({startDir: workingDir});
+      const config = createMockResolvedConfig({workingDirectory: workingDir});
       const services = new Services({resolvedConfig: config});
 
       expect(services.getWorkingDirectory()).to.equal(workingDir);
@@ -190,7 +190,7 @@ describe('services', () => {
 
     it('should return working directory from fromResolvedConfig when provided in config', () => {
       const workingDir = '/path/to/project';
-      const config = createMockResolvedConfig({startDir: workingDir});
+      const config = createMockResolvedConfig({workingDirectory: workingDir});
       const services = Services.fromResolvedConfig(config);
 
       expect(services.getWorkingDirectory()).to.equal(workingDir);

packages/b2c-plugin-example-config/src/sources/env-file-source.ts

@@ -58,10 +58,10 @@ export class EnvFileSource implements ConfigSource {
    *
    * File location priority:
    * 1. B2C_ENV_FILE_PATH environment variable (explicit override)
-   * 2. .env.b2c in startDir (from options)
+   * 2. .env.b2c in workingDirectory (from options)
    * 3. .env.b2c in current working directory
    *
-   * @param options - Resolution options (startDir used for file lookup)
+   * @param options - Resolution options (workingDirectory used for file lookup)
    * @returns Parsed configuration and location, or undefined if file not found
    */
   load(options: ResolveConfigOptions): ConfigLoadResult | undefined {
@@ -71,7 +71,7 @@ export class EnvFileSource implements ConfigSource {
     if (envOverride) {
       envFilePath = envOverride;
     } else {
-      const searchDir = options.startDir ?? process.cwd();
+      const searchDir = options.workingDirectory ?? process.cwd();
       envFilePath = join(searchDir, '.env.b2c');
     }
 

packages/b2c-tooling-sdk/src/cli/base-command.ts

@@ -293,7 +293,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    * Gets base configuration options from common flags.
    *
    * Subclasses should spread these options when overriding loadConfiguration()
-   * to ensure common options like startDir are always included.
+   * to ensure common options like workingDirectory are always included.
    *
    * @example
    * ```typescript
@@ -310,7 +310,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     return {
       instance: this.flags.instance,
       configPath: this.flags.config,
-      startDir: this.flags['working-directory'],
+      workingDirectory: this.flags['working-directory'],
     };
   }
 

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

@@ -175,7 +175,7 @@ export interface LoadConfigOptions {
   /** Explicit path to config file (skips searching if provided) */
   configPath?: string;
   /** Starting directory for config file search (default: current working directory) */
-  startDir?: string;
+  workingDirectory?: string;
   /** Cloud origin for MRT ~/.mobify lookup (e.g., https://cloud-staging.mobify.com) */
   cloudOrigin?: string;
   /** Path to custom MRT credentials file (overrides default ~/.mobify) */
@@ -236,17 +236,17 @@ export function loadConfig(
 ): ResolvedB2CConfig {
   const logger = getLogger();
 
-  // Preserve instanceName and startDir from options if not already in flags
+  // Preserve instanceName and workingDirectory from options if not already in flags
   const effectiveFlags = {
     ...flags,
     instanceName: flags.instanceName ?? options.instance,
-    startDir: flags.startDir ?? options.startDir,
+    workingDirectory: flags.workingDirectory ?? options.workingDirectory,
   };
 
   const resolved = resolveConfig(effectiveFlags, {
     instance: options.instance,
     configPath: options.configPath,
-    startDir: options.startDir,
+    workingDirectory: options.workingDirectory,
     hostnameProtection: true,
     cloudOrigin: options.cloudOrigin,
     credentialsFile: options.credentialsFile,

packages/b2c-tooling-sdk/src/config/dw-json.ts

@@ -96,7 +96,7 @@ export interface LoadDwJsonOptions {
   /** Explicit path to dw.json (skips searching if provided) */
   path?: string;
   /** Starting directory for search (defaults to cwd) */
-  startDir?: string;
+  workingDirectory?: string;
 }
 
 /**
@@ -112,7 +112,7 @@ export interface LoadDwJsonResult {
 /**
  * Finds dw.json by searching upward from the starting directory.
  *
- * @param startDir - Directory to start searching from (defaults to cwd)
+ * @param workingDirectory - Directory to start searching from (defaults to cwd)
  * @returns Path to dw.json if found, undefined otherwise
  *
  * @example
@@ -121,8 +121,8 @@ export interface LoadDwJsonResult {
  *   console.log(`Found dw.json at ${dwPath}`);
  * }
  */
-export function findDwJson(startDir: string = process.cwd()): string | undefined {
-  let dir = startDir;
+export function findDwJson(workingDirectory: string = process.cwd()): string | undefined {
+  let dir = workingDirectory;
   const root = path.parse(dir).root;
 
   while (dir !== root) {
@@ -209,7 +209,7 @@ function selectConfig(json: DwJsonMultiConfig, instanceName?: string): DwJsonCon
  */
 export function loadFullDwJson(options: LoadDwJsonOptions = {}): {config: DwJsonMultiConfig; path: string} | undefined {
   const logger = getLogger();
-  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
+  const dwJsonPath = options.path ?? path.join(options.workingDirectory || process.cwd(), 'dw.json');
 
   logger.trace({path: dwJsonPath}, '[DwJsonSource] Checking for config file');
 
@@ -247,7 +247,7 @@ export interface AddInstanceOptions {
   /** Path to dw.json (defaults to ./dw.json) */
   path?: string;
   /** Starting directory for search */
-  startDir?: string;
+  workingDirectory?: string;
   /** Whether to set as active instance */
   setActive?: boolean;
 }
@@ -263,7 +263,7 @@ export interface AddInstanceOptions {
  * @throws Error if instance with same name already exists
  */
 export function addInstance(instance: DwJsonConfig, options: AddInstanceOptions = {}): void {
-  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
+  const dwJsonPath = options.path ?? path.join(options.workingDirectory || process.cwd(), 'dw.json');
 
   let existing: DwJsonMultiConfig = {};
   if (fs.existsSync(dwJsonPath)) {
@@ -322,7 +322,7 @@ export interface RemoveInstanceOptions {
   /** Path to dw.json */
   path?: string;
   /** Starting directory for search */
-  startDir?: string;
+  workingDirectory?: string;
 }
 
 /**
@@ -333,7 +333,7 @@ export interface RemoveInstanceOptions {
  * @throws Error if instance not found or dw.json doesn't exist
  */
 export function removeInstance(name: string, options: RemoveInstanceOptions = {}): void {
-  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
+  const dwJsonPath = options.path ?? path.join(options.workingDirectory || process.cwd(), 'dw.json');
 
   if (!fs.existsSync(dwJsonPath)) {
     throw new Error('No dw.json file found');
@@ -364,7 +364,7 @@ export interface SetActiveInstanceOptions {
   /** Path to dw.json */
   path?: string;
   /** Starting directory for search */
-  startDir?: string;
+  workingDirectory?: string;
 }
 
 /**
@@ -375,7 +375,7 @@ export interface SetActiveInstanceOptions {
  * @throws Error if instance not found or dw.json doesn't exist
  */
 export function setActiveInstance(name: string, options: SetActiveInstanceOptions = {}): void {
-  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
+  const dwJsonPath = options.path ?? path.join(options.workingDirectory || process.cwd(), 'dw.json');
 
   if (!fs.existsSync(dwJsonPath)) {
     throw new Error('No dw.json file found');
@@ -418,7 +418,7 @@ export function setActiveInstance(name: string, options: SetActiveInstanceOption
  * Loads configuration from a dw.json file.
  *
  * If an explicit path is provided, uses that file. Otherwise, looks for dw.json
- * in the startDir (or cwd). Does NOT search parent directories.
+ * in the workingDirectory (or cwd). Does NOT search parent directories.
  *
  * Use `findDwJson()` if you need to search upward through parent directories.
  *
@@ -434,7 +434,7 @@ export function setActiveInstance(name: string, options: SetActiveInstanceOption
  * }
  *
  * // Load from specific directory
- * const result = loadDwJson({ startDir: '/path/to/project' });
+ * const result = loadDwJson({ workingDirectory: '/path/to/project' });
  *
  * // Use named instance
  * const result = loadDwJson({ instance: 'staging' });
@@ -446,7 +446,7 @@ export function loadDwJson(options: LoadDwJsonOptions = {}): LoadDwJsonResult |
   const logger = getLogger();
 
   // If explicit path provided, use it. Otherwise default to ./dw.json (no upward search)
-  const dwJsonPath = options.path ?? path.join(options.startDir || process.cwd(), 'dw.json');
+  const dwJsonPath = options.path ?? path.join(options.workingDirectory || process.cwd(), 'dw.json');
 
   logger.trace({path: dwJsonPath}, '[DwJsonSource] Checking for config file');
 

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

@@ -316,7 +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,
+      workingDirectory: overrides.workingDirectory ?? base.workingDirectory,
       mrtProject: overrides.mrtProject ?? base.mrtProject,
       mrtEnvironment: overrides.mrtEnvironment ?? base.mrtEnvironment,
       mrtApiKey: overrides.mrtApiKey ?? base.mrtApiKey,

packages/b2c-tooling-sdk/src/config/sources/dw-json-source.ts

@@ -34,7 +34,7 @@ export class DwJsonSource implements ConfigSource {
     const result = loadDwJson({
       instance: options.instance,
       path: options.configPath,
-      startDir: options.startDir,
+      workingDirectory: options.workingDirectory,
     });
 
     if (!result) {
@@ -55,7 +55,7 @@ export class DwJsonSource implements ConfigSource {
   listInstances(options?: ResolveConfigOptions): InstanceInfo[] {
     const result = loadFullDwJson({
       path: options?.configPath,
-      startDir: options?.startDir,
+      workingDirectory: options?.workingDirectory,
     });
 
     if (!result) {
@@ -101,7 +101,7 @@ export class DwJsonSource implements ConfigSource {
     const dwJsonConfig = mapNormalizedConfigToDwJson(options.config, options.name);
     addInstance(dwJsonConfig, {
       path: options.configPath,
-      startDir: options.startDir,
+      workingDirectory: options.workingDirectory,
       setActive: options.setActive,
     });
   }
@@ -112,7 +112,7 @@ export class DwJsonSource implements ConfigSource {
   removeInstance(name: string, options?: ResolveConfigOptions): void {
     removeInstance(name, {
       path: options?.configPath,
-      startDir: options?.startDir,
+      workingDirectory: options?.workingDirectory,
     });
   }
 
@@ -122,7 +122,7 @@ export class DwJsonSource implements ConfigSource {
   setActiveInstance(name: string, options?: ResolveConfigOptions): void {
     setActiveInstance(name, {
       path: options?.configPath,
-      startDir: options?.startDir,
+      workingDirectory: options?.workingDirectory,
     });
   }
 }

packages/b2c-tooling-sdk/src/config/sources/package-json-source.ts

@@ -60,8 +60,8 @@ export class PackageJsonSource implements ConfigSource {
   load(options: ResolveConfigOptions): ConfigLoadResult | undefined {
     const logger = getLogger();
 
-    // Only look in cwd (or startDir if provided)
-    const searchDir = options.startDir ?? process.cwd();
+    // Only look in cwd (or workingDirectory if provided)
+    const searchDir = options.workingDirectory ?? process.cwd();
     const packageJsonPath = path.join(searchDir, 'package.json');
 
     logger.trace({location: packageJsonPath}, '[PackageJsonSource] Checking for package.json');

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

@@ -80,7 +80,7 @@ export interface NormalizedConfig {
   /** Instance name (from multi-config supporting sources) */
   instanceName?: string;
   /** Starting directory for config file search and project-relative operations */
-  startDir?: string;
+  workingDirectory?: string;
 
   // TLS/mTLS
   /** Path to PKCS12 certificate file for client mTLS (two-factor auth) */
@@ -143,7 +143,7 @@ export interface ResolveConfigOptions {
   /** Explicit path to config file (defaults to auto-discover) */
   configPath?: string;
   /** Starting directory for config file search */
-  startDir?: string;
+  workingDirectory?: string;
   /** Whether to apply hostname mismatch protection (default: true) */
   hostnameProtection?: boolean;
   /** Cloud origin for ~/.mobify lookup (MRT) */