VS Code Safety Mode + content library fixes (#399)

* Enforce Safety Mode in VS Code extension

Register the SDK safety middleware on the global middleware registry from the
extension so destructive HTTP calls honor SFCC_SAFETY_LEVEL, SFCC_SAFETY_CONFIRM,
SFCC_SAFETY_CONFIG, and per-instance `safety` blocks in dw.json. Rebuild the
guard on config reset so instance switches re-apply the policy.

Add registerSafeCommand() that evaluates every VS Code command against the guard
(command rules like { "command": "b2c-dx.sandbox.delete", "action": "block" }),
mirroring BaseCommand's per-command evaluation. Replace vscode.commands.registerCommand
across all feature areas. Sandbox destructive ops additionally run through
runWithSafety() for an idiomatic VS Code modal when the policy requires confirm.

* Fix Content Libraries tree not updating on instance switch

ContentConfigProvider was clearing only the library cache on config reset,
so browsed libraries from the previous instance persisted in the tree. Also
reset the browsed libraries list so getRootChildren() re-seeds from the new
instance's contentLibrary on the next refresh.

* Support assetQuery as a first-class config field

Add assetQuery to NormalizedConfig and DwJsonConfig so it can be set
per-instance in dw.json, project-wide in package.json under "b2c", or via
SFCC_ASSET_QUERY. Wire it through the dw.json↔normalized mapping, merge, env
source array parsing, and PackageJsonSource allow-list.

The VS Code Content Libraries tree and export commands now pass the resolved
value to fetchContentLibrary/exportContent; b2c content export falls back to
the config value when --asset-query isn't provided (default remains
["image.path"]).

Author: clavery

.changeset/asset-query-config.md

@@ -0,0 +1,7 @@
+---
+'@salesforce/b2c-tooling-sdk': minor
+'@salesforce/b2c-cli': minor
+'b2c-vs-extension': minor
+---
+
+Support `assetQuery` as a first-class config field. Set it in `dw.json` (per-instance), in `package.json` under `b2c`, or via `SFCC_ASSET_QUERY` to control which JSON dot-paths are extracted as assets during content library parsing. The VS Code Content Libraries tree and `b2c content export` both honor it automatically; the `--asset-query` flag still wins when provided, and the fallback remains `["image.path"]`.

.changeset/vscode-content-tree-instance-switch.md

@@ -0,0 +1,5 @@
+---
+'b2c-vs-extension': patch
+---
+
+Fix Content Libraries tree not updating when switching instances. The tree previously kept libraries from the old instance; it now re-seeds from the newly active instance's configured `contentLibrary` on switch.

.changeset/vscode-safety-middleware.md

@@ -0,0 +1,5 @@
+---
+'b2c-vs-extension': minor
+---
+
+Enforce Safety Mode in the VS Code extension. Destructive operations initiated from the extension (sandbox delete/stop/restart, WebDAV writes, jobs, etc.) now honor `SFCC_SAFETY_LEVEL`, `SFCC_SAFETY_CONFIRM`, `SFCC_SAFETY_CONFIG`, and the per-instance `safety` block in `dw.json`, consistent with the CLI. Every extension command is also evaluated against command rules (e.g. `{ "command": "b2c-dx.sandbox.delete", "action": "block" }`), and confirmation-mode policies surface a native VS Code modal before the command runs.

packages/b2c-cli/src/commands/content/export.ts

