Merge branch 'main' into W-21461342-Configurable-safety-levels

Author: charithaT07

.claude/skills/testing/SKILL.md

@@ -324,11 +324,29 @@ const customAuth = new MockAuthStrategy('custom-token');
 
 ## Silencing Test Output
 
-Commands may produce console output (tables, formatted displays) even in tests. Use these helpers to keep test output clean.
+Commands produce console output (tables, formatted displays) during tests. **All test helpers are designed to keep test output clean by default** — no extra work needed in most cases.
 
-### Using runSilent for Output Capture
+### stubCommandConfigAndLogger Silences Output Automatically
 
-The `runSilent` helper uses oclif's `captureOutput` to suppress stdout/stderr:
+The `stubCommandConfigAndLogger` helper (used by AM and sandbox command tests) automatically stubs `command.log`, `command.logToStderr`, and `ux.stdout` so no output leaks to the console:
+
+```typescript
+import { stubCommandConfigAndLogger } from '../../../helpers/test-setup.js';
+
+it('displays client details in non-JSON mode', async () => {
+  const command = new ClientGet([], {} as any);
+  stubCommandConfigAndLogger(command); // stdout is silenced automatically
+  stubJsonEnabled(command, false);
+  // ... setup ...
+
+  const result = await command.run(); // No console noise
+  expect(result.id).to.equal('client-123');
+});
+```
+
+### Using runSilent for Other Cases
+
+For commands that don't use `stubCommandConfigAndLogger`, use `runSilent` to capture stdout/stderr:
 
 ```typescript
 import { runSilent } from '../../helpers/test-setup.js';
@@ -344,24 +362,22 @@ it('returns data in non-JSON mode', async () => {
 });
 ```
 
-Use `runSilent` when:
-- Testing non-JSON output modes (tables, formatted displays)
-- The test doesn't need to verify console output content
-- You want clean test output with only pass/fail summary
-
 ### When Output Verification is Needed
 
-If you need to verify console output, stub `ux.stdout` directly:
+If you need to verify console output content, stub `ux.stdout` directly **before** calling `stubCommandConfigAndLogger` (which checks if the stub already exists):
 
 ```typescript
 import { ux } from '@oclif/core';
 
 it('prints table in non-JSON mode', async () => {
   const stdoutStub = sinon.stub(ux, 'stdout');
+  stubCommandConfigAndLogger(command); // won't double-stub ux.stdout
 
   await command.run();
 
   expect(stdoutStub.called).to.be.true;
+  const text = stdoutStub.firstCall.args[0];
+  expect(text).to.include('expected content');
 });
 ```
 

.github/workflows/changesets.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
 
       - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4

.github/workflows/ci.yml

@@ -60,9 +60,6 @@ jobs:
       - name: Build packages
         run: pnpm -r run build
 
-      - name: Build documentation
-        run: pnpm run docs:build
-
       - name: Run SDK tests
         id: sdk-test
         working-directory: packages/b2c-tooling-sdk

.github/workflows/docs.yml

@@ -0,0 +1,54 @@
+name: Docs Build
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.17.1
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build packages
+        run: pnpm -r run build
+
+      - name: Build documentation
+        run: pnpm run docs:build

.github/workflows/publish.yml

