Add globalConfigSourceRegistry to match middleware pattern (#206)

* Add globalConfigSourceRegistry to match middleware registry pattern

Add a global ConfigSourceRegistry singleton that resolveConfig() auto-includes,
matching the existing globalMiddlewareRegistry and globalAuthMiddlewareRegistry
patterns. This eliminates the need to manually pass plugin config sources to
every resolveConfig()/loadConfig() call.

Changes:
- New ConfigSourceRegistry class with register/unregister/getSources/clear
- resolveConfig() auto-includes globalConfigSourceRegistry sources
- B2CPluginManager.applyMiddleware() registers config sources globally
- Simplified BaseCommand: removed getPluginSources() and pluginSources properties
- Simplified 6 loadConfig() callsites across CLI commands
- Deprecated PluginSources type in cli/config.ts
- VS Code extension: removed resolveConfigWithPlugins() wrapper
- Fixes MCP server bug where plugin config sources were silently dropped

* Isolate tests from developer environment (plugin hooks and global registries)

Add B2C_SKIP_PLUGIN_HOOKS env var guard to all three collectPlugin* methods
in BaseCommand to prevent real plugins (keychain, password-store, etc.) from
running during tests. Add mocha root hooks to CLI, MCP, and SDK packages that
set this env var and clear global registries before each test.

This fixes a pre-existing test isolation issue where locally installed plugins
could pollute test state, made visible by the globalConfigSourceRegistry
addition (plugin config sources accumulated O(N^2) across N tests).

* Add changeset for globalConfigSourceRegistry and test isolation

Author: clavery

.changeset/global-config-source-registry.md

@@ -0,0 +1,7 @@
+---
+'@salesforce/b2c-tooling-sdk': patch
+'@salesforce/b2c-cli': patch
+'@salesforce/b2c-dx-mcp': patch
+---
+
+Add `globalConfigSourceRegistry` for automatic plugin config source inclusion in `resolveConfig()`, matching the existing middleware registry pattern. Plugin config sources are now picked up automatically by all SDK consumers without manual plumbing. Also improves test isolation by preventing locally installed plugins from affecting test runs.

packages/b2c-cli/.mocharc.json

@@ -5,6 +5,7 @@
   "recursive": true,
   "reporter": "spec",
   "timeout": 60000,
+  "require": ["test/setup.ts"],
   "node-option": [
     "import=tsx",
     "conditions=development"

packages/b2c-cli/src/utils/cip/command.ts

@@ -102,7 +102,6 @@ export abstract class CipCommand<T extends typeof Command> extends OAuthCommand<
         cipHost: flags['cip-host'] as string | undefined,
       },
       this.getBaseConfigOptions(),
-      this.getPluginSources(),
     );
   }
 

packages/b2c-cli/test/setup.ts

@@ -0,0 +1,27 @@
+/*
+ * 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
+ */
+
+/**
+ * Global test setup for CLI tests.
+ *
+ * - Skips plugin hook collection so real plugins installed on the developer's
+ *   machine (keychain, password-store, etc.) don't pollute the test environment
+ * - Clears all SDK global registries before each test to prevent state leakage
+ */
+import {globalMiddlewareRegistry} from '@salesforce/b2c-tooling-sdk/clients';
+import {globalAuthMiddlewareRegistry} from '@salesforce/b2c-tooling-sdk/auth';
+import {globalConfigSourceRegistry} from '@salesforce/b2c-tooling-sdk/config';
+
+// Prevent BaseCommand from running plugin hooks during tests
+process.env.B2C_SKIP_PLUGIN_HOOKS = '1';
+
+export const mochaHooks = {
+  beforeEach() {
+    globalMiddlewareRegistry.clear();
+    globalAuthMiddlewareRegistry.clear();
+    globalConfigSourceRegistry.clear();
+  },
+};

packages/b2c-dx-mcp/.mocharc.json

@@ -5,6 +5,7 @@
   "recursive": true,
   "reporter": "spec",
   "timeout": 60000,