@@ -48,9 +48,8 @@ export default class ContentExport extends JobCommand<typeof ContentExport> {
     }),
     'asset-query': Flags.string({
       char: 'q',
-      description: 'JSON dot-paths for asset extraction',
+      description: 'JSON dot-paths for asset extraction (falls back to config "assetQuery", then ["image.path"])',
       multiple: true,
-      default: ['image.path'],
     }),
     regex: Flags.boolean({
       char: 'r',
@@ -117,12 +116,13 @@ export default class ContentExport extends JobCommand<typeof ContentExport> {
     }
 
     const waitOptions = flags.timeout ? {timeoutSeconds: flags.timeout} : undefined;
+    const assetQuery = flags['asset-query'] ?? this.resolvedConfig.values.assetQuery ?? ['image.path'];
 
     if (flags['dry-run']) {
       const {library} = await this.operations.fetchContentLibrary(this.instance, libraryId, {
         libraryFile: flags['library-file'],
         isSiteLibrary: flags['site-library'],
-        assetQuery: flags['asset-query'],
+        assetQuery,
         keepOrphans: flags['keep-orphans'],
         waitOptions,
       });
@@ -222,7 +222,7 @@ export default class ContentExport extends JobCommand<typeof ContentExport> {
 
     const result = await this.operations.exportContent(this.instance, pageIds, libraryId, outputPath, {
       isSiteLibrary: flags['site-library'],
-      assetQuery: flags['asset-query'],
+      assetQuery,
       libraryFile: flags['library-file'],
       offline: flags.offline,
       folders: flags.folder,

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

@@ -85,6 +85,8 @@ export interface DwJsonConfig {
   catalogs?: string[];
   /** Library IDs for WebDAV browsing */
   libraries?: string[];
+  /** JSON dot-paths for asset extraction during content library parsing (defaults to ['image.path']) */
+  assetQuery?: string[];
   /** Optional CIP analytics host override */
   cipHost?: string;
   /** Path to PKCS12 certificate file for mTLS (two-factor auth) */

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

@@ -161,6 +161,7 @@ export function mapDwJsonToNormalizedConfig(json: DwJsonConfig): NormalizedConfi
     contentLibrary: json.contentLibrary,
     catalogs: json.catalogs,
     libraries: json.libraries,
+    assetQuery: json.assetQuery,
     cipHost: json.cipHost,
     instanceName: json.name,
     authMethods: json.authMethods,
@@ -291,6 +292,9 @@ export function mapNormalizedConfigToDwJson(config: Partial<NormalizedConfig>, n
   if (config.libraries !== undefined) {
     result.libraries = config.libraries;
   }
+  if (config.assetQuery !== undefined) {
+    result.assetQuery = config.assetQuery;
+  }
   if (config.cipHost !== undefined) {
     result.cipHost = config.cipHost;
   }
@@ -442,6 +446,7 @@ export function mergeConfigsWithProtection(
       contentLibrary: overrides.contentLibrary ?? base.contentLibrary,
       catalogs: overrides.catalogs ?? base.catalogs,
       libraries: overrides.libraries ?? base.libraries,
+      assetQuery: overrides.assetQuery ?? base.assetQuery,
       cipHost: overrides.cipHost ?? base.cipHost,
       sandboxApiHost: overrides.sandboxApiHost ?? base.sandboxApiHost,
       realm: overrides.realm ?? base.realm,

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

@@ -40,6 +40,7 @@ const ENV_VAR_MAP: Record<string, keyof NormalizedConfig> = {
   SFCC_CARTRIDGES: 'cartridges',
   SFCC_CATALOGS: 'catalogs',
   SFCC_LIBRARIES: 'libraries',
+  SFCC_ASSET_QUERY: 'assetQuery',
   SFCC_AUTH_METHODS: 'authMethods',
   SFCC_ACCOUNT_MANAGER_HOST: 'accountManagerHost',
   SFCC_SANDBOX_API_HOST: 'sandboxApiHost',
@@ -59,7 +60,14 @@ const ENV_VAR_MAP: Record<string, keyof NormalizedConfig> = {
 };
 
 /** Fields that should be parsed as comma-separated arrays. */
-const ARRAY_FIELDS = new Set<keyof NormalizedConfig>(['scopes', 'authMethods', 'cartridges', 'catalogs', 'libraries']);
+const ARRAY_FIELDS = new Set<keyof NormalizedConfig>([
+  'scopes',
+  'authMethods',
+  'cartridges',
+  'catalogs',
+  'libraries',
+  'assetQuery',
+]);
 
 /** Fields that should be parsed as booleans. */
 const BOOLEAN_FIELDS = new Set<keyof NormalizedConfig>(['selfSigned']);

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

@@ -25,6 +25,7 @@ const ALLOWED_FIELDS: (keyof NormalizedConfig)[] = [
   'shortCode',
   'clientId',
   'contentLibrary',
+  'assetQuery',
   'mrtProject',
   'mrtOrigin',
   'accountManagerHost',
@@ -39,6 +40,7 @@ interface PackageJsonB2CConfig {
   shortCode?: string;
   clientId?: string;
   contentLibrary?: string;
+  assetQuery?: string[];
   mrtProject?: string;
   mrtOrigin?: string;
   accountManagerHost?: string;

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

@@ -115,6 +115,13 @@ export interface NormalizedConfig {
   /** Library IDs for WebDAV browsing */
   libraries?: string[];
 
+  /**
+   * JSON dot-paths for asset extraction from component data during
+   * content library parsing. Used by `content export` and the VS Code
+   * content library browser. Defaults to `['image.path']` when unset.
+   */
+  assetQuery?: string[];
+
   // CIP
   /** Optional CIP analytics host override */
   cipHost?: string;

packages/b2c-vs-extension/src/api-browser/index.ts

@@ -5,6 +5,7 @@
  */
 import * as vscode from 'vscode';
 import type {B2CExtensionConfig} from '../config-provider.js';
+import {registerSafeCommand} from '../safety.js';
 import {ApiBrowserTreeDataProvider, type SchemaEntry} from './api-browser-tree-provider.js';
 import {SwaggerWebviewManager} from './swagger-webview.js';
 
@@ -21,16 +22,13 @@ export function registerApiBrowser(
     showCollapseAll: true,
   });
 
-  const refreshDisposable = vscode.commands.registerCommand('b2c-dx.apiBrowser.refresh', () => {
+  const refreshDisposable = registerSafeCommand('b2c-dx.apiBrowser.refresh', () => {
     treeProvider.refresh();
   });
 
-  const openSwaggerDisposable = vscode.commands.registerCommand(
-    'b2c-dx.apiBrowser.openSwagger',
-    (schema: SchemaEntry) => {
-      swaggerManager.openSwaggerPanel(schema);
-    },
-  );
+  const openSwaggerDisposable = registerSafeCommand('b2c-dx.apiBrowser.openSwagger', (schema: SchemaEntry) => {
+    swaggerManager.openSwaggerPanel(schema);
+  });
 
   configProvider.onDidReset(() => {
     treeProvider.refresh();