@@ -105,7 +105,7 @@ jobs:
 
       - name: Setup pnpm
         if: steps.release-type.outputs.type == 'nightly' || (steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true')
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
 
       - name: Setup Node.js
         if: steps.release-type.outputs.type == 'nightly' || (steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true')

AGENTS.md

@@ -161,6 +161,8 @@ This catches prettier formatting, import ordering, class member ordering (`perfe
 
 See [testing skill](./.claude/skills/testing/SKILL.md) for patterns on writing tests with Mocha, Chai, and MSW.
 
+**Stdout in tests**: Command tests must not leak output to the console. `stubCommandConfigAndLogger()` silences `command.log`, `command.logToStderr`, and `ux.stdout` automatically. For other cases, use `runSilent()` from `test/helpers/test-setup.ts`.
+
 ## Changesets
 
 This project uses [Changesets](https://github.com/changesets/changesets) for version management with **independent per-package versioning**. Each package versions independently based on its own changesets.

packages/b2c-cli/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @salesforce/b2c-cli
 
+## 0.7.4
+
+### Patch Changes
+
+- [`4cf7249`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/4cf72497f5e01d627de7aae80290d072f4c914f6) - Add `cartridges` config option to specify which cartridges to deploy/watch. Supports comma or colon-separated strings, or arrays in dw.json. Also accepts `cartridgesPath` as an alias. The `-c` flag still takes precedence when provided. (Thanks [@clavery](https://github.com/clavery)!)
+
+- [#264](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/pull/264) [`9996eba`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/9996eba2a8fe53a27bf52fb208eb722d618cd282) - Fix multiple issues with the hook scaffold (#247): (Thanks [@clavery](https://github.com/clavery)!)
+
+- Updated dependencies [[`16bd9d6`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/16bd9d6a1c658d6ba3de04fa3acf89295e1e5e06), [`4cf7249`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/4cf72497f5e01d627de7aae80290d072f4c914f6), [`9996eba`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/9996eba2a8fe53a27bf52fb208eb722d618cd282), [`d50bf6b`](https://github.com/SalesforceCommerceCloud/b2c-developer-tooling/commit/d50bf6b91dcd40314f10c8c97a28805039161213)]:
+  - @salesforce/b2c-tooling-sdk@0.9.0
+
 ## 0.7.3
 
 ### Patch Changes

packages/b2c-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/b2c-cli",
   "description": "A Salesforce B2C Commerce CLI",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "author": "Charles Lavery",
   "bin": {
     "b2c": "./bin/run.js"

packages/b2c-cli/src/commands/code/deploy.ts

@@ -134,9 +134,8 @@ export default class CodeDeploy extends CartridgeCommand<typeof CodeDeploy> {
       this.error(t('commands.code.deploy.noCartridges', 'No cartridges found in {{path}}', {path: this.cartridgePath}));
     }
 
-    this.logger?.info(
-      {path: this.cartridgePath, server: hostname, codeVersion: version},
-      t('commands.code.deploy.deploying', 'Deploying {{path}} to {{hostname}} ({{version}})', {
+    this.log(
+      t('commands.code.deploy.deploying', 'Deploying {{path}} to {{hostname}} ({{version}})...', {
         path: this.cartridgePath,
         hostname,
         version,
@@ -145,12 +144,13 @@ export default class CodeDeploy extends CartridgeCommand<typeof CodeDeploy> {
 
     // Log found cartridges
     for (const c of cartridges) {
-      this.logger?.debug({cartridgeName: c.name, path: c.src}, `  ${c.name}`);
+      this.log(`  ${c.name} (${c.src})`);
     }
 
     try {
       // Optionally delete existing cartridges first
       if (this.flags.delete) {
+        this.log(t('commands.code.deploy.deleting', 'Deleting existing cartridges...'));
         await this.operations.deleteCartridges(this.instance, cartridges);
       }
 
@@ -174,12 +174,15 @@ export default class CodeDeploy extends CartridgeCommand<typeof CodeDeploy> {
         reloaded,
       };
 
-      this.logger?.info(
-        {codeVersion: result.codeVersion, cartridgeCount: result.cartridges.length},
-        t('commands.code.deploy.summary', 'Deployed {{count}} cartridge(s) to {{codeVersion}}', {
-          count: result.cartridges.length,
-          codeVersion: result.codeVersion,
-        }),
+      this.log(
+        t(
+          'commands.code.deploy.summary',
+          'Deployed {{count}} cartridge(s) to version "{{codeVersion}}" successfully!',
+          {
+            count: result.cartridges.length,
+            codeVersion: result.codeVersion,
+          },
+        ),
       );
 
       if (result.reloaded) {

packages/b2c-cli/src/commands/setup/inspect.ts

@@ -89,7 +89,7 @@ export default class SetupInspect extends BaseCommand<typeof SetupInspect> {
 
   static hiddenAliases = ['config:show', 'config:inspect'];
 
-  protected override loadConfiguration(): ResolvedB2CConfig {
+  protected override async loadConfiguration(): Promise<ResolvedB2CConfig> {
     // Include EnvSource so that SFCC_* environment variables are visible in inspect output.
     // Other commands handle env vars via oclif flag mappings, but inspect needs to show them
     // as a config source since it doesn't have those flags.