+  "require": ["test/setup.ts"],
   "node-option": [
     "import=tsx",
     "conditions=development"

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

@@ -0,0 +1,27 @@
+/*
+ * 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
+ */
+
+/**
+ * Global test setup for MCP tests.
+ *
+ * - Skips plugin hook collection so real plugins installed on the developer's
+ *   machine don't pollute the test environment
+ * - Clears all SDK global registries before each test to prevent state leakage
+ */
+import {globalMiddlewareRegistry} from '@salesforce/b2c-tooling-sdk/clients';
+import {globalAuthMiddlewareRegistry} from '@salesforce/b2c-tooling-sdk/auth';
+import {globalConfigSourceRegistry} from '@salesforce/b2c-tooling-sdk/config';
+
+// Prevent BaseCommand from running plugin hooks during tests
+process.env.B2C_SKIP_PLUGIN_HOOKS = '1';
+
+export const mochaHooks = {
+  beforeEach() {
+    globalMiddlewareRegistry.clear();
+    globalAuthMiddlewareRegistry.clear();
+    globalConfigSourceRegistry.clear();
+  },
+};

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

@@ -5,7 +5,7 @@
  */
 import {Command, Flags, type Interfaces} from '@oclif/core';
 import {loadConfig} from './config.js';
-import type {LoadConfigOptions, PluginSources} from './config.js';
+import type {LoadConfigOptions} from './config.js';
 import type {ResolvedB2CConfig} from '../config/index.js';
 import {parseFriendlySandboxId} from '../operations/ods/sandbox-lookup.js';
 import type {
@@ -19,7 +19,7 @@ import type {
 import {setLanguage} from '../i18n/index.js';
 import {configureLogger, getLogger, type LogLevel, type Logger} from '../logging/index.js';
 import {createExtraParamsMiddleware, type ExtraParamsConfig} from '../clients/middleware.js';
-import type {ConfigSource} from '../config/types.js';
+import {globalConfigSourceRegistry} from '../config/config-source-registry.js';
 import {globalMiddlewareRegistry} from '../clients/middleware-registry.js';
 import {globalAuthMiddlewareRegistry} from '../auth/middleware.js';
 import {setUserAgent} from '../clients/user-agent.js';
@@ -130,11 +130,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   /** Telemetry instance for tracking command events */
   protected telemetry?: Telemetry;
 
-  /** High-priority config sources from plugins (inserted before defaults) */
-  protected pluginSourcesBefore: ConfigSource[] = [];
-  /** Low-priority config sources from plugins (inserted after defaults) */
-  protected pluginSourcesAfter: ConfigSource[] = [];
-
   /** Start time for command duration tracking */
   private commandStartTime?: number;
 
@@ -312,7 +307,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    *     ...this.getBaseConfigOptions(),
    *     // Add subclass-specific options here
    *   };
-   *   return loadConfig(extractMyFlags(this.flags), options, this.getPluginSources());
+   *   return loadConfig(extractMyFlags(this.flags), options);
    * }
    * ```
    */
@@ -325,18 +320,8 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     };
   }
 
-  /**
-   * Gets plugin sources for configuration resolution.
-   */
-  protected getPluginSources(): PluginSources {
-    return {
-      before: this.pluginSourcesBefore,
-      after: this.pluginSourcesAfter,
-    };
-  }
-
   protected loadConfiguration(): ResolvedB2CConfig {
-    return loadConfig({}, this.getBaseConfigOptions(), this.getPluginSources());
+    return loadConfig({}, this.getBaseConfigOptions());
   }
 
   /**
@@ -403,16 +388,17 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    * but before configuration is resolved. It allows CLI plugins to provide
    * custom ConfigSource implementations.
    *
-   * Plugin sources are collected into two arrays based on their priority:
-   * - `pluginSourcesBefore`: High priority sources (override defaults)
-   * - `pluginSourcesAfter`: Low priority sources (fill gaps)
+   * Plugin sources are registered with the global config source registry
+   * and automatically included in all subsequent `resolveConfig()` calls.
    *
    * Priority mapping:
    * - 'before' → -1 (higher priority than defaults)
    * - 'after' → 10 (lower priority than defaults)
    * - number → used directly
    */
   protected async collectPluginConfigSources(): Promise<void> {
+    if (process.env.B2C_SKIP_PLUGIN_HOOKS) return;
+
     // Access flags that may be defined in subclasses (OAuthCommand, InstanceCommand)
     const flags = this.flags as Record<string, unknown>;
 
@@ -429,7 +415,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
 
     const hookResult = await this.config.runHook('b2c:config-sources', hookOptions);
 
-    // Collect sources from all plugins that responded, respecting priority
+    // Collect sources from all plugins and register with global registry
     for (const success of hookResult.successes) {
       const result = success.result as ConfigSourcesHookResult | undefined;
       if (!result?.sources?.length) continue;
@@ -444,19 +430,12 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
               ? result.priority
               : 10; // default 'after'
 
-      // Apply priority to sources that don't already have one set
+      // Apply priority to sources that don't already have one set, then register globally
       for (const source of result.sources) {
         if (source.priority === undefined) {
           (source as {priority?: number}).priority = numericPriority;
         }
-      }
-
-      // Still use before/after arrays for backwards compatibility
-      // The resolver will sort all sources by priority anyway
-      if (numericPriority < 0) {
-        this.pluginSourcesBefore.push(...result.sources);
-      } else {
-        this.pluginSourcesAfter.push(...result.sources);
+        globalConfigSourceRegistry.register(source);
       }
     }
 
@@ -476,6 +455,8 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    * Plugin middleware is registered with the global middleware registry.
    */
   protected async collectPluginHttpMiddleware(): Promise<void> {
+    if (process.env.B2C_SKIP_PLUGIN_HOOKS) return;
+
     const hookOptions: HttpMiddlewareHookOptions = {
       flags: this.flags as Record<string, unknown>,
     };
@@ -509,6 +490,8 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    * Plugin middleware is registered with the global auth middleware registry.
    */
   protected async collectPluginAuthMiddleware(): Promise<void> {
+    if (process.env.B2C_SKIP_PLUGIN_HOOKS) return;
+
     const hookOptions: AuthMiddlewareHookOptions = {
       flags: this.flags as Record<string, unknown>,
     };

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

@@ -146,7 +146,7 @@ export interface ExtractedMrtFlags {
  *   ...this.getBaseConfigOptions(),
  *   ...mrt.options,
  * };
- * return loadConfig(mrt.config, options, this.getPluginSources());
+ * return loadConfig(mrt.config, options);
  * ```
  */
 export function extractMrtFlags(flags: ParsedFlags): ExtractedMrtFlags {
@@ -189,8 +189,9 @@ export interface LoadConfigOptions {
 /**
  * Plugin-provided configuration sources with priority ordering.
  *
- * Used by BaseCommand to pass sources collected from the `b2c:config-sources` hook
- * to the configuration resolver.
+ * @deprecated Plugin config sources are now registered with the global
+ * {@link globalConfigSourceRegistry} and automatically included in
+ * {@link resolveConfig}. This type is retained for backwards compatibility.
  */
 export interface PluginSources {
   /**
@@ -215,7 +216,8 @@ export interface PluginSources {
  *
  * @param flags - Configuration values from CLI flags/env vars
  * @param options - Loading options
- * @param pluginSources - Optional sources from CLI plugins (via b2c:config-sources hook)
+ * @param pluginSources - @deprecated Plugin sources are now registered globally via
+ *   {@link globalConfigSourceRegistry}. This parameter is retained for backwards compatibility.
  * @returns Resolved configuration with factory methods
  *
  * @example

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

@@ -181,11 +181,7 @@ export abstract class InstanceCommand<T extends typeof Command> extends OAuthCom
   }
 
   protected override loadConfiguration(): ResolvedB2CConfig {
-    return loadConfig(
-      extractInstanceFlags(this.flags as Record<string, unknown>),
-      this.getBaseConfigOptions(),
-      this.getPluginSources(),
-    );
+    return loadConfig(extractInstanceFlags(this.flags as Record<string, unknown>), this.getBaseConfigOptions());
   }
 
   /**

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

@@ -69,7 +69,7 @@ export abstract class MrtCommand<T extends typeof Command> extends BaseCommand<T
       ...mrt.options,
     };
 
-    return loadConfig(mrt.config, options, this.getPluginSources());
+    return loadConfig(mrt.config, options);
   }
 
   /**