@salesforce/storefront-next-dev 1.4.0 → 1.5.0-alpha.0

package/dist/commands/audit/finalize.js

@@ -0,0 +1,42 @@
+import "../../package.js";
+import { r as commonFlags } from "../../flags.js";
+import "../../assets.js";
+import "../../catalog.js";
+import "../../measured-run.js";
+import { n as finalize } from "../../audit.js";
+import "../../sanitize.js";
+import "../../schema.js";
+import "../../events.js";
+import "../../live.js";
+import { i as AuditCommand, n as workspaceFlag, r as workspaceFor, t as text } from "../../flags2.js";
+
+//#region src/commands/audit/finalize.ts
+var Finalize = class Finalize extends AuditCommand {
+	static hidden = true;
+	static summary = "Merge script results and ai-analysis/ into audit-result.json";
+	static description = "Validates the latest run's ai-analysis/ files, writes its audit-result.json, and prints its path. A failed finalize can be fixed and run again.";
+	static examples = ["<%= config.bin %> <%= command.id %> -d ./my-storefront"];
+	static flags = {
+		...commonFlags,
+		workspace: workspaceFlag("The audit workspace; its latest run is finalized"),
+		categories: text({
+			helpValue: "<dir>",
+			description: "The categories directory prepare used"
+		}),
+		events: text({
+			helpValue: "<file>",
+			description: "Write progress events here instead of the run folder"
+		})
+	};
+	async run() {
+		const { flags } = await this.parse(Finalize);
+		this.log(await finalize({
+			workspace: workspaceFor(flags),
+			categories: flags.categories,
+			events: flags.events
+		}));
+	}
+};
+
+//#endregion
+export { Finalize as default };

package/dist/commands/audit/prepare.js

@@ -0,0 +1,84 @@
+import "../../package.js";
+import { n as PROJECT_DIRECTORY_FLAG, r as commonFlags } from "../../flags.js";
+import "../../assets.js";
+import "../../catalog.js";
+import "../../measured-run.js";
+import { r as prepare } from "../../audit.js";
+import "../../sanitize.js";
+import "../../schema.js";
+import "../../events.js";
+import "../../live.js";
+import { i as AuditCommand, t as text } from "../../flags2.js";
+import { Flags } from "@oclif/core";
+
+//#region src/commands/audit/prepare.ts
+var Prepare = class Prepare extends AuditCommand {
+	static hidden = true;
+	static summary = "Validate catalog, inventory source, and run Playhouse collection";
+	static description = "Collects Playhouse evidence for each page, builds the project for the bundle analysis, runs the rule scripts, and prints the path of the run's prepared.json. Measuring needs Playwright's Chromium; if the Playwright browser cache lacks the revision Playhouse is built for, prepare downloads it once (about 180 MB).";
+	static examples = ["<%= config.bin %> <%= command.id %> --url home=https://example.com/ --url plp=https://example.com/shoes", "<%= config.bin %> <%= command.id %> -d ./my-storefront --url home=https://example.com/"];
+	static flags = {
+		...commonFlags,
+		url: text({
+			multiple: true,
+			multipleNonGreedy: true,
+			helpValue: "<label>=<url>",
+			description: "A page to audit, such as home=https://example.com/ (repeat for each page)"
+		}),
+		archive: text({
+			multiple: true,
+			multipleNonGreedy: true,
+			helpValue: "<label>=<dir>",
+			description: "Reuse a completed Playhouse archive (absolute path) for the --url with this label"
+		}),
+		"expected-page": text({
+			multiple: true,
+			multipleNonGreedy: true,
+			helpValue: "<label>",
+			description: "A page the audit should cover (repeat; default home, plp and pdp)"
+		}),
+		workspace: text({
+			helpValue: "<dir>",
+			description: "The audit workspace (default: <project-directory>/.site-audit)"
+		}),
+		runs: Flags.integer({
+			min: 1,
+			max: Number.MAX_SAFE_INTEGER,
+			default: 1,
+			helpValue: "<n>",
+			description: "Playhouse runs per page"
+		}),
+		"allow-http": Flags.boolean({ description: "Allow http:// URLs" }),
+		categories: text({
+			helpValue: "<dir>",
+			description: "Use another categories directory; its rule scripts are not run"
+		}),
+		events: text({
+			helpValue: "<file>",
+			description: "Write progress events here instead of the run folder"
+		}),
+		build: Flags.boolean({
+			default: true,
+			allowNo: true,
+			description: "Build the project (its build script, twice) to break down each page's JavaScript; rewrites the gitignored build/ folder"
+		})
+	};
+	async run() {
+		const { flags } = await this.parse(Prepare);
+		this.log(await prepare({
+			urls: flags.url,
+			archives: flags.archive,
+			expectedPages: flags["expected-page"],
+			project: flags[PROJECT_DIRECTORY_FLAG],
+			workspace: flags.workspace,
+			runs: flags.runs,
+			allowHttp: flags["allow-http"],
+			categories: flags.categories,
+			events: flags.events,
+			build: flags.build
+		}));
+	}
+};
+
+//#endregion
+export { Prepare as default };

