avoid missing base command flags

Author: yhsieh1

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

@@ -194,19 +194,43 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     return input;
   }
 
-  protected loadConfiguration(): ResolvedB2CConfig {
-    const options: LoadConfigOptions = {
+  /**
+   * Gets base configuration options from common flags.
+   *
+   * Subclasses should spread these options when overriding loadConfiguration()
+   * to ensure common options like startDir are always included.
+   *
+   * @example
+   * ```typescript
+   * protected override loadConfiguration(): ResolvedB2CConfig {
+   *   const options: LoadConfigOptions = {
+   *     ...this.getBaseConfigOptions(),
+   *     // Add subclass-specific options here
+   *   };
+   *   return loadConfig(extractMyFlags(this.flags), options, this.getPluginSources());
+   * }
+   * ```
+   */
+  protected getBaseConfigOptions(): LoadConfigOptions {
+    return {
       instance: this.flags.instance,
       configPath: this.flags.config,
       startDir: this.flags['working-directory'],
     };
+  }
 
-    const pluginSources: PluginSources = {
+  /**
+   * Gets plugin sources for configuration resolution.
+   */
+  protected getPluginSources(): PluginSources {
+    return {
       before: this.pluginSourcesBefore,
       after: this.pluginSourcesAfter,
     };
+  }
 
-    return loadConfig({}, options, pluginSources);
+  protected loadConfiguration(): ResolvedB2CConfig {
+    return loadConfig({}, this.getBaseConfigOptions(), this.getPluginSources());
   }
 
   /**

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

@@ -6,7 +6,6 @@
 import {Command, Flags} from '@oclif/core';
 import {OAuthCommand} from './oauth-command.js';
 import {loadConfig, extractInstanceFlags} from './config.js';
-import type {LoadConfigOptions, PluginSources} from './config.js';
 import type {ResolvedB2CConfig} from '../config/index.js';
 import type {B2CInstance} from '../instance/index.js';
 import {t} from '../i18n/index.js';
@@ -160,17 +159,11 @@ export abstract class InstanceCommand<T extends typeof Command> extends OAuthCom
   }
 
   protected override loadConfiguration(): ResolvedB2CConfig {
-    const options: LoadConfigOptions = {
-      instance: this.flags.instance,
-      configPath: this.flags.config,
-    };
-
-    const pluginSources: PluginSources = {
-      before: this.pluginSourcesBefore,
-      after: this.pluginSourcesAfter,
-    };
-
-    return loadConfig(extractInstanceFlags(this.flags as Record<string, unknown>), options, pluginSources);
+    return loadConfig(
+      extractInstanceFlags(this.flags as Record<string, unknown>),
+      this.getBaseConfigOptions(),
+      this.getPluginSources(),
+    );
   }
 
   /**

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

@@ -6,7 +6,7 @@
 import {Command, Flags} from '@oclif/core';
 import {BaseCommand} from './base-command.js';
 import {loadConfig, extractMrtFlags} from './config.js';
-import type {LoadConfigOptions, PluginSources} from './config.js';
+import type {LoadConfigOptions} from './config.js';
 import type {ResolvedB2CConfig} from '../config/index.js';
 import type {AuthStrategy} from '../auth/types.js';
 import {MrtClient} from '../platform/mrt.js';
@@ -63,18 +63,12 @@ export abstract class MrtCommand<T extends typeof Command> extends BaseCommand<T
 
   protected override loadConfiguration(): ResolvedB2CConfig {
     const options: LoadConfigOptions = {
-      instance: this.flags.instance,
-      configPath: this.flags.config,
+      ...this.getBaseConfigOptions(),
       cloudOrigin: this.flags['cloud-origin'] as string | undefined, // MobifySource uses this to load ~/.mobify--[hostname] if set
       credentialsFile: this.flags['credentials-file'] as string | undefined, // Override path to MRT credentials file
     };
 
-    const pluginSources: PluginSources = {
-      before: this.pluginSourcesBefore,
-      after: this.pluginSourcesAfter,
-    };
-
-    return loadConfig(extractMrtFlags(this.flags as Record<string, unknown>), options, pluginSources);
+    return loadConfig(extractMrtFlags(this.flags as Record<string, unknown>), options, this.getPluginSources());
   }
 
   /**

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

@@ -6,7 +6,7 @@
 import {Command, Flags} from '@oclif/core';
 import {BaseCommand} from './base-command.js';
 import {loadConfig, extractOAuthFlags, ALL_AUTH_METHODS} from './config.js';
-import type {LoadConfigOptions, AuthMethod, PluginSources} from './config.js';
+import type {AuthMethod} from './config.js';
 import type {ResolvedB2CConfig} from '../config/index.js';
 import {OAuthStrategy} from '../auth/oauth.js';
 import {ImplicitOAuthStrategy} from '../auth/oauth-implicit.js';
@@ -84,17 +84,11 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
   }
 
   protected override loadConfiguration(): ResolvedB2CConfig {
-    const options: LoadConfigOptions = {
-      instance: this.flags.instance,
-      configPath: this.flags.config,
-    };
-
-    const pluginSources: PluginSources = {
-      before: this.pluginSourcesBefore,
-      after: this.pluginSourcesAfter,
-    };
-
-    return loadConfig(extractOAuthFlags(this.flags as Record<string, unknown>), options, pluginSources);
+    return loadConfig(
+      extractOAuthFlags(this.flags as Record<string, unknown>),
+      this.getBaseConfigOptions(),
+      this.getPluginSources(),
+    );
   }
 
   /**