Optimize unit-test runtime (~89% reduction) (#406)

* test(sdk): pass pollIntervalSeconds:0 in cartridge import tests

Nine `addCartridge`/`removeCartridge`/`setCartridgePath` tests in `cartridges.test.ts` exercise the Business-Manager import-export fallback, which calls `waitForJob` with a default 3s poll interval. Because the MSW handler resolves the job immediately, the 3s sleep is pure dead time.

This change passes `{waitOptions: {pollIntervalSeconds: 0}}` (existing public option on `CartridgeUpdateOptions`) so the tests skip the artificial wait. No production-code change.

Metric: pnpm run test:agent 40.2s → 14.4s (-64%).

* chore: run package test suites concurrently with pnpm -r --parallel

By default `pnpm -r run` walks the workspace in topological order, so SDK + mrt run first, then CLI + MCP. None of the package test:agent commands actually need each other's build artifacts (tests import source TS via the `development` workspace condition), so we can run them all concurrently.

Metric: pnpm run test:agent 14.4s → 8.8s (-39%).

* test(cli): pass interval:0 in scapi replications wait tests

Four `scapi replications wait` tests pass `interval: 1` (one real second per poll) along with a mocked `fetch` that returns immediately. Set `interval: 0` so the in-test polling loop runs at memory speed. The flag is already integer-typed and treats 0 as a valid no-wait value.

Metric: cli package test 4s → 3s.

* feat(sdk): inject `now()` clock into waitForEnv

`waitForEnv` already accepts a custom `sleep` function for tests, but the timeout check still reads `Date.now()` directly, so the existing 'should timeout after specified duration' test waits ~1s of real wall time even though `instantSleep` is in use.

Add an optional `now?: () => number` option that mirrors the existing `sleep` injection. The MRT timeout test passes a virtual clock that advances 1s per call, making the test instant.

Metric: SDK package test 4s → 3s.

* test(sdk): run mocha --parallel --jobs 4

The SDK package has 114 unit-test files and is the wall-clock bottleneck of the workspace test run. Mocha's parallel mode shards files across worker processes; jobs=4 is empirically the sweet spot under root pnpm -r --parallel (jobs=8 oversubscribes the 16-CPU machine and degrades wall time when CLI is also running parallel workers).

Metric: pnpm run test:agent 8.9s → 5.2s (-41%).

* test(cli): run mocha --parallel with per-worker auth-store isolation

The CLI's stateful auth store is a JSON file in the oclif data directory (e.g. `~/Library/Application Support/@salesforce/b2c-cli/auth-session.json`). Under mocha --parallel, every worker process shares this file, so concurrent `setStoredSession`/`clearStoredSession` calls race and tests fail intermittently.

This change:
  - Adds an optional `B2C_TEST_DATA_DIR` env override in `BaseCommand.init()` so tests can redirect the store path.
  - Has the CLI test setup create a unique per-process `mkdtemp` directory, set `B2C_TEST_DATA_DIR`, and call `initializeStatefulStore(testDataDir)` for the worker. The mocha `beforeEach` hook re-asserts the path before each test (in case a test called `resetStatefulStoreForTesting`).
  - Enables `mocha --parallel --jobs 4` for the CLI package.

Metric: pnpm run test:agent 5.2s → 4.5s (-13%). Cumulative: 40.2s → 4.5s (-89%).

Author: clavery

package.json

@@ -7,7 +7,7 @@
     "start": "pnpm --filter @salesforce/b2c-cli run dev",
     "test": "pnpm -r test",
     "test:unit": "pnpm -r run test:unit",
-    "test:agent": "pnpm -r run test:agent",
+    "test:agent": "pnpm -r --parallel run test:agent",
     "coverage": "pnpm -r run coverage",
     "format": "pnpm -r run format",
     "lint": "pnpm -r run lint",

packages/b2c-cli/package.json

@@ -337,7 +337,7 @@
     "test:ci": "c8 env OCLIF_TEST_ROOT=. mocha --forbid-only --exclude \"test/functional/e2e/**\" --reporter json --reporter-option output=test-results.json \"test/**/*.test.ts\"",
     "test:ci:win": "c8 --check-coverage=false env OCLIF_TEST_ROOT=. mocha --forbid-only --exclude \"test/functional/e2e/**\" --reporter json --reporter-option output=test-results.json \"test/**/*.test.ts\"",
     "test:unit": "env OCLIF_TEST_ROOT=. mocha --forbid-only --exclude \"test/functional/e2e/**\" \"test/**/*.test.ts\"",
-    "test:agent": "env OCLIF_TEST_ROOT=. mocha --forbid-only --reporter min --exclude \"test/functional/e2e/**\" \"test/**/*.test.ts\"",
+    "test:agent": "env OCLIF_TEST_ROOT=. mocha --forbid-only --parallel --jobs 4 --reporter min --exclude \"test/functional/e2e/**\" \"test/**/*.test.ts\"",
     "test:e2e": "env TEST_USE_SHARED_SANDBOX=true OCLIF_TEST_ROOT=. mocha --forbid-only --require test/functional/e2e/hooks.ts --node-option import=tsx --timeout 30000 --retries 2 --reporter spec \"test/functional/e2e/**/*.test.ts\"",
     "test:e2e:ci": "env TEST_USE_SHARED_SANDBOX=true OCLIF_TEST_ROOT=. mocha --forbid-only --require test/functional/e2e/hooks.ts --node-option import=tsx --timeout 30000 --retries 2 --reporter json --reporter-option output=test-results.json \"test/functional/e2e/**/*.test.ts\"",
     "test:e2e:auth": "env OCLIF_TEST_ROOT=. mocha --forbid-only \"test/functional/e2e/auth-token.test.ts\"",

packages/b2c-cli/test/commands/scapi/replications/wait.test.ts

@@ -30,7 +30,7 @@ describe('scapi replications wait', () => {
 
     it('waits for process to complete', async () => {
       const command: any = new ReplicationsWait([], config);
-      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 1}, {'process-id': 'proc-123'});
+      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 0}, {'process-id': 'proc-123'});
       await command.init();
 
       sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
@@ -74,7 +74,7 @@ describe('scapi replications wait', () => {
 
     it('returns failed status', async () => {
       const command: any = new ReplicationsWait([], config);
-      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 1}, {'process-id': 'proc-456'});
+      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 0}, {'process-id': 'proc-456'});
       await command.init();
 
       sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
@@ -102,7 +102,7 @@ describe('scapi replications wait', () => {
 
     it('logs status updates in non-JSON mode', async () => {
       const command: any = new ReplicationsWait([], config);
-      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 1}, {'process-id': 'proc-789'});
+      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 0}, {'process-id': 'proc-789'});
       await command.init();
 
       sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
@@ -164,7 +164,7 @@ describe('scapi replications wait', () => {
 
     it('handles API errors during polling', async () => {
       const command: any = new ReplicationsWait([], config);
-      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 1}, {'process-id': 'proc-error'});
+      stubParse(command, {'tenant-id': 'zzxy_prd', timeout: 10, interval: 0}, {'process-id': 'proc-error'});
       await command.init();
 
       sinon.stub(command, 'requireOAuthCredentials').returns(void 0);

packages/b2c-cli/test/setup.ts

@@ -12,16 +12,35 @@
  * - 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 {
+  globalAuthMiddlewareRegistry,
+  initializeStatefulStore,
+  clearStoredSession,
+} from '@salesforce/b2c-tooling-sdk/auth';
 import {globalConfigSourceRegistry} from '@salesforce/b2c-tooling-sdk/config';
+import {mkdtempSync} from 'node:fs';
+import {tmpdir} from 'node:os';
+import {join} from 'node:path';
 
 // Prevent BaseCommand from running plugin hooks during tests
 process.env.B2C_SKIP_PLUGIN_HOOKS = '1';
 
+// Isolate the stateful auth session store to a unique per-process temp dir.
+// Both the test setup and BaseCommand.init() will use this path, so tests
+// (or parallel mocha workers) don't race on the developer's real auth file at
+// ~/Library/Application Support/@salesforce/b2c-cli/auth-session.json.
+const testDataDir = mkdtempSync(join(tmpdir(), 'b2c-cli-test-'));
+process.env.B2C_TEST_DATA_DIR = testDataDir;
+initializeStatefulStore(testDataDir);
+
 export const mochaHooks = {
   beforeEach() {
     globalMiddlewareRegistry.clear();
     globalAuthMiddlewareRegistry.clear();
     globalConfigSourceRegistry.clear();
+    // Re-isolate stateful store path before every test in case a prior test
+    // called resetStatefulStoreForTesting(), and clear any leftover session.
+    initializeStatefulStore(testDataDir);
+    clearStoredSession();
   },
 };

packages/b2c-tooling-sdk/package.json

@@ -411,7 +411,7 @@
     "test": "c8 mocha --forbid-only \"test/**/*.test.ts\"",
     "test:ci": "c8 mocha --forbid-only --reporter json --reporter-option output=test-results.json \"test/**/*.test.ts\"",
     "test:unit": "mocha --forbid-only \"test/**/*.test.ts\"",
-    "test:agent": "mocha --forbid-only --reporter min \"test/**/*.test.ts\"",
+    "test:agent": "mocha --forbid-only --parallel --jobs 4 --reporter min \"test/**/*.test.ts\"",
     "test:watch": "mocha --watch \"test/**/*.test.ts\"",
     "coverage": "c8 report",
     "posttest": "pnpm run lint",

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

@@ -166,8 +166,10 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     this.configureLogging();
 
     // Initialize stateful auth store with oclif's data directory so session
-    // files are stored alongside other CLI data (e.g. ~/Library/Application Support/@salesforce/b2c-cli)
-    initializeStatefulStore(this.config.dataDir);
+    // files are stored alongside other CLI data (e.g. ~/Library/Application Support/@salesforce/b2c-cli).
+    // Tests may override the path via B2C_TEST_DATA_DIR to isolate the auth-session.json
+    // file (e.g. per mocha worker) so they don't race on the developer's real session file.
+    initializeStatefulStore(process.env.B2C_TEST_DATA_DIR ?? this.config.dataDir);
 
     // Set CLI User-Agent (CLI name/version only, without @salesforce/ prefix)
     // This must happen before any API clients are created

packages/b2c-tooling-sdk/src/operations/mrt/env.ts

@@ -390,6 +390,11 @@ export interface WaitForEnvOptions extends GetEnvOptions {
    * Custom sleep function for testing.
    */
   sleep?: (ms: number) => Promise<void>;
+
+  /**
+   * Custom clock for testing. Defaults to Date.now.
+   */
+  now?: () => number;
 }
 
 async function defaultSleep(ms: number): Promise<void> {
@@ -441,7 +446,8 @@ export async function waitForEnv(options: WaitForEnvOptions, auth: AuthStrategy)
   const {projectSlug, slug, pollIntervalSeconds = 10, timeoutSeconds = 2700, onPoll, origin} = options;
 
   const sleepFn = options.sleep ?? defaultSleep;
-  const startTime = Date.now();
+  const nowFn = options.now ?? Date.now;
+  const startTime = nowFn();
   const pollIntervalMs = pollIntervalSeconds * 1000;
   const timeoutMs = timeoutSeconds * 1000;
 
@@ -450,9 +456,9 @@ export async function waitForEnv(options: WaitForEnvOptions, auth: AuthStrategy)
   await sleepFn(pollIntervalMs);
 
   while (true) {
-    const elapsedSeconds = Math.round((Date.now() - startTime) / 1000);
+    const elapsedSeconds = Math.round((nowFn() - startTime) / 1000);
 
-    if (timeoutSeconds > 0 && Date.now() - startTime > timeoutMs) {
+    if (timeoutSeconds > 0 && nowFn() - startTime > timeoutMs) {
       throw new Error(`Timeout waiting for environment "${slug}" after ${timeoutSeconds}s`);
     }
 

packages/b2c-tooling-sdk/test/operations/mrt/env.test.ts

@@ -312,6 +312,13 @@ describe('operations/mrt/env', () => {
 
       const auth = new MockAuthStrategy();
 
+      // Virtual clock that advances by 1s on every call to simulate timeout without real waiting.
+      let virtualNow = 0;
+      const fakeNow = () => {
+        virtualNow += 1000;
+        return virtualNow;
+      };
+
       try {
         await waitForEnv(
           {
@@ -320,6 +327,7 @@ describe('operations/mrt/env', () => {
             pollIntervalSeconds: 1,
             timeoutSeconds: 1,
             sleep: instantSleep,
+            now: fakeNow,
           },
           auth,
         );

packages/b2c-tooling-sdk/test/operations/sites/cartridges.test.ts

@@ -20,6 +20,8 @@ import {
 } from '../../../src/operations/sites/cartridges.js';
 
 const TEST_HOST = 'test.demandware.net';
+// Skip the 3s job-poll interval in tests; the mocked job completes immediately.
+const FAST_POLL = {waitOptions: {pollIntervalSeconds: 0}};
 const BASE_URL = `https://${TEST_HOST}/s/-/dw/data/v25_6`;
 const WEBDAV_BASE = `https://${TEST_HOST}/on/demandware.servlet/webdav/Sites`;
 
@@ -167,7 +169,7 @@ describe('operations/sites/cartridges', () => {
         }),
       );
 
-      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new_cart', position: 'first'});
+      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new_cart', position: 'first'}, FAST_POLL);
 
       expect(result.cartridges).to.equal('new_cart:existing_cart');
       expect(importedBuffer).to.exist;
@@ -195,7 +197,7 @@ describe('operations/sites/cartridges', () => {
         ...createImportHandlers(),
       );
 
-      const result = await addCartridge(mockInstance, 'RefArch', {name: 'cart_c', position: 'last'});
+      const result = await addCartridge(mockInstance, 'RefArch', {name: 'cart_c', position: 'last'}, FAST_POLL);
 
       expect(result.cartridges).to.equal('cart_a:cart_b:cart_c');
     });
@@ -222,7 +224,7 @@ describe('operations/sites/cartridges', () => {
         ...createImportHandlers(),
       );
 
-      const result = await removeCartridge(mockInstance, 'Sites-Site', 'cart_a');
+      const result = await removeCartridge(mockInstance, 'Sites-Site', 'cart_a', FAST_POLL);
 
       expect(result.cartridges).to.equal('cart_b');
     });
@@ -269,7 +271,7 @@ describe('operations/sites/cartridges', () => {
         }),
       );
 
-      const result = await setCartridgePath(mockInstance, 'Sites-Site', 'bm_cart1:bm_cart2');
+      const result = await setCartridgePath(mockInstance, 'Sites-Site', 'bm_cart1:bm_cart2', FAST_POLL);
 
       expect(result.cartridges).to.equal('bm_cart1:bm_cart2');
 
@@ -293,7 +295,7 @@ describe('operations/sites/cartridges', () => {
         }),
       );
 
-      await setCartridgePath(mockInstance, 'RefArch', 'cart1:cart2');
+      await setCartridgePath(mockInstance, 'RefArch', 'cart1:cart2', FAST_POLL);
 
       const zip = await JSZip.loadAsync(importedBuffer!);
       const files = Object.keys(zip.files);
@@ -317,30 +319,32 @@ describe('operations/sites/cartridges', () => {
     });
 
     it('should add at first position', async () => {
-      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new', position: 'first'});
+      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new', position: 'first'}, FAST_POLL);
       expect(result.cartridgeList).to.deep.equal(['new', 'cart_a', 'cart_b', 'cart_c']);
     });
 
     it('should add at last position', async () => {
-      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new', position: 'last'});
+      const result = await addCartridge(mockInstance, 'Sites-Site', {name: 'new', position: 'last'}, FAST_POLL);
       expect(result.cartridgeList).to.deep.equal(['cart_a', 'cart_b', 'cart_c', 'new']);
     });
 
     it('should add before target', async () => {
-      const result = await addCartridge(mockInstance, 'Sites-Site', {
-        name: 'new',
-        position: 'before',
-        target: 'cart_b',
-      });
+      const result = await addCartridge(
+        mockInstance,
+        'Sites-Site',
+        {name: 'new', position: 'before', target: 'cart_b'},
+        FAST_POLL,
+      );
       expect(result.cartridgeList).to.deep.equal(['cart_a', 'new', 'cart_b', 'cart_c']);
     });
 
     it('should add after target', async () => {
-      const result = await addCartridge(mockInstance, 'Sites-Site', {
-        name: 'new',
-        position: 'after',
-        target: 'cart_b',
-      });
+      const result = await addCartridge(
+        mockInstance,
+        'Sites-Site',
+        {name: 'new', position: 'after', target: 'cart_b'},
+        FAST_POLL,
+      );
       expect(result.cartridgeList).to.deep.equal(['cart_a', 'cart_b', 'new', 'cart_c']);
     });