package/dist/commands/audit/progress.js

@@ -0,0 +1,51 @@
+import "../../package.js";
+import { r as commonFlags } from "../../flags.js";
+import "../../assets.js";
+import "../../catalog.js";
+import "../../measured-run.js";
+import { t as eventsFileFor } from "../../audit.js";
+import "../../sanitize.js";
+import "../../schema.js";
+import { a as progressEventSchema, t as appendEvent, y as latestRunDir } from "../../events.js";
+import "../../live.js";
+import { i as AuditCommand, n as workspaceFlag, r as workspaceFor, t as text } from "../../flags2.js";
+import path from "node:path";
+import { mkdir } from "node:fs/promises";
+
+//#region src/commands/audit/progress.ts
+var Progress = class Progress extends AuditCommand {
+	static hidden = true;
+	static summary = "Append one live-progress event to the run event log";
+	static examples = ["<%= config.bin %> <%= command.id %> --event '{\"type\":\"log\",\"level\":\"info\",\"message\":\"Checking SEO rules\"}'"];
+	static flags = {
+		...commonFlags,
+		workspace: workspaceFlag("The audit workspace; the event goes to its latest run"),
+		event: text({
+			required: true,
+			helpValue: "<json>",
+			description: "The event, as a JSON object (not run.start, run.error or run.complete)"
+		}),
+		events: text({
+			helpValue: "<file>",
+			description: "Append to this file instead of the latest run"
+		})
+	};
+	async run() {
+		const { flags } = await this.parse(Progress);
+		let payload;
+		try {
+			payload = JSON.parse(flags.event);
+		} catch (error) {
+			throw new Error("--event must be a JSON object", { cause: error });
+		}
+		const type = typeof payload === "object" && payload !== null ? payload.type : void 0;
+		if (typeof type === "string" && type.startsWith("run.")) throw new Error(`--event cannot be ${type}; prepare and finalize write the run events`);
+		const event = progressEventSchema.parse(payload);
+		const eventsFile = flags.events === void 0 ? eventsFileFor(void 0, await latestRunDir(workspaceFor(flags))) : path.resolve(flags.events);
+		await mkdir(path.dirname(eventsFile), { recursive: true });
+		await appendEvent(eventsFile, event);
+	}
+};
+
+//#endregion
+export { Progress as default };

package/dist/commands/audit/serve.js

@@ -0,0 +1,63 @@
+import { r as commonFlags } from "../../flags.js";
+import "../../sanitize.js";
+import { i as AuditCommand, n as workspaceFlag, r as workspaceFor, t as text } from "../../flags2.js";
+import { Flags } from "@oclif/core";
+import path from "node:path";
+import { spawn } from "node:child_process";
+
+//#region src/commands/audit/serve.ts
+var Serve = class Serve extends AuditCommand {
+	static hidden = true;
+	static summary = "Serve the dashboard for a finalized audit-result.json or a live run";
+	static examples = ["<%= config.bin %> <%= command.id %> -d ./my-storefront --no-open"];
+	static flags = {
+		...commonFlags,
+		workspace: workspaceFlag("An audit workspace: follow its latest run live, and list earlier runs", { exclusive: ["input"] }),
+		input: text({
+			exclusive: ["workspace"],
+			helpValue: "<file>",
+			description: "A finished audit-result.json, served on its own"
+		}),
+		port: Flags.integer({
+			min: 1,
+			max: 65535,
+			default: 8787,
+			helpValue: "<n>",
+			description: "The port to listen on"
+		}),
+		open: Flags.boolean({
+			default: true,
+			allowNo: true,
+			description: "Open the dashboard in a browser"
+		}),
+		ui: text({
+			helpValue: "<dir>",
+			description: "Serve another built UI directory"
+		})
+	};
+	async run() {
+		const { flags } = await this.parse(Serve);
+		const source = flags.input === void 0 ? { workspace: workspaceFor(flags) } : { input: path.resolve(flags.input) };
+		const { startServer } = await import("../../server2.js");
+		const { url } = await startServer({
+			...source,
+			uiDir: flags.ui === void 0 ? void 0 : path.resolve(flags.ui),
+			port: flags.port
+		});
+		this.log(`Site audit dashboard: ${url}`);
+		if (flags.open) openBrowser(url);
+	}
+};
+function openBrowser(url) {
+	const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+	try {
+		spawn(command, [url], {
+			stdio: "ignore",
+			detached: true,
+			shell: process.platform === "win32"
+		}).unref();
+	} catch {}
+}
+
+//#endregion
+export { Serve as default };

package/dist/commands/config/aggregate-extensions.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import { t as logger } from "../../logger.js";
 import "../../logger2.js";
 import { r as commonFlags } from "../../flags.js";

package/dist/commands/create-bundle.js

@@ -1,7 +1,8 @@
+import "../package.js";
 import { t as logger } from "../logger.js";
 import "../logger2.js";
 import { i as getMrtConfig, n as getDefaultBuildDir, r as getDefaultMessage } from "../utils.js";
-import { a as buildMrtConfig } from "../config.js";
+import { o as buildMrtConfig } from "../config.js";
 import { r as commonFlags } from "../flags.js";
 import { t as createBundle } from "../bundle.js";
 import { Command, Flags } from "@oclif/core";

package/dist/commands/create-instructions.js

@@ -1,3 +1,4 @@
+import "../package.js";
 import { t as logger } from "../logger.js";
 import "../logger2.js";
 import { Command, Flags } from "@oclif/core";

package/dist/commands/create-storefront.js

@@ -1,3 +1,4 @@
+import "../package.js";
 import { t as logger } from "../logger.js";
 import "../logger2.js";
 import { t as generateEnvFile } from "../utils.js";

package/dist/commands/deploy-cartridge.js

@@ -1,9 +1,9 @@
-import { i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, t as CARTRIDGES_BASE_DIR } from "../config.js";
+import { i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, r as SFNEXT_BASE_CARTRIDGE_NAME, t as CARTRIDGES_BASE_DIR } from "../config.js";
 import { Flags } from "@oclif/core";
 import path from "path";
 import fs from "fs-extra";
 import { CartridgeCommand } from "@salesforce/b2c-tooling-sdk/cli";
-import { createScriptsBackend, deleteCartridges, reloadCodeVersion, uploadCartridges } from "@salesforce/b2c-tooling-sdk/operations/code";
+import { deleteCartridges, reloadCodeVersion, uploadCartridges } from "@salesforce/b2c-tooling-sdk/operations/code";
 
 //#region src/commands/deploy-cartridge.ts
 /**
@@ -18,10 +18,23 @@ import { createScriptsBackend, deleteCartridges, reloadCodeVersion, uploadCartri
 * Additional flags:
 * - --delete: Delete existing cartridges before upload
 * - --reload/-r: Reload (re-activate) code version after deploy (requires OAuth)
+* - --cartridge-ignore-dirs: Directory names to skip inside cartridges, replacing the SDK default
+*   (node_modules, .git, coverage, .cache, tmp, temp)
+*
+* Environment variables:
+* - SFCC_CARTRIDGE_IGNORE_DIRS (optional): comma-separated equivalent of --cartridge-ignore-dirs,
+*   e.g. `node_modules,.git`. Also settable as `cartridge-ignore-dirs` in dw.json.
+* - SFCC_DEFAULT_CLIENT (optional): `true` is equivalent to --default-client (inherited from the SDK),
+*   which ignores any configured API client and uses browser sign-in.
+*
+* With only a server configured (no WebDAV access key or API client), or with --default-client,
+* uploads sign in to Account Manager in a browser and the user's Business Manager role authorizes
+* WebDAV access. --default-client cannot be combined with --reload, which needs an API client.
 *
 * Code version discovery and reload use SCAPI (scopes `sfcc.scripts` / `sfcc.scripts.rw`) when
 * SFCC_SHORTCODE and SFCC_TENANT_ID are set with client-credentials auth, falling back to OCAPI.
 * Override with --api-backend (env: SFCC_API_BACKEND): auto (default), scapi, or ocapi.
+* Without an API client, the active code version is read over WebDAV; reload still needs one.
 */
 var Deploy = class Deploy extends CartridgeCommand {
 	static description = "Deploy cartridges to B2C Commerce Cloud instance";
@@ -46,12 +59,18 @@ var Deploy = class Deploy extends CartridgeCommand {
 		delete: Flags.boolean({
 			description: "Delete existing cartridges before upload",
 			default: false
+		}),
+		"cartridge-ignore-dirs": Flags.string({
+			description: "Directory names to skip inside cartridges, replacing the default list (node_modules,.git,coverage,.cache,tmp,temp); pass an empty value to skip nothing (env: SFCC_CARTRIDGE_IGNORE_DIRS)",
+			multiple: true,
+			multipleNonGreedy: true,
+			delimiter: ","
 		})
 	};
 	_scriptsBackend;
-	/** SCAPI-first code version backend with OCAPI fallback, honoring --api-backend. */
+	/** SCAPI-first code version backend with OCAPI fallback (or WebDAV without an API client), honoring --api-backend. */
 	get scriptsBackend() {
-		this._scriptsBackend ??= createScriptsBackend({ instance: this.instance });
+		this._scriptsBackend ??= this.createScriptsBackend();
 		return this._scriptsBackend;
 	}
 	async run() {
@@ -59,15 +78,16 @@ var Deploy = class Deploy extends CartridgeCommand {
 		const projectDirectory = flags["project-directory"] || process.cwd();
 		if (!fs.existsSync(projectDirectory)) this.error(`Project directory doesn't exist: ${projectDirectory}`);
 		const cartridgesDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR);
-		const metadataDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR);
-		if (!fs.existsSync(metadataDir)) this.error(`Metadata directory doesn't exist: ${metadataDir}. Run 'sfnext generate-cartridge' first.`);
+		const { include, exclude } = this.cartridgeOptions;
+		const hasCartridgeFilter = Boolean(include?.length || exclude?.length);
+		const checkBaseMetadata = (directory) => {
+			if (!fs.existsSync(directory)) this.error(`Metadata directory doesn't exist: ${directory}. Run 'sfnext generate-cartridge' first.`);
+		};
+		if (!hasCartridgeFilter) checkBaseMetadata(path.join(projectDirectory, CARTRIDGES_BASE_DIR, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR));
 		this.requireServer();
 		this.requireWebDavCredentials();
 		let version = this.resolvedConfig.values.codeVersion;
-		if ((!version || flags.reload) && !this.hasOAuthCredentials()) {
-			const reason = version ? "The --reload flag requires OAuth credentials to reload the code version via SCAPI or OCAPI." : "No code version specified. OAuth credentials are required to auto-discover the active code version.";
-			this.error(`${reason}\n\nProvide --code-version to use basic auth only, or configure OAuth credentials (--client-id and --client-secret).`);
-		}
+		if (flags.reload && !this.hasOAuthCredentials()) this.error("The --reload flag requires OAuth credentials to reload the code version via SCAPI or OCAPI.\n\nDeploy without --reload to use WebDAV only, or configure OAuth credentials (--client-id and --client-secret).");
 		if (!version) {
 			this.warn("No code version specified, discovering active code version...");
 			let activeVersion;
@@ -82,13 +102,17 @@ var Deploy = class Deploy extends CartridgeCommand {
 		}
 		const cartridges = await this.findCartridgesWithProviders(cartridgesDir);
 		if (cartridges.length === 0) this.error(`No cartridges found in ${cartridgesDir}`);
+		if (hasCartridgeFilter) {
+			const selectedBase = cartridges.find((cartridge) => cartridge.name === SFNEXT_BASE_CARTRIDGE_NAME);
+			if (selectedBase) checkBaseMetadata(path.join(selectedBase.src, "cartridge", "experience"));
+		}
 		this.log(`Deploying to code version "${version}"...`);
 		for (const c of cartridges) this.log(`  ${c.name} (${c.src})`);
 		if (flags.delete) {
 			this.log("Deleting existing cartridges...");
 			await deleteCartridges(this.instance, cartridges);
 		}
-		await uploadCartridges(this.instance, cartridges);
+		await uploadCartridges(this.instance, cartridges, { ignoreDirs: this.resolvedConfig.values.cartridgeIgnoreDirs });
 		if (flags.reload) try {
 			await reloadCodeVersion(this.scriptsBackend, version);
 			this.log("Code version reloaded.");

package/dist/commands/dev.js

@@ -1,5 +1,7 @@
+import "../package.js";
 import { i as printShutdownMessage, n as printServerConfig, r as printServerInfo } from "../logger.js";
 import "../logger2.js";
+import "../ts-import.js";
 import { i as loadProjectConfig, n as initBasePathEnv, r as getCommerceCloudApiUrl, t as createServer$2 } from "../server.js";
 import "../config.js";
 import { r as commonFlags } from "../flags.js";

package/dist/commands/extensions/create.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import "../../logger.js";
 import "../../logger2.js";
 import "../../dependency-utils.js";

package/dist/commands/extensions/install.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import "../../logger.js";
 import "../../logger2.js";
 import "../../dependency-utils.js";

package/dist/commands/extensions/list.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import "../../logger.js";
 import "../../logger2.js";
 import "../../dependency-utils.js";

package/dist/commands/extensions/remove.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import "../../logger.js";
 import "../../logger2.js";
 import "../../dependency-utils.js";

package/dist/commands/generate-cartridge.js

@@ -1,15 +1,48 @@
+import "../package.js";
 import "../logger.js";
 import "../logger2.js";
 import "../format-with-project-biome.js";
-import { i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, t as CARTRIDGES_BASE_DIR } from "../config.js";
+import "../ts-import.js";
+import { a as assertValidCartridgeName, r as SFNEXT_BASE_CARTRIDGE_NAME, s as cartridgeExperienceDir, t as CARTRIDGES_BASE_DIR } from "../config.js";
 import { r as commonFlags } from "../flags.js";
 import { t as generateMetadata } from "../generate-cartridge.js";
 import { t as validateCartridgeMetadata } from "../validate-cartridge.js";
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import path from "path";
 import fs from "fs-extra";
 import chalk from "chalk";
+import { createScaffoldRegistry, generateFromScaffold } from "@salesforce/b2c-tooling-sdk/scaffold";
 
+//#region src/cartridge-services/initialize-cartridge.ts
+/**
+* Create a named cartridge with only SDK identity files (`.project` and
+* `<name>.properties`). Sample controllers, models, scripts, templates, and
+* static assets are omitted. If the target already exists, leave it unchanged
+* so non-metadata customizations are preserved. No project base cartridge is
+* required.
+*/
+async function initializeNamedCartridge(projectDirectory, cartridgeName) {
+	assertValidCartridgeName(cartridgeName);
+	const cartridgesDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR);
+	const targetDir = path.join(cartridgesDir, cartridgeName);
+	if (fs.existsSync(targetDir)) return;
+	const scaffold = await createScaffoldRegistry().getScaffold("cartridge", { sources: ["built-in"] });
+	if (!scaffold) throw new Error("Built-in cartridge scaffold not found");
+	await generateFromScaffold(scaffold, {
+		outputDir: cartridgesDir,
+		interactive: false,
+		variables: {
+			cartridgeName,
+			includeControllers: false,
+			includeModels: false,
+			includeScripts: false,
+			includeTemplates: false,
+			includeStatic: false
+		}
+	});
+}
+
+//#endregion
 //#region src/commands/generate-cartridge.ts
 /**
 * Generate cartridge metadata command.
@@ -20,18 +53,29 @@ import chalk from "chalk";
 var Generate = class Generate extends Command {
 	static description = "Generate Page Designer component metadata from decorated components";
 	static examples = ["<%= config.bin %> <%= command.id %>", "<%= config.bin %> <%= command.id %> -d ./my-project"];
-	static flags = { ...commonFlags };
+	static flags = {
+		...commonFlags,
+		"site-id": Flags.string({ description: "Site ID to use for site-specific configuration, such as SEO route prefixes (defaults to app.defaultSiteId)" }),
+		"cartridge-name": Flags.string({ description: "Cartridge directory name under cartridges/ (defaults to app_storefrontnext_base). A new name scaffolds identity files once, then generates metadata there." })
+	};
 	async run() {
 		const { flags } = await this.parse(Generate);
 		const projectDirectory = flags["project-directory"];
 		if (!fs.existsSync(projectDirectory)) this.error(`Project directory doesn't exist: ${projectDirectory}`);
-		const metadataDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR);
+		const cartridgeName = flags["cartridge-name"] ?? SFNEXT_BASE_CARTRIDGE_NAME;
+		try {
+			assertValidCartridgeName(cartridgeName);
+			if (cartridgeName !== SFNEXT_BASE_CARTRIDGE_NAME) await initializeNamedCartridge(projectDirectory, cartridgeName);
+		} catch (error) {
+			this.error(error instanceof Error ? error.message : String(error));
+		}
+		const metadataDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR, cartridgeExperienceDir(cartridgeName));
 		if (!fs.existsSync(metadataDir)) {
 			this.log(`Creating metadata directory: ${metadataDir}`);
 			fs.mkdirSync(metadataDir, { recursive: true });
 		}
 		this.log("Generating Page Designer metadata...");
-		await generateMetadata(projectDirectory, metadataDir);
+		await generateMetadata(projectDirectory, metadataDir, { siteId: flags["site-id"] });
 		this.log("Page Designer metadata generated successfully!\n");
 		this.log("Validating generated metadata...\n");
 		const summary = await validateCartridgeMetadata(metadataDir);

package/dist/commands/locales/aggregate-extensions.js

@@ -1,3 +1,4 @@
+import "../../package.js";
 import { t as logger } from "../../logger.js";
 import "../../logger2.js";
 import { r as commonFlags } from "../../flags.js";

package/dist/commands/prepare-local.js

@@ -1,3 +1,4 @@
+import "../package.js";
 import "../logger.js";
 import { t as prepareForLocalDev } from "../local-dev-setup.js";
 import { r as commonFlags } from "../flags.js";

package/dist/commands/preview.js

@@ -1,5 +1,7 @@
+import "../package.js";
 import { i as printShutdownMessage, n as printServerConfig, r as printServerInfo, t as logger } from "../logger.js";
 import "../logger2.js";
+import "../ts-import.js";
 import { i as loadProjectConfig, n as initBasePathEnv, r as getCommerceCloudApiUrl, t as createServer } from "../server.js";
 import "../config.js";
 import { r as commonFlags } from "../flags.js";

package/dist/commands/push.js

@@ -1,8 +1,10 @@
+import "../package.js";
 import "../logger.js";
 import "../logger2.js";
 import { n as getDefaultBuildDir, r as getDefaultMessage } from "../utils.js";
 import "../format-with-project-biome.js";
-import { a as buildMrtConfig, i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, n as GENERATE_AND_DEPLOY_CARTRIDGE_ON_MRT_PUSH, r as SFNEXT_BASE_CARTRIDGE_NAME, t as CARTRIDGES_BASE_DIR } from "../config.js";
+import "../ts-import.js";
+import { i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, n as GENERATE_AND_DEPLOY_CARTRIDGE_ON_MRT_PUSH, o as buildMrtConfig, r as SFNEXT_BASE_CARTRIDGE_NAME, t as CARTRIDGES_BASE_DIR } from "../config.js";
 import { i as withLegacyMrtShortFlags } from "../flags.js";
 import { n as getBundleDependencies, t as createBundle } from "../bundle.js";
 import { t as generateMetadata } from "../generate-cartridge.js";
@@ -10,7 +12,7 @@ import { Flags } from "@oclif/core";
 import path from "path";
 import fs from "fs-extra";
 import { MrtCommand } from "@salesforce/b2c-tooling-sdk/cli";
-import { uploadCartridges } from "@salesforce/b2c-tooling-sdk/operations/code";
+import { createScriptsBackend, uploadCartridges } from "@salesforce/b2c-tooling-sdk/operations/code";
 import { createBundleV2, createDeploymentScapi, mrtScapiUnavailableMessage, runMrtWithFallback, uploadBundle, uploadBundleScapi, waitForDeploymentScapi, waitForEnv } from "@salesforce/b2c-tooling-sdk/operations/mrt";
 import { DEFAULT_MRT_ORIGIN, createMrtClient } from "@salesforce/b2c-tooling-sdk/clients";
 
@@ -208,6 +210,20 @@ var Push = class Push extends MrtCommand {
 		}, this.getMrtAuth());
 	}
 	/**
+	* Whether WebDAV can fall back to an Account Manager browser login (built-in public client)
+	* when neither a WebDAV access key nor an API client is configured. Only for interactive
+	* terminals, since the login waits for the browser; never in CI.
+	*
+	* Environment variables:
+	* - `CI` (optional): when set (e.g. `true`), disables the browser login.
+	* - `SFCC_AUTH_METHODS` (optional): when set, must include `user` (e.g. `basic,user`).
+	*/
+	canUseBrowserLoginForWebDav() {
+		if (!process.stdin.isTTY || process.env.CI) return false;
+		const authMethods = this.resolvedConfig.values.authMethods;
+		return !authMethods || authMethods.includes("user");
+	}
+	/**
 	* Generate and deploy cartridge metadata to B2C instance.
 	* This is a pre-MRT-push step that ensures Page Designer metadata is current.
 	*/
@@ -223,15 +239,29 @@ var Push = class Push extends MrtCommand {
 				this.warn("B2C instance not configured, skipping cartridge deployment");
 				return;
 			}
-			if (!this.resolvedConfig.values.codeVersion) {
-				this.warn("Code version not configured, skipping cartridge deployment");
-				return;
+			const browserLogin = this.canUseBrowserLoginForWebDav();
+			if (!this.resolvedConfig.hasBasicAuthConfig() && !this.resolvedConfig.hasOAuthConfig()) {
+				if (!browserLogin) {
+					this.warn("WebDAV credentials not configured, skipping cartridge deployment");
+					return;
+				}
+				this.log("No WebDAV credentials configured, using Account Manager browser sign-in...");
+			}
+			const instance = this.resolvedConfig.createB2CInstance({ defaultWebDavClient: browserLogin });
+			if (!instance.config.codeVersion) {
+				const activeVersion = await createScriptsBackend({ instance }).getActiveCodeVersion();
+				if (!activeVersion?.id) {
+					this.warn("No active code version found, skipping cartridge deployment");
+					return;
+				}
+				instance.config.codeVersion = activeVersion.id;
+				this.log(`Using active code version "${activeVersion.id}"`);
 			}
-			await uploadCartridges(this.resolvedConfig.createB2CInstance(), [{
+			await uploadCartridges(instance, [{
 				name: SFNEXT_BASE_CARTRIDGE_NAME,
 				src: path.join(projectDirectory, CARTRIDGES_BASE_DIR, SFNEXT_BASE_CARTRIDGE_NAME),
 				dest: SFNEXT_BASE_CARTRIDGE_NAME
-			}]);
+			}], { ignoreDirs: this.resolvedConfig.values.cartridgeIgnoreDirs });
 			this.log("Cartridge deployed successfully!");
 		} catch (cartridgeError) {
 			this.warn(`Failed to generate or deploy cartridge: ${cartridgeError.message}`);

package/dist/commands/validate-cartridge.js

@@ -1,7 +1,7 @@
-import { i as SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR, t as CARTRIDGES_BASE_DIR } from "../config.js";
+import { a as assertValidCartridgeName, r as SFNEXT_BASE_CARTRIDGE_NAME, s as cartridgeExperienceDir, t as CARTRIDGES_BASE_DIR } from "../config.js";
 import { r as commonFlags } from "../flags.js";
 import { t as validateCartridgeMetadata } from "../validate-cartridge.js";
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import path from "path";
 import fs from "fs-extra";
 import chalk from "chalk";
@@ -16,12 +16,21 @@ import chalk from "chalk";
 var ValidateCartridge = class ValidateCartridge extends Command {
 	static description = "Validate Page Designer metadata JSON files against schemas";
 	static examples = ["<%= config.bin %> <%= command.id %>", "<%= config.bin %> <%= command.id %> -d ./my-project"];
-	static flags = { ...commonFlags };
+	static flags = {
+		...commonFlags,
+		"cartridge-name": Flags.string({ description: "Cartridge directory name under cartridges/ (defaults to app_storefrontnext_base)" })
+	};
 	async run() {
 		const { flags } = await this.parse(ValidateCartridge);
 		const projectDirectory = flags["project-directory"];
 		if (!fs.existsSync(projectDirectory)) this.error(`Project directory doesn't exist: ${projectDirectory}`);
-		const metadataDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR);
+		const cartridgeName = flags["cartridge-name"] ?? SFNEXT_BASE_CARTRIDGE_NAME;
+		try {
+			assertValidCartridgeName(cartridgeName);
+		} catch (error) {
+			this.error(error instanceof Error ? error.message : String(error));
+		}
+		const metadataDir = path.join(projectDirectory, CARTRIDGES_BASE_DIR, cartridgeExperienceDir(cartridgeName));
 		if (!fs.existsSync(metadataDir)) this.error(`Metadata directory doesn't exist: ${metadataDir}\nRun "sfnext generate-cartridge" first to generate metadata files.`);
 		this.log("Validating Page Designer metadata...\n");
 		const summary = await validateCartridgeMetadata(metadataDir);

package/dist/config.js

@@ -17,7 +17,18 @@ const getMrtEntryFile = (mode) => {
 //#region src/config.ts
 const CARTRIDGES_BASE_DIR = "cartridges";
 const SFNEXT_BASE_CARTRIDGE_NAME = "app_storefrontnext_base";
-const SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR = `${SFNEXT_BASE_CARTRIDGE_NAME}/cartridge/experience`;
+/**
+* Reject path-like `--cartridge-name` values before they are joined under `cartridges/`.
+* Invalid input is rejected as-is; it is not trimmed or sanitized.
+*/
+function assertValidCartridgeName(cartridgeName) {
+	if (cartridgeName.trim().length === 0 || cartridgeName === "." || cartridgeName === ".." || /[\\/]/.test(cartridgeName) || cartridgeName.includes("\0") || /^[a-zA-Z]:/.test(cartridgeName)) throw new Error("Invalid --cartridge-name: must be a single cartridge name, not a path.");
+}
+/** Metadata directory relative to `cartridges/`, for the given cartridge name. */
+function cartridgeExperienceDir(cartridgeName = SFNEXT_BASE_CARTRIDGE_NAME) {
+	return `${cartridgeName}/cartridge/experience`;
+}
+const SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR = cartridgeExperienceDir();
 /**
 * When enabled, automatically generates and deploys cartridge metadata before an MRT push.
 * This is useful for keeping Page Designer metadata in sync with component changes.
@@ -112,4 +123,4 @@ const buildMrtConfig = async (_buildDirectory, projectDirectory) => {
 };
 
 //#endregion
-export { buildMrtConfig as a, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR as i, GENERATE_AND_DEPLOY_CARTRIDGE_ON_MRT_PUSH as n, loadRuntimeConfig as o, SFNEXT_BASE_CARTRIDGE_NAME as r, CARTRIDGES_BASE_DIR as t };
+export { assertValidCartridgeName as a, loadRuntimeConfig as c, SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR as i, GENERATE_AND_DEPLOY_CARTRIDGE_ON_MRT_PUSH as n, buildMrtConfig as o, SFNEXT_BASE_CARTRIDGE_NAME as r, cartridgeExperienceDir as s, CARTRIDGES_BASE_DIR as t };