From 269a3c93b91d8f4c18209ef6ca0ace3f1d24aa9a Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 13:37:17 -0700
Subject: [PATCH 01/67] Initial version of bundle comparison script. Note:
 includes changes to the pnpm-lock and pnpm-workspace that need to be reverted
 before this change is reviewed or checked in.

---
 .../utils/bundle-size-tests/eslint.config.mts |  20 +
 examples/utils/bundle-size-tests/package.json |   7 +-
 .../scripts/compare-bundles.ts                | 542 +++++++++++
 .../bundle-size-tests/tsconfig.scripts.json   |   9 +
 pnpm-lock.yaml                                | 894 +++++++++++++++---
 pnpm-workspace.yaml                           |   4 +-
 6 files changed, 1356 insertions(+), 120 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/compare-bundles.ts
 create mode 100644 examples/utils/bundle-size-tests/tsconfig.scripts.json

diff --git a/examples/utils/bundle-size-tests/eslint.config.mts b/examples/utils/bundle-size-tests/eslint.config.mts
index 7a6d122ed2c2..01724bbc5dc4 100644
--- a/examples/utils/bundle-size-tests/eslint.config.mts
+++ b/examples/utils/bundle-size-tests/eslint.config.mts
@@ -8,6 +8,26 @@ import { recommended } from "@fluidframework/eslint-config-fluid/flat.mts";
 
 const config: Linter.Config[] = [
 	...recommended,
+	{
+		// Include script files in typed linting via an explicit tsconfig list.
+		files: ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],
+		languageOptions: {
+			parserOptions: {
+				projectService: false,
+				project: ["./tsconfig.json", "./tsconfig.scripts.json", "./src/test/tsconfig.json"],
+			},
+		},
+	},
+	{
+		files: ["scripts/**/*.ts"],
+		rules: {
+			"import-x/no-nodejs-modules": "off",
+			"unicorn/filename-case": "off",
+			"@typescript-eslint/prefer-nullish-coalescing": "off",
+			"@typescript-eslint/no-unsafe-call": "off",
+			"@typescript-eslint/no-unsafe-return": "off",
+		},
+	},
 	{
 		rules: {
 			"@typescript-eslint/consistent-type-imports": "off",
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 589d048f5141..685bb1b1226c 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,8 +21,9 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"eslint": "eslint --quiet --format stylish src",
-		"eslint:fix": "eslint --quiet --format stylish src --fix --fix-type problem,suggestion,layout",
+		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compare-bundles.ts",
+		"eslint": "eslint --quiet --format stylish src scripts",
+		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
 		"format": "npm run format:biome",
 		"format:biome": "biome check . --write",
@@ -60,6 +61,7 @@
 		"@fluidframework/bundle-size-tools": "catalog:buildTools",
 		"@fluidframework/eslint-config-fluid": "catalog:eslint",
 		"@mixer/webpack-bundle-compare": "^0.1.0",
+		"@msgpack/msgpack": "^2.8.0",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "catalog:types",
 		"eslint": "catalog:eslint",
@@ -71,6 +73,7 @@
 		"source-map-loader": "^5.0.0",
 		"string-replace-loader": "^3.1.0",
 		"ts-loader": "^9.5.1",
+		"tsx": "^4.19.4",
 		"typescript": "~5.4.5",
 		"webpack": "^5.94.0",
 		"webpack-bundle-analyzer": "^4.5.0",
diff --git a/examples/utils/bundle-size-tests/scripts/compare-bundles.ts b/examples/utils/bundle-size-tests/scripts/compare-bundles.ts
new file mode 100644
index 000000000000..0f59a584506d
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/compare-bundles.ts
@@ -0,0 +1,542 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { gunzipSync, gzipSync } from "node:zlib";
+
+import { decode } from "@msgpack/msgpack";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const defaultAnalysisDirectory = resolve(scriptDirectory, "..");
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ * Supports both "--option value" and "--option=value" formats.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract (e.g., "--base-branch")
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for (e.g., "--help")
+ * @returns True if the flag is present, false otherwise
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+function sanitizeForFileName(value: string): string {
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/** Represents a single asset in a bundle. */
+interface AssetStat {
+	/** The name of the asset (e.g., "bundle.js") */
+	name: string;
+	/** The parsed size of the asset in bytes */
+	size?: number;
+}
+
+/** Represents aggregated statistics for a bundle build. */
+interface BundleStats {
+	/** Array of assets and their sizes */
+	assets?: AssetStat[];
+	/** Entrypoint names mapped to their constituent assets and sizes */
+	entrypoints?: Record<string, { assets?: { size?: number }[] }>;
+}
+
+/**
+ * Generates candidate file paths for bundle stats files in order of preference.
+ * Tries multiple possible locations to handle different directory structures.
+ *
+ * @param analysisDirectory - The base analysis directory containing bundle stats
+ * @param label - The label suffix used to identify the specific stats (e.g., "parent", "current")
+ * @returns An array of candidate file paths to check in order
+ */
+function getStatsFileCandidates(analysisDirectory: string, label: string): string[] {
+	return [
+		resolve(analysisDirectory, `bundleAnalysis.${label}`, "bundleStats.msp.gz"),
+		resolve(analysisDirectory, "bundleAnalysis", label, "bundleStats.msp.gz"),
+		resolve(analysisDirectory, "bundleAnalysis", "bundleStats.msp.gz"),
+	];
+}
+
+/**
+ * Loads and deserializes bundle statistics from a MessagePack-compressed file.
+ * Attempts multiple file locations and throws an error if stats cannot be found.
+ *
+ * @param analysisDirectory - The base analysis directory
+ * @param label - The label suffix used to identify the specific stats
+ * @returns Parsed bundle statistics
+ * @throws Error if bundle stats file cannot be found in any candidate location
+ */
+function loadStats(analysisDirectory: string, label: string): BundleStats {
+	const candidates = getStatsFileCandidates(analysisDirectory, label);
+	const statsFilePath = candidates.find((candidate) => existsSync(candidate));
+	if (statsFilePath === undefined) {
+		const expectedPaths = candidates.map((candidate) => `  - ${candidate}`).join("\n");
+		throw new Error(
+			[
+				`Could not find bundle stats for label "${label}".`,
+				"Checked:",
+				expectedPaths,
+				"",
+				"If your base stats are stored in a different location, pass --base-label or --analysis-dir explicitly.",
+			].join("\n"),
+		);
+	}
+
+	const compressedData = readFileSync(statsFilePath);
+	const decompressedData = gunzipSync(compressedData);
+	return decode(decompressedData) as BundleStats;
+}
+
+/**
+ * Calculates the gzip-compressed size of a file using maximum compression level.
+ *
+ * @param filePath - The path to the file
+ * @returns The gzip-compressed size in bytes, or undefined if the file cannot be read
+ */
+function gzipSize(filePath: string): number | undefined {
+	try {
+		return gzipSync(readFileSync(filePath), { level: 9 }).length;
+	} catch {
+		return undefined;
+	}
+}
+
+/** Reporter interface for dual console and text file output. */
+interface Reporter {
+	/** Prints a line to both console and internal buffer */
+	print: (line?: string) => void;
+	/** Prints a section header with spacing */
+	section: (title: string) => void;
+	/** Prints a table header with a divider line */
+	tableHeader: (header: string, dividerLength: number) => void;
+	/** Returns all accumulated output as a single text string */
+	toText: () => string;
+}
+
+/**
+ * Creates a reporter that outputs to both console and a text buffer.
+ * Allows for simultaneous console output and file writing of the same content.
+ *
+ * @returns A Reporter instance with print, section, tableHeader, and toText methods
+ */
+function createReporter(): Reporter {
+	const outputLines: string[] = [];
+
+	function print(line = ""): void {
+		console.log(line);
+		outputLines.push(line);
+	}
+
+	function section(title: string): void {
+		print();
+		print(title);
+	}
+
+	function tableHeader(header: string, dividerLength: number): void {
+		print(header);
+		print("-".repeat(dividerLength));
+	}
+
+	function toText(): string {
+		return `${outputLines.join("\n")}\n`;
+	}
+
+	return { print, section, tableHeader, toText };
+}
+
+/** Represents a comparison row for a single asset between two builds. */
+interface CompareRow {
+	/** The asset name */
+	name: string;
+	/** The parsed size in the base build */
+	baseStatSize: number;
+	/** The parsed size in the current build */
+	currentStatSize: number;
+}
+
+/**
+ * Formats an asset comparison row for tabular display.
+ * Includes name, base size, current size, diff, and percentage change.
+ *
+ * @param row - The comparison row to format
+ * @returns A formatted string suitable for console output
+ */
+function formatAssetRow(row: CompareRow): string {
+	const diff = row.currentStatSize - row.baseStatSize;
+	const percentChange =
+		row.baseStatSize > 0 && diff !== 0
+			? `${((diff / row.baseStatSize) * 100).toFixed(1)}%`
+			: "";
+	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
+
+	return (
+		(row.name + (diff === 0 ? "" : " *")).padEnd(40) +
+		String(row.baseStatSize).padStart(12) +
+		String(row.currentStatSize).padStart(12) +
+		diffStr.padStart(12) +
+		percentChange.padStart(10)
+	);
+}
+
+/**
+ * Formats an entrypoint comparison row for tabular display.
+ * Includes entrypoint name, base size, current size, and diff.
+ *
+ * @param entrypointName - The name of the entrypoint
+ * @param baseSize - The total parsed size of assets in the base entrypoint
+ * @param currentSize - The total parsed size of assets in the current entrypoint
+ * @returns A formatted string suitable for console output
+ */
+function formatEntrypointRow(
+	entrypointName: string,
+	baseSize: number,
+	currentSize: number,
+): string {
+	const diff = currentSize - baseSize;
+	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
+	return (
+		entrypointName.padEnd(30) +
+		String(baseSize).padStart(12) +
+		String(currentSize).padStart(12) +
+		diffStr.padStart(12)
+	);
+}
+
+/** Parsed command-line options for the bundle comparison script. */
+interface Options {
+	/** Branch name for the base build (default: "main") */
+	baseBranch: string;
+	/** Branch name for the current build (default: current branch or BUILD_SOURCEBRANCHNAME) */
+	currentBranch: string;
+	/** Label suffix for base stats files (default: "parent") */
+	baseLabel: string;
+	/** Label suffix for current stats files (default: "current") */
+	currentLabel: string;
+	/** Directory containing bundleAnalysis folders (default: examples/utils/bundle-size-tests) */
+	analysisDirectory: string;
+	/** Directory where comparison output files are written (default: analysis-dir/bundleAnalysis) */
+	outputDirectory: string;
+	/** Build output directory for base gzip size comparison (default: analysis-dir/bundleAnalysis.base-label/build) */
+	baseBuildDirectory: string;
+	/** Build output directory for current gzip size comparison (default: analysis-dir/build) */
+	currentBuildDirectory: string;
+}
+
+/**
+ * Parses command-line arguments into an Options object.
+ * Provides defaults for all options and reads BUILD_SOURCEBRANCHNAME environment variable.
+ *
+ * @param argv - The command-line argument list
+ * @returns Parsed options with defaults applied
+ */
+function parseOptions(argv: string[]): Options {
+	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
+	const currentBranch =
+		getOptionValue(argv, "--current-branch") ??
+		process.env.BUILD_SOURCEBRANCHNAME ??
+		"current";
+	const baseLabel = getOptionValue(argv, "--base-label") ?? "parent";
+	const currentLabel = getOptionValue(argv, "--current-label") ?? "current";
+	const analysisDirectory = resolve(
+		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
+	);
+	const outputDirectory = resolve(
+		getOptionValue(argv, "--output-dir") ?? `${analysisDirectory}/bundleAnalysis`,
+	);
+	const baseBuildDirectory = resolve(
+		getOptionValue(argv, "--base-build-dir") ??
+			`${analysisDirectory}/bundleAnalysis.${baseLabel}/build`,
+	);
+	const currentBuildDirectory = resolve(
+		getOptionValue(argv, "--current-build-dir") ?? `${analysisDirectory}/build`,
+	);
+
+	return {
+		baseBranch,
+		currentBranch,
+		baseLabel,
+		currentLabel,
+		analysisDirectory,
+		outputDirectory,
+		baseBuildDirectory,
+		currentBuildDirectory,
+	};
+}
+
+/**
+ * Writes comparison results to both text and JSON output files.
+ * Creates the output directory if it does not exist.
+ * File names are derived from sanitized branch names (e.g., "compare-main-to-dev.txt").
+ *
+ * @param outputDirectory - The directory where output files will be written
+ * @param baseBranch - The base branch name (used in output filename)
+ * @param currentBranch - The current branch name (used in output filename)
+ * @param textContent - The formatted text comparison report
+ * @param jsonObject - The structured comparison data as a JSON-serializable object
+ */
+function writeOutputFiles(
+	outputDirectory: string,
+	baseBranch: string,
+	currentBranch: string,
+	textContent: string,
+	jsonObject: object,
+): void {
+	mkdirSync(outputDirectory, { recursive: true });
+
+	const baseRevision = sanitizeForFileName(baseBranch);
+	const currentRevision = sanitizeForFileName(currentBranch);
+	const outputBaseName = `compare-${baseRevision}-to-${currentRevision}`;
+	const textOutputPath = resolve(outputDirectory, `${outputBaseName}.txt`);
+	const jsonOutputPath = resolve(outputDirectory, `${outputBaseName}.json`);
+
+	writeFileSync(textOutputPath, textContent);
+	writeFileSync(jsonOutputPath, `${JSON.stringify(jsonObject, undefined, 2)}\n`);
+
+	console.log("\nWrote comparison outputs:");
+	console.log(`  ${textOutputPath}`);
+	console.log(`  ${jsonOutputPath}`);
+}
+
+/**
+ * Prints the help text describing usage, options, and examples for the script.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  tsx ./scripts/compare-bundles.ts [options]
+
+Options:
+  --help, -h
+    Show this help text and exit.
+
+  --base-branch <name>         Base branch label in output (default: main)
+  --current-branch <name>      Current branch label in output (default: BUILD_SOURCEBRANCHNAME or current)
+  --base-label <name>          Base stats directory suffix (default: parent)
+  --current-label <name>       Current stats directory suffix (default: current)
+
+  --analysis-dir <path>        Directory containing bundleAnalysis.<label> folders
+                               (default: examples/utils/bundle-size-tests)
+  --output-dir <path>          Directory where comparison outputs are written
+                               (default: <analysis-dir>/bundleAnalysis)
+  --base-build-dir <path>      Build output directory used for base gzip comparison
+                               (default: <analysis-dir>/bundleAnalysis.<base-label>/build)
+  --current-build-dir <path>   Build output directory used for current gzip comparison
+                               (default: <analysis-dir>/build)
+
+Examples:
+  tsx ./scripts/compare-bundles.ts --base-branch main --current-branch tbrosman/default-field-kinds
+  tsx ./scripts/compare-bundles.ts --analysis-dir examples/utils/bundle-size-tests
+`);
+}
+
+/** Represents gzip size comparison data for a single asset. */
+interface GzipRow {
+	/** The asset name */
+	name: string;
+	/** Gzip-compressed size of the asset in the base build (if available) */
+	baseGzipSize?: number;
+	/** Gzip-compressed size of the asset in the current build (if available) */
+	currentGzipSize?: number;
+	/** Difference in gzip size (current - base) */
+	diff?: number;
+}
+
+/** Represents entrypoint comparison data from parsed bundle statistics. */
+interface EntrypointRow {
+	/** The entrypoint name */
+	entrypointName: string;
+	/** Total parsed size of assets in the base entrypoint */
+	baseSize: number;
+	/** Total parsed size of assets in the current entrypoint */
+	currentSize: number;
+	/** Difference in total size (current - base) */
+	diff: number;
+}
+
+/**
+ * Main entry point for the bundle comparison script.
+ * Loads statistics from base and current builds, compares assets and entrypoints,
+ * and generates both console output and file-based reports (text and JSON).
+ *
+ * @param argv - The command-line argument list (typically process.argv)
+ * @throws Error if bundle stats cannot be found or loaded
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const options = parseOptions(argv);
+	const reporter = createReporter();
+
+	const baseStats = loadStats(options.analysisDirectory, options.baseLabel);
+	const currentStats = loadStats(options.analysisDirectory, options.currentLabel);
+
+	const baseAssets = Object.fromEntries(
+		(baseStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
+	const currentAssets = Object.fromEntries(
+		(currentStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
+
+	const rows: CompareRow[] = [
+		...new Set([...Object.keys(baseAssets), ...Object.keys(currentAssets)]),
+	]
+		.sort()
+		.map((name) => ({
+			name,
+			baseStatSize: baseAssets[name]?.size ?? 0,
+			currentStatSize: currentAssets[name]?.size ?? 0,
+		}));
+
+	reporter.section(
+		`=== Bundle Size Comparison: ${options.baseBranch} -> ${options.currentBranch} ===`,
+	);
+	reporter.section("All assets (stat/parsed size in bytes):");
+	reporter.tableHeader(
+		"Asset".padEnd(40) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12) +
+			"% Change".padStart(10),
+		88,
+	);
+	for (const row of rows) {
+		reporter.print(formatAssetRow(row));
+	}
+
+	const changedRows = rows.filter((row) => row.currentStatSize !== row.baseStatSize);
+	const gzipRows: GzipRow[] = [];
+	if (changedRows.length > 0) {
+		reporter.section("=== Gzip sizes for changed assets ===");
+		reporter.tableHeader(
+			"Asset".padEnd(40) +
+				"Base Gzip".padStart(14) +
+				"Current Gzip".padStart(14) +
+				"Diff".padStart(12),
+			82,
+		);
+
+		for (const row of changedRows) {
+			const baseGzipSize = gzipSize(resolve(options.baseBuildDirectory, row.name));
+			const currentGzipSize = gzipSize(resolve(options.currentBuildDirectory, row.name));
+
+			if (baseGzipSize !== undefined && currentGzipSize !== undefined) {
+				const diff = currentGzipSize - baseGzipSize;
+				const line =
+					row.name.padEnd(40) +
+					String(baseGzipSize).padStart(14) +
+					String(currentGzipSize).padStart(14) +
+					`${diff > 0 ? "+" : ""}${diff}`.padStart(12);
+				reporter.print(line);
+				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize, diff });
+			} else {
+				reporter.print(`${row.name.padEnd(40)}(base/current build not found)`);
+				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize });
+			}
+		}
+	}
+
+	const baseEntrypoints = baseStats.entrypoints ?? {};
+	const currentEntrypoints = currentStats.entrypoints ?? {};
+	const entrypointRows: EntrypointRow[] = [];
+	const namedEntrypoints = [
+		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
+	]
+		.filter((entrypointName) => !/^\d/.test(entrypointName))
+		.sort();
+
+	reporter.section("=== Named entrypoint total asset sizes ===");
+	reporter.tableHeader(
+		"Entrypoint".padEnd(30) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12),
+		68,
+	);
+	for (const entrypointName of namedEntrypoints) {
+		const baseSize = (baseEntrypoints[entrypointName]?.assets ?? []).reduce(
+			(sum, asset) => sum + (asset?.size ?? 0),
+			0,
+		);
+		const currentSize = (currentEntrypoints[entrypointName]?.assets ?? []).reduce(
+			(sum, asset) => sum + (asset?.size ?? 0),
+			0,
+		);
+		reporter.print(formatEntrypointRow(entrypointName, baseSize, currentSize));
+		entrypointRows.push({
+			entrypointName,
+			baseSize,
+			currentSize,
+			diff: currentSize - baseSize,
+		});
+	}
+
+	writeOutputFiles(
+		options.outputDirectory,
+		options.baseBranch,
+		options.currentBranch,
+		reporter.toText(),
+		{
+			comparedAt: new Date().toISOString(),
+			baseBranch: options.baseBranch,
+			currentBranch: options.currentBranch,
+			baseLabel: options.baseLabel,
+			currentLabel: options.currentLabel,
+			analysisDirectory: options.analysisDirectory,
+			baseBuildDirectory: options.baseBuildDirectory,
+			currentBuildDirectory: options.currentBuildDirectory,
+			assets: rows.map((row) => ({
+				name: row.name,
+				baseStatSize: row.baseStatSize,
+				currentStatSize: row.currentStatSize,
+				diff: row.currentStatSize - row.baseStatSize,
+			})),
+			gzipChangedAssets: gzipRows,
+			entrypoints: entrypointRows,
+		},
+	);
+}
+
+main(process.argv);
diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
new file mode 100644
index 000000000000..ed6f739caa70
--- /dev/null
+++ b/examples/utils/bundle-size-tests/tsconfig.scripts.json
@@ -0,0 +1,9 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"noEmit": true,
+		"types": ["node"],
+		"exactOptionalPropertyTypes": false
+	},
+	"include": ["scripts/**/*.ts"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a359a6e6dba5..80d2bd48802b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,9 +25,6 @@ catalogs:
     eslint:
       specifier: ~9.39.1
       version: 9.39.1
-    eslint-config-prettier:
-      specifier: ~10.1.8
-      version: 10.1.8
 
 overrides:
   '@biomejs/biome': ~2.4.5
@@ -84,7 +81,7 @@ importers:
         version: link:packages/tools/changelog-generator-wrapper
       '@fluid-tools/build-cli':
         specifier: catalog:buildTools
-        version: 0.64.0(@types/node@22.19.17)(encoding@0.1.13)(webpack-cli@5.1.4)
+        version: 0.64.0(@types/node@22.19.17)(encoding@0.1.13)
       '@fluid-tools/markdown-magic':
         specifier: workspace:~
         version: link:tools/markdown-magic
@@ -172,7 +169,7 @@ importers:
         version: 0.64.0(@types/node@22.19.17)
       '@fluidframework/eslint-config-fluid':
         specifier: catalog:eslint
-        version: 9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
+        version: 9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       eslint:
         specifier: catalog:eslint
         version: 9.39.1(jiti@2.6.1)
@@ -4862,6 +4859,9 @@ importers:
       '@mixer/webpack-bundle-compare':
         specifier: ^0.1.0
         version: 0.1.1
+      '@msgpack/msgpack':
+        specifier: ^2.8.0
+        version: 2.8.0
       '@types/mocha':
         specifier: ^10.0.10
         version: 10.0.10
@@ -4895,6 +4895,9 @@ importers:
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
+      tsx:
+        specifier: ^4.19.4
+        version: 4.21.0
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -17596,53 +17599,53 @@ packages:
     hasBin: true
 
   '@biomejs/cli-darwin-arm64@2.4.5':
-    resolution: {integrity: sha512-lGS4Nd5O3KQJ6TeWv10mElnx1phERhBxqGP/IKq0SvZl78kcWDFMaTtVK+w3v3lusRFxJY78n07PbKplirsU5g==}
+    resolution: {integrity: sha1-piRyqzUpo5BbFuHz/bvHTy5fACM=}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
   '@biomejs/cli-darwin-x64@2.4.5':
-    resolution: {integrity: sha512-6MoH4tyISIBNkZ2Q5T1R7dLd5BsITb2yhhhrU9jHZxnNSNMWl+s2Mxu7NBF8Y3a7JJcqq9nsk8i637z4gqkJxQ==}
+    resolution: {integrity: sha1-6LsAH89qjHUbCXHMz1OZPpui5uk=}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
   '@biomejs/cli-linux-arm64-musl@2.4.5':
-    resolution: {integrity: sha512-iqLDgpzobG7gpBF0fwEVS/LT8kmN7+S0E2YKFDtqliJfzNLnAiV2Nnyb+ehCDCJgAZBASkYHR2o60VQWikpqIg==}
+    resolution: {integrity: sha1-t+95AiN/FhEwYWWaTFSv9a1FE9U=}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@biomejs/cli-linux-arm64@2.4.5':
-    resolution: {integrity: sha512-U1GAG6FTjhAO04MyH4xn23wRNBkT6H7NentHh+8UxD6ShXKBm5SY4RedKJzkUThANxb9rUKIPc7B8ew9Xo/cWg==}
+    resolution: {integrity: sha1-8RCvdIllyxtXYk27vXrLpynah4A=}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@biomejs/cli-linux-x64-musl@2.4.5':
-    resolution: {integrity: sha512-NlKa7GpbQmNhZf9kakQeddqZyT7itN7jjWdakELeXyTU3pg/83fTysRRDPJD0akTfKDl6vZYNT9Zqn4MYZVBOA==}
+    resolution: {integrity: sha1-w0k+uglCFuc1U4xVNU28iGe1GQk=}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@biomejs/cli-linux-x64@2.4.5':
-    resolution: {integrity: sha512-NdODlSugMzTlENPTa4z0xB82dTUlCpsrOxc43///aNkTLblIYH4XpYflBbf5ySlQuP8AA4AZd1qXhV07IdrHdQ==}
+    resolution: {integrity: sha1-FYBVUNtORf+9bELRQNDLXG2+B68=}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@biomejs/cli-win32-arm64@2.4.5':
-    resolution: {integrity: sha512-EBfrTqRIWOFSd7CQb/0ttjHMR88zm3hGravnDwUA9wHAaCAYsULKDebWcN5RmrEo1KBtl/gDVJMrFjNR0pdGUw==}
+    resolution: {integrity: sha1-ja5X3I/8HoLgClnmI7UCPAlyak0=}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
   '@biomejs/cli-win32-x64@2.4.5':
-    resolution: {integrity: sha512-Pmhv9zT95YzECfjEHNl3mN9Vhusw9VA5KHY0ZvlGsxsjwS5cb7vpRnHzJIv0vG7jB0JI7xEaMH9ddfZm/RozBw==}
+    resolution: {integrity: sha1-C00zVeDWhWz/jtci4F7HsGUuQ6s=}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -17715,7 +17718,7 @@ packages:
     resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==}
 
   '@colors/colors@1.5.0':
-    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
+    resolution: {integrity: sha1-u1BFecHK6SPmV2pPXaQ9Jfl729k=}
     engines: {node: '>=0.1.90'}
 
   '@colors/colors@1.6.0':
@@ -17723,7 +17726,7 @@ packages:
     engines: {node: '>=0.1.90'}
 
   '@cspotcode/source-map-support@0.8.1':
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    resolution: {integrity: sha1-AGKcNaaI4FqIsc2mhPudXnPwAKE=}
     engines: {node: '>=12'}
 
   '@csstools/color-helpers@5.1.0':
@@ -17762,13 +17765,13 @@ packages:
     engines: {node: '>=10.0.0'}
 
   '@emnapi/core@1.9.1':
-    resolution: {integrity: sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==}
+    resolution: {integrity: sha1-IUMGnHRMokQgdPgHhGLlHt1jx70=}
 
   '@emnapi/runtime@1.9.1':
-    resolution: {integrity: sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==}
+    resolution: {integrity: sha1-EV/yoNWJhlvmvY6dcB5JnEc/Ko0=}
 
   '@emnapi/wasi-threads@1.2.0':
-    resolution: {integrity: sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==}
+    resolution: {integrity: sha1-oZ2Xcsw9GVNwv24qgF7sQKp14Y4=}
 
   '@emotion/hash@0.9.2':
     resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
@@ -17793,6 +17796,162 @@ packages:
     resolution: {integrity: sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==}
     engines: {node: '>=10'}
 
+  '@esbuild/aix-ppc64@0.27.7':
+    resolution: {integrity: sha1-grdPkqp41yC3FBYpOfskjJCt31M=}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.27.7':
+    resolution: {integrity: sha1-94y4oxIfwgWlMoWtskly2zhdGF0=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.27.7':
+    resolution: {integrity: sha1-WT4QoUULv8rGyzIfYfRoRTusIJ0=}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.27.7':
+    resolution: {integrity: sha1-RTFD0HMyYDPS0iyvnkjeS64nSwc=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.27.7':
+    resolution: {integrity: sha1-byMAD7m0C34Et9BgbAaTvQYy8yI=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.27.7':
+    resolution: {integrity: sha1-Jzk90YuxJjxmOXnF8VduAMLQJL4=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.27.7':
+    resolution: {integrity: sha1-IuRjj6UC0cACcHcyTJdkDjrfOmI=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.27.7':
+    resolution: {integrity: sha1-kiS45P6pJM4hlOPvw+muv4IhktY=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.27.7':
+    resolution: {integrity: sha1-T10cJ1J9gXs1aEriFBnlfCvaCWY=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.27.7':
+    resolution: {integrity: sha1-uenQcMjBwESc8Ssg6sN9cKRZWSE=}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.27.7':
+    resolution: {integrity: sha1-P4D7aWqpYFGpQEfzXIWwiyHDb54=}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.27.7':
+    resolution: {integrity: sha1-m+HywoIQsT67QVYiG7o1b+FnUgU=}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.27.7':
+    resolution: {integrity: sha1-SrXuZ6Pfy8tej9eIPa5uc1sRY7g=}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.27.7':
+    resolution: {integrity: sha1-2seMaJ9kmUWcQyHlwVAywSMH5+o=}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.27.7':
+    resolution: {integrity: sha1-BQ99OzVcOpgwjpNbxNYyXakbACc=}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.27.7':
+    resolution: {integrity: sha1-1h9xXOYdQ/5YRK0Nj0Y/iMvk/vY=}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.27.7':
+    resolution: {integrity: sha1-yo4apHj8ggkle/Osj3nE3CmC8yo=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.27.7':
+    resolution: {integrity: sha1-FlDywblI3us++Ujy/DBhRyPAlpA=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.27.7':
+    resolution: {integrity: sha1-ZXcqs0LEszGb8HBaIRBQqsG24yA=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.27.7':
+    resolution: {integrity: sha1-N+18+mZUnXlVhS/ON9DD3k5xXqE=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.27.7':
+    resolution: {integrity: sha1-Ab89OFhV71DLM9t8S1L5V8NM0Xk=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.27.7':
+    resolution: {integrity: sha1-bB+Us0CGWZqr2k6sj2OClLmHdBA=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@esbuild/sunos-x64@0.27.7':
+    resolution: {integrity: sha1-Sw3ReuCmlB0tD9NakGOSUXBxqQ0=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.27.7':
+    resolution: {integrity: sha1-NBk6tVZdb/aMqSisBL51ECzLLnc=}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.27.7':
+    resolution: {integrity: sha1-62fw5EglFdjBiU7eYxwyek2p/E0=}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.27.7':
+    resolution: {integrity: sha1-j+MLMIi4m0hzw6bMh1l645IMCos=}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-plugin-eslint-comments@4.5.0':
     resolution: {integrity: sha512-MAhuTKlr4y/CE3WYX26raZjy+I/kS2PLKSzvfmDCGrBLTFHOYwqROZdr4XwPgXwX3K9rjzMr4pSmUWGnzsUyMg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -19230,7 +19389,7 @@ packages:
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
   '@jridgewell/trace-mapping@0.3.9':
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+    resolution: {integrity: sha1-ZTT9WTOlO6fL86F2FeJzoNEnP/k=}
 
   '@json2csv/formatters@7.0.6':
     resolution: {integrity: sha512-hjIk1H1TR4ydU5ntIENEPgoMGW+Q7mJ+537sDFDbsk+Y3EPl2i4NfFVjw0NJRgT+ihm8X30M67mA8AS6jPidSA==}
@@ -19362,38 +19521,42 @@ packages:
   '@mixer/webpack-bundle-compare@0.1.1':
     resolution: {integrity: sha512-EJe72ByalyTcG7CDdopfGGOnyUqmj1XQD9nF4VgS+FVKAIc97YGiQ4Dlz2B3uUVxuigdGDxh3kIri5f+u5ajKg==}
 
+  '@msgpack/msgpack@2.8.0':
+    resolution: {integrity: sha1-QhDet3HuORKWTxShXd+1/4d+cLk=}
+    engines: {node: '>= 10'}
+
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
-    resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==}
+    resolution: {integrity: sha1-nt7GGyLDCCAYp59tHDAond89nRE=}
     cpu: [arm64]
     os: [darwin]
 
   '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3':
-    resolution: {integrity: sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==}
+    resolution: {integrity: sha1-M2d6J1IEiYrYrL9ic0/E3AtqSFU=}
     cpu: [x64]
     os: [darwin]
 
   '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3':
-    resolution: {integrity: sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==}
+    resolution: {integrity: sha1-Ge33zcLnBj7jKEA8HYlaht0o9Ls=}
     cpu: [arm64]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3':
-    resolution: {integrity: sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==}
+    resolution: {integrity: sha1-lPsFQ7ouKHZsP8Q5yrvgRArnAVk=}
     cpu: [arm]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3':
-    resolution: {integrity: sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==}
+    resolution: {integrity: sha1-SgYJq1/kTQfJxgoR5EhNPDi71uM=}
     cpu: [x64]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3':
-    resolution: {integrity: sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==}
+    resolution: {integrity: sha1-CqVQLVR7V6v8SsSS3mjiAG5BckI=}
     cpu: [x64]
     os: [win32]
 
   '@napi-rs/wasm-runtime@0.2.12':
-    resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==}
+    resolution: {integrity: sha1-PniouW5sM6bFF+GJTvvVOFp8tvI=}
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -19577,95 +19740,95 @@ packages:
     resolution: {integrity: sha512-uu43FGU34B5VM9mCNjXCwLaGHYjXdNincqKLaraaCW+7S2+SmiBg1Nv8bPnmschrIfZmfKNY9f3fC376MRrObw==}
 
   '@parcel/watcher-android-arm64@2.5.0':
-    resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==}
+    resolution: {integrity: sha1-4y092mZHeR7pMFVq7iBvzV6g+3o=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
 
   '@parcel/watcher-darwin-arm64@2.5.0':
-    resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==}
+    resolution: {integrity: sha1-DZ5oC36ewcj1SUTxuUWqh1WvsS8=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
 
   '@parcel/watcher-darwin-x64@2.5.0':
-    resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==}
+    resolution: {integrity: sha1-+fHVzp1YeNNE8U7xhWt6gwxZ0bs=}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
 
   '@parcel/watcher-freebsd-x64@2.5.0':
-    resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==}
+    resolution: {integrity: sha1-K3fwyC0Z6E/0wh3m2n99CWsafoI=}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
 
   '@parcel/watcher-linux-arm-glibc@2.5.0':
-    resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==}
+    resolution: {integrity: sha1-ku0yLFbbr6PSVF3PKAMzSu4THkI=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.0':
-    resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
+    resolution: {integrity: sha1-zUjpv94M270uzZrM/FKWfiL4SaQ=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.0':
-    resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
+    resolution: {integrity: sha1-e4H21aRCu4n7q69sE1c+lKRv6wM=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.0':
-    resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
+    resolution: {integrity: sha1-3Lj/AQd831mhjZ4KTf96DP5f1zI=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.0':
-    resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
+    resolution: {integrity: sha1-LiVGAP2k4y2DlCOE0RBuHu2ESU0=}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.0':
-    resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
+    resolution: {integrity: sha1-AfzqYP7bsyJa+AjT8KexEil5Lu8=}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.0':
-    resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
+    resolution: {integrity: sha1-h82xbgeD53AZflL7HcAnuwyEcVQ=}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
 
   '@parcel/watcher-win32-ia32@2.5.0':
-    resolution: {integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==}
+    resolution: {integrity: sha1-d4w5tW2jPgRbohxnjDGp+dfGsiA=}
     engines: {node: '>= 10.0.0'}
     cpu: [ia32]
     os: [win32]
 
   '@parcel/watcher-win32-x64@2.5.0':
-    resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==}
+    resolution: {integrity: sha1-M4c4dtC7xYiqzOOOkNHXSAzoHLc=}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
 
   '@parcel/watcher@2.5.0':
-    resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
+    resolution: {integrity: sha1-XIiBixK43kMHqdPm3D4o66DfvRA=}
     engines: {node: '>= 10.0.0'}
 
   '@pkgjs/parseargs@0.11.0':
-    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    resolution: {integrity: sha1-p36nQvqyV3UUVDTrHSMoz1ATrDM=}
     engines: {node: '>=14'}
 
   '@pm2/agent@2.0.4':
@@ -19680,7 +19843,7 @@ packages:
     engines: {node: '>=4.0'}
 
   '@pm2/pm2-version-check@1.0.4':
-    resolution: {integrity: sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==}
+    resolution: {integrity: sha1-z5f7sUsOypVDDKBe7cy9JoOAbkM=}
 
   '@pnpm/config.env-replace@1.1.0':
     resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
@@ -19851,7 +20014,7 @@ packages:
     resolution: {integrity: sha512-iJ5qu1EO3kZDthq9zbMQ9ufB4jd0XwhHJ+4RNpTUEVTIZFitCV++IUfH1YCACGasct41pQRxGmWQNoaRZmn7EQ==}
 
   '@technote-space/doctoc@2.4.7':
-    resolution: {integrity: sha512-F4oyUpf2e29p3tNH0oTW0a3eOgd3wek2vz1urNalSKCFY8U0hzkFqwU+89rmXGLzzz8WMcLtEXb90CCgqnDQqQ==}
+    resolution: {integrity: sha1-NbYvS5STMxLxq6AgHVER/QmmrG0=}
 
   '@technote-space/doctoc@2.6.4':
     resolution: {integrity: sha512-gm6It+7hCuVSFMl9kP9NYX5TTqc6GRcb9HXm0/YhKnou1E0pyocG+6IR/1GNOu/yCkRnD9bRlp5BYw8puvf2kA==}
@@ -19886,13 +20049,13 @@ packages:
       '@testing-library/dom': '>=7.21.4'
 
   '@textlint/ast-node-types@12.6.1':
-    resolution: {integrity: sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==}
+    resolution: {integrity: sha1-Nezv505wHX9jLAg9T9qJyrG4kBI=}
 
   '@textlint/ast-node-types@13.4.1':
     resolution: {integrity: sha512-qrZyhCh8Ekk6nwArx3BROybm9BnX6vF7VcZbijetV/OM3yfS4rTYhoMWISmhVEP2H2re0CtWEyMl/XF+WdvVLQ==}
 
   '@textlint/markdown-to-ast@12.6.1':
-    resolution: {integrity: sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==}
+    resolution: {integrity: sha1-/My1czs+ds0Nt4oyN2OrEB8tgDs=}
 
   '@textlint/markdown-to-ast@13.4.1':
     resolution: {integrity: sha512-jUa5bTNmxjEgfCXW4xfn7eSJqzUXyNKiIDWLKtI4MUKRNhT3adEaa/NuQl0Mii3Hu3HraZR7hYhRHLh+eeM43w==}
@@ -19914,16 +20077,16 @@ packages:
     resolution: {integrity: sha512-m7Lllj9n/S6sOkCkRftpM7L24uvmfXQFedlW/4hENcuJH1HHm9u5EgxZb9uVjQSCGrbBWBkOGgcTxNg36r6ywA==}
 
   '@tsconfig/node10@1.0.12':
-    resolution: {integrity: sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==}
+    resolution: {integrity: sha1-vlfOrB5GkrQb6d5r6MMqEGY226Q=}
 
   '@tsconfig/node12@1.0.11':
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+    resolution: {integrity: sha1-7j3vHyfZ7WbaxuRqKVz/sBUuBY0=}
 
   '@tsconfig/node14@1.0.3':
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+    resolution: {integrity: sha1-5DhjFihPALmENb9A9y91oJ2r9sE=}
 
   '@tsconfig/node16@1.0.4':
-    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+    resolution: {integrity: sha1-C5LcwMwcgfbzBqOB8o4xsaVlNuk=}
 
   '@tufjs/canonical-json@1.0.0':
     resolution: {integrity: sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==}
@@ -19934,7 +20097,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
   '@tybys/wasm-util@0.10.1':
-    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
+    resolution: {integrity: sha1-7N3TIFzx4tUnRkn/Du3SmR7X9BQ=}
 
   '@tylerbu/markdown-magic@2.4.0-tylerbu-1':
     resolution: {integrity: sha512-p8nG2uH2+tQMGtT2Tam4gdJuJwuOdJdSA73LlNmRG+8dcxSNXkiwADyd/to6gY/oZOuNB5sJahBho5fLmxLI3Q==}
@@ -20183,7 +20346,7 @@ packages:
     resolution: {integrity: sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw==}
 
   '@types/parse-json@4.0.2':
-    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
+    resolution: {integrity: sha1-WVDlCWB5MFWEXpVsQn/CsNcMUjk=}
 
   '@types/path-browserify@1.0.3':
     resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
@@ -20317,7 +20480,7 @@ packages:
     resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
 
   '@types/yauzl@2.10.3':
-    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
+    resolution: {integrity: sha1-6bKAi08QlQSgPNqVglmHb2EBeZk=}
 
   '@typescript-eslint/eslint-plugin@8.54.0':
     resolution: {integrity: sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==}
@@ -20467,105 +20630,105 @@ packages:
     resolution: {integrity: sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
-    resolution: {integrity: sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==}
+    resolution: {integrity: sha1-n1sEUDCI5qNUKV6OqP48uZ5Dr4E=}
     cpu: [arm]
     os: [android]
 
   '@unrs/resolver-binding-android-arm64@1.11.1':
-    resolution: {integrity: sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==}
+    resolution: {integrity: sha1-dBSIVDG9cXi5ia7cTSXMyzhlvJ8=}
     cpu: [arm64]
     os: [android]
 
   '@unrs/resolver-binding-darwin-arm64@1.11.1':
-    resolution: {integrity: sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==}
+    resolution: {integrity: sha1-tKhVb0IXH7nJ97rII1BF6Cqgy98=}
     cpu: [arm64]
     os: [darwin]
 
   '@unrs/resolver-binding-darwin-x64@1.11.1':
-    resolution: {integrity: sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==}
+    resolution: {integrity: sha1-/U2BJXsT9NGgg4kKahfADeVx8Nw=}
     cpu: [x64]
     os: [darwin]
 
   '@unrs/resolver-binding-freebsd-x64@1.11.1':
-    resolution: {integrity: sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==}
+    resolution: {integrity: sha1-0lEwhNDzfEB3V+IvMr2SSnjP2Zs=}
     cpu: [x64]
     os: [freebsd]
 
   '@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1':
-    resolution: {integrity: sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==}
+    resolution: {integrity: sha1-hE0mBdBXSI13+rCXBfKGa4YWTgo=}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm-musleabihf@1.11.1':
-    resolution: {integrity: sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==}
+    resolution: {integrity: sha1-IEiSmVzvtr0dAX1S0JcZO8Yd2tM=}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm64-gnu@1.11.1':
-    resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
+    resolution: {integrity: sha1-Aj6ww6rEYGahC+ej82Lns087350=}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-arm64-musl@1.11.1':
-    resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
+    resolution: {integrity: sha1-nm+auwZCTjFApgrJlhOXhvXZm+A=}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1':
-    resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
+    resolution: {integrity: sha1-sRFBfxfJ0bAu++yOCDmPDFUnu0Q=}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1':
-    resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
+    resolution: {integrity: sha1-kv+/AnSK8+mYc5RcmoperQHVCKk=}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-musl@1.11.1':
-    resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
+    resolution: {integrity: sha1-C+xvElj8OQ5rMF6f9EJWyyB94WU=}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-linux-s390x-gnu@1.11.1':
-    resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
+    resolution: {integrity: sha1-V3hDoITFlS9ZBncGM8z7idrJvJQ=}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-gnu@1.11.1':
-    resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
+    resolution: {integrity: sha1-NvsxjuvdaQ9toyrF4EmadvqIGTU=}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-musl@1.11.1':
-    resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
+    resolution: {integrity: sha1-v7mvdfeD+Y9qIsQkQhTv5N8YU9Y=}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-wasm32-wasi@1.11.1':
-    resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}
+    resolution: {integrity: sha1-dSw1ndh1aEsnQpUA2IIm18xy9x0=}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
   '@unrs/resolver-binding-win32-arm64-msvc@1.11.1':
-    resolution: {integrity: sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==}
+    resolution: {integrity: sha1-zlc15gDkwvu0Cc0FGzt9pKOZrzU=}
     cpu: [arm64]
     os: [win32]
 
   '@unrs/resolver-binding-win32-ia32-msvc@1.11.1':
-    resolution: {integrity: sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==}
+    resolution: {integrity: sha1-cvxXvHxk7Fw94NZO4NGBAxe8YKY=}
     cpu: [ia32]
     os: [win32]
 
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
-    resolution: {integrity: sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==}
+    resolution: {integrity: sha1-U4seEDv42YZOe4XMlvqNb7bEB3c=}
     cpu: [x64]
     os: [win32]
 
@@ -20877,7 +21040,7 @@ packages:
     engines: {node: '>=0.8.0'}
 
   arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+    resolution: {integrity: sha1-Jp/HrVuOQstjyJbVZmAXJhwUQIk=}
 
   arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
@@ -21031,7 +21194,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
   babel-plugin-macros@3.1.0:
-    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    resolution: {integrity: sha1-nvbcdN65NLTbNE3Jc+6FHRSMUME=}
     engines: {node: '>=10', npm: '>=6'}
 
   babel-preset-current-node-syntax@1.1.0:
@@ -21062,7 +21225,7 @@ packages:
     resolution: {integrity: sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==}
 
   bare-fs@4.1.4:
-    resolution: {integrity: sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==}
+    resolution: {integrity: sha1-Pdhjkl8phD5kqQMIOcnLMVVxTUA=}
     engines: {bare: '>=1.16.0'}
     peerDependencies:
       bare-buffer: '*'
@@ -21075,7 +21238,7 @@ packages:
     engines: {bare: '>=1.14.0'}
 
   bare-path@3.0.0:
-    resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==}
+    resolution: {integrity: sha1-tZ0YEwulKmr5J22z6WouPT6lIXg=}
 
   bare-stream@2.6.5:
     resolution: {integrity: sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==}
@@ -21640,7 +21803,7 @@ packages:
     engines: {node: '>= 12'}
 
   commander@9.5.0:
-    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    resolution: {integrity: sha1-vAjR61zt98y3l6lhmdQce8PmDTA=}
     engines: {node: ^12.20.0 || >=14}
 
   comment-parser@1.4.1:
@@ -21753,7 +21916,7 @@ packages:
     engines: {node: '>= 0.10'}
 
   cosmiconfig@7.1.0:
-    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    resolution: {integrity: sha1-FEO5r6WWtnAILqRsvY9qYrhGNfY=}
     engines: {node: '>=10'}
 
   cosmiconfig@8.3.6:
@@ -21794,7 +21957,7 @@ packages:
     hasBin: true
 
   create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+    resolution: {integrity: sha1-wdfo8eX2z8n/ZfnNNS03NIdWwzM=}
 
   crelt@1.0.6:
     resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
@@ -21959,7 +22122,7 @@ packages:
     resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
 
   debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    resolution: {integrity: sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -21967,7 +22130,7 @@ packages:
         optional: true
 
   debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    resolution: {integrity: sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o=}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -22172,7 +22335,7 @@ packages:
     resolution: {integrity: sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==}
 
   diff@4.0.4:
-    resolution: {integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==}
+    resolution: {integrity: sha1-em2/2jJfJfB1F+m1GPiXwIMy4H0=}
     engines: {node: '>=0.3.1'}
 
   diff@5.2.2:
@@ -22333,7 +22496,7 @@ packages:
     engines: {node: '>=14'}
 
   empty-npm-package@1.0.0:
-    resolution: {integrity: sha512-q4Mq/+XO7UNDdMiPpR/LIBIW1Zl4V0Z6UT9aKGqIAnBCtCb3lvZJM1KbDbdzdC8fKflwflModfjR29Nt0EpcwA==}
+    resolution: {integrity: sha1-/aKett5e+jkfc9V4aXhTr1X2eTo=}
 
   enabled@2.0.0:
     resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==}
@@ -22347,7 +22510,7 @@ packages:
     engines: {node: '>= 0.8'}
 
   encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
+    resolution: {integrity: sha1-VldK/deR9UqOmyeFwFgqLSYhD6k=}
 
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
@@ -22404,7 +22567,7 @@ packages:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
 
   errno@0.1.8:
-    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
+    resolution: {integrity: sha1-i7Ppx9Rjvkl2/4iPdrSAnrwugR8=}
     hasBin: true
 
   error-ex@1.3.2:
@@ -22444,6 +22607,11 @@ packages:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
+  esbuild@0.27.7:
+    resolution: {integrity: sha1-vK3OIrLz/XbyV+OmT4OmSYb+oR8=}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -23023,12 +23191,12 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
   fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    resolution: {integrity: sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    resolution: {integrity: sha1-ysZAd4XQNnWipeGlMFxpezR9kNY=}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
@@ -23104,7 +23272,7 @@ packages:
     engines: {node: '>= 0.4'}
 
   get-tsconfig@4.13.7:
-    resolution: {integrity: sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==}
+    resolution: {integrity: sha1-udixmbBgM87uoak99+pXZUFQibw=}
 
   get-uri@6.0.4:
     resolution: {integrity: sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==}
@@ -23240,7 +23408,7 @@ packages:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
   graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+    resolution: {integrity: sha1-QYPk6L8Iu24Fu7L30uDI9xLKQOM=}
 
   gray-matter@4.0.3:
     resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
@@ -23506,7 +23674,7 @@ packages:
     engines: {node: '>= 4'}
 
   image-size@0.5.5:
-    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
+    resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=}
     engines: {node: '>=0.10.0'}
     hasBin: true
 
@@ -24194,7 +24362,7 @@ packages:
     hasBin: true
 
   json-alexander@0.1.13:
-    resolution: {integrity: sha512-s84SuqZwnb7mGJB03sGlcdx458FR91Uwwy2lKJBDN+TBJ7ARbyP/ssGnjW9t5QyxwG/b23W22Dz9Ga6nuyHqnA==}
+    resolution: {integrity: sha1-eTDrd1Y8JjZBZ33EyXlyTORis/Y=}
 
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
@@ -24612,7 +24780,7 @@ packages:
     resolution: {integrity: sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==}
 
   make-dir@2.1.0:
-    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
+    resolution: {integrity: sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=}
     engines: {node: '>=6'}
 
   make-dir@4.0.0:
@@ -24620,7 +24788,7 @@ packages:
     engines: {node: '>=10'}
 
   make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+    resolution: {integrity: sha1-LrLjfqm2fEiR9oShOUeZr0hM96I=}
 
   make-fetch-happen@10.2.1:
     resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==}
@@ -24642,7 +24810,7 @@ packages:
       markdown-magic: '>=0.1 <=2.x'
 
   markdown-magic@2.6.1:
-    resolution: {integrity: sha512-i+wPC9bAGzFVftF1P5ItooOCvX+TTD3v504WpupsJz+3B0wRZMuPxeFAE7uZXEZYjsiQYskoMgpypoJTWerpVA==}
+    resolution: {integrity: sha1-/BvNwjd1TKuuTQT3VJTP47aPKr0=}
     hasBin: true
 
   markdown-table@2.0.0:
@@ -24908,7 +25076,7 @@ packages:
     engines: {node: '>= 0.6'}
 
   mime@1.6.0:
-    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+    resolution: {integrity: sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=}
     engines: {node: '>=4'}
     hasBin: true
 
@@ -25084,7 +25252,7 @@ packages:
     hasBin: true
 
   msgpackr-extract@3.0.3:
-    resolution: {integrity: sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==}
+    resolution: {integrity: sha1-6dhwI945znFIcvnpUE48GZbWEBI=}
     hasBin: true
 
   msgpackr@1.11.2:
@@ -25141,7 +25309,7 @@ packages:
     hasBin: true
 
   native-request@1.1.2:
-    resolution: {integrity: sha512-/etjwrK0J4Ebbcnt35VMWnfiUX/B04uwGJxyJInagxDqf2z5drSt/lsOvEMWGYunz1kaLZAFrV4NDAbOoDKvAQ==}
+    resolution: {integrity: sha1-tneVJ1dCnbbNQZcqKcO3gZd0E+0=}
 
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
@@ -25785,7 +25953,7 @@ packages:
     resolution: {integrity: sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA==}
 
   pm2-sysmonit@1.2.8:
-    resolution: {integrity: sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==}
+    resolution: {integrity: sha1-7d6jSlP9jI18PvtzuXo8VIaG4k0=}
 
   pm2@5.4.3:
     resolution: {integrity: sha512-4/I1htIHzZk1Y67UgOCo4F1cJtas1kSds31N8zN0PybO230id1nigyjGuGFzUnGmUFPmrJ0On22fO1ChFlp7VQ==}
@@ -26424,7 +26592,7 @@ packages:
     engines: {node: '>=8'}
 
   resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+    resolution: {integrity: sha1-YWs9wsVwVrVYjDHN9LPWTbEzcg8=}
 
   resolve.exports@2.0.3:
     resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==}
@@ -26886,7 +27054,7 @@ packages:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
   source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    resolution: {integrity: sha1-dHIq8y6WFOnCh6jQu95IteLxomM=}
     engines: {node: '>=0.10.0'}
 
   source-map@0.7.4:
@@ -27150,42 +27318,42 @@ packages:
     resolution: {integrity: sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==}
 
   syncpack-darwin-arm64@14.0.2:
-    resolution: {integrity: sha512-qVTB7VQHpXfKMOyPzRoX+gsh+2rPw9631kbt/DfTthyfOrXUbp0QOZF0F0XtSYCYcG7IQehhMER3MLLvCwRTlA==}
+    resolution: {integrity: sha1-rZzikxHvCNGvr8hSxnshFkb/d3M=}
     cpu: [arm64]
     os: [darwin]
 
   syncpack-darwin-x64@14.0.2:
-    resolution: {integrity: sha512-KtB44JzPafpjEyA58GhoY+0jdfHuEEMsny0/T9tqkmgJBjgygssSsdN5quBrVB7QOQcJoRJoM+TsEQx3o63lww==}
+    resolution: {integrity: sha1-EORsyOnIFR7i/HxLqvvPU6ZCcyM=}
     cpu: [x64]
     os: [darwin]
 
   syncpack-linux-arm64-musl@14.0.2:
-    resolution: {integrity: sha512-kyO9jjIfFpVsETcHzzG+TzNE82TNqE4Pz8ZMKMc/cLnk7XcN9LbvrdqRjxmGoW5ZSJGTOjQtZsp6owtM9ODrfA==}
+    resolution: {integrity: sha1-emyVcOgL3qLezIytuXGHrBh8uaU=}
     cpu: [arm64]
     os: [linux]
 
   syncpack-linux-arm64@14.0.2:
-    resolution: {integrity: sha512-7erMuE/dm2yvdZ1Kr5aq81g3dE9ap7AG+EehonI9Det23gxlr7tXRpBbl3EYzAQr97ifrLGJpnQ6jtRQRAneTA==}
+    resolution: {integrity: sha1-/JQKQi1MBYavNbw/CfNxWj84QYk=}
     cpu: [arm64]
     os: [linux]
 
   syncpack-linux-x64-musl@14.0.2:
-    resolution: {integrity: sha512-kXlsvH4V7sBR8vWku+lnrdh+xQCmlRedk1RQDH/c+MpZ/PJy0UCIEovlrSgXcUFG0IVVrXbDGAxWJM4RB5oWeA==}
+    resolution: {integrity: sha1-RfpZQ6rkWT8Oo8sz2RYD3pBszko=}
     cpu: [x64]
     os: [linux]
 
   syncpack-linux-x64@14.0.2:
-    resolution: {integrity: sha512-FGO9AsGakTPhfX+DW1Jmy2oaVeXhD7o1A+MmIMhcn9ArJThbBDmgkcTkU5Ek0E0tty4ZaNJgh1uhwwliPDHCeA==}
+    resolution: {integrity: sha1-qq87W4neLX7AJyy/ys3A4elWF8w=}
     cpu: [x64]
     os: [linux]
 
   syncpack-windows-arm64@14.0.2:
-    resolution: {integrity: sha512-Vmh6hmPXL2/DtppVYS1/zkr/RKKiJql6LqklqdPovB8F1TiTxulfv6RaGxR2d0r7Y9vDpoOSXxnONT4BoyCyUA==}
+    resolution: {integrity: sha1-32sBZqje+/D7bOmu4Pu1BrwzwxI=}
     cpu: [arm64]
     os: [win32]
 
   syncpack-windows-x64@14.0.2:
-    resolution: {integrity: sha512-lndo5gWCmsoYVxgOdQ1R4rFeiJWN4N4YLWqdWrun5V+LTuh6C7SyajJSlCxpLeRm2GDdZ+7oAjbJUDDHwF+IZA==}
+    resolution: {integrity: sha1-gSt6RI7SmDpchOziqMGgYrsJrD0=}
     cpu: [x64]
     os: [win32]
 
@@ -27452,7 +27620,7 @@ packages:
     resolution: {integrity: sha512-M9MqFGZREyeb5fTl6gNHKZLqBQA0TjA1lea+CR48R8EBTDuWrNqW6ccC5QvjNR4s6wDumD3LTCjOFSp9iwlzaw==}
 
   ts-node@10.9.2:
-    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    resolution: {integrity: sha1-cPAhyeGFvM3Kgg4m3EE4BcEBxx8=}
     hasBin: true
     peerDependencies:
       '@swc/core': '>=1.2.50'
@@ -27485,6 +27653,11 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
+  tsx@4.21.0:
+    resolution: {integrity: sha1-Mqps8XSB4zb3Vhleb+BNrj5jCLE=}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
   tuf-js@1.1.7:
     resolution: {integrity: sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -27647,7 +27820,7 @@ packages:
     resolution: {integrity: sha512-Oy/k+tFle5NAA3J/yrrYGfvEnPVrDZ8s8/WCwjUE75k331QyKIsFss7byQ/PzBmXLY6h1moRnZbnaxWBe3I3CA==}
 
   uglify-js@3.19.3:
-    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
+    resolution: {integrity: sha1-gjFem7xvKyWIiFis0f/4RBA1t38=}
     engines: {node: '>=0.8.0'}
     hasBin: true
 
@@ -27856,7 +28029,7 @@ packages:
     hasBin: true
 
   v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+    resolution: {integrity: sha1-Yzbo1xllyz01obu3hoRFp8BSZL8=}
 
   v8-to-istanbul@9.3.0:
     resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
@@ -27939,7 +28112,7 @@ packages:
     resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
 
   wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+    resolution: {integrity: sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=}
 
   web-streams-polyfill@4.0.0-beta.3:
     resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
@@ -28253,7 +28426,7 @@ packages:
     engines: {node: '>=18'}
 
   yaml@1.10.3:
-    resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==}
+    resolution: {integrity: sha1-duQH7ZXEJoT7jhRkHl3mL+ZbvLM=}
     engines: {node: '>= 6'}
 
   yaml@2.8.3:
@@ -28285,7 +28458,7 @@ packages:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
   yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    resolution: {integrity: sha1-HodAGgnXZ8HV6rJqbkwYUYLS61A=}
     engines: {node: '>=6'}
 
   yocto-queue@0.1.0:
@@ -28952,6 +29125,84 @@ snapshots:
 
   '@es-joy/resolve.exports@1.2.0': {}
 
+  '@esbuild/aix-ppc64@0.27.7':
+    optional: true
+
+  '@esbuild/android-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/android-arm@0.27.7':
+    optional: true
+
+  '@esbuild/android-x64@0.27.7':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/darwin-x64@0.27.7':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.27.7':
+    optional: true
+
+  '@esbuild/linux-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/linux-arm@0.27.7':
+    optional: true
+
+  '@esbuild/linux-ia32@0.27.7':
+    optional: true
+
+  '@esbuild/linux-loong64@0.27.7':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.27.7':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.27.7':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.27.7':
+    optional: true
+
+  '@esbuild/linux-s390x@0.27.7':
+    optional: true
+
+  '@esbuild/linux-x64@0.27.7':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.27.7':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.27.7':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/sunos-x64@0.27.7':
+    optional: true
+
+  '@esbuild/win32-arm64@0.27.7':
+    optional: true
+
+  '@esbuild/win32-ia32@0.27.7':
+    optional: true
+
+  '@esbuild/win32-x64@0.27.7':
+    optional: true
+
   '@eslint-community/eslint-plugin-eslint-comments@4.5.0(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       escape-string-regexp: 4.0.0
@@ -30245,6 +30496,17 @@ snapshots:
       - supports-color
       - typescript
 
+  '@fluid-internal/eslint-plugin-fluid@0.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@microsoft/tsdoc': 0.15.1
+      '@typescript-eslint/parser': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+      ts-morph: 22.0.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@fluid-internal/test-driver-definitions@2.92.0':
     dependencies:
       '@fluidframework/core-interfaces': 2.92.0
@@ -30260,6 +30522,82 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@fluid-tools/build-cli@0.64.0(@types/node@22.19.17)(encoding@0.1.13)':
+    dependencies:
+      '@andrewbranch/untar.js': 1.0.3
+      '@fluid-tools/build-infrastructure': 0.64.0(@types/node@22.19.17)
+      '@fluid-tools/version-tools': 0.64.0(@types/node@22.19.17)
+      '@fluidframework/build-tools': 0.64.0(@types/node@22.19.17)
+      '@fluidframework/bundle-size-tools': 0.64.0(webpack-cli@5.1.4)
+      '@inquirer/prompts': 8.0.2(@types/node@22.19.17)
+      '@microsoft/api-extractor': 7.58.1(patch_hash=949a26f6cec9ac4e37522f178b8e4982136ccfeb8c6d0835130ef2aa6788f4fa)(@types/node@22.19.17)
+      '@oclif/core': 4.8.0
+      '@oclif/plugin-autocomplete': 3.2.39
+      '@oclif/plugin-commands': 4.1.38
+      '@oclif/plugin-help': 6.2.36
+      '@oclif/plugin-not-found': 3.2.73(@types/node@22.19.17)
+      '@octokit/core': 7.0.6
+      '@octokit/rest': 22.0.1
+      '@rushstack/node-core-library': 5.21.0(@types/node@22.19.17)
+      async: 3.2.6
+      azure-devops-node-api: 11.2.0
+      change-case: 5.4.4
+      danger: 13.0.5(encoding@0.1.13)
+      date-fns: 3.6.0
+      debug: 4.4.3(supports-color@8.1.1)
+      execa: 5.1.1
+      fflate: 0.8.2
+      fs-extra: 11.3.2
+      github-slugger: 2.0.0
+      globby: 11.1.0
+      gray-matter: 4.0.3
+      human-id: 4.1.3
+      issue-parser: 7.0.1
+      json5: 2.2.3
+      jssm: 5.104.2
+      jszip: 3.10.1
+      latest-version: 9.0.0
+      lilconfig: 3.1.3
+      mdast: 3.0.0
+      mdast-util-heading-range: 4.0.0
+      mdast-util-to-string: 4.0.0
+      minimatch: 10.2.4
+      npm-check-updates: 16.14.20
+      oclif: 4.22.52(@types/node@22.19.17)
+      picocolors: 1.1.1
+      prettier: 3.2.5
+      prompts: 2.4.2
+      read-pkg-up: 7.0.1
+      remark: 15.0.1
+      remark-gfm: 4.0.1
+      remark-github: 12.0.0
+      remark-github-beta-blockquote-admonitions: 3.1.1
+      remark-toc: 9.0.0
+      replace-in-file: 7.2.0
+      resolve.exports: 2.0.3
+      semver: 7.7.3
+      simple-git: 3.32.3
+      sort-json: 2.0.1
+      sort-package-json: 1.57.0
+      strip-ansi: 7.1.2
+      table: 6.9.0
+      ts-morph: 22.0.0
+      unist-util-visit: 5.0.0
+      xml2js: 0.6.2
+      yaml: 2.8.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - '@types/node'
+      - bluebird
+      - bufferutil
+      - encoding
+      - esbuild
+      - react-devtools-core
+      - supports-color
+      - uglify-js
+      - utf-8-validate
+      - webpack-cli
+
   '@fluid-tools/build-cli@0.64.0(@types/node@22.19.17)(encoding@0.1.13)(webpack-cli@5.1.4)':
     dependencies:
       '@andrewbranch/untar.js': 1.0.3
@@ -30937,6 +31275,37 @@ snapshots:
       - supports-color
       - typescript
 
+  '@fluidframework/eslint-config-fluid@9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-plugin-eslint-comments': 4.5.0(eslint@9.39.1(jiti@2.6.1))
+      '@eslint/eslintrc': 3.3.3
+      '@eslint/js': 9.39.4
+      '@fluid-internal/eslint-plugin-fluid': 0.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@rushstack/eslint-plugin': 0.22.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      eslint-config-biome: 2.1.3
+      eslint-config-prettier: 10.1.8(eslint@9.39.1(jiti@2.6.1))
+      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-depend: 1.4.0
+      eslint-plugin-import-x: 4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-jsdoc: 61.4.2(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-promise: 7.2.1(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-react: 7.37.5(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-react-hooks: 7.0.1(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-tsdoc: 0.5.2(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      eslint-plugin-unicorn: 54.0.0(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-unused-imports: 4.3.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+      globals: 14.0.0
+      typescript-eslint: 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+    transitivePeerDependencies:
+      - '@typescript-eslint/utils'
+      - eslint
+      - eslint-import-resolver-node
+      - eslint-plugin-import
+      - supports-color
+      - typescript
+
   '@fluidframework/file-driver@2.92.0':
     dependencies:
       '@fluid-internal/client-utils': 2.92.0
@@ -32606,6 +32975,8 @@ snapshots:
       js-base64: 3.7.7
       msgpack-lite: 0.1.26
 
+  '@msgpack/msgpack@2.8.0': {}
+
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
     optional: true
 
@@ -33052,6 +33423,15 @@ snapshots:
       - supports-color
       - typescript
 
+  '@rushstack/eslint-plugin@0.22.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@rushstack/tree-pattern': 0.3.4
+      '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@rushstack/node-core-library@3.66.1(@types/node@22.19.17)':
     dependencies:
       colors: 1.2.5
@@ -33773,6 +34153,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.54.0
+      '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.54.0
+      eslint: 9.39.1(jiti@2.6.1)
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.46.4
@@ -33785,6 +34181,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.46.4
+      '@typescript-eslint/types': 8.46.4
+      '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.46.4
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.54.0
@@ -33797,6 +34205,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.54.0
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.54.0
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/project-service@8.46.4(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33806,6 +34226,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.46.4(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.58.0
+      debug: 4.4.3(supports-color@8.1.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/project-service@8.54.0(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33815,6 +34244,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.54.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.58.0
+      debug: 4.4.3(supports-color@8.1.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/project-service@8.56.1(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33824,6 +34262,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.56.1(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.58.0
+      debug: 4.4.3(supports-color@8.1.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.46.4':
     dependencies:
       '@typescript-eslint/types': 8.46.4
@@ -33843,14 +34290,26 @@ snapshots:
     dependencies:
       typescript: 5.4.5
 
+  '@typescript-eslint/tsconfig-utils@8.46.4(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
   '@typescript-eslint/tsconfig-utils@8.54.0(typescript@5.4.5)':
     dependencies:
       typescript: 5.4.5
 
+  '@typescript-eslint/tsconfig-utils@8.54.0(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
   '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.4.5)':
     dependencies:
       typescript: 5.4.5
 
+  '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
   '@typescript-eslint/type-utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -33863,6 +34322,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/type-utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 9.39.1(jiti@2.6.1)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/types@8.46.4': {}
 
   '@typescript-eslint/types@8.54.0': {}
@@ -33887,6 +34358,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.46.4(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.46.4(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.4
+      '@typescript-eslint/visitor-keys': 8.46.4
+      debug: 4.4.3(supports-color@8.1.1)
+      fast-glob: 3.3.3
+      is-glob: 4.0.3
+      minimatch: 9.0.9
+      semver: 7.7.3
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/typescript-estree@8.54.0(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/project-service': 8.54.0(typescript@5.4.5)
@@ -33902,6 +34389,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.54.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/visitor-keys': 8.54.0
+      debug: 4.4.3(supports-color@8.1.1)
+      minimatch: 9.0.9
+      semver: 7.7.3
+      tinyglobby: 0.2.15
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/typescript-estree@8.56.1(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/project-service': 8.56.1(typescript@5.4.5)
@@ -33917,6 +34419,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.56.1(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/visitor-keys': 8.56.1
+      debug: 4.4.3(supports-color@8.1.1)
+      minimatch: 10.2.4
+      semver: 7.7.3
+      tinyglobby: 0.2.15
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -33928,6 +34445,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.46.4
+      '@typescript-eslint/types': 8.46.4
+      '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -33939,6 +34467,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.54.0
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -33950,6 +34489,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.56.1
+      '@typescript-eslint/types': 8.56.1
+      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/visitor-keys@8.46.4':
     dependencies:
       '@typescript-eslint/types': 8.46.4
@@ -34082,7 +34632,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0(debug@4.4.3)
+      axios: 1.15.0
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -34168,12 +34718,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -34520,6 +35070,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.15.0:
+    dependencies:
+      follow-redirects: 1.15.11
+      form-data: 4.0.5
+      proxy-from-env: 2.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@1.15.0(debug@4.3.7):
     dependencies:
       follow-redirects: 1.15.11(debug@4.3.7)
@@ -36116,6 +36674,35 @@ snapshots:
       is-date-object: 1.1.0
       is-symbol: 1.1.1
 
+  esbuild@0.27.7:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.27.7
+      '@esbuild/android-arm': 0.27.7
+      '@esbuild/android-arm64': 0.27.7
+      '@esbuild/android-x64': 0.27.7
+      '@esbuild/darwin-arm64': 0.27.7
+      '@esbuild/darwin-x64': 0.27.7
+      '@esbuild/freebsd-arm64': 0.27.7
+      '@esbuild/freebsd-x64': 0.27.7
+      '@esbuild/linux-arm': 0.27.7
+      '@esbuild/linux-arm64': 0.27.7
+      '@esbuild/linux-ia32': 0.27.7
+      '@esbuild/linux-loong64': 0.27.7
+      '@esbuild/linux-mips64el': 0.27.7
+      '@esbuild/linux-ppc64': 0.27.7
+      '@esbuild/linux-riscv64': 0.27.7
+      '@esbuild/linux-s390x': 0.27.7
+      '@esbuild/linux-x64': 0.27.7
+      '@esbuild/netbsd-arm64': 0.27.7
+      '@esbuild/netbsd-x64': 0.27.7
+      '@esbuild/openbsd-arm64': 0.27.7
+      '@esbuild/openbsd-x64': 0.27.7
+      '@esbuild/openharmony-arm64': 0.27.7
+      '@esbuild/sunos-x64': 0.27.7
+      '@esbuild/win32-arm64': 0.27.7
+      '@esbuild/win32-ia32': 0.27.7
+      '@esbuild/win32-x64': 0.27.7
+
   escalade@3.2.0: {}
 
   escape-goat@4.0.0: {}
@@ -36166,6 +36753,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1)):
+    dependencies:
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 9.39.1(jiti@2.6.1)
+      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
+      get-tsconfig: 4.13.7
+      is-bun-module: 2.0.0
+      stable-hash-x: 0.2.0
+      tinyglobby: 0.2.15
+      unrs-resolver: 1.11.1
+    optionalDependencies:
+      eslint-plugin-import-x: 4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-chai-expect@3.1.0(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
@@ -36194,6 +36796,24 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
+    dependencies:
+      '@package-json/types': 0.0.12
+      '@typescript-eslint/types': 8.58.0
+      comment-parser: 1.4.6
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 9.39.1(jiti@2.6.1)
+      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
+      is-glob: 4.0.3
+      minimatch: 9.0.9
+      semver: 7.7.3
+      stable-hash-x: 0.2.0
+      unrs-resolver: 1.11.1
+    optionalDependencies:
+      '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
     dependencies:
       '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
@@ -36273,6 +36893,16 @@ snapshots:
       - supports-color
       - typescript
 
+  eslint-plugin-tsdoc@0.5.2(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3):
+    dependencies:
+      '@microsoft/tsdoc': 0.16.0
+      '@microsoft/tsdoc-config': 0.18.1
+      '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+    transitivePeerDependencies:
+      - eslint
+      - supports-color
+      - typescript
+
   eslint-plugin-unicorn@54.0.0(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       '@babel/helper-validator-identifier': 7.27.1
@@ -36301,6 +36931,12 @@ snapshots:
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
 
+  eslint-plugin-unused-imports@4.3.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
+    dependencies:
+      eslint: 9.39.1(jiti@2.6.1)
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+
   eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
@@ -36707,6 +37343,8 @@ snapshots:
 
   fn.name@1.1.0: {}
 
+  follow-redirects@1.15.11: {}
+
   follow-redirects@1.15.11(debug@4.3.7):
     optionalDependencies:
       debug: 4.3.7
@@ -42384,6 +43022,10 @@ snapshots:
     dependencies:
       typescript: 5.4.5
 
+  ts-api-utils@2.4.0(typescript@5.9.3):
+    dependencies:
+      typescript: 5.9.3
+
   ts-deepmerge@7.0.3: {}
 
   ts-interface-checker@0.1.13: {}
@@ -42466,6 +43108,13 @@ snapshots:
 
   tslib@2.8.1: {}
 
+  tsx@4.21.0:
+    dependencies:
+      esbuild: 0.27.7
+      get-tsconfig: 4.13.7
+    optionalDependencies:
+      fsevents: 2.3.3
+
   tuf-js@1.1.7:
     dependencies:
       '@tufjs/models': 1.0.4
@@ -42583,6 +43232,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  typescript-eslint@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3):
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.1(jiti@2.6.1)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   typescript@4.9.5: {}
 
   typescript@5.4.5: {}
@@ -43212,7 +43872,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 21ee09b1a30a..13ce928239a8 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -27,7 +27,9 @@ minimumReleaseAgeExclude: [
 ]
 resolutionMode: highest
 blockExoticSubdeps: true
-trustPolicy: no-downgrade
+# TODO: Do not check this in. Re-enable `trustPolicy: no-downgrade` after the temporary install unblock is no longer needed.
+# Revert any pnpm-lock.yaml changes and run install again to add new dependencies.
+trustPolicy: off
 trustPolicyExclude:
   # axios@0.30.3 is the last legitimate 0.30.x release (published 2026-02-18). The trust
   # downgrade fires because 0.30.x was published via direct CLI rather than the OIDC/GitHub

From b97f1c9d9b63dbd1d6556e964117400c174969b9 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 16:53:28 -0700
Subject: [PATCH 02/67] Fixed dependencies6866431.

---
 pnpm-lock.yaml      | 373 +++++++++++++++++---------------------------
 pnpm-workspace.yaml |   4 +-
 2 files changed, 146 insertions(+), 231 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 80d2bd48802b..e2cd7603dc14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,6 +25,9 @@ catalogs:
     eslint:
       specifier: ~9.39.1
       version: 9.39.1
+    eslint-config-prettier:
+      specifier: ~10.1.8
+      version: 10.1.8
 
 overrides:
   '@biomejs/biome': ~2.4.5
@@ -81,7 +84,7 @@ importers:
         version: link:packages/tools/changelog-generator-wrapper
       '@fluid-tools/build-cli':
         specifier: catalog:buildTools
-        version: 0.64.0(@types/node@22.19.17)(encoding@0.1.13)
+        version: 0.64.0(@types/node@22.19.17)(encoding@0.1.13)(webpack-cli@5.1.4)
       '@fluid-tools/markdown-magic':
         specifier: workspace:~
         version: link:tools/markdown-magic
@@ -17599,53 +17602,53 @@ packages:
     hasBin: true
 
   '@biomejs/cli-darwin-arm64@2.4.5':
-    resolution: {integrity: sha1-piRyqzUpo5BbFuHz/bvHTy5fACM=}
+    resolution: {integrity: sha512-lGS4Nd5O3KQJ6TeWv10mElnx1phERhBxqGP/IKq0SvZl78kcWDFMaTtVK+w3v3lusRFxJY78n07PbKplirsU5g==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
   '@biomejs/cli-darwin-x64@2.4.5':
-    resolution: {integrity: sha1-6LsAH89qjHUbCXHMz1OZPpui5uk=}
+    resolution: {integrity: sha512-6MoH4tyISIBNkZ2Q5T1R7dLd5BsITb2yhhhrU9jHZxnNSNMWl+s2Mxu7NBF8Y3a7JJcqq9nsk8i637z4gqkJxQ==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
   '@biomejs/cli-linux-arm64-musl@2.4.5':
-    resolution: {integrity: sha1-t+95AiN/FhEwYWWaTFSv9a1FE9U=}
+    resolution: {integrity: sha512-iqLDgpzobG7gpBF0fwEVS/LT8kmN7+S0E2YKFDtqliJfzNLnAiV2Nnyb+ehCDCJgAZBASkYHR2o60VQWikpqIg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@biomejs/cli-linux-arm64@2.4.5':
-    resolution: {integrity: sha1-8RCvdIllyxtXYk27vXrLpynah4A=}
+    resolution: {integrity: sha512-U1GAG6FTjhAO04MyH4xn23wRNBkT6H7NentHh+8UxD6ShXKBm5SY4RedKJzkUThANxb9rUKIPc7B8ew9Xo/cWg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@biomejs/cli-linux-x64-musl@2.4.5':
-    resolution: {integrity: sha1-w0k+uglCFuc1U4xVNU28iGe1GQk=}
+    resolution: {integrity: sha512-NlKa7GpbQmNhZf9kakQeddqZyT7itN7jjWdakELeXyTU3pg/83fTysRRDPJD0akTfKDl6vZYNT9Zqn4MYZVBOA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@biomejs/cli-linux-x64@2.4.5':
-    resolution: {integrity: sha1-FYBVUNtORf+9bELRQNDLXG2+B68=}
+    resolution: {integrity: sha512-NdODlSugMzTlENPTa4z0xB82dTUlCpsrOxc43///aNkTLblIYH4XpYflBbf5ySlQuP8AA4AZd1qXhV07IdrHdQ==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@biomejs/cli-win32-arm64@2.4.5':
-    resolution: {integrity: sha1-ja5X3I/8HoLgClnmI7UCPAlyak0=}
+    resolution: {integrity: sha512-EBfrTqRIWOFSd7CQb/0ttjHMR88zm3hGravnDwUA9wHAaCAYsULKDebWcN5RmrEo1KBtl/gDVJMrFjNR0pdGUw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
   '@biomejs/cli-win32-x64@2.4.5':
-    resolution: {integrity: sha1-C00zVeDWhWz/jtci4F7HsGUuQ6s=}
+    resolution: {integrity: sha512-Pmhv9zT95YzECfjEHNl3mN9Vhusw9VA5KHY0ZvlGsxsjwS5cb7vpRnHzJIv0vG7jB0JI7xEaMH9ddfZm/RozBw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -17718,7 +17721,7 @@ packages:
     resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==}
 
   '@colors/colors@1.5.0':
-    resolution: {integrity: sha1-u1BFecHK6SPmV2pPXaQ9Jfl729k=}
+    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
   '@colors/colors@1.6.0':
@@ -17726,7 +17729,7 @@ packages:
     engines: {node: '>=0.1.90'}
 
   '@cspotcode/source-map-support@0.8.1':
-    resolution: {integrity: sha1-AGKcNaaI4FqIsc2mhPudXnPwAKE=}
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
 
   '@csstools/color-helpers@5.1.0':
@@ -17765,13 +17768,13 @@ packages:
     engines: {node: '>=10.0.0'}
 
   '@emnapi/core@1.9.1':
-    resolution: {integrity: sha1-IUMGnHRMokQgdPgHhGLlHt1jx70=}
+    resolution: {integrity: sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==}
 
   '@emnapi/runtime@1.9.1':
-    resolution: {integrity: sha1-EV/yoNWJhlvmvY6dcB5JnEc/Ko0=}
+    resolution: {integrity: sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==}
 
   '@emnapi/wasi-threads@1.2.0':
-    resolution: {integrity: sha1-oZ2Xcsw9GVNwv24qgF7sQKp14Y4=}
+    resolution: {integrity: sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==}
 
   '@emotion/hash@0.9.2':
     resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
@@ -17797,157 +17800,157 @@ packages:
     engines: {node: '>=10'}
 
   '@esbuild/aix-ppc64@0.27.7':
-    resolution: {integrity: sha1-grdPkqp41yC3FBYpOfskjJCt31M=}
+    resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
   '@esbuild/android-arm64@0.27.7':
-    resolution: {integrity: sha1-94y4oxIfwgWlMoWtskly2zhdGF0=}
+    resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
   '@esbuild/android-arm@0.27.7':
-    resolution: {integrity: sha1-WT4QoUULv8rGyzIfYfRoRTusIJ0=}
+    resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
   '@esbuild/android-x64@0.27.7':
-    resolution: {integrity: sha1-RTFD0HMyYDPS0iyvnkjeS64nSwc=}
+    resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
   '@esbuild/darwin-arm64@0.27.7':
-    resolution: {integrity: sha1-byMAD7m0C34Et9BgbAaTvQYy8yI=}
+    resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
   '@esbuild/darwin-x64@0.27.7':
-    resolution: {integrity: sha1-Jzk90YuxJjxmOXnF8VduAMLQJL4=}
+    resolution: {integrity: sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
   '@esbuild/freebsd-arm64@0.27.7':
-    resolution: {integrity: sha1-IuRjj6UC0cACcHcyTJdkDjrfOmI=}
+    resolution: {integrity: sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
   '@esbuild/freebsd-x64@0.27.7':
-    resolution: {integrity: sha1-kiS45P6pJM4hlOPvw+muv4IhktY=}
+    resolution: {integrity: sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
   '@esbuild/linux-arm64@0.27.7':
-    resolution: {integrity: sha1-T10cJ1J9gXs1aEriFBnlfCvaCWY=}
+    resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
   '@esbuild/linux-arm@0.27.7':
-    resolution: {integrity: sha1-uenQcMjBwESc8Ssg6sN9cKRZWSE=}
+    resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
   '@esbuild/linux-ia32@0.27.7':
-    resolution: {integrity: sha1-P4D7aWqpYFGpQEfzXIWwiyHDb54=}
+    resolution: {integrity: sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
   '@esbuild/linux-loong64@0.27.7':
-    resolution: {integrity: sha1-m+HywoIQsT67QVYiG7o1b+FnUgU=}
+    resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
   '@esbuild/linux-mips64el@0.27.7':
-    resolution: {integrity: sha1-SrXuZ6Pfy8tej9eIPa5uc1sRY7g=}
+    resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
   '@esbuild/linux-ppc64@0.27.7':
-    resolution: {integrity: sha1-2seMaJ9kmUWcQyHlwVAywSMH5+o=}
+    resolution: {integrity: sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
   '@esbuild/linux-riscv64@0.27.7':
-    resolution: {integrity: sha1-BQ99OzVcOpgwjpNbxNYyXakbACc=}
+    resolution: {integrity: sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
   '@esbuild/linux-s390x@0.27.7':
-    resolution: {integrity: sha1-1h9xXOYdQ/5YRK0Nj0Y/iMvk/vY=}
+    resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
   '@esbuild/linux-x64@0.27.7':
-    resolution: {integrity: sha1-yo4apHj8ggkle/Osj3nE3CmC8yo=}
+    resolution: {integrity: sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
   '@esbuild/netbsd-arm64@0.27.7':
-    resolution: {integrity: sha1-FlDywblI3us++Ujy/DBhRyPAlpA=}
+    resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
   '@esbuild/netbsd-x64@0.27.7':
-    resolution: {integrity: sha1-ZXcqs0LEszGb8HBaIRBQqsG24yA=}
+    resolution: {integrity: sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
   '@esbuild/openbsd-arm64@0.27.7':
-    resolution: {integrity: sha1-N+18+mZUnXlVhS/ON9DD3k5xXqE=}
+    resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
   '@esbuild/openbsd-x64@0.27.7':
-    resolution: {integrity: sha1-Ab89OFhV71DLM9t8S1L5V8NM0Xk=}
+    resolution: {integrity: sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
   '@esbuild/openharmony-arm64@0.27.7':
-    resolution: {integrity: sha1-bB+Us0CGWZqr2k6sj2OClLmHdBA=}
+    resolution: {integrity: sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
   '@esbuild/sunos-x64@0.27.7':
-    resolution: {integrity: sha1-Sw3ReuCmlB0tD9NakGOSUXBxqQ0=}
+    resolution: {integrity: sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
   '@esbuild/win32-arm64@0.27.7':
-    resolution: {integrity: sha1-NBk6tVZdb/aMqSisBL51ECzLLnc=}
+    resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
   '@esbuild/win32-ia32@0.27.7':
-    resolution: {integrity: sha1-62fw5EglFdjBiU7eYxwyek2p/E0=}
+    resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
   '@esbuild/win32-x64@0.27.7':
-    resolution: {integrity: sha1-j+MLMIi4m0hzw6bMh1l645IMCos=}
+    resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -19389,7 +19392,7 @@ packages:
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
   '@jridgewell/trace-mapping@0.3.9':
-    resolution: {integrity: sha1-ZTT9WTOlO6fL86F2FeJzoNEnP/k=}
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
 
   '@json2csv/formatters@7.0.6':
     resolution: {integrity: sha512-hjIk1H1TR4ydU5ntIENEPgoMGW+Q7mJ+537sDFDbsk+Y3EPl2i4NfFVjw0NJRgT+ihm8X30M67mA8AS6jPidSA==}
@@ -19522,41 +19525,41 @@ packages:
     resolution: {integrity: sha512-EJe72ByalyTcG7CDdopfGGOnyUqmj1XQD9nF4VgS+FVKAIc97YGiQ4Dlz2B3uUVxuigdGDxh3kIri5f+u5ajKg==}
 
   '@msgpack/msgpack@2.8.0':
-    resolution: {integrity: sha1-QhDet3HuORKWTxShXd+1/4d+cLk=}
+    resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
     engines: {node: '>= 10'}
 
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
-    resolution: {integrity: sha1-nt7GGyLDCCAYp59tHDAond89nRE=}
+    resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==}
     cpu: [arm64]
     os: [darwin]
 
   '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3':
-    resolution: {integrity: sha1-M2d6J1IEiYrYrL9ic0/E3AtqSFU=}
+    resolution: {integrity: sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==}
     cpu: [x64]
     os: [darwin]
 
   '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3':
-    resolution: {integrity: sha1-Ge33zcLnBj7jKEA8HYlaht0o9Ls=}
+    resolution: {integrity: sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==}
     cpu: [arm64]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3':
-    resolution: {integrity: sha1-lPsFQ7ouKHZsP8Q5yrvgRArnAVk=}
+    resolution: {integrity: sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==}
     cpu: [arm]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3':
-    resolution: {integrity: sha1-SgYJq1/kTQfJxgoR5EhNPDi71uM=}
+    resolution: {integrity: sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==}
     cpu: [x64]
     os: [linux]
 
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3':
-    resolution: {integrity: sha1-CqVQLVR7V6v8SsSS3mjiAG5BckI=}
+    resolution: {integrity: sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==}
     cpu: [x64]
     os: [win32]
 
   '@napi-rs/wasm-runtime@0.2.12':
-    resolution: {integrity: sha1-PniouW5sM6bFF+GJTvvVOFp8tvI=}
+    resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==}
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -19740,95 +19743,95 @@ packages:
     resolution: {integrity: sha512-uu43FGU34B5VM9mCNjXCwLaGHYjXdNincqKLaraaCW+7S2+SmiBg1Nv8bPnmschrIfZmfKNY9f3fC376MRrObw==}
 
   '@parcel/watcher-android-arm64@2.5.0':
-    resolution: {integrity: sha1-4y092mZHeR7pMFVq7iBvzV6g+3o=}
+    resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
 
   '@parcel/watcher-darwin-arm64@2.5.0':
-    resolution: {integrity: sha1-DZ5oC36ewcj1SUTxuUWqh1WvsS8=}
+    resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
 
   '@parcel/watcher-darwin-x64@2.5.0':
-    resolution: {integrity: sha1-+fHVzp1YeNNE8U7xhWt6gwxZ0bs=}
+    resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
 
   '@parcel/watcher-freebsd-x64@2.5.0':
-    resolution: {integrity: sha1-K3fwyC0Z6E/0wh3m2n99CWsafoI=}
+    resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
 
   '@parcel/watcher-linux-arm-glibc@2.5.0':
-    resolution: {integrity: sha1-ku0yLFbbr6PSVF3PKAMzSu4THkI=}
+    resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.0':
-    resolution: {integrity: sha1-zUjpv94M270uzZrM/FKWfiL4SaQ=}
+    resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.0':
-    resolution: {integrity: sha1-e4H21aRCu4n7q69sE1c+lKRv6wM=}
+    resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.0':
-    resolution: {integrity: sha1-3Lj/AQd831mhjZ4KTf96DP5f1zI=}
+    resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.0':
-    resolution: {integrity: sha1-LiVGAP2k4y2DlCOE0RBuHu2ESU0=}
+    resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.0':
-    resolution: {integrity: sha1-AfzqYP7bsyJa+AjT8KexEil5Lu8=}
+    resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.0':
-    resolution: {integrity: sha1-h82xbgeD53AZflL7HcAnuwyEcVQ=}
+    resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
 
   '@parcel/watcher-win32-ia32@2.5.0':
-    resolution: {integrity: sha1-d4w5tW2jPgRbohxnjDGp+dfGsiA=}
+    resolution: {integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==}
     engines: {node: '>= 10.0.0'}
     cpu: [ia32]
     os: [win32]
 
   '@parcel/watcher-win32-x64@2.5.0':
-    resolution: {integrity: sha1-M4c4dtC7xYiqzOOOkNHXSAzoHLc=}
+    resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
 
   '@parcel/watcher@2.5.0':
-    resolution: {integrity: sha1-XIiBixK43kMHqdPm3D4o66DfvRA=}
+    resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
     engines: {node: '>= 10.0.0'}
 
   '@pkgjs/parseargs@0.11.0':
-    resolution: {integrity: sha1-p36nQvqyV3UUVDTrHSMoz1ATrDM=}
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
   '@pm2/agent@2.0.4':
@@ -19843,7 +19846,7 @@ packages:
     engines: {node: '>=4.0'}
 
   '@pm2/pm2-version-check@1.0.4':
-    resolution: {integrity: sha1-z5f7sUsOypVDDKBe7cy9JoOAbkM=}
+    resolution: {integrity: sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==}
 
   '@pnpm/config.env-replace@1.1.0':
     resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
@@ -20014,7 +20017,7 @@ packages:
     resolution: {integrity: sha512-iJ5qu1EO3kZDthq9zbMQ9ufB4jd0XwhHJ+4RNpTUEVTIZFitCV++IUfH1YCACGasct41pQRxGmWQNoaRZmn7EQ==}
 
   '@technote-space/doctoc@2.4.7':
-    resolution: {integrity: sha1-NbYvS5STMxLxq6AgHVER/QmmrG0=}
+    resolution: {integrity: sha512-F4oyUpf2e29p3tNH0oTW0a3eOgd3wek2vz1urNalSKCFY8U0hzkFqwU+89rmXGLzzz8WMcLtEXb90CCgqnDQqQ==}
 
   '@technote-space/doctoc@2.6.4':
     resolution: {integrity: sha512-gm6It+7hCuVSFMl9kP9NYX5TTqc6GRcb9HXm0/YhKnou1E0pyocG+6IR/1GNOu/yCkRnD9bRlp5BYw8puvf2kA==}
@@ -20049,13 +20052,13 @@ packages:
       '@testing-library/dom': '>=7.21.4'
 
   '@textlint/ast-node-types@12.6.1':
-    resolution: {integrity: sha1-Nezv505wHX9jLAg9T9qJyrG4kBI=}
+    resolution: {integrity: sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==}
 
   '@textlint/ast-node-types@13.4.1':
     resolution: {integrity: sha512-qrZyhCh8Ekk6nwArx3BROybm9BnX6vF7VcZbijetV/OM3yfS4rTYhoMWISmhVEP2H2re0CtWEyMl/XF+WdvVLQ==}
 
   '@textlint/markdown-to-ast@12.6.1':
-    resolution: {integrity: sha1-/My1czs+ds0Nt4oyN2OrEB8tgDs=}
+    resolution: {integrity: sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==}
 
   '@textlint/markdown-to-ast@13.4.1':
     resolution: {integrity: sha512-jUa5bTNmxjEgfCXW4xfn7eSJqzUXyNKiIDWLKtI4MUKRNhT3adEaa/NuQl0Mii3Hu3HraZR7hYhRHLh+eeM43w==}
@@ -20077,16 +20080,16 @@ packages:
     resolution: {integrity: sha512-m7Lllj9n/S6sOkCkRftpM7L24uvmfXQFedlW/4hENcuJH1HHm9u5EgxZb9uVjQSCGrbBWBkOGgcTxNg36r6ywA==}
 
   '@tsconfig/node10@1.0.12':
-    resolution: {integrity: sha1-vlfOrB5GkrQb6d5r6MMqEGY226Q=}
+    resolution: {integrity: sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==}
 
   '@tsconfig/node12@1.0.11':
-    resolution: {integrity: sha1-7j3vHyfZ7WbaxuRqKVz/sBUuBY0=}
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
 
   '@tsconfig/node14@1.0.3':
-    resolution: {integrity: sha1-5DhjFihPALmENb9A9y91oJ2r9sE=}
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
 
   '@tsconfig/node16@1.0.4':
-    resolution: {integrity: sha1-C5LcwMwcgfbzBqOB8o4xsaVlNuk=}
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
 
   '@tufjs/canonical-json@1.0.0':
     resolution: {integrity: sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==}
@@ -20097,7 +20100,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
   '@tybys/wasm-util@0.10.1':
-    resolution: {integrity: sha1-7N3TIFzx4tUnRkn/Du3SmR7X9BQ=}
+    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
   '@tylerbu/markdown-magic@2.4.0-tylerbu-1':
     resolution: {integrity: sha512-p8nG2uH2+tQMGtT2Tam4gdJuJwuOdJdSA73LlNmRG+8dcxSNXkiwADyd/to6gY/oZOuNB5sJahBho5fLmxLI3Q==}
@@ -20346,7 +20349,7 @@ packages:
     resolution: {integrity: sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw==}
 
   '@types/parse-json@4.0.2':
-    resolution: {integrity: sha1-WVDlCWB5MFWEXpVsQn/CsNcMUjk=}
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
   '@types/path-browserify@1.0.3':
     resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
@@ -20480,7 +20483,7 @@ packages:
     resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
 
   '@types/yauzl@2.10.3':
-    resolution: {integrity: sha1-6bKAi08QlQSgPNqVglmHb2EBeZk=}
+    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
   '@typescript-eslint/eslint-plugin@8.54.0':
     resolution: {integrity: sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==}
@@ -20630,105 +20633,105 @@ packages:
     resolution: {integrity: sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
-    resolution: {integrity: sha1-n1sEUDCI5qNUKV6OqP48uZ5Dr4E=}
+    resolution: {integrity: sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==}
     cpu: [arm]
     os: [android]
 
   '@unrs/resolver-binding-android-arm64@1.11.1':
-    resolution: {integrity: sha1-dBSIVDG9cXi5ia7cTSXMyzhlvJ8=}
+    resolution: {integrity: sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==}
     cpu: [arm64]
     os: [android]
 
   '@unrs/resolver-binding-darwin-arm64@1.11.1':
-    resolution: {integrity: sha1-tKhVb0IXH7nJ97rII1BF6Cqgy98=}
+    resolution: {integrity: sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==}
     cpu: [arm64]
     os: [darwin]
 
   '@unrs/resolver-binding-darwin-x64@1.11.1':
-    resolution: {integrity: sha1-/U2BJXsT9NGgg4kKahfADeVx8Nw=}
+    resolution: {integrity: sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==}
     cpu: [x64]
     os: [darwin]
 
   '@unrs/resolver-binding-freebsd-x64@1.11.1':
-    resolution: {integrity: sha1-0lEwhNDzfEB3V+IvMr2SSnjP2Zs=}
+    resolution: {integrity: sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==}
     cpu: [x64]
     os: [freebsd]
 
   '@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1':
-    resolution: {integrity: sha1-hE0mBdBXSI13+rCXBfKGa4YWTgo=}
+    resolution: {integrity: sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm-musleabihf@1.11.1':
-    resolution: {integrity: sha1-IEiSmVzvtr0dAX1S0JcZO8Yd2tM=}
+    resolution: {integrity: sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm64-gnu@1.11.1':
-    resolution: {integrity: sha1-Aj6ww6rEYGahC+ej82Lns087350=}
+    resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-arm64-musl@1.11.1':
-    resolution: {integrity: sha1-nm+auwZCTjFApgrJlhOXhvXZm+A=}
+    resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1':
-    resolution: {integrity: sha1-sRFBfxfJ0bAu++yOCDmPDFUnu0Q=}
+    resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1':
-    resolution: {integrity: sha1-kv+/AnSK8+mYc5RcmoperQHVCKk=}
+    resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-musl@1.11.1':
-    resolution: {integrity: sha1-C+xvElj8OQ5rMF6f9EJWyyB94WU=}
+    resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-linux-s390x-gnu@1.11.1':
-    resolution: {integrity: sha1-V3hDoITFlS9ZBncGM8z7idrJvJQ=}
+    resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-gnu@1.11.1':
-    resolution: {integrity: sha1-NvsxjuvdaQ9toyrF4EmadvqIGTU=}
+    resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-musl@1.11.1':
-    resolution: {integrity: sha1-v7mvdfeD+Y9qIsQkQhTv5N8YU9Y=}
+    resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
   '@unrs/resolver-binding-wasm32-wasi@1.11.1':
-    resolution: {integrity: sha1-dSw1ndh1aEsnQpUA2IIm18xy9x0=}
+    resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
   '@unrs/resolver-binding-win32-arm64-msvc@1.11.1':
-    resolution: {integrity: sha1-zlc15gDkwvu0Cc0FGzt9pKOZrzU=}
+    resolution: {integrity: sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==}
     cpu: [arm64]
     os: [win32]
 
   '@unrs/resolver-binding-win32-ia32-msvc@1.11.1':
-    resolution: {integrity: sha1-cvxXvHxk7Fw94NZO4NGBAxe8YKY=}
+    resolution: {integrity: sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==}
     cpu: [ia32]
     os: [win32]
 
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
-    resolution: {integrity: sha1-U4seEDv42YZOe4XMlvqNb7bEB3c=}
+    resolution: {integrity: sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==}
     cpu: [x64]
     os: [win32]
 
@@ -21040,7 +21043,7 @@ packages:
     engines: {node: '>=0.8.0'}
 
   arg@4.1.3:
-    resolution: {integrity: sha1-Jp/HrVuOQstjyJbVZmAXJhwUQIk=}
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
 
   arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
@@ -21194,7 +21197,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
   babel-plugin-macros@3.1.0:
-    resolution: {integrity: sha1-nvbcdN65NLTbNE3Jc+6FHRSMUME=}
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
 
   babel-preset-current-node-syntax@1.1.0:
@@ -21225,7 +21228,7 @@ packages:
     resolution: {integrity: sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==}
 
   bare-fs@4.1.4:
-    resolution: {integrity: sha1-Pdhjkl8phD5kqQMIOcnLMVVxTUA=}
+    resolution: {integrity: sha512-r8+26Voz8dGX3AYpJdFb1ZPaUSM8XOLCZvy+YGpRTmwPHIxA7Z3Jov/oMPtV7hfRQbOnH8qGlLTzQAbgtdNN0Q==}
     engines: {bare: '>=1.16.0'}
     peerDependencies:
       bare-buffer: '*'
@@ -21238,7 +21241,7 @@ packages:
     engines: {bare: '>=1.14.0'}
 
   bare-path@3.0.0:
-    resolution: {integrity: sha1-tZ0YEwulKmr5J22z6WouPT6lIXg=}
+    resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==}
 
   bare-stream@2.6.5:
     resolution: {integrity: sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==}
@@ -21803,7 +21806,7 @@ packages:
     engines: {node: '>= 12'}
 
   commander@9.5.0:
-    resolution: {integrity: sha1-vAjR61zt98y3l6lhmdQce8PmDTA=}
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
     engines: {node: ^12.20.0 || >=14}
 
   comment-parser@1.4.1:
@@ -21916,7 +21919,7 @@ packages:
     engines: {node: '>= 0.10'}
 
   cosmiconfig@7.1.0:
-    resolution: {integrity: sha1-FEO5r6WWtnAILqRsvY9qYrhGNfY=}
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
     engines: {node: '>=10'}
 
   cosmiconfig@8.3.6:
@@ -21957,7 +21960,7 @@ packages:
     hasBin: true
 
   create-require@1.1.1:
-    resolution: {integrity: sha1-wdfo8eX2z8n/ZfnNNS03NIdWwzM=}
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
   crelt@1.0.6:
     resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
@@ -22122,7 +22125,7 @@ packages:
     resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
 
   debug@2.6.9:
-    resolution: {integrity: sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=}
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -22130,7 +22133,7 @@ packages:
         optional: true
 
   debug@3.2.7:
-    resolution: {integrity: sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o=}
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -22335,7 +22338,7 @@ packages:
     resolution: {integrity: sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g==}
 
   diff@4.0.4:
-    resolution: {integrity: sha1-em2/2jJfJfB1F+m1GPiXwIMy4H0=}
+    resolution: {integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==}
     engines: {node: '>=0.3.1'}
 
   diff@5.2.2:
@@ -22496,7 +22499,7 @@ packages:
     engines: {node: '>=14'}
 
   empty-npm-package@1.0.0:
-    resolution: {integrity: sha1-/aKett5e+jkfc9V4aXhTr1X2eTo=}
+    resolution: {integrity: sha512-q4Mq/+XO7UNDdMiPpR/LIBIW1Zl4V0Z6UT9aKGqIAnBCtCb3lvZJM1KbDbdzdC8fKflwflModfjR29Nt0EpcwA==}
 
   enabled@2.0.0:
     resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==}
@@ -22510,7 +22513,7 @@ packages:
     engines: {node: '>= 0.8'}
 
   encoding@0.1.13:
-    resolution: {integrity: sha1-VldK/deR9UqOmyeFwFgqLSYhD6k=}
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
 
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
@@ -22567,7 +22570,7 @@ packages:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
 
   errno@0.1.8:
-    resolution: {integrity: sha1-i7Ppx9Rjvkl2/4iPdrSAnrwugR8=}
+    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
     hasBin: true
 
   error-ex@1.3.2:
@@ -22608,7 +22611,7 @@ packages:
     engines: {node: '>= 0.4'}
 
   esbuild@0.27.7:
-    resolution: {integrity: sha1-vK3OIrLz/XbyV+OmT4OmSYb+oR8=}
+    resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -23191,12 +23194,12 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
   fsevents@2.3.2:
-    resolution: {integrity: sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=}
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   fsevents@2.3.3:
-    resolution: {integrity: sha1-ysZAd4XQNnWipeGlMFxpezR9kNY=}
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
@@ -23272,7 +23275,7 @@ packages:
     engines: {node: '>= 0.4'}
 
   get-tsconfig@4.13.7:
-    resolution: {integrity: sha1-udixmbBgM87uoak99+pXZUFQibw=}
+    resolution: {integrity: sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==}
 
   get-uri@6.0.4:
     resolution: {integrity: sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==}
@@ -23408,7 +23411,7 @@ packages:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
   graceful-fs@4.2.11:
-    resolution: {integrity: sha1-QYPk6L8Iu24Fu7L30uDI9xLKQOM=}
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
   gray-matter@4.0.3:
     resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
@@ -23674,7 +23677,7 @@ packages:
     engines: {node: '>= 4'}
 
   image-size@0.5.5:
-    resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=}
+    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
     engines: {node: '>=0.10.0'}
     hasBin: true
 
@@ -24362,7 +24365,7 @@ packages:
     hasBin: true
 
   json-alexander@0.1.13:
-    resolution: {integrity: sha1-eTDrd1Y8JjZBZ33EyXlyTORis/Y=}
+    resolution: {integrity: sha512-s84SuqZwnb7mGJB03sGlcdx458FR91Uwwy2lKJBDN+TBJ7ARbyP/ssGnjW9t5QyxwG/b23W22Dz9Ga6nuyHqnA==}
 
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
@@ -24780,7 +24783,7 @@ packages:
     resolution: {integrity: sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==}
 
   make-dir@2.1.0:
-    resolution: {integrity: sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=}
+    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
 
   make-dir@4.0.0:
@@ -24788,7 +24791,7 @@ packages:
     engines: {node: '>=10'}
 
   make-error@1.3.6:
-    resolution: {integrity: sha1-LrLjfqm2fEiR9oShOUeZr0hM96I=}
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
   make-fetch-happen@10.2.1:
     resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==}
@@ -24810,7 +24813,7 @@ packages:
       markdown-magic: '>=0.1 <=2.x'
 
   markdown-magic@2.6.1:
-    resolution: {integrity: sha1-/BvNwjd1TKuuTQT3VJTP47aPKr0=}
+    resolution: {integrity: sha512-i+wPC9bAGzFVftF1P5ItooOCvX+TTD3v504WpupsJz+3B0wRZMuPxeFAE7uZXEZYjsiQYskoMgpypoJTWerpVA==}
     hasBin: true
 
   markdown-table@2.0.0:
@@ -25076,7 +25079,7 @@ packages:
     engines: {node: '>= 0.6'}
 
   mime@1.6.0:
-    resolution: {integrity: sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=}
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
     engines: {node: '>=4'}
     hasBin: true
 
@@ -25252,7 +25255,7 @@ packages:
     hasBin: true
 
   msgpackr-extract@3.0.3:
-    resolution: {integrity: sha1-6dhwI945znFIcvnpUE48GZbWEBI=}
+    resolution: {integrity: sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==}
     hasBin: true
 
   msgpackr@1.11.2:
@@ -25309,7 +25312,7 @@ packages:
     hasBin: true
 
   native-request@1.1.2:
-    resolution: {integrity: sha1-tneVJ1dCnbbNQZcqKcO3gZd0E+0=}
+    resolution: {integrity: sha512-/etjwrK0J4Ebbcnt35VMWnfiUX/B04uwGJxyJInagxDqf2z5drSt/lsOvEMWGYunz1kaLZAFrV4NDAbOoDKvAQ==}
 
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
@@ -25953,7 +25956,7 @@ packages:
     resolution: {integrity: sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA==}
 
   pm2-sysmonit@1.2.8:
-    resolution: {integrity: sha1-7d6jSlP9jI18PvtzuXo8VIaG4k0=}
+    resolution: {integrity: sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==}
 
   pm2@5.4.3:
     resolution: {integrity: sha512-4/I1htIHzZk1Y67UgOCo4F1cJtas1kSds31N8zN0PybO230id1nigyjGuGFzUnGmUFPmrJ0On22fO1ChFlp7VQ==}
@@ -26592,7 +26595,7 @@ packages:
     engines: {node: '>=8'}
 
   resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha1-YWs9wsVwVrVYjDHN9LPWTbEzcg8=}
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
   resolve.exports@2.0.3:
     resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==}
@@ -27054,7 +27057,7 @@ packages:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
   source-map@0.6.1:
-    resolution: {integrity: sha1-dHIq8y6WFOnCh6jQu95IteLxomM=}
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
   source-map@0.7.4:
@@ -27318,42 +27321,42 @@ packages:
     resolution: {integrity: sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==}
 
   syncpack-darwin-arm64@14.0.2:
-    resolution: {integrity: sha1-rZzikxHvCNGvr8hSxnshFkb/d3M=}
+    resolution: {integrity: sha512-qVTB7VQHpXfKMOyPzRoX+gsh+2rPw9631kbt/DfTthyfOrXUbp0QOZF0F0XtSYCYcG7IQehhMER3MLLvCwRTlA==}
     cpu: [arm64]
     os: [darwin]
 
   syncpack-darwin-x64@14.0.2:
-    resolution: {integrity: sha1-EORsyOnIFR7i/HxLqvvPU6ZCcyM=}
+    resolution: {integrity: sha512-KtB44JzPafpjEyA58GhoY+0jdfHuEEMsny0/T9tqkmgJBjgygssSsdN5quBrVB7QOQcJoRJoM+TsEQx3o63lww==}
     cpu: [x64]
     os: [darwin]
 
   syncpack-linux-arm64-musl@14.0.2:
-    resolution: {integrity: sha1-emyVcOgL3qLezIytuXGHrBh8uaU=}
+    resolution: {integrity: sha512-kyO9jjIfFpVsETcHzzG+TzNE82TNqE4Pz8ZMKMc/cLnk7XcN9LbvrdqRjxmGoW5ZSJGTOjQtZsp6owtM9ODrfA==}
     cpu: [arm64]
     os: [linux]
 
   syncpack-linux-arm64@14.0.2:
-    resolution: {integrity: sha1-/JQKQi1MBYavNbw/CfNxWj84QYk=}
+    resolution: {integrity: sha512-7erMuE/dm2yvdZ1Kr5aq81g3dE9ap7AG+EehonI9Det23gxlr7tXRpBbl3EYzAQr97ifrLGJpnQ6jtRQRAneTA==}
     cpu: [arm64]
     os: [linux]
 
   syncpack-linux-x64-musl@14.0.2:
-    resolution: {integrity: sha1-RfpZQ6rkWT8Oo8sz2RYD3pBszko=}
+    resolution: {integrity: sha512-kXlsvH4V7sBR8vWku+lnrdh+xQCmlRedk1RQDH/c+MpZ/PJy0UCIEovlrSgXcUFG0IVVrXbDGAxWJM4RB5oWeA==}
     cpu: [x64]
     os: [linux]
 
   syncpack-linux-x64@14.0.2:
-    resolution: {integrity: sha1-qq87W4neLX7AJyy/ys3A4elWF8w=}
+    resolution: {integrity: sha512-FGO9AsGakTPhfX+DW1Jmy2oaVeXhD7o1A+MmIMhcn9ArJThbBDmgkcTkU5Ek0E0tty4ZaNJgh1uhwwliPDHCeA==}
     cpu: [x64]
     os: [linux]
 
   syncpack-windows-arm64@14.0.2:
-    resolution: {integrity: sha1-32sBZqje+/D7bOmu4Pu1BrwzwxI=}
+    resolution: {integrity: sha512-Vmh6hmPXL2/DtppVYS1/zkr/RKKiJql6LqklqdPovB8F1TiTxulfv6RaGxR2d0r7Y9vDpoOSXxnONT4BoyCyUA==}
     cpu: [arm64]
     os: [win32]
 
   syncpack-windows-x64@14.0.2:
-    resolution: {integrity: sha1-gSt6RI7SmDpchOziqMGgYrsJrD0=}
+    resolution: {integrity: sha512-lndo5gWCmsoYVxgOdQ1R4rFeiJWN4N4YLWqdWrun5V+LTuh6C7SyajJSlCxpLeRm2GDdZ+7oAjbJUDDHwF+IZA==}
     cpu: [x64]
     os: [win32]
 
@@ -27620,7 +27623,7 @@ packages:
     resolution: {integrity: sha512-M9MqFGZREyeb5fTl6gNHKZLqBQA0TjA1lea+CR48R8EBTDuWrNqW6ccC5QvjNR4s6wDumD3LTCjOFSp9iwlzaw==}
 
   ts-node@10.9.2:
-    resolution: {integrity: sha1-cPAhyeGFvM3Kgg4m3EE4BcEBxx8=}
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
     hasBin: true
     peerDependencies:
       '@swc/core': '>=1.2.50'
@@ -27654,7 +27657,7 @@ packages:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
   tsx@4.21.0:
-    resolution: {integrity: sha1-Mqps8XSB4zb3Vhleb+BNrj5jCLE=}
+    resolution: {integrity: sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -27820,7 +27823,7 @@ packages:
     resolution: {integrity: sha512-Oy/k+tFle5NAA3J/yrrYGfvEnPVrDZ8s8/WCwjUE75k331QyKIsFss7byQ/PzBmXLY6h1moRnZbnaxWBe3I3CA==}
 
   uglify-js@3.19.3:
-    resolution: {integrity: sha1-gjFem7xvKyWIiFis0f/4RBA1t38=}
+    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
     engines: {node: '>=0.8.0'}
     hasBin: true
 
@@ -28029,7 +28032,7 @@ packages:
     hasBin: true
 
   v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha1-Yzbo1xllyz01obu3hoRFp8BSZL8=}
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
   v8-to-istanbul@9.3.0:
     resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
@@ -28112,7 +28115,7 @@ packages:
     resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
 
   wcwidth@1.0.1:
-    resolution: {integrity: sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=}
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
 
   web-streams-polyfill@4.0.0-beta.3:
     resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
@@ -28426,7 +28429,7 @@ packages:
     engines: {node: '>=18'}
 
   yaml@1.10.3:
-    resolution: {integrity: sha1-duQH7ZXEJoT7jhRkHl3mL+ZbvLM=}
+    resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==}
     engines: {node: '>= 6'}
 
   yaml@2.8.3:
@@ -28458,7 +28461,7 @@ packages:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
   yn@3.1.1:
-    resolution: {integrity: sha1-HodAGgnXZ8HV6rJqbkwYUYLS61A=}
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
 
   yocto-queue@0.1.0:
@@ -30522,82 +30525,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@fluid-tools/build-cli@0.64.0(@types/node@22.19.17)(encoding@0.1.13)':
-    dependencies:
-      '@andrewbranch/untar.js': 1.0.3
-      '@fluid-tools/build-infrastructure': 0.64.0(@types/node@22.19.17)
-      '@fluid-tools/version-tools': 0.64.0(@types/node@22.19.17)
-      '@fluidframework/build-tools': 0.64.0(@types/node@22.19.17)
-      '@fluidframework/bundle-size-tools': 0.64.0(webpack-cli@5.1.4)
-      '@inquirer/prompts': 8.0.2(@types/node@22.19.17)
-      '@microsoft/api-extractor': 7.58.1(patch_hash=949a26f6cec9ac4e37522f178b8e4982136ccfeb8c6d0835130ef2aa6788f4fa)(@types/node@22.19.17)
-      '@oclif/core': 4.8.0
-      '@oclif/plugin-autocomplete': 3.2.39
-      '@oclif/plugin-commands': 4.1.38
-      '@oclif/plugin-help': 6.2.36
-      '@oclif/plugin-not-found': 3.2.73(@types/node@22.19.17)
-      '@octokit/core': 7.0.6
-      '@octokit/rest': 22.0.1
-      '@rushstack/node-core-library': 5.21.0(@types/node@22.19.17)
-      async: 3.2.6
-      azure-devops-node-api: 11.2.0
-      change-case: 5.4.4
-      danger: 13.0.5(encoding@0.1.13)
-      date-fns: 3.6.0
-      debug: 4.4.3(supports-color@8.1.1)
-      execa: 5.1.1
-      fflate: 0.8.2
-      fs-extra: 11.3.2
-      github-slugger: 2.0.0
-      globby: 11.1.0
-      gray-matter: 4.0.3
-      human-id: 4.1.3
-      issue-parser: 7.0.1
-      json5: 2.2.3
-      jssm: 5.104.2
-      jszip: 3.10.1
-      latest-version: 9.0.0
-      lilconfig: 3.1.3
-      mdast: 3.0.0
-      mdast-util-heading-range: 4.0.0
-      mdast-util-to-string: 4.0.0
-      minimatch: 10.2.4
-      npm-check-updates: 16.14.20
-      oclif: 4.22.52(@types/node@22.19.17)
-      picocolors: 1.1.1
-      prettier: 3.2.5
-      prompts: 2.4.2
-      read-pkg-up: 7.0.1
-      remark: 15.0.1
-      remark-gfm: 4.0.1
-      remark-github: 12.0.0
-      remark-github-beta-blockquote-admonitions: 3.1.1
-      remark-toc: 9.0.0
-      replace-in-file: 7.2.0
-      resolve.exports: 2.0.3
-      semver: 7.7.3
-      simple-git: 3.32.3
-      sort-json: 2.0.1
-      sort-package-json: 1.57.0
-      strip-ansi: 7.1.2
-      table: 6.9.0
-      ts-morph: 22.0.0
-      unist-util-visit: 5.0.0
-      xml2js: 0.6.2
-      yaml: 2.8.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - '@types/node'
-      - bluebird
-      - bufferutil
-      - encoding
-      - esbuild
-      - react-devtools-core
-      - supports-color
-      - uglify-js
-      - utf-8-validate
-      - webpack-cli
-
   '@fluid-tools/build-cli@0.64.0(@types/node@22.19.17)(encoding@0.1.13)(webpack-cli@5.1.4)':
     dependencies:
       '@andrewbranch/untar.js': 1.0.3
@@ -34632,7 +34559,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0
+      axios: 1.15.0(debug@4.4.3)
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -34718,12 +34645,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -35070,14 +34997,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@1.15.0:
-    dependencies:
-      follow-redirects: 1.15.11
-      form-data: 4.0.5
-      proxy-from-env: 2.1.0
-    transitivePeerDependencies:
-      - debug
-
   axios@1.15.0(debug@4.3.7):
     dependencies:
       follow-redirects: 1.15.11(debug@4.3.7)
@@ -37343,8 +37262,6 @@ snapshots:
 
   fn.name@1.1.0: {}
 
-  follow-redirects@1.15.11: {}
-
   follow-redirects@1.15.11(debug@4.3.7):
     optionalDependencies:
       debug: 4.3.7
@@ -43872,7 +43789,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 13ce928239a8..21ee09b1a30a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -27,9 +27,7 @@ minimumReleaseAgeExclude: [
 ]
 resolutionMode: highest
 blockExoticSubdeps: true
-# TODO: Do not check this in. Re-enable `trustPolicy: no-downgrade` after the temporary install unblock is no longer needed.
-# Revert any pnpm-lock.yaml changes and run install again to add new dependencies.
-trustPolicy: off
+trustPolicy: no-downgrade
 trustPolicyExclude:
   # axios@0.30.3 is the last legitimate 0.30.x release (published 2026-02-18). The trust
   # downgrade fires because 0.30.x was published via direct CLI rather than the OIDC/GitHub

From d5ef70b9f3ba2905be6546281a5cc406649cb923 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 17:04:05 -0700
Subject: [PATCH 03/67] Cleanup.

---
 examples/utils/bundle-size-tests/package.json |  2 +-
 .../{compare-bundles.ts => compareBundles.ts} | 82 ++++++++++---------
 2 files changed, 43 insertions(+), 41 deletions(-)
 rename examples/utils/bundle-size-tests/scripts/{compare-bundles.ts => compareBundles.ts} (90%)

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 685bb1b1226c..2821ba716902 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,7 +21,7 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compare-bundles.ts",
+		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
diff --git a/examples/utils/bundle-size-tests/scripts/compare-bundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
similarity index 90%
rename from examples/utils/bundle-size-tests/scripts/compare-bundles.ts
rename to examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 0f59a584506d..ab2fed819d99 100644
--- a/examples/utils/bundle-size-tests/scripts/compare-bundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -82,8 +82,8 @@ interface BundleStats {
  * Tries multiple possible locations to handle different directory structures.
  *
  * @param analysisDirectory - The base analysis directory containing bundle stats
- * @param label - The label suffix used to identify the specific stats (e.g., "parent", "current")
- * @returns An array of candidate file paths to check in order
+ * @param label - The label suffix used to identify the specific stats
+ * @returns Array of candidate file paths to check in order
  */
 function getStatsFileCandidates(analysisDirectory: string, label: string): string[] {
 	return [
@@ -100,7 +100,6 @@ function getStatsFileCandidates(analysisDirectory: string, label: string): strin
  * @param analysisDirectory - The base analysis directory
  * @param label - The label suffix used to identify the specific stats
  * @returns Parsed bundle statistics
- * @throws Error if bundle stats file cannot be found in any candidate location
  */
 function loadStats(analysisDirectory: string, label: string): BundleStats {
 	const candidates = getStatsFileCandidates(analysisDirectory, label);
@@ -137,47 +136,51 @@ function gzipSize(filePath: string): number | undefined {
 	}
 }
 
-/** Reporter interface for dual console and text file output. */
-interface Reporter {
-	/** Prints a line to both console and internal buffer */
-	print: (line?: string) => void;
-	/** Prints a section header with spacing */
-	section: (title: string) => void;
-	/** Prints a table header with a divider line */
-	tableHeader: (header: string, dividerLength: number) => void;
-	/** Returns all accumulated output as a single text string */
-	toText: () => string;
-}
-
 /**
- * Creates a reporter that outputs to both console and a text buffer.
- * Allows for simultaneous console output and file writing of the same content.
- *
- * @returns A Reporter instance with print, section, tableHeader, and toText methods
+ * Provides dual console and text file output for bundle comparison reports.
  */
-function createReporter(): Reporter {
-	const outputLines: string[] = [];
-
-	function print(line = ""): void {
+class Reporter {
+	private outputLines: string[] = [];
+
+	/**
+	 * Prints a line to both console and internal buffer.
+	 *
+	 * @param line - The line to print (defaults to empty string)
+	 */
+	print(line = ""): void {
 		console.log(line);
-		outputLines.push(line);
+		this.outputLines.push(line);
 	}
 
-	function section(title: string): void {
-		print();
-		print(title);
+	/**
+	 * Prints a section header with spacing.
+	 *
+	 * @param title - The section title
+	 */
+	section(title: string): void {
+		this.print();
+		this.print(title);
 	}
 
-	function tableHeader(header: string, dividerLength: number): void {
-		print(header);
-		print("-".repeat(dividerLength));
+	/**
+	 * Prints a table header with a divider line.
+	 *
+	 * @param header - The header text
+	 * @param dividerLength - The length of the divider line
+	 */
+	tableHeader(header: string, dividerLength: number): void {
+		this.print(header);
+		this.print("-".repeat(dividerLength));
 	}
 
-	function toText(): string {
-		return `${outputLines.join("\n")}\n`;
+	/**
+	 * Returns all accumulated output as a single text string.
+	 *
+	 * @returns The full text output
+	 */
+	toText(): string {
+		return `${this.outputLines.join("\n")}\n`;
 	}
-
-	return { print, section, tableHeader, toText };
 }
 
 /** Represents a comparison row for a single asset between two builds. */
@@ -339,7 +342,7 @@ function writeOutputFiles(
 function printHelp(): void {
 	console.log(`
 Usage:
-  tsx ./scripts/compare-bundles.ts [options]
+  tsx ./scripts/compareBundles.ts [options]
 
 Options:
   --help, -h
@@ -360,8 +363,8 @@ Options:
                                (default: <analysis-dir>/build)
 
 Examples:
-  tsx ./scripts/compare-bundles.ts --base-branch main --current-branch tbrosman/default-field-kinds
-  tsx ./scripts/compare-bundles.ts --analysis-dir examples/utils/bundle-size-tests
+  tsx ./scripts/compareBundles.ts --base-branch main --current-branch tbrosman/default-field-kinds
+  tsx ./scripts/compareBundles.ts --analysis-dir examples/utils/bundle-size-tests
 `);
 }
 
@@ -392,10 +395,9 @@ interface EntrypointRow {
 /**
  * Main entry point for the bundle comparison script.
  * Loads statistics from base and current builds, compares assets and entrypoints,
- * and generates both console output and file-based reports (text and JSON).
+ * and generates both console and file-based reports (text and JSON).
  *
  * @param argv - The command-line argument list (typically process.argv)
- * @throws Error if bundle stats cannot be found or loaded
  */
 function main(argv: string[]): void {
 	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
@@ -404,7 +406,7 @@ function main(argv: string[]): void {
 	}
 
 	const options = parseOptions(argv);
-	const reporter = createReporter();
+	const reporter = new Reporter();
 
 	const baseStats = loadStats(options.analysisDirectory, options.baseLabel);
 	const currentStats = loadStats(options.analysisDirectory, options.currentLabel);

From f6cc9eae00f72ae94f431ddced048b3ee6086289 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 17:09:29 -0700
Subject: [PATCH 04/67] Tweaked directory structure.

---
 .../bundle-size-tests/scripts/compareBundles.ts    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index ab2fed819d99..2f27bfdf2d5f 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -255,9 +255,9 @@ interface Options {
 	analysisDirectory: string;
 	/** Directory where comparison output files are written (default: analysis-dir/bundleAnalysis) */
 	outputDirectory: string;
-	/** Build output directory for base gzip size comparison (default: analysis-dir/bundleAnalysis.base-label/build) */
+	/** Build output directory for base gzip size comparison (default: analysis-dir/bundleAnalysis/<base-label>/build) */
 	baseBuildDirectory: string;
-	/** Build output directory for current gzip size comparison (default: analysis-dir/build) */
+	/** Build output directory for current gzip size comparison (default: analysis-dir/bundleAnalysis/current/build) */
 	currentBuildDirectory: string;
 }
 
@@ -284,10 +284,10 @@ function parseOptions(argv: string[]): Options {
 	);
 	const baseBuildDirectory = resolve(
 		getOptionValue(argv, "--base-build-dir") ??
-			`${analysisDirectory}/bundleAnalysis.${baseLabel}/build`,
+			`${analysisDirectory}/bundleAnalysis/${baseLabel}/build`,
 	);
 	const currentBuildDirectory = resolve(
-		getOptionValue(argv, "--current-build-dir") ?? `${analysisDirectory}/build`,
+		getOptionValue(argv, "--current-build-dir") ?? `${analysisDirectory}/bundleAnalysis/current/build`,
 	);
 
 	return {
@@ -353,14 +353,14 @@ Options:
   --base-label <name>          Base stats directory suffix (default: parent)
   --current-label <name>       Current stats directory suffix (default: current)
 
-  --analysis-dir <path>        Directory containing bundleAnalysis.<label> folders
+  --analysis-dir <path>        Directory containing bundleAnalysis with stats subdirectories
                                (default: examples/utils/bundle-size-tests)
   --output-dir <path>          Directory where comparison outputs are written
                                (default: <analysis-dir>/bundleAnalysis)
   --base-build-dir <path>      Build output directory used for base gzip comparison
-                               (default: <analysis-dir>/bundleAnalysis.<base-label>/build)
+                               (default: <analysis-dir>/bundleAnalysis/<base-label>/build)
   --current-build-dir <path>   Build output directory used for current gzip comparison
-                               (default: <analysis-dir>/build)
+                               (default: <analysis-dir>/bundleAnalysis/current/build)
 
 Examples:
   tsx ./scripts/compareBundles.ts --base-branch main --current-branch tbrosman/default-field-kinds

From 133fe63301811d036ee1feaaacadb86cfad1f20e Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 20:07:18 -0700
Subject: [PATCH 05/67] Improvements. Script doesn't actually do what it says
 it does yet.

---
 .../scripts/compareBundles.ts                 | 111 ++++--------------
 1 file changed, 25 insertions(+), 86 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 2f27bfdf2d5f..1602ea9c5555 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -77,43 +77,19 @@ interface BundleStats {
 	entrypoints?: Record<string, { assets?: { size?: number }[] }>;
 }
 
-/**
- * Generates candidate file paths for bundle stats files in order of preference.
- * Tries multiple possible locations to handle different directory structures.
- *
- * @param analysisDirectory - The base analysis directory containing bundle stats
- * @param label - The label suffix used to identify the specific stats
- * @returns Array of candidate file paths to check in order
- */
-function getStatsFileCandidates(analysisDirectory: string, label: string): string[] {
-	return [
-		resolve(analysisDirectory, `bundleAnalysis.${label}`, "bundleStats.msp.gz"),
-		resolve(analysisDirectory, "bundleAnalysis", label, "bundleStats.msp.gz"),
-		resolve(analysisDirectory, "bundleAnalysis", "bundleStats.msp.gz"),
-	];
-}
-
 /**
  * Loads and deserializes bundle statistics from a MessagePack-compressed file.
- * Attempts multiple file locations and throws an error if stats cannot be found.
  *
  * @param analysisDirectory - The base analysis directory
- * @param label - The label suffix used to identify the specific stats
+ * @param label - The label subdirectory (typically derived from branch name)
  * @returns Parsed bundle statistics
  */
 function loadStats(analysisDirectory: string, label: string): BundleStats {
-	const candidates = getStatsFileCandidates(analysisDirectory, label);
-	const statsFilePath = candidates.find((candidate) => existsSync(candidate));
-	if (statsFilePath === undefined) {
-		const expectedPaths = candidates.map((candidate) => `  - ${candidate}`).join("\n");
+	const statsFilePath = resolve(analysisDirectory, "bundleAnalysis", label, "bundleStats.msp.gz");
+	if (!existsSync(statsFilePath)) {
 		throw new Error(
-			[
-				`Could not find bundle stats for label "${label}".`,
-				"Checked:",
-				expectedPaths,
-				"",
-				"If your base stats are stored in a different location, pass --base-label or --analysis-dir explicitly.",
-			].join("\n"),
+			`Could not find bundle stats at "${statsFilePath}". ` +
+			`Ensure you have built and analyzed bundles with the correct --analysis-dir.`,
 		);
 	}
 
@@ -247,23 +223,13 @@ interface Options {
 	baseBranch: string;
 	/** Branch name for the current build (default: current branch or BUILD_SOURCEBRANCHNAME) */
 	currentBranch: string;
-	/** Label suffix for base stats files (default: "parent") */
-	baseLabel: string;
-	/** Label suffix for current stats files (default: "current") */
-	currentLabel: string;
-	/** Directory containing bundleAnalysis folders (default: examples/utils/bundle-size-tests) */
+	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/{label}/ (default: examples/utils/bundle-size-tests) */
 	analysisDirectory: string;
-	/** Directory where comparison output files are written (default: analysis-dir/bundleAnalysis) */
-	outputDirectory: string;
-	/** Build output directory for base gzip size comparison (default: analysis-dir/bundleAnalysis/<base-label>/build) */
-	baseBuildDirectory: string;
-	/** Build output directory for current gzip size comparison (default: analysis-dir/bundleAnalysis/current/build) */
-	currentBuildDirectory: string;
 }
 
 /**
  * Parses command-line arguments into an Options object.
- * Provides defaults for all options and reads BUILD_SOURCEBRANCHNAME environment variable.
+ * Reads BUILD_SOURCEBRANCHNAME environment variable for current branch if not provided.
  *
  * @param argv - The command-line argument list
  * @returns Parsed options with defaults applied
@@ -274,32 +240,11 @@ function parseOptions(argv: string[]): Options {
 		getOptionValue(argv, "--current-branch") ??
 		process.env.BUILD_SOURCEBRANCHNAME ??
 		"current";
-	const baseLabel = getOptionValue(argv, "--base-label") ?? "parent";
-	const currentLabel = getOptionValue(argv, "--current-label") ?? "current";
 	const analysisDirectory = resolve(
 		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
 	);
-	const outputDirectory = resolve(
-		getOptionValue(argv, "--output-dir") ?? `${analysisDirectory}/bundleAnalysis`,
-	);
-	const baseBuildDirectory = resolve(
-		getOptionValue(argv, "--base-build-dir") ??
-			`${analysisDirectory}/bundleAnalysis/${baseLabel}/build`,
-	);
-	const currentBuildDirectory = resolve(
-		getOptionValue(argv, "--current-build-dir") ?? `${analysisDirectory}/bundleAnalysis/current/build`,
-	);
 
-	return {
-		baseBranch,
-		currentBranch,
-		baseLabel,
-		currentLabel,
-		analysisDirectory,
-		outputDirectory,
-		baseBuildDirectory,
-		currentBuildDirectory,
-	};
+	return { baseBranch, currentBranch, analysisDirectory };
 }
 
 /**
@@ -348,22 +293,13 @@ Options:
   --help, -h
     Show this help text and exit.
 
-  --base-branch <name>         Base branch label in output (default: main)
-  --current-branch <name>      Current branch label in output (default: BUILD_SOURCEBRANCHNAME or current)
-  --base-label <name>          Base stats directory suffix (default: parent)
-  --current-label <name>       Current stats directory suffix (default: current)
-
-  --analysis-dir <path>        Directory containing bundleAnalysis with stats subdirectories
-                               (default: examples/utils/bundle-size-tests)
-  --output-dir <path>          Directory where comparison outputs are written
-                               (default: <analysis-dir>/bundleAnalysis)
-  --base-build-dir <path>      Build output directory used for base gzip comparison
-                               (default: <analysis-dir>/bundleAnalysis/<base-label>/build)
-  --current-build-dir <path>   Build output directory used for current gzip comparison
-                               (default: <analysis-dir>/bundleAnalysis/current/build)
+  --base-branch <name>    Base branch name (default: main)
+  --current-branch <name> Current branch name (default: BUILD_SOURCEBRANCHNAME or current)
+  --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
+                          under bundleAnalysis/{label}/ (default: examples/utils/bundle-size-tests)
 
 Examples:
-  tsx ./scripts/compareBundles.ts --base-branch main --current-branch tbrosman/default-field-kinds
+  tsx ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
   tsx ./scripts/compareBundles.ts --analysis-dir examples/utils/bundle-size-tests
 `);
 }
@@ -408,8 +344,15 @@ function main(argv: string[]): void {
 	const options = parseOptions(argv);
 	const reporter = new Reporter();
 
-	const baseStats = loadStats(options.analysisDirectory, options.baseLabel);
-	const currentStats = loadStats(options.analysisDirectory, options.currentLabel);
+	// Derive labels and directories from branch names
+	const baseLabel = sanitizeForFileName(options.baseBranch);
+	const currentLabel = sanitizeForFileName(options.currentBranch);
+	const outputDirectory = resolve(options.analysisDirectory, "bundleAnalysis");
+	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
+	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
+
+	const baseStats = loadStats(options.analysisDirectory, baseLabel);
+	const currentStats = loadStats(options.analysisDirectory, currentLabel);
 
 	const baseAssets = Object.fromEntries(
 		(baseStats.assets ?? [])
@@ -461,8 +404,8 @@ function main(argv: string[]): void {
 		);
 
 		for (const row of changedRows) {
-			const baseGzipSize = gzipSize(resolve(options.baseBuildDirectory, row.name));
-			const currentGzipSize = gzipSize(resolve(options.currentBuildDirectory, row.name));
+			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name));
+			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name));
 
 			if (baseGzipSize !== undefined && currentGzipSize !== undefined) {
 				const diff = currentGzipSize - baseGzipSize;
@@ -516,7 +459,7 @@ function main(argv: string[]): void {
 	}
 
 	writeOutputFiles(
-		options.outputDirectory,
+		outputDirectory,
 		options.baseBranch,
 		options.currentBranch,
 		reporter.toText(),
@@ -524,11 +467,7 @@ function main(argv: string[]): void {
 			comparedAt: new Date().toISOString(),
 			baseBranch: options.baseBranch,
 			currentBranch: options.currentBranch,
-			baseLabel: options.baseLabel,
-			currentLabel: options.currentLabel,
 			analysisDirectory: options.analysisDirectory,
-			baseBuildDirectory: options.baseBuildDirectory,
-			currentBuildDirectory: options.currentBuildDirectory,
 			assets: rows.map((row) => ({
 				name: row.name,
 				baseStatSize: row.baseStatSize,

From 0f7938c374932584a299366e11e369d92b21ac6a Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 20:35:41 -0700
Subject: [PATCH 06/67] Partially working. Checks out old revision for
 comparison.

---
 examples/utils/bundle-size-tests/package.json |   1 +
 .../scripts/collectAndCompareBundles.ts       | 277 ++++++++++++++++++
 .../scripts/compareBundles.ts                 |   9 +-
 3 files changed, 285 insertions(+), 2 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 2821ba716902..81a75759355b 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,6 +21,7 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
+		"collect:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectAndCompareBundles.ts",
 		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
new file mode 100644
index 000000000000..83ea8d7cd638
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { execSync, spawnSync } from "node:child_process";
+import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const packageRoot = resolve(scriptDirectory, "..");
+const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
+
+/**
+ * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+function sanitizeForFileName(value: string): string {
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/**
+ * Gets the current git branch name.
+ *
+ * @returns The current branch name
+ */
+function getCurrentBranch(): string {
+	return execSync("git rev-parse --abbrev-ref HEAD", {
+		cwd: packageRoot,
+		encoding: "utf-8",
+	}).trim();
+}
+
+/**
+ * Stashes current changes if any exist.
+ *
+ * @returns True if changes were stashed, false otherwise
+ */
+function stashChanges(): boolean {
+	try {
+		const output = execSync("git stash push -u", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		}).trim();
+		// If nothing was stashed, output says "No local changes to save"
+		if (output && !output.includes("No local changes")) {
+			console.log("Stashed local changes");
+			return true;
+		}
+		return false;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Restores the most recent stash.
+ */
+function restoreStash(): void {
+	try {
+		execSync("git stash pop", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		});
+		console.log("Restored stashed changes");
+	} catch (error) {
+		console.warn(
+			"Could not restore stashed changes:",
+			error instanceof Error ? error.message : String(error),
+		);
+	}
+}
+
+/**
+ * Checks out a git branch without force (preserves untracked files like bundleAnalysis/).
+ *
+ * @param branchName - The branch to check out
+ */
+function checkoutBranch(branchName: string): void {
+	console.log(`\nChecking out branch: ${branchName}`);
+	execSync(`git checkout ${branchName}`, {
+		cwd: packageRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Builds bundles using webpack.
+ */
+function buildBundles(): void {
+	console.log("\nBuilding bundles with webpack...");
+	execSync("npm run webpack", {
+		cwd: packageRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Saves the generated stats file to a label-specific subdirectory.
+ * Assumes webpack has just run and created bundleAnalysis/bundleStats.msp.gz.
+ *
+ * @param label - The label for this build (e.g., "main", "feature_branch")
+ */
+function saveStats(label: string): void {
+	const tempStatsPath = resolve(bundleAnalysisDirectory, "bundleStats.msp.gz");
+	const labelDirectory = resolve(bundleAnalysisDirectory, label);
+	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
+
+	if (!existsSync(tempStatsPath)) {
+		throw new Error(
+			`Bundle stats not found at ${tempStatsPath}. ` + `Check that webpack ran successfully.`,
+		);
+	}
+
+	mkdirSync(labelDirectory, { recursive: true });
+	renameSync(tempStatsPath, destStatsPath);
+	console.log(`Saved stats to: ${destStatsPath}`);
+}
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for
+ * @returns True if the flag is present, false otherwise
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Prints the help text describing usage and options.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  tsx ./scripts/collectAndCompareBundles.ts [options]
+
+Options:
+  --help, -h
+    Show this help text and exit.
+
+  --base-branch <name>    Base branch name (default: main)
+  --current-branch <name> Current branch name (default: current git branch)
+  --skip-compare          Collect stats only, skip the comparison step
+  --clean                 Remove bundleAnalysis directory before starting
+
+Examples:
+  tsx ./scripts/collectAndCompareBundles.ts
+  tsx ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
+  tsx ./scripts/collectAndCompareBundles.ts --clean --skip-compare
+`);
+}
+
+/**
+ * Main entry point: collects bundle stats from two branches and runs comparison.
+ *
+ * @param argv - The command-line argument list
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
+	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
+	const skipCompare = hasFlag(argv, "--skip-compare");
+	const clean = hasFlag(argv, "--clean");
+
+	const originalBranch = getCurrentBranch();
+
+	try {
+		if (clean && existsSync(bundleAnalysisDirectory)) {
+			console.log(`\nCleaning bundleAnalysis directory...`);
+			rmSync(bundleAnalysisDirectory, { recursive: true });
+		}
+
+		// Stash local changes before switching branches
+		const hasStash = stashChanges();
+
+		try {
+			// Collect base branch stats
+			if (originalBranch !== baseBranch) {
+				checkoutBranch(baseBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(baseBranch));
+
+			// Collect current branch stats
+			if (originalBranch !== currentBranch && baseBranch !== currentBranch) {
+				checkoutBranch(currentBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(currentBranch));
+
+			// Return to original branch
+			if (originalBranch !== currentBranch && originalBranch !== baseBranch) {
+				checkoutBranch(originalBranch);
+			}
+		} finally {
+			// Restore stashed changes if any were made
+			if (hasStash) {
+				restoreStash();
+			}
+		}
+
+		// Run comparison unless skipped
+		if (!skipCompare) {
+			console.log("\n" + "=".repeat(80));
+			console.log("Running bundle comparison...");
+			console.log("=".repeat(80));
+
+			const compareScript = resolve(scriptDirectory, "compareBundles.ts");
+			const result = spawnSync(
+				"tsx",
+				[
+					"--tsconfig",
+					resolve(packageRoot, "tsconfig.scripts.json"),
+					compareScript,
+					"--base-branch",
+					baseBranch,
+					"--current-branch",
+					currentBranch,
+					"--analysis-dir",
+					packageRoot,
+				],
+				{
+					cwd: packageRoot,
+					stdio: "inherit",
+				},
+			);
+
+			if (result.status !== 0 && result.status !== null) {
+				throw new Error(`Comparison script exited with code ${result.status}`);
+			}
+		}
+
+		console.log("\n" + "=".repeat(80));
+		console.log("✓ Bundle collection and comparison complete!");
+		console.log("=".repeat(80));
+	} catch (error) {
+		console.error("\n❌ Error:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+}
+
+main(process.argv.slice(2));
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 1602ea9c5555..4e0b3b9e3047 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -85,11 +85,16 @@ interface BundleStats {
  * @returns Parsed bundle statistics
  */
 function loadStats(analysisDirectory: string, label: string): BundleStats {
-	const statsFilePath = resolve(analysisDirectory, "bundleAnalysis", label, "bundleStats.msp.gz");
+	const statsFilePath = resolve(
+		analysisDirectory,
+		"bundleAnalysis",
+		label,
+		"bundleStats.msp.gz",
+	);
 	if (!existsSync(statsFilePath)) {
 		throw new Error(
 			`Could not find bundle stats at "${statsFilePath}". ` +
-			`Ensure you have built and analyzed bundles with the correct --analysis-dir.`,
+				`Ensure you have built and analyzed bundles with the correct --analysis-dir.`,
 		);
 	}
 

From 936443dd307156fb8642c8555516bc6c5fcf7a5c Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 20:57:40 -0700
Subject: [PATCH 07/67] Better tolerance for cases where package sets differ.

---
 .../scripts/collectAndCompareBundles.ts       | 310 +++++++++++
 .../scripts/compareBundles.ts                 | 492 ++++++++++++++++++
 .../bundle-size-tests/tsconfig.scripts.json   |   9 +
 3 files changed, 811 insertions(+)
 create mode 100644 examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
 create mode 100644 examples/utils/bundle-size-tests/scripts/compareBundles.ts
 create mode 100644 examples/utils/bundle-size-tests/tsconfig.scripts.json

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
new file mode 100644
index 000000000000..d1a3a9ba1c1d
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -0,0 +1,310 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { execSync, spawnSync } from "node:child_process";
+import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const packageRoot = resolve(scriptDirectory, "..");
+
+/**
+ * Gets the repository root directory.
+ *
+ * @returns The absolute path to the repository root
+ */
+function getRepoRoot(): string {
+	return execSync("git rev-parse --show-toplevel", {
+		encoding: "utf-8",
+	}).trim();
+}
+
+const repoRoot = getRepoRoot();
+const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
+
+/**
+ * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+function sanitizeForFileName(value: string): string {
+	// eslint-disable-next-line unicorn/prefer-string-replace-all
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/**
+ * Gets the current git branch name.
+ *
+ * @returns The current branch name
+ */
+function getCurrentBranch(): string {
+	return execSync("git rev-parse --abbrev-ref HEAD", {
+		cwd: packageRoot,
+		encoding: "utf-8",
+	}).trim();
+}
+
+/**
+ * Stashes current changes if any exist.
+ *
+ * @returns True if changes were stashed, false otherwise
+ */
+function stashChanges(): boolean {
+	try {
+		const output = execSync("git stash push -u", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		}).trim();
+		// If nothing was stashed, output says "No local changes to save"
+		if (output && !output.includes("No local changes")) {
+			console.log("Stashed local changes");
+			return true;
+		}
+		return false;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Restores the most recent stash.
+ */
+function restoreStash(): void {
+	try {
+		execSync("git stash pop", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		});
+		console.log("Restored stashed changes");
+	} catch (error) {
+		console.warn(
+			"Could not restore stashed changes:",
+			error instanceof Error ? error.message : String(error),
+		);
+	}
+}
+
+/**
+ * Checks out a git branch without force (preserves untracked files like bundleAnalysis/).
+ *
+ * @param branchName - The branch to check out
+ */
+function checkoutBranch(branchName: string): void {
+	console.log(`\nChecking out branch: ${branchName}`);
+	execSync(`git checkout ${branchName}`, {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+
+	console.log("Enabling corepack and installing dependencies...");
+	execSync("corepack enable", {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+	execSync("pnpm install", {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Builds bundles using webpack.
+ */
+function buildBundles(): void {
+	console.log("\nBuilding bundles with webpack...");
+	execSync("npm run webpack", {
+		cwd: packageRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Saves the generated stats file to a label-specific subdirectory.
+ * Assumes webpack has just run and created bundleAnalysis/bundleStats.msp.gz.
+ *
+ * @param label - The label for this build (e.g., "main", "feature_branch")
+ */
+function saveStats(label: string): void {
+	const tempStatsPath = resolve(bundleAnalysisDirectory, "bundleStats.msp.gz");
+	const labelDirectory = resolve(bundleAnalysisDirectory, label);
+	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
+
+	if (!existsSync(tempStatsPath)) {
+		throw new Error(
+			`Bundle stats not found at ${tempStatsPath}. ` + `Check that webpack ran successfully.`,
+		);
+	}
+
+	mkdirSync(labelDirectory, { recursive: true });
+	renameSync(tempStatsPath, destStatsPath);
+	console.log(`Saved stats to: ${destStatsPath}`);
+}
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for
+ * @returns True if the flag is present, false otherwise
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Prints the help text describing usage and options.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  tsx ./scripts/collectAndCompareBundles.ts [options]
+
+Options:
+  --help, -h
+    Show this help text and exit.
+
+  --base-branch <name>    Base branch name (default: main)
+  --current-branch <name> Current branch name (default: current git branch)
+  --skip-compare          Collect stats only, skip the comparison step
+  --clean                 Remove bundleAnalysis directory before starting
+
+Examples:
+  tsx ./scripts/collectAndCompareBundles.ts
+  tsx ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
+  tsx ./scripts/collectAndCompareBundles.ts --clean --skip-compare
+`);
+}
+
+/**
+ * Main entry point: collects bundle stats from two branches and runs comparison.
+ *
+ * @param argv - The command-line argument list
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
+	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
+	const skipCompare = hasFlag(argv, "--skip-compare");
+	const clean = hasFlag(argv, "--clean");
+
+	const originalBranch = getCurrentBranch();
+
+	try {
+		if (clean && existsSync(bundleAnalysisDirectory)) {
+			console.log(`\nCleaning bundleAnalysis directory...`);
+			rmSync(bundleAnalysisDirectory, { recursive: true });
+		}
+
+		// Stash local changes before switching branches
+		const hasStash = stashChanges();
+
+		try {
+			// Collect base branch stats
+			if (originalBranch !== baseBranch) {
+				checkoutBranch(baseBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(baseBranch));
+
+			// Collect current branch stats
+			if (originalBranch !== currentBranch && baseBranch !== currentBranch) {
+				checkoutBranch(currentBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(currentBranch));
+
+			// Return to original branch
+			if (originalBranch !== currentBranch && originalBranch !== baseBranch) {
+				checkoutBranch(originalBranch);
+			}
+		} finally {
+			// Restore stashed changes if any were made
+			if (hasStash) {
+				console.log("\nEnabling corepack and installing dependencies for original branch...");
+				execSync("corepack enable", {
+					cwd: repoRoot,
+					stdio: "inherit",
+				});
+				execSync("pnpm install", {
+					cwd: repoRoot,
+					stdio: "inherit",
+				});
+				restoreStash();
+			}
+		}
+
+		// Run comparison unless skipped
+		if (!skipCompare) {
+			console.log(`\n${"=".repeat(80)}`);
+			console.log("Running bundle comparison...");
+			console.log("=".repeat(80));
+
+			const compareScript = resolve(scriptDirectory, "compareBundles.ts");
+			const result = spawnSync(
+				"tsx",
+				[
+					"--tsconfig",
+					resolve(packageRoot, "tsconfig.scripts.json"),
+					compareScript,
+					"--base-branch",
+					baseBranch,
+					"--current-branch",
+					currentBranch,
+					"--analysis-dir",
+					packageRoot,
+				],
+				{
+					cwd: packageRoot,
+					stdio: "inherit",
+				},
+			);
+
+			if (result.status !== 0 && result.status !== null) {
+				throw new Error(`Comparison script exited with code ${result.status}`);
+			}
+		}
+
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("✓ Bundle collection and comparison complete!");
+		console.log("=".repeat(80));
+	} catch (error) {
+		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
+		throw error;
+	}
+}
+
+main(process.argv.slice(2));
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
new file mode 100644
index 000000000000..34900543a801
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -0,0 +1,492 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { gunzipSync, gzipSync } from "node:zlib";
+
+import { decode } from "@msgpack/msgpack";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const defaultAnalysisDirectory = resolve(scriptDirectory, "..");
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ * Supports both "--option value" and "--option=value" formats.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract (e.g., "--base-branch")
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for (e.g., "--help")
+ * @returns True if the flag is present, false otherwise
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+// eslint-disable-next-line unicorn/prefer-string-replace-all
+function sanitizeForFileName(value: string): string {
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/** Represents a single asset in a bundle. */
+interface AssetStat {
+	/** The name of the asset (e.g., "bundle.js") */
+	name: string;
+	/** The parsed size of the asset in bytes */
+	size?: number;
+}
+
+/** Represents aggregated statistics for a bundle build. */
+interface BundleStats {
+	/** Array of assets and their sizes */
+	assets?: AssetStat[];
+	/** Entrypoint names mapped to their constituent assets and sizes */
+	entrypoints?: Record<string, { assets?: { size?: number }[] }>;
+}
+
+/**
+ * Loads and deserializes bundle statistics from a MessagePack-compressed file.
+ * If the file does not exist, returns an empty stats object and logs a warning.
+ *
+ * @param analysisDirectory - The base analysis directory
+ * @param label - The label subdirectory (typically derived from branch name)
+ * @returns Parsed bundle statistics, or empty stats if file not found
+ */
+function loadStats(analysisDirectory: string, label: string): BundleStats {
+	const statsFilePath = resolve(
+		analysisDirectory,
+		"bundleAnalysis",
+		label,
+		"bundleStats.msp.gz",
+	);
+	if (!existsSync(statsFilePath)) {
+		console.warn(
+			`Warning: Bundle stats not found at "${statsFilePath}". ` +
+				`Returning empty stats (all assets will be treated as size 0).`,
+		);
+		return { assets: [], entrypoints: {} };
+	}
+
+	const compressedData = readFileSync(statsFilePath);
+	const decompressedData = gunzipSync(compressedData);
+	return decode(decompressedData) as BundleStats;
+}
+
+/**
+ * Calculates the gzip-compressed size of a file using maximum compression level.
+ *
+ * @param filePath - The path to the file
+ * @returns The gzip-compressed size in bytes, or undefined if the file cannot be read
+ */
+function gzipSize(filePath: string): number | undefined {
+	try {
+		return gzipSync(readFileSync(filePath), { level: 9 }).length;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Provides dual console and text file output for bundle comparison reports.
+ */
+class Reporter {
+	private readonly outputLines: string[] = [];
+
+	/**
+	 * Prints a line to both console and internal buffer.
+	 *
+	 * @param line - The line to print (defaults to empty string)
+	 */
+	print(line = ""): void {
+		console.log(line);
+		this.outputLines.push(line);
+	}
+
+	/**
+	 * Prints a section header with spacing.
+	 *
+	 * @param title - The section title
+	 */
+	section(title: string): void {
+		this.print();
+		this.print(title);
+	}
+
+	/**
+	 * Prints a table header with a divider line.
+	 *
+	 * @param header - The header text
+	 * @param dividerLength - The length of the divider line
+	 */
+	tableHeader(header: string, dividerLength: number): void {
+		this.print(header);
+		this.print("-".repeat(dividerLength));
+	}
+
+	/**
+	 * Returns all accumulated output as a single text string.
+	 *
+	 * @returns The full text output
+	 */
+	toText(): string {
+		return `${this.outputLines.join("\n")}\n`;
+	}
+}
+
+/** Represents a comparison row for a single asset between two builds. */
+interface CompareRow {
+	/** The asset name */
+	name: string;
+	/** The parsed size in the base build */
+	baseStatSize: number;
+	/** The parsed size in the current build */
+	currentStatSize: number;
+}
+
+/**
+ * Formats an asset comparison row for tabular display.
+ * Includes name, base size, current size, diff, and percentage change.
+ *
+ * @param row - The comparison row to format
+ * @returns A formatted string suitable for console output
+ */
+function formatAssetRow(row: CompareRow): string {
+	const diff = row.currentStatSize - row.baseStatSize;
+	const percentChange =
+		row.baseStatSize > 0 && diff !== 0
+			? `${((diff / row.baseStatSize) * 100).toFixed(1)}%`
+			: "";
+	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
+
+	return (
+		(row.name + (diff === 0 ? "" : " *")).padEnd(40) +
+		String(row.baseStatSize).padStart(12) +
+		String(row.currentStatSize).padStart(12) +
+		diffStr.padStart(12) +
+		percentChange.padStart(10)
+	);
+}
+
+/**
+ * Formats an entrypoint comparison row for tabular display.
+ * Includes entrypoint name, base size, current size, and diff.
+ *
+ * @param entrypointName - The name of the entrypoint
+ * @param baseSize - The total parsed size of assets in the base entrypoint
+ * @param currentSize - The total parsed size of assets in the current entrypoint
+ * @returns A formatted string suitable for console output
+ */
+function formatEntrypointRow(
+	entrypointName: string,
+	baseSize: number,
+	currentSize: number,
+): string {
+	const diff = currentSize - baseSize;
+	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
+	return (
+		entrypointName.padEnd(30) +
+		String(baseSize).padStart(12) +
+		String(currentSize).padStart(12) +
+		diffStr.padStart(12)
+	);
+}
+
+/** Parsed command-line options for the bundle comparison script. */
+interface Options {
+	/** Branch name for the base build (default: "main") */
+	baseBranch: string;
+	/** Branch name for the current build (default: current branch or BUILD_SOURCEBRANCHNAME) */
+	currentBranch: string;
+	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/\{label\}/ (default: examples/utils/bundle-size-tests) */
+	analysisDirectory: string;
+}
+
+/**
+ * Parses command-line arguments into an Options object.
+ * Reads BUILD_SOURCEBRANCHNAME environment variable for current branch if not provided.
+ *
+ * @param argv - The command-line argument list
+ * @returns Parsed options with defaults applied
+ */
+function parseOptions(argv: string[]): Options {
+	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
+	const currentBranch =
+		getOptionValue(argv, "--current-branch") ??
+		process.env.BUILD_SOURCEBRANCHNAME ??
+		"current";
+	const analysisDirectory = resolve(
+		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
+	);
+
+	return { baseBranch, currentBranch, analysisDirectory };
+}
+
+/**
+ * Writes comparison results to both text and JSON output files.
+ * Creates the output directory if it does not exist.
+ * File names are derived from sanitized branch names (e.g., "compare-main-to-dev.txt").
+ *
+ * @param outputDirectory - The directory where output files will be written
+ * @param baseBranch - The base branch name (used in output filename)
+ * @param currentBranch - The current branch name (used in output filename)
+ * @param textContent - The formatted text comparison report
+ * @param jsonObject - The structured comparison data as a JSON-serializable object
+ */
+
+function writeOutputFiles(
+	outputDirectory: string,
+	baseBranch: string,
+	currentBranch: string,
+	textContent: string,
+	jsonObject: object,
+): void {
+	mkdirSync(outputDirectory, { recursive: true });
+
+	const baseRevision = sanitizeForFileName(baseBranch);
+	const currentRevision = sanitizeForFileName(currentBranch);
+	const outputBaseName = `compare-${baseRevision}-to-${currentRevision}`;
+	const textOutputPath = resolve(outputDirectory, `${outputBaseName}.txt`);
+	const jsonOutputPath = resolve(outputDirectory, `${outputBaseName}.json`);
+
+	writeFileSync(textOutputPath, textContent);
+	writeFileSync(jsonOutputPath, `${JSON.stringify(jsonObject, undefined, 2)}\n`);
+
+	console.log("\nWrote comparison outputs:");
+	console.log(`  ${textOutputPath}`);
+	console.log(`  ${jsonOutputPath}`);
+}
+
+/**
+ * Prints the help text describing usage, options, and examples for the script.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  tsx ./scripts/compareBundles.ts [options]
+
+Options:
+  --help, -h
+    Show this help text and exit.
+
+  --base-branch <name>    Base branch name (default: main)
+  --current-branch <name> Current branch name (default: BUILD_SOURCEBRANCHNAME or current)
+  --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
+                          under bundleAnalysis/{label}/ (default: examples/utils/bundle-size-tests)
+
+Examples:
+  tsx ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
+  tsx ./scripts/compareBundles.ts --analysis-dir examples/utils/bundle-size-tests
+`);
+}
+
+/** Represents gzip size comparison data for a single asset. */
+interface GzipRow {
+	/** The asset name */
+	name: string;
+	/** Gzip-compressed size of the asset in the base build (if available) */
+	baseGzipSize?: number;
+	/** Gzip-compressed size of the asset in the current build (if available) */
+	currentGzipSize?: number;
+	/** Difference in gzip size (current - base) */
+	diff?: number;
+}
+
+/** Represents entrypoint comparison data from parsed bundle statistics. */
+interface EntrypointRow {
+	/** The entrypoint name */
+	entrypointName: string;
+	/** Total parsed size of assets in the base entrypoint */
+	baseSize: number;
+	/** Total parsed size of assets in the current entrypoint */
+	currentSize: number;
+	/** Difference in total size (current - base) */
+	diff: number;
+}
+
+/**
+ * Main entry point for the bundle comparison script.
+ * Loads statistics from base and current builds, compares assets and entrypoints,
+ * and generates both console and file-based reports (text and JSON).
+ *
+ * @param argv - The command-line argument list (typically process.argv)
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const options = parseOptions(argv);
+	const reporter = new Reporter();
+
+	// Derive labels and directories from branch names
+	const baseLabel = sanitizeForFileName(options.baseBranch);
+	const currentLabel = sanitizeForFileName(options.currentBranch);
+	const outputDirectory = resolve(options.analysisDirectory, "bundleAnalysis");
+	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
+	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
+
+	const baseStats = loadStats(options.analysisDirectory, baseLabel);
+	const currentStats = loadStats(options.analysisDirectory, currentLabel);
+
+	const baseAssets = Object.fromEntries(
+		(baseStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
+	const currentAssets = Object.fromEntries(
+		(currentStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
+
+	const rows: CompareRow[] = [
+		...new Set([...Object.keys(baseAssets), ...Object.keys(currentAssets)]),
+	]
+		.sort()
+		.map((name) => ({
+			name,
+			baseStatSize: baseAssets[name]?.size ?? 0,
+			currentStatSize: currentAssets[name]?.size ?? 0,
+		}));
+
+	reporter.section(
+		`=== Bundle Size Comparison: ${options.baseBranch} -> ${options.currentBranch} ===`,
+	);
+	reporter.section("All assets (stat/parsed size in bytes):");
+	reporter.tableHeader(
+		"Asset".padEnd(40) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12) +
+			"% Change".padStart(10),
+		88,
+	);
+	for (const row of rows) {
+		reporter.print(formatAssetRow(row));
+	}
+
+	const changedRows = rows.filter((row) => row.currentStatSize !== row.baseStatSize);
+	const gzipRows: GzipRow[] = [];
+	if (changedRows.length > 0) {
+		reporter.section("=== Gzip sizes for changed assets ===");
+		reporter.tableHeader(
+			"Asset".padEnd(40) +
+				"Base Gzip".padStart(14) +
+				"Current Gzip".padStart(14) +
+				"Diff".padStart(12),
+			82,
+		);
+
+		for (const row of changedRows) {
+			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name));
+			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name));
+
+			if (baseGzipSize !== undefined && currentGzipSize !== undefined) {
+				const diff = currentGzipSize - baseGzipSize;
+				const line =
+					row.name.padEnd(40) +
+					String(baseGzipSize).padStart(14) +
+					String(currentGzipSize).padStart(14) +
+					`${diff > 0 ? "+" : ""}${diff}`.padStart(12);
+				reporter.print(line);
+				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize, diff });
+			} else {
+				reporter.print(`${row.name.padEnd(40)}(base/current build not found)`);
+				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize });
+			}
+		}
+	}
+
+	const baseEntrypoints = baseStats.entrypoints ?? {};
+	const currentEntrypoints = currentStats.entrypoints ?? {};
+	const entrypointRows: EntrypointRow[] = [];
+	const namedEntrypoints = [
+		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
+	]
+		.filter((entrypointName) => !/^\d/.test(entrypointName))
+		.sort();
+
+	reporter.section("=== Named entrypoint total asset sizes ===");
+	reporter.tableHeader(
+		"Entrypoint".padEnd(30) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12),
+		68,
+	);
+	for (const entrypointName of namedEntrypoints) {
+		const baseSize = (baseEntrypoints[entrypointName]?.assets ?? []).reduce(
+			(sum, asset) => sum + (asset?.size ?? 0),
+			0,
+		);
+		const currentSize = (currentEntrypoints[entrypointName]?.assets ?? []).reduce(
+			(sum, asset) => sum + (asset?.size ?? 0),
+			0,
+		);
+		reporter.print(formatEntrypointRow(entrypointName, baseSize, currentSize));
+		entrypointRows.push({
+			entrypointName,
+			baseSize,
+			currentSize,
+			diff: currentSize - baseSize,
+		});
+	}
+
+	writeOutputFiles(
+		outputDirectory,
+		options.baseBranch,
+		options.currentBranch,
+		reporter.toText(),
+		{
+			comparedAt: new Date().toISOString(),
+			baseBranch: options.baseBranch,
+			currentBranch: options.currentBranch,
+			analysisDirectory: options.analysisDirectory,
+			assets: rows.map((row) => ({
+				name: row.name,
+				baseStatSize: row.baseStatSize,
+				currentStatSize: row.currentStatSize,
+				diff: row.currentStatSize - row.baseStatSize,
+			})),
+			gzipChangedAssets: gzipRows,
+			entrypoints: entrypointRows,
+		},
+	);
+}
+
+main(process.argv);
diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
new file mode 100644
index 000000000000..ed6f739caa70
--- /dev/null
+++ b/examples/utils/bundle-size-tests/tsconfig.scripts.json
@@ -0,0 +1,9 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"noEmit": true,
+		"types": ["node"],
+		"exactOptionalPropertyTypes": false
+	},
+	"include": ["scripts/**/*.ts"]
+}

From ba0a8ba6e899b4f3e028c13e2d02a54051c1737d Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 23 Apr 2026 21:03:46 -0700
Subject: [PATCH 08/67] Minor fix.

---
 .../scripts/collectAndCompareBundles.ts       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index d1a3a9ba1c1d..f8f769ce704e 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -252,17 +252,17 @@ function main(argv: string[]): void {
 				checkoutBranch(originalBranch);
 			}
 		} finally {
-			// Restore stashed changes if any were made
+			// Always ensure original branch has fresh dependencies and restore stash if needed
+			console.log("\nEnabling corepack and installing dependencies for original branch...");
+			execSync("corepack enable", {
+				cwd: repoRoot,
+				stdio: "inherit",
+			});
+			execSync("pnpm install", {
+				cwd: repoRoot,
+				stdio: "inherit",
+			});
 			if (hasStash) {
-				console.log("\nEnabling corepack and installing dependencies for original branch...");
-				execSync("corepack enable", {
-					cwd: repoRoot,
-					stdio: "inherit",
-				});
-				execSync("pnpm install", {
-					cwd: repoRoot,
-					stdio: "inherit",
-				});
 				restoreStash();
 			}
 		}

From d674f2511db22de86219bd3b223e8d336b32fd73 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 09:38:15 -0700
Subject: [PATCH 09/67] Split collect and compare script.

---
 examples/utils/bundle-size-tests/package.json |   3 +-
 .../scripts/collectAndCompareBundles.ts       | 267 +++--------------
 .../scripts/collectBundles.ts                 | 277 ++++++++++++++++++
 3 files changed, 313 insertions(+), 234 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/collectBundles.ts

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 81a75759355b..d638ebaf0a42 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,7 +21,8 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"collect:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectAndCompareBundles.ts",
+		"collect:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectBundles.ts",
+		"collect:compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectAndCompareBundles.ts",
 		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index f8f769ce704e..53b0800e5bb3 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -3,8 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { execSync, spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import { spawnSync } from "node:child_process";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -12,173 +11,41 @@ const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
 /**
- * Gets the repository root directory.
- *
- * @returns The absolute path to the repository root
- */
-function getRepoRoot(): string {
-	return execSync("git rev-parse --show-toplevel", {
-		encoding: "utf-8",
-	}).trim();
-}
-
-const repoRoot = getRepoRoot();
-const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
-
-/**
- * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
- *
- * @param value - The string to sanitize
- * @returns The sanitized string safe for use as a filename
- */
-function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all
-	return value.replace(/[^\w.-]/g, "_");
-}
-
-/**
- * Gets the current git branch name.
+ * Checks if a flag is present in the command-line argument list.
  *
- * @returns The current branch name
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for
+ * @returns True if the flag is present, false otherwise
  */
-function getCurrentBranch(): string {
-	return execSync("git rev-parse --abbrev-ref HEAD", {
-		cwd: packageRoot,
-		encoding: "utf-8",
-	}).trim();
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
 }
 
 /**
- * Stashes current changes if any exist.
+ * Runs a script with tsx and inherited stdio.
  *
- * @returns True if changes were stashed, false otherwise
+ * @param scriptName - Script file name under ./scripts/
+ * @param scriptArgs - Arguments to forward to the script
  */
-function stashChanges(): boolean {
-	try {
-		const output = execSync("git stash push -u", {
+function runScript(scriptName: string, scriptArgs: string[]): void {
+	const scriptPath = resolve(scriptDirectory, scriptName);
+	const result = spawnSync(
+		"tsx",
+		[
+			"--tsconfig",
+			resolve(packageRoot, "tsconfig.scripts.json"),
+			scriptPath,
+			...scriptArgs,
+		],
+		{
 			cwd: packageRoot,
-			encoding: "utf-8",
-		}).trim();
-		// If nothing was stashed, output says "No local changes to save"
-		if (output && !output.includes("No local changes")) {
-			console.log("Stashed local changes");
-			return true;
-		}
-		return false;
-	} catch {
-		return false;
-	}
-}
-
-/**
- * Restores the most recent stash.
- */
-function restoreStash(): void {
-	try {
-		execSync("git stash pop", {
-			cwd: packageRoot,
-			encoding: "utf-8",
-		});
-		console.log("Restored stashed changes");
-	} catch (error) {
-		console.warn(
-			"Could not restore stashed changes:",
-			error instanceof Error ? error.message : String(error),
-		);
-	}
-}
-
-/**
- * Checks out a git branch without force (preserves untracked files like bundleAnalysis/).
- *
- * @param branchName - The branch to check out
- */
-function checkoutBranch(branchName: string): void {
-	console.log(`\nChecking out branch: ${branchName}`);
-	execSync(`git checkout ${branchName}`, {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-
-	console.log("Enabling corepack and installing dependencies...");
-	execSync("corepack enable", {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-	execSync("pnpm install", {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Builds bundles using webpack.
- */
-function buildBundles(): void {
-	console.log("\nBuilding bundles with webpack...");
-	execSync("npm run webpack", {
-		cwd: packageRoot,
-		stdio: "inherit",
-	});
-}
+			stdio: "inherit",
+		},
+	);
 
-/**
- * Saves the generated stats file to a label-specific subdirectory.
- * Assumes webpack has just run and created bundleAnalysis/bundleStats.msp.gz.
- *
- * @param label - The label for this build (e.g., "main", "feature_branch")
- */
-function saveStats(label: string): void {
-	const tempStatsPath = resolve(bundleAnalysisDirectory, "bundleStats.msp.gz");
-	const labelDirectory = resolve(bundleAnalysisDirectory, label);
-	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
-
-	if (!existsSync(tempStatsPath)) {
-		throw new Error(
-			`Bundle stats not found at ${tempStatsPath}. ` + `Check that webpack ran successfully.`,
-		);
-	}
-
-	mkdirSync(labelDirectory, { recursive: true });
-	renameSync(tempStatsPath, destStatsPath);
-	console.log(`Saved stats to: ${destStatsPath}`);
-}
-
-/**
- * Extracts the value of a command-line option from the argument list.
- *
- * @param argv - The command-line argument list
- * @param optionName - The name of the option to extract
- * @returns The option value, or undefined if not found
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
+	if (result.status !== 0 && result.status !== null) {
+		throw new Error(`Script ${scriptName} exited with code ${result.status}`);
 	}
-
-	return argv[index + 1];
-}
-
-/**
- * Checks if a flag is present in the command-line argument list.
- *
- * @param argv - The command-line argument list
- * @param flagName - The flag to check for
- * @returns True if the flag is present, false otherwise
- */
-function hasFlag(argv: string[], flagName: string): boolean {
-	return argv.includes(flagName);
 }
 
 /**
@@ -194,7 +61,7 @@ Options:
     Show this help text and exit.
 
   --base-branch <name>    Base branch name (default: main)
-  --current-branch <name> Current branch name (default: current git branch)
+  --current-branch <name> Current branch name (default: current git branch or CI branch)
   --skip-compare          Collect stats only, skip the comparison step
   --clean                 Remove bundleAnalysis directory before starting
 
@@ -206,7 +73,7 @@ Examples:
 }
 
 /**
- * Main entry point: collects bundle stats from two branches and runs comparison.
+ * Main entry point: runs collection followed by comparison.
  *
  * @param argv - The command-line argument list
  */
@@ -216,86 +83,20 @@ function main(argv: string[]): void {
 		return;
 	}
 
-	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
-	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
 	const skipCompare = hasFlag(argv, "--skip-compare");
-	const clean = hasFlag(argv, "--clean");
-
-	const originalBranch = getCurrentBranch();
+	const collectionArgs = argv.filter((arg) => arg !== "--skip-compare");
 
 	try {
-		if (clean && existsSync(bundleAnalysisDirectory)) {
-			console.log(`\nCleaning bundleAnalysis directory...`);
-			rmSync(bundleAnalysisDirectory, { recursive: true });
-		}
-
-		// Stash local changes before switching branches
-		const hasStash = stashChanges();
-
-		try {
-			// Collect base branch stats
-			if (originalBranch !== baseBranch) {
-				checkoutBranch(baseBranch);
-			}
-			buildBundles();
-			saveStats(sanitizeForFileName(baseBranch));
-
-			// Collect current branch stats
-			if (originalBranch !== currentBranch && baseBranch !== currentBranch) {
-				checkoutBranch(currentBranch);
-			}
-			buildBundles();
-			saveStats(sanitizeForFileName(currentBranch));
-
-			// Return to original branch
-			if (originalBranch !== currentBranch && originalBranch !== baseBranch) {
-				checkoutBranch(originalBranch);
-			}
-		} finally {
-			// Always ensure original branch has fresh dependencies and restore stash if needed
-			console.log("\nEnabling corepack and installing dependencies for original branch...");
-			execSync("corepack enable", {
-				cwd: repoRoot,
-				stdio: "inherit",
-			});
-			execSync("pnpm install", {
-				cwd: repoRoot,
-				stdio: "inherit",
-			});
-			if (hasStash) {
-				restoreStash();
-			}
-		}
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("Collecting bundle stats...");
+		console.log("=".repeat(80));
+		runScript("collectBundles.ts", collectionArgs);
 
-		// Run comparison unless skipped
 		if (!skipCompare) {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log("Running bundle comparison...");
 			console.log("=".repeat(80));
-
-			const compareScript = resolve(scriptDirectory, "compareBundles.ts");
-			const result = spawnSync(
-				"tsx",
-				[
-					"--tsconfig",
-					resolve(packageRoot, "tsconfig.scripts.json"),
-					compareScript,
-					"--base-branch",
-					baseBranch,
-					"--current-branch",
-					currentBranch,
-					"--analysis-dir",
-					packageRoot,
-				],
-				{
-					cwd: packageRoot,
-					stdio: "inherit",
-				},
-			);
-
-			if (result.status !== 0 && result.status !== null) {
-				throw new Error(`Comparison script exited with code ${result.status}`);
-			}
+			runScript("compareBundles.ts", collectionArgs);
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
new file mode 100644
index 000000000000..f720fc2395e6
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { execSync } from "node:child_process";
+import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const packageRoot = resolve(scriptDirectory, "..");
+
+/**
+ * Gets the repository root directory.
+ *
+ * @returns The absolute path to the repository root
+ */
+function getRepoRoot(): string {
+	return execSync("git rev-parse --show-toplevel", {
+		encoding: "utf-8",
+	}).trim();
+}
+
+const repoRoot = getRepoRoot();
+const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
+
+/**
+ * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+function sanitizeForFileName(value: string): string {
+	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/**
+ * Gets the current git branch name.
+ *
+ * @returns The current branch name
+ */
+function getCurrentBranch(): string {
+	return execSync("git rev-parse --abbrev-ref HEAD", {
+		cwd: packageRoot,
+		encoding: "utf-8",
+	}).trim();
+}
+
+/**
+ * Stashes current changes if any exist.
+ *
+ * @returns True if changes were stashed, false otherwise
+ */
+function stashChanges(): boolean {
+	try {
+		const output = execSync("git stash push -u", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		}).trim();
+		// If nothing was stashed, output says "No local changes to save"
+		if (output && !output.includes("No local changes")) {
+			console.log("Stashed local changes");
+			return true;
+		}
+		return false;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Restores the most recent stash.
+ */
+function restoreStash(): void {
+	try {
+		execSync("git stash pop", {
+			cwd: packageRoot,
+			encoding: "utf-8",
+		});
+		console.log("Restored stashed changes");
+	} catch (error) {
+		console.warn(
+			"Could not restore stashed changes:",
+			error instanceof Error ? error.message : String(error),
+		);
+	}
+}
+
+/**
+ * Checks out a git branch without force (preserves untracked files like bundleAnalysis/).
+ *
+ * @param branchName - The branch to check out
+ */
+function checkoutBranch(branchName: string): void {
+	console.log(`\nChecking out branch: ${branchName}`);
+	execSync(`git checkout ${branchName}`, {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+
+	console.log("Enabling corepack and installing dependencies...");
+	execSync("corepack enable", {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+	execSync("pnpm install", {
+		cwd: repoRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Builds bundles using webpack.
+ */
+function buildBundles(): void {
+	console.log("\nBuilding bundles with webpack...");
+	execSync("npm run webpack", {
+		cwd: packageRoot,
+		stdio: "inherit",
+	});
+}
+
+/**
+ * Saves the generated stats file to a label-specific subdirectory.
+ * Assumes webpack has just run and created bundleAnalysis/bundleStats.msp.gz.
+ *
+ * @param label - The label for this build (e.g., "main", "feature_branch")
+ */
+function saveStats(label: string): void {
+	const tempStatsPath = resolve(bundleAnalysisDirectory, "bundleStats.msp.gz");
+	const labelDirectory = resolve(bundleAnalysisDirectory, label);
+	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
+
+	if (!existsSync(tempStatsPath)) {
+		throw new Error(
+			`Bundle stats not found at ${tempStatsPath}. ` + `Check that webpack ran successfully.`,
+		);
+	}
+
+	mkdirSync(labelDirectory, { recursive: true });
+	renameSync(tempStatsPath, destStatsPath);
+	console.log(`Saved stats to: ${destStatsPath}`);
+}
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param flagName - The flag to check for
+ * @returns True if the flag is present, false otherwise
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Prints the help text describing usage and options.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  tsx ./scripts/collectBundles.ts [options]
+
+Options:
+  --help, -h
+    Show this help text and exit.
+
+  --base-branch <name>    Base branch name (default: main)
+  --current-branch <name> Current branch name (default: current git branch)
+  --clean                 Remove bundleAnalysis directory before starting
+
+Examples:
+  tsx ./scripts/collectBundles.ts
+  tsx ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
+  tsx ./scripts/collectBundles.ts --clean
+`);
+}
+
+/**
+ * Main entry point: collects bundle stats from two branches.
+ *
+ * @param argv - The command-line argument list
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
+	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
+	const clean = hasFlag(argv, "--clean");
+
+	const originalBranch = getCurrentBranch();
+
+	try {
+		if (clean && existsSync(bundleAnalysisDirectory)) {
+			console.log(`\nCleaning bundleAnalysis directory...`);
+			rmSync(bundleAnalysisDirectory, { recursive: true });
+		}
+
+		// Stash local changes before switching branches
+		const hasStash = stashChanges();
+
+		try {
+			// Collect base branch stats
+			if (originalBranch !== baseBranch) {
+				checkoutBranch(baseBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(baseBranch));
+
+			// Collect current branch stats
+			if (originalBranch !== currentBranch && baseBranch !== currentBranch) {
+				checkoutBranch(currentBranch);
+			}
+			buildBundles();
+			saveStats(sanitizeForFileName(currentBranch));
+
+			// Return to original branch
+			if (originalBranch !== currentBranch && originalBranch !== baseBranch) {
+				checkoutBranch(originalBranch);
+			}
+		} finally {
+			// Always ensure original branch has fresh dependencies and restore stash if needed
+			console.log("\nEnabling corepack and installing dependencies for original branch...");
+			execSync("corepack enable", {
+				cwd: repoRoot,
+				stdio: "inherit",
+			});
+			execSync("pnpm install", {
+				cwd: repoRoot,
+				stdio: "inherit",
+			});
+			if (hasStash) {
+				restoreStash();
+			}
+		}
+
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("✓ Bundle collection complete!");
+		console.log("=".repeat(80));
+	} catch (error) {
+		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
+		throw error;
+	}
+}
+
+main(process.argv.slice(2));

From 0e92d863c210abadded0a6088a4fa147d329a769 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 12:28:46 -0700
Subject: [PATCH 10/67] Various safety improvements. Added an option to do a
 clean build.

---
 .../scripts/collectAndCompareBundles.ts       | 101 ++++-
 .../scripts/collectBundles.ts                 | 424 +++++++++++++++---
 .../scripts/compareBundles.ts                 |  15 +-
 3 files changed, 466 insertions(+), 74 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 53b0800e5bb3..d349d86ea6a8 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -4,12 +4,33 @@
  */
 
 import { spawnSync } from "node:child_process";
+import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
+/**
+ * Path to the tsx CLI entrypoint.
+ *
+ * `tsx`'s package.json `exports` map does not expose `./dist/cli.mjs` directly,
+ * but its `bin` field points to it. We resolve the package's own package.json
+ * (always exported) and then resolve the bin path relative to that.
+ */
+const tsxCliPath = (() => {
+	const req = createRequire(import.meta.url);
+	const tsxPackageJsonPath = req.resolve("tsx/package.json");
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+	const tsxPackageJson = req("tsx/package.json") as { bin?: string | Record<string, string> };
+	const binField = tsxPackageJson.bin;
+	const binRelPath = typeof binField === "string" ? binField : binField?.tsx;
+	if (binRelPath === undefined) {
+		throw new Error("Unable to locate tsx CLI via its package.json bin field.");
+	}
+	return resolve(dirname(tsxPackageJsonPath), binRelPath);
+})();
+
 /**
  * Checks if a flag is present in the command-line argument list.
  *
@@ -24,14 +45,18 @@ function hasFlag(argv: string[], flagName: string): boolean {
 /**
  * Runs a script with tsx and inherited stdio.
  *
+ * Invokes the local tsx CLI directly via `process.execPath` to avoid relying
+ * on `tsx` being on PATH (which is flaky on Windows / npm script contexts).
+ *
  * @param scriptName - Script file name under ./scripts/
  * @param scriptArgs - Arguments to forward to the script
  */
 function runScript(scriptName: string, scriptArgs: string[]): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
 	const result = spawnSync(
-		"tsx",
+		process.execPath,
 		[
+			tsxCliPath,
 			"--tsconfig",
 			resolve(packageRoot, "tsconfig.scripts.json"),
 			scriptPath,
@@ -43,8 +68,15 @@ function runScript(scriptName: string, scriptArgs: string[]): void {
 		},
 	);
 
-	if (result.status !== 0 && result.status !== null) {
-		throw new Error(`Script ${scriptName} exited with code ${result.status}`);
+	if (result.error !== undefined) {
+		throw new Error(
+			`Failed to launch script ${scriptName}: ${result.error.message}`,
+		);
+	}
+	if (result.status !== 0) {
+		throw new Error(
+			`Script ${scriptName} exited with code ${result.status ?? "null (signal)"}.`,
+		);
 	}
 }
 
@@ -63,15 +95,42 @@ Options:
   --base-branch <name>    Base branch name (default: main)
   --current-branch <name> Current branch name (default: current git branch or CI branch)
   --skip-compare          Collect stats only, skip the comparison step
-  --clean                 Remove bundleAnalysis directory before starting
+  --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
+  --force-clean-build     Run a full workspace clean (fluid-build --task clean) at each
+                          revision before building. By default we rely on fluid-build's
+                          incremental detection.
+  --restore-only          Do not collect or compare. Use the state file left by a previous
+                          aborted run to check out the original branch, reinstall
+                          dependencies, and pop the matching stash (if any).
 
 Examples:
   tsx ./scripts/collectAndCompareBundles.ts
   tsx ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/collectAndCompareBundles.ts --clean --skip-compare
+  tsx ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
+  tsx ./scripts/collectAndCompareBundles.ts --force-clean-build
+  tsx ./scripts/collectAndCompareBundles.ts --restore-only
 `);
 }
 
+/**
+ * Extracts the value of a command-line option from the argument list.
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+	return argv[index + 1];
+}
+
 /**
  * Main entry point: runs collection followed by comparison.
  *
@@ -83,20 +142,46 @@ function main(argv: string[]): void {
 		return;
 	}
 
+	// Restore-only short-circuits: delegate to collectBundles and skip comparison.
+	if (hasFlag(argv, "--restore-only")) {
+		runScript("collectBundles.ts", ["--restore-only"]);
+		return;
+	}
+
+	const baseBranch = getOptionValue(argv, "--base-branch");
+	const currentBranch = getOptionValue(argv, "--current-branch");
 	const skipCompare = hasFlag(argv, "--skip-compare");
-	const collectionArgs = argv.filter((arg) => arg !== "--skip-compare");
+	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
+	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
+
+	const collectArgs: string[] = [];
+	const compareArgs: string[] = [];
+	if (baseBranch !== undefined) {
+		collectArgs.push("--base-branch", baseBranch);
+		compareArgs.push("--base-branch", baseBranch);
+	}
+	if (currentBranch !== undefined) {
+		collectArgs.push("--current-branch", currentBranch);
+		compareArgs.push("--current-branch", currentBranch);
+	}
+	if (cleanAnalysisDir) {
+		collectArgs.push("--clean-analysis-dir");
+	}
+	if (forceCleanBuildFlag) {
+		collectArgs.push("--force-clean-build");
+	}
 
 	try {
 		console.log(`\n${"=".repeat(80)}`);
 		console.log("Collecting bundle stats...");
 		console.log("=".repeat(80));
-		runScript("collectBundles.ts", collectionArgs);
+		runScript("collectBundles.ts", collectArgs);
 
 		if (!skipCompare) {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log("Running bundle comparison...");
 			console.log("=".repeat(80));
-			runScript("compareBundles.ts", collectionArgs);
+			runScript("compareBundles.ts", compareArgs);
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index f720fc2395e6..8d568306667d 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -4,13 +4,39 @@
  */
 
 import { execSync } from "node:child_process";
-import { existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import {
+	existsSync,
+	mkdirSync,
+	readFileSync,
+	renameSync,
+	rmSync,
+	writeFileSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
+/**
+ * Environment for all child processes we spawn.
+ *
+ * This script is itself launched via `tsx --tsconfig ./tsconfig.scripts.json`
+ * (see the `collect:bundles` npm script). tsx propagates that choice to
+ * subprocesses via the `TSX_TSCONFIG_PATH` env var. If we inherit it blindly,
+ * any child that also runs tsx (e.g. fluid-build -> `tsx scripts/print-configs.ts`
+ * in @fluidframework/eslint-config-fluid) will try to load `./tsconfig.scripts.json`
+ * relative to its own cwd and fail. We also strip `TSX_TSCONFIG_CONTENT` for the
+ * same reason. Everything else is inherited normally.
+ */
+const childEnv: NodeJS.ProcessEnv = (() => {
+	const env = { ...process.env };
+	delete env.TSX_TSCONFIG_PATH;
+	delete env.TSX_TSCONFIG_CONTENT;
+	return env;
+})();
+
 /**
  * Gets the repository root directory.
  *
@@ -19,11 +45,51 @@ const packageRoot = resolve(scriptDirectory, "..");
 function getRepoRoot(): string {
 	return execSync("git rev-parse --show-toplevel", {
 		encoding: "utf-8",
+		env: childEnv,
 	}).trim();
 }
 
 const repoRoot = getRepoRoot();
-const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
+
+/**
+ * Root of persistent state for collect/compare runs.
+ * Lives in the OS temp directory so it survives:
+ *   - `git checkout` between branches (which would overwrite in-tree untracked files)
+ *   - `npm run clean` (which rimrafs bundleAnalysis/ under the package)
+ */
+const analysisRoot = resolve(tmpdir(), "fluid-bundle-compare");
+
+/**
+ * Where saved bundle stats live, keyed by sanitized branch label.
+ * compareBundles.ts reads from `<analysisRoot>/bundleAnalysis/<label>/bundleStats.msp.gz`.
+ */
+const bundleAnalysisDirectory = resolve(analysisRoot, "bundleAnalysis");
+
+/**
+ * State file used to coordinate restore after an aborted run.
+ * Written before the first branch switch; removed on clean exit.
+ */
+const stateFilePath = resolve(analysisRoot, "state.json");
+
+/**
+ * Webpack writes its raw output here (inside the package).
+ * `saveStats` moves it out of the package into `bundleAnalysisDirectory`.
+ */
+const webpackStatsOutputPath = resolve(packageRoot, "bundleAnalysis", "bundleStats.msp.gz");
+
+/**
+ * Persistent state saved before we start mutating the working tree.
+ */
+interface RunState {
+	/** ISO timestamp at which the run started. */
+	createdAt: string;
+	/** The branch we must return to on completion or restore. */
+	originalBranch: string;
+	/** Unique marker embedded in the stash message so we can find it later. */
+	stashMarker: string;
+	/** True if a stash entry was actually created with that marker. */
+	stashed: boolean;
+}
 
 /**
  * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
@@ -43,53 +109,120 @@ function sanitizeForFileName(value: string): string {
  */
 function getCurrentBranch(): string {
 	return execSync("git rev-parse --abbrev-ref HEAD", {
-		cwd: packageRoot,
+		cwd: repoRoot,
 		encoding: "utf-8",
+		env: childEnv,
 	}).trim();
 }
 
 /**
- * Stashes current changes if any exist.
- *
- * @returns True if changes were stashed, false otherwise
+ * Writes the run state file.
  */
-function stashChanges(): boolean {
+function writeState(state: RunState): void {
+	mkdirSync(analysisRoot, { recursive: true });
+	writeFileSync(stateFilePath, `${JSON.stringify(state, undefined, 2)}\n`);
+}
+
+/**
+ * Reads the run state file if it exists.
+ */
+function readState(): RunState | undefined {
+	if (!existsSync(stateFilePath)) {
+		return undefined;
+	}
 	try {
-		const output = execSync("git stash push -u", {
-			cwd: packageRoot,
-			encoding: "utf-8",
-		}).trim();
-		// If nothing was stashed, output says "No local changes to save"
-		if (output && !output.includes("No local changes")) {
-			console.log("Stashed local changes");
-			return true;
-		}
-		return false;
+		return JSON.parse(readFileSync(stateFilePath, "utf-8")) as RunState;
 	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Removes the run state file if it exists.
+ */
+function clearState(): void {
+	if (existsSync(stateFilePath)) {
+		rmSync(stateFilePath, { force: true });
+	}
+}
+
+/**
+ * Generates a unique marker for the git stash created by this run.
+ */
+function generateStashMarker(): string {
+	return `fluid-bundle-collect:${Date.now()}-${process.pid}`;
+}
+
+/**
+ * Stashes current changes (if any) with the given marker embedded in the message.
+ *
+ * @returns True if a stash entry was created, false if there was nothing to stash.
+ */
+function stashChanges(marker: string): boolean {
+	const output = execSync(`git stash push -u -m "${marker}"`, {
+		cwd: repoRoot,
+		encoding: "utf-8",
+		env: childEnv,
+	}).trim();
+	if (output.includes("No local changes")) {
 		return false;
 	}
+	console.log(`Stashed local changes (marker: ${marker})`);
+	return true;
+}
+
+/**
+ * Finds the stash list index for the stash entry containing the given marker in its subject.
+ *
+ * @returns The stash ref (e.g. "stash@{2}"), or undefined if no matching stash is found.
+ */
+function findStashRefByMarker(marker: string): string | undefined {
+	const list = execSync("git stash list", {
+		cwd: repoRoot,
+		encoding: "utf-8",
+		env: childEnv,
+	});
+	for (const line of list.split("\n")) {
+		if (line.includes(marker)) {
+			const match = line.match(/^(stash@\{\d+\})/);
+			if (match !== null) {
+				return match[1];
+			}
+		}
+	}
+	return undefined;
 }
 
 /**
- * Restores the most recent stash.
+ * Pops the stash entry whose subject contains the given marker.
+ *
+ * @returns True if a matching stash was found and popped, false otherwise.
  */
-function restoreStash(): void {
+function popStashByMarker(marker: string): boolean {
+	const stashRef = findStashRefByMarker(marker);
+	if (stashRef === undefined) {
+		console.warn(`No stash entry found matching marker "${marker}".`);
+		return false;
+	}
 	try {
-		execSync("git stash pop", {
-			cwd: packageRoot,
-			encoding: "utf-8",
+		execSync(`git stash pop ${stashRef}`, {
+			cwd: repoRoot,
+			stdio: "inherit",
+			env: childEnv,
 		});
-		console.log("Restored stashed changes");
+		console.log(`Restored stashed changes from ${stashRef}.`);
+		return true;
 	} catch (error) {
 		console.warn(
-			"Could not restore stashed changes:",
+			`Could not pop stash ${stashRef}:`,
 			error instanceof Error ? error.message : String(error),
 		);
+		return false;
 	}
 }
 
 /**
- * Checks out a git branch without force (preserves untracked files like bundleAnalysis/).
+ * Checks out a git branch without force (preserves untracked files).
  *
  * @param branchName - The branch to check out
  */
@@ -98,16 +231,74 @@ function checkoutBranch(branchName: string): void {
 	execSync(`git checkout ${branchName}`, {
 		cwd: repoRoot,
 		stdio: "inherit",
+		env: childEnv,
 	});
+}
 
+/**
+ * Installs dependencies for the currently checked-out revision.
+ */
+function installDependencies(): void {
 	console.log("Enabling corepack and installing dependencies...");
 	execSync("corepack enable", {
 		cwd: repoRoot,
 		stdio: "inherit",
+		env: childEnv,
 	});
 	execSync("pnpm install", {
 		cwd: repoRoot,
 		stdio: "inherit",
+		env: childEnv,
+	});
+}
+
+/**
+ * Runs the repo-root `clean` script, which invokes `fluid-build --task clean` across
+ * the entire client release group. This is the only reliable way to clear stale
+ * build artifacts for every transitive dependency of bundle-size-tests:
+ *
+ *   - `fluid-build . --task clean` (scoped to this package) does NOT cascade into
+ *     dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
+ *   - The per-package `clean` npm scripts only remove outputs in their own package.
+ *
+ * Only runs when --force-clean-build is set. By default we rely on fluid-build's
+ * content-hash based incremental detection: when sources change across a git
+ * checkout, their hashes differ from the stored `*.done.build.log`, and the
+ * affected packages rebuild. This is usually sufficient and much faster.
+ */
+function forceCleanBuild(): void {
+	console.log("\nForce-cleaning all workspace build artifacts (fluid-build --task clean)...");
+	execSync("npm run clean", {
+		cwd: repoRoot,
+		stdio: "inherit",
+		env: childEnv,
+	});
+}
+
+/**
+ * Builds this package and its transitive dependencies so webpack has the lib/
+ * outputs it needs.
+ *
+ * Runs the `build:compile` script (`fluid-build . --task compile`), which only
+ * produces the JS outputs webpack consumes. We deliberately do NOT run the full
+ * `build` task: that also pulls in `lint`, `check:format`, `build:api-reports`,
+ * `build:docs`, etc. across every transitive dependency. Those are:
+ *   - unnecessary for producing webpack bundles, and
+ *   - prone to unrelated failures across revisions (e.g. lint rule changes),
+ *     which would make bundle-size comparison impossible whenever any
+ *     non-code check happens to be broken at either revision.
+ *
+ * fluid-build uses content-hash based incremental detection, so after a `git
+ * checkout` to a different revision, source hashes differ from the stored
+ * `*.done.build.log` and the affected packages rebuild automatically. This
+ * means a prior clean is not normally required (see --force-clean-build).
+ */
+function buildWorkspace(): void {
+	console.log("\nCompiling bundle-size-tests and its dependencies...");
+	execSync("npm run build:compile", {
+		cwd: packageRoot,
+		stdio: "inherit",
+		env: childEnv,
 	});
 }
 
@@ -119,28 +310,29 @@ function buildBundles(): void {
 	execSync("npm run webpack", {
 		cwd: packageRoot,
 		stdio: "inherit",
+		env: childEnv,
 	});
 }
 
 /**
- * Saves the generated stats file to a label-specific subdirectory.
- * Assumes webpack has just run and created bundleAnalysis/bundleStats.msp.gz.
+ * Moves webpack's raw stats output into the per-label directory under the persistent
+ * analysis root (in the OS temp dir).
  *
  * @param label - The label for this build (e.g., "main", "feature_branch")
  */
 function saveStats(label: string): void {
-	const tempStatsPath = resolve(bundleAnalysisDirectory, "bundleStats.msp.gz");
 	const labelDirectory = resolve(bundleAnalysisDirectory, label);
 	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
 
-	if (!existsSync(tempStatsPath)) {
+	if (!existsSync(webpackStatsOutputPath)) {
 		throw new Error(
-			`Bundle stats not found at ${tempStatsPath}. ` + `Check that webpack ran successfully.`,
+			`Bundle stats not found at ${webpackStatsOutputPath}. ` +
+				`Check that webpack ran successfully.`,
 		);
 	}
 
 	mkdirSync(labelDirectory, { recursive: true });
-	renameSync(tempStatsPath, destStatsPath);
+	renameSync(webpackStatsOutputPath, destStatsPath);
 	console.log(`Saved stats to: ${destStatsPath}`);
 }
 
@@ -190,20 +382,72 @@ Usage:
   tsx ./scripts/collectBundles.ts [options]
 
 Options:
-  --help, -h
-    Show this help text and exit.
-
+  --help, -h              Show this help text and exit.
   --base-branch <name>    Base branch name (default: main)
   --current-branch <name> Current branch name (default: current git branch)
-  --clean                 Remove bundleAnalysis directory before starting
+  --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
+  --force-clean-build     Run a full workspace clean (fluid-build --task clean) at each
+                          revision before building. By default, we rely on fluid-build's
+                          content-hash based incremental detection, which is usually
+                          sufficient to rebuild only what changed across the checkout.
+                          Use this if you suspect stale artifacts are influencing the
+                          comparison.
+  --restore-only          Do not collect anything. Instead, use the state file left by a
+                          previous aborted run to check out the original branch, reinstall
+                          dependencies, and pop the matching stash (if any).
+  --exit-after-build      Debug only. Stop after building the workspace at the base branch
+                          (before webpack). Skips the automatic restore so the workspace
+                          can be inspected at the base revision. Run --restore-only to
+                          return to the original branch and pop the stash.
+
+Persistent state lives under: ${analysisRoot}
 
 Examples:
   tsx ./scripts/collectBundles.ts
   tsx ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/collectBundles.ts --clean
+  tsx ./scripts/collectBundles.ts --clean-analysis-dir
+  tsx ./scripts/collectBundles.ts --force-clean-build
+  tsx ./scripts/collectBundles.ts --restore-only
 `);
 }
 
+/**
+ * Performs the restore-only workflow: read state, return to original branch,
+ * reinstall dependencies, pop the matching stash, and clear state.
+ */
+function restoreFromState(): void {
+	const state = readState();
+	if (state === undefined) {
+		console.log(`No run state found at ${stateFilePath}. Nothing to restore.`);
+		return;
+	}
+
+	console.log(`Found run state from ${state.createdAt}.`);
+	console.log(`  originalBranch: ${state.originalBranch}`);
+	console.log(`  stashMarker:    ${state.stashMarker}`);
+	console.log(`  stashed:        ${state.stashed}`);
+
+	const currentBranch = getCurrentBranch();
+	if (currentBranch !== state.originalBranch) {
+		checkoutBranch(state.originalBranch);
+	} else {
+		console.log(`Already on original branch (${state.originalBranch}).`);
+	}
+
+	installDependencies();
+
+	if (state.stashed) {
+		popStashByMarker(state.stashMarker);
+	} else {
+		console.log("No stash to restore (nothing was stashed at start of run).");
+	}
+
+	clearState();
+	console.log(`\n${"=".repeat(80)}`);
+	console.log("✓ Restore complete.");
+	console.log("=".repeat(80));
+}
+
 /**
  * Main entry point: collects bundle stats from two branches.
  *
@@ -215,61 +459,123 @@ function main(argv: string[]): void {
 		return;
 	}
 
+	if (hasFlag(argv, "--restore-only")) {
+		restoreFromState();
+		return;
+	}
+
 	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
 	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
-	const clean = hasFlag(argv, "--clean");
+	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
+	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
+	const exitAfterBuild = hasFlag(argv, "--exit-after-build");
+
+	const existingState = readState();
+	if (existingState !== undefined) {
+		throw new Error(
+			`Found leftover run state at ${stateFilePath} from ${existingState.createdAt}. ` +
+				`A previous collect run may have been aborted. ` +
+				`Run with --restore-only to recover, or delete the state file manually if you are sure it is stale.`,
+		);
+	}
 
 	const originalBranch = getCurrentBranch();
+	const stashMarker = generateStashMarker();
 
 	try {
-		if (clean && existsSync(bundleAnalysisDirectory)) {
-			console.log(`\nCleaning bundleAnalysis directory...`);
+		if (cleanAnalysisDir && existsSync(bundleAnalysisDirectory)) {
+			console.log(`\nCleaning bundleAnalysis directory: ${bundleAnalysisDirectory}`);
 			rmSync(bundleAnalysisDirectory, { recursive: true });
 		}
 
-		// Stash local changes before switching branches
-		const hasStash = stashChanges();
+		// Record state BEFORE mutating the working tree so that --restore-only
+		// can recover from any failure after this point.
+		writeState({
+			createdAt: new Date().toISOString(),
+			originalBranch,
+			stashMarker,
+			stashed: false,
+		});
+
+		const hasStash = stashChanges(stashMarker);
+		if (hasStash) {
+			writeState({
+				createdAt: new Date().toISOString(),
+				originalBranch,
+				stashMarker,
+				stashed: true,
+			});
+		}
 
 		try {
-			// Collect base branch stats
-			if (originalBranch !== baseBranch) {
+			if (getCurrentBranch() !== baseBranch) {
 				checkoutBranch(baseBranch);
+				installDependencies();
 			}
+			if (forceCleanBuildFlag) {
+				forceCleanBuild();
+			}
+			buildWorkspace();
+
+			if (exitAfterBuild) {
+				console.log(`\n${"=".repeat(80)}`);
+				console.log("--exit-after-build: stopping after base-branch build.");
+				console.log(`  Currently checked out: ${getCurrentBranch()}`);
+				console.log(
+					"  State file retained at:",
+					stateFilePath,
+				);
+				console.log(
+					"  Use --restore-only to return to the original branch and pop the stash.",
+				);
+				console.log("=".repeat(80));
+				return;
+			}
+
 			buildBundles();
 			saveStats(sanitizeForFileName(baseBranch));
 
-			// Collect current branch stats
-			if (originalBranch !== currentBranch && baseBranch !== currentBranch) {
+			if (getCurrentBranch() !== currentBranch) {
 				checkoutBranch(currentBranch);
+				installDependencies();
+			}
+			if (forceCleanBuildFlag) {
+				forceCleanBuild();
 			}
+			buildWorkspace();
 			buildBundles();
 			saveStats(sanitizeForFileName(currentBranch));
 
-			// Return to original branch
-			if (originalBranch !== currentBranch && originalBranch !== baseBranch) {
+			if (getCurrentBranch() !== originalBranch) {
 				checkoutBranch(originalBranch);
 			}
 		} finally {
-			// Always ensure original branch has fresh dependencies and restore stash if needed
-			console.log("\nEnabling corepack and installing dependencies for original branch...");
-			execSync("corepack enable", {
-				cwd: repoRoot,
-				stdio: "inherit",
-			});
-			execSync("pnpm install", {
-				cwd: repoRoot,
-				stdio: "inherit",
-			});
-			if (hasStash) {
-				restoreStash();
+			if (!exitAfterBuild) {
+				// Always ensure original branch has fresh dependencies and restore stash if needed.
+				const nowOn = getCurrentBranch();
+				if (nowOn !== originalBranch) {
+					checkoutBranch(originalBranch);
+				}
+				installDependencies();
+				if (hasStash) {
+					popStashByMarker(stashMarker);
+				}
+				clearState();
 			}
+			// When exitAfterBuild is set, intentionally skip the automatic restore
+			// so the user can inspect the workspace at the failing revision.
+			// Run --restore-only to clean up.
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
 		console.log("✓ Bundle collection complete!");
+		console.log(`  Stats directory: ${bundleAnalysisDirectory}`);
 		console.log("=".repeat(80));
 	} catch (error) {
 		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
+		console.error(
+			`If the working tree or branch is in an inconsistent state, re-run with --restore-only.`,
+		);
 		throw error;
 	}
 }
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index f898924ebc16..8c65f5955090 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -4,14 +4,15 @@
  */
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { tmpdir } from "node:os";
+import { resolve } from "node:path";
 import { gunzipSync, gzipSync } from "node:zlib";
 
 import { decode } from "@msgpack/msgpack";
 
-const scriptDirectory = dirname(fileURLToPath(import.meta.url));
-const defaultAnalysisDirectory = resolve(scriptDirectory, "..");
+// Default to the persistent analysis root used by collectBundles.ts.
+// Kept in the OS temp dir so results survive `git checkout` and `npm run clean`.
+const defaultAnalysisDirectory = resolve(tmpdir(), "fluid-bundle-compare");
 
 /**
  * Extracts the value of a command-line option from the argument list.
@@ -231,7 +232,7 @@ interface Options {
 	baseBranch: string;
 	/** Branch name for the current build (default: current branch or BUILD_SOURCEBRANCHNAME) */
 	currentBranch: string;
-	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/\{label\}/ (default: examples/utils/bundle-size-tests) */
+	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/\{label\}/ (default: OS temp dir / fluid-bundle-compare) */
 	analysisDirectory: string;
 }
 
@@ -304,11 +305,11 @@ Options:
   --base-branch <name>    Base branch name (default: main)
   --current-branch <name> Current branch name (default: BUILD_SOURCEBRANCHNAME or current)
   --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
-                          under bundleAnalysis/{label}/ (default: examples/utils/bundle-size-tests)
+                          under bundleAnalysis/{label}/ (default: ${defaultAnalysisDirectory})
 
 Examples:
   tsx ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/compareBundles.ts --analysis-dir examples/utils/bundle-size-tests
+  tsx ./scripts/compareBundles.ts --analysis-dir /some/other/path
 `);
 }
 

From cc7a685b4128f5933a18dcaf2346292e2ab5aaa7 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 13:01:42 -0700
Subject: [PATCH 11/67] Mostly works, gzip comparison broken.

---
 .../utils/bundle-size-tests/scripts/collectBundles.ts    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 8d568306667d..127ccc668804 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -5,11 +5,12 @@
 
 import { execSync } from "node:child_process";
 import {
+	copyFileSync,
 	existsSync,
 	mkdirSync,
 	readFileSync,
-	renameSync,
 	rmSync,
+	unlinkSync,
 	writeFileSync,
 } from "node:fs";
 import { tmpdir } from "node:os";
@@ -332,7 +333,11 @@ function saveStats(label: string): void {
 	}
 
 	mkdirSync(labelDirectory, { recursive: true });
-	renameSync(webpackStatsOutputPath, destStatsPath);
+	// Use copy + unlink instead of renameSync because the source and destination
+	// may live on different drives (e.g. D: -> C:\Users\<user>\AppData\Local\Temp),
+	// which causes renameSync to fail with EXDEV on Windows.
+	copyFileSync(webpackStatsOutputPath, destStatsPath);
+	unlinkSync(webpackStatsOutputPath);
 	console.log(`Saved stats to: ${destStatsPath}`);
 }
 

From 74567eda1698321db8b1bca657d9bb85850302f1 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 13:17:30 -0700
Subject: [PATCH 12/67] Gzipped stat comparison.

---
 .../scripts/collectBundles.ts                 | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 127ccc668804..5fb086e599fc 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -6,6 +6,7 @@
 import { execSync } from "node:child_process";
 import {
 	copyFileSync,
+	cpSync,
 	existsSync,
 	mkdirSync,
 	readFileSync,
@@ -78,6 +79,13 @@ const stateFilePath = resolve(analysisRoot, "state.json");
  */
 const webpackStatsOutputPath = resolve(packageRoot, "bundleAnalysis", "bundleStats.msp.gz");
 
+/**
+ * Webpack writes the actual JS bundle assets here (inside the package).
+ * `saveStats` copies this directory out so `compareBundles.ts` can compute
+ * gzip sizes for each asset.
+ */
+const webpackBuildOutputPath = resolve(packageRoot, "build");
+
 /**
  * Persistent state saved before we start mutating the working tree.
  */
@@ -339,6 +347,21 @@ function saveStats(label: string): void {
 	copyFileSync(webpackStatsOutputPath, destStatsPath);
 	unlinkSync(webpackStatsOutputPath);
 	console.log(`Saved stats to: ${destStatsPath}`);
+
+	// Also copy webpack's bundle outputs so compareBundles.ts can compute gzip
+	// sizes for changed assets. The destination layout (`<label>/build/<asset>`)
+	// matches what compareBundles.ts expects.
+	if (existsSync(webpackBuildOutputPath)) {
+		const destBuildPath = resolve(labelDirectory, "build");
+		rmSync(destBuildPath, { recursive: true, force: true });
+		cpSync(webpackBuildOutputPath, destBuildPath, { recursive: true });
+		console.log(`Saved build outputs to: ${destBuildPath}`);
+	} else {
+		console.warn(
+			`Warning: webpack build outputs not found at ${webpackBuildOutputPath}; ` +
+				`gzip sizes will be unavailable for label "${label}".`,
+		);
+	}
 }
 
 /**

From eeb0fb0b3f54bf33885415c1051445e7f20d289c Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 13:25:10 -0700
Subject: [PATCH 13/67] Clean build now default.

---
 .../scripts/collectAndCompareBundles.ts       | 17 ++++---
 .../scripts/collectBundles.ts                 | 44 ++++++++++---------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index d349d86ea6a8..2c0266354db6 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -96,9 +96,12 @@ Options:
   --current-branch <name> Current branch name (default: current git branch or CI branch)
   --skip-compare          Collect stats only, skip the comparison step
   --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
-  --force-clean-build     Run a full workspace clean (fluid-build --task clean) at each
-                          revision before building. By default we rely on fluid-build's
-                          incremental detection.
+  --skip-clean-build      Skip the full workspace clean that normally runs before each
+                          build. By default we run 'fluid-build --task clean' at the
+                          repo root before building each revision so the comparison is
+                          not affected by stale artifacts. Skipping is faster but may
+                          produce incorrect sizes or build errors if incremental build
+                          state from a previous revision interferes with the current one.
   --restore-only          Do not collect or compare. Use the state file left by a previous
                           aborted run to check out the original branch, reinstall
                           dependencies, and pop the matching stash (if any).
@@ -107,7 +110,7 @@ Examples:
   tsx ./scripts/collectAndCompareBundles.ts
   tsx ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
   tsx ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
-  tsx ./scripts/collectAndCompareBundles.ts --force-clean-build
+  tsx ./scripts/collectAndCompareBundles.ts --skip-clean-build
   tsx ./scripts/collectAndCompareBundles.ts --restore-only
 `);
 }
@@ -152,7 +155,7 @@ function main(argv: string[]): void {
 	const currentBranch = getOptionValue(argv, "--current-branch");
 	const skipCompare = hasFlag(argv, "--skip-compare");
 	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
-	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
+	const skipCleanBuildFlag = hasFlag(argv, "--skip-clean-build");
 
 	const collectArgs: string[] = [];
 	const compareArgs: string[] = [];
@@ -167,8 +170,8 @@ function main(argv: string[]): void {
 	if (cleanAnalysisDir) {
 		collectArgs.push("--clean-analysis-dir");
 	}
-	if (forceCleanBuildFlag) {
-		collectArgs.push("--force-clean-build");
+	if (skipCleanBuildFlag) {
+		collectArgs.push("--skip-clean-build");
 	}
 
 	try {
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 5fb086e599fc..3211ef07a830 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -270,13 +270,16 @@ function installDependencies(): void {
  *     dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
  *   - The per-package `clean` npm scripts only remove outputs in their own package.
  *
- * Only runs when --force-clean-build is set. By default we rely on fluid-build's
- * content-hash based incremental detection: when sources change across a git
- * checkout, their hashes differ from the stored `*.done.build.log`, and the
- * affected packages rebuild. This is usually sufficient and much faster.
+ * Runs by default before building each revision so the comparison is not affected
+ * by stale artifacts. Skipped when --skip-clean-build is passed. fluid-build's
+ * content-hash based incremental detection usually rebuilds what changed across
+ * a checkout, but is not always sufficient: stale tsbuildinfo or entrypoint
+ * outputs from a previous revision can cause either build errors or subtly
+ * incorrect bundle contents. The extra clean is worth the time cost for an
+ * accurate comparison.
  */
-function forceCleanBuild(): void {
-	console.log("\nForce-cleaning all workspace build artifacts (fluid-build --task clean)...");
+function cleanWorkspace(): void {
+	console.log("\nCleaning all workspace build artifacts (fluid-build --task clean)...");
 	execSync("npm run clean", {
 		cwd: repoRoot,
 		stdio: "inherit",
@@ -299,8 +302,9 @@ function forceCleanBuild(): void {
  *
  * fluid-build uses content-hash based incremental detection, so after a `git
  * checkout` to a different revision, source hashes differ from the stored
- * `*.done.build.log` and the affected packages rebuild automatically. This
- * means a prior clean is not normally required (see --force-clean-build).
+ * `*.done.build.log` and the affected packages rebuild automatically. This is
+ * usually enough, but not always reliable; see `cleanWorkspace` and the
+ * --skip-clean-build flag.
  */
 function buildWorkspace(): void {
 	console.log("\nCompiling bundle-size-tests and its dependencies...");
@@ -414,12 +418,12 @@ Options:
   --base-branch <name>    Base branch name (default: main)
   --current-branch <name> Current branch name (default: current git branch)
   --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
-  --force-clean-build     Run a full workspace clean (fluid-build --task clean) at each
-                          revision before building. By default, we rely on fluid-build's
-                          content-hash based incremental detection, which is usually
-                          sufficient to rebuild only what changed across the checkout.
-                          Use this if you suspect stale artifacts are influencing the
-                          comparison.
+  --skip-clean-build      Skip the full workspace clean that normally runs before each
+                          build. By default we run 'fluid-build --task clean' at the
+                          repo root before building each revision so the comparison is
+                          not affected by stale artifacts. Skipping is faster but may
+                          produce incorrect sizes or build errors if incremental build
+                          state from a previous revision interferes with the current one.
   --restore-only          Do not collect anything. Instead, use the state file left by a
                           previous aborted run to check out the original branch, reinstall
                           dependencies, and pop the matching stash (if any).
@@ -434,7 +438,7 @@ Examples:
   tsx ./scripts/collectBundles.ts
   tsx ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
   tsx ./scripts/collectBundles.ts --clean-analysis-dir
-  tsx ./scripts/collectBundles.ts --force-clean-build
+  tsx ./scripts/collectBundles.ts --skip-clean-build
   tsx ./scripts/collectBundles.ts --restore-only
 `);
 }
@@ -495,7 +499,7 @@ function main(argv: string[]): void {
 	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
 	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
 	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
-	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
+	const skipCleanBuild = hasFlag(argv, "--skip-clean-build");
 	const exitAfterBuild = hasFlag(argv, "--exit-after-build");
 
 	const existingState = readState();
@@ -540,8 +544,8 @@ function main(argv: string[]): void {
 				checkoutBranch(baseBranch);
 				installDependencies();
 			}
-			if (forceCleanBuildFlag) {
-				forceCleanBuild();
+			if (!skipCleanBuild) {
+				cleanWorkspace();
 			}
 			buildWorkspace();
 
@@ -567,8 +571,8 @@ function main(argv: string[]): void {
 				checkoutBranch(currentBranch);
 				installDependencies();
 			}
-			if (forceCleanBuildFlag) {
-				forceCleanBuild();
+			if (!skipCleanBuild) {
+				cleanWorkspace();
 			}
 			buildWorkspace();
 			buildBundles();

From 5f0eb2bd9a1e55f332889a962cb9abacd46efcf9 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 13:38:59 -0700
Subject: [PATCH 14/67] Ported to jiti.

---
 examples/utils/bundle-size-tests/package.json |   7 +-
 .../scripts/collectAndCompareBundles.ts       |  54 ++--
 .../scripts/collectBundles.ts                 |  41 +--
 .../scripts/compareBundles.ts                 |   6 +-
 pnpm-lock.yaml                                | 283 ------------------
 5 files changed, 34 insertions(+), 357 deletions(-)

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index d638ebaf0a42..5091abcf1476 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,9 +21,9 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"collect:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectBundles.ts",
-		"collect:compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/collectAndCompareBundles.ts",
-		"compare:bundles": "tsx --tsconfig ./tsconfig.scripts.json ./scripts/compareBundles.ts",
+		"collect:bundles": "jiti ./scripts/collectBundles.ts",
+		"collect:compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
+		"compare:bundles": "jiti ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
@@ -75,7 +75,6 @@
 		"source-map-loader": "^5.0.0",
 		"string-replace-loader": "^3.1.0",
 		"ts-loader": "^9.5.1",
-		"tsx": "^4.19.4",
 		"typescript": "~5.4.5",
 		"webpack": "^5.94.0",
 		"webpack-bundle-analyzer": "^4.5.0",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 2c0266354db6..0fc0919b54df 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -12,23 +12,23 @@ const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
 /**
- * Path to the tsx CLI entrypoint.
+ * Path to the jiti CLI entrypoint.
  *
- * `tsx`'s package.json `exports` map does not expose `./dist/cli.mjs` directly,
+ * `jiti`'s package.json `exports` map does not expose its CLI file directly,
  * but its `bin` field points to it. We resolve the package's own package.json
  * (always exported) and then resolve the bin path relative to that.
  */
-const tsxCliPath = (() => {
+const jitiCliPath = (() => {
 	const req = createRequire(import.meta.url);
-	const tsxPackageJsonPath = req.resolve("tsx/package.json");
+	const jitiPackageJsonPath = req.resolve("jiti/package.json");
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const tsxPackageJson = req("tsx/package.json") as { bin?: string | Record<string, string> };
-	const binField = tsxPackageJson.bin;
-	const binRelPath = typeof binField === "string" ? binField : binField?.tsx;
+	const jitiPackageJson = req("jiti/package.json") as { bin?: string | Record<string, string> };
+	const binField = jitiPackageJson.bin;
+	const binRelPath = typeof binField === "string" ? binField : binField?.jiti;
 	if (binRelPath === undefined) {
-		throw new Error("Unable to locate tsx CLI via its package.json bin field.");
+		throw new Error("Unable to locate jiti CLI via its package.json bin field.");
 	}
-	return resolve(dirname(tsxPackageJsonPath), binRelPath);
+	return resolve(dirname(jitiPackageJsonPath), binRelPath);
 })();
 
 /**
@@ -43,30 +43,20 @@ function hasFlag(argv: string[], flagName: string): boolean {
 }
 
 /**
- * Runs a script with tsx and inherited stdio.
+ * Runs a script with jiti and inherited stdio.
  *
- * Invokes the local tsx CLI directly via `process.execPath` to avoid relying
- * on `tsx` being on PATH (which is flaky on Windows / npm script contexts).
+ * Invokes the local jiti CLI directly via `process.execPath` to avoid relying
+ * on `jiti` being on PATH (which is flaky on Windows / npm script contexts).
  *
  * @param scriptName - Script file name under ./scripts/
  * @param scriptArgs - Arguments to forward to the script
  */
 function runScript(scriptName: string, scriptArgs: string[]): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
-	const result = spawnSync(
-		process.execPath,
-		[
-			tsxCliPath,
-			"--tsconfig",
-			resolve(packageRoot, "tsconfig.scripts.json"),
-			scriptPath,
-			...scriptArgs,
-		],
-		{
-			cwd: packageRoot,
-			stdio: "inherit",
-		},
-	);
+	const result = spawnSync(process.execPath, [jitiCliPath, scriptPath, ...scriptArgs], {
+		cwd: packageRoot,
+		stdio: "inherit",
+	});
 
 	if (result.error !== undefined) {
 		throw new Error(
@@ -86,7 +76,7 @@ function runScript(scriptName: string, scriptArgs: string[]): void {
 function printHelp(): void {
 	console.log(`
 Usage:
-  tsx ./scripts/collectAndCompareBundles.ts [options]
+  jiti ./scripts/collectAndCompareBundles.ts [options]
 
 Options:
   --help, -h
@@ -107,11 +97,11 @@ Options:
                           dependencies, and pop the matching stash (if any).
 
 Examples:
-  tsx ./scripts/collectAndCompareBundles.ts
-  tsx ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
-  tsx ./scripts/collectAndCompareBundles.ts --skip-clean-build
-  tsx ./scripts/collectAndCompareBundles.ts --restore-only
+  jiti ./scripts/collectAndCompareBundles.ts
+  jiti ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
+  jiti ./scripts/collectAndCompareBundles.ts --skip-clean-build
+  jiti ./scripts/collectAndCompareBundles.ts --restore-only
 `);
 }
 
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 3211ef07a830..048f4f10df1a 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -21,24 +21,6 @@ import { fileURLToPath } from "node:url";
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
-/**
- * Environment for all child processes we spawn.
- *
- * This script is itself launched via `tsx --tsconfig ./tsconfig.scripts.json`
- * (see the `collect:bundles` npm script). tsx propagates that choice to
- * subprocesses via the `TSX_TSCONFIG_PATH` env var. If we inherit it blindly,
- * any child that also runs tsx (e.g. fluid-build -> `tsx scripts/print-configs.ts`
- * in @fluidframework/eslint-config-fluid) will try to load `./tsconfig.scripts.json`
- * relative to its own cwd and fail. We also strip `TSX_TSCONFIG_CONTENT` for the
- * same reason. Everything else is inherited normally.
- */
-const childEnv: NodeJS.ProcessEnv = (() => {
-	const env = { ...process.env };
-	delete env.TSX_TSCONFIG_PATH;
-	delete env.TSX_TSCONFIG_CONTENT;
-	return env;
-})();
-
 /**
  * Gets the repository root directory.
  *
@@ -47,7 +29,6 @@ const childEnv: NodeJS.ProcessEnv = (() => {
 function getRepoRoot(): string {
 	return execSync("git rev-parse --show-toplevel", {
 		encoding: "utf-8",
-		env: childEnv,
 	}).trim();
 }
 
@@ -120,7 +101,6 @@ function getCurrentBranch(): string {
 	return execSync("git rev-parse --abbrev-ref HEAD", {
 		cwd: repoRoot,
 		encoding: "utf-8",
-		env: childEnv,
 	}).trim();
 }
 
@@ -171,7 +151,6 @@ function stashChanges(marker: string): boolean {
 	const output = execSync(`git stash push -u -m "${marker}"`, {
 		cwd: repoRoot,
 		encoding: "utf-8",
-		env: childEnv,
 	}).trim();
 	if (output.includes("No local changes")) {
 		return false;
@@ -189,7 +168,6 @@ function findStashRefByMarker(marker: string): string | undefined {
 	const list = execSync("git stash list", {
 		cwd: repoRoot,
 		encoding: "utf-8",
-		env: childEnv,
 	});
 	for (const line of list.split("\n")) {
 		if (line.includes(marker)) {
@@ -217,7 +195,6 @@ function popStashByMarker(marker: string): boolean {
 		execSync(`git stash pop ${stashRef}`, {
 			cwd: repoRoot,
 			stdio: "inherit",
-			env: childEnv,
 		});
 		console.log(`Restored stashed changes from ${stashRef}.`);
 		return true;
@@ -240,7 +217,6 @@ function checkoutBranch(branchName: string): void {
 	execSync(`git checkout ${branchName}`, {
 		cwd: repoRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 }
 
@@ -252,12 +228,10 @@ function installDependencies(): void {
 	execSync("corepack enable", {
 		cwd: repoRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 	execSync("pnpm install", {
 		cwd: repoRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 }
 
@@ -283,7 +257,6 @@ function cleanWorkspace(): void {
 	execSync("npm run clean", {
 		cwd: repoRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 }
 
@@ -311,7 +284,6 @@ function buildWorkspace(): void {
 	execSync("npm run build:compile", {
 		cwd: packageRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 }
 
@@ -323,7 +295,6 @@ function buildBundles(): void {
 	execSync("npm run webpack", {
 		cwd: packageRoot,
 		stdio: "inherit",
-		env: childEnv,
 	});
 }
 
@@ -411,7 +382,7 @@ function hasFlag(argv: string[], flagName: string): boolean {
 function printHelp(): void {
 	console.log(`
 Usage:
-  tsx ./scripts/collectBundles.ts [options]
+  jiti ./scripts/collectBundles.ts [options]
 
 Options:
   --help, -h              Show this help text and exit.
@@ -435,11 +406,11 @@ Options:
 Persistent state lives under: ${analysisRoot}
 
 Examples:
-  tsx ./scripts/collectBundles.ts
-  tsx ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/collectBundles.ts --clean-analysis-dir
-  tsx ./scripts/collectBundles.ts --skip-clean-build
-  tsx ./scripts/collectBundles.ts --restore-only
+  jiti ./scripts/collectBundles.ts
+  jiti ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/collectBundles.ts --clean-analysis-dir
+  jiti ./scripts/collectBundles.ts --skip-clean-build
+  jiti ./scripts/collectBundles.ts --restore-only
 `);
 }
 
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 8c65f5955090..484074422b6e 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -296,7 +296,7 @@ function writeOutputFiles(
 function printHelp(): void {
 	console.log(`
 Usage:
-  tsx ./scripts/compareBundles.ts [options]
+  jiti ./scripts/compareBundles.ts [options]
 
 Options:
   --help, -h
@@ -308,8 +308,8 @@ Options:
                           under bundleAnalysis/{label}/ (default: ${defaultAnalysisDirectory})
 
 Examples:
-  tsx ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
-  tsx ./scripts/compareBundles.ts --analysis-dir /some/other/path
+  jiti ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/compareBundles.ts --analysis-dir /some/other/path
 `);
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e2cd7603dc14..98d09c89da18 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4898,9 +4898,6 @@ importers:
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
-      tsx:
-        specifier: ^4.19.4
-        version: 4.21.0
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -17799,162 +17796,6 @@ packages:
     resolution: {integrity: sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==}
     engines: {node: '>=10'}
 
-  '@esbuild/aix-ppc64@0.27.7':
-    resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/android-arm64@0.27.7':
-    resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm@0.27.7':
-    resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-x64@0.27.7':
-    resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/darwin-arm64@0.27.7':
-    resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.27.7':
-    resolution: {integrity: sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/freebsd-arm64@0.27.7':
-    resolution: {integrity: sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.27.7':
-    resolution: {integrity: sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/linux-arm64@0.27.7':
-    resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.27.7':
-    resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.27.7':
-    resolution: {integrity: sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.27.7':
-    resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.27.7':
-    resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.27.7':
-    resolution: {integrity: sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.27.7':
-    resolution: {integrity: sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.27.7':
-    resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.27.7':
-    resolution: {integrity: sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/netbsd-arm64@0.27.7':
-    resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.27.7':
-    resolution: {integrity: sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/openbsd-arm64@0.27.7':
-    resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.27.7':
-    resolution: {integrity: sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openharmony-arm64@0.27.7':
-    resolution: {integrity: sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
-  '@esbuild/sunos-x64@0.27.7':
-    resolution: {integrity: sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/win32-arm64@0.27.7':
-    resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.27.7':
-    resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.27.7':
-    resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@eslint-community/eslint-plugin-eslint-comments@4.5.0':
     resolution: {integrity: sha512-MAhuTKlr4y/CE3WYX26raZjy+I/kS2PLKSzvfmDCGrBLTFHOYwqROZdr4XwPgXwX3K9rjzMr4pSmUWGnzsUyMg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -22610,11 +22451,6 @@ packages:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
-  esbuild@0.27.7:
-    resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -27656,11 +27492,6 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tsx@4.21.0:
-    resolution: {integrity: sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-
   tuf-js@1.1.7:
     resolution: {integrity: sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -29128,84 +28959,6 @@ snapshots:
 
   '@es-joy/resolve.exports@1.2.0': {}
 
-  '@esbuild/aix-ppc64@0.27.7':
-    optional: true
-
-  '@esbuild/android-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/android-arm@0.27.7':
-    optional: true
-
-  '@esbuild/android-x64@0.27.7':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/darwin-x64@0.27.7':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.27.7':
-    optional: true
-
-  '@esbuild/linux-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/linux-arm@0.27.7':
-    optional: true
-
-  '@esbuild/linux-ia32@0.27.7':
-    optional: true
-
-  '@esbuild/linux-loong64@0.27.7':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.27.7':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.27.7':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.27.7':
-    optional: true
-
-  '@esbuild/linux-s390x@0.27.7':
-    optional: true
-
-  '@esbuild/linux-x64@0.27.7':
-    optional: true
-
-  '@esbuild/netbsd-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.27.7':
-    optional: true
-
-  '@esbuild/openbsd-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.27.7':
-    optional: true
-
-  '@esbuild/openharmony-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/sunos-x64@0.27.7':
-    optional: true
-
-  '@esbuild/win32-arm64@0.27.7':
-    optional: true
-
-  '@esbuild/win32-ia32@0.27.7':
-    optional: true
-
-  '@esbuild/win32-x64@0.27.7':
-    optional: true
-
   '@eslint-community/eslint-plugin-eslint-comments@4.5.0(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       escape-string-regexp: 4.0.0
@@ -36593,35 +36346,6 @@ snapshots:
       is-date-object: 1.1.0
       is-symbol: 1.1.1
 
-  esbuild@0.27.7:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.7
-      '@esbuild/android-arm': 0.27.7
-      '@esbuild/android-arm64': 0.27.7
-      '@esbuild/android-x64': 0.27.7
-      '@esbuild/darwin-arm64': 0.27.7
-      '@esbuild/darwin-x64': 0.27.7
-      '@esbuild/freebsd-arm64': 0.27.7
-      '@esbuild/freebsd-x64': 0.27.7
-      '@esbuild/linux-arm': 0.27.7
-      '@esbuild/linux-arm64': 0.27.7
-      '@esbuild/linux-ia32': 0.27.7
-      '@esbuild/linux-loong64': 0.27.7
-      '@esbuild/linux-mips64el': 0.27.7
-      '@esbuild/linux-ppc64': 0.27.7
-      '@esbuild/linux-riscv64': 0.27.7
-      '@esbuild/linux-s390x': 0.27.7
-      '@esbuild/linux-x64': 0.27.7
-      '@esbuild/netbsd-arm64': 0.27.7
-      '@esbuild/netbsd-x64': 0.27.7
-      '@esbuild/openbsd-arm64': 0.27.7
-      '@esbuild/openbsd-x64': 0.27.7
-      '@esbuild/openharmony-arm64': 0.27.7
-      '@esbuild/sunos-x64': 0.27.7
-      '@esbuild/win32-arm64': 0.27.7
-      '@esbuild/win32-ia32': 0.27.7
-      '@esbuild/win32-x64': 0.27.7
-
   escalade@3.2.0: {}
 
   escape-goat@4.0.0: {}
@@ -43025,13 +42749,6 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  tsx@4.21.0:
-    dependencies:
-      esbuild: 0.27.7
-      get-tsconfig: 4.13.7
-    optionalDependencies:
-      fsevents: 2.3.3
-
   tuf-js@1.1.7:
     dependencies:
       '@tufjs/models': 1.0.4

From 4f7bd6bf384ebc2193c010073cc00d47e15d9fca Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 14:00:24 -0700
Subject: [PATCH 15/67] Fix for assets that don't match.

---
 .../scripts/compareBundles.ts                 | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 484074422b6e..f6b076666ed8 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -413,22 +413,19 @@ function main(argv: string[]): void {
 		);
 
 		for (const row of changedRows) {
-			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name));
-			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name));
-
-			if (baseGzipSize !== undefined && currentGzipSize !== undefined) {
-				const diff = currentGzipSize - baseGzipSize;
-				const line =
-					row.name.padEnd(40) +
-					String(baseGzipSize).padStart(14) +
-					String(currentGzipSize).padStart(14) +
-					`${diff > 0 ? "+" : ""}${diff}`.padStart(12);
-				reporter.print(line);
-				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize, diff });
-			} else {
-				reporter.print(`${row.name.padEnd(40)}(base/current build not found)`);
-				gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize });
-			}
+			// Missing assets are treated as size 0: an asset present in only one revision
+			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
+			// represents a genuine delta, not missing data.
+			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name)) ?? 0;
+			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name)) ?? 0;
+			const diff = currentGzipSize - baseGzipSize;
+			const line =
+				row.name.padEnd(40) +
+				String(baseGzipSize).padStart(14) +
+				String(currentGzipSize).padStart(14) +
+				`${diff > 0 ? "+" : ""}${diff}`.padStart(12);
+			reporter.print(line);
+			gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize, diff });
 		}
 	}
 

From 7474942b6e386ad9bc1e585e16ac5f9d4c8f2a19 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 16:58:56 -0700
Subject: [PATCH 16/67] Removed tsx-specific workaround. No longer needed.

---
 .../scripts/collectAndCompareBundles.ts       | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 0fc0919b54df..c7cc42ed4f49 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -4,33 +4,12 @@
  */
 
 import { spawnSync } from "node:child_process";
-import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
-/**
- * Path to the jiti CLI entrypoint.
- *
- * `jiti`'s package.json `exports` map does not expose its CLI file directly,
- * but its `bin` field points to it. We resolve the package's own package.json
- * (always exported) and then resolve the bin path relative to that.
- */
-const jitiCliPath = (() => {
-	const req = createRequire(import.meta.url);
-	const jitiPackageJsonPath = req.resolve("jiti/package.json");
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const jitiPackageJson = req("jiti/package.json") as { bin?: string | Record<string, string> };
-	const binField = jitiPackageJson.bin;
-	const binRelPath = typeof binField === "string" ? binField : binField?.jiti;
-	if (binRelPath === undefined) {
-		throw new Error("Unable to locate jiti CLI via its package.json bin field.");
-	}
-	return resolve(dirname(jitiPackageJsonPath), binRelPath);
-})();
-
 /**
  * Checks if a flag is present in the command-line argument list.
  *
@@ -43,20 +22,26 @@ function hasFlag(argv: string[], flagName: string): boolean {
 }
 
 /**
- * Runs a script with jiti and inherited stdio.
+ * Runs a TypeScript script via Node with jiti's ESM register hook.
  *
- * Invokes the local jiti CLI directly via `process.execPath` to avoid relying
- * on `jiti` being on PATH (which is flaky on Windows / npm script contexts).
+ * Using `--import jiti/register` avoids depending on the `jiti` binary being
+ * on PATH (which is flaky on Windows / npm script contexts) while still
+ * routing through a stable, documented entry point exposed by jiti's package
+ * exports map.
  *
  * @param scriptName - Script file name under ./scripts/
  * @param scriptArgs - Arguments to forward to the script
  */
 function runScript(scriptName: string, scriptArgs: string[]): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
-	const result = spawnSync(process.execPath, [jitiCliPath, scriptPath, ...scriptArgs], {
-		cwd: packageRoot,
-		stdio: "inherit",
-	});
+	const result = spawnSync(
+		process.execPath,
+		["--import", "jiti/register", scriptPath, ...scriptArgs],
+		{
+			cwd: packageRoot,
+			stdio: "inherit",
+		},
+	);
 
 	if (result.error !== undefined) {
 		throw new Error(

From c24086c03aa0eb1415c9ec374cb20eee6a837a06 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 17:13:54 -0700
Subject: [PATCH 17/67] Removed current branch parameter.

---
 .../scripts/collectAndCompareBundles.ts       | 11 ++--
 .../scripts/collectBundles.ts                 | 50 +++++++++----------
 .../scripts/compareBundles.ts                 | 32 +++++++++---
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index c7cc42ed4f49..278336b90c35 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -67,8 +67,8 @@ Options:
   --help, -h
     Show this help text and exit.
 
-  --base-branch <name>    Base branch name (default: main)
-  --current-branch <name> Current branch name (default: current git branch or CI branch)
+  --base-branch <name>    Base branch name (default: main). The other side of the
+                          comparison is always the currently checked-out branch.
   --skip-compare          Collect stats only, skip the comparison step
   --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
   --skip-clean-build      Skip the full workspace clean that normally runs before each
@@ -83,7 +83,7 @@ Options:
 
 Examples:
   jiti ./scripts/collectAndCompareBundles.ts
-  jiti ./scripts/collectAndCompareBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/collectAndCompareBundles.ts --base-branch main
   jiti ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
   jiti ./scripts/collectAndCompareBundles.ts --skip-clean-build
   jiti ./scripts/collectAndCompareBundles.ts --restore-only
@@ -127,7 +127,6 @@ function main(argv: string[]): void {
 	}
 
 	const baseBranch = getOptionValue(argv, "--base-branch");
-	const currentBranch = getOptionValue(argv, "--current-branch");
 	const skipCompare = hasFlag(argv, "--skip-compare");
 	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
 	const skipCleanBuildFlag = hasFlag(argv, "--skip-clean-build");
@@ -138,10 +137,6 @@ function main(argv: string[]): void {
 		collectArgs.push("--base-branch", baseBranch);
 		compareArgs.push("--base-branch", baseBranch);
 	}
-	if (currentBranch !== undefined) {
-		collectArgs.push("--current-branch", currentBranch);
-		compareArgs.push("--current-branch", currentBranch);
-	}
 	if (cleanAnalysisDir) {
 		collectArgs.push("--clean-analysis-dir");
 	}
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 048f4f10df1a..56af6a1e45cd 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -37,8 +37,9 @@ const repoRoot = getRepoRoot();
 /**
  * Root of persistent state for collect/compare runs.
  * Lives in the OS temp directory so it survives:
- *   - `git checkout` between branches (which would overwrite in-tree untracked files)
- *   - `npm run clean` (which rimrafs bundleAnalysis/ under the package)
+ *
+ * - `git checkout` between branches (which would overwrite in-tree untracked files)
+ * - `npm run clean` (which rimrafs bundleAnalysis/ under the package)
  */
 const analysisRoot = resolve(tmpdir(), "fluid-bundle-compare");
 
@@ -162,7 +163,7 @@ function stashChanges(marker: string): boolean {
 /**
  * Finds the stash list index for the stash entry containing the given marker in its subject.
  *
- * @returns The stash ref (e.g. "stash@{2}"), or undefined if no matching stash is found.
+ * @returns The stash ref (e.g. `stash@\{2\}`), or undefined if no matching stash is found.
  */
 function findStashRefByMarker(marker: string): string | undefined {
 	const list = execSync("git stash list", {
@@ -171,7 +172,7 @@ function findStashRefByMarker(marker: string): string | undefined {
 	});
 	for (const line of list.split("\n")) {
 		if (line.includes(marker)) {
-			const match = line.match(/^(stash@\{\d+\})/);
+			const match = /^(stash@{\d+})/.exec(line);
 			if (match !== null) {
 				return match[1];
 			}
@@ -240,9 +241,8 @@ function installDependencies(): void {
  * the entire client release group. This is the only reliable way to clear stale
  * build artifacts for every transitive dependency of bundle-size-tests:
  *
- *   - `fluid-build . --task clean` (scoped to this package) does NOT cascade into
- *     dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
- *   - The per-package `clean` npm scripts only remove outputs in their own package.
+ * - `fluid-build . --task clean` (scoped to this package) does NOT cascade into dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
+ * - The per-package `clean` npm scripts only remove outputs in their own package.
  *
  * Runs by default before building each revision so the comparison is not affected
  * by stale artifacts. Skipped when --skip-clean-build is passed. fluid-build's
@@ -268,13 +268,12 @@ function cleanWorkspace(): void {
  * produces the JS outputs webpack consumes. We deliberately do NOT run the full
  * `build` task: that also pulls in `lint`, `check:format`, `build:api-reports`,
  * `build:docs`, etc. across every transitive dependency. Those are:
- *   - unnecessary for producing webpack bundles, and
- *   - prone to unrelated failures across revisions (e.g. lint rule changes),
- *     which would make bundle-size comparison impossible whenever any
- *     non-code check happens to be broken at either revision.
  *
- * fluid-build uses content-hash based incremental detection, so after a `git
- * checkout` to a different revision, source hashes differ from the stored
+ * - unnecessary for producing webpack bundles, and
+ * - prone to unrelated failures across revisions (e.g. lint rule changes), which would make bundle-size comparison impossible whenever any non-code check happens to be broken at either revision.
+ *
+ * fluid-build uses content-hash based incremental detection, so after a
+ * `git checkout` to a different revision, source hashes differ from the stored
  * `*.done.build.log` and the affected packages rebuild automatically. This is
  * usually enough, but not always reliable; see `cleanWorkspace` and the
  * --skip-clean-build flag.
@@ -386,8 +385,8 @@ Usage:
 
 Options:
   --help, -h              Show this help text and exit.
-  --base-branch <name>    Base branch name (default: main)
-  --current-branch <name> Current branch name (default: current git branch)
+  --base-branch <name>    Base branch name (default: main). The other side of the
+                          comparison is always the currently checked-out branch.
   --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
   --skip-clean-build      Skip the full workspace clean that normally runs before each
                           build. By default we run 'fluid-build --task clean' at the
@@ -407,7 +406,7 @@ Persistent state lives under: ${analysisRoot}
 
 Examples:
   jiti ./scripts/collectBundles.ts
-  jiti ./scripts/collectBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/collectBundles.ts --base-branch main
   jiti ./scripts/collectBundles.ts --clean-analysis-dir
   jiti ./scripts/collectBundles.ts --skip-clean-build
   jiti ./scripts/collectBundles.ts --restore-only
@@ -431,10 +430,10 @@ function restoreFromState(): void {
 	console.log(`  stashed:        ${state.stashed}`);
 
 	const currentBranch = getCurrentBranch();
-	if (currentBranch !== state.originalBranch) {
-		checkoutBranch(state.originalBranch);
-	} else {
+	if (currentBranch === state.originalBranch) {
 		console.log(`Already on original branch (${state.originalBranch}).`);
+	} else {
+		checkoutBranch(state.originalBranch);
 	}
 
 	installDependencies();
@@ -468,7 +467,6 @@ function main(argv: string[]): void {
 	}
 
 	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
-	const currentBranch = getOptionValue(argv, "--current-branch") ?? getCurrentBranch();
 	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
 	const skipCleanBuild = hasFlag(argv, "--skip-clean-build");
 	const exitAfterBuild = hasFlag(argv, "--exit-after-build");
@@ -538,8 +536,10 @@ function main(argv: string[]): void {
 			buildBundles();
 			saveStats(sanitizeForFileName(baseBranch));
 
-			if (getCurrentBranch() !== currentBranch) {
-				checkoutBranch(currentBranch);
+			// The "current" side of the comparison is always whatever branch was
+			// checked out when this script started. Return to it and rebuild.
+			if (getCurrentBranch() !== originalBranch) {
+				checkoutBranch(originalBranch);
 				installDependencies();
 			}
 			if (!skipCleanBuild) {
@@ -547,11 +547,7 @@ function main(argv: string[]): void {
 			}
 			buildWorkspace();
 			buildBundles();
-			saveStats(sanitizeForFileName(currentBranch));
-
-			if (getCurrentBranch() !== originalBranch) {
-				checkoutBranch(originalBranch);
-			}
+			saveStats(sanitizeForFileName(originalBranch));
 		} finally {
 			if (!exitAfterBuild) {
 				// Always ensure original branch has fresh dependencies and restore stash if needed.
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index f6b076666ed8..554e2156c805 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  */
 
+import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { resolve } from "node:path";
@@ -63,6 +64,22 @@ function sanitizeForFileName(value: string): string {
 	return value.replace(/[^\w.-]/g, "_");
 }
 
+/**
+ * Returns the current git branch name, or undefined if it cannot be determined
+ * (e.g., not in a git work tree).
+ */
+function tryGetCurrentBranch(): string | undefined {
+	try {
+		const branch = execSync("git rev-parse --abbrev-ref HEAD", {
+			encoding: "utf-8",
+			stdio: ["ignore", "pipe", "ignore"],
+		}).trim();
+		return branch.length > 0 ? branch : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
 /** Represents a single asset in a bundle. */
 interface AssetStat {
 	/** The name of the asset (e.g., "bundle.js") */
@@ -230,7 +247,7 @@ function formatEntrypointRow(
 interface Options {
 	/** Branch name for the base build (default: "main") */
 	baseBranch: string;
-	/** Branch name for the current build (default: current branch or BUILD_SOURCEBRANCHNAME) */
+	/** Branch name for the current build (auto-detected from git HEAD or BUILD_SOURCEBRANCHNAME) */
 	currentBranch: string;
 	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/\{label\}/ (default: OS temp dir / fluid-bundle-compare) */
 	analysisDirectory: string;
@@ -238,7 +255,8 @@ interface Options {
 
 /**
  * Parses command-line arguments into an Options object.
- * Reads BUILD_SOURCEBRANCHNAME environment variable for current branch if not provided.
+ * The current branch is auto-detected: BUILD_SOURCEBRANCHNAME (CI) takes precedence,
+ * then the current git branch, falling back to the literal "current".
  *
  * @param argv - The command-line argument list
  * @returns Parsed options with defaults applied
@@ -246,9 +264,7 @@ interface Options {
 function parseOptions(argv: string[]): Options {
 	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
 	const currentBranch =
-		getOptionValue(argv, "--current-branch") ??
-		process.env.BUILD_SOURCEBRANCHNAME ??
-		"current";
+		process.env.BUILD_SOURCEBRANCHNAME ?? tryGetCurrentBranch() ?? "current";
 	const analysisDirectory = resolve(
 		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
 	);
@@ -302,13 +318,13 @@ Options:
   --help, -h
     Show this help text and exit.
 
-  --base-branch <name>    Base branch name (default: main)
-  --current-branch <name> Current branch name (default: BUILD_SOURCEBRANCHNAME or current)
+  --base-branch <name>    Base branch name (default: main). The "current" side is
+                          auto-detected from BUILD_SOURCEBRANCHNAME or git HEAD.
   --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
                           under bundleAnalysis/{label}/ (default: ${defaultAnalysisDirectory})
 
 Examples:
-  jiti ./scripts/compareBundles.ts --base-branch main --current-branch feature/my-changes
+  jiti ./scripts/compareBundles.ts --base-branch main
   jiti ./scripts/compareBundles.ts --analysis-dir /some/other/path
 `);
 }

From f1d18325e06f85fd867a4ba8d2f000cf631f5d6e Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 17:27:13 -0700
Subject: [PATCH 18/67] Lint fix.

---
 .../bundle-size-tests/scripts/collectAndCompareBundles.ts    | 4 +---
 examples/utils/bundle-size-tests/scripts/collectBundles.ts   | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 278336b90c35..de0c171b5d4d 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -44,9 +44,7 @@ function runScript(scriptName: string, scriptArgs: string[]): void {
 	);
 
 	if (result.error !== undefined) {
-		throw new Error(
-			`Failed to launch script ${scriptName}: ${result.error.message}`,
-		);
+		throw new Error(`Failed to launch script ${scriptName}: ${result.error.message}`);
 	}
 	if (result.status !== 0) {
 		throw new Error(
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
index 56af6a1e45cd..94504061789e 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
@@ -522,10 +522,7 @@ function main(argv: string[]): void {
 				console.log(`\n${"=".repeat(80)}`);
 				console.log("--exit-after-build: stopping after base-branch build.");
 				console.log(`  Currently checked out: ${getCurrentBranch()}`);
-				console.log(
-					"  State file retained at:",
-					stateFilePath,
-				);
+				console.log("  State file retained at:", stateFilePath);
 				console.log(
 					"  Use --restore-only to return to the original branch and pop the stash.",
 				);

From 13fda20cc6bdaf4e04d25c4c82ec3d5529fb4227 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 17:45:05 -0700
Subject: [PATCH 19/67] Fixed lockfile.

---
 pnpm-lock.yaml | 165 +++++++++++++++++++++++++++++++------------------
 1 file changed, 106 insertions(+), 59 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 98d09c89da18..c07e93f4356a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -381,7 +381,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -511,7 +511,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -638,7 +638,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -934,7 +934,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1079,7 +1079,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1236,7 +1236,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1360,7 +1360,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1578,7 +1578,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1681,7 +1681,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1860,7 +1860,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1975,7 +1975,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2084,7 +2084,7 @@ importers:
         version: 5.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2290,7 +2290,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -2323,7 +2323,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2544,7 +2544,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -3069,7 +3069,7 @@ importers:
         version: 4.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4377,7 +4377,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4413,7 +4413,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4522,7 +4522,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4564,7 +4564,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4688,7 +4688,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5391,7 +5391,7 @@ importers:
         version: link:../../../packages/utils/tool-utils
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -5600,7 +5600,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5769,7 +5769,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5950,7 +5950,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6110,7 +6110,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6237,7 +6237,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6376,7 +6376,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6500,7 +6500,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6751,7 +6751,7 @@ importers:
         version: link:../../../../packages/dds/shared-object-base
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -7645,7 +7645,7 @@ importers:
         version: 18.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@22.19.17)(typescript@5.4.5)
@@ -11048,7 +11048,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16169,7 +16169,7 @@ importers:
         version: 3.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16468,7 +16468,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16501,7 +16501,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16658,7 +16658,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16697,7 +16697,7 @@ importers:
         version: 3.32.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -30479,7 +30479,7 @@ snapshots:
       '@fluidframework/routerlicious-driver': 1.4.0(encoding@0.1.13)
       '@fluidframework/runtime-utils': 1.4.0
       '@fluidframework/server-services-client': 0.1036.5002
-      axios: 0.30.3(debug@4.4.3)
+      axios: 0.30.3
       uuid: 8.3.2
     transitivePeerDependencies:
       - bufferutil
@@ -30895,7 +30895,7 @@ snapshots:
       '@fluidframework/protocol-base': 0.1036.5002
       '@fluidframework/protocol-definitions': 0.1028.2000
       '@fluidframework/telemetry-utils': 1.4.0
-      axios: 0.30.3(debug@4.4.3)
+      axios: 0.30.3
       uuid: 8.3.2
     transitivePeerDependencies:
       - debug
@@ -31445,6 +31445,35 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@fluidframework/server-lambdas@7.0.0':
+    dependencies:
+      '@fluidframework/common-utils': 3.1.0
+      '@fluidframework/gitresources': 7.0.0
+      '@fluidframework/protocol-base': 7.0.0
+      '@fluidframework/protocol-definitions': 3.2.0
+      '@fluidframework/server-lambdas-driver': 7.0.0
+      '@fluidframework/server-services-client': 7.0.0
+      '@fluidframework/server-services-core': 7.0.0
+      '@fluidframework/server-services-telemetry': 7.0.0
+      '@types/semver': 7.7.0
+      assert: 2.1.0
+      async: 3.2.6
+      axios: 1.15.0(debug@4.3.7)
+      buffer: 6.0.3
+      double-ended-queue: 2.1.0-0
+      events: 3.3.0
+      json-stringify-safe: 5.0.1
+      lodash: 4.18.1
+      nconf: 0.12.1
+      opossum: 8.5.0
+      semver: 7.7.3
+      serialize-error: 8.1.0
+      sha.js: 2.4.12
+      uuid: 11.1.0
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+
   '@fluidframework/server-lambdas@7.0.0(debug@4.4.3)':
     dependencies:
       '@fluidframework/common-utils': 3.1.0
@@ -34312,7 +34341,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0(debug@4.4.3)
+      axios: 1.15.0(debug@4.3.7)
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -34398,12 +34427,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -34742,6 +34771,14 @@ snapshots:
 
   axe-core@4.10.2: {}
 
+  axios@0.30.3:
+    dependencies:
+      follow-redirects: 1.15.11(debug@4.3.7)
+      form-data: 4.0.5
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@0.30.3(debug@4.4.3):
     dependencies:
       follow-redirects: 1.15.11(debug@4.4.3)
@@ -36457,7 +36494,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
+  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
     dependencies:
       '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
       eslint: 9.39.1(jiti@2.6.1)
@@ -37582,6 +37619,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  http-proxy-middleware@2.0.9(@types/express@4.17.21):
+    dependencies:
+      '@types/http-proxy': 1.17.15
+      http-proxy: 1.18.1
+      is-glob: 4.0.3
+      is-plain-obj: 3.0.0
+      micromatch: 4.0.8
+    optionalDependencies:
+      '@types/express': 4.17.21
+    transitivePeerDependencies:
+      - debug
+
   http-proxy-middleware@2.0.9(@types/express@4.17.21)(debug@4.4.3):
     dependencies:
       '@types/http-proxy': 1.17.15
@@ -37594,6 +37643,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  http-proxy@1.18.1:
+    dependencies:
+      eventemitter3: 4.0.7
+      follow-redirects: 1.15.11(debug@4.3.7)
+      requires-port: 1.0.0
+    transitivePeerDependencies:
+      - debug
+
   http-proxy@1.18.1(debug@4.4.3):
     dependencies:
       eventemitter3: 4.0.7
@@ -38218,7 +38275,7 @@ snapshots:
       prompts: 2.4.2
       spawnd: 10.1.4
       tree-kill: 1.2.2
-      wait-on: 8.0.1
+      wait-on: 8.0.1(debug@4.3.7)
     transitivePeerDependencies:
       - debug
       - supports-color
@@ -42544,7 +42601,7 @@ snapshots:
       '@fluidframework/gitresources': 7.0.0
       '@fluidframework/protocol-base': 7.0.0
       '@fluidframework/protocol-definitions': 3.2.0
-      '@fluidframework/server-lambdas': 7.0.0(debug@4.4.3)
+      '@fluidframework/server-lambdas': 7.0.0
       '@fluidframework/server-local-server': 7.0.0
       '@fluidframework/server-memory-orderer': 7.0.0
       '@fluidframework/server-services-client': 7.0.0
@@ -42554,7 +42611,7 @@ snapshots:
       '@fluidframework/server-services-utils': 7.0.0
       '@fluidframework/server-test-utils': 7.0.0
       agentkeepalive: 4.6.0
-      axios: 1.15.0(debug@4.4.3)
+      axios: 1.15.0(debug@4.3.7)
       body-parser: 1.20.3
       charwise: 3.0.1
       compression: 1.7.5
@@ -42671,7 +42728,7 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
+  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
@@ -43247,16 +43304,6 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
-  wait-on@8.0.1:
-    dependencies:
-      axios: 1.15.0(debug@4.4.3)
-      joi: 17.13.3
-      lodash: 4.18.1
-      minimist: 1.2.8
-      rxjs: 7.8.2
-    transitivePeerDependencies:
-      - debug
-
   wait-on@8.0.1(debug@4.3.7):
     dependencies:
       axios: 1.15.0(debug@4.3.7)
@@ -43442,7 +43489,7 @@ snapshots:
       express: 4.22.1
       graceful-fs: 4.2.11
       html-entities: 2.6.0
-      http-proxy-middleware: 2.0.9(@types/express@4.17.21)(debug@4.4.3)
+      http-proxy-middleware: 2.0.9(@types/express@4.17.21)
       ipaddr.js: 2.2.0
       launch-editor: 2.9.1
       open: 8.4.2
@@ -43506,7 +43553,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild

From 208214764beb0a70c93159dee4554d29cd291426 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 17:58:55 -0700
Subject: [PATCH 20/67] Fixed dependencies. Removed msgpack in favor of
 msgpack-lite (which we already depend on).

---
 examples/utils/bundle-size-tests/package.json |   1 -
 .../scripts/compareBundles.ts                 |  22 +-
 pnpm-lock.yaml                                | 461 +++---------------
 3 files changed, 78 insertions(+), 406 deletions(-)

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 5091abcf1476..db01d7b79615 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -63,7 +63,6 @@
 		"@fluidframework/bundle-size-tools": "catalog:buildTools",
 		"@fluidframework/eslint-config-fluid": "catalog:eslint",
 		"@mixer/webpack-bundle-compare": "^0.1.0",
-		"@msgpack/msgpack": "^2.8.0",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "catalog:types",
 		"eslint": "catalog:eslint",
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 554e2156c805..b4db8c32b44c 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -7,9 +7,9 @@ import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { resolve } from "node:path";
-import { gunzipSync, gzipSync } from "node:zlib";
+import { gzipSync } from "node:zlib";
 
-import { decode } from "@msgpack/msgpack";
+import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
 
 // Default to the persistent analysis root used by collectBundles.ts.
 // Kept in the OS temp dir so results survive `git checkout` and `npm run clean`.
@@ -120,8 +120,22 @@ function loadStats(analysisDirectory: string, label: string): BundleStats {
 	}
 
 	const compressedData = readFileSync(statsFilePath);
-	const decompressedData = gunzipSync(compressedData);
-	return decode(decompressedData) as BundleStats;
+	const fullStats = decompressStatsFile(compressedData);
+	// Project to just the fields we need so the huge `chunks`/`modules` trees
+	// produced by msgpack-lite can be GC'd. Two full webpack stats objects in
+	// memory at once is enough to OOM Node's default 4 GB heap.
+	const slim: BundleStats = {
+		assets: fullStats.assets?.map((a) => ({ name: a.name, size: a.size })),
+		entrypoints: fullStats.entrypoints
+			? Object.fromEntries(
+					Object.entries(fullStats.entrypoints).map(([name, ep]) => [
+						name,
+						{ assets: ep.assets?.map((a) => ({ size: a.size })) },
+					]),
+				)
+			: {},
+	};
+	return slim;
 }
 
 /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c07e93f4356a..a359a6e6dba5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -172,7 +172,7 @@ importers:
         version: 0.64.0(@types/node@22.19.17)
       '@fluidframework/eslint-config-fluid':
         specifier: catalog:eslint
-        version: 9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+        version: 9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
       eslint:
         specifier: catalog:eslint
         version: 9.39.1(jiti@2.6.1)
@@ -381,7 +381,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -511,7 +511,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -638,7 +638,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -934,7 +934,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1079,7 +1079,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1236,7 +1236,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1360,7 +1360,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1578,7 +1578,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1681,7 +1681,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1860,7 +1860,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1975,7 +1975,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2084,7 +2084,7 @@ importers:
         version: 5.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2290,7 +2290,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -2323,7 +2323,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2544,7 +2544,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -3069,7 +3069,7 @@ importers:
         version: 4.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4377,7 +4377,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4413,7 +4413,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4522,7 +4522,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4564,7 +4564,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4688,7 +4688,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4862,9 +4862,6 @@ importers:
       '@mixer/webpack-bundle-compare':
         specifier: ^0.1.0
         version: 0.1.1
-      '@msgpack/msgpack':
-        specifier: ^2.8.0
-        version: 2.8.0
       '@types/mocha':
         specifier: ^10.0.10
         version: 10.0.10
@@ -5391,7 +5388,7 @@ importers:
         version: link:../../../packages/utils/tool-utils
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -5600,7 +5597,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5769,7 +5766,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5950,7 +5947,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6110,7 +6107,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6237,7 +6234,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6376,7 +6373,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6500,7 +6497,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6751,7 +6748,7 @@ importers:
         version: link:../../../../packages/dds/shared-object-base
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -7645,7 +7642,7 @@ importers:
         version: 18.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@22.19.17)(typescript@5.4.5)
@@ -11048,7 +11045,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16169,7 +16166,7 @@ importers:
         version: 3.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16468,7 +16465,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16501,7 +16498,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16658,7 +16655,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16697,7 +16694,7 @@ importers:
         version: 3.32.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -19365,10 +19362,6 @@ packages:
   '@mixer/webpack-bundle-compare@0.1.1':
     resolution: {integrity: sha512-EJe72ByalyTcG7CDdopfGGOnyUqmj1XQD9nF4VgS+FVKAIc97YGiQ4Dlz2B3uUVxuigdGDxh3kIri5f+u5ajKg==}
 
-  '@msgpack/msgpack@2.8.0':
-    resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
-    engines: {node: '>= 10'}
-
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
     resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==}
     cpu: [arm64]
@@ -30252,17 +30245,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@fluid-internal/eslint-plugin-fluid@0.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@microsoft/tsdoc': 0.15.1
-      '@typescript-eslint/parser': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      ts-morph: 22.0.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@fluid-internal/test-driver-definitions@2.92.0':
     dependencies:
       '@fluidframework/core-interfaces': 2.92.0
@@ -30479,7 +30461,7 @@ snapshots:
       '@fluidframework/routerlicious-driver': 1.4.0(encoding@0.1.13)
       '@fluidframework/runtime-utils': 1.4.0
       '@fluidframework/server-services-client': 0.1036.5002
-      axios: 0.30.3
+      axios: 0.30.3(debug@4.4.3)
       uuid: 8.3.2
     transitivePeerDependencies:
       - bufferutil
@@ -30895,7 +30877,7 @@ snapshots:
       '@fluidframework/protocol-base': 0.1036.5002
       '@fluidframework/protocol-definitions': 0.1028.2000
       '@fluidframework/telemetry-utils': 1.4.0
-      axios: 0.30.3
+      axios: 0.30.3(debug@4.4.3)
       uuid: 8.3.2
     transitivePeerDependencies:
       - debug
@@ -30955,37 +30937,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@fluidframework/eslint-config-fluid@9.0.0(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/eslint-plugin-eslint-comments': 4.5.0(eslint@9.39.1(jiti@2.6.1))
-      '@eslint/eslintrc': 3.3.3
-      '@eslint/js': 9.39.4
-      '@fluid-internal/eslint-plugin-fluid': 0.4.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@rushstack/eslint-plugin': 0.22.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint-config-biome: 2.1.3
-      eslint-config-prettier: 10.1.8(eslint@9.39.1(jiti@2.6.1))
-      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-depend: 1.4.0
-      eslint-plugin-import-x: 4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-jsdoc: 61.4.2(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-promise: 7.2.1(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-react: 7.37.5(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-react-hooks: 7.0.1(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-tsdoc: 0.5.2(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint-plugin-unicorn: 54.0.0(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-unused-imports: 4.3.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
-      globals: 14.0.0
-      typescript-eslint: 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-    transitivePeerDependencies:
-      - '@typescript-eslint/utils'
-      - eslint
-      - eslint-import-resolver-node
-      - eslint-plugin-import
-      - supports-color
-      - typescript
-
   '@fluidframework/file-driver@2.92.0':
     dependencies:
       '@fluid-internal/client-utils': 2.92.0
@@ -31445,35 +31396,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@fluidframework/server-lambdas@7.0.0':
-    dependencies:
-      '@fluidframework/common-utils': 3.1.0
-      '@fluidframework/gitresources': 7.0.0
-      '@fluidframework/protocol-base': 7.0.0
-      '@fluidframework/protocol-definitions': 3.2.0
-      '@fluidframework/server-lambdas-driver': 7.0.0
-      '@fluidframework/server-services-client': 7.0.0
-      '@fluidframework/server-services-core': 7.0.0
-      '@fluidframework/server-services-telemetry': 7.0.0
-      '@types/semver': 7.7.0
-      assert: 2.1.0
-      async: 3.2.6
-      axios: 1.15.0(debug@4.3.7)
-      buffer: 6.0.3
-      double-ended-queue: 2.1.0-0
-      events: 3.3.0
-      json-stringify-safe: 5.0.1
-      lodash: 4.18.1
-      nconf: 0.12.1
-      opossum: 8.5.0
-      semver: 7.7.3
-      serialize-error: 8.1.0
-      sha.js: 2.4.12
-      uuid: 11.1.0
-    transitivePeerDependencies:
-      - debug
-      - supports-color
-
   '@fluidframework/server-lambdas@7.0.0(debug@4.4.3)':
     dependencies:
       '@fluidframework/common-utils': 3.1.0
@@ -32684,8 +32606,6 @@ snapshots:
       js-base64: 3.7.7
       msgpack-lite: 0.1.26
 
-  '@msgpack/msgpack@2.8.0': {}
-
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
     optional: true
 
@@ -33132,15 +33052,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@rushstack/eslint-plugin@0.22.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@rushstack/tree-pattern': 0.3.4
-      '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@rushstack/node-core-library@3.66.1(@types/node@22.19.17)':
     dependencies:
       colors: 1.2.5
@@ -33862,22 +33773,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.54.0
-      eslint: 9.39.1(jiti@2.6.1)
-      ignore: 7.0.5
-      natural-compare: 1.4.0
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.46.4
@@ -33890,18 +33785,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.46.4
-      '@typescript-eslint/types': 8.46.4
-      '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.46.4
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.54.0
@@ -33914,18 +33797,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.54.0
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/project-service@8.46.4(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33935,15 +33806,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.46.4(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
-      '@typescript-eslint/types': 8.58.0
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/project-service@8.54.0(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33953,15 +33815,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.54.0(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
-      '@typescript-eslint/types': 8.58.0
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/project-service@8.56.1(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.4.5)
@@ -33971,15 +33824,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.56.1(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
-      '@typescript-eslint/types': 8.58.0
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/scope-manager@8.46.4':
     dependencies:
       '@typescript-eslint/types': 8.46.4
@@ -33999,26 +33843,14 @@ snapshots:
     dependencies:
       typescript: 5.4.5
 
-  '@typescript-eslint/tsconfig-utils@8.46.4(typescript@5.9.3)':
-    dependencies:
-      typescript: 5.9.3
-
   '@typescript-eslint/tsconfig-utils@8.54.0(typescript@5.4.5)':
     dependencies:
       typescript: 5.4.5
 
-  '@typescript-eslint/tsconfig-utils@8.54.0(typescript@5.9.3)':
-    dependencies:
-      typescript: 5.9.3
-
   '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.4.5)':
     dependencies:
       typescript: 5.4.5
 
-  '@typescript-eslint/tsconfig-utils@8.56.1(typescript@5.9.3)':
-    dependencies:
-      typescript: 5.9.3
-
   '@typescript-eslint/type-utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -34031,18 +33863,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 9.39.1(jiti@2.6.1)
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/types@8.46.4': {}
 
   '@typescript-eslint/types@8.54.0': {}
@@ -34067,22 +33887,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.46.4(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.46.4(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.9.3)
-      '@typescript-eslint/types': 8.46.4
-      '@typescript-eslint/visitor-keys': 8.46.4
-      debug: 4.4.3(supports-color@8.1.1)
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
-      minimatch: 9.0.9
-      semver: 7.7.3
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/typescript-estree@8.54.0(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/project-service': 8.54.0(typescript@5.4.5)
@@ -34098,21 +33902,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.54.0(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/visitor-keys': 8.54.0
-      debug: 4.4.3(supports-color@8.1.1)
-      minimatch: 9.0.9
-      semver: 7.7.3
-      tinyglobby: 0.2.15
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/typescript-estree@8.56.1(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/project-service': 8.56.1(typescript@5.4.5)
@@ -34128,21 +33917,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.56.1(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.56.1(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.56.1(typescript@5.9.3)
-      '@typescript-eslint/types': 8.56.1
-      '@typescript-eslint/visitor-keys': 8.56.1
-      debug: 4.4.3(supports-color@8.1.1)
-      minimatch: 10.2.4
-      semver: 7.7.3
-      tinyglobby: 0.2.15
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -34154,17 +33928,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.46.4
-      '@typescript-eslint/types': 8.46.4
-      '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -34176,17 +33939,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
@@ -34198,17 +33950,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.56.1
-      '@typescript-eslint/types': 8.56.1
-      '@typescript-eslint/typescript-estree': 8.56.1(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/visitor-keys@8.46.4':
     dependencies:
       '@typescript-eslint/types': 8.46.4
@@ -34341,7 +34082,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0(debug@4.3.7)
+      axios: 1.15.0(debug@4.4.3)
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -34427,12 +34168,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -34771,14 +34512,6 @@ snapshots:
 
   axe-core@4.10.2: {}
 
-  axios@0.30.3:
-    dependencies:
-      follow-redirects: 1.15.11(debug@4.3.7)
-      form-data: 4.0.5
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
   axios@0.30.3(debug@4.4.3):
     dependencies:
       follow-redirects: 1.15.11(debug@4.4.3)
@@ -36433,21 +36166,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)))(eslint@9.39.1(jiti@2.6.1)):
-    dependencies:
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 9.39.1(jiti@2.6.1)
-      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
-      get-tsconfig: 4.13.7
-      is-bun-module: 2.0.0
-      stable-hash-x: 0.2.0
-      tinyglobby: 0.2.15
-      unrs-resolver: 1.11.1
-    optionalDependencies:
-      eslint-plugin-import-x: 4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-plugin-chai-expect@3.1.0(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
@@ -36476,25 +36194,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import-x@4.16.2(@typescript-eslint/utils@8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
-    dependencies:
-      '@package-json/types': 0.0.12
-      '@typescript-eslint/types': 8.58.0
-      comment-parser: 1.4.6
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 9.39.1(jiti@2.6.1)
-      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
-      is-glob: 4.0.3
-      minimatch: 9.0.9
-      semver: 7.7.3
-      stable-hash-x: 0.2.0
-      unrs-resolver: 1.11.1
-    optionalDependencies:
-      '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
+  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
     dependencies:
       '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
       eslint: 9.39.1(jiti@2.6.1)
@@ -36573,16 +36273,6 @@ snapshots:
       - supports-color
       - typescript
 
-  eslint-plugin-tsdoc@0.5.2(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3):
-    dependencies:
-      '@microsoft/tsdoc': 0.16.0
-      '@microsoft/tsdoc-config': 0.18.1
-      '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-      - typescript
-
   eslint-plugin-unicorn@54.0.0(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       '@babel/helper-validator-identifier': 7.27.1
@@ -36611,12 +36301,6 @@ snapshots:
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
 
-  eslint-plugin-unused-imports@4.3.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1)):
-    dependencies:
-      eslint: 9.39.1(jiti@2.6.1)
-    optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-
   eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
@@ -37619,18 +37303,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  http-proxy-middleware@2.0.9(@types/express@4.17.21):
-    dependencies:
-      '@types/http-proxy': 1.17.15
-      http-proxy: 1.18.1
-      is-glob: 4.0.3
-      is-plain-obj: 3.0.0
-      micromatch: 4.0.8
-    optionalDependencies:
-      '@types/express': 4.17.21
-    transitivePeerDependencies:
-      - debug
-
   http-proxy-middleware@2.0.9(@types/express@4.17.21)(debug@4.4.3):
     dependencies:
       '@types/http-proxy': 1.17.15
@@ -37643,14 +37315,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  http-proxy@1.18.1:
-    dependencies:
-      eventemitter3: 4.0.7
-      follow-redirects: 1.15.11(debug@4.3.7)
-      requires-port: 1.0.0
-    transitivePeerDependencies:
-      - debug
-
   http-proxy@1.18.1(debug@4.4.3):
     dependencies:
       eventemitter3: 4.0.7
@@ -38275,7 +37939,7 @@ snapshots:
       prompts: 2.4.2
       spawnd: 10.1.4
       tree-kill: 1.2.2
-      wait-on: 8.0.1(debug@4.3.7)
+      wait-on: 8.0.1
     transitivePeerDependencies:
       - debug
       - supports-color
@@ -42601,7 +42265,7 @@ snapshots:
       '@fluidframework/gitresources': 7.0.0
       '@fluidframework/protocol-base': 7.0.0
       '@fluidframework/protocol-definitions': 3.2.0
-      '@fluidframework/server-lambdas': 7.0.0
+      '@fluidframework/server-lambdas': 7.0.0(debug@4.4.3)
       '@fluidframework/server-local-server': 7.0.0
       '@fluidframework/server-memory-orderer': 7.0.0
       '@fluidframework/server-services-client': 7.0.0
@@ -42611,7 +42275,7 @@ snapshots:
       '@fluidframework/server-services-utils': 7.0.0
       '@fluidframework/server-test-utils': 7.0.0
       agentkeepalive: 4.6.0
-      axios: 1.15.0(debug@4.3.7)
+      axios: 1.15.0(debug@4.4.3)
       body-parser: 1.20.3
       charwise: 3.0.1
       compression: 1.7.5
@@ -42720,15 +42384,11 @@ snapshots:
     dependencies:
       typescript: 5.4.5
 
-  ts-api-utils@2.4.0(typescript@5.9.3):
-    dependencies:
-      typescript: 5.9.3
-
   ts-deepmerge@7.0.3: {}
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
+  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
@@ -42923,17 +42583,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  typescript-eslint@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3):
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.39.1(jiti@2.6.1)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   typescript@4.9.5: {}
 
   typescript@5.4.5: {}
@@ -43304,6 +42953,16 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
+  wait-on@8.0.1:
+    dependencies:
+      axios: 1.15.0(debug@4.4.3)
+      joi: 17.13.3
+      lodash: 4.18.1
+      minimist: 1.2.8
+      rxjs: 7.8.2
+    transitivePeerDependencies:
+      - debug
+
   wait-on@8.0.1(debug@4.3.7):
     dependencies:
       axios: 1.15.0(debug@4.3.7)
@@ -43489,7 +43148,7 @@ snapshots:
       express: 4.22.1
       graceful-fs: 4.2.11
       html-entities: 2.6.0
-      http-proxy-middleware: 2.0.9(@types/express@4.17.21)
+      http-proxy-middleware: 2.0.9(@types/express@4.17.21)(debug@4.4.3)
       ipaddr.js: 2.2.0
       launch-editor: 2.9.1
       open: 8.4.2
@@ -43553,7 +43212,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild

From 85e510757ff032213cce75213b694a801733a4f8 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 24 Apr 2026 18:05:46 -0700
Subject: [PATCH 21/67] Lint.

---
 examples/utils/bundle-size-tests/tsconfig.scripts.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
index ed6f739caa70..60832e97682c 100644
--- a/examples/utils/bundle-size-tests/tsconfig.scripts.json
+++ b/examples/utils/bundle-size-tests/tsconfig.scripts.json
@@ -3,7 +3,7 @@
 	"compilerOptions": {
 		"noEmit": true,
 		"types": ["node"],
-		"exactOptionalPropertyTypes": false
+		"exactOptionalPropertyTypes": false,
 	},
-	"include": ["scripts/**/*.ts"]
+	"include": ["scripts/**/*.ts"],
 }

From 0d5a882a7e4e166610cdcc22e4fc55652973defc Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 27 Apr 2026 12:48:27 -0700
Subject: [PATCH 22/67] - Instead of altering git state, the collect phase
 checks out a separate enlistment. It avoids cleaning as well. - No temp
 directory. - Removed custom labels (extraneous feature). - collectBundle.ts
 replaced collectBundles.ts and only collects one bundle per invocation.

---
 examples/utils/bundle-size-tests/package.json |   2 +-
 .../scripts/collectAndCompareBundles.ts       | 150 +++--
 .../scripts/collectBundle.ts                  | 337 ++++++++++
 .../scripts/collectBundles.ts                 | 579 ------------------
 .../scripts/compareBundles.ts                 |  24 +-
 5 files changed, 437 insertions(+), 655 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/collectBundle.ts
 delete mode 100644 examples/utils/bundle-size-tests/scripts/collectBundles.ts

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index aee6a61e58a3..23fdeead5b3d 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,7 +21,7 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"collect:bundles": "jiti ./scripts/collectBundles.ts",
+		"collect:bundle": "jiti ./scripts/collectBundle.ts",
 		"collect:compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
 		"compare:bundles": "jiti ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index de0c171b5d4d..1d39cdd53eff 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -21,6 +21,40 @@ function hasFlag(argv: string[], flagName: string): boolean {
 	return argv.includes(flagName);
 }
 
+/**
+ * Extracts the value of a command-line option from the argument list.
+ *
+ * @param argv - The command-line argument list
+ * @param optionName - The name of the option to extract
+ * @returns The option value, or undefined if not found
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+	return argv[index + 1];
+}
+
+/**
+ * Sanitizes a string for use as a filename.
+ *
+ * @param value - The string to sanitize
+ * @returns The sanitized string safe for use as a filename
+ */
+function sanitizeForFileName(value: string): string {
+	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
+	return value.replace(/[^\w.-]/g, "_");
+}
+
 /**
  * Runs a TypeScript script via Node with jiti's ESM register hook.
  *
@@ -31,8 +65,13 @@ function hasFlag(argv: string[], flagName: string): boolean {
  *
  * @param scriptName - Script file name under ./scripts/
  * @param scriptArgs - Arguments to forward to the script
+ * @param envOverrides - Extra environment variables to set for the child process
  */
-function runScript(scriptName: string, scriptArgs: string[]): void {
+function runScript(
+	scriptName: string,
+	scriptArgs: string[],
+	envOverrides?: Record<string, string>,
+): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
 	const result = spawnSync(
 		process.execPath,
@@ -40,6 +79,7 @@ function runScript(scriptName: string, scriptArgs: string[]): void {
 		{
 			cwd: packageRoot,
 			stdio: "inherit",
+			env: envOverrides === undefined ? process.env : { ...process.env, ...envOverrides },
 		},
 	);
 
@@ -61,54 +101,36 @@ function printHelp(): void {
 Usage:
   jiti ./scripts/collectAndCompareBundles.ts [options]
 
+Runs collectBundle.ts twice — once in local mode for the outer repo, once in
+revision mode for a separate inner enlistment checked out at the base revision —
+and then runs compareBundles.ts to produce the diff. The outer repo's working
+tree, branch, and stash are never modified.
+
 Options:
   --help, -h
     Show this help text and exit.
 
-  --base-branch <name>    Base branch name (default: main). The other side of the
-                          comparison is always the currently checked-out branch.
-  --skip-compare          Collect stats only, skip the comparison step
-  --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
-  --skip-clean-build      Skip the full workspace clean that normally runs before each
-                          build. By default we run 'fluid-build --task clean' at the
-                          repo root before building each revision so the comparison is
-                          not affected by stale artifacts. Skipping is faster but may
-                          produce incorrect sizes or build errors if incremental build
-                          state from a previous revision interferes with the current one.
-  --restore-only          Do not collect or compare. Use the state file left by a previous
-                          aborted run to check out the original branch, reinstall
-                          dependencies, and pop the matching stash (if any).
+  --base-revision <rev>     Revision to use as the comparison baseline. Branch,
+                            tag, or commit SHA. Default: main.
+  --skip-compare            Collect both bundles, skip the comparison step.
+  --force-clean-build       Run the full workspace clean before each build.
+                            Off by default; opt in when stale incremental build
+                            state may interfere with the current revision.
+
+Labels (used as bundleAnalysis subdirectory names) are determined automatically:
+the local bundle is saved under "current" and the base bundle under the
+sanitized base revision name.
 
 Examples:
   jiti ./scripts/collectAndCompareBundles.ts
-  jiti ./scripts/collectAndCompareBundles.ts --base-branch main
-  jiti ./scripts/collectAndCompareBundles.ts --clean-analysis-dir --skip-compare
-  jiti ./scripts/collectAndCompareBundles.ts --skip-clean-build
-  jiti ./scripts/collectAndCompareBundles.ts --restore-only
+  jiti ./scripts/collectAndCompareBundles.ts --base-revision main
+  jiti ./scripts/collectAndCompareBundles.ts --base-revision v2.20.0
+  jiti ./scripts/collectAndCompareBundles.ts --force-clean-build --skip-compare
 `);
 }
 
 /**
- * Extracts the value of a command-line option from the argument list.
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
-	}
-	return argv[index + 1];
-}
-
-/**
- * Main entry point: runs collection followed by comparison.
+ * Main entry point: runs collection (local + revision) followed by comparison.
  *
  * @param argv - The command-line argument list
  */
@@ -118,41 +140,47 @@ function main(argv: string[]): void {
 		return;
 	}
 
-	// Restore-only short-circuits: delegate to collectBundles and skip comparison.
-	if (hasFlag(argv, "--restore-only")) {
-		runScript("collectBundles.ts", ["--restore-only"]);
-		return;
-	}
+	const baseRevision = getOptionValue(argv, "--base-revision") ?? "main";
+	// Labels mirror the defaults baked into collectBundle.ts: revision-mode runs
+	// save under the sanitized revision name, local-mode runs save under "current".
+	const baseLabel = sanitizeForFileName(baseRevision);
+	const currentLabel = "current";
 
-	const baseBranch = getOptionValue(argv, "--base-branch");
 	const skipCompare = hasFlag(argv, "--skip-compare");
-	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
-	const skipCleanBuildFlag = hasFlag(argv, "--skip-clean-build");
-
-	const collectArgs: string[] = [];
-	const compareArgs: string[] = [];
-	if (baseBranch !== undefined) {
-		collectArgs.push("--base-branch", baseBranch);
-		compareArgs.push("--base-branch", baseBranch);
-	}
-	if (cleanAnalysisDir) {
-		collectArgs.push("--clean-analysis-dir");
-	}
-	if (skipCleanBuildFlag) {
-		collectArgs.push("--skip-clean-build");
+	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
+
+	const sharedCollectArgs: string[] = [];
+	if (forceCleanBuildFlag) {
+		sharedCollectArgs.push("--force-clean-build");
 	}
 
 	try {
 		console.log(`\n${"=".repeat(80)}`);
-		console.log("Collecting bundle stats...");
+		console.log(`Collecting local bundle (label: ${currentLabel})...`);
+		console.log("=".repeat(80));
+		runScript("collectBundle.ts", ["--mode", "local", ...sharedCollectArgs]);
+
+		console.log(`\n${"=".repeat(80)}`);
+		console.log(`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`);
 		console.log("=".repeat(80));
-		runScript("collectBundles.ts", collectArgs);
+		runScript("collectBundle.ts", [
+			"--mode",
+			"revision",
+			"--revision",
+			baseRevision,
+			...sharedCollectArgs,
+		]);
 
 		if (!skipCompare) {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log("Running bundle comparison...");
 			console.log("=".repeat(80));
-			runScript("compareBundles.ts", compareArgs);
+			// compareBundles.ts auto-detects the "current" label from
+			// BUILD_SOURCEBRANCHNAME (sanitized internally), so we use it to plumb
+			// through the explicit current label without modifying compareBundles.
+			runScript("compareBundles.ts", ["--base-branch", baseLabel], {
+				BUILD_SOURCEBRANCHNAME: currentLabel,
+			});
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
new file mode 100644
index 000000000000..def4b352c843
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -0,0 +1,337 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { execSync } from "node:child_process";
+import { copyFileSync, cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const outerPackageRoot = resolve(scriptDirectory, "..");
+
+/**
+ * Workspace-relative path of this package, used to locate the same package
+ * inside a freshly-cloned inner repo.
+ */
+const packageWorkspacePath = "examples/utils/bundle-size-tests";
+
+/**
+ * Gets the repository root directory for the given working directory.
+ */
+function getRepoRoot(cwd: string): string {
+	return execSync("git rev-parse --show-toplevel", {
+		cwd,
+		encoding: "utf-8",
+	}).trim();
+}
+
+const outerRepoRoot = getRepoRoot(outerPackageRoot);
+
+/**
+ * Where saved bundle stats live, keyed by sanitized label.
+ * `compareBundles.ts` reads from `<bundleAnalysisDirectory>/<label>/bundleStats.msp.gz`.
+ *
+ * Lives under this package's `bundleAnalysis/` directory, which is matched by
+ * the repo-wide `.gitignore` entry for `bundleAnalysis`.
+ *
+ * Note: `npm run clean` in this package rimrafs `bundleAnalysis/`, so any state
+ * here (including the inner repo clone) is wiped on clean. The inner repo is
+ * re-cloned automatically on next use.
+ */
+const bundleAnalysisDirectory = resolve(outerPackageRoot, "bundleAnalysis");
+
+/**
+ * Persistent location of the inner FluidFramework enlistment used for
+ * collecting bundles at arbitrary revisions. Cloned from the outer repo's
+ * `origin` remote on first use and reused across runs.
+ *
+ * Only one inner repo is ever maintained — the unique name avoids collisions
+ * with label subdirectories under {@link bundleAnalysisDirectory}.
+ */
+const innerRepoRoot = resolve(bundleAnalysisDirectory, "fluid-bundle-compare-base-repo");
+
+/**
+ * Sanitizes a string for use as a filename.
+ */
+function sanitizeForFileName(value: string): string {
+	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
+	return value.replace(/[^\w.-]/g, "_");
+}
+
+/**
+ * Runs a command inheriting stdio, throwing on failure.
+ */
+function run(command: string, cwd: string): void {
+	execSync(command, { cwd, stdio: "inherit" });
+}
+
+/**
+ * Enables corepack and installs dependencies in the given repo.
+ */
+function installDependencies(repoRoot: string): void {
+	console.log(`Enabling corepack and installing dependencies in ${repoRoot}...`);
+	run("corepack enable", repoRoot);
+	run("pnpm install", repoRoot);
+}
+
+/**
+ * Runs the repo-root `clean` script, which invokes `fluid-build --task clean` across
+ * the entire client release group. This is the only reliable way to clear stale
+ * build artifacts for every transitive dependency of bundle-size-tests:
+ *
+ * - `fluid-build . --task clean` (scoped to this package) does NOT cascade into dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
+ * - The per-package `clean` npm scripts only remove outputs in their own package.
+ */
+function cleanWorkspace(repoRoot: string): void {
+	console.log(`\nCleaning workspace build artifacts in ${repoRoot}...`);
+	run("npm run clean", repoRoot);
+}
+
+/**
+ * Compiles this package and its transitive dependencies so webpack has the
+ * `lib/` outputs it needs. Uses `build:compile` to avoid the lint / docs / api-report
+ * tasks pulled in by the full `build` target, which are unnecessary for bundle
+ * collection and prone to unrelated failures across revisions.
+ */
+function buildWorkspace(packageRoot: string): void {
+	console.log(`\nCompiling bundle-size-tests and its dependencies in ${packageRoot}...`);
+	run("npm run build:compile", packageRoot);
+}
+
+/**
+ * Builds bundles using webpack inside the given package root.
+ */
+function buildBundles(packageRoot: string): void {
+	console.log(`\nBuilding bundles with webpack in ${packageRoot}...`);
+	run("npm run webpack", packageRoot);
+}
+
+/**
+ * Moves webpack's stats output and `build/` directory into the per-label directory
+ * under the persistent analysis root.
+ *
+ * @param label - Sanitized label for this build (e.g., "main", "feature_branch").
+ * @param sourcePackageRoot - Package root that produced the webpack output.
+ */
+function saveStats(label: string, sourcePackageRoot: string): void {
+	const webpackStatsOutputPath = resolve(
+		sourcePackageRoot,
+		"bundleAnalysis",
+		"bundleStats.msp.gz",
+	);
+	const webpackBuildOutputPath = resolve(sourcePackageRoot, "build");
+
+	const labelDirectory = resolve(bundleAnalysisDirectory, label);
+	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
+
+	if (!existsSync(webpackStatsOutputPath)) {
+		throw new Error(
+			`Bundle stats not found at ${webpackStatsOutputPath}. ` +
+				`Check that webpack ran successfully.`,
+		);
+	}
+
+	mkdirSync(labelDirectory, { recursive: true });
+	// Use copy + unlink instead of renameSync because the source and destination
+	// may live on different drives (e.g. D: -> C:\Users\<user>\AppData\Local\Temp),
+	// which causes renameSync to fail with EXDEV on Windows.
+	copyFileSync(webpackStatsOutputPath, destStatsPath);
+	unlinkSync(webpackStatsOutputPath);
+	console.log(`Saved stats to: ${destStatsPath}`);
+
+	if (existsSync(webpackBuildOutputPath)) {
+		const destBuildPath = resolve(labelDirectory, "build");
+		rmSync(destBuildPath, { recursive: true, force: true });
+		cpSync(webpackBuildOutputPath, destBuildPath, { recursive: true });
+		console.log(`Saved build outputs to: ${destBuildPath}`);
+	} else {
+		console.warn(
+			`Warning: webpack build outputs not found at ${webpackBuildOutputPath}; ` +
+				`gzip sizes will be unavailable for label "${label}".`,
+		);
+	}
+}
+
+/**
+ * Returns the URL of the outer repo's `origin` remote, used as the source
+ * for cloning the inner repo.
+ */
+function getOuterOriginUrl(): string {
+	return execSync("git config --get remote.origin.url", {
+		cwd: outerRepoRoot,
+		encoding: "utf-8",
+	}).trim();
+}
+
+/**
+ * Ensures the inner FluidFramework enlistment exists under {@link innerRepoRoot}.
+ *
+ * On first call, clones from the outer repo's `origin` remote. On subsequent
+ * calls, reuses the existing clone (an explicit `git fetch` is performed before
+ * checkout to ensure the requested revision is available).
+ *
+ * Never modifies the outer repo's working tree, branch, or stash.
+ */
+function ensureInnerRepo(): void {
+	if (existsSync(resolve(innerRepoRoot, ".git"))) {
+		return;
+	}
+
+	const originUrl = getOuterOriginUrl();
+	mkdirSync(dirname(innerRepoRoot), { recursive: true });
+	console.log(`\nCloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
+	// Filter blobs to keep the clone fast; blobs are fetched lazily on checkout.
+	run(
+		`git clone --filter=blob:none ${JSON.stringify(originUrl)} ${JSON.stringify(innerRepoRoot)}`,
+		dirname(innerRepoRoot),
+	);
+}
+
+/**
+ * Fetches the latest refs and checks out the requested revision in the inner repo.
+ * The revision can be a branch, tag, or commit SHA.
+ */
+function syncInnerRepoToRevision(revision: string): void {
+	console.log(`\nFetching latest refs in inner repo...`);
+	run("git fetch --tags origin", innerRepoRoot);
+
+	console.log(`Checking out revision "${revision}" in inner repo...`);
+	// Use detached HEAD checkout so we don't have to manage local branch state.
+	run(`git checkout --detach ${JSON.stringify(revision)}`, innerRepoRoot);
+}
+
+/**
+ * Extracts the value of a command-line option from the argument list.
+ */
+function getOptionValue(argv: string[], optionName: string): string | undefined {
+	const optionPrefix = `${optionName}=`;
+	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
+	if (index === -1) {
+		return undefined;
+	}
+
+	const optionArg = argv[index];
+	if (optionArg === undefined) {
+		return undefined;
+	}
+
+	if (optionArg.startsWith(optionPrefix)) {
+		return optionArg.slice(optionPrefix.length);
+	}
+
+	return argv[index + 1];
+}
+
+/**
+ * Checks if a flag is present in the command-line argument list.
+ */
+function hasFlag(argv: string[], flagName: string): boolean {
+	return argv.includes(flagName);
+}
+
+/**
+ * Prints the help text describing usage and options.
+ */
+function printHelp(): void {
+	console.log(`
+Usage:
+  jiti ./scripts/collectBundle.ts [options]
+
+Modes:
+  --mode local              (default) Build and collect a bundle from the outer
+                            FluidFramework enlistment (the repo containing this
+                            script). The outer repo's working tree, branch, and
+                            stash are never modified.
+
+  --mode revision           Build and collect a bundle from a separate inner
+                            FluidFramework enlistment, checked out to a specific
+                            revision. The inner repo lives at:
+                              ${innerRepoRoot}
+                            It is cloned from the outer repo's 'origin' remote on
+                            first use and reused thereafter.
+
+Options:
+  --help, -h                Show this help text and exit.
+  --revision <rev>          (revision mode only, required) Branch, tag, or commit
+                            SHA to check out in the inner repo before building.
+                            Also used as the label under which the bundle stats
+                            are saved.
+  --force-clean-build       Run the full workspace clean ('npm run clean' at the
+                            repo root) before building. Off by default; opt in
+                            when stale incremental build state from a previous
+                            revision may interfere with the current one (e.g.
+                            after switching revisions in the inner repo).
+
+Bundle stats are saved under:
+  ${bundleAnalysisDirectory}/<sanitized-label>/
+where <label> is the revision name in revision mode, or "current" in local mode.
+
+Examples:
+  jiti ./scripts/collectBundle.ts
+  jiti ./scripts/collectBundle.ts --mode revision --revision main
+  jiti ./scripts/collectBundle.ts --mode revision --revision v2.20.0
+`);
+}
+
+/**
+ * Main entry point: collects a single bundle in either local or revision mode.
+ *
+ * @param argv - The command-line argument list
+ */
+function main(argv: string[]): void {
+	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
+		printHelp();
+		return;
+	}
+
+	const mode = getOptionValue(argv, "--mode") ?? "local";
+	if (mode !== "local" && mode !== "revision") {
+		throw new Error(`Invalid --mode "${mode}". Expected "local" or "revision".`);
+	}
+
+	const revision = getOptionValue(argv, "--revision");
+	const forceCleanBuild = hasFlag(argv, "--force-clean-build");
+
+	if (mode === "revision" && (revision === undefined || revision.length === 0)) {
+		throw new Error(`--mode revision requires --revision <rev>.`);
+	}
+
+	const label = sanitizeForFileName(mode === "revision" ? (revision as string) : "current");
+
+	let activeRepoRoot: string;
+	let activePackageRoot: string;
+
+	if (mode === "local") {
+		activeRepoRoot = outerRepoRoot;
+		activePackageRoot = outerPackageRoot;
+	} else {
+		ensureInnerRepo();
+		// Only the inner repo's revision is changed. The outer repo is never touched.
+		syncInnerRepoToRevision(revision as string);
+		activeRepoRoot = innerRepoRoot;
+		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
+		if (!existsSync(activePackageRoot)) {
+			throw new Error(
+				`Expected package not found in inner repo at ${activePackageRoot}. ` +
+					`The revision "${revision as string}" may predate this package.`,
+			);
+		}
+		installDependencies(activeRepoRoot);
+	}
+
+	if (forceCleanBuild) {
+		cleanWorkspace(activeRepoRoot);
+	}
+	buildWorkspace(activePackageRoot);
+	buildBundles(activePackageRoot);
+	saveStats(label, activePackageRoot);
+
+	console.log(`\n${"=".repeat(80)}`);
+	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
+	console.log(`  Stats directory: ${resolve(bundleAnalysisDirectory, label)}`);
+	console.log("=".repeat(80));
+}
+
+main(process.argv.slice(2));
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundles.ts b/examples/utils/bundle-size-tests/scripts/collectBundles.ts
deleted file mode 100644
index 94504061789e..000000000000
--- a/examples/utils/bundle-size-tests/scripts/collectBundles.ts
+++ /dev/null
@@ -1,579 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { execSync } from "node:child_process";
-import {
-	copyFileSync,
-	cpSync,
-	existsSync,
-	mkdirSync,
-	readFileSync,
-	rmSync,
-	unlinkSync,
-	writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const scriptDirectory = dirname(fileURLToPath(import.meta.url));
-const packageRoot = resolve(scriptDirectory, "..");
-
-/**
- * Gets the repository root directory.
- *
- * @returns The absolute path to the repository root
- */
-function getRepoRoot(): string {
-	return execSync("git rev-parse --show-toplevel", {
-		encoding: "utf-8",
-	}).trim();
-}
-
-const repoRoot = getRepoRoot();
-
-/**
- * Root of persistent state for collect/compare runs.
- * Lives in the OS temp directory so it survives:
- *
- * - `git checkout` between branches (which would overwrite in-tree untracked files)
- * - `npm run clean` (which rimrafs bundleAnalysis/ under the package)
- */
-const analysisRoot = resolve(tmpdir(), "fluid-bundle-compare");
-
-/**
- * Where saved bundle stats live, keyed by sanitized branch label.
- * compareBundles.ts reads from `<analysisRoot>/bundleAnalysis/<label>/bundleStats.msp.gz`.
- */
-const bundleAnalysisDirectory = resolve(analysisRoot, "bundleAnalysis");
-
-/**
- * State file used to coordinate restore after an aborted run.
- * Written before the first branch switch; removed on clean exit.
- */
-const stateFilePath = resolve(analysisRoot, "state.json");
-
-/**
- * Webpack writes its raw output here (inside the package).
- * `saveStats` moves it out of the package into `bundleAnalysisDirectory`.
- */
-const webpackStatsOutputPath = resolve(packageRoot, "bundleAnalysis", "bundleStats.msp.gz");
-
-/**
- * Webpack writes the actual JS bundle assets here (inside the package).
- * `saveStats` copies this directory out so `compareBundles.ts` can compute
- * gzip sizes for each asset.
- */
-const webpackBuildOutputPath = resolve(packageRoot, "build");
-
-/**
- * Persistent state saved before we start mutating the working tree.
- */
-interface RunState {
-	/** ISO timestamp at which the run started. */
-	createdAt: string;
-	/** The branch we must return to on completion or restore. */
-	originalBranch: string;
-	/** Unique marker embedded in the stash message so we can find it later. */
-	stashMarker: string;
-	/** True if a stash entry was actually created with that marker. */
-	stashed: boolean;
-}
-
-/**
- * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
- *
- * @param value - The string to sanitize
- * @returns The sanitized string safe for use as a filename
- */
-function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
-	return value.replace(/[^\w.-]/g, "_");
-}
-
-/**
- * Gets the current git branch name.
- *
- * @returns The current branch name
- */
-function getCurrentBranch(): string {
-	return execSync("git rev-parse --abbrev-ref HEAD", {
-		cwd: repoRoot,
-		encoding: "utf-8",
-	}).trim();
-}
-
-/**
- * Writes the run state file.
- */
-function writeState(state: RunState): void {
-	mkdirSync(analysisRoot, { recursive: true });
-	writeFileSync(stateFilePath, `${JSON.stringify(state, undefined, 2)}\n`);
-}
-
-/**
- * Reads the run state file if it exists.
- */
-function readState(): RunState | undefined {
-	if (!existsSync(stateFilePath)) {
-		return undefined;
-	}
-	try {
-		return JSON.parse(readFileSync(stateFilePath, "utf-8")) as RunState;
-	} catch {
-		return undefined;
-	}
-}
-
-/**
- * Removes the run state file if it exists.
- */
-function clearState(): void {
-	if (existsSync(stateFilePath)) {
-		rmSync(stateFilePath, { force: true });
-	}
-}
-
-/**
- * Generates a unique marker for the git stash created by this run.
- */
-function generateStashMarker(): string {
-	return `fluid-bundle-collect:${Date.now()}-${process.pid}`;
-}
-
-/**
- * Stashes current changes (if any) with the given marker embedded in the message.
- *
- * @returns True if a stash entry was created, false if there was nothing to stash.
- */
-function stashChanges(marker: string): boolean {
-	const output = execSync(`git stash push -u -m "${marker}"`, {
-		cwd: repoRoot,
-		encoding: "utf-8",
-	}).trim();
-	if (output.includes("No local changes")) {
-		return false;
-	}
-	console.log(`Stashed local changes (marker: ${marker})`);
-	return true;
-}
-
-/**
- * Finds the stash list index for the stash entry containing the given marker in its subject.
- *
- * @returns The stash ref (e.g. `stash@\{2\}`), or undefined if no matching stash is found.
- */
-function findStashRefByMarker(marker: string): string | undefined {
-	const list = execSync("git stash list", {
-		cwd: repoRoot,
-		encoding: "utf-8",
-	});
-	for (const line of list.split("\n")) {
-		if (line.includes(marker)) {
-			const match = /^(stash@{\d+})/.exec(line);
-			if (match !== null) {
-				return match[1];
-			}
-		}
-	}
-	return undefined;
-}
-
-/**
- * Pops the stash entry whose subject contains the given marker.
- *
- * @returns True if a matching stash was found and popped, false otherwise.
- */
-function popStashByMarker(marker: string): boolean {
-	const stashRef = findStashRefByMarker(marker);
-	if (stashRef === undefined) {
-		console.warn(`No stash entry found matching marker "${marker}".`);
-		return false;
-	}
-	try {
-		execSync(`git stash pop ${stashRef}`, {
-			cwd: repoRoot,
-			stdio: "inherit",
-		});
-		console.log(`Restored stashed changes from ${stashRef}.`);
-		return true;
-	} catch (error) {
-		console.warn(
-			`Could not pop stash ${stashRef}:`,
-			error instanceof Error ? error.message : String(error),
-		);
-		return false;
-	}
-}
-
-/**
- * Checks out a git branch without force (preserves untracked files).
- *
- * @param branchName - The branch to check out
- */
-function checkoutBranch(branchName: string): void {
-	console.log(`\nChecking out branch: ${branchName}`);
-	execSync(`git checkout ${branchName}`, {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Installs dependencies for the currently checked-out revision.
- */
-function installDependencies(): void {
-	console.log("Enabling corepack and installing dependencies...");
-	execSync("corepack enable", {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-	execSync("pnpm install", {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Runs the repo-root `clean` script, which invokes `fluid-build --task clean` across
- * the entire client release group. This is the only reliable way to clear stale
- * build artifacts for every transitive dependency of bundle-size-tests:
- *
- * - `fluid-build . --task clean` (scoped to this package) does NOT cascade into dependencies, because the `clean` task in fluidBuild.config.cjs has no `^clean`.
- * - The per-package `clean` npm scripts only remove outputs in their own package.
- *
- * Runs by default before building each revision so the comparison is not affected
- * by stale artifacts. Skipped when --skip-clean-build is passed. fluid-build's
- * content-hash based incremental detection usually rebuilds what changed across
- * a checkout, but is not always sufficient: stale tsbuildinfo or entrypoint
- * outputs from a previous revision can cause either build errors or subtly
- * incorrect bundle contents. The extra clean is worth the time cost for an
- * accurate comparison.
- */
-function cleanWorkspace(): void {
-	console.log("\nCleaning all workspace build artifacts (fluid-build --task clean)...");
-	execSync("npm run clean", {
-		cwd: repoRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Builds this package and its transitive dependencies so webpack has the lib/
- * outputs it needs.
- *
- * Runs the `build:compile` script (`fluid-build . --task compile`), which only
- * produces the JS outputs webpack consumes. We deliberately do NOT run the full
- * `build` task: that also pulls in `lint`, `check:format`, `build:api-reports`,
- * `build:docs`, etc. across every transitive dependency. Those are:
- *
- * - unnecessary for producing webpack bundles, and
- * - prone to unrelated failures across revisions (e.g. lint rule changes), which would make bundle-size comparison impossible whenever any non-code check happens to be broken at either revision.
- *
- * fluid-build uses content-hash based incremental detection, so after a
- * `git checkout` to a different revision, source hashes differ from the stored
- * `*.done.build.log` and the affected packages rebuild automatically. This is
- * usually enough, but not always reliable; see `cleanWorkspace` and the
- * --skip-clean-build flag.
- */
-function buildWorkspace(): void {
-	console.log("\nCompiling bundle-size-tests and its dependencies...");
-	execSync("npm run build:compile", {
-		cwd: packageRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Builds bundles using webpack.
- */
-function buildBundles(): void {
-	console.log("\nBuilding bundles with webpack...");
-	execSync("npm run webpack", {
-		cwd: packageRoot,
-		stdio: "inherit",
-	});
-}
-
-/**
- * Moves webpack's raw stats output into the per-label directory under the persistent
- * analysis root (in the OS temp dir).
- *
- * @param label - The label for this build (e.g., "main", "feature_branch")
- */
-function saveStats(label: string): void {
-	const labelDirectory = resolve(bundleAnalysisDirectory, label);
-	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
-
-	if (!existsSync(webpackStatsOutputPath)) {
-		throw new Error(
-			`Bundle stats not found at ${webpackStatsOutputPath}. ` +
-				`Check that webpack ran successfully.`,
-		);
-	}
-
-	mkdirSync(labelDirectory, { recursive: true });
-	// Use copy + unlink instead of renameSync because the source and destination
-	// may live on different drives (e.g. D: -> C:\Users\<user>\AppData\Local\Temp),
-	// which causes renameSync to fail with EXDEV on Windows.
-	copyFileSync(webpackStatsOutputPath, destStatsPath);
-	unlinkSync(webpackStatsOutputPath);
-	console.log(`Saved stats to: ${destStatsPath}`);
-
-	// Also copy webpack's bundle outputs so compareBundles.ts can compute gzip
-	// sizes for changed assets. The destination layout (`<label>/build/<asset>`)
-	// matches what compareBundles.ts expects.
-	if (existsSync(webpackBuildOutputPath)) {
-		const destBuildPath = resolve(labelDirectory, "build");
-		rmSync(destBuildPath, { recursive: true, force: true });
-		cpSync(webpackBuildOutputPath, destBuildPath, { recursive: true });
-		console.log(`Saved build outputs to: ${destBuildPath}`);
-	} else {
-		console.warn(
-			`Warning: webpack build outputs not found at ${webpackBuildOutputPath}; ` +
-				`gzip sizes will be unavailable for label "${label}".`,
-		);
-	}
-}
-
-/**
- * Extracts the value of a command-line option from the argument list.
- *
- * @param argv - The command-line argument list
- * @param optionName - The name of the option to extract
- * @returns The option value, or undefined if not found
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
-	}
-
-	return argv[index + 1];
-}
-
-/**
- * Checks if a flag is present in the command-line argument list.
- *
- * @param argv - The command-line argument list
- * @param flagName - The flag to check for
- * @returns True if the flag is present, false otherwise
- */
-function hasFlag(argv: string[], flagName: string): boolean {
-	return argv.includes(flagName);
-}
-
-/**
- * Prints the help text describing usage and options.
- */
-function printHelp(): void {
-	console.log(`
-Usage:
-  jiti ./scripts/collectBundles.ts [options]
-
-Options:
-  --help, -h              Show this help text and exit.
-  --base-branch <name>    Base branch name (default: main). The other side of the
-                          comparison is always the currently checked-out branch.
-  --clean-analysis-dir    Remove the persistent bundleAnalysis directory before starting
-  --skip-clean-build      Skip the full workspace clean that normally runs before each
-                          build. By default we run 'fluid-build --task clean' at the
-                          repo root before building each revision so the comparison is
-                          not affected by stale artifacts. Skipping is faster but may
-                          produce incorrect sizes or build errors if incremental build
-                          state from a previous revision interferes with the current one.
-  --restore-only          Do not collect anything. Instead, use the state file left by a
-                          previous aborted run to check out the original branch, reinstall
-                          dependencies, and pop the matching stash (if any).
-  --exit-after-build      Debug only. Stop after building the workspace at the base branch
-                          (before webpack). Skips the automatic restore so the workspace
-                          can be inspected at the base revision. Run --restore-only to
-                          return to the original branch and pop the stash.
-
-Persistent state lives under: ${analysisRoot}
-
-Examples:
-  jiti ./scripts/collectBundles.ts
-  jiti ./scripts/collectBundles.ts --base-branch main
-  jiti ./scripts/collectBundles.ts --clean-analysis-dir
-  jiti ./scripts/collectBundles.ts --skip-clean-build
-  jiti ./scripts/collectBundles.ts --restore-only
-`);
-}
-
-/**
- * Performs the restore-only workflow: read state, return to original branch,
- * reinstall dependencies, pop the matching stash, and clear state.
- */
-function restoreFromState(): void {
-	const state = readState();
-	if (state === undefined) {
-		console.log(`No run state found at ${stateFilePath}. Nothing to restore.`);
-		return;
-	}
-
-	console.log(`Found run state from ${state.createdAt}.`);
-	console.log(`  originalBranch: ${state.originalBranch}`);
-	console.log(`  stashMarker:    ${state.stashMarker}`);
-	console.log(`  stashed:        ${state.stashed}`);
-
-	const currentBranch = getCurrentBranch();
-	if (currentBranch === state.originalBranch) {
-		console.log(`Already on original branch (${state.originalBranch}).`);
-	} else {
-		checkoutBranch(state.originalBranch);
-	}
-
-	installDependencies();
-
-	if (state.stashed) {
-		popStashByMarker(state.stashMarker);
-	} else {
-		console.log("No stash to restore (nothing was stashed at start of run).");
-	}
-
-	clearState();
-	console.log(`\n${"=".repeat(80)}`);
-	console.log("✓ Restore complete.");
-	console.log("=".repeat(80));
-}
-
-/**
- * Main entry point: collects bundle stats from two branches.
- *
- * @param argv - The command-line argument list
- */
-function main(argv: string[]): void {
-	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
-		printHelp();
-		return;
-	}
-
-	if (hasFlag(argv, "--restore-only")) {
-		restoreFromState();
-		return;
-	}
-
-	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
-	const cleanAnalysisDir = hasFlag(argv, "--clean-analysis-dir");
-	const skipCleanBuild = hasFlag(argv, "--skip-clean-build");
-	const exitAfterBuild = hasFlag(argv, "--exit-after-build");
-
-	const existingState = readState();
-	if (existingState !== undefined) {
-		throw new Error(
-			`Found leftover run state at ${stateFilePath} from ${existingState.createdAt}. ` +
-				`A previous collect run may have been aborted. ` +
-				`Run with --restore-only to recover, or delete the state file manually if you are sure it is stale.`,
-		);
-	}
-
-	const originalBranch = getCurrentBranch();
-	const stashMarker = generateStashMarker();
-
-	try {
-		if (cleanAnalysisDir && existsSync(bundleAnalysisDirectory)) {
-			console.log(`\nCleaning bundleAnalysis directory: ${bundleAnalysisDirectory}`);
-			rmSync(bundleAnalysisDirectory, { recursive: true });
-		}
-
-		// Record state BEFORE mutating the working tree so that --restore-only
-		// can recover from any failure after this point.
-		writeState({
-			createdAt: new Date().toISOString(),
-			originalBranch,
-			stashMarker,
-			stashed: false,
-		});
-
-		const hasStash = stashChanges(stashMarker);
-		if (hasStash) {
-			writeState({
-				createdAt: new Date().toISOString(),
-				originalBranch,
-				stashMarker,
-				stashed: true,
-			});
-		}
-
-		try {
-			if (getCurrentBranch() !== baseBranch) {
-				checkoutBranch(baseBranch);
-				installDependencies();
-			}
-			if (!skipCleanBuild) {
-				cleanWorkspace();
-			}
-			buildWorkspace();
-
-			if (exitAfterBuild) {
-				console.log(`\n${"=".repeat(80)}`);
-				console.log("--exit-after-build: stopping after base-branch build.");
-				console.log(`  Currently checked out: ${getCurrentBranch()}`);
-				console.log("  State file retained at:", stateFilePath);
-				console.log(
-					"  Use --restore-only to return to the original branch and pop the stash.",
-				);
-				console.log("=".repeat(80));
-				return;
-			}
-
-			buildBundles();
-			saveStats(sanitizeForFileName(baseBranch));
-
-			// The "current" side of the comparison is always whatever branch was
-			// checked out when this script started. Return to it and rebuild.
-			if (getCurrentBranch() !== originalBranch) {
-				checkoutBranch(originalBranch);
-				installDependencies();
-			}
-			if (!skipCleanBuild) {
-				cleanWorkspace();
-			}
-			buildWorkspace();
-			buildBundles();
-			saveStats(sanitizeForFileName(originalBranch));
-		} finally {
-			if (!exitAfterBuild) {
-				// Always ensure original branch has fresh dependencies and restore stash if needed.
-				const nowOn = getCurrentBranch();
-				if (nowOn !== originalBranch) {
-					checkoutBranch(originalBranch);
-				}
-				installDependencies();
-				if (hasStash) {
-					popStashByMarker(stashMarker);
-				}
-				clearState();
-			}
-			// When exitAfterBuild is set, intentionally skip the automatic restore
-			// so the user can inspect the workspace at the failing revision.
-			// Run --restore-only to clean up.
-		}
-
-		console.log(`\n${"=".repeat(80)}`);
-		console.log("✓ Bundle collection complete!");
-		console.log(`  Stats directory: ${bundleAnalysisDirectory}`);
-		console.log("=".repeat(80));
-	} catch (error) {
-		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
-		console.error(
-			`If the working tree or branch is in an inconsistent state, re-run with --restore-only.`,
-		);
-		throw error;
-	}
-}
-
-main(process.argv.slice(2));
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index b4db8c32b44c..f3f47f5b567a 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -5,15 +5,16 @@
 
 import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { resolve } from "node:path";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { gzipSync } from "node:zlib";
 
 import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
 
-// Default to the persistent analysis root used by collectBundles.ts.
-// Kept in the OS temp dir so results survive `git checkout` and `npm run clean`.
-const defaultAnalysisDirectory = resolve(tmpdir(), "fluid-bundle-compare");
+// Default to the persistent analysis root used by collectBundle.ts.
+// Lives under this package's `bundleAnalysis/` directory (gitignored).
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
 
 /**
  * Extracts the value of a command-line option from the argument list.
@@ -105,12 +106,7 @@ interface BundleStats {
  * @returns Parsed bundle statistics, or empty stats if file not found
  */
 function loadStats(analysisDirectory: string, label: string): BundleStats {
-	const statsFilePath = resolve(
-		analysisDirectory,
-		"bundleAnalysis",
-		label,
-		"bundleStats.msp.gz",
-	);
+	const statsFilePath = resolve(analysisDirectory, label, "bundleStats.msp.gz");
 	if (!existsSync(statsFilePath)) {
 		console.warn(
 			`Warning: Bundle stats not found at "${statsFilePath}". ` +
@@ -263,7 +259,7 @@ interface Options {
 	baseBranch: string;
 	/** Branch name for the current build (auto-detected from git HEAD or BUILD_SOURCEBRANCHNAME) */
 	currentBranch: string;
-	/** Parent directory where bundleStats.msp.gz files are stored under bundleAnalysis/\{label\}/ (default: OS temp dir / fluid-bundle-compare) */
+	/** Directory containing per-label bundleStats.msp.gz files at \{label\}/bundleStats.msp.gz (default: this package's bundleAnalysis/) */
 	analysisDirectory: string;
 }
 
@@ -335,7 +331,7 @@ Options:
   --base-branch <name>    Base branch name (default: main). The "current" side is
                           auto-detected from BUILD_SOURCEBRANCHNAME or git HEAD.
   --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
-                          under bundleAnalysis/{label}/ (default: ${defaultAnalysisDirectory})
+                          at {label}/bundleStats.msp.gz (default: ${defaultAnalysisDirectory})
 
 Examples:
   jiti ./scripts/compareBundles.ts --base-branch main
@@ -386,7 +382,7 @@ function main(argv: string[]): void {
 	// Derive labels and directories from branch names
 	const baseLabel = sanitizeForFileName(options.baseBranch);
 	const currentLabel = sanitizeForFileName(options.currentBranch);
-	const outputDirectory = resolve(options.analysisDirectory, "bundleAnalysis");
+	const outputDirectory = options.analysisDirectory;
 	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
 	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
 

From 5ba1fee235791e6a080a1a650218cff3802f0db2 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 27 Apr 2026 13:37:42 -0700
Subject: [PATCH 23/67] - Added an exclusion to the root workspace so I can
 build inside the sub-repo. - Refactors.

---
 .../scripts/collectAndCompareBundles.ts       | 24 +++---
 .../scripts/collectBundle.ts                  |  2 +-
 .../scripts/compareBundles.ts                 | 78 ++++++++-----------
 pnpm-workspace.yaml                           |  3 +
 4 files changed, 45 insertions(+), 62 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 1d39cdd53eff..aace0c0f08b6 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -65,21 +65,17 @@ function sanitizeForFileName(value: string): string {
  *
  * @param scriptName - Script file name under ./scripts/
  * @param scriptArgs - Arguments to forward to the script
- * @param envOverrides - Extra environment variables to set for the child process
  */
-function runScript(
-	scriptName: string,
-	scriptArgs: string[],
-	envOverrides?: Record<string, string>,
-): void {
+function runScript(scriptName: string, scriptArgs: string[]): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
+	// Bump the V8 heap so compareBundles.ts can hold two decompressed webpack
+	// stats objects in memory without hitting the default ~4 GB OOM.
 	const result = spawnSync(
 		process.execPath,
-		["--import", "jiti/register", scriptPath, ...scriptArgs],
+		["--max-old-space-size=8192", "--import", "jiti/register", scriptPath, ...scriptArgs],
 		{
 			cwd: packageRoot,
 			stdio: "inherit",
-			env: envOverrides === undefined ? process.env : { ...process.env, ...envOverrides },
 		},
 	);
 
@@ -175,12 +171,12 @@ function main(argv: string[]): void {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log("Running bundle comparison...");
 			console.log("=".repeat(80));
-			// compareBundles.ts auto-detects the "current" label from
-			// BUILD_SOURCEBRANCHNAME (sanitized internally), so we use it to plumb
-			// through the explicit current label without modifying compareBundles.
-			runScript("compareBundles.ts", ["--base-branch", baseLabel], {
-				BUILD_SOURCEBRANCHNAME: currentLabel,
-			});
+			runScript("compareBundles.ts", [
+				"--base-label",
+				baseLabel,
+				"--current-label",
+				currentLabel,
+			]);
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index def4b352c843..cfe20e83bc67 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -50,7 +50,7 @@ const bundleAnalysisDirectory = resolve(outerPackageRoot, "bundleAnalysis");
  * Only one inner repo is ever maintained — the unique name avoids collisions
  * with label subdirectories under {@link bundleAnalysisDirectory}.
  */
-const innerRepoRoot = resolve(bundleAnalysisDirectory, "fluid-bundle-compare-base-repo");
+const innerRepoRoot = resolve(bundleAnalysisDirectory, "base-repo");
 
 /**
  * Sanitizes a string for use as a filename.
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index f3f47f5b567a..bca7ab13b292 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -65,22 +64,6 @@ function sanitizeForFileName(value: string): string {
 	return value.replace(/[^\w.-]/g, "_");
 }
 
-/**
- * Returns the current git branch name, or undefined if it cannot be determined
- * (e.g., not in a git work tree).
- */
-function tryGetCurrentBranch(): string | undefined {
-	try {
-		const branch = execSync("git rev-parse --abbrev-ref HEAD", {
-			encoding: "utf-8",
-			stdio: ["ignore", "pipe", "ignore"],
-		}).trim();
-		return branch.length > 0 ? branch : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
 /** Represents a single asset in a bundle. */
 interface AssetStat {
 	/** The name of the asset (e.g., "bundle.js") */
@@ -255,31 +238,28 @@ function formatEntrypointRow(
 
 /** Parsed command-line options for the bundle comparison script. */
 interface Options {
-	/** Branch name for the base build (default: "main") */
-	baseBranch: string;
-	/** Branch name for the current build (auto-detected from git HEAD or BUILD_SOURCEBRANCHNAME) */
-	currentBranch: string;
+	/** Label of the base bundle (default: "main"). Matches the directory name written by collectBundle.ts. */
+	baseLabel: string;
+	/** Label of the current bundle (default: "current"). Matches the directory name written by collectBundle.ts in local mode. */
+	currentLabel: string;
 	/** Directory containing per-label bundleStats.msp.gz files at \{label\}/bundleStats.msp.gz (default: this package's bundleAnalysis/) */
 	analysisDirectory: string;
 }
 
 /**
  * Parses command-line arguments into an Options object.
- * The current branch is auto-detected: BUILD_SOURCEBRANCHNAME (CI) takes precedence,
- * then the current git branch, falling back to the literal "current".
  *
  * @param argv - The command-line argument list
  * @returns Parsed options with defaults applied
  */
 function parseOptions(argv: string[]): Options {
-	const baseBranch = getOptionValue(argv, "--base-branch") ?? "main";
-	const currentBranch =
-		process.env.BUILD_SOURCEBRANCHNAME ?? tryGetCurrentBranch() ?? "current";
+	const baseLabel = getOptionValue(argv, "--base-label") ?? "main";
+	const currentLabel = getOptionValue(argv, "--current-label") ?? "current";
 	const analysisDirectory = resolve(
 		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
 	);
 
-	return { baseBranch, currentBranch, analysisDirectory };
+	return { baseLabel, currentLabel, analysisDirectory };
 }
 
 /**
@@ -288,23 +268,23 @@ function parseOptions(argv: string[]): Options {
  * File names are derived from sanitized branch names (e.g., "compare-main-to-dev.txt").
  *
  * @param outputDirectory - The directory where output files will be written
- * @param baseBranch - The base branch name (used in output filename)
- * @param currentBranch - The current branch name (used in output filename)
+ * @param baseLabel - The base bundle label (used in output filename)
+ * @param currentLabel - The current bundle label (used in output filename)
  * @param textContent - The formatted text comparison report
  * @param jsonObject - The structured comparison data as a JSON-serializable object
  */
 function writeOutputFiles(
 	outputDirectory: string,
-	baseBranch: string,
-	currentBranch: string,
+	baseLabel: string,
+	currentLabel: string,
 	textContent: string,
 	jsonObject: object,
 ): void {
 	mkdirSync(outputDirectory, { recursive: true });
 
-	const baseRevision = sanitizeForFileName(baseBranch);
-	const currentRevision = sanitizeForFileName(currentBranch);
-	const outputBaseName = `compare-${baseRevision}-to-${currentRevision}`;
+	const baseSuffix = sanitizeForFileName(baseLabel);
+	const currentSuffix = sanitizeForFileName(currentLabel);
+	const outputBaseName = `compare-${baseSuffix}-to-${currentSuffix}`;
 	const textOutputPath = resolve(outputDirectory, `${outputBaseName}.txt`);
 	const jsonOutputPath = resolve(outputDirectory, `${outputBaseName}.json`);
 
@@ -328,13 +308,18 @@ Options:
   --help, -h
     Show this help text and exit.
 
-  --base-branch <name>    Base branch name (default: main). The "current" side is
-                          auto-detected from BUILD_SOURCEBRANCHNAME or git HEAD.
-  --analysis-dir <path>   Parent directory where bundleStats.msp.gz files are stored
-                          at {label}/bundleStats.msp.gz (default: ${defaultAnalysisDirectory})
+  --base-label <name>     Label (subdirectory name) of the base bundle
+                          (default: main). Must match a label previously written
+                          by collectBundle.ts.
+  --current-label <name>  Label (subdirectory name) of the current bundle
+                          (default: current).
+  --analysis-dir <path>   Parent directory containing bundleStats.msp.gz files
+                          at {label}/bundleStats.msp.gz
+                          (default: ${defaultAnalysisDirectory})
 
 Examples:
-  jiti ./scripts/compareBundles.ts --base-branch main
+  jiti ./scripts/compareBundles.ts
+  jiti ./scripts/compareBundles.ts --base-label main --current-label feature
   jiti ./scripts/compareBundles.ts --analysis-dir /some/other/path
 `);
 }
@@ -379,9 +364,8 @@ function main(argv: string[]): void {
 	const options = parseOptions(argv);
 	const reporter = new Reporter();
 
-	// Derive labels and directories from branch names
-	const baseLabel = sanitizeForFileName(options.baseBranch);
-	const currentLabel = sanitizeForFileName(options.currentBranch);
+	const baseLabel = sanitizeForFileName(options.baseLabel);
+	const currentLabel = sanitizeForFileName(options.currentLabel);
 	const outputDirectory = options.analysisDirectory;
 	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
 	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
@@ -411,7 +395,7 @@ function main(argv: string[]): void {
 		}));
 
 	reporter.section(
-		`=== Bundle Size Comparison: ${options.baseBranch} -> ${options.currentBranch} ===`,
+		`=== Bundle Size Comparison: ${options.baseLabel} -> ${options.currentLabel} ===`,
 	);
 	reporter.section("All assets (stat/parsed size in bytes):");
 	reporter.tableHeader(
@@ -492,13 +476,13 @@ function main(argv: string[]): void {
 
 	writeOutputFiles(
 		outputDirectory,
-		options.baseBranch,
-		options.currentBranch,
+		options.baseLabel,
+		options.currentLabel,
 		reporter.toText(),
 		{
 			comparedAt: new Date().toISOString(),
-			baseBranch: options.baseBranch,
-			currentBranch: options.currentBranch,
+			baseLabel: options.baseLabel,
+			currentLabel: options.currentLabel,
 			analysisDirectory: options.analysisDirectory,
 			assets: rows.map((row) => ({
 				name: row.name,
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3df86e098e85..c57993045a1b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -19,6 +19,9 @@ packages:
   - "!**/dist/**"
   - "!**/lib/**"
   - "!**/src/**"
+  # exclude inner FluidFramework enlistment used by examples/utils/bundle-size-tests
+  # for cross-revision bundle comparison (see examples/utils/bundle-size-tests/scripts/collectBundle.ts).
+  - "!**/bundleAnalysis/**"
 
 # Supply chain security settings - see /DEV.md for documentation
 minimumReleaseAge: 1440

From c49f007f1a8f665678bab27804f0fced4a91e1ef Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 27 Apr 2026 17:10:07 -0700
Subject: [PATCH 24/67] Cleanup.

---
 .../scripts/collectAndCompareBundles.ts       |  7 +-
 .../scripts/compareBundles.ts                 | 72 ++++++++-----------
 2 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index aace0c0f08b6..fd5bdc46040c 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -171,12 +171,7 @@ function main(argv: string[]): void {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log("Running bundle comparison...");
 			console.log("=".repeat(80));
-			runScript("compareBundles.ts", [
-				"--base-label",
-				baseLabel,
-				"--current-label",
-				currentLabel,
-			]);
+			runScript("compareBundles.ts", []);
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index bca7ab13b292..8dbe57aec9d1 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -15,6 +15,12 @@ import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
 
+// Labels are fixed to match what collectBundle.ts writes:
+//   local mode    -> "current"
+//   revision mode -> sanitized revision (we always use "main" for the base side here)
+const baseLabel = "main";
+const currentLabel = "current";
+
 /**
  * Extracts the value of a command-line option from the argument list.
  * Supports both "--option value" and "--option=value" formats.
@@ -238,10 +244,6 @@ function formatEntrypointRow(
 
 /** Parsed command-line options for the bundle comparison script. */
 interface Options {
-	/** Label of the base bundle (default: "main"). Matches the directory name written by collectBundle.ts. */
-	baseLabel: string;
-	/** Label of the current bundle (default: "current"). Matches the directory name written by collectBundle.ts in local mode. */
-	currentLabel: string;
 	/** Directory containing per-label bundleStats.msp.gz files at \{label\}/bundleStats.msp.gz (default: this package's bundleAnalysis/) */
 	analysisDirectory: string;
 }
@@ -253,13 +255,11 @@ interface Options {
  * @returns Parsed options with defaults applied
  */
 function parseOptions(argv: string[]): Options {
-	const baseLabel = getOptionValue(argv, "--base-label") ?? "main";
-	const currentLabel = getOptionValue(argv, "--current-label") ?? "current";
 	const analysisDirectory = resolve(
 		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
 	);
 
-	return { baseLabel, currentLabel, analysisDirectory };
+	return { analysisDirectory };
 }
 
 /**
@@ -268,15 +268,11 @@ function parseOptions(argv: string[]): Options {
  * File names are derived from sanitized branch names (e.g., "compare-main-to-dev.txt").
  *
  * @param outputDirectory - The directory where output files will be written
- * @param baseLabel - The base bundle label (used in output filename)
- * @param currentLabel - The current bundle label (used in output filename)
  * @param textContent - The formatted text comparison report
  * @param jsonObject - The structured comparison data as a JSON-serializable object
  */
 function writeOutputFiles(
 	outputDirectory: string,
-	baseLabel: string,
-	currentLabel: string,
 	textContent: string,
 	jsonObject: object,
 ): void {
@@ -304,22 +300,20 @@ function printHelp(): void {
 Usage:
   jiti ./scripts/compareBundles.ts [options]
 
+Compares the two bundles previously collected by collectBundle.ts:
+  base    = ${baseLabel}/bundleStats.msp.gz
+  current = ${currentLabel}/bundleStats.msp.gz
+
 Options:
   --help, -h
     Show this help text and exit.
 
-  --base-label <name>     Label (subdirectory name) of the base bundle
-                          (default: main). Must match a label previously written
-                          by collectBundle.ts.
-  --current-label <name>  Label (subdirectory name) of the current bundle
-                          (default: current).
   --analysis-dir <path>   Parent directory containing bundleStats.msp.gz files
                           at {label}/bundleStats.msp.gz
                           (default: ${defaultAnalysisDirectory})
 
 Examples:
   jiti ./scripts/compareBundles.ts
-  jiti ./scripts/compareBundles.ts --base-label main --current-label feature
   jiti ./scripts/compareBundles.ts --analysis-dir /some/other/path
 `);
 }
@@ -364,14 +358,12 @@ function main(argv: string[]): void {
 	const options = parseOptions(argv);
 	const reporter = new Reporter();
 
-	const baseLabel = sanitizeForFileName(options.baseLabel);
-	const currentLabel = sanitizeForFileName(options.currentLabel);
 	const outputDirectory = options.analysisDirectory;
 	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
 	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
 
-	const baseStats = loadStats(options.analysisDirectory, baseLabel);
-	const currentStats = loadStats(options.analysisDirectory, currentLabel);
+	const baseStats = loadStats(outputDirectory, baseLabel);
+	const currentStats = loadStats(outputDirectory, currentLabel);
 
 	const baseAssets = Object.fromEntries(
 		(baseStats.assets ?? [])
@@ -394,9 +386,7 @@ function main(argv: string[]): void {
 			currentStatSize: currentAssets[name]?.size ?? 0,
 		}));
 
-	reporter.section(
-		`=== Bundle Size Comparison: ${options.baseLabel} -> ${options.currentLabel} ===`,
-	);
+	reporter.section(`=== Bundle Size Comparison: ${baseLabel} -> ${currentLabel} ===`);
 	reporter.section("All assets (stat/parsed size in bytes):");
 	reporter.tableHeader(
 		"Asset".padEnd(40) +
@@ -474,26 +464,20 @@ function main(argv: string[]): void {
 		});
 	}
 
-	writeOutputFiles(
-		outputDirectory,
-		options.baseLabel,
-		options.currentLabel,
-		reporter.toText(),
-		{
-			comparedAt: new Date().toISOString(),
-			baseLabel: options.baseLabel,
-			currentLabel: options.currentLabel,
-			analysisDirectory: options.analysisDirectory,
-			assets: rows.map((row) => ({
-				name: row.name,
-				baseStatSize: row.baseStatSize,
-				currentStatSize: row.currentStatSize,
-				diff: row.currentStatSize - row.baseStatSize,
-			})),
-			gzipChangedAssets: gzipRows,
-			entrypoints: entrypointRows,
-		},
-	);
+	writeOutputFiles(outputDirectory, reporter.toText(), {
+		comparedAt: new Date().toISOString(),
+		baseLabel,
+		currentLabel,
+		analysisDirectory: options.analysisDirectory,
+		assets: rows.map((row) => ({
+			name: row.name,
+			baseStatSize: row.baseStatSize,
+			currentStatSize: row.currentStatSize,
+			diff: row.currentStatSize - row.baseStatSize,
+		})),
+		gzipChangedAssets: gzipRows,
+		entrypoints: entrypointRows,
+	});
 }
 
 main(process.argv);

From 44d4279089c89017f7ae82152456178f94d62b86 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 27 Apr 2026 17:35:40 -0700
Subject: [PATCH 25/67] Better logic for finding the base revision.

---
 .../scripts/collectAndCompareBundles.ts       | 63 ++++++++++++++-----
 .../scripts/collectBundle.ts                  | 11 +++-
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index fd5bdc46040c..492e2f33ec3c 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -10,6 +10,28 @@ import { fileURLToPath } from "node:url";
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
+/**
+ * Resolves a committish (branch, tag, or SHA) to the merge-base with the outer
+ * repo's current HEAD. Returns the full SHA, or undefined if the rev cannot be
+ * resolved (e.g. unknown branch, detached state with no shared history).
+ *
+ * Using merge-base instead of the raw branch tip means the comparison is taken
+ * against the actual fork point, which is what users typically want — and it
+ * works for worktree-based setups where `main` may not exist as a local branch
+ * at the location they expect.
+ */
+function resolveMergeBase(rev: string): string | undefined {
+	const result = spawnSync("git", ["merge-base", "HEAD", rev], {
+		cwd: packageRoot,
+		encoding: "utf-8",
+	});
+	if (result.status !== 0) {
+		return undefined;
+	}
+	const sha = result.stdout.trim();
+	return sha.length > 0 ? sha : undefined;
+}
+
 /**
  * Checks if a flag is present in the command-line argument list.
  *
@@ -44,17 +66,6 @@ function getOptionValue(argv: string[], optionName: string): string | undefined
 	return argv[index + 1];
 }
 
-/**
- * Sanitizes a string for use as a filename.
- *
- * @param value - The string to sanitize
- * @returns The sanitized string safe for use as a filename
- */
-function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
-	return value.replace(/[^\w.-]/g, "_");
-}
-
 /**
  * Runs a TypeScript script via Node with jiti's ESM register hook.
  *
@@ -107,7 +118,11 @@ Options:
     Show this help text and exit.
 
   --base-revision <rev>     Revision to use as the comparison baseline. Branch,
-                            tag, or commit SHA. Default: main.
+                            tag, or commit SHA. The actual base used is the
+                            merge-base of HEAD and this revision (i.e. the fork
+                            point), so worktree-based setups where 'main' is in
+                            an unusual location still produce the expected
+                            comparison. Default: main.
   --skip-compare            Collect both bundles, skip the comparison step.
   --force-clean-build       Run the full workspace clean before each build.
                             Off by default; opt in when stale incremental build
@@ -136,10 +151,24 @@ function main(argv: string[]): void {
 		return;
 	}
 
-	const baseRevision = getOptionValue(argv, "--base-revision") ?? "main";
-	// Labels mirror the defaults baked into collectBundle.ts: revision-mode runs
-	// save under the sanitized revision name, local-mode runs save under "current".
-	const baseLabel = sanitizeForFileName(baseRevision);
+	const baseRevisionInput = getOptionValue(argv, "--base-revision") ?? "main";
+	const resolvedBaseRevision = resolveMergeBase(baseRevisionInput);
+	if (resolvedBaseRevision === undefined) {
+		throw new Error(
+			`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
+				`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
+		);
+	}
+	if (resolvedBaseRevision !== baseRevisionInput) {
+		console.log(
+			`Resolved --base-revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
+		);
+	}
+	const baseRevision = resolvedBaseRevision;
+	// compareBundles.ts reads from fixed label directories ("main" / "current"),
+	// so pin the base bundle's directory name to "main" regardless of which
+	// revision we resolved to.
+	const baseLabel = "main";
 	const currentLabel = "current";
 
 	const skipCompare = hasFlag(argv, "--skip-compare");
@@ -164,6 +193,8 @@ function main(argv: string[]): void {
 			"revision",
 			"--revision",
 			baseRevision,
+			"--label",
+			baseLabel,
 			...sharedCollectArgs,
 		]);
 
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index cfe20e83bc67..3d1511a4ae29 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -256,8 +256,10 @@ Options:
   --help, -h                Show this help text and exit.
   --revision <rev>          (revision mode only, required) Branch, tag, or commit
                             SHA to check out in the inner repo before building.
-                            Also used as the label under which the bundle stats
-                            are saved.
+                            Also used as the default label.
+  --label <name>            Override the directory name under which bundle stats
+                            are saved. Defaults to the sanitized revision in
+                            revision mode, or "current" in local mode.
   --force-clean-build       Run the full workspace clean ('npm run clean' at the
                             repo root) before building. Off by default; opt in
                             when stale incremental build state from a previous
@@ -298,7 +300,10 @@ function main(argv: string[]): void {
 		throw new Error(`--mode revision requires --revision <rev>.`);
 	}
 
-	const label = sanitizeForFileName(mode === "revision" ? (revision as string) : "current");
+	const labelOverride = getOptionValue(argv, "--label");
+	const label = sanitizeForFileName(
+		labelOverride ?? (mode === "revision" ? (revision as string) : "current"),
+	);
 
 	let activeRepoRoot: string;
 	let activePackageRoot: string;

From 595dac63664bf1cd2ad7cf8135f082b9350f525c Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 28 Apr 2026 17:03:12 -0700
Subject: [PATCH 26/67] - Ported all scripts to oclif. Since they are not
 running in a true oclif CLI, the help text is render with a helper module. -
 Tweaked heap size for compare when run as a package.json script. I'm not sure
 why it takes so much RAM.

---
 examples/utils/bundle-size-tests/package.json |   3 +-
 .../scripts/collectAndCompareBundles.ts       | 252 ++++++++----------
 .../scripts/collectBundle.ts                  | 223 +++++++---------
 .../scripts/compareBundles.ts                 | 145 ++++------
 .../bundle-size-tests/scripts/oclifHelp.ts    |  90 +++++++
 pnpm-lock.yaml                                | 216 +++++++++------
 6 files changed, 491 insertions(+), 438 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/oclifHelp.ts

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 3444e24cdb82..5a2696c71818 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -23,7 +23,7 @@
 		"clean": "rimraf --glob build dist lib bundleAnalysis \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
 		"collect:bundle": "jiti ./scripts/collectBundle.ts",
 		"collect:compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
-		"compare:bundles": "jiti ./scripts/compareBundles.ts",
+		"compare:bundles": "node --max-old-space-size=8192 --import jiti/register ./scripts/compareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
@@ -63,6 +63,7 @@
 		"@fluidframework/bundle-size-tools": "catalog:buildTools",
 		"@fluidframework/eslint-config-fluid": "catalog:eslint",
 		"@mixer/webpack-bundle-compare": "^0.1.0",
+		"@oclif/core": "^4.10.5",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "catalog:types",
 		"eslint": "catalog:eslint",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 492e2f33ec3c..0fc7fc6f7306 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -7,6 +7,10 @@ import { spawnSync } from "node:child_process";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
+import { Command, Flags } from "@oclif/core";
+
+import { maybePrintHelp } from "./oclifHelp.ts";
+
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
 
@@ -32,40 +36,6 @@ function resolveMergeBase(rev: string): string | undefined {
 	return sha.length > 0 ? sha : undefined;
 }
 
-/**
- * Checks if a flag is present in the command-line argument list.
- *
- * @param argv - The command-line argument list
- * @param flagName - The flag to check for
- * @returns True if the flag is present, false otherwise
- */
-function hasFlag(argv: string[], flagName: string): boolean {
-	return argv.includes(flagName);
-}
-
-/**
- * Extracts the value of a command-line option from the argument list.
- *
- * @param argv - The command-line argument list
- * @param optionName - The name of the option to extract
- * @returns The option value, or undefined if not found
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
-	}
-	return argv[index + 1];
-}
-
 /**
  * Runs a TypeScript script via Node with jiti's ESM register hook.
  *
@@ -101,117 +71,123 @@ function runScript(scriptName: string, scriptArgs: string[]): void {
 }
 
 /**
- * Prints the help text describing usage and options.
- */
-function printHelp(): void {
-	console.log(`
-Usage:
-  jiti ./scripts/collectAndCompareBundles.ts [options]
-
-Runs collectBundle.ts twice — once in local mode for the outer repo, once in
-revision mode for a separate inner enlistment checked out at the base revision —
-and then runs compareBundles.ts to produce the diff. The outer repo's working
-tree, branch, and stash are never modified.
-
-Options:
-  --help, -h
-    Show this help text and exit.
-
-  --base-revision <rev>     Revision to use as the comparison baseline. Branch,
-                            tag, or commit SHA. The actual base used is the
-                            merge-base of HEAD and this revision (i.e. the fork
-                            point), so worktree-based setups where 'main' is in
-                            an unusual location still produce the expected
-                            comparison. Default: main.
-  --skip-compare            Collect both bundles, skip the comparison step.
-  --force-clean-build       Run the full workspace clean before each build.
-                            Off by default; opt in when stale incremental build
-                            state may interfere with the current revision.
-
-Labels (used as bundleAnalysis subdirectory names) are determined automatically:
-the local bundle is saved under "current" and the base bundle under the
-sanitized base revision name.
-
-Examples:
-  jiti ./scripts/collectAndCompareBundles.ts
-  jiti ./scripts/collectAndCompareBundles.ts --base-revision main
-  jiti ./scripts/collectAndCompareBundles.ts --base-revision v2.20.0
-  jiti ./scripts/collectAndCompareBundles.ts --force-clean-build --skip-compare
-`);
-}
-
-/**
- * Main entry point: runs collection (local + revision) followed by comparison.
+ * Orchestrates: collectBundle.ts (local), then collectBundle.ts (revision),
+ * then compareBundles.ts.
  *
- * @param argv - The command-line argument list
+ * Labels (used as bundleAnalysis subdirectory names) are determined automatically:
+ * the local bundle is saved under "current" and the base bundle under "main",
+ * regardless of the resolved revision SHA, so that compareBundles.ts can find
+ * both directories.
  */
-function main(argv: string[]): void {
-	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
-		printHelp();
-		return;
-	}
+class CollectAndCompareBundlesCommand extends Command {
+	public static override readonly description =
+		"Run collectBundle.ts twice (local + revision merge-base) and then compareBundles.ts. " +
+		"The outer repo's working tree, branch, and stash are never modified.";
+
+	public static override readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --base-revision main",
+		"<%= config.bin %> <%= command.id %> --base-revision v2.20.0",
+		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
+	];
+
+	public static override readonly flags = {
+		"base-revision": Flags.string({
+			description:
+				"Revision to use as the comparison baseline (branch, tag, or commit SHA). " +
+				"The actual base used is the merge-base of HEAD and this revision (the fork " +
+				"point), so worktree-based setups where 'main' is in an unusual location " +
+				"still produce the expected comparison.",
+			default: "main",
+		}),
+		"skip-compare": Flags.boolean({
+			description: "Collect both bundles, but skip the comparison step.",
+			default: false,
+		}),
+		"force-clean-build": Flags.boolean({
+			description:
+				"Run the full workspace clean before each build. Off by default; opt in " +
+				"when stale incremental build state may interfere with the current revision.",
+			default: false,
+		}),
+	};
+
+	public async run(): Promise<void> {
+		const { flags } = await this.parse(CollectAndCompareBundlesCommand);
+
+		const baseRevisionInput = flags["base-revision"];
+		const resolvedBaseRevision = resolveMergeBase(baseRevisionInput);
+		if (resolvedBaseRevision === undefined) {
+			this.error(
+				`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
+					`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
+				{ exit: 1 },
+			);
+		}
+		if (resolvedBaseRevision !== baseRevisionInput) {
+			console.log(
+				`Resolved --base-revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
+			);
+		}
+		const baseRevision = resolvedBaseRevision;
+		// compareBundles.ts reads from fixed label directories ("main" / "current"),
+		// so pin the base bundle's directory name to "main" regardless of which
+		// revision we resolved to.
+		const baseLabel = "main";
+		const currentLabel = "current";
+
+		const skipCompare = flags["skip-compare"];
+		const forceCleanBuildFlag = flags["force-clean-build"];
+
+		const sharedCollectArgs: string[] = [];
+		if (forceCleanBuildFlag) {
+			sharedCollectArgs.push("--force-clean-build");
+		}
 
-	const baseRevisionInput = getOptionValue(argv, "--base-revision") ?? "main";
-	const resolvedBaseRevision = resolveMergeBase(baseRevisionInput);
-	if (resolvedBaseRevision === undefined) {
-		throw new Error(
-			`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
-				`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
-		);
-	}
-	if (resolvedBaseRevision !== baseRevisionInput) {
-		console.log(
-			`Resolved --base-revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
-		);
-	}
-	const baseRevision = resolvedBaseRevision;
-	// compareBundles.ts reads from fixed label directories ("main" / "current"),
-	// so pin the base bundle's directory name to "main" regardless of which
-	// revision we resolved to.
-	const baseLabel = "main";
-	const currentLabel = "current";
-
-	const skipCompare = hasFlag(argv, "--skip-compare");
-	const forceCleanBuildFlag = hasFlag(argv, "--force-clean-build");
-
-	const sharedCollectArgs: string[] = [];
-	if (forceCleanBuildFlag) {
-		sharedCollectArgs.push("--force-clean-build");
-	}
+		try {
+			console.log(`\n${"=".repeat(80)}`);
+			console.log(`Collecting local bundle (label: ${currentLabel})...`);
+			console.log("=".repeat(80));
+			runScript("collectBundle.ts", ["--mode", "local", ...sharedCollectArgs]);
 
-	try {
-		console.log(`\n${"=".repeat(80)}`);
-		console.log(`Collecting local bundle (label: ${currentLabel})...`);
-		console.log("=".repeat(80));
-		runScript("collectBundle.ts", ["--mode", "local", ...sharedCollectArgs]);
-
-		console.log(`\n${"=".repeat(80)}`);
-		console.log(`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`);
-		console.log("=".repeat(80));
-		runScript("collectBundle.ts", [
-			"--mode",
-			"revision",
-			"--revision",
-			baseRevision,
-			"--label",
-			baseLabel,
-			...sharedCollectArgs,
-		]);
-
-		if (!skipCompare) {
 			console.log(`\n${"=".repeat(80)}`);
-			console.log("Running bundle comparison...");
+			console.log(
+				`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
+			);
 			console.log("=".repeat(80));
-			runScript("compareBundles.ts", []);
-		}
+			runScript("collectBundle.ts", [
+				"--mode",
+				"revision",
+				"--revision",
+				baseRevision,
+				"--label",
+				baseLabel,
+				...sharedCollectArgs,
+			]);
+
+			if (!skipCompare) {
+				console.log(`\n${"=".repeat(80)}`);
+				console.log("Running bundle comparison...");
+				console.log("=".repeat(80));
+				runScript("compareBundles.ts", []);
+			}
 
-		console.log(`\n${"=".repeat(80)}`);
-		console.log("✓ Bundle collection and comparison complete!");
-		console.log("=".repeat(80));
-	} catch (error) {
-		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
-		throw error;
+			console.log(`\n${"=".repeat(80)}`);
+			console.log("✓ Bundle collection and comparison complete!");
+			console.log("=".repeat(80));
+		} catch (error) {
+			console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
+			throw error;
+		}
 	}
 }
 
-main(process.argv.slice(2));
+if (
+	!maybePrintHelp(
+		process.argv.slice(2),
+		"collectAndCompareBundles.ts",
+		CollectAndCompareBundlesCommand,
+	)
+) {
+	await CollectAndCompareBundlesCommand.run(process.argv.slice(2), import.meta.url);
+}
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 3d1511a4ae29..2f55d7b0e89f 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -8,6 +8,10 @@ import { copyFileSync, cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
+import { Command, Flags } from "@oclif/core";
+
+import { maybePrintHelp } from "./oclifHelp.ts";
+
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const outerPackageRoot = resolve(scriptDirectory, "..");
 
@@ -203,140 +207,103 @@ function syncInnerRepoToRevision(revision: string): void {
 }
 
 /**
- * Extracts the value of a command-line option from the argument list.
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
-	}
-
-	return argv[index + 1];
-}
-
-/**
- * Checks if a flag is present in the command-line argument list.
- */
-function hasFlag(argv: string[], flagName: string): boolean {
-	return argv.includes(flagName);
-}
-
-/**
- * Prints the help text describing usage and options.
- */
-function printHelp(): void {
-	console.log(`
-Usage:
-  jiti ./scripts/collectBundle.ts [options]
-
-Modes:
-  --mode local              (default) Build and collect a bundle from the outer
-                            FluidFramework enlistment (the repo containing this
-                            script). The outer repo's working tree, branch, and
-                            stash are never modified.
-
-  --mode revision           Build and collect a bundle from a separate inner
-                            FluidFramework enlistment, checked out to a specific
-                            revision. The inner repo lives at:
-                              ${innerRepoRoot}
-                            It is cloned from the outer repo's 'origin' remote on
-                            first use and reused thereafter.
-
-Options:
-  --help, -h                Show this help text and exit.
-  --revision <rev>          (revision mode only, required) Branch, tag, or commit
-                            SHA to check out in the inner repo before building.
-                            Also used as the default label.
-  --label <name>            Override the directory name under which bundle stats
-                            are saved. Defaults to the sanitized revision in
-                            revision mode, or "current" in local mode.
-  --force-clean-build       Run the full workspace clean ('npm run clean' at the
-                            repo root) before building. Off by default; opt in
-                            when stale incremental build state from a previous
-                            revision may interfere with the current one (e.g.
-                            after switching revisions in the inner repo).
-
-Bundle stats are saved under:
-  ${bundleAnalysisDirectory}/<sanitized-label>/
-where <label> is the revision name in revision mode, or "current" in local mode.
-
-Examples:
-  jiti ./scripts/collectBundle.ts
-  jiti ./scripts/collectBundle.ts --mode revision --revision main
-  jiti ./scripts/collectBundle.ts --mode revision --revision v2.20.0
-`);
-}
-
-/**
- * Main entry point: collects a single bundle in either local or revision mode.
+ * Collects a single bundle from either the outer enlistment (local mode) or a
+ * separate inner enlistment checked out to a specific revision (revision mode).
  *
- * @param argv - The command-line argument list
+ * In revision mode, the inner repo at {@link innerRepoRoot} is cloned from the
+ * outer repo's `origin` remote on first use and reused thereafter. The outer
+ * repo's working tree, branch, and stash are never modified.
  */
-function main(argv: string[]): void {
-	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
-		printHelp();
-		return;
-	}
-
-	const mode = getOptionValue(argv, "--mode") ?? "local";
-	if (mode !== "local" && mode !== "revision") {
-		throw new Error(`Invalid --mode "${mode}". Expected "local" or "revision".`);
-	}
-
-	const revision = getOptionValue(argv, "--revision");
-	const forceCleanBuild = hasFlag(argv, "--force-clean-build");
-
-	if (mode === "revision" && (revision === undefined || revision.length === 0)) {
-		throw new Error(`--mode revision requires --revision <rev>.`);
-	}
-
-	const labelOverride = getOptionValue(argv, "--label");
-	const label = sanitizeForFileName(
-		labelOverride ?? (mode === "revision" ? (revision as string) : "current"),
-	);
+class CollectBundleCommand extends Command {
+	public static override readonly description =
+		"Build and collect a bundle, either from the outer enlistment (local mode) or " +
+		"from a separate inner enlistment checked out to a specific revision (revision mode). " +
+		"The outer repo's working tree, branch, and stash are never modified.";
+
+	public static override readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --mode revision --revision main",
+		"<%= config.bin %> <%= command.id %> --mode revision --revision v2.20.0",
+	];
+
+	public static override readonly flags = {
+		mode: Flags.string({
+			description:
+				"local: collect from the outer enlistment. revision: collect from a separate " +
+				"inner enlistment checked out at --revision.",
+			options: ["local", "revision"] as const,
+			default: "local",
+		}),
+		revision: Flags.string({
+			description:
+				"(revision mode only, required) Branch, tag, or commit SHA to check out " +
+				"in the inner repo before building. Also used as the default label.",
+		}),
+		label: Flags.string({
+			description:
+				"Override the directory name under which bundle stats are saved. " +
+				'Defaults to the sanitized revision in revision mode, or "current" in local mode.',
+		}),
+		"force-clean-build": Flags.boolean({
+			description:
+				"Run the full workspace clean ('npm run clean' at the repo root) before " +
+				"building. Off by default; opt in when stale incremental build state from a " +
+				"previous revision may interfere with the current one.",
+			default: false,
+		}),
+	};
+
+	public async run(): Promise<void> {
+		const { flags } = await this.parse(CollectBundleCommand);
+
+		const mode = flags.mode as "local" | "revision";
+		const { revision } = flags;
+		const forceCleanBuild = flags["force-clean-build"];
+
+		if (mode === "revision" && (revision === undefined || revision.length === 0)) {
+			this.error("--mode revision requires --revision <rev>.", { exit: 1 });
+		}
 
-	let activeRepoRoot: string;
-	let activePackageRoot: string;
+		const label = sanitizeForFileName(
+			flags.label ?? (mode === "revision" ? (revision as string) : "current"),
+		);
 
-	if (mode === "local") {
-		activeRepoRoot = outerRepoRoot;
-		activePackageRoot = outerPackageRoot;
-	} else {
-		ensureInnerRepo();
-		// Only the inner repo's revision is changed. The outer repo is never touched.
-		syncInnerRepoToRevision(revision as string);
-		activeRepoRoot = innerRepoRoot;
-		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
-		if (!existsSync(activePackageRoot)) {
-			throw new Error(
-				`Expected package not found in inner repo at ${activePackageRoot}. ` +
-					`The revision "${revision as string}" may predate this package.`,
-			);
+		let activeRepoRoot: string;
+		let activePackageRoot: string;
+
+		if (mode === "local") {
+			activeRepoRoot = outerRepoRoot;
+			activePackageRoot = outerPackageRoot;
+		} else {
+			ensureInnerRepo();
+			// Only the inner repo's revision is changed. The outer repo is never touched.
+			syncInnerRepoToRevision(revision as string);
+			activeRepoRoot = innerRepoRoot;
+			activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
+			if (!existsSync(activePackageRoot)) {
+				this.error(
+					`Expected package not found in inner repo at ${activePackageRoot}. ` +
+						`The revision "${revision as string}" may predate this package.`,
+					{ exit: 1 },
+				);
+			}
+			installDependencies(activeRepoRoot);
 		}
-		installDependencies(activeRepoRoot);
-	}
 
-	if (forceCleanBuild) {
-		cleanWorkspace(activeRepoRoot);
+		if (forceCleanBuild) {
+			cleanWorkspace(activeRepoRoot);
+		}
+		buildWorkspace(activePackageRoot);
+		buildBundles(activePackageRoot);
+		saveStats(label, activePackageRoot);
+
+		console.log(`\n${"=".repeat(80)}`);
+		console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
+		console.log(`  Stats directory: ${resolve(bundleAnalysisDirectory, label)}`);
+		console.log("=".repeat(80));
 	}
-	buildWorkspace(activePackageRoot);
-	buildBundles(activePackageRoot);
-	saveStats(label, activePackageRoot);
-
-	console.log(`\n${"=".repeat(80)}`);
-	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
-	console.log(`  Stats directory: ${resolve(bundleAnalysisDirectory, label)}`);
-	console.log("=".repeat(80));
 }
 
-main(process.argv.slice(2));
+if (!maybePrintHelp(process.argv.slice(2), "collectBundle.ts", CollectBundleCommand)) {
+	await CollectBundleCommand.run(process.argv.slice(2), import.meta.url);
+}
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 8dbe57aec9d1..f8ea639f4d86 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -9,56 +9,22 @@ import { fileURLToPath } from "node:url";
 import { gzipSync } from "node:zlib";
 
 import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
+import { Command, Flags } from "@oclif/core";
+
+import { maybePrintHelp } from "./oclifHelp.ts";
 
 // Default to the persistent analysis root used by collectBundle.ts.
 // Lives under this package's `bundleAnalysis/` directory (gitignored).
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
 
-// Labels are fixed to match what collectBundle.ts writes:
-//   local mode    -> "current"
-//   revision mode -> sanitized revision (we always use "main" for the base side here)
-const baseLabel = "main";
+// The current side is always written by collectBundle.ts in local mode, which
+// uses the fixed label "current". The base side is whatever label
+// collectBundle.ts wrote in revision mode (default "main", overridable via
+// --base-label).
+const defaultBaseLabel = "main";
 const currentLabel = "current";
 
-/**
- * Extracts the value of a command-line option from the argument list.
- * Supports both "--option value" and "--option=value" formats.
- *
- * @param argv - The command-line argument list
- * @param optionName - The name of the option to extract (e.g., "--base-branch")
- * @returns The option value, or undefined if not found
- */
-function getOptionValue(argv: string[], optionName: string): string | undefined {
-	const optionPrefix = `${optionName}=`;
-	const index = argv.findIndex((arg) => arg === optionName || arg.startsWith(optionPrefix));
-	if (index === -1) {
-		return undefined;
-	}
-
-	const optionArg = argv[index];
-	if (optionArg === undefined) {
-		return undefined;
-	}
-
-	if (optionArg.startsWith(optionPrefix)) {
-		return optionArg.slice(optionPrefix.length);
-	}
-
-	return argv[index + 1];
-}
-
-/**
- * Checks if a flag is present in the command-line argument list.
- *
- * @param argv - The command-line argument list
- * @param flagName - The flag to check for (e.g., "--help")
- * @returns True if the flag is present, false otherwise
- */
-function hasFlag(argv: string[], flagName: string): boolean {
-	return argv.includes(flagName);
-}
-
 /**
  * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
  *
@@ -246,20 +212,8 @@ function formatEntrypointRow(
 interface Options {
 	/** Directory containing per-label bundleStats.msp.gz files at \{label\}/bundleStats.msp.gz (default: this package's bundleAnalysis/) */
 	analysisDirectory: string;
-}
-
-/**
- * Parses command-line arguments into an Options object.
- *
- * @param argv - The command-line argument list
- * @returns Parsed options with defaults applied
- */
-function parseOptions(argv: string[]): Options {
-	const analysisDirectory = resolve(
-		getOptionValue(argv, "--analysis-dir") ?? defaultAnalysisDirectory,
-	);
-
-	return { analysisDirectory };
+	/** Label subdirectory holding the base-side bundle stats (default: "main"). */
+	baseLabel: string;
 }
 
 /**
@@ -273,6 +227,7 @@ function parseOptions(argv: string[]): Options {
  */
 function writeOutputFiles(
 	outputDirectory: string,
+	baseLabel: string,
 	textContent: string,
 	jsonObject: object,
 ): void {
@@ -295,28 +250,6 @@ function writeOutputFiles(
 /**
  * Prints the help text describing usage, options, and examples for the script.
  */
-function printHelp(): void {
-	console.log(`
-Usage:
-  jiti ./scripts/compareBundles.ts [options]
-
-Compares the two bundles previously collected by collectBundle.ts:
-  base    = ${baseLabel}/bundleStats.msp.gz
-  current = ${currentLabel}/bundleStats.msp.gz
-
-Options:
-  --help, -h
-    Show this help text and exit.
-
-  --analysis-dir <path>   Parent directory containing bundleStats.msp.gz files
-                          at {label}/bundleStats.msp.gz
-                          (default: ${defaultAnalysisDirectory})
-
-Examples:
-  jiti ./scripts/compareBundles.ts
-  jiti ./scripts/compareBundles.ts --analysis-dir /some/other/path
-`);
-}
 
 /** Represents gzip size comparison data for a single asset. */
 interface GzipRow {
@@ -343,21 +276,55 @@ interface EntrypointRow {
 }
 
 /**
- * Main entry point for the bundle comparison script.
  * Loads statistics from base and current builds, compares assets and entrypoints,
  * and generates both console and file-based reports (text and JSON).
- *
- * @param argv - The command-line argument list (typically process.argv)
  */
-function main(argv: string[]): void {
-	if (hasFlag(argv, "--help") || hasFlag(argv, "-h")) {
-		printHelp();
-		return;
+class CompareBundlesCommand extends Command {
+	public static override readonly description =
+		`Compare the two bundles previously collected by collectBundle.ts (base = --base-label, current = ${currentLabel}).`;
+
+	public static override readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --base-label some-revision",
+		"<%= config.bin %> <%= command.id %> --analysis-dir /some/other/path",
+	];
+
+	public static override readonly flags = {
+		"analysis-dir": Flags.string({
+			description:
+				"Parent directory containing bundleStats.msp.gz files at " +
+				"{label}/bundleStats.msp.gz.",
+			default: defaultAnalysisDirectory,
+		}),
+		"base-label": Flags.string({
+			description:
+				"Label subdirectory under --analysis-dir holding the base-side " +
+				"bundle stats. Must match the --label passed to collectBundle.ts " +
+				"in revision mode.",
+			default: defaultBaseLabel,
+		}),
+	};
+
+	public async run(): Promise<void> {
+		const { flags } = await this.parse(CompareBundlesCommand);
+		const options: Options = {
+			analysisDirectory: resolve(flags["analysis-dir"]),
+			baseLabel: flags["base-label"],
+		};
+
+		runCompare(options);
 	}
+}
 
-	const options = parseOptions(argv);
+/**
+ * Runs the bundle comparison and writes the report files.
+ *
+ * @param options - Parsed options for the comparison
+ */
+function runCompare(options: Options): void {
 	const reporter = new Reporter();
 
+	const { baseLabel } = options;
 	const outputDirectory = options.analysisDirectory;
 	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
 	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
@@ -464,7 +431,7 @@ function main(argv: string[]): void {
 		});
 	}
 
-	writeOutputFiles(outputDirectory, reporter.toText(), {
+	writeOutputFiles(outputDirectory, baseLabel, reporter.toText(), {
 		comparedAt: new Date().toISOString(),
 		baseLabel,
 		currentLabel,
@@ -480,4 +447,6 @@ function main(argv: string[]): void {
 	});
 }
 
-main(process.argv);
+if (!maybePrintHelp(process.argv.slice(2), "compareBundles.ts", CompareBundlesCommand)) {
+	await CompareBundlesCommand.run(process.argv.slice(2), import.meta.url);
+}
diff --git a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
new file mode 100644
index 000000000000..143e0e389896
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
@@ -0,0 +1,90 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { Command } from "@oclif/core";
+
+/**
+ * Renders simple help text for a single-command oclif script from its static
+ * metadata (`description`, `flags`, `examples`). Used because oclif's built-in
+ * `--help` machinery needs a full `Config`, which is heavyweight for scripts
+ * that are invoked directly via jiti rather than through a CLI bin.
+ *
+ * Intercepts `--help` / `-h` in argv before `Command.run`, prints, and exits.
+ *
+ * @param argv - The argument list that will be passed to the command
+ * @param commandName - The name to use in the synopsis line (e.g. `compareBundles.ts`)
+ * @param CommandClass - The oclif Command subclass whose metadata to render
+ * @returns true if help was printed (caller should not invoke `.run`)
+ */
+export function maybePrintHelp(
+	argv: string[],
+	commandName: string,
+	CommandClass: typeof Command,
+): boolean {
+	if (!argv.includes("--help") && !argv.includes("-h")) {
+		return false;
+	}
+
+	const description = CommandClass.description ?? "";
+	const flags = (CommandClass.flags ?? {}) as Record<
+		string,
+		{
+			type?: string;
+			description?: string;
+			default?: unknown;
+			options?: readonly string[];
+			required?: boolean;
+		}
+	>;
+	const examples = (CommandClass.examples ?? []).map((e) =>
+		typeof e === "string" ? e : (e.command ?? ""),
+	);
+
+	console.log(`Usage:\n  jiti ./scripts/${commandName} [flags]\n`);
+	if (description.length > 0) {
+		console.log(`${description}\n`);
+	}
+
+	const flagEntries = Object.entries(flags);
+	if (flagEntries.length > 0) {
+		console.log("Flags:");
+		for (const [name, def] of flagEntries) {
+			const isBoolean = def.type === "boolean";
+			const valuePart = isBoolean
+				? ""
+				: def.options
+					? ` <${def.options.join("|")}>`
+					: " <value>";
+			const defaultPart =
+				def.default !== undefined && !isBoolean
+					? ` (default: ${String(def.default)})`
+					: isBoolean && def.default === true
+						? " (default: true)"
+						: "";
+			const requiredPart = def.required ? " (required)" : "";
+			console.log(
+				`  --${name}${valuePart}${defaultPart}${requiredPart}\n      ${
+					def.description ?? ""
+				}`,
+			);
+		}
+		console.log();
+	}
+
+	if (examples.length > 0) {
+		console.log("Examples:");
+		for (const example of examples) {
+			console.log(
+				`  ${example
+					.replaceAll("<%= config.bin %> <%= command.id %>", `jiti ./scripts/${commandName}`)
+					.replaceAll("<%= config.bin %>", "jiti")
+					.replaceAll("<%= command.id %>", commandName)}`,
+			);
+		}
+		console.log();
+	}
+
+	return true;
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cd8bcd7dfbd1..7de121887ee7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -381,7 +381,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -511,7 +511,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -638,7 +638,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -934,7 +934,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1079,7 +1079,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1236,7 +1236,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1360,7 +1360,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1578,7 +1578,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1681,7 +1681,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1860,7 +1860,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1975,7 +1975,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2084,7 +2084,7 @@ importers:
         version: 5.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2290,7 +2290,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -2323,7 +2323,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2544,7 +2544,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -3069,7 +3069,7 @@ importers:
         version: 4.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4377,7 +4377,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4413,7 +4413,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4522,7 +4522,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4564,7 +4564,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4688,7 +4688,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4862,6 +4862,9 @@ importers:
       '@mixer/webpack-bundle-compare':
         specifier: ^0.1.0
         version: 0.1.1
+      '@oclif/core':
+        specifier: ^4.10.5
+        version: 4.10.5
       '@types/mocha':
         specifier: ^10.0.10
         version: 10.0.10
@@ -5388,7 +5391,7 @@ importers:
         version: link:../../../packages/utils/tool-utils
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -5597,7 +5600,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5766,7 +5769,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5947,7 +5950,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6107,7 +6110,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6234,7 +6237,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6373,7 +6376,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6497,7 +6500,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6748,7 +6751,7 @@ importers:
         version: link:../../../../packages/dds/shared-object-base
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.4.3)
+        version: 1.15.0(debug@4.3.7)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -7645,7 +7648,7 @@ importers:
         version: 18.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@22.19.17)(typescript@5.4.5)
@@ -11048,7 +11051,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16169,7 +16172,7 @@ importers:
         version: 3.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16468,7 +16471,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16501,7 +16504,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16658,7 +16661,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16697,7 +16700,7 @@ importers:
         version: 3.32.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -27967,7 +27970,7 @@ snapshots:
       cjs-module-lexer: 1.4.1
       fflate: 0.8.2
       lru-cache: 11.2.6
-      semver: 7.7.3
+      semver: 7.7.4
       typescript: 5.6.1-rc
       validate-npm-package-name: 5.0.1
 
@@ -28336,7 +28339,7 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.7.3
+      semver: 7.7.4
 
   '@changesets/assemble-release-plan@6.0.9':
     dependencies:
@@ -28345,7 +28348,7 @@ snapshots:
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.7.3
+      semver: 7.7.4
 
   '@changesets/changelog-git@0.2.1':
     dependencies:
@@ -28403,7 +28406,7 @@ snapshots:
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   '@changesets/get-release-plan@4.0.14':
     dependencies:
@@ -29945,7 +29948,7 @@ snapshots:
       oclif: 4.23.0(@types/node@22.19.17)
       picocolors: 1.1.1
       read-pkg-up: 7.0.1
-      semver: 7.7.3
+      semver: 7.7.4
       simple-git: 3.32.3
       sort-package-json: 1.57.0
       type-fest: 2.19.0
@@ -30056,7 +30059,7 @@ snapshots:
       '@fluidframework/routerlicious-driver': 1.4.0(encoding@0.1.13)
       '@fluidframework/runtime-utils': 1.4.0
       '@fluidframework/server-services-client': 0.1036.5002
-      axios: 0.30.3(debug@4.4.3)
+      axios: 0.30.3
       uuid: 8.3.2
     transitivePeerDependencies:
       - bufferutil
@@ -30471,7 +30474,7 @@ snapshots:
       '@fluidframework/protocol-base': 0.1036.5002
       '@fluidframework/protocol-definitions': 0.1028.2000
       '@fluidframework/telemetry-utils': 1.4.0
-      axios: 0.30.3(debug@4.4.3)
+      axios: 0.30.3
       uuid: 8.3.2
     transitivePeerDependencies:
       - debug
@@ -31021,6 +31024,35 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@fluidframework/server-lambdas@7.0.0':
+    dependencies:
+      '@fluidframework/common-utils': 3.1.0
+      '@fluidframework/gitresources': 7.0.0
+      '@fluidframework/protocol-base': 7.0.0
+      '@fluidframework/protocol-definitions': 3.2.0
+      '@fluidframework/server-lambdas-driver': 7.0.0
+      '@fluidframework/server-services-client': 7.0.0
+      '@fluidframework/server-services-core': 7.0.0
+      '@fluidframework/server-services-telemetry': 7.0.0
+      '@types/semver': 7.7.0
+      assert: 2.1.0
+      async: 3.2.6
+      axios: 1.15.0(debug@4.3.7)
+      buffer: 6.0.3
+      double-ended-queue: 2.1.0-0
+      events: 3.3.0
+      json-stringify-safe: 5.0.1
+      lodash: 4.18.1
+      nconf: 0.12.1
+      opossum: 8.5.0
+      semver: 7.7.4
+      serialize-error: 8.1.0
+      sha.js: 2.4.12
+      uuid: 11.1.0
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+
   '@fluidframework/server-lambdas@7.0.0(debug@4.4.3)':
     dependencies:
       '@fluidframework/common-utils': 3.1.0
@@ -31042,7 +31074,7 @@ snapshots:
       lodash: 4.18.1
       nconf: 0.12.1
       opossum: 8.5.0
-      semver: 7.7.3
+      semver: 7.7.4
       serialize-error: 8.1.0
       sha.js: 2.4.12
       uuid: 11.1.0
@@ -32312,7 +32344,7 @@ snapshots:
       is-wsl: 2.2.0
       lilconfig: 3.1.3
       minimatch: 10.2.4
-      semver: 7.7.3
+      semver: 7.7.4
       string-width: 4.2.3
       supports-color: 8.1.1
       tinyglobby: 0.2.15
@@ -32669,7 +32701,7 @@ snapshots:
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
-      semver: 7.7.3
+      semver: 7.7.4
       tar-fs: 3.1.1
       unbzip2-stream: 1.4.3
       yargs: 17.7.2
@@ -33585,7 +33617,7 @@ snapshots:
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.9
-      semver: 7.7.3
+      semver: 7.7.4
       ts-api-utils: 2.4.0(typescript@5.4.5)
       typescript: 5.4.5
     transitivePeerDependencies:
@@ -33601,7 +33633,7 @@ snapshots:
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.9
-      semver: 7.7.3
+      semver: 7.7.4
       ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -33615,7 +33647,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.54.0
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 9.0.9
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.4.5)
       typescript: 5.4.5
@@ -33630,7 +33662,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.54.0
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 9.0.9
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
@@ -33645,7 +33677,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.56.1
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.4
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.4.5)
       typescript: 5.4.5
@@ -33660,7 +33692,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.56.1
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.4
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
@@ -33865,7 +33897,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0(debug@4.4.3)
+      axios: 1.15.0(debug@4.3.7)
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -33951,12 +33983,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -34277,6 +34309,14 @@ snapshots:
 
   axe-core@4.10.2: {}
 
+  axios@0.30.3:
+    dependencies:
+      follow-redirects: 1.15.11(debug@4.3.7)
+      form-data: 4.0.5
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@0.30.3(debug@4.4.3):
     dependencies:
       follow-redirects: 1.15.11(debug@4.4.3)
@@ -35095,7 +35135,7 @@ snapshots:
 
   create-esm-loader@0.2.5:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   create-jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)):
     dependencies:
@@ -35917,7 +35957,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
+  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
     dependencies:
       '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
       eslint: 9.39.1(jiti@2.6.1)
@@ -36977,6 +37017,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  http-proxy-middleware@2.0.9(@types/express@4.17.21):
+    dependencies:
+      '@types/http-proxy': 1.17.15
+      http-proxy: 1.18.1
+      is-glob: 4.0.3
+      is-plain-obj: 3.0.0
+      micromatch: 4.0.8
+    optionalDependencies:
+      '@types/express': 4.17.21
+    transitivePeerDependencies:
+      - debug
+
   http-proxy-middleware@2.0.9(@types/express@4.17.21)(debug@4.4.3):
     dependencies:
       '@types/http-proxy': 1.17.15
@@ -36989,6 +37041,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  http-proxy@1.18.1:
+    dependencies:
+      eventemitter3: 4.0.7
+      follow-redirects: 1.15.11(debug@4.3.7)
+      requires-port: 1.0.0
+    transitivePeerDependencies:
+      - debug
+
   http-proxy@1.18.1(debug@4.4.3):
     dependencies:
       eventemitter3: 4.0.7
@@ -37157,7 +37217,7 @@ snapshots:
       fengari: 0.1.4
       fengari-interop: 0.1.3(fengari@0.1.4)
       ioredis: 5.6.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   ioredis@5.6.1:
     dependencies:
@@ -37233,7 +37293,7 @@ snapshots:
 
   is-bun-module@2.0.0:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   is-callable@1.2.7: {}
 
@@ -37451,7 +37511,7 @@ snapshots:
       '@babel/parser': 7.28.4
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
-      semver: 7.7.3
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
@@ -37586,7 +37646,7 @@ snapshots:
       prompts: 2.4.2
       spawnd: 10.1.4
       tree-kill: 1.2.2
-      wait-on: 8.0.1
+      wait-on: 8.0.1(debug@4.3.7)
     transitivePeerDependencies:
       - debug
       - supports-color
@@ -37822,7 +37882,7 @@ snapshots:
       jest-util: 29.7.0
       natural-compare: 1.4.0
       pretty-format: 29.7.0
-      semver: 7.7.3
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
@@ -38048,7 +38108,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.3
+      semver: 7.7.4
 
   jsrsasign@11.1.1: {}
 
@@ -38115,7 +38175,7 @@ snapshots:
       chalk: 5.6.2
       console-table-printer: 2.14.6
       p-queue: 6.6.2
-      semver: 7.7.3
+      semver: 7.7.4
       uuid: 10.0.0
     optionalDependencies:
       openai: 5.12.2(ws@8.19.0)(zod@3.25.76)
@@ -38368,7 +38428,7 @@ snapshots:
 
   make-dir@4.0.0:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   make-error@1.3.6: {}
 
@@ -39136,7 +39196,7 @@ snapshots:
 
   node-abi@3.71.0:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   node-addon-api@4.3.0: {}
 
@@ -39462,7 +39522,7 @@ snapshots:
       ky: 1.7.3
       registry-auth-token: 5.1.0
       registry-url: 6.0.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   package-manager-detector@0.2.11:
     dependencies:
@@ -41551,7 +41611,7 @@ snapshots:
       '@fluidframework/gitresources': 7.0.0
       '@fluidframework/protocol-base': 7.0.0
       '@fluidframework/protocol-definitions': 3.2.0
-      '@fluidframework/server-lambdas': 7.0.0(debug@4.4.3)
+      '@fluidframework/server-lambdas': 7.0.0
       '@fluidframework/server-local-server': 7.0.0
       '@fluidframework/server-memory-orderer': 7.0.0
       '@fluidframework/server-services-client': 7.0.0
@@ -41561,7 +41621,7 @@ snapshots:
       '@fluidframework/server-services-utils': 7.0.0
       '@fluidframework/server-test-utils': 7.0.0
       agentkeepalive: 4.6.0
-      axios: 1.15.0(debug@4.4.3)
+      axios: 1.15.0(debug@4.3.7)
       body-parser: 1.20.3
       charwise: 3.0.1
       compression: 1.7.5
@@ -41678,7 +41738,7 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
+  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
@@ -42205,16 +42265,6 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
-  wait-on@8.0.1:
-    dependencies:
-      axios: 1.15.0(debug@4.4.3)
-      joi: 17.13.3
-      lodash: 4.18.1
-      minimist: 1.2.8
-      rxjs: 7.8.2
-    transitivePeerDependencies:
-      - debug
-
   wait-on@8.0.1(debug@4.3.7):
     dependencies:
       axios: 1.15.0(debug@4.3.7)
@@ -42400,7 +42450,7 @@ snapshots:
       express: 4.22.1
       graceful-fs: 4.2.11
       html-entities: 2.6.0
-      http-proxy-middleware: 2.0.9(@types/express@4.17.21)(debug@4.4.3)
+      http-proxy-middleware: 2.0.9(@types/express@4.17.21)
       ipaddr.js: 2.2.0
       launch-editor: 2.9.1
       open: 8.4.2
@@ -42464,7 +42514,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild

From c36f4756120398b0998ad715511a446f99b5427a Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 29 Apr 2026 10:15:45 -0700
Subject: [PATCH 27/67] Fixed lint issues by adding more types and a tsconfig
 for scripts.

---
 .../bundle-size-tests/scripts/oclifHelp.ts    | 21 ++++++++++++-------
 .../bundle-size-tests/tsconfig.scripts.json   |  4 ++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
index 143e0e389896..91b001d61048 100644
--- a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
+++ b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
@@ -33,14 +33,18 @@ export function maybePrintHelp(
 		{
 			type?: string;
 			description?: string;
-			default?: unknown;
+			default?: string | number | boolean;
 			options?: readonly string[];
 			required?: boolean;
 		}
 	>;
-	const examples = (CommandClass.examples ?? []).map((e) =>
-		typeof e === "string" ? e : (e.command ?? ""),
-	);
+	const examples: string[] = (CommandClass.examples ?? []).map((e) => {
+		if (typeof e === "string") {
+			return e;
+		}
+		const command = (e as { command?: unknown }).command;
+		return typeof command === "string" ? command : "";
+	});
 
 	console.log(`Usage:\n  jiti ./scripts/${commandName} [flags]\n`);
 	if (description.length > 0) {
@@ -57,13 +61,14 @@ export function maybePrintHelp(
 				: def.options
 					? ` <${def.options.join("|")}>`
 					: " <value>";
+			const defaultValue = def.default;
 			const defaultPart =
-				def.default !== undefined && !isBoolean
-					? ` (default: ${String(def.default)})`
-					: isBoolean && def.default === true
+				defaultValue !== undefined && !isBoolean
+					? ` (default: ${String(defaultValue)})`
+					: isBoolean && defaultValue === true
 						? " (default: true)"
 						: "";
-			const requiredPart = def.required ? " (required)" : "";
+			const requiredPart = def.required === true ? " (required)" : "";
 			console.log(
 				`  --${name}${valuePart}${defaultPart}${requiredPart}\n      ${
 					def.description ?? ""
diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
index 60832e97682c..1aee08fd24c0 100644
--- a/examples/utils/bundle-size-tests/tsconfig.scripts.json
+++ b/examples/utils/bundle-size-tests/tsconfig.scripts.json
@@ -4,6 +4,10 @@
 		"noEmit": true,
 		"types": ["node"],
 		"exactOptionalPropertyTypes": false,
+		// scripts/ is run directly via jiti on modern Node; the repo-wide ES2020
+		// lib excludes things like String.prototype.replaceAll which the scripts
+		// rely on (and which type-aware lint can't see otherwise).
+		"lib": ["ES2022"],
 	},
 	"include": ["scripts/**/*.ts"],
 }

From 21b623c3161d3fb66dea2683c467d6e673a023f0 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 29 Apr 2026 10:50:34 -0700
Subject: [PATCH 28/67] Lint.

---
 examples/utils/bundle-size-tests/scripts/oclifHelp.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
index 91b001d61048..1e0a155485bf 100644
--- a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
+++ b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
@@ -70,9 +70,7 @@ export function maybePrintHelp(
 						: "";
 			const requiredPart = def.required === true ? " (required)" : "";
 			console.log(
-				`  --${name}${valuePart}${defaultPart}${requiredPart}\n      ${
-					def.description ?? ""
-				}`,
+				`  --${name}${valuePart}${defaultPart}${requiredPart}\n      ${def.description ?? ""}`,
 			);
 		}
 		console.log();

From 905b787fc47de2cf70e633c7b3e1c00d7657cf11 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 29 Apr 2026 14:03:22 -0700
Subject: [PATCH 29/67] Better example label name.

---
 .../bundle-size-tests/scripts/collectAndCompareBundles.ts     | 2 +-
 examples/utils/bundle-size-tests/scripts/collectBundle.ts     | 4 ++--
 examples/utils/bundle-size-tests/scripts/compareBundles.ts    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 0fc7fc6f7306..59df69bad97b 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -87,7 +87,7 @@ class CollectAndCompareBundlesCommand extends Command {
 	public static override readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
 		"<%= config.bin %> <%= command.id %> --base-revision main",
-		"<%= config.bin %> <%= command.id %> --base-revision v2.20.0",
+		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
 		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
 	];
 
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 2f55d7b0e89f..6fb03c332e11 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -116,7 +116,7 @@ function buildBundles(packageRoot: string): void {
  * Moves webpack's stats output and `build/` directory into the per-label directory
  * under the persistent analysis root.
  *
- * @param label - Sanitized label for this build (e.g., "main", "feature_branch").
+ * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
  * @param sourcePackageRoot - Package root that produced the webpack output.
  */
 function saveStats(label: string, sourcePackageRoot: string): void {
@@ -223,7 +223,7 @@ class CollectBundleCommand extends Command {
 	public static override readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
 		"<%= config.bin %> <%= command.id %> --mode revision --revision main",
-		"<%= config.bin %> <%= command.id %> --mode revision --revision v2.20.0",
+		"<%= config.bin %> <%= command.id %> --mode revision --revision client_v2.100.0",
 	];
 
 	public static override readonly flags = {
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index f8ea639f4d86..769c50b23d94 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -219,7 +219,7 @@ interface Options {
 /**
  * Writes comparison results to both text and JSON output files.
  * Creates the output directory if it does not exist.
- * File names are derived from sanitized branch names (e.g., "compare-main-to-dev.txt").
+ * File names are derived from sanitized branch names (e.g., "compare-main-to-client_v2.100.0.txt").
  *
  * @param outputDirectory - The directory where output files will be written
  * @param textContent - The formatted text comparison report

From 19b540827aa6ae55a62fbaa86125fe7ab794a74b Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 29 Apr 2026 14:36:04 -0700
Subject: [PATCH 30/67] Switched to using simple-git for git commands.

---
 examples/utils/bundle-size-tests/package.json |  1 +
 .../scripts/collectAndCompareBundles.ts       | 17 ++++---
 .../scripts/collectBundle.ts                  | 44 +++++++++----------
 pnpm-lock.yaml                                |  3 ++
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 5a2696c71818..40d5b5146c59 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -71,6 +71,7 @@
 		"mocha": "^11.7.5",
 		"puppeteer": "^23.6.0",
 		"rimraf": "^6.1.3",
+		"simple-git": "^3.32.3",
 		"source-map-explorer": "^2.5.3",
 		"source-map-loader": "^5.0.0",
 		"string-replace-loader": "^3.1.0",
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 59df69bad97b..ae460c5f0c35 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -8,6 +8,7 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { Command, Flags } from "@oclif/core";
+import { simpleGit } from "simple-git";
 
 import { maybePrintHelp } from "./oclifHelp.ts";
 
@@ -24,16 +25,14 @@ const packageRoot = resolve(scriptDirectory, "..");
  * works for worktree-based setups where `main` may not exist as a local branch
  * at the location they expect.
  */
-function resolveMergeBase(rev: string): string | undefined {
-	const result = spawnSync("git", ["merge-base", "HEAD", rev], {
-		cwd: packageRoot,
-		encoding: "utf-8",
-	});
-	if (result.status !== 0) {
+async function resolveMergeBase(rev: string): Promise<string | undefined> {
+	try {
+		const output = await simpleGit(packageRoot).raw(["merge-base", "HEAD", rev]);
+		const sha = output.trim();
+		return sha.length > 0 ? sha : undefined;
+	} catch {
 		return undefined;
 	}
-	const sha = result.stdout.trim();
-	return sha.length > 0 ? sha : undefined;
 }
 
 /**
@@ -116,7 +115,7 @@ class CollectAndCompareBundlesCommand extends Command {
 		const { flags } = await this.parse(CollectAndCompareBundlesCommand);
 
 		const baseRevisionInput = flags["base-revision"];
-		const resolvedBaseRevision = resolveMergeBase(baseRevisionInput);
+		const resolvedBaseRevision = await resolveMergeBase(baseRevisionInput);
 		if (resolvedBaseRevision === undefined) {
 			this.error(
 				`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 6fb03c332e11..3e7bc598a0bd 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -9,6 +9,7 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { Command, Flags } from "@oclif/core";
+import { simpleGit } from "simple-git";
 
 import { maybePrintHelp } from "./oclifHelp.ts";
 
@@ -24,14 +25,12 @@ const packageWorkspacePath = "examples/utils/bundle-size-tests";
 /**
  * Gets the repository root directory for the given working directory.
  */
-function getRepoRoot(cwd: string): string {
-	return execSync("git rev-parse --show-toplevel", {
-		cwd,
-		encoding: "utf-8",
-	}).trim();
+async function getRepoRoot(cwd: string): Promise<string> {
+	const output = await simpleGit(cwd).revparse(["--show-toplevel"]);
+	return output.trim();
 }
 
-const outerRepoRoot = getRepoRoot(outerPackageRoot);
+const outerRepoRoot = await getRepoRoot(outerPackageRoot);
 
 /**
  * Where saved bundle stats live, keyed by sanitized label.
@@ -162,11 +161,12 @@ function saveStats(label: string, sourcePackageRoot: string): void {
  * Returns the URL of the outer repo's `origin` remote, used as the source
  * for cloning the inner repo.
  */
-function getOuterOriginUrl(): string {
-	return execSync("git config --get remote.origin.url", {
-		cwd: outerRepoRoot,
-		encoding: "utf-8",
-	}).trim();
+async function getOuterOriginUrl(): Promise<string> {
+	const { value } = await simpleGit(outerRepoRoot).getConfig("remote.origin.url");
+	if (value === null || value.length === 0) {
+		throw new Error(`Could not read remote.origin.url from ${outerRepoRoot}.`);
+	}
+	return value;
 }
 
 /**
@@ -178,32 +178,32 @@ function getOuterOriginUrl(): string {
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
-function ensureInnerRepo(): void {
+async function ensureInnerRepo(): Promise<void> {
 	if (existsSync(resolve(innerRepoRoot, ".git"))) {
 		return;
 	}
 
-	const originUrl = getOuterOriginUrl();
+	const originUrl = await getOuterOriginUrl();
 	mkdirSync(dirname(innerRepoRoot), { recursive: true });
 	console.log(`\nCloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
 	// Filter blobs to keep the clone fast; blobs are fetched lazily on checkout.
-	run(
-		`git clone --filter=blob:none ${JSON.stringify(originUrl)} ${JSON.stringify(innerRepoRoot)}`,
-		dirname(innerRepoRoot),
-	);
+	await simpleGit(dirname(innerRepoRoot)).clone(originUrl, innerRepoRoot, [
+		"--filter=blob:none",
+	]);
 }
 
 /**
  * Fetches the latest refs and checks out the requested revision in the inner repo.
  * The revision can be a branch, tag, or commit SHA.
  */
-function syncInnerRepoToRevision(revision: string): void {
+async function syncInnerRepoToRevision(revision: string): Promise<void> {
+	const innerGit = simpleGit(innerRepoRoot);
 	console.log(`\nFetching latest refs in inner repo...`);
-	run("git fetch --tags origin", innerRepoRoot);
+	await innerGit.fetch(["--tags", "origin"]);
 
 	console.log(`Checking out revision "${revision}" in inner repo...`);
 	// Use detached HEAD checkout so we don't have to manage local branch state.
-	run(`git checkout --detach ${JSON.stringify(revision)}`, innerRepoRoot);
+	await innerGit.raw(["checkout", "--detach", revision]);
 }
 
 /**
@@ -275,9 +275,9 @@ class CollectBundleCommand extends Command {
 			activeRepoRoot = outerRepoRoot;
 			activePackageRoot = outerPackageRoot;
 		} else {
-			ensureInnerRepo();
+			await ensureInnerRepo();
 			// Only the inner repo's revision is changed. The outer repo is never touched.
-			syncInnerRepoToRevision(revision as string);
+			await syncInnerRepoToRevision(revision as string);
 			activeRepoRoot = innerRepoRoot;
 			activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
 			if (!existsSync(activePackageRoot)) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7de121887ee7..15ee13a5a277 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4886,6 +4886,9 @@ importers:
       rimraf:
         specifier: ^6.1.3
         version: 6.1.3
+      simple-git:
+        specifier: ^3.32.3
+        version: 3.32.3
       source-map-explorer:
         specifier: ^2.5.3
         version: 2.5.3

From 9262667dde03e16a1ad7a2bad7421d26153ad580 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 1 May 2026 11:55:18 -0700
Subject: [PATCH 31/67] - Made the script part of the build. - Ordered
 pnpm-workspace exclusions.

---
 examples/utils/bundle-size-tests/package.json        | 12 ++++++++++++
 .../scripts/collectAndCompareBundles.ts              |  2 +-
 .../utils/bundle-size-tests/scripts/collectBundle.ts |  2 +-
 .../bundle-size-tests/scripts/compareBundles.ts      |  2 +-
 .../utils/bundle-size-tests/tsconfig.scripts.json    |  1 +
 pnpm-workspace.yaml                                  |  7 ++++---
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 40d5b5146c59..8ce2e73661db 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -16,6 +16,7 @@
 		"build": "fluid-build . --task build",
 		"build:compile": "fluid-build . --task compile",
 		"build:esnext": "tsc --project ./tsconfig.json",
+		"build:scripts": "tsc --project ./tsconfig.scripts.json",
 		"build:test": "npm run build:test:esm",
 		"build:test:esm": "tsc --project ./src/test/tsconfig.json",
 		"check:biome": "biome check .",
@@ -90,6 +91,17 @@
 				"...",
 				"webpack"
 			],
+			"build:scripts": [
+				"^tsc",
+				"^api"
+			],
+			"compile": {
+				"dependsOn": [
+					"...",
+					"build:scripts"
+				],
+				"script": false
+			},
 			"webpack": [
 				"^build:esnext"
 			],
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index ae460c5f0c35..bbe3d1812e8f 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -10,7 +10,7 @@ import { fileURLToPath } from "node:url";
 import { Command, Flags } from "@oclif/core";
 import { simpleGit } from "simple-git";
 
-import { maybePrintHelp } from "./oclifHelp.ts";
+import { maybePrintHelp } from "./oclifHelp.js";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 3e7bc598a0bd..99b2971be336 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -11,7 +11,7 @@ import { fileURLToPath } from "node:url";
 import { Command, Flags } from "@oclif/core";
 import { simpleGit } from "simple-git";
 
-import { maybePrintHelp } from "./oclifHelp.ts";
+import { maybePrintHelp } from "./oclifHelp.js";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const outerPackageRoot = resolve(scriptDirectory, "..");
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 769c50b23d94..54744234e3ac 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -11,7 +11,7 @@ import { gzipSync } from "node:zlib";
 import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
 import { Command, Flags } from "@oclif/core";
 
-import { maybePrintHelp } from "./oclifHelp.ts";
+import { maybePrintHelp } from "./oclifHelp.js";
 
 // Default to the persistent analysis root used by collectBundle.ts.
 // Lives under this package's `bundleAnalysis/` directory (gitignored).
diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
index 1aee08fd24c0..12fa6d02062b 100644
--- a/examples/utils/bundle-size-tests/tsconfig.scripts.json
+++ b/examples/utils/bundle-size-tests/tsconfig.scripts.json
@@ -2,6 +2,7 @@
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
 		"noEmit": true,
+		"tsBuildInfoFile": "./lib/tsconfig.scripts.tsbuildinfo",
 		"types": ["node"],
 		"exactOptionalPropertyTypes": false,
 		// scripts/ is run directly via jiti on modern Node; the repo-wide ES2020
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0980ad3bd084..03e5d7bc75eb 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -15,13 +15,14 @@ packages:
   - "packages/**"
   - "tools/markdown-magic"
 
+  # exclude inner FluidFramework enlistment used by examples/utils/bundle-size-tests
+  # for cross-revision bundle comparison (see examples/utils/bundle-size-tests/scripts/collectBundle.ts).
+  - "!**/bundleAnalysis/**"
+
   # exclude any package.json files that are inside src or output directories
   - "!**/dist/**"
   - "!**/lib/**"
   - "!**/src/**"
-  # exclude inner FluidFramework enlistment used by examples/utils/bundle-size-tests
-  # for cross-revision bundle comparison (see examples/utils/bundle-size-tests/scripts/collectBundle.ts).
-  - "!**/bundleAnalysis/**"
 
 # Supply chain security settings - see /DEV.md for documentation
 minimumReleaseAge: 1440

From 7a6abb0bad7933cd8dadd3a674d91ddca14dc818 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 1 May 2026 13:09:00 -0700
Subject: [PATCH 32/67] Refactor inner repo management to support shallow
 cloning and revision-specific checkouts.

Co-authored-by: Copilot <copilot@github.com>
---
 .../scripts/collectAndCompareBundles.ts       | 55 ++++++++++++----
 .../scripts/collectBundle.ts                  | 63 +++++++++++--------
 2 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index bbe3d1812e8f..fa61f1b00c0f 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -4,6 +4,7 @@
  */
 
 import { spawnSync } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -14,6 +15,7 @@ import { maybePrintHelp } from "./oclifHelp.js";
 
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDirectory, "..");
+const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
 
 /**
  * Resolves a committish (branch, tag, or SHA) to the merge-base with the outer
@@ -143,6 +145,21 @@ class CollectAndCompareBundlesCommand extends Command {
 			sharedCollectArgs.push("--force-clean-build");
 		}
 
+		// The inner repo is only ever checked out at a clean revision; its build
+		// output for a given SHA is deterministic, so cached stats from a prior
+		// run for the same SHA can be reused. We track the SHA used to produce
+		// the base stats in a sidecar revision.txt file.
+		const baseLabelDirectory = resolve(bundleAnalysisDirectory, baseLabel);
+		const baseStatsPath = resolve(baseLabelDirectory, "bundleStats.msp.gz");
+		const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
+		const cachedBaseRevision = existsSync(baseRevisionMarkerPath)
+			? readFileSync(baseRevisionMarkerPath, "utf8").trim()
+			: undefined;
+		const baseStatsAreCached =
+			!forceCleanBuildFlag &&
+			existsSync(baseStatsPath) &&
+			cachedBaseRevision === baseRevision;
+
 		try {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log(`Collecting local bundle (label: ${currentLabel})...`);
@@ -150,19 +167,31 @@ class CollectAndCompareBundlesCommand extends Command {
 			runScript("collectBundle.ts", ["--mode", "local", ...sharedCollectArgs]);
 
 			console.log(`\n${"=".repeat(80)}`);
-			console.log(
-				`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
-			);
-			console.log("=".repeat(80));
-			runScript("collectBundle.ts", [
-				"--mode",
-				"revision",
-				"--revision",
-				baseRevision,
-				"--label",
-				baseLabel,
-				...sharedCollectArgs,
-			]);
+			if (baseStatsAreCached) {
+				console.log(
+					`Reusing cached base bundle (revision: ${baseRevision}, label: ${baseLabel}).`,
+				);
+				console.log(`  Stats: ${baseStatsPath}`);
+				console.log("=".repeat(80));
+			} else {
+				console.log(
+					`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
+				);
+				console.log("=".repeat(80));
+				runScript("collectBundle.ts", [
+					"--mode",
+					"revision",
+					"--revision",
+					baseRevision,
+					"--label",
+					baseLabel,
+					...sharedCollectArgs,
+				]);
+				// Record the SHA that produced these stats so a subsequent run
+				// against the same merge-base can skip the rebuild.
+				mkdirSync(baseLabelDirectory, { recursive: true });
+				writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
+			}
 
 			if (!skipCompare) {
 				console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 99b2971be336..5028d47777fd 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -170,40 +170,51 @@ async function getOuterOriginUrl(): Promise<string> {
 }
 
 /**
- * Ensures the inner FluidFramework enlistment exists under {@link innerRepoRoot}.
+ * Ensures the inner FluidFramework enlistment exists under {@link innerRepoRoot}
+ * and is checked out at the requested revision.
  *
- * On first call, clones from the outer repo's `origin` remote. On subsequent
- * calls, reuses the existing clone (an explicit `git fetch` is performed before
- * checkout to ensure the requested revision is available).
+ * On first call, performs a shallow clone of the outer repo's `origin` remote
+ * (`--depth=1 --no-tags --no-checkout`). On every call (including the first),
+ * the requested revision is fetched shallowly (`fetch --depth=1 origin <rev>`)
+ * and checked out detached. This keeps the inner repo's `.git` directory small
+ * even after many revisions have been visited.
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
-async function ensureInnerRepo(): Promise<void> {
-	if (existsSync(resolve(innerRepoRoot, ".git"))) {
-		return;
+async function ensureInnerRepoAtRevision(revision: string): Promise<void> {
+	if (!existsSync(resolve(innerRepoRoot, ".git"))) {
+		const originUrl = await getOuterOriginUrl();
+		mkdirSync(dirname(innerRepoRoot), { recursive: true });
+		console.log(`\nShallow-cloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
+		// Clone shallow with no checkout: we'll fetch and check out the exact
+		// revision the caller requested below. --filter=blob:none isn't needed
+		// on top of --depth=1.
+		await simpleGit(dirname(innerRepoRoot)).clone(originUrl, innerRepoRoot, [
+			"--depth=1",
+			"--no-tags",
+			"--no-checkout",
+		]);
 	}
 
-	const originUrl = await getOuterOriginUrl();
-	mkdirSync(dirname(innerRepoRoot), { recursive: true });
-	console.log(`\nCloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
-	// Filter blobs to keep the clone fast; blobs are fetched lazily on checkout.
-	await simpleGit(dirname(innerRepoRoot)).clone(originUrl, innerRepoRoot, [
-		"--filter=blob:none",
-	]);
-}
-
-/**
- * Fetches the latest refs and checks out the requested revision in the inner repo.
- * The revision can be a branch, tag, or commit SHA.
- */
-async function syncInnerRepoToRevision(revision: string): Promise<void> {
 	const innerGit = simpleGit(innerRepoRoot);
-	console.log(`\nFetching latest refs in inner repo...`);
-	await innerGit.fetch(["--tags", "origin"]);
+	console.log(`\nFetching revision "${revision}" (shallow) into inner repo...`);
+	// Fetch only the requested commit at depth 1. By naming the SHA directly
+	// we skip fetching any branch tips first, which is what keeps the inner
+	// repo's `.git` small. This relies on the server allowing fetch-by-SHA:
+	// `uploadpack.allowReachableSHA1InWant` lets clients ask for any commit
+	// reachable from an advertised ref (not just the ref tips themselves).
+	// GitHub enables this on every repo; without it, we'd have to fetch a
+	// branch and walk history to the SHA, defeating --depth=1 for any
+	// non-tip commit (which is the common case here, since the merge-base
+	// usually isn't `main` HEAD).
+	await innerGit.fetch(["--depth=1", "origin", revision]);
 
 	console.log(`Checking out revision "${revision}" in inner repo...`);
 	// Use detached HEAD checkout so we don't have to manage local branch state.
-	await innerGit.raw(["checkout", "--detach", revision]);
+	// FETCH_HEAD is set by the fetch above and is guaranteed to point at the
+	// requested commit, even when `revision` is a SHA the local clone hasn't
+	// otherwise heard of.
+	await innerGit.raw(["checkout", "--detach", "FETCH_HEAD"]);
 }
 
 /**
@@ -275,9 +286,7 @@ class CollectBundleCommand extends Command {
 			activeRepoRoot = outerRepoRoot;
 			activePackageRoot = outerPackageRoot;
 		} else {
-			await ensureInnerRepo();
-			// Only the inner repo's revision is changed. The outer repo is never touched.
-			await syncInnerRepoToRevision(revision as string);
+			await ensureInnerRepoAtRevision(revision as string);
 			activeRepoRoot = innerRepoRoot;
 			activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
 			if (!existsSync(activePackageRoot)) {

From f3fef9baa931a0441224b0e63311e2404af82eeb Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 1 May 2026 17:32:23 -0700
Subject: [PATCH 33/67] Delete base repo by default.

---
 .../scripts/collectAndCompareBundles.ts       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index fa61f1b00c0f..3e112c4dfa54 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -4,7 +4,7 @@
  */
 
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -111,6 +111,15 @@ class CollectAndCompareBundlesCommand extends Command {
 				"when stale incremental build state may interfere with the current revision.",
 			default: false,
 		}),
+		"keep-base-repo": Flags.boolean({
+			description:
+				"For debugging only: keep the inner base-repo clone after collecting the " +
+				"base bundle. By default the inner repo is deleted once stats are saved, " +
+				"since it can be re-created cheaply via shallow clone on the next run. " +
+				"Pass this flag to inspect the inner repo's working tree or build output " +
+				"(e.g. when a build is failing inside the inner repo).",
+			default: false,
+		}),
 	};
 
 	public async run(): Promise<void> {
@@ -139,6 +148,7 @@ class CollectAndCompareBundlesCommand extends Command {
 
 		const skipCompare = flags["skip-compare"];
 		const forceCleanBuildFlag = flags["force-clean-build"];
+		const keepBaseRepo = flags["keep-base-repo"];
 
 		const sharedCollectArgs: string[] = [];
 		if (forceCleanBuildFlag) {
@@ -191,6 +201,18 @@ class CollectAndCompareBundlesCommand extends Command {
 				// against the same merge-base can skip the rebuild.
 				mkdirSync(baseLabelDirectory, { recursive: true });
 				writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
+
+				// Delete the inner repo now that the stats are saved. It's a
+				// shallow clone of the outer repo's `origin`, so re-creating it
+				// on the next run is cheap; keeping it around just consumes disk
+				// (hundreds of MB once dependencies are installed).
+				if (!keepBaseRepo) {
+					const innerRepoRoot = resolve(bundleAnalysisDirectory, "base-repo");
+					if (existsSync(innerRepoRoot)) {
+						console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
+						rmSync(innerRepoRoot, { recursive: true, force: true });
+					}
+				}
 			}
 
 			if (!skipCompare) {

From feb3acd8144ed37855a1591da73e9b14df9af355 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 1 May 2026 18:07:48 -0700
Subject: [PATCH 34/67] - Added timestamps for the current repo to
 differentiate runs. - Dump a patch of the current repo for reproducibility.

---
 .../scripts/collectAndCompareBundles.ts       | 21 +++++++---
 .../scripts/collectBundle.ts                  | 41 ++++++++++++++++++-
 .../scripts/compareBundles.ts                 | 29 +++++++++----
 3 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 3e112c4dfa54..7f069f66e450 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -140,11 +140,14 @@ class CollectAndCompareBundlesCommand extends Command {
 			);
 		}
 		const baseRevision = resolvedBaseRevision;
-		// compareBundles.ts reads from fixed label directories ("main" / "current"),
-		// so pin the base bundle's directory name to "main" regardless of which
-		// revision we resolved to.
+		// compareBundles.ts reads from a fixed base label ("main"); pin the base
+		// bundle's directory name to that regardless of which revision we resolved.
 		const baseLabel = "main";
-		const currentLabel = "current";
+		// The current side is timestamped (unix epoch seconds) so successive runs,
+		// which may carry different uncommitted changes, don't clobber each other.
+		// We pass the same label to collectBundle (--label) and compareBundles
+		// (--current-label) so they agree on the directory.
+		const currentLabel = `current_${Math.floor(Date.now() / 1000)}`;
 
 		const skipCompare = flags["skip-compare"];
 		const forceCleanBuildFlag = flags["force-clean-build"];
@@ -174,7 +177,13 @@ class CollectAndCompareBundlesCommand extends Command {
 			console.log(`\n${"=".repeat(80)}`);
 			console.log(`Collecting local bundle (label: ${currentLabel})...`);
 			console.log("=".repeat(80));
-			runScript("collectBundle.ts", ["--mode", "local", ...sharedCollectArgs]);
+			runScript("collectBundle.ts", [
+				"--mode",
+				"local",
+				"--label",
+				currentLabel,
+				...sharedCollectArgs,
+			]);
 
 			console.log(`\n${"=".repeat(80)}`);
 			if (baseStatsAreCached) {
@@ -219,7 +228,7 @@ class CollectAndCompareBundlesCommand extends Command {
 				console.log(`\n${"=".repeat(80)}`);
 				console.log("Running bundle comparison...");
 				console.log("=".repeat(80));
-				runScript("compareBundles.ts", []);
+				runScript("compareBundles.ts", ["--current-label", currentLabel]);
 			}
 
 			console.log(`\n${"=".repeat(80)}`);
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index 5028d47777fd..bff383a82abd 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -4,7 +4,15 @@
  */
 
 import { execSync } from "node:child_process";
-import { copyFileSync, cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from "node:fs";
+import {
+	copyFileSync,
+	cpSync,
+	existsSync,
+	mkdirSync,
+	rmSync,
+	unlinkSync,
+	writeFileSync,
+} from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -157,6 +165,34 @@ function saveStats(label: string, sourcePackageRoot: string): void {
 	}
 }
 
+/**
+ * Captures the outer repo's currently-staged diff to a sibling file next to
+ * the bundle stats, so the analysis is reproducible even with uncommitted
+ * changes. Only staged changes are recorded; unstaged changes are intentionally
+ * excluded (they're often noisy / random) but a warning is printed if any are
+ * detected so the user can `git add` the relevant pieces and re-run.
+ *
+ * The patch is written as `staged-changes.patch` next to `bundleStats.msp.gz`
+ * inside the per-label directory.
+ */
+async function captureLocalPatch(repoRoot: string, labelDirectory: string): Promise<void> {
+	const git = simpleGit(repoRoot);
+	const stagedDiff = await git.diff(["--cached"]);
+	const unstagedDiff = await git.diff();
+	if (unstagedDiff.length > 0) {
+		console.warn(
+			`Warning: unstaged changes detected in ${repoRoot}. They will NOT be ` +
+				`captured in the patch alongside this analysis. Stage all changes you ` +
+				`want recorded (e.g. "git add -u") before running collectBundle so the ` +
+				`patch faithfully describes what was bundled.`,
+		);
+	}
+	mkdirSync(labelDirectory, { recursive: true });
+	const patchPath = resolve(labelDirectory, "staged-changes.patch");
+	writeFileSync(patchPath, stagedDiff);
+	console.log(`Saved staged-changes patch to: ${patchPath}`);
+}
+
 /**
  * Returns the URL of the outer repo's `origin` remote, used as the source
  * for cloning the inner repo.
@@ -285,6 +321,9 @@ class CollectBundleCommand extends Command {
 		if (mode === "local") {
 			activeRepoRoot = outerRepoRoot;
 			activePackageRoot = outerPackageRoot;
+			// Capture the staged diff up front, before any build steps. This way the
+			// patch is preserved even if the build subsequently fails.
+			await captureLocalPatch(outerRepoRoot, resolve(bundleAnalysisDirectory, label));
 		} else {
 			await ensureInnerRepoAtRevision(revision as string);
 			activeRepoRoot = innerRepoRoot;
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 54744234e3ac..f813beca9c87 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -18,12 +18,12 @@ import { maybePrintHelp } from "./oclifHelp.js";
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
 
-// The current side is always written by collectBundle.ts in local mode, which
-// uses the fixed label "current". The base side is whatever label
-// collectBundle.ts wrote in revision mode (default "main", overridable via
-// --base-label).
+// The current side is always written by collectBundle.ts in local mode. The
+// default label is "current", but the orchestrator (collectAndCompareBundles.ts)
+// passes a timestamped label like "current_<epoch>" via --current-label so that
+// successive runs with different uncommitted changes don't overwrite each other.
 const defaultBaseLabel = "main";
-const currentLabel = "current";
+const defaultCurrentLabel = "current";
 
 /**
  * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
@@ -214,6 +214,8 @@ interface Options {
 	analysisDirectory: string;
 	/** Label subdirectory holding the base-side bundle stats (default: "main"). */
 	baseLabel: string;
+	/** Label subdirectory holding the current-side bundle stats (default: "current"). */
+	currentLabel: string;
 }
 
 /**
@@ -228,6 +230,7 @@ interface Options {
 function writeOutputFiles(
 	outputDirectory: string,
 	baseLabel: string,
+	currentLabel: string,
 	textContent: string,
 	jsonObject: object,
 ): void {
@@ -281,7 +284,8 @@ interface EntrypointRow {
  */
 class CompareBundlesCommand extends Command {
 	public static override readonly description =
-		`Compare the two bundles previously collected by collectBundle.ts (base = --base-label, current = ${currentLabel}).`;
+		"Compare the two bundles previously collected by collectBundle.ts " +
+		"(base = --base-label, current = --current-label).";
 
 	public static override readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
@@ -303,6 +307,14 @@ class CompareBundlesCommand extends Command {
 				"in revision mode.",
 			default: defaultBaseLabel,
 		}),
+		"current-label": Flags.string({
+			description:
+				"Label subdirectory under --analysis-dir holding the current-side " +
+				"bundle stats. Must match the --label passed to collectBundle.ts " +
+				"in local mode (the orchestrator passes a timestamped label like " +
+				"'current_<epoch>').",
+			default: defaultCurrentLabel,
+		}),
 	};
 
 	public async run(): Promise<void> {
@@ -310,6 +322,7 @@ class CompareBundlesCommand extends Command {
 		const options: Options = {
 			analysisDirectory: resolve(flags["analysis-dir"]),
 			baseLabel: flags["base-label"],
+			currentLabel: flags["current-label"],
 		};
 
 		runCompare(options);
@@ -324,7 +337,7 @@ class CompareBundlesCommand extends Command {
 function runCompare(options: Options): void {
 	const reporter = new Reporter();
 
-	const { baseLabel } = options;
+	const { baseLabel, currentLabel } = options;
 	const outputDirectory = options.analysisDirectory;
 	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
 	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
@@ -431,7 +444,7 @@ function runCompare(options: Options): void {
 		});
 	}
 
-	writeOutputFiles(outputDirectory, baseLabel, reporter.toText(), {
+	writeOutputFiles(outputDirectory, baseLabel, currentLabel, reporter.toText(), {
 		comparedAt: new Date().toISOString(),
 		baseLabel,
 		currentLabel,

From adf2435328c320d3ba471cfa2a60c13eb31f8197 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 6 May 2026 16:42:11 -0700
Subject: [PATCH 35/67] refactor(bundle-size-tests): split compareBundles into
 compute/render/write

Separate the data and presentation concerns of compareBundles.ts:

- computeComparison(options) returns a strongly-typed ComparisonReport
  (assets, gzipChangedAssets, entrypoints) with no rendering or output.
- renderAsText(report) produces the human-readable text report and
  echoes it to the console.
- writeOutputFiles(dir, report, text) writes the .txt and .json files,
  deriving the base name from the report's labels.
- runCompare() composes the three.

Also tightens up the file:

- Drop the Reporter class in favor of a local emit() closure.
- Drop formatAssetRow / formatEntrypointRow (single-caller); keep one
  shared formatDiff helper.
- Make GzipRow fields required and drop the matching `?? 0` fallbacks.
- Remove redundant per-field JSDoc on internal interfaces; keep doc on
  ComparisonReport (the JSON schema) and the top-level functions.

Output (text + JSON) is unchanged.
---
 .../scripts/compareBundles.ts                 | 523 ++++++++----------
 1 file changed, 219 insertions(+), 304 deletions(-)

diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index f813beca9c87..48948532e0e4 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -25,40 +25,69 @@ const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis"
 const defaultBaseLabel = "main";
 const defaultCurrentLabel = "current";
 
-/**
- * Sanitizes a string for use as a filename by replacing non-alphanumeric characters with underscores.
- *
- * @param value - The string to sanitize
- * @returns The sanitized string safe for use as a filename
- */
-function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all
-	return value.replace(/[^\w.-]/g, "_");
-}
-
-/** Represents a single asset in a bundle. */
 interface AssetStat {
-	/** The name of the asset (e.g., "bundle.js") */
 	name: string;
-	/** The parsed size of the asset in bytes */
 	size?: number;
 }
 
-/** Represents aggregated statistics for a bundle build. */
 interface BundleStats {
-	/** Array of assets and their sizes */
 	assets?: AssetStat[];
-	/** Entrypoint names mapped to their constituent assets and sizes */
 	entrypoints?: Record<string, { assets?: { size?: number }[] }>;
 }
 
+interface Options {
+	analysisDirectory: string;
+	baseLabel: string;
+	currentLabel: string;
+}
+
+interface AssetComparison {
+	name: string;
+	baseStatSize: number;
+	currentStatSize: number;
+	diff: number;
+}
+
+interface GzipRow {
+	name: string;
+	baseGzipSize: number;
+	currentGzipSize: number;
+	diff: number;
+}
+
+interface EntrypointRow {
+	entrypointName: string;
+	baseSize: number;
+	currentSize: number;
+	diff: number;
+}
+
+/** Structured comparison report written to the JSON output file. */
+interface ComparisonReport {
+	/** ISO timestamp of when the comparison was generated */
+	comparedAt: string;
+	/** Label subdirectory holding the base-side bundle stats */
+	baseLabel: string;
+	/** Label subdirectory holding the current-side bundle stats */
+	currentLabel: string;
+	/** Parent directory containing the per-label bundle stats */
+	analysisDirectory: string;
+	/** Per-asset parsed-size comparison rows */
+	assets: AssetComparison[];
+	/** Gzip size comparison rows for assets whose parsed size changed */
+	gzipChangedAssets: GzipRow[];
+	/** Per-entrypoint total parsed-size comparison rows */
+	entrypoints: EntrypointRow[];
+}
+
+function sanitizeForFileName(value: string): string {
+	// eslint-disable-next-line unicorn/prefer-string-replace-all
+	return value.replace(/[^\w.-]/g, "_");
+}
+
 /**
  * Loads and deserializes bundle statistics from a MessagePack-compressed file.
  * If the file does not exist, returns an empty stats object and logs a warning.
- *
- * @param analysisDirectory - The base analysis directory
- * @param label - The label subdirectory (typically derived from branch name)
- * @returns Parsed bundle statistics, or empty stats if file not found
  */
 function loadStats(analysisDirectory: string, label: string): BundleStats {
 	const statsFilePath = resolve(analysisDirectory, label, "bundleStats.msp.gz");
@@ -75,7 +104,7 @@ function loadStats(analysisDirectory: string, label: string): BundleStats {
 	// Project to just the fields we need so the huge `chunks`/`modules` trees
 	// produced by msgpack-lite can be GC'd. Two full webpack stats objects in
 	// memory at once is enough to OOM Node's default 4 GB heap.
-	const slim: BundleStats = {
+	return {
 		assets: fullStats.assets?.map((a) => ({ name: a.name, size: a.size })),
 		entrypoints: fullStats.entrypoints
 			? Object.fromEntries(
@@ -86,15 +115,8 @@ function loadStats(analysisDirectory: string, label: string): BundleStats {
 				)
 			: {},
 	};
-	return slim;
 }
 
-/**
- * Calculates the gzip-compressed size of a file using maximum compression level.
- *
- * @param filePath - The path to the file
- * @returns The gzip-compressed size in bytes, or undefined if the file cannot be read
- */
 function gzipSize(filePath: string): number | undefined {
 	try {
 		return gzipSync(readFileSync(filePath), { level: 9 }).length;
@@ -104,184 +126,210 @@ function gzipSize(filePath: string): number | undefined {
 }
 
 /**
- * Provides dual console and text file output for bundle comparison reports.
+ * Computes a structured comparison between the base and current bundle stats.
+ * Pure data: does no rendering or file I/O beyond reading the stats and
+ * gzip-sizing changed assets from the corresponding `build/` directories.
  */
-class Reporter {
-	private readonly outputLines: string[] = [];
-
-	/**
-	 * Prints a line to both console and internal buffer.
-	 *
-	 * @param line - The line to print (defaults to empty string)
-	 */
-	print(line = ""): void {
-		console.log(line);
-		this.outputLines.push(line);
-	}
+function computeComparison(options: Options): ComparisonReport {
+	const { baseLabel, currentLabel, analysisDirectory } = options;
+	const baseBuildDirectory = resolve(analysisDirectory, baseLabel, "build");
+	const currentBuildDirectory = resolve(analysisDirectory, currentLabel, "build");
 
-	/**
-	 * Prints a section header with spacing.
-	 *
-	 * @param title - The section title
-	 */
-	section(title: string): void {
-		this.print();
-		this.print(title);
-	}
+	const baseStats = loadStats(analysisDirectory, baseLabel);
+	const currentStats = loadStats(analysisDirectory, currentLabel);
 
-	/**
-	 * Prints a table header with a divider line.
-	 *
-	 * @param header - The header text
-	 * @param dividerLength - The length of the divider line
-	 */
-	tableHeader(header: string, dividerLength: number): void {
-		this.print(header);
-		this.print("-".repeat(dividerLength));
-	}
+	const baseAssets = Object.fromEntries(
+		(baseStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
+	const currentAssets = Object.fromEntries(
+		(currentStats.assets ?? [])
+			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
+			.map((asset) => [asset.name, asset]),
+	);
 
-	/**
-	 * Returns all accumulated output as a single text string.
-	 *
-	 * @returns The full text output
-	 */
-	toText(): string {
-		return `${this.outputLines.join("\n")}\n`;
-	}
+	const assets: AssetComparison[] = [
+		...new Set([...Object.keys(baseAssets), ...Object.keys(currentAssets)]),
+	]
+		.sort()
+		.map((name) => {
+			const baseStatSize = baseAssets[name]?.size ?? 0;
+			const currentStatSize = currentAssets[name]?.size ?? 0;
+			return {
+				name,
+				baseStatSize,
+				currentStatSize,
+				diff: currentStatSize - baseStatSize,
+			};
+		});
+
+	const gzipChangedAssets: GzipRow[] = assets
+		.filter((row) => row.diff !== 0)
+		.map((row) => {
+			// Missing assets are treated as size 0: an asset present in only one revision
+			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
+			// represents a genuine delta, not missing data.
+			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name)) ?? 0;
+			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name)) ?? 0;
+			return {
+				name: row.name,
+				baseGzipSize,
+				currentGzipSize,
+				diff: currentGzipSize - baseGzipSize,
+			};
+		});
+
+	const baseEntrypoints = baseStats.entrypoints ?? {};
+	const currentEntrypoints = currentStats.entrypoints ?? {};
+	const entrypoints: EntrypointRow[] = [
+		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
+	]
+		.filter((entrypointName) => !/^\d/.test(entrypointName))
+		.sort()
+		.map((entrypointName) => {
+			const baseSize = (baseEntrypoints[entrypointName]?.assets ?? []).reduce(
+				(sum, asset) => sum + (asset?.size ?? 0),
+				0,
+			);
+			const currentSize = (currentEntrypoints[entrypointName]?.assets ?? []).reduce(
+				(sum, asset) => sum + (asset?.size ?? 0),
+				0,
+			);
+			return {
+				entrypointName,
+				baseSize,
+				currentSize,
+				diff: currentSize - baseSize,
+			};
+		});
+
+	return {
+		comparedAt: new Date().toISOString(),
+		baseLabel,
+		currentLabel,
+		analysisDirectory,
+		assets,
+		gzipChangedAssets,
+		entrypoints,
+	};
 }
 
-/** Represents a comparison row for a single asset between two builds. */
-interface CompareRow {
-	/** The asset name */
-	name: string;
-	/** The parsed size in the base build */
-	baseStatSize: number;
-	/** The parsed size in the current build */
-	currentStatSize: number;
+/** Formats a signed diff as "-", "+N", or "-N". */
+function formatDiff(diff: number): string {
+	if (diff === 0) return "-";
+	return diff > 0 ? `+${diff}` : `${diff}`;
 }
 
 /**
- * Formats an asset comparison row for tabular display.
- * Includes name, base size, current size, diff, and percentage change.
- *
- * @param row - The comparison row to format
- * @returns A formatted string suitable for console output
+ * Renders a {@link ComparisonReport} as a human-readable text report.
+ * Also echoes each line to the console.
  */
-function formatAssetRow(row: CompareRow): string {
-	const diff = row.currentStatSize - row.baseStatSize;
-	const percentChange =
-		row.baseStatSize > 0 && diff !== 0
-			? `${((diff / row.baseStatSize) * 100).toFixed(1)}%`
-			: "";
-	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
-
-	return (
-		(row.name + (diff === 0 ? "" : " *")).padEnd(40) +
-		String(row.baseStatSize).padStart(12) +
-		String(row.currentStatSize).padStart(12) +
-		diffStr.padStart(12) +
-		percentChange.padStart(10)
+function renderAsText(report: ComparisonReport): string {
+	const lines: string[] = [];
+	const emit = (line = ""): void => {
+		console.log(line);
+		lines.push(line);
+	};
+
+	emit();
+	emit(`=== Bundle Size Comparison: ${report.baseLabel} -> ${report.currentLabel} ===`);
+	emit();
+	emit("All assets (stat/parsed size in bytes):");
+	emit(
+		"Asset".padEnd(40) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12) +
+			"% Change".padStart(10),
 	);
-}
+	emit("-".repeat(88));
+	for (const row of report.assets) {
+		const percentChange =
+			row.baseStatSize > 0 && row.diff !== 0
+				? `${((row.diff / row.baseStatSize) * 100).toFixed(1)}%`
+				: "";
+		emit(
+			(row.name + (row.diff === 0 ? "" : " *")).padEnd(40) +
+				String(row.baseStatSize).padStart(12) +
+				String(row.currentStatSize).padStart(12) +
+				formatDiff(row.diff).padStart(12) +
+				percentChange.padStart(10),
+		);
+	}
 
-/**
- * Formats an entrypoint comparison row for tabular display.
- * Includes entrypoint name, base size, current size, and diff.
- *
- * @param entrypointName - The name of the entrypoint
- * @param baseSize - The total parsed size of assets in the base entrypoint
- * @param currentSize - The total parsed size of assets in the current entrypoint
- * @returns A formatted string suitable for console output
- */
-function formatEntrypointRow(
-	entrypointName: string,
-	baseSize: number,
-	currentSize: number,
-): string {
-	const diff = currentSize - baseSize;
-	const diffStr = diff === 0 ? "-" : `${diff > 0 ? "+" : ""}${diff}`;
-	return (
-		entrypointName.padEnd(30) +
-		String(baseSize).padStart(12) +
-		String(currentSize).padStart(12) +
-		diffStr.padStart(12)
+	if (report.gzipChangedAssets.length > 0) {
+		emit();
+		emit("=== Gzip sizes for changed assets ===");
+		emit(
+			"Asset".padEnd(40) +
+				"Base Gzip".padStart(14) +
+				"Current Gzip".padStart(14) +
+				"Diff".padStart(12),
+		);
+		emit("-".repeat(82));
+		for (const row of report.gzipChangedAssets) {
+			emit(
+				row.name.padEnd(40) +
+					String(row.baseGzipSize).padStart(14) +
+					String(row.currentGzipSize).padStart(14) +
+					formatDiff(row.diff).padStart(12),
+			);
+		}
+	}
+
+	emit();
+	emit("=== Named entrypoint total asset sizes ===");
+	emit(
+		"Entrypoint".padEnd(30) +
+			"Base".padStart(12) +
+			"Current".padStart(12) +
+			"Diff".padStart(12),
 	);
-}
+	emit("-".repeat(68));
+	for (const row of report.entrypoints) {
+		emit(
+			row.entrypointName.padEnd(30) +
+				String(row.baseSize).padStart(12) +
+				String(row.currentSize).padStart(12) +
+				formatDiff(row.diff).padStart(12),
+		);
+	}
 
-/** Parsed command-line options for the bundle comparison script. */
-interface Options {
-	/** Directory containing per-label bundleStats.msp.gz files at \{label\}/bundleStats.msp.gz (default: this package's bundleAnalysis/) */
-	analysisDirectory: string;
-	/** Label subdirectory holding the base-side bundle stats (default: "main"). */
-	baseLabel: string;
-	/** Label subdirectory holding the current-side bundle stats (default: "current"). */
-	currentLabel: string;
+	return `${lines.join("\n")}\n`;
 }
 
 /**
- * Writes comparison results to both text and JSON output files.
- * Creates the output directory if it does not exist.
- * File names are derived from sanitized branch names (e.g., "compare-main-to-client_v2.100.0.txt").
- *
- * @param outputDirectory - The directory where output files will be written
- * @param textContent - The formatted text comparison report
- * @param jsonObject - The structured comparison data as a JSON-serializable object
+ * Writes the text and JSON report files. File names are derived from sanitized
+ * branch names (e.g. "compare-main-to-client_v2.100.0.txt" and ".json").
  */
 function writeOutputFiles(
 	outputDirectory: string,
-	baseLabel: string,
-	currentLabel: string,
+	report: ComparisonReport,
 	textContent: string,
-	jsonObject: object,
 ): void {
 	mkdirSync(outputDirectory, { recursive: true });
 
-	const baseSuffix = sanitizeForFileName(baseLabel);
-	const currentSuffix = sanitizeForFileName(currentLabel);
+	const baseSuffix = sanitizeForFileName(report.baseLabel);
+	const currentSuffix = sanitizeForFileName(report.currentLabel);
 	const outputBaseName = `compare-${baseSuffix}-to-${currentSuffix}`;
 	const textOutputPath = resolve(outputDirectory, `${outputBaseName}.txt`);
 	const jsonOutputPath = resolve(outputDirectory, `${outputBaseName}.json`);
 
 	writeFileSync(textOutputPath, textContent);
-	writeFileSync(jsonOutputPath, `${JSON.stringify(jsonObject, undefined, 2)}\n`);
+	writeFileSync(jsonOutputPath, `${JSON.stringify(report, undefined, 2)}\n`);
 
 	console.log("\nWrote comparison outputs:");
 	console.log(`  ${textOutputPath}`);
 	console.log(`  ${jsonOutputPath}`);
 }
 
-/**
- * Prints the help text describing usage, options, and examples for the script.
- */
-
-/** Represents gzip size comparison data for a single asset. */
-interface GzipRow {
-	/** The asset name */
-	name: string;
-	/** Gzip-compressed size of the asset in the base build (if available) */
-	baseGzipSize?: number;
-	/** Gzip-compressed size of the asset in the current build (if available) */
-	currentGzipSize?: number;
-	/** Difference in gzip size (current - base) */
-	diff?: number;
-}
-
-/** Represents entrypoint comparison data from parsed bundle statistics. */
-interface EntrypointRow {
-	/** The entrypoint name */
-	entrypointName: string;
-	/** Total parsed size of assets in the base entrypoint */
-	baseSize: number;
-	/** Total parsed size of assets in the current entrypoint */
-	currentSize: number;
-	/** Difference in total size (current - base) */
-	diff: number;
+function runCompare(options: Options): void {
+	const report = computeComparison(options);
+	const textContent = renderAsText(report);
+	writeOutputFiles(options.analysisDirectory, report, textContent);
 }
 
-/**
- * Loads statistics from base and current builds, compares assets and entrypoints,
- * and generates both console and file-based reports (text and JSON).
- */
 class CompareBundlesCommand extends Command {
 	public static override readonly description =
 		"Compare the two bundles previously collected by collectBundle.ts " +
@@ -319,145 +367,12 @@ class CompareBundlesCommand extends Command {
 
 	public async run(): Promise<void> {
 		const { flags } = await this.parse(CompareBundlesCommand);
-		const options: Options = {
+		runCompare({
 			analysisDirectory: resolve(flags["analysis-dir"]),
 			baseLabel: flags["base-label"],
 			currentLabel: flags["current-label"],
-		};
-
-		runCompare(options);
-	}
-}
-
-/**
- * Runs the bundle comparison and writes the report files.
- *
- * @param options - Parsed options for the comparison
- */
-function runCompare(options: Options): void {
-	const reporter = new Reporter();
-
-	const { baseLabel, currentLabel } = options;
-	const outputDirectory = options.analysisDirectory;
-	const baseBuildDirectory = resolve(outputDirectory, baseLabel, "build");
-	const currentBuildDirectory = resolve(outputDirectory, currentLabel, "build");
-
-	const baseStats = loadStats(outputDirectory, baseLabel);
-	const currentStats = loadStats(outputDirectory, currentLabel);
-
-	const baseAssets = Object.fromEntries(
-		(baseStats.assets ?? [])
-			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
-			.map((asset) => [asset.name, asset]),
-	);
-	const currentAssets = Object.fromEntries(
-		(currentStats.assets ?? [])
-			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
-			.map((asset) => [asset.name, asset]),
-	);
-
-	const rows: CompareRow[] = [
-		...new Set([...Object.keys(baseAssets), ...Object.keys(currentAssets)]),
-	]
-		.sort()
-		.map((name) => ({
-			name,
-			baseStatSize: baseAssets[name]?.size ?? 0,
-			currentStatSize: currentAssets[name]?.size ?? 0,
-		}));
-
-	reporter.section(`=== Bundle Size Comparison: ${baseLabel} -> ${currentLabel} ===`);
-	reporter.section("All assets (stat/parsed size in bytes):");
-	reporter.tableHeader(
-		"Asset".padEnd(40) +
-			"Base".padStart(12) +
-			"Current".padStart(12) +
-			"Diff".padStart(12) +
-			"% Change".padStart(10),
-		88,
-	);
-	for (const row of rows) {
-		reporter.print(formatAssetRow(row));
-	}
-
-	const changedRows = rows.filter((row) => row.currentStatSize !== row.baseStatSize);
-	const gzipRows: GzipRow[] = [];
-	if (changedRows.length > 0) {
-		reporter.section("=== Gzip sizes for changed assets ===");
-		reporter.tableHeader(
-			"Asset".padEnd(40) +
-				"Base Gzip".padStart(14) +
-				"Current Gzip".padStart(14) +
-				"Diff".padStart(12),
-			82,
-		);
-
-		for (const row of changedRows) {
-			// Missing assets are treated as size 0: an asset present in only one revision
-			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
-			// represents a genuine delta, not missing data.
-			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name)) ?? 0;
-			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name)) ?? 0;
-			const diff = currentGzipSize - baseGzipSize;
-			const line =
-				row.name.padEnd(40) +
-				String(baseGzipSize).padStart(14) +
-				String(currentGzipSize).padStart(14) +
-				`${diff > 0 ? "+" : ""}${diff}`.padStart(12);
-			reporter.print(line);
-			gzipRows.push({ name: row.name, baseGzipSize, currentGzipSize, diff });
-		}
-	}
-
-	const baseEntrypoints = baseStats.entrypoints ?? {};
-	const currentEntrypoints = currentStats.entrypoints ?? {};
-	const entrypointRows: EntrypointRow[] = [];
-	const namedEntrypoints = [
-		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
-	]
-		.filter((entrypointName) => !/^\d/.test(entrypointName))
-		.sort();
-
-	reporter.section("=== Named entrypoint total asset sizes ===");
-	reporter.tableHeader(
-		"Entrypoint".padEnd(30) +
-			"Base".padStart(12) +
-			"Current".padStart(12) +
-			"Diff".padStart(12),
-		68,
-	);
-	for (const entrypointName of namedEntrypoints) {
-		const baseSize = (baseEntrypoints[entrypointName]?.assets ?? []).reduce(
-			(sum, asset) => sum + (asset?.size ?? 0),
-			0,
-		);
-		const currentSize = (currentEntrypoints[entrypointName]?.assets ?? []).reduce(
-			(sum, asset) => sum + (asset?.size ?? 0),
-			0,
-		);
-		reporter.print(formatEntrypointRow(entrypointName, baseSize, currentSize));
-		entrypointRows.push({
-			entrypointName,
-			baseSize,
-			currentSize,
-			diff: currentSize - baseSize,
 		});
 	}
-
-	writeOutputFiles(outputDirectory, baseLabel, currentLabel, reporter.toText(), {
-		comparedAt: new Date().toISOString(),
-		baseLabel,
-		currentLabel,
-		analysisDirectory: options.analysisDirectory,
-		assets: rows.map((row) => ({
-			name: row.name,
-			baseStatSize: row.baseStatSize,
-			currentStatSize: row.currentStatSize,
-			diff: row.currentStatSize - row.baseStatSize,
-		})),
-		gzipChangedAssets: gzipRows,
-		entrypoints: entrypointRows,
-	});
 }
 
 if (!maybePrintHelp(process.argv.slice(2), "compareBundles.ts", CompareBundlesCommand)) {

From c1817bbd00818c5cca1cdd8acbd5ac04e9e62b22 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 1 Jun 2026 13:28:19 -0700
Subject: [PATCH 36/67] refactor(bundle-size-tests): read analyzer.json instead
 of decompressing webpack stats

Switch the bundle comparison scripts to consume webpack-bundle-analyzer's
`analyzer.json` (already emitted in json mode) rather than decompressing
`bundleStats.msp.gz` via `@fluidframework/bundle-size-tools`. That package is
not part of this repo, so the import broke `build:compile`; the analyzer report
already carries per-asset statSize/parsedSize/gzipSize plus
isInitialByEntrypoint, which is everything the diff needs.

- compareBundles.ts: read each side's analyzer.json directly; drop the
  bundle-size-tools import, the gzip helpers, and the in-memory stats
  decompression.
- collectBundle.ts: save only <label>/analyzer.json per label (no build/ copy,
  no .msp.gz); remove now-unused imports.
- collectAndCompareBundles.ts: remove the --max-old-space-size=8192 heap
  override (no longer needed without decompression) and key the base-bundle
  cache off analyzer.json + revision.txt.
- package.json: consolidate to a single `compare:bundles` script and add
  compareBundlesOutput to clean.
- scripts/README.md: document the workflow, jiti invocation, and outputs;
  remove the obsolete heap-size guidance.
- .gitignore: ignore compareBundlesOutput.

Verified end to end: `npm run compare:bundles` builds the local and merge-base
bundles, compares via analyzer.json, and writes .txt/.json reports with no OOM
and no external dependency.
---
 .gitignore                                    |   1 +
 examples/utils/bundle-size-tests/package.json |   6 +-
 .../utils/bundle-size-tests/scripts/README.md | 101 +++++++++++++
 .../scripts/collectAndCompareBundles.ts       |  39 ++---
 .../scripts/collectBundle.ts                  |  48 ++-----
 .../scripts/compareBundles.ts                 | 134 +++++++++---------
 6 files changed, 210 insertions(+), 119 deletions(-)
 create mode 100644 examples/utils/bundle-size-tests/scripts/README.md

diff --git a/.gitignore b/.gitignore
index bcf8b0388096..1a52e95b4baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ legacy.d.ts
 # Bundle analysis artifacts
 bundleAnalysis
 bundleAnalyzerJson
+compareBundlesOutput
 
 # Misc pipeline artifacts
 artifacts
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 49d47aadbcbe..9b3128e5ff3d 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,10 +21,8 @@
 		"build:test:esm": "tsc --project ./src/test/tsconfig.json",
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
-		"clean": "rimraf --glob build dist lib bundleAnalysis bundleAnalyzerJson \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"collect:bundle": "jiti ./scripts/collectBundle.ts",
-		"collect:compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
-		"compare:bundles": "node --max-old-space-size=8192 --import jiti/register ./scripts/compareBundles.ts",
+		"clean": "rimraf --glob build dist lib bundleAnalysis bundleAnalyzerJson compareBundlesOutput \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
+		"compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
 		"eslint": "eslint --quiet --format stylish src scripts",
 		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
diff --git a/examples/utils/bundle-size-tests/scripts/README.md b/examples/utils/bundle-size-tests/scripts/README.md
new file mode 100644
index 000000000000..d20fa3f2609c
--- /dev/null
+++ b/examples/utils/bundle-size-tests/scripts/README.md
@@ -0,0 +1,101 @@
+# Bundle comparison scripts
+
+These scripts measure how a change affects the webpack bundle produced by
+`@fluid-example/bundle-size-tests`. They build the bundle on two different
+revisions and diff the per-asset and per-entrypoint sizes so regressions (or
+wins) are easy to spot before pushing.
+
+Scripts:
+
+| Script                        | Responsibility                                                                 |
+| ----------------------------- | ------------------------------------------------------------------------------ |
+| `collectBundle.ts`            | Build one bundle and save its stats under a label.                             |
+| `compareBundles.ts`           | Diff two already-collected bundles and write the report.                       |
+| `collectAndCompareBundles.ts` | Orchestrate both collect steps plus the compare step end-to-end.               |
+
+The orchestrator is the entry point exposed as the `compare:bundles` npm
+script; the other two are building blocks you usually only reach for when you
+want finer control or are debugging a single step.
+
+## Running the scripts
+
+Run the orchestrator through the package script:
+
+```sh
+npm run compare:bundles
+```
+
+To pass flags, forward them after `--`:
+
+```sh
+npm run compare:bundles -- --base-revision client_v2.100.0
+```
+
+Only collectAndCompareBundles is exposed as an npm script. Invoke other scripts directly with
+[jiti](https://github.com/unjs/jiti), which runs the TypeScript sources without a
+separate compile step. Each script self-describes its flags via `--help`:
+
+```sh
+jiti ./scripts/collectBundle.ts --help
+jiti ./scripts/compareBundles.ts --help
+jiti ./scripts/collectAndCompareBundles.ts --help
+```
+
+## Typical workflow
+
+In almost every case you just want the one-shot orchestrator:
+
+```sh
+npm run compare:bundles
+```
+
+This compares your working tree against the merge-base of `HEAD` and `main` —
+i.e. the point your branch forked from — so the diff reflects only your own
+changes, not unrelated commits that have since landed on `main`. Use
+`--base-revision` to compare against a different branch, tag, or commit; the
+merge-base of that revision and `HEAD` is what actually gets built.
+
+Reach for the lower-level scripts when the orchestrator's flow doesn't fit:
+
+- **`compareBundles.ts` on its own** — when both bundles are already collected
+  and you only want to re-run the diff (e.g. tweaking the report, or comparing
+  two labels the orchestrator wouldn't pair automatically). It reads each side's
+  previously saved `analyzer.json` and writes a fresh report without rebuilding
+  anything.
+- **`collectBundle.ts` on its own** — when you want to capture a single bundle
+  without immediately diffing it, or to pre-populate a label for a later
+  comparison.
+
+### How collection works
+
+`collectBundle.ts` runs in one of two modes:
+
+- **local** — builds the bundle from the outer enlistment (your working tree,
+  including staged changes). The staged diff is captured alongside the report so
+  the measurement is reproducible.
+- **revision** — builds the bundle from a *separate* inner clone of the repo
+  checked out at a specific commit. The inner clone is created on first use as a
+  shallow clone of your `origin` remote and the requested commit is fetched
+  shallowly, keeping it small. The outer repo's working tree, branch, and stash
+  are never touched.
+
+Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
+(webpack-bundle-analyzer's JSON report). That single file carries per-asset
+parsed/gzip sizes and entrypoint membership — everything the comparison needs —
+so it is the only artifact saved per label; the larger webpack stats and `build/`
+outputs are not retained.
+
+The orchestrator runs `collectBundle.ts` once in each mode: local for the
+current side, revision for the base side. The base-side report is cached and
+keyed by the resolved SHA, so a re-run against the same merge-base skips the
+rebuild.
+
+## Outputs
+
+- Each label's `analyzer.json` is saved under `bundleAnalysis/<label>/`
+  (gitignored). This is also where the cached base report and the inner repo
+  clone live.
+- Comparison reports (`.txt` and `.json`) are written to `compareBundlesOutput/`
+  (gitignored).
+
+Both directories are removed by `npm run clean`.
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
index 2b2b3d84ea07..33c446707e1f 100644
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
@@ -18,18 +18,27 @@ const packageRoot = resolve(scriptDirectory, "..");
 const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
 
 /**
- * Resolves a committish (branch, tag, or SHA) to the merge-base with the outer
- * repo's current HEAD. Returns the full SHA, or undefined if the rev cannot be
+ * Resolves the merge-base (best common ancestor) of two committishes (branch,
+ * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
  * resolved (e.g. unknown branch, detached state with no shared history).
  *
- * Using merge-base instead of the raw branch tip means the comparison is taken
+ * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
+ * symmetric — per the git documentation, `git merge-base a b` outputs a commit
+ * reachable from both `a` and `b`, so argument order does not affect the result
+ * (order only matters for the 3+ commit and `--fork-point` forms, which we do
+ * not use here).
+ *
+ * Using merge-base instead of a raw branch tip means the comparison is taken
  * against the actual fork point, which is what users typically want — and it
  * works for worktree-based setups where `main` may not exist as a local branch
  * at the location they expect.
  */
-async function resolveMergeBase(rev: string): Promise<string | undefined> {
+async function resolveMergeBase(
+	rev: string,
+	otherRev = "HEAD",
+): Promise<string | undefined> {
 	try {
-		const output = await simpleGit(packageRoot).raw(["merge-base", "HEAD", rev]);
+		const output = await simpleGit(packageRoot).raw(["merge-base", rev, otherRev]);
 		const sha = output.trim();
 		return sha.length > 0 ? sha : undefined;
 	} catch {
@@ -50,11 +59,9 @@ async function resolveMergeBase(rev: string): Promise<string | undefined> {
  */
 function runScript(scriptName: string, scriptArgs: string[]): void {
 	const scriptPath = resolve(scriptDirectory, scriptName);
-	// Bump the V8 heap so compareBundles.ts can hold two decompressed webpack
-	// stats objects in memory without hitting the default ~4 GB OOM.
 	const result = spawnSync(
 		process.execPath,
-		["--max-old-space-size=8192", "--import", "jiti/register", scriptPath, ...scriptArgs],
+		["--import", "jiti/register", scriptPath, ...scriptArgs],
 		{
 			cwd: packageRoot,
 			stdio: "inherit",
@@ -159,17 +166,17 @@ class CollectAndCompareBundlesCommand extends Command {
 		}
 
 		// The inner repo is only ever checked out at a clean revision; its build
-		// output for a given SHA is deterministic, so cached stats from a prior
-		// run for the same SHA can be reused. We track the SHA used to produce
-		// the base stats in a sidecar revision.txt file.
+		// output for a given SHA is deterministic, so a cached base report from a
+		// prior run for the same SHA can be reused. We track the SHA used to produce
+		// the base report in a sidecar revision.txt file.
 		const baseLabelDirectory = resolve(bundleAnalysisDirectory, baseLabel);
-		const baseStatsPath = resolve(baseLabelDirectory, "bundleStats.msp.gz");
+		const baseAnalyzerPath = resolve(baseLabelDirectory, "analyzer.json");
 		const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
 		const cachedBaseRevision = existsSync(baseRevisionMarkerPath)
 			? readFileSync(baseRevisionMarkerPath, "utf8").trim()
 			: undefined;
 		const baseStatsAreCached =
-			!forceCleanBuildFlag && existsSync(baseStatsPath) && cachedBaseRevision === baseRevision;
+			!forceCleanBuildFlag && existsSync(baseAnalyzerPath) && cachedBaseRevision === baseRevision;
 
 		try {
 			console.log(`\n${"=".repeat(80)}`);
@@ -188,7 +195,7 @@ class CollectAndCompareBundlesCommand extends Command {
 				console.log(
 					`Reusing cached base bundle (revision: ${baseRevision}, label: ${baseLabel}).`,
 				);
-				console.log(`  Stats: ${baseStatsPath}`);
+				console.log(`  Report: ${baseAnalyzerPath}`);
 				console.log("=".repeat(80));
 			} else {
 				console.log(
@@ -204,12 +211,12 @@ class CollectAndCompareBundlesCommand extends Command {
 					baseLabel,
 					...sharedCollectArgs,
 				]);
-				// Record the SHA that produced these stats so a subsequent run
+				// Record the SHA that produced this report so a subsequent run
 				// against the same merge-base can skip the rebuild.
 				mkdirSync(baseLabelDirectory, { recursive: true });
 				writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
 
-				// Delete the inner repo now that the stats are saved. It's a
+				// Delete the inner repo now that the report is saved. It's a
 				// shallow clone of the outer repo's `origin`, so re-creating it
 				// on the next run is cheap; keeping it around just consumes disk
 				// (hundreds of MB once dependencies are installed).
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
index bff383a82abd..d0db1552f254 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/examples/utils/bundle-size-tests/scripts/collectBundle.ts
@@ -4,15 +4,7 @@
  */
 
 import { execSync } from "node:child_process";
-import {
-	copyFileSync,
-	cpSync,
-	existsSync,
-	mkdirSync,
-	rmSync,
-	unlinkSync,
-	writeFileSync,
-} from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -120,26 +112,28 @@ function buildBundles(packageRoot: string): void {
 }
 
 /**
- * Moves webpack's stats output and `build/` directory into the per-label directory
- * under the persistent analysis root.
+ * Saves webpack-bundle-analyzer's JSON report into the per-label directory under
+ * the persistent analysis root. This `analyzer.json` carries per-asset
+ * parsed/gzip sizes and entrypoint membership, which is everything
+ * compareBundles.ts needs — so the (large) webpack stats and `build/` outputs
+ * do not need to be retained.
  *
  * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
  * @param sourcePackageRoot - Package root that produced the webpack output.
  */
 function saveStats(label: string, sourcePackageRoot: string): void {
-	const webpackStatsOutputPath = resolve(
+	const analyzerJsonOutputPath = resolve(
 		sourcePackageRoot,
-		"bundleAnalysis",
-		"bundleStats.msp.gz",
+		"bundleAnalyzerJson",
+		"analyzer.json",
 	);
-	const webpackBuildOutputPath = resolve(sourcePackageRoot, "build");
 
 	const labelDirectory = resolve(bundleAnalysisDirectory, label);
-	const destStatsPath = resolve(labelDirectory, "bundleStats.msp.gz");
+	const destAnalyzerPath = resolve(labelDirectory, "analyzer.json");
 
-	if (!existsSync(webpackStatsOutputPath)) {
+	if (!existsSync(analyzerJsonOutputPath)) {
 		throw new Error(
-			`Bundle stats not found at ${webpackStatsOutputPath}. ` +
+			`Analyzer report not found at ${analyzerJsonOutputPath}. ` +
 				`Check that webpack ran successfully.`,
 		);
 	}
@@ -148,21 +142,9 @@ function saveStats(label: string, sourcePackageRoot: string): void {
 	// Use copy + unlink instead of renameSync because the source and destination
 	// may live on different drives (e.g. D: -> C:\Users\<user>\AppData\Local\Temp),
 	// which causes renameSync to fail with EXDEV on Windows.
-	copyFileSync(webpackStatsOutputPath, destStatsPath);
-	unlinkSync(webpackStatsOutputPath);
-	console.log(`Saved stats to: ${destStatsPath}`);
-
-	if (existsSync(webpackBuildOutputPath)) {
-		const destBuildPath = resolve(labelDirectory, "build");
-		rmSync(destBuildPath, { recursive: true, force: true });
-		cpSync(webpackBuildOutputPath, destBuildPath, { recursive: true });
-		console.log(`Saved build outputs to: ${destBuildPath}`);
-	} else {
-		console.warn(
-			`Warning: webpack build outputs not found at ${webpackBuildOutputPath}; ` +
-				`gzip sizes will be unavailable for label "${label}".`,
-		);
-	}
+	copyFileSync(analyzerJsonOutputPath, destAnalyzerPath);
+	unlinkSync(analyzerJsonOutputPath);
+	console.log(`Saved analyzer report to: ${destAnalyzerPath}`);
 }
 
 /**
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
index 48948532e0e4..f3af1aead9d9 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/examples/utils/bundle-size-tests/scripts/compareBundles.ts
@@ -6,9 +6,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { gzipSync } from "node:zlib";
 
-import { decompressStatsFile } from "@fluidframework/bundle-size-tools";
 import { Command, Flags } from "@oclif/core";
 
 import { maybePrintHelp } from "./oclifHelp.js";
@@ -18,6 +16,10 @@ import { maybePrintHelp } from "./oclifHelp.js";
 const scriptDirectory = dirname(fileURLToPath(import.meta.url));
 const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
 
+// Comparison reports are written here, separate from the (large, gitignored)
+// bundleAnalysis stats so the human-readable outputs are easy to find and keep.
+const defaultOutputDirectory = resolve(scriptDirectory, "..", "compareBundlesOutput");
+
 // The current side is always written by collectBundle.ts in local mode. The
 // default label is "current", but the orchestrator (collectAndCompareBundles.ts)
 // passes a timestamped label like "current_<epoch>" via --current-label so that
@@ -25,18 +27,24 @@ const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis"
 const defaultBaseLabel = "main";
 const defaultCurrentLabel = "current";
 
-interface AssetStat {
-	name: string;
-	size?: number;
-}
-
-interface BundleStats {
-	assets?: AssetStat[];
-	entrypoints?: Record<string, { assets?: { size?: number }[] }>;
+/**
+ * A node from webpack-bundle-analyzer's JSON report (`analyzerMode: "json"`).
+ * Only the fields this script consumes are modeled. Each top-level node is an
+ * emitted asset; `parsedSize`/`gzipSize` are the minified and gzipped sizes of
+ * the asset as it ships, and `isInitialByEntrypoint` maps each entrypoint the
+ * asset is an initial chunk of to `true`.
+ */
+interface AnalyzerNode {
+	label: string;
+	isAsset?: boolean;
+	parsedSize?: number;
+	gzipSize?: number;
+	isInitialByEntrypoint?: Record<string, boolean>;
 }
 
 interface Options {
 	analysisDirectory: string;
+	outputDirectory: string;
 	baseLabel: string;
 	currentLabel: string;
 }
@@ -86,67 +94,60 @@ function sanitizeForFileName(value: string): string {
 }
 
 /**
- * Loads and deserializes bundle statistics from a MessagePack-compressed file.
- * If the file does not exist, returns an empty stats object and logs a warning.
+ * Loads webpack-bundle-analyzer's JSON report for a label. If the file does not
+ * exist, returns an empty array and logs a warning.
  */
-function loadStats(analysisDirectory: string, label: string): BundleStats {
-	const statsFilePath = resolve(analysisDirectory, label, "bundleStats.msp.gz");
-	if (!existsSync(statsFilePath)) {
+function loadAnalyzer(analysisDirectory: string, label: string): AnalyzerNode[] {
+	const analyzerFilePath = resolve(analysisDirectory, label, "analyzer.json");
+	if (!existsSync(analyzerFilePath)) {
 		console.warn(
-			`Warning: Bundle stats not found at "${statsFilePath}". ` +
+			`Warning: Analyzer report not found at "${analyzerFilePath}". ` +
 				`Returning empty stats (all assets will be treated as size 0).`,
 		);
-		return { assets: [], entrypoints: {} };
+		return [];
 	}
+	return JSON.parse(readFileSync(analyzerFilePath, "utf8")) as AnalyzerNode[];
+}
 
-	const compressedData = readFileSync(statsFilePath);
-	const fullStats = decompressStatsFile(compressedData);
-	// Project to just the fields we need so the huge `chunks`/`modules` trees
-	// produced by msgpack-lite can be GC'd. Two full webpack stats objects in
-	// memory at once is enough to OOM Node's default 4 GB heap.
-	return {
-		assets: fullStats.assets?.map((a) => ({ name: a.name, size: a.size })),
-		entrypoints: fullStats.entrypoints
-			? Object.fromEntries(
-					Object.entries(fullStats.entrypoints).map(([name, ep]) => [
-						name,
-						{ assets: ep.assets?.map((a) => ({ size: a.size })) },
-					]),
-				)
-			: {},
-	};
+/** Whether an analyzer node is an emitted `.js` asset (excluding source maps). */
+function isJsAsset(node: AnalyzerNode): boolean {
+	return node.label.endsWith(".js") && !node.label.endsWith(".map");
 }
 
-function gzipSize(filePath: string): number | undefined {
-	try {
-		return gzipSync(readFileSync(filePath), { level: 9 }).length;
-	} catch {
-		return undefined;
+/**
+ * Sums each entrypoint's initial-chunk parsed sizes. analyzer.json tags every
+ * asset with the entrypoints it is an initial chunk of via isInitialByEntrypoint.
+ */
+function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
+	const totals: Record<string, number> = {};
+	for (const node of nodes.filter(isJsAsset)) {
+		for (const [entrypointName, isInitial] of Object.entries(
+			node.isInitialByEntrypoint ?? {},
+		)) {
+			if (isInitial !== true) continue;
+			totals[entrypointName] = (totals[entrypointName] ?? 0) + (node.parsedSize ?? 0);
+		}
 	}
+	return totals;
 }
 
 /**
- * Computes a structured comparison between the base and current bundle stats.
- * Pure data: does no rendering or file I/O beyond reading the stats and
- * gzip-sizing changed assets from the corresponding `build/` directories.
+ * Computes a structured comparison between the base and current bundles.
+ * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
+ * report) and does no other I/O. Parsed and gzip sizes come straight from that
+ * report, so no webpack stats decompression or on-disk gzipping is needed.
  */
 function computeComparison(options: Options): ComparisonReport {
 	const { baseLabel, currentLabel, analysisDirectory } = options;
-	const baseBuildDirectory = resolve(analysisDirectory, baseLabel, "build");
-	const currentBuildDirectory = resolve(analysisDirectory, currentLabel, "build");
 
-	const baseStats = loadStats(analysisDirectory, baseLabel);
-	const currentStats = loadStats(analysisDirectory, currentLabel);
+	const baseNodes = loadAnalyzer(analysisDirectory, baseLabel);
+	const currentNodes = loadAnalyzer(analysisDirectory, currentLabel);
 
 	const baseAssets = Object.fromEntries(
-		(baseStats.assets ?? [])
-			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
-			.map((asset) => [asset.name, asset]),
+		baseNodes.filter(isJsAsset).map((node) => [node.label, node]),
 	);
 	const currentAssets = Object.fromEntries(
-		(currentStats.assets ?? [])
-			.filter((asset) => asset.name.endsWith(".js") && !asset.name.endsWith(".map"))
-			.map((asset) => [asset.name, asset]),
+		currentNodes.filter(isJsAsset).map((node) => [node.label, node]),
 	);
 
 	const assets: AssetComparison[] = [
@@ -154,8 +155,8 @@ function computeComparison(options: Options): ComparisonReport {
 	]
 		.sort()
 		.map((name) => {
-			const baseStatSize = baseAssets[name]?.size ?? 0;
-			const currentStatSize = currentAssets[name]?.size ?? 0;
+			const baseStatSize = baseAssets[name]?.parsedSize ?? 0;
+			const currentStatSize = currentAssets[name]?.parsedSize ?? 0;
 			return {
 				name,
 				baseStatSize,
@@ -170,8 +171,8 @@ function computeComparison(options: Options): ComparisonReport {
 			// Missing assets are treated as size 0: an asset present in only one revision
 			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
 			// represents a genuine delta, not missing data.
-			const baseGzipSize = gzipSize(resolve(baseBuildDirectory, row.name)) ?? 0;
-			const currentGzipSize = gzipSize(resolve(currentBuildDirectory, row.name)) ?? 0;
+			const baseGzipSize = baseAssets[row.name]?.gzipSize ?? 0;
+			const currentGzipSize = currentAssets[row.name]?.gzipSize ?? 0;
 			return {
 				name: row.name,
 				baseGzipSize,
@@ -180,22 +181,17 @@ function computeComparison(options: Options): ComparisonReport {
 			};
 		});
 
-	const baseEntrypoints = baseStats.entrypoints ?? {};
-	const currentEntrypoints = currentStats.entrypoints ?? {};
+	// Sum each entrypoint's initial-chunk parsed sizes.
+	const baseEntrypoints = entrypointSizes(baseNodes);
+	const currentEntrypoints = entrypointSizes(currentNodes);
 	const entrypoints: EntrypointRow[] = [
 		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
 	]
 		.filter((entrypointName) => !/^\d/.test(entrypointName))
 		.sort()
 		.map((entrypointName) => {
-			const baseSize = (baseEntrypoints[entrypointName]?.assets ?? []).reduce(
-				(sum, asset) => sum + (asset?.size ?? 0),
-				0,
-			);
-			const currentSize = (currentEntrypoints[entrypointName]?.assets ?? []).reduce(
-				(sum, asset) => sum + (asset?.size ?? 0),
-				0,
-			);
+			const baseSize = baseEntrypoints[entrypointName] ?? 0;
+			const currentSize = currentEntrypoints[entrypointName] ?? 0;
 			return {
 				entrypointName,
 				baseSize,
@@ -327,7 +323,7 @@ function writeOutputFiles(
 function runCompare(options: Options): void {
 	const report = computeComparison(options);
 	const textContent = renderAsText(report);
-	writeOutputFiles(options.analysisDirectory, report, textContent);
+	writeOutputFiles(options.outputDirectory, report, textContent);
 }
 
 class CompareBundlesCommand extends Command {
@@ -348,6 +344,11 @@ class CompareBundlesCommand extends Command {
 				"{label}/bundleStats.msp.gz.",
 			default: defaultAnalysisDirectory,
 		}),
+		"output-dir": Flags.string({
+			description:
+				"Directory where the .txt and .json comparison reports are written.",
+			default: defaultOutputDirectory,
+		}),
 		"base-label": Flags.string({
 			description:
 				"Label subdirectory under --analysis-dir holding the base-side " +
@@ -369,6 +370,7 @@ class CompareBundlesCommand extends Command {
 		const { flags } = await this.parse(CompareBundlesCommand);
 		runCompare({
 			analysisDirectory: resolve(flags["analysis-dir"]),
+			outputDirectory: resolve(flags["output-dir"]),
 			baseLabel: flags["base-label"],
 			currentLabel: flags["current-label"],
 		});

From a3bf4a0dc5cb5ff668f79055617be1271eafc207 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Mon, 1 Jun 2026 18:10:33 -0700
Subject: [PATCH 37/67] refactor(build-cli): move bundle-size scripts into flub
 commands

Move the bundle-size-tests collect/compare/orchestrate scripts out of the
example package and into build-cli as a real `flub bundle` command topic,
backed by pure, parameterized library functions.

build-cli:
- Add `flub bundle collect`, `flub bundle compare`, and
  `flub bundle collect-and-compare` commands (src/commands/bundle/).
- Convert the bundleSize library modules to pure parameterized functions
  (collectBundle, compareBundles, collectAndCompareBundles) with no oclif
  Command classes and no example-specific paths derived from import.meta.url.
  Example-specific context (package dir, analysis/output dirs, labels,
  base revision) is now passed in as options.
- collectAndCompareBundles now calls collect/compare in-process instead of
  spawning sibling scripts via jiti.
- compareBundles routes per-asset size diffs through the shared
  compareJsonReports primitive; export it from index.ts alongside the new
  functions and their option types.
- Remove the now-unneeded oclifHelp helper.
- Register the `bundle` topic and regenerate README/manifest/docs.

examples/utils/bundle-size-tests:
- Delete scripts/ and tsconfig.scripts.json; `compare:bundles` now calls
  `flub bundle collect-and-compare`.
- Drop the @oclif/core, jiti, and simple-git devDeps and the build:scripts
  task; add @fluid-tools/build-cli (catalog:buildTools).
- Trim eslint config and update the lockfile accordingly.
---
 build-tools/packages/build-cli/README.md      |   1 +
 .../packages/build-cli/docs/build-perf.md     |   4 +-
 build-tools/packages/build-cli/docs/bundle.md | 136 +++++++++
 build-tools/packages/build-cli/package.json   |   3 +
 .../commands/bundle/collect-and-compare.ts    |  98 +++++++
 .../build-cli/src/commands/bundle/collect.ts  |  93 +++++++
 .../build-cli/src/commands/bundle/compare.ts  |  62 +++++
 .../bundleSize/collectAndCompareBundles.ts    | 195 +++++++++++++
 .../src/library/bundleSize}/collectBundle.ts  | 226 +++++++--------
 .../src/library/bundleSize}/compareBundles.ts | 167 ++++--------
 .../library/bundleSize/compareJsonReports.ts  |   2 +-
 .../build-cli/src/library/bundleSize/index.ts |  10 +-
 examples/utils/bundle-size-tests/README.md    |  97 +++++++
 .../utils/bundle-size-tests/eslint.config.mts |  13 +-
 examples/utils/bundle-size-tests/package.json |  18 +-
 .../utils/bundle-size-tests/scripts/README.md | 101 -------
 .../scripts/collectAndCompareBundles.ts       | 257 ------------------
 .../bundle-size-tests/scripts/oclifHelp.ts    |  93 -------
 .../bundle-size-tests/tsconfig.scripts.json   |  14 -
 pnpm-lock.yaml                                | 146 +++++-----
 20 files changed, 913 insertions(+), 823 deletions(-)
 create mode 100644 build-tools/packages/build-cli/docs/bundle.md
 create mode 100644 build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
 create mode 100644 build-tools/packages/build-cli/src/commands/bundle/collect.ts
 create mode 100644 build-tools/packages/build-cli/src/commands/bundle/compare.ts
 create mode 100644 build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
 rename {examples/utils/bundle-size-tests/scripts => build-tools/packages/build-cli/src/library/bundleSize}/collectBundle.ts (57%)
 rename {examples/utils/bundle-size-tests/scripts => build-tools/packages/build-cli/src/library/bundleSize}/compareBundles.ts (62%)
 delete mode 100644 examples/utils/bundle-size-tests/scripts/README.md
 delete mode 100644 examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
 delete mode 100644 examples/utils/bundle-size-tests/scripts/oclifHelp.ts
 delete mode 100644 examples/utils/bundle-size-tests/tsconfig.scripts.json

diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index ff37c120d012..fdce80cb3b66 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -36,6 +36,7 @@ USAGE
 * [`flub autocomplete`](docs/autocomplete.md) - Display autocomplete installation instructions.
 * [`flub build-perf`](docs/build-perf.md) - Build performance observability commands for collecting, processing, and analyzing build metrics.
 * [`flub bump`](docs/bump.md) - Bump the version of packages, release groups, and their dependencies.
+* [`flub bundle`](docs/bundle.md) - Bundle commands collect and compare webpack bundle sizes across revisions.
 * [`flub check`](docs/check.md) - Check commands are used to verify repo state, apply policy, etc.
 * [`flub commands`](docs/commands.md) - List all flub commands.
 * [`flub exec`](docs/exec.md) - Run a shell command in the context of a package or release group.
diff --git a/build-tools/packages/build-cli/docs/build-perf.md b/build-tools/packages/build-cli/docs/build-perf.md
index b1663f949174..54a14f48744f 100644
--- a/build-tools/packages/build-cli/docs/build-perf.md
+++ b/build-tools/packages/build-cli/docs/build-perf.md
@@ -75,7 +75,7 @@ DESCRIPTION
 EXAMPLES
   Collect public (PR) build data.
 
-    $ flub build-perf collect --mode public --project public --buildDefId 11 --outputDir ./output --adoApiToken \
+    $ flub build-perf collect --mode public --project public --buildDefId 11 --outputDir ./output --adoApiToken ^
       $ADO_TOKEN
 ```
 
@@ -108,7 +108,7 @@ DESCRIPTION
 EXAMPLES
   Deploy dashboard for public mode.
 
-    $ flub build-perf deploy --mode public --aswaHostname myapp.azurestaticapps.net --dataDir ./data \
+    $ flub build-perf deploy --mode public --aswaHostname myapp.azurestaticapps.net --dataDir ./data ^
       --deploymentToken $SWA_TOKEN
 ```
 
diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
new file mode 100644
index 000000000000..2c7d96b018e9
--- /dev/null
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -0,0 +1,136 @@
+`flub bundle`
+=============
+
+Bundle commands collect and compare webpack bundle sizes across revisions.
+
+* [`flub bundle collect`](#flub-bundle-collect)
+* [`flub bundle collect-and-compare`](#flub-bundle-collect-and-compare)
+* [`flub bundle compare`](#flub-bundle-compare)
+
+## `flub bundle collect`
+
+Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
+
+```
+USAGE
+  $ flub bundle collect [-v | --quiet] [--mode local|revision] [--revision <value>] [--label <value>] [--package-dir
+    <value>] [--analysis-dir <value>] [--force-clean-build]
+
+FLAGS
+  --analysis-dir=<value>  Directory under which per-label analyzer stats are saved. Defaults to
+                          <package-dir>/bundleAnalysis.
+  --force-clean-build     Run the full workspace clean ('npm run clean' at the repo root) before building. Off by
+                          default; opt in when stale incremental build state from a previous revision may interfere with
+                          the current one.
+  --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
+                          revision in revision mode, or "current" in local mode.
+  --mode=<option>         [default: local] local: collect from the outer enlistment. revision: collect from a separate
+                          inner enlistment checked out at --revision.
+                          <options: local|revision>
+  --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
+                          collected.
+  --revision=<value>      (revision mode only, required) Branch, tag, or commit SHA to check out in the inner repo
+                          before building. Also used as the default label.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked
+  out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
+
+EXAMPLES
+  $ flub bundle collect
+
+  $ flub bundle collect --mode revision --revision main
+
+  $ flub bundle collect --mode revision --revision client_v2.100.0
+```
+
+_See code: [src/commands/bundle/collect.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect.ts)_
+
+## `flub bundle collect-and-compare`
+
+Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree, branch, and stash are never modified.
+
+```
+USAGE
+  $ flub bundle collect-and-compare [-v | --quiet] [--base-revision <value>] [--package-dir <value>] [--analysis-dir <value>]
+    [--output-dir <value>] [--skip-compare] [--force-clean-build] [--keep-base-repo]
+
+FLAGS
+  --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to
+                           <package-dir>/bundleAnalysis.
+  --base-revision=<value>  [default: main] Revision to use as the comparison baseline (branch, tag, or commit SHA). The
+                           actual base used is the merge-base of HEAD and this revision (the fork point), so
+                           worktree-based setups where 'main' is in an unusual location still produce the expected
+                           comparison.
+  --force-clean-build      Run the full workspace clean before each build. Off by default; opt in when stale incremental
+                           build state may interfere with the current revision.
+  --keep-base-repo         For debugging only: keep the inner base-repo clone after collecting the base bundle. By
+                           default the inner repo is deleted once stats are saved, since it can be re-created cheaply
+                           via shallow clone on the next run. Pass this flag to inspect the inner repo's working tree or
+                           build output (e.g. when a build is failing inside the inner repo).
+  --output-dir=<value>     Directory where the comparison reports are written. Defaults to
+                           <package-dir>/compareBundlesOutput.
+  --package-dir=<value>    [default: .] Package root whose webpack bundles are built and compared.
+  --skip-compare           Collect both bundles, but skip the comparison step.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree,
+  branch, and stash are never modified.
+
+EXAMPLES
+  $ flub bundle collect-and-compare
+
+  $ flub bundle collect-and-compare --base-revision main
+
+  $ flub bundle collect-and-compare --base-revision client_v2.100.0
+
+  $ flub bundle collect-and-compare --force-clean-build --skip-compare
+```
+
+_See code: [src/commands/bundle/collect-and-compare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts)_
+
+## `flub bundle compare`
+
+Compare the two bundles previously collected by 'flub bundle collect' (base = --base-label, current = --current-label).
+
+```
+USAGE
+  $ flub bundle compare [-v | --quiet] [--analysis-dir <value>] [--output-dir <value>] [--base-label <value>]
+    [--current-label <value>]
+
+FLAGS
+  --analysis-dir=<value>   [default: ./bundleAnalysis] Parent directory containing analyzer.json files at
+                           {label}/analyzer.json.
+  --base-label=<value>     [default: main] Label subdirectory under --analysis-dir holding the base-side bundle stats.
+                           Must match the --label passed to 'flub bundle collect' in revision mode.
+  --current-label=<value>  [default: current] Label subdirectory under --analysis-dir holding the current-side bundle
+                           stats. Must match the --label passed to 'flub bundle collect' in local mode (the orchestrator
+                           passes a timestamped label like 'current_<epoch>').
+  --output-dir=<value>     [default: ./compareBundlesOutput] Directory where the .txt and .json comparison reports are
+                           written.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Compare the two bundles previously collected by 'flub bundle collect' (base = --base-label, current =
+  --current-label).
+
+EXAMPLES
+  $ flub bundle compare
+
+  $ flub bundle compare --base-label some-revision
+
+  $ flub bundle compare --analysis-dir /some/other/path
+```
+
+_See code: [src/commands/bundle/compare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/compare.ts)_
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index f96a6e403785..4228935c674b 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -225,6 +225,9 @@
 			"bump": {
 				"description": "Bump the version of packages, release groups, and their dependencies."
 			},
+			"bundle": {
+				"description": "Bundle commands collect and compare webpack bundle sizes across revisions."
+			},
 			"check": {
 				"description": "Check commands are used to verify repo state, apply policy, etc."
 			},
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
new file mode 100644
index 000000000000..497d8bf28f94
--- /dev/null
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { resolve } from "node:path";
+import { Flags } from "@oclif/core";
+
+import { collectAndCompareBundles } from "../../library/bundleSize/index.js";
+import { BaseCommand } from "../../library/commands/base.js";
+
+/**
+ * Orchestrates a local bundle collection, a base-revision (merge-base) bundle collection, and a
+ * comparison between them. The outer repo's working tree, branch, and stash are never modified.
+ */
+export default class BundleCollectAndCompare extends BaseCommand<
+	typeof BundleCollectAndCompare
+> {
+	public static readonly description =
+		"Collect the local bundle and the base-revision (merge-base) bundle, then compare them. " +
+		"The outer repo's working tree, branch, and stash are never modified.";
+
+	public static readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --base-revision main",
+		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
+		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
+	];
+
+	public static readonly flags = {
+		"base-revision": Flags.string({
+			description:
+				"Revision to use as the comparison baseline (branch, tag, or commit SHA). The " +
+				"actual base used is the merge-base of HEAD and this revision (the fork point), so " +
+				"worktree-based setups where 'main' is in an unusual location still produce the " +
+				"expected comparison.",
+			default: "main",
+		}),
+		"package-dir": Flags.string({
+			description: "Package root whose webpack bundles are built and compared.",
+			default: ".",
+		}),
+		"analysis-dir": Flags.string({
+			description:
+				"Directory under which per-label analyzer stats are saved. Defaults to " +
+				"<package-dir>/bundleAnalysis.",
+		}),
+		"output-dir": Flags.string({
+			description:
+				"Directory where the comparison reports are written. Defaults to " +
+				"<package-dir>/compareBundlesOutput.",
+		}),
+		"skip-compare": Flags.boolean({
+			description: "Collect both bundles, but skip the comparison step.",
+			default: false,
+		}),
+		"force-clean-build": Flags.boolean({
+			description:
+				"Run the full workspace clean before each build. Off by default; opt in when stale " +
+				"incremental build state may interfere with the current revision.",
+			default: false,
+		}),
+		"keep-base-repo": Flags.boolean({
+			description:
+				"For debugging only: keep the inner base-repo clone after collecting the base " +
+				"bundle. By default the inner repo is deleted once stats are saved, since it can be " +
+				"re-created cheaply via shallow clone on the next run. Pass this flag to inspect the " +
+				"inner repo's working tree or build output (e.g. when a build is failing inside the " +
+				"inner repo).",
+			default: false,
+		}),
+		...BaseCommand.flags,
+	} as const;
+
+	public async run(): Promise<void> {
+		const { flags } = this;
+
+		const packageDir = resolve(flags["package-dir"]);
+		const analysisDir =
+			flags["analysis-dir"] === undefined
+				? resolve(packageDir, "bundleAnalysis")
+				: resolve(flags["analysis-dir"]);
+		const outputDir =
+			flags["output-dir"] === undefined
+				? resolve(packageDir, "compareBundlesOutput")
+				: resolve(flags["output-dir"]);
+
+		await collectAndCompareBundles({
+			baseRevision: flags["base-revision"],
+			skipCompare: flags["skip-compare"],
+			forceCleanBuild: flags["force-clean-build"],
+			keepBaseRepo: flags["keep-base-repo"],
+			packageDir,
+			analysisDir,
+			outputDir,
+		});
+	}
+}
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
new file mode 100644
index 000000000000..41d386b2e00a
--- /dev/null
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { resolve } from "node:path";
+import { Flags } from "@oclif/core";
+
+import { collectBundle } from "../../library/bundleSize/index.js";
+import { BaseCommand } from "../../library/commands/base.js";
+
+/**
+ * Builds and collects a single bundle, either from the outer enlistment (local mode) or from a
+ * separate inner enlistment checked out to a specific revision (revision mode). The collected
+ * webpack-bundle-analyzer report is saved under `<analysis-dir>/<label>/analyzer.json` for later
+ * comparison by `flub bundle compare`.
+ */
+export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
+	public static readonly description =
+		"Build and collect a bundle, either from the outer enlistment (local mode) or from a " +
+		"separate inner enlistment checked out to a specific revision (revision mode). The outer " +
+		"repo's working tree, branch, and stash are never modified.";
+
+	public static readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --mode revision --revision main",
+		"<%= config.bin %> <%= command.id %> --mode revision --revision client_v2.100.0",
+	];
+
+	public static readonly flags = {
+		mode: Flags.string({
+			description:
+				"local: collect from the outer enlistment. revision: collect from a separate " +
+				"inner enlistment checked out at --revision.",
+			options: ["local", "revision"] as const,
+			default: "local",
+		}),
+		revision: Flags.string({
+			description:
+				"(revision mode only, required) Branch, tag, or commit SHA to check out in the " +
+				"inner repo before building. Also used as the default label.",
+		}),
+		label: Flags.string({
+			description:
+				"Override the directory name under which bundle stats are saved. Defaults to the " +
+				'sanitized revision in revision mode, or "current" in local mode.',
+		}),
+		"package-dir": Flags.string({
+			description:
+				"Package root whose webpack bundles are built and whose analyzer.json is collected.",
+			default: ".",
+		}),
+		"analysis-dir": Flags.string({
+			description:
+				"Directory under which per-label analyzer stats are saved. Defaults to " +
+				"<package-dir>/bundleAnalysis.",
+		}),
+		"force-clean-build": Flags.boolean({
+			description:
+				"Run the full workspace clean ('npm run clean' at the repo root) before building. " +
+				"Off by default; opt in when stale incremental build state from a previous revision " +
+				"may interfere with the current one.",
+			default: false,
+		}),
+		...BaseCommand.flags,
+	} as const;
+
+	public async run(): Promise<void> {
+		const { flags } = this;
+
+		const mode = flags.mode as "local" | "revision";
+		const { revision } = flags;
+		if (mode === "revision" && (revision === undefined || revision.length === 0)) {
+			this.error("--mode revision requires --revision <rev>.", { exit: 1 });
+		}
+
+		const packageDir = resolve(flags["package-dir"]);
+		const analysisDir =
+			flags["analysis-dir"] === undefined
+				? resolve(packageDir, "bundleAnalysis")
+				: resolve(flags["analysis-dir"]);
+		const label = flags.label ?? (mode === "revision" ? (revision as string) : "current");
+
+		await collectBundle({
+			mode,
+			revision,
+			label,
+			forceCleanBuild: flags["force-clean-build"],
+			packageDir,
+			analysisDir,
+		});
+	}
+}
diff --git a/build-tools/packages/build-cli/src/commands/bundle/compare.ts b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
new file mode 100644
index 000000000000..f1985f6a9b99
--- /dev/null
+++ b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { resolve } from "node:path";
+import { Flags } from "@oclif/core";
+
+import { compareBundles } from "../../library/bundleSize/index.js";
+import { BaseCommand } from "../../library/commands/base.js";
+
+/**
+ * Compares the two bundles previously collected by `flub bundle collect`
+ * (base = --base-label, current = --current-label) and writes human-readable `.txt` and
+ * structured `.json` comparison reports.
+ */
+export default class BundleCompare extends BaseCommand<typeof BundleCompare> {
+	public static readonly description =
+		"Compare the two bundles previously collected by 'flub bundle collect' " +
+		"(base = --base-label, current = --current-label).";
+
+	public static readonly examples = [
+		"<%= config.bin %> <%= command.id %>",
+		"<%= config.bin %> <%= command.id %> --base-label some-revision",
+		"<%= config.bin %> <%= command.id %> --analysis-dir /some/other/path",
+	];
+
+	public static readonly flags = {
+		"analysis-dir": Flags.string({
+			description: "Parent directory containing analyzer.json files at {label}/analyzer.json.",
+			default: "./bundleAnalysis",
+		}),
+		"output-dir": Flags.string({
+			description: "Directory where the .txt and .json comparison reports are written.",
+			default: "./compareBundlesOutput",
+		}),
+		"base-label": Flags.string({
+			description:
+				"Label subdirectory under --analysis-dir holding the base-side bundle stats. " +
+				"Must match the --label passed to 'flub bundle collect' in revision mode.",
+			default: "main",
+		}),
+		"current-label": Flags.string({
+			description:
+				"Label subdirectory under --analysis-dir holding the current-side bundle stats. " +
+				"Must match the --label passed to 'flub bundle collect' in local mode (the " +
+				"orchestrator passes a timestamped label like 'current_<epoch>').",
+			default: "current",
+		}),
+		...BaseCommand.flags,
+	} as const;
+
+	public async run(): Promise<void> {
+		const { flags } = this;
+		compareBundles({
+			analysisDirectory: resolve(flags["analysis-dir"]),
+			outputDirectory: resolve(flags["output-dir"]),
+			baseLabel: flags["base-label"],
+			currentLabel: flags["current-label"],
+		});
+	}
+}
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
new file mode 100644
index 000000000000..b51f59fb5572
--- /dev/null
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -0,0 +1,195 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+
+import { simpleGit } from "simple-git";
+
+import { collectBundle } from "./collectBundle.js";
+import { compareBundles } from "./compareBundles.js";
+
+/**
+ * Options for {@link collectAndCompareBundles}.
+ */
+export interface CollectAndCompareBundlesOptions {
+	/**
+	 * Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base
+	 * used is the merge-base of HEAD and this revision (the fork point).
+	 */
+	readonly baseRevision: string;
+	/** Collect both bundles, but skip the comparison step. */
+	readonly skipCompare: boolean;
+	/** Run the full workspace clean before each build. */
+	readonly forceCleanBuild: boolean;
+	/** For debugging only: keep the inner base-repo clone after collecting the base bundle. */
+	readonly keepBaseRepo: boolean;
+	/** Package root whose webpack bundles are built and compared. */
+	readonly packageDir: string;
+	/** Directory under which per-label analyzer stats are saved. */
+	readonly analysisDir: string;
+	/** Directory where the comparison reports are written. */
+	readonly outputDir: string;
+}
+
+/**
+ * Resolves the merge-base (best common ancestor) of two committishes (branch,
+ * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
+ * resolved (e.g. unknown branch, detached state with no shared history).
+ *
+ * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
+ * symmetric — per the git documentation, `git merge-base a b` outputs a commit
+ * reachable from both `a` and `b`, so argument order does not affect the result
+ * (order only matters for the 3+ commit and `--fork-point` forms, which we do
+ * not use here).
+ *
+ * Using merge-base instead of a raw branch tip means the comparison is taken
+ * against the actual fork point, which is what users typically want — and it
+ * works for worktree-based setups where `main` may not exist as a local branch
+ * at the location they expect.
+ */
+async function resolveMergeBase(
+	packageDir: string,
+	rev: string,
+	otherRev = "HEAD",
+): Promise<string | undefined> {
+	try {
+		const output = await simpleGit(packageDir).raw(["merge-base", rev, otherRev]);
+		const sha = output.trim();
+		return sha.length > 0 ? sha : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Orchestrates: {@link collectBundle} (local), then {@link collectBundle} (revision merge-base),
+ * then {@link compareBundles}.
+ *
+ * Labels (used as analysis subdirectory names) are determined automatically:
+ * the local bundle is saved under a timestamped "current_<epoch>" label and the
+ * base bundle under "main", regardless of the resolved revision SHA, so that
+ * {@link compareBundles} can find both directories.
+ *
+ * The outer repo's working tree, branch, and stash are never modified.
+ */
+export async function collectAndCompareBundles(
+	options: CollectAndCompareBundlesOptions,
+): Promise<void> {
+	const {
+		baseRevision: baseRevisionInput,
+		skipCompare,
+		forceCleanBuild,
+		keepBaseRepo,
+		packageDir,
+		analysisDir,
+		outputDir,
+	} = options;
+
+	const resolvedBaseRevision = await resolveMergeBase(packageDir, baseRevisionInput);
+	if (resolvedBaseRevision === undefined) {
+		throw new Error(
+			`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
+				`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
+		);
+	}
+	if (resolvedBaseRevision !== baseRevisionInput) {
+		console.log(
+			`Resolved base revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
+		);
+	}
+	const baseRevision = resolvedBaseRevision;
+	// compareBundles reads from a fixed base label ("main"); pin the base
+	// bundle's directory name to that regardless of which revision we resolved.
+	const baseLabel = "main";
+	// The current side is timestamped (unix epoch seconds) so successive runs,
+	// which may carry different uncommitted changes, don't clobber each other.
+	// We pass the same label to collectBundle and compareBundles so they agree
+	// on the directory.
+	const currentLabel = `current_${Math.floor(Date.now() / 1000)}`;
+
+	// The inner repo is only ever checked out at a clean revision; its build
+	// output for a given SHA is deterministic, so a cached base report from a
+	// prior run for the same SHA can be reused. We track the SHA used to produce
+	// the base report in a sidecar revision.txt file.
+	const baseLabelDirectory = resolve(analysisDir, baseLabel);
+	const baseAnalyzerPath = resolve(baseLabelDirectory, "analyzer.json");
+	const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
+	const cachedBaseRevision = existsSync(baseRevisionMarkerPath)
+		? readFileSync(baseRevisionMarkerPath, "utf8").trim()
+		: undefined;
+	const baseStatsAreCached =
+		!forceCleanBuild && existsSync(baseAnalyzerPath) && cachedBaseRevision === baseRevision;
+
+	try {
+		console.log(`\n${"=".repeat(80)}`);
+		console.log(`Collecting local bundle (label: ${currentLabel})...`);
+		console.log("=".repeat(80));
+		await collectBundle({
+			mode: "local",
+			label: currentLabel,
+			forceCleanBuild,
+			packageDir,
+			analysisDir,
+		});
+
+		console.log(`\n${"=".repeat(80)}`);
+		if (baseStatsAreCached) {
+			console.log(
+				`Reusing cached base bundle (revision: ${baseRevision}, label: ${baseLabel}).`,
+			);
+			console.log(`  Report: ${baseAnalyzerPath}`);
+			console.log("=".repeat(80));
+		} else {
+			console.log(
+				`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
+			);
+			console.log("=".repeat(80));
+			await collectBundle({
+				mode: "revision",
+				revision: baseRevision,
+				label: baseLabel,
+				forceCleanBuild,
+				packageDir,
+				analysisDir,
+			});
+			// Record the SHA that produced this report so a subsequent run
+			// against the same merge-base can skip the rebuild.
+			mkdirSync(baseLabelDirectory, { recursive: true });
+			writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
+
+			// Delete the inner repo now that the report is saved. It's a
+			// shallow clone of the outer repo's `origin`, so re-creating it
+			// on the next run is cheap; keeping it around just consumes disk
+			// (hundreds of MB once dependencies are installed).
+			if (!keepBaseRepo) {
+				const innerRepoRoot = resolve(analysisDir, "base-repo");
+				if (existsSync(innerRepoRoot)) {
+					console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
+					rmSync(innerRepoRoot, { recursive: true, force: true });
+				}
+			}
+		}
+
+		if (!skipCompare) {
+			console.log(`\n${"=".repeat(80)}`);
+			console.log("Running bundle comparison...");
+			console.log("=".repeat(80));
+			compareBundles({
+				analysisDirectory: analysisDir,
+				outputDirectory: outputDir,
+				baseLabel,
+				currentLabel,
+			});
+		}
+
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("✓ Bundle collection and comparison complete!");
+		console.log("=".repeat(80));
+	} catch (error) {
+		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
+		throw error;
+	}
+}
diff --git a/examples/utils/bundle-size-tests/scripts/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
similarity index 57%
rename from examples/utils/bundle-size-tests/scripts/collectBundle.ts
rename to build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index d0db1552f254..517ca9d02411 100644
--- a/examples/utils/bundle-size-tests/scripts/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -6,21 +6,41 @@
 import { execSync } from "node:child_process";
 import { copyFileSync, existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
 
-import { Command, Flags } from "@oclif/core";
 import { simpleGit } from "simple-git";
 
-import { maybePrintHelp } from "./oclifHelp.js";
-
-const scriptDirectory = dirname(fileURLToPath(import.meta.url));
-const outerPackageRoot = resolve(scriptDirectory, "..");
-
 /**
- * Workspace-relative path of this package, used to locate the same package
- * inside a freshly-cloned inner repo.
+ * Options for {@link collectBundle}.
  */
-const packageWorkspacePath = "examples/utils/bundle-size-tests";
+export interface CollectBundleOptions {
+	/**
+	 * `local`: collect from the outer enlistment that contains {@link CollectBundleOptions.packageDir}.
+	 * `revision`: collect from a separate inner enlistment checked out at {@link CollectBundleOptions.revision}.
+	 */
+	readonly mode: "local" | "revision";
+	/**
+	 * (revision mode only) Branch, tag, or commit SHA to check out in the inner repo before building.
+	 */
+	readonly revision?: string;
+	/**
+	 * Directory name (under {@link CollectBundleOptions.analysisDir}) to save the collected bundle
+	 * stats into. Sanitized for filesystem use before being applied.
+	 */
+	readonly label: string;
+	/**
+	 * Run the full workspace clean (`npm run clean` at the repo root) before building.
+	 */
+	readonly forceCleanBuild: boolean;
+	/**
+	 * Package root whose webpack bundles are built and whose `analyzer.json` is collected.
+	 */
+	readonly packageDir: string;
+	/**
+	 * Directory under which per-label analyzer stats are saved. The inner enlistment used for
+	 * revision mode lives at `<analysisDir>/base-repo`.
+	 */
+	readonly analysisDir: string;
+}
 
 /**
  * Gets the repository root directory for the given working directory.
@@ -30,37 +50,22 @@ async function getRepoRoot(cwd: string): Promise<string> {
 	return output.trim();
 }
 
-const outerRepoRoot = await getRepoRoot(outerPackageRoot);
-
 /**
- * Where saved bundle stats live, keyed by sanitized label.
- * `compareBundles.ts` reads from `<bundleAnalysisDirectory>/<label>/bundleStats.msp.gz`.
- *
- * Lives under this package's `bundleAnalysis/` directory, which is matched by
- * the repo-wide `.gitignore` entry for `bundleAnalysis`.
- *
- * Note: `npm run clean` in this package rimrafs `bundleAnalysis/`, so any state
- * here (including the inner repo clone) is wiped on clean. The inner repo is
- * re-cloned automatically on next use.
+ * Returns the path of the given directory relative to the root of the repo that contains it,
+ * e.g. `examples/utils/bundle-size-tests`. Used to locate the same package inside a
+ * freshly-cloned inner repo.
  */
-const bundleAnalysisDirectory = resolve(outerPackageRoot, "bundleAnalysis");
-
-/**
- * Persistent location of the inner FluidFramework enlistment used for
- * collecting bundles at arbitrary revisions. Cloned from the outer repo's
- * `origin` remote on first use and reused across runs.
- *
- * Only one inner repo is ever maintained — the unique name avoids collisions
- * with label subdirectories under {@link bundleAnalysisDirectory}.
- */
-const innerRepoRoot = resolve(bundleAnalysisDirectory, "base-repo");
+async function getPackageWorkspacePath(packageDir: string): Promise<string> {
+	const output = await simpleGit(packageDir).revparse(["--show-prefix"]);
+	// `--show-prefix` returns a trailing-slash-terminated path (or empty string at the repo root).
+	return output.trim().replace(/\/$/, "");
+}
 
 /**
  * Sanitizes a string for use as a filename.
  */
 function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all -- Keep regex replacement for older TS lib targets.
-	return value.replace(/[^\w.-]/g, "_");
+	return value.replaceAll(/[^\w.-]/g, "_");
 }
 
 /**
@@ -120,15 +125,16 @@ function buildBundles(packageRoot: string): void {
  *
  * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
  * @param sourcePackageRoot - Package root that produced the webpack output.
+ * @param analysisDir - Directory under which per-label stats are saved.
  */
-function saveStats(label: string, sourcePackageRoot: string): void {
+function saveStats(label: string, sourcePackageRoot: string, analysisDir: string): void {
 	const analyzerJsonOutputPath = resolve(
 		sourcePackageRoot,
 		"bundleAnalyzerJson",
 		"analyzer.json",
 	);
 
-	const labelDirectory = resolve(bundleAnalysisDirectory, label);
+	const labelDirectory = resolve(analysisDir, label);
 	const destAnalyzerPath = resolve(labelDirectory, "analyzer.json");
 
 	if (!existsSync(analyzerJsonOutputPath)) {
@@ -154,8 +160,7 @@ function saveStats(label: string, sourcePackageRoot: string): void {
  * excluded (they're often noisy / random) but a warning is printed if any are
  * detected so the user can `git add` the relevant pieces and re-run.
  *
- * The patch is written as `staged-changes.patch` next to `bundleStats.msp.gz`
- * inside the per-label directory.
+ * The patch is written as `staged-changes.patch` inside the per-label directory.
  */
 async function captureLocalPatch(repoRoot: string, labelDirectory: string): Promise<void> {
 	const git = simpleGit(repoRoot);
@@ -165,7 +170,7 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
 		console.warn(
 			`Warning: unstaged changes detected in ${repoRoot}. They will NOT be ` +
 				`captured in the patch alongside this analysis. Stage all changes you ` +
-				`want recorded (e.g. "git add -u") before running collectBundle so the ` +
+				`want recorded (e.g. "git add -u") before collecting so the ` +
 				`patch faithfully describes what was bundled.`,
 		);
 	}
@@ -179,7 +184,7 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
  * Returns the URL of the outer repo's `origin` remote, used as the source
  * for cloning the inner repo.
  */
-async function getOuterOriginUrl(): Promise<string> {
+async function getOuterOriginUrl(outerRepoRoot: string): Promise<string> {
 	const { value } = await simpleGit(outerRepoRoot).getConfig("remote.origin.url");
 	if (value === null || value.length === 0) {
 		throw new Error(`Could not read remote.origin.url from ${outerRepoRoot}.`);
@@ -188,7 +193,7 @@ async function getOuterOriginUrl(): Promise<string> {
 }
 
 /**
- * Ensures the inner FluidFramework enlistment exists under {@link innerRepoRoot}
+ * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot`
  * and is checked out at the requested revision.
  *
  * On first call, performs a shallow clone of the outer repo's `origin` remote
@@ -199,9 +204,13 @@ async function getOuterOriginUrl(): Promise<string> {
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
-async function ensureInnerRepoAtRevision(revision: string): Promise<void> {
+async function ensureInnerRepoAtRevision(
+	revision: string,
+	outerRepoRoot: string,
+	innerRepoRoot: string,
+): Promise<void> {
 	if (!existsSync(resolve(innerRepoRoot, ".git"))) {
-		const originUrl = await getOuterOriginUrl();
+		const originUrl = await getOuterOriginUrl(outerRepoRoot);
 		mkdirSync(dirname(innerRepoRoot), { recursive: true });
 		console.log(`\nShallow-cloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
 		// Clone shallow with no checkout: we'll fetch and check out the exact
@@ -239,101 +248,54 @@ async function ensureInnerRepoAtRevision(revision: string): Promise<void> {
  * Collects a single bundle from either the outer enlistment (local mode) or a
  * separate inner enlistment checked out to a specific revision (revision mode).
  *
- * In revision mode, the inner repo at {@link innerRepoRoot} is cloned from the
+ * In revision mode, the inner repo at `<analysisDir>/base-repo` is cloned from the
  * outer repo's `origin` remote on first use and reused thereafter. The outer
  * repo's working tree, branch, and stash are never modified.
  */
-class CollectBundleCommand extends Command {
-	public static override readonly description =
-		"Build and collect a bundle, either from the outer enlistment (local mode) or " +
-		"from a separate inner enlistment checked out to a specific revision (revision mode). " +
-		"The outer repo's working tree, branch, and stash are never modified.";
-
-	public static override readonly examples = [
-		"<%= config.bin %> <%= command.id %>",
-		"<%= config.bin %> <%= command.id %> --mode revision --revision main",
-		"<%= config.bin %> <%= command.id %> --mode revision --revision client_v2.100.0",
-	];
-
-	public static override readonly flags = {
-		mode: Flags.string({
-			description:
-				"local: collect from the outer enlistment. revision: collect from a separate " +
-				"inner enlistment checked out at --revision.",
-			options: ["local", "revision"] as const,
-			default: "local",
-		}),
-		revision: Flags.string({
-			description:
-				"(revision mode only, required) Branch, tag, or commit SHA to check out " +
-				"in the inner repo before building. Also used as the default label.",
-		}),
-		label: Flags.string({
-			description:
-				"Override the directory name under which bundle stats are saved. " +
-				'Defaults to the sanitized revision in revision mode, or "current" in local mode.',
-		}),
-		"force-clean-build": Flags.boolean({
-			description:
-				"Run the full workspace clean ('npm run clean' at the repo root) before " +
-				"building. Off by default; opt in when stale incremental build state from a " +
-				"previous revision may interfere with the current one.",
-			default: false,
-		}),
-	};
+export async function collectBundle(options: CollectBundleOptions): Promise<void> {
+	const { mode, revision, forceCleanBuild, packageDir, analysisDir } = options;
 
-	public async run(): Promise<void> {
-		const { flags } = await this.parse(CollectBundleCommand);
-
-		const mode = flags.mode as "local" | "revision";
-		const { revision } = flags;
-		const forceCleanBuild = flags["force-clean-build"];
-
-		if (mode === "revision" && (revision === undefined || revision.length === 0)) {
-			this.error("--mode revision requires --revision <rev>.", { exit: 1 });
-		}
-
-		const label = sanitizeForFileName(
-			flags.label ?? (mode === "revision" ? (revision as string) : "current"),
-		);
-
-		let activeRepoRoot: string;
-		let activePackageRoot: string;
-
-		if (mode === "local") {
-			activeRepoRoot = outerRepoRoot;
-			activePackageRoot = outerPackageRoot;
-			// Capture the staged diff up front, before any build steps. This way the
-			// patch is preserved even if the build subsequently fails.
-			await captureLocalPatch(outerRepoRoot, resolve(bundleAnalysisDirectory, label));
-		} else {
-			await ensureInnerRepoAtRevision(revision as string);
-			activeRepoRoot = innerRepoRoot;
-			activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
-			if (!existsSync(activePackageRoot)) {
-				this.error(
-					`Expected package not found in inner repo at ${activePackageRoot}. ` +
-						`The revision "${revision as string}" may predate this package.`,
-					{ exit: 1 },
-				);
-			}
-			installDependencies(activeRepoRoot);
-		}
+	if (mode === "revision" && (revision === undefined || revision.length === 0)) {
+		throw new Error("revision mode requires a revision.");
+	}
 
-		if (forceCleanBuild) {
-			cleanWorkspace(activeRepoRoot);
+	const label = sanitizeForFileName(options.label);
+
+	const outerRepoRoot = await getRepoRoot(packageDir);
+	const innerRepoRoot = resolve(analysisDir, "base-repo");
+
+	let activeRepoRoot: string;
+	let activePackageRoot: string;
+
+	if (mode === "local") {
+		activeRepoRoot = outerRepoRoot;
+		activePackageRoot = packageDir;
+		// Capture the staged diff up front, before any build steps. This way the
+		// patch is preserved even if the build subsequently fails.
+		await captureLocalPatch(outerRepoRoot, resolve(analysisDir, label));
+	} else {
+		const packageWorkspacePath = await getPackageWorkspacePath(packageDir);
+		await ensureInnerRepoAtRevision(revision as string, outerRepoRoot, innerRepoRoot);
+		activeRepoRoot = innerRepoRoot;
+		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
+		if (!existsSync(activePackageRoot)) {
+			throw new Error(
+				`Expected package not found in inner repo at ${activePackageRoot}. ` +
+					`The revision "${revision as string}" may predate this package.`,
+			);
 		}
-		buildWorkspace(activePackageRoot);
-		buildBundles(activePackageRoot);
-		saveStats(label, activePackageRoot);
-
-		console.log(`\n${"=".repeat(80)}`);
-		console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
-		console.log(`  Stats directory: ${resolve(bundleAnalysisDirectory, label)}`);
-		console.log("=".repeat(80));
+		installDependencies(activeRepoRoot);
 	}
-}
 
-if (!maybePrintHelp(process.argv.slice(2), "collectBundle.ts", CollectBundleCommand)) {
-	await CollectBundleCommand.run(process.argv.slice(2), import.meta.url);
+	if (forceCleanBuild) {
+		cleanWorkspace(activeRepoRoot);
+	}
+	buildWorkspace(activePackageRoot);
+	buildBundles(activePackageRoot);
+	saveStats(label, activePackageRoot, analysisDir);
+
+	console.log(`\n${"=".repeat(80)}`);
+	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
+	console.log(`  Stats directory: ${resolve(analysisDir, label)}`);
+	console.log("=".repeat(80));
 }
diff --git a/examples/utils/bundle-size-tests/scripts/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
similarity index 62%
rename from examples/utils/bundle-size-tests/scripts/compareBundles.ts
rename to build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index f3af1aead9d9..56b4dede3b03 100644
--- a/examples/utils/bundle-size-tests/scripts/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -4,49 +4,33 @@
  */
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import { resolve } from "node:path";
 
-import { Command, Flags } from "@oclif/core";
+import type { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 
-import { maybePrintHelp } from "./oclifHelp.js";
-
-// Default to the persistent analysis root used by collectBundle.ts.
-// Lives under this package's `bundleAnalysis/` directory (gitignored).
-const scriptDirectory = dirname(fileURLToPath(import.meta.url));
-const defaultAnalysisDirectory = resolve(scriptDirectory, "..", "bundleAnalysis");
-
-// Comparison reports are written here, separate from the (large, gitignored)
-// bundleAnalysis stats so the human-readable outputs are easy to find and keep.
-const defaultOutputDirectory = resolve(scriptDirectory, "..", "compareBundlesOutput");
-
-// The current side is always written by collectBundle.ts in local mode. The
-// default label is "current", but the orchestrator (collectAndCompareBundles.ts)
-// passes a timestamped label like "current_<epoch>" via --current-label so that
-// successive runs with different uncommitted changes don't overwrite each other.
-const defaultBaseLabel = "main";
-const defaultCurrentLabel = "current";
+import { compareJsonReports } from "./compareJsonReports.js";
 
 /**
- * A node from webpack-bundle-analyzer's JSON report (`analyzerMode: "json"`).
- * Only the fields this script consumes are modeled. Each top-level node is an
- * emitted asset; `parsedSize`/`gzipSize` are the minified and gzipped sizes of
- * the asset as it ships, and `isInitialByEntrypoint` maps each entrypoint the
- * asset is an initial chunk of to `true`.
+ * A single node from webpack-bundle-analyzer's JSON report
+ * (`analyzerMode: "json"`). Each top-level node is an emitted asset;
+ * `parsedSize`/`gzipSize` are the minified and gzipped sizes of the asset as it
+ * ships, and `isInitialByEntrypoint` maps each entrypoint the asset is an
+ * initial chunk of to `true`.
  */
-interface AnalyzerNode {
-	label: string;
-	isAsset?: boolean;
-	parsedSize?: number;
-	gzipSize?: number;
-	isInitialByEntrypoint?: Record<string, boolean>;
-}
+type AnalyzerNode = BundleAnalyzerPlugin.JsonReportItem;
 
-interface Options {
-	analysisDirectory: string;
-	outputDirectory: string;
-	baseLabel: string;
-	currentLabel: string;
+/**
+ * Options for {@link compareBundles}.
+ */
+export interface CompareBundlesOptions {
+	/** Parent directory containing analyzer.json files at `{label}/analyzer.json`. */
+	readonly analysisDirectory: string;
+	/** Directory where the `.txt` and `.json` comparison reports are written. */
+	readonly outputDirectory: string;
+	/** Label subdirectory under {@link CompareBundlesOptions.analysisDirectory} holding the base-side bundle stats. */
+	readonly baseLabel: string;
+	/** Label subdirectory under {@link CompareBundlesOptions.analysisDirectory} holding the current-side bundle stats. */
+	readonly currentLabel: string;
 }
 
 interface AssetComparison {
@@ -89,8 +73,7 @@ interface ComparisonReport {
 }
 
 function sanitizeForFileName(value: string): string {
-	// eslint-disable-next-line unicorn/prefer-string-replace-all
-	return value.replace(/[^\w.-]/g, "_");
+	return value.replaceAll(/[^\w.-]/g, "_");
 }
 
 /**
@@ -109,9 +92,14 @@ function loadAnalyzer(analysisDirectory: string, label: string): AnalyzerNode[]
 	return JSON.parse(readFileSync(analyzerFilePath, "utf8")) as AnalyzerNode[];
 }
 
+/** Whether an asset name is an emitted `.js` asset (excluding source maps). */
+function isJsAssetName(name: string): boolean {
+	return name.endsWith(".js") && !name.endsWith(".map");
+}
+
 /** Whether an analyzer node is an emitted `.js` asset (excluding source maps). */
 function isJsAsset(node: AnalyzerNode): boolean {
-	return node.label.endsWith(".js") && !node.label.endsWith(".map");
+	return isJsAssetName(node.label);
 }
 
 /**
@@ -136,27 +124,30 @@ function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
  * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
  * report) and does no other I/O. Parsed and gzip sizes come straight from that
  * report, so no webpack stats decompression or on-disk gzipping is needed.
+ *
+ * The per-asset size diff is produced by the shared {@link compareJsonReports}
+ * primitive; this function adds the JS-asset filter, gzip-changed rows, and
+ * per-entrypoint aggregation (which needs the raw `isInitialByEntrypoint` data
+ * not carried by the comparison's `BundleData`).
  */
-function computeComparison(options: Options): ComparisonReport {
+function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 	const { baseLabel, currentLabel, analysisDirectory } = options;
 
 	const baseNodes = loadAnalyzer(analysisDirectory, baseLabel);
 	const currentNodes = loadAnalyzer(analysisDirectory, currentLabel);
 
-	const baseAssets = Object.fromEntries(
-		baseNodes.filter(isJsAsset).map((node) => [node.label, node]),
-	);
-	const currentAssets = Object.fromEntries(
-		currentNodes.filter(isJsAsset).map((node) => [node.label, node]),
-	);
+	// Shared primitive: per-asset { base?, compare? } size data keyed by asset
+	// label. It filters to `isAsset` entries; we further restrict to JS assets
+	// (excluding source maps) below to match this report's scope.
+	const bundleComparison = compareJsonReports(baseNodes, currentNodes);
 
-	const assets: AssetComparison[] = [
-		...new Set([...Object.keys(baseAssets), ...Object.keys(currentAssets)]),
-	]
+	const assets: AssetComparison[] = Object.keys(bundleComparison)
+		.filter((name) => isJsAssetName(name))
 		.sort()
 		.map((name) => {
-			const baseStatSize = baseAssets[name]?.parsedSize ?? 0;
-			const currentStatSize = currentAssets[name]?.parsedSize ?? 0;
+			const { base, compare } = bundleComparison[name];
+			const baseStatSize = base?.parsedSize ?? 0;
+			const currentStatSize = compare?.parsedSize ?? 0;
 			return {
 				name,
 				baseStatSize,
@@ -171,8 +162,9 @@ function computeComparison(options: Options): ComparisonReport {
 			// Missing assets are treated as size 0: an asset present in only one revision
 			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
 			// represents a genuine delta, not missing data.
-			const baseGzipSize = baseAssets[row.name]?.gzipSize ?? 0;
-			const currentGzipSize = currentAssets[row.name]?.gzipSize ?? 0;
+			const { base, compare } = bundleComparison[row.name];
+			const baseGzipSize = base?.gzipSize ?? 0;
+			const currentGzipSize = compare?.gzipSize ?? 0;
 			return {
 				name: row.name,
 				baseGzipSize,
@@ -181,7 +173,9 @@ function computeComparison(options: Options): ComparisonReport {
 			};
 		});
 
-	// Sum each entrypoint's initial-chunk parsed sizes.
+	// Sum each entrypoint's initial-chunk parsed sizes. This reads the raw nodes
+	// directly because `isInitialByEntrypoint` is not part of the comparison's
+	// per-asset `BundleData`.
 	const baseEntrypoints = entrypointSizes(baseNodes);
 	const currentEntrypoints = entrypointSizes(currentNodes);
 	const entrypoints: EntrypointRow[] = [
@@ -320,63 +314,14 @@ function writeOutputFiles(
 	console.log(`  ${jsonOutputPath}`);
 }
 
-function runCompare(options: Options): void {
+/**
+ * Compares the two bundles previously collected into
+ * `{analysisDirectory}/{baseLabel}/analyzer.json` and
+ * `{analysisDirectory}/{currentLabel}/analyzer.json`, then writes human-readable
+ * `.txt` and structured `.json` comparison reports to `outputDirectory`.
+ */
+export function compareBundles(options: CompareBundlesOptions): void {
 	const report = computeComparison(options);
 	const textContent = renderAsText(report);
 	writeOutputFiles(options.outputDirectory, report, textContent);
 }
-
-class CompareBundlesCommand extends Command {
-	public static override readonly description =
-		"Compare the two bundles previously collected by collectBundle.ts " +
-		"(base = --base-label, current = --current-label).";
-
-	public static override readonly examples = [
-		"<%= config.bin %> <%= command.id %>",
-		"<%= config.bin %> <%= command.id %> --base-label some-revision",
-		"<%= config.bin %> <%= command.id %> --analysis-dir /some/other/path",
-	];
-
-	public static override readonly flags = {
-		"analysis-dir": Flags.string({
-			description:
-				"Parent directory containing bundleStats.msp.gz files at " +
-				"{label}/bundleStats.msp.gz.",
-			default: defaultAnalysisDirectory,
-		}),
-		"output-dir": Flags.string({
-			description:
-				"Directory where the .txt and .json comparison reports are written.",
-			default: defaultOutputDirectory,
-		}),
-		"base-label": Flags.string({
-			description:
-				"Label subdirectory under --analysis-dir holding the base-side " +
-				"bundle stats. Must match the --label passed to collectBundle.ts " +
-				"in revision mode.",
-			default: defaultBaseLabel,
-		}),
-		"current-label": Flags.string({
-			description:
-				"Label subdirectory under --analysis-dir holding the current-side " +
-				"bundle stats. Must match the --label passed to collectBundle.ts " +
-				"in local mode (the orchestrator passes a timestamped label like " +
-				"'current_<epoch>').",
-			default: defaultCurrentLabel,
-		}),
-	};
-
-	public async run(): Promise<void> {
-		const { flags } = await this.parse(CompareBundlesCommand);
-		runCompare({
-			analysisDirectory: resolve(flags["analysis-dir"]),
-			outputDirectory: resolve(flags["output-dir"]),
-			baseLabel: flags["base-label"],
-			currentLabel: flags["current-label"],
-		});
-	}
-}
-
-if (!maybePrintHelp(process.argv.slice(2), "compareBundles.ts", CompareBundlesCommand)) {
-	await CompareBundlesCommand.run(process.argv.slice(2), import.meta.url);
-}
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareJsonReports.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareJsonReports.ts
index e2fd37e387f1..96941c831f45 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareJsonReports.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareJsonReports.ts
@@ -40,7 +40,7 @@ function jsonReportToBundleSizes(
  * Bundles present only in one side encode added/removed via field presence
  * (see {@link BundlesComparison}).
  */
-function compareJsonReports(
+export function compareJsonReports(
 	base: BundleAnalyzerPlugin.JsonReport | undefined,
 	compare: BundleAnalyzerPlugin.JsonReport | undefined,
 ): BundlesComparison {
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/index.ts b/build-tools/packages/build-cli/src/library/bundleSize/index.ts
index 71118c4f50f6..41c3c5fc8fb6 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/index.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/index.ts
@@ -3,14 +3,20 @@
  * Licensed under the MIT License.
  */
 
-export { compareJsonReportsByPackage } from "./compareJsonReports.js";
+export {
+	type CollectAndCompareBundlesOptions,
+	collectAndCompareBundles,
+} from "./collectAndCompareBundles.js";
+export { type CollectBundleOptions, collectBundle } from "./collectBundle.js";
+export { type CompareBundlesOptions, compareBundles } from "./compareBundles.js";
+export { compareJsonReports, compareJsonReportsByPackage } from "./compareJsonReports.js";
 export { extractAnalyzerJsonsFromArtifact } from "./extractAnalyzerJsonsFromArtifact.js";
 export {
 	type ReadAnalyzerJsonsResult,
 	readAnalyzerJsonsFromFileSystem,
 } from "./readAnalyzerJsonsFromFileSystem.js";
 export { sourcePackageFromAnalyzerPath } from "./sourcePackageFromAnalyzerPath.js";
-export {
+export type {
 	AnalyzerJsonByPackage,
 	BundleData,
 	BundlesComparison,
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index 195341201f95..932915f7c8f0 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -2,6 +2,103 @@
 
 This package bundles some commonly used Fluid packages. The webpack output of this package is used for bundle analysis in our ongoing effort to make Fluid fast!
 
+## Comparing bundle sizes
+
+This package can measure how a change affects its webpack bundle by building the
+bundle on two different revisions and diffing the per-asset and per-entrypoint
+sizes, so regressions (or wins) are easy to spot before pushing.
+
+The workflow is implemented as the `flub bundle` command topic in
+[`@fluid-tools/build-cli`](../../../build-tools/packages/build-cli); this package
+just invokes it with the appropriate context. The relevant commands are:
+
+| Command                          | Responsibility                                                   |
+| -------------------------------- | --------------------------------------------------------------- |
+| `flub bundle collect`            | Build one bundle and save its stats under a label.              |
+| `flub bundle compare`            | Diff two already-collected bundles and write the report.        |
+| `flub bundle collect-and-compare`| Orchestrate both collect steps plus the compare step end-to-end. |
+
+### Running
+
+The orchestrator is exposed as the `compare:bundles` npm script:
+
+```sh
+npm run compare:bundles
+```
+
+To pass flags, forward them after `--`:
+
+```sh
+npm run compare:bundles -- --base-revision client_v2.100.0
+```
+
+Each command self-describes its flags via `--help`:
+
+```sh
+flub bundle collect --help
+flub bundle compare --help
+flub bundle collect-and-compare --help
+```
+
+### Typical workflow
+
+In almost every case you just want the one-shot orchestrator:
+
+```sh
+npm run compare:bundles
+```
+
+This compares your working tree against the merge-base of `HEAD` and `main` —
+i.e. the point your branch forked from — so the diff reflects only your own
+changes, not unrelated commits that have since landed on `main`. Use
+`--base-revision` to compare against a different branch, tag, or commit; the
+merge-base of that revision and `HEAD` is what actually gets built.
+
+Reach for the lower-level commands when the orchestrator's flow doesn't fit:
+
+- **`flub bundle compare` on its own** — when both bundles are already collected
+  and you only want to re-run the diff (e.g. tweaking the report, or comparing
+  two labels the orchestrator wouldn't pair automatically). It reads each side's
+  previously saved `analyzer.json` and writes a fresh report without rebuilding
+  anything.
+- **`flub bundle collect` on its own** — when you want to capture a single bundle
+  without immediately diffing it, or to pre-populate a label for a later
+  comparison.
+
+### How collection works
+
+`flub bundle collect` runs in one of two modes:
+
+- **local** — builds the bundle from the outer enlistment (your working tree,
+  including staged changes). The staged diff is captured alongside the report so
+  the measurement is reproducible.
+- **revision** — builds the bundle from a _separate_ inner clone of the repo
+  checked out at a specific commit. The inner clone is created on first use as a
+  shallow clone of your `origin` remote and the requested commit is fetched
+  shallowly, keeping it small. The outer repo's working tree, branch, and stash
+  are never touched.
+
+Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
+(webpack-bundle-analyzer's JSON report). That single file carries per-asset
+parsed/gzip sizes and entrypoint membership — everything the comparison needs —
+so it is the only artifact saved per label; the larger webpack stats and `build/`
+outputs are not retained.
+
+The orchestrator runs `flub bundle collect` once in each mode: local for the
+current side, revision for the base side. The base-side report is cached and
+keyed by the resolved SHA, so a re-run against the same merge-base skips the
+rebuild.
+
+### Outputs
+
+- Each label's `analyzer.json` is saved under `bundleAnalysis/<label>/`
+  (gitignored). This is also where the cached base report and the inner repo
+  clone live.
+- Comparison reports (`.txt` and `.json`) are written to `compareBundlesOutput/`
+  (gitignored).
+
+Both directories are removed by `npm run clean`.
+
 <!-- AUTO-GENERATED-CONTENT:START (README_FOOTER) -->
 
 <!-- prettier-ignore-start -->
diff --git a/examples/utils/bundle-size-tests/eslint.config.mts b/examples/utils/bundle-size-tests/eslint.config.mts
index 01724bbc5dc4..6a0219e9f413 100644
--- a/examples/utils/bundle-size-tests/eslint.config.mts
+++ b/examples/utils/bundle-size-tests/eslint.config.mts
@@ -9,25 +9,14 @@ import { recommended } from "@fluidframework/eslint-config-fluid/flat.mts";
 const config: Linter.Config[] = [
 	...recommended,
 	{
-		// Include script files in typed linting via an explicit tsconfig list.
 		files: ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],
 		languageOptions: {
 			parserOptions: {
 				projectService: false,
-				project: ["./tsconfig.json", "./tsconfig.scripts.json", "./src/test/tsconfig.json"],
+				project: ["./tsconfig.json", "./src/test/tsconfig.json"],
 			},
 		},
 	},
-	{
-		files: ["scripts/**/*.ts"],
-		rules: {
-			"import-x/no-nodejs-modules": "off",
-			"unicorn/filename-case": "off",
-			"@typescript-eslint/prefer-nullish-coalescing": "off",
-			"@typescript-eslint/no-unsafe-call": "off",
-			"@typescript-eslint/no-unsafe-return": "off",
-		},
-	},
 	{
 		rules: {
 			"@typescript-eslint/consistent-type-imports": "off",
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 9b3128e5ff3d..c735ed1346b5 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -16,15 +16,14 @@
 		"build": "fluid-build . --task build",
 		"build:compile": "fluid-build . --task compile",
 		"build:esnext": "tsc --project ./tsconfig.json",
-		"build:scripts": "tsc --project ./tsconfig.scripts.json",
 		"build:test": "npm run build:test:esm",
 		"build:test:esm": "tsc --project ./src/test/tsconfig.json",
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis bundleAnalyzerJson compareBundlesOutput \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"compare:bundles": "jiti ./scripts/collectAndCompareBundles.ts",
-		"eslint": "eslint --quiet --format stylish src scripts",
-		"eslint:fix": "eslint --quiet --format stylish src scripts --fix --fix-type problem,suggestion,layout",
+		"compare:bundles": "flub bundle collect-and-compare",
+		"eslint": "eslint --quiet --format stylish src",
+		"eslint:fix": "eslint --quiet --format stylish src --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
 		"format": "npm run format:biome",
 		"format:biome": "biome check . --write",
@@ -56,20 +55,18 @@
 	"devDependencies": {
 		"@biomejs/biome": "~2.4.5",
 		"@cerner/duplicate-package-checker-webpack-plugin": "~2.3.0",
+		"@fluid-tools/build-cli": "catalog:buildTools",
 		"@fluid-tools/version-tools": "catalog:buildTools",
 		"@fluidframework/build-common": "^2.0.3",
 		"@fluidframework/build-tools": "catalog:buildTools",
 		"@fluidframework/eslint-config-fluid": "catalog:eslint",
 		"@mixer/webpack-bundle-compare": "^0.1.0",
-		"@oclif/core": "^4.10.5",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "catalog:types",
 		"eslint": "catalog:eslint",
-		"jiti": "^2.6.1",
 		"mocha": "^11.7.5",
 		"puppeteer": "^23.6.0",
 		"rimraf": "^6.1.3",
-		"simple-git": "^3.32.3",
 		"source-map-explorer": "^2.5.3",
 		"source-map-loader": "^5.0.0",
 		"string-replace-loader": "^3.1.0",
@@ -88,14 +85,9 @@
 				"...",
 				"webpack"
 			],
-			"build:scripts": [
-				"^tsc",
-				"^api"
-			],
 			"compile": {
 				"dependsOn": [
-					"...",
-					"build:scripts"
+					"..."
 				],
 				"script": false
 			},
diff --git a/examples/utils/bundle-size-tests/scripts/README.md b/examples/utils/bundle-size-tests/scripts/README.md
deleted file mode 100644
index d20fa3f2609c..000000000000
--- a/examples/utils/bundle-size-tests/scripts/README.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Bundle comparison scripts
-
-These scripts measure how a change affects the webpack bundle produced by
-`@fluid-example/bundle-size-tests`. They build the bundle on two different
-revisions and diff the per-asset and per-entrypoint sizes so regressions (or
-wins) are easy to spot before pushing.
-
-Scripts:
-
-| Script                        | Responsibility                                                                 |
-| ----------------------------- | ------------------------------------------------------------------------------ |
-| `collectBundle.ts`            | Build one bundle and save its stats under a label.                             |
-| `compareBundles.ts`           | Diff two already-collected bundles and write the report.                       |
-| `collectAndCompareBundles.ts` | Orchestrate both collect steps plus the compare step end-to-end.               |
-
-The orchestrator is the entry point exposed as the `compare:bundles` npm
-script; the other two are building blocks you usually only reach for when you
-want finer control or are debugging a single step.
-
-## Running the scripts
-
-Run the orchestrator through the package script:
-
-```sh
-npm run compare:bundles
-```
-
-To pass flags, forward them after `--`:
-
-```sh
-npm run compare:bundles -- --base-revision client_v2.100.0
-```
-
-Only collectAndCompareBundles is exposed as an npm script. Invoke other scripts directly with
-[jiti](https://github.com/unjs/jiti), which runs the TypeScript sources without a
-separate compile step. Each script self-describes its flags via `--help`:
-
-```sh
-jiti ./scripts/collectBundle.ts --help
-jiti ./scripts/compareBundles.ts --help
-jiti ./scripts/collectAndCompareBundles.ts --help
-```
-
-## Typical workflow
-
-In almost every case you just want the one-shot orchestrator:
-
-```sh
-npm run compare:bundles
-```
-
-This compares your working tree against the merge-base of `HEAD` and `main` —
-i.e. the point your branch forked from — so the diff reflects only your own
-changes, not unrelated commits that have since landed on `main`. Use
-`--base-revision` to compare against a different branch, tag, or commit; the
-merge-base of that revision and `HEAD` is what actually gets built.
-
-Reach for the lower-level scripts when the orchestrator's flow doesn't fit:
-
-- **`compareBundles.ts` on its own** — when both bundles are already collected
-  and you only want to re-run the diff (e.g. tweaking the report, or comparing
-  two labels the orchestrator wouldn't pair automatically). It reads each side's
-  previously saved `analyzer.json` and writes a fresh report without rebuilding
-  anything.
-- **`collectBundle.ts` on its own** — when you want to capture a single bundle
-  without immediately diffing it, or to pre-populate a label for a later
-  comparison.
-
-### How collection works
-
-`collectBundle.ts` runs in one of two modes:
-
-- **local** — builds the bundle from the outer enlistment (your working tree,
-  including staged changes). The staged diff is captured alongside the report so
-  the measurement is reproducible.
-- **revision** — builds the bundle from a *separate* inner clone of the repo
-  checked out at a specific commit. The inner clone is created on first use as a
-  shallow clone of your `origin` remote and the requested commit is fetched
-  shallowly, keeping it small. The outer repo's working tree, branch, and stash
-  are never touched.
-
-Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
-(webpack-bundle-analyzer's JSON report). That single file carries per-asset
-parsed/gzip sizes and entrypoint membership — everything the comparison needs —
-so it is the only artifact saved per label; the larger webpack stats and `build/`
-outputs are not retained.
-
-The orchestrator runs `collectBundle.ts` once in each mode: local for the
-current side, revision for the base side. The base-side report is cached and
-keyed by the resolved SHA, so a re-run against the same merge-base skips the
-rebuild.
-
-## Outputs
-
-- Each label's `analyzer.json` is saved under `bundleAnalysis/<label>/`
-  (gitignored). This is also where the cached base report and the inner repo
-  clone live.
-- Comparison reports (`.txt` and `.json`) are written to `compareBundlesOutput/`
-  (gitignored).
-
-Both directories are removed by `npm run clean`.
diff --git a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts b/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
deleted file mode 100644
index 33c446707e1f..000000000000
--- a/examples/utils/bundle-size-tests/scripts/collectAndCompareBundles.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-import { Command, Flags } from "@oclif/core";
-import { simpleGit } from "simple-git";
-
-import { maybePrintHelp } from "./oclifHelp.js";
-
-const scriptDirectory = dirname(fileURLToPath(import.meta.url));
-const packageRoot = resolve(scriptDirectory, "..");
-const bundleAnalysisDirectory = resolve(packageRoot, "bundleAnalysis");
-
-/**
- * Resolves the merge-base (best common ancestor) of two committishes (branch,
- * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
- * resolved (e.g. unknown branch, detached state with no shared history).
- *
- * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
- * symmetric — per the git documentation, `git merge-base a b` outputs a commit
- * reachable from both `a` and `b`, so argument order does not affect the result
- * (order only matters for the 3+ commit and `--fork-point` forms, which we do
- * not use here).
- *
- * Using merge-base instead of a raw branch tip means the comparison is taken
- * against the actual fork point, which is what users typically want — and it
- * works for worktree-based setups where `main` may not exist as a local branch
- * at the location they expect.
- */
-async function resolveMergeBase(
-	rev: string,
-	otherRev = "HEAD",
-): Promise<string | undefined> {
-	try {
-		const output = await simpleGit(packageRoot).raw(["merge-base", rev, otherRev]);
-		const sha = output.trim();
-		return sha.length > 0 ? sha : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
-/**
- * Runs a TypeScript script via Node with jiti's ESM register hook.
- *
- * Using `--import jiti/register` avoids depending on the `jiti` binary being
- * on PATH (which is flaky on Windows / npm script contexts) while still
- * routing through a stable, documented entry point exposed by jiti's package
- * exports map.
- *
- * @param scriptName - Script file name under ./scripts/
- * @param scriptArgs - Arguments to forward to the script
- */
-function runScript(scriptName: string, scriptArgs: string[]): void {
-	const scriptPath = resolve(scriptDirectory, scriptName);
-	const result = spawnSync(
-		process.execPath,
-		["--import", "jiti/register", scriptPath, ...scriptArgs],
-		{
-			cwd: packageRoot,
-			stdio: "inherit",
-		},
-	);
-
-	if (result.error !== undefined) {
-		throw new Error(`Failed to launch script ${scriptName}: ${result.error.message}`);
-	}
-	if (result.status !== 0) {
-		throw new Error(
-			`Script ${scriptName} exited with code ${result.status ?? "null (signal)"}.`,
-		);
-	}
-}
-
-/**
- * Orchestrates: collectBundle.ts (local), then collectBundle.ts (revision),
- * then compareBundles.ts.
- *
- * Labels (used as bundleAnalysis subdirectory names) are determined automatically:
- * the local bundle is saved under "current" and the base bundle under "main",
- * regardless of the resolved revision SHA, so that compareBundles.ts can find
- * both directories.
- */
-class CollectAndCompareBundlesCommand extends Command {
-	public static override readonly description =
-		"Run collectBundle.ts twice (local + revision merge-base) and then compareBundles.ts. " +
-		"The outer repo's working tree, branch, and stash are never modified.";
-
-	public static override readonly examples = [
-		"<%= config.bin %> <%= command.id %>",
-		"<%= config.bin %> <%= command.id %> --base-revision main",
-		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
-		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
-	];
-
-	public static override readonly flags = {
-		"base-revision": Flags.string({
-			description:
-				"Revision to use as the comparison baseline (branch, tag, or commit SHA). " +
-				"The actual base used is the merge-base of HEAD and this revision (the fork " +
-				"point), so worktree-based setups where 'main' is in an unusual location " +
-				"still produce the expected comparison.",
-			default: "main",
-		}),
-		"skip-compare": Flags.boolean({
-			description: "Collect both bundles, but skip the comparison step.",
-			default: false,
-		}),
-		"force-clean-build": Flags.boolean({
-			description:
-				"Run the full workspace clean before each build. Off by default; opt in " +
-				"when stale incremental build state may interfere with the current revision.",
-			default: false,
-		}),
-		"keep-base-repo": Flags.boolean({
-			description:
-				"For debugging only: keep the inner base-repo clone after collecting the " +
-				"base bundle. By default the inner repo is deleted once stats are saved, " +
-				"since it can be re-created cheaply via shallow clone on the next run. " +
-				"Pass this flag to inspect the inner repo's working tree or build output " +
-				"(e.g. when a build is failing inside the inner repo).",
-			default: false,
-		}),
-	};
-
-	public async run(): Promise<void> {
-		const { flags } = await this.parse(CollectAndCompareBundlesCommand);
-
-		const baseRevisionInput = flags["base-revision"];
-		const resolvedBaseRevision = await resolveMergeBase(baseRevisionInput);
-		if (resolvedBaseRevision === undefined) {
-			this.error(
-				`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
-					`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
-				{ exit: 1 },
-			);
-		}
-		if (resolvedBaseRevision !== baseRevisionInput) {
-			console.log(
-				`Resolved --base-revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
-			);
-		}
-		const baseRevision = resolvedBaseRevision;
-		// compareBundles.ts reads from a fixed base label ("main"); pin the base
-		// bundle's directory name to that regardless of which revision we resolved.
-		const baseLabel = "main";
-		// The current side is timestamped (unix epoch seconds) so successive runs,
-		// which may carry different uncommitted changes, don't clobber each other.
-		// We pass the same label to collectBundle (--label) and compareBundles
-		// (--current-label) so they agree on the directory.
-		const currentLabel = `current_${Math.floor(Date.now() / 1000)}`;
-
-		const skipCompare = flags["skip-compare"];
-		const forceCleanBuildFlag = flags["force-clean-build"];
-		const keepBaseRepo = flags["keep-base-repo"];
-
-		const sharedCollectArgs: string[] = [];
-		if (forceCleanBuildFlag) {
-			sharedCollectArgs.push("--force-clean-build");
-		}
-
-		// The inner repo is only ever checked out at a clean revision; its build
-		// output for a given SHA is deterministic, so a cached base report from a
-		// prior run for the same SHA can be reused. We track the SHA used to produce
-		// the base report in a sidecar revision.txt file.
-		const baseLabelDirectory = resolve(bundleAnalysisDirectory, baseLabel);
-		const baseAnalyzerPath = resolve(baseLabelDirectory, "analyzer.json");
-		const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
-		const cachedBaseRevision = existsSync(baseRevisionMarkerPath)
-			? readFileSync(baseRevisionMarkerPath, "utf8").trim()
-			: undefined;
-		const baseStatsAreCached =
-			!forceCleanBuildFlag && existsSync(baseAnalyzerPath) && cachedBaseRevision === baseRevision;
-
-		try {
-			console.log(`\n${"=".repeat(80)}`);
-			console.log(`Collecting local bundle (label: ${currentLabel})...`);
-			console.log("=".repeat(80));
-			runScript("collectBundle.ts", [
-				"--mode",
-				"local",
-				"--label",
-				currentLabel,
-				...sharedCollectArgs,
-			]);
-
-			console.log(`\n${"=".repeat(80)}`);
-			if (baseStatsAreCached) {
-				console.log(
-					`Reusing cached base bundle (revision: ${baseRevision}, label: ${baseLabel}).`,
-				);
-				console.log(`  Report: ${baseAnalyzerPath}`);
-				console.log("=".repeat(80));
-			} else {
-				console.log(
-					`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
-				);
-				console.log("=".repeat(80));
-				runScript("collectBundle.ts", [
-					"--mode",
-					"revision",
-					"--revision",
-					baseRevision,
-					"--label",
-					baseLabel,
-					...sharedCollectArgs,
-				]);
-				// Record the SHA that produced this report so a subsequent run
-				// against the same merge-base can skip the rebuild.
-				mkdirSync(baseLabelDirectory, { recursive: true });
-				writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
-
-				// Delete the inner repo now that the report is saved. It's a
-				// shallow clone of the outer repo's `origin`, so re-creating it
-				// on the next run is cheap; keeping it around just consumes disk
-				// (hundreds of MB once dependencies are installed).
-				if (!keepBaseRepo) {
-					const innerRepoRoot = resolve(bundleAnalysisDirectory, "base-repo");
-					if (existsSync(innerRepoRoot)) {
-						console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
-						rmSync(innerRepoRoot, { recursive: true, force: true });
-					}
-				}
-			}
-
-			if (!skipCompare) {
-				console.log(`\n${"=".repeat(80)}`);
-				console.log("Running bundle comparison...");
-				console.log("=".repeat(80));
-				runScript("compareBundles.ts", ["--current-label", currentLabel]);
-			}
-
-			console.log(`\n${"=".repeat(80)}`);
-			console.log("✓ Bundle collection and comparison complete!");
-			console.log("=".repeat(80));
-		} catch (error) {
-			console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
-			throw error;
-		}
-	}
-}
-
-if (
-	!maybePrintHelp(
-		process.argv.slice(2),
-		"collectAndCompareBundles.ts",
-		CollectAndCompareBundlesCommand,
-	)
-) {
-	await CollectAndCompareBundlesCommand.run(process.argv.slice(2), import.meta.url);
-}
diff --git a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts b/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
deleted file mode 100644
index 1e0a155485bf..000000000000
--- a/examples/utils/bundle-size-tests/scripts/oclifHelp.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import type { Command } from "@oclif/core";
-
-/**
- * Renders simple help text for a single-command oclif script from its static
- * metadata (`description`, `flags`, `examples`). Used because oclif's built-in
- * `--help` machinery needs a full `Config`, which is heavyweight for scripts
- * that are invoked directly via jiti rather than through a CLI bin.
- *
- * Intercepts `--help` / `-h` in argv before `Command.run`, prints, and exits.
- *
- * @param argv - The argument list that will be passed to the command
- * @param commandName - The name to use in the synopsis line (e.g. `compareBundles.ts`)
- * @param CommandClass - The oclif Command subclass whose metadata to render
- * @returns true if help was printed (caller should not invoke `.run`)
- */
-export function maybePrintHelp(
-	argv: string[],
-	commandName: string,
-	CommandClass: typeof Command,
-): boolean {
-	if (!argv.includes("--help") && !argv.includes("-h")) {
-		return false;
-	}
-
-	const description = CommandClass.description ?? "";
-	const flags = (CommandClass.flags ?? {}) as Record<
-		string,
-		{
-			type?: string;
-			description?: string;
-			default?: string | number | boolean;
-			options?: readonly string[];
-			required?: boolean;
-		}
-	>;
-	const examples: string[] = (CommandClass.examples ?? []).map((e) => {
-		if (typeof e === "string") {
-			return e;
-		}
-		const command = (e as { command?: unknown }).command;
-		return typeof command === "string" ? command : "";
-	});
-
-	console.log(`Usage:\n  jiti ./scripts/${commandName} [flags]\n`);
-	if (description.length > 0) {
-		console.log(`${description}\n`);
-	}
-
-	const flagEntries = Object.entries(flags);
-	if (flagEntries.length > 0) {
-		console.log("Flags:");
-		for (const [name, def] of flagEntries) {
-			const isBoolean = def.type === "boolean";
-			const valuePart = isBoolean
-				? ""
-				: def.options
-					? ` <${def.options.join("|")}>`
-					: " <value>";
-			const defaultValue = def.default;
-			const defaultPart =
-				defaultValue !== undefined && !isBoolean
-					? ` (default: ${String(defaultValue)})`
-					: isBoolean && defaultValue === true
-						? " (default: true)"
-						: "";
-			const requiredPart = def.required === true ? " (required)" : "";
-			console.log(
-				`  --${name}${valuePart}${defaultPart}${requiredPart}\n      ${def.description ?? ""}`,
-			);
-		}
-		console.log();
-	}
-
-	if (examples.length > 0) {
-		console.log("Examples:");
-		for (const example of examples) {
-			console.log(
-				`  ${example
-					.replaceAll("<%= config.bin %> <%= command.id %>", `jiti ./scripts/${commandName}`)
-					.replaceAll("<%= config.bin %>", "jiti")
-					.replaceAll("<%= command.id %>", commandName)}`,
-			);
-		}
-		console.log();
-	}
-
-	return true;
-}
diff --git a/examples/utils/bundle-size-tests/tsconfig.scripts.json b/examples/utils/bundle-size-tests/tsconfig.scripts.json
deleted file mode 100644
index 12fa6d02062b..000000000000
--- a/examples/utils/bundle-size-tests/tsconfig.scripts.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"compilerOptions": {
-		"noEmit": true,
-		"tsBuildInfoFile": "./lib/tsconfig.scripts.tsbuildinfo",
-		"types": ["node"],
-		"exactOptionalPropertyTypes": false,
-		// scripts/ is run directly via jiti on modern Node; the repo-wide ES2020
-		// lib excludes things like String.prototype.replaceAll which the scripts
-		// rely on (and which type-aware lint can't see otherwise).
-		"lib": ["ES2022"],
-	},
-	"include": ["scripts/**/*.ts"],
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 16efe48afb29..7fb6af9b3754 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -374,7 +374,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -504,7 +504,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -631,7 +631,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -927,7 +927,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1072,7 +1072,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1229,7 +1229,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1353,7 +1353,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1571,7 +1571,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1674,7 +1674,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1853,7 +1853,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -1968,7 +1968,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2077,7 +2077,7 @@ importers:
         version: 5.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2283,7 +2283,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -2316,7 +2316,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -2537,7 +2537,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -3062,7 +3062,7 @@ importers:
         version: 4.0.0(webpack@5.103.0)
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4370,7 +4370,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4406,7 +4406,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4515,7 +4515,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4557,7 +4557,7 @@ importers:
         version: 2.1.0
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       events_pkg:
         specifier: npm:events@^3.1.0
         version: events@3.3.0
@@ -4681,7 +4681,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -4837,6 +4837,9 @@ importers:
       '@cerner/duplicate-package-checker-webpack-plugin':
         specifier: ~2.3.0
         version: 2.3.0(webpack@5.103.0)
+      '@fluid-tools/build-cli':
+        specifier: catalog:buildTools
+        version: 0.65.0(@types/node@22.19.17)(encoding@0.1.13)(webpack-cli@5.1.4)
       '@fluid-tools/version-tools':
         specifier: catalog:buildTools
         version: 0.65.0(@types/node@22.19.17)
@@ -4852,9 +4855,6 @@ importers:
       '@mixer/webpack-bundle-compare':
         specifier: ^0.1.0
         version: 0.1.1
-      '@oclif/core':
-        specifier: ^4.10.5
-        version: 4.10.5
       '@types/mocha':
         specifier: ^10.0.10
         version: 10.0.10
@@ -4864,9 +4864,6 @@ importers:
       eslint:
         specifier: catalog:eslint
         version: 9.39.1(jiti@2.6.1)
-      jiti:
-        specifier: ^2.6.1
-        version: 2.6.1
       mocha:
         specifier: ^11.7.5
         version: 11.7.5
@@ -4876,9 +4873,6 @@ importers:
       rimraf:
         specifier: ^6.1.3
         version: 6.1.3
-      simple-git:
-        specifier: ^3.32.3
-        version: 3.32.3
       source-map-explorer:
         specifier: ^2.5.3
         version: 2.5.3
@@ -5372,7 +5366,7 @@ importers:
         version: link:../../../packages/utils/tool-utils
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -5581,7 +5575,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5750,7 +5744,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -5931,7 +5925,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6091,7 +6085,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6218,7 +6212,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6357,7 +6351,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6481,7 +6475,7 @@ importers:
         version: 7.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -6732,7 +6726,7 @@ importers:
         version: link:../../../../packages/dds/shared-object-base
       axios:
         specifier: ^1.15.0
-        version: 1.15.0(debug@4.3.7)
+        version: 1.15.0(debug@4.4.3)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -7629,7 +7623,7 @@ importers:
         version: 18.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@22.19.17)(typescript@5.4.5)
@@ -11044,7 +11038,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16183,7 +16177,7 @@ importers:
         version: 3.0.1
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16482,7 +16476,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16515,7 +16509,7 @@ importers:
         version: 6.1.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.4.5)(webpack@5.103.0)
@@ -16672,7 +16666,7 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-jest:
         specifier: ~29.5.0
-        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       eslint-plugin-react:
         specifier: ~7.37.5
         version: 7.37.5(eslint@9.39.1(jiti@2.6.1))
@@ -16711,7 +16705,7 @@ importers:
         version: 3.32.3
       ts-jest:
         specifier: ^29.1.1
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5)
       typescript:
         specifier: ~5.4.5
         version: 5.4.5
@@ -30104,7 +30098,7 @@ snapshots:
       '@fluidframework/routerlicious-driver': 1.4.0(encoding@0.1.13)
       '@fluidframework/runtime-utils': 1.4.0
       '@fluidframework/server-services-client': 0.1036.5002
-      axios: 0.30.3
+      axios: 0.30.3(debug@4.4.3)
       uuid: 8.3.2
     transitivePeerDependencies:
       - bufferutil
@@ -30518,7 +30512,7 @@ snapshots:
       '@fluidframework/protocol-base': 0.1036.5002
       '@fluidframework/protocol-definitions': 0.1028.2000
       '@fluidframework/telemetry-utils': 1.4.0
-      axios: 0.30.3
+      axios: 0.30.3(debug@4.4.3)
       uuid: 8.3.2
     transitivePeerDependencies:
       - debug
@@ -33897,7 +33891,7 @@ snapshots:
 
   '@vvago/vale@3.12.0':
     dependencies:
-      axios: 1.15.0(debug@4.3.7)
+      axios: 1.15.0(debug@4.4.3)
       rimraf: 5.0.10
       tar: 7.5.11
       unzipper: 0.10.14
@@ -33983,12 +33977,12 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.103.0)':
     dependencies:
       webpack: 5.103.0(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.2)(webpack@5.103.0)':
     dependencies:
@@ -34309,14 +34303,6 @@ snapshots:
 
   axe-core@4.10.2: {}
 
-  axios@0.30.3:
-    dependencies:
-      follow-redirects: 1.15.11(debug@4.3.7)
-      form-data: 4.0.5
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
   axios@0.30.3(debug@4.4.3):
     dependencies:
       follow-redirects: 1.15.11(debug@4.4.3)
@@ -35957,7 +35943,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
+  eslint-plugin-jest@29.5.0(@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5))(eslint@9.39.1(jiti@2.6.1))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
     dependencies:
       '@typescript-eslint/utils': 8.56.1(eslint@9.39.1(jiti@2.6.1))(typescript@5.4.5)
       eslint: 9.39.1(jiti@2.6.1)
@@ -37013,18 +36999,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  http-proxy-middleware@2.0.9(@types/express@4.17.21):
-    dependencies:
-      '@types/http-proxy': 1.17.15
-      http-proxy: 1.18.1
-      is-glob: 4.0.3
-      is-plain-obj: 3.0.0
-      micromatch: 4.0.8
-    optionalDependencies:
-      '@types/express': 4.17.21
-    transitivePeerDependencies:
-      - debug
-
   http-proxy-middleware@2.0.9(@types/express@4.17.21)(debug@4.4.3):
     dependencies:
       '@types/http-proxy': 1.17.15
@@ -37037,14 +37011,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  http-proxy@1.18.1:
-    dependencies:
-      eventemitter3: 4.0.7
-      follow-redirects: 1.15.11(debug@4.3.7)
-      requires-port: 1.0.0
-    transitivePeerDependencies:
-      - debug
-
   http-proxy@1.18.1(debug@4.4.3):
     dependencies:
       eventemitter3: 4.0.7
@@ -37642,7 +37608,7 @@ snapshots:
       prompts: 2.4.2
       spawnd: 10.1.4
       tree-kill: 1.2.2
-      wait-on: 8.0.1(debug@4.3.7)
+      wait-on: 8.0.1
     transitivePeerDependencies:
       - debug
       - supports-color
@@ -41620,7 +41586,7 @@ snapshots:
       '@fluidframework/server-services-utils': 7.0.1
       '@fluidframework/server-test-utils': 7.0.1
       agentkeepalive: 4.6.0
-      axios: 1.15.0(debug@4.3.7)
+      axios: 1.15.0(debug@4.4.3)
       body-parser: 1.20.3
       charwise: 3.0.1
       compression: 1.7.5
@@ -41739,7 +41705,7 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0))(typescript@5.4.5):
+  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.19.17)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@22.19.17)(typescript@5.4.5)))(typescript@5.4.5):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
@@ -42266,6 +42232,16 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
+  wait-on@8.0.1:
+    dependencies:
+      axios: 1.15.0(debug@4.4.3)
+      joi: 17.13.3
+      lodash: 4.18.1
+      minimist: 1.2.8
+      rxjs: 7.8.2
+    transitivePeerDependencies:
+      - debug
+
   wait-on@8.0.1(debug@4.3.7):
     dependencies:
       axios: 1.15.0(debug@4.3.7)
@@ -42451,7 +42427,7 @@ snapshots:
       express: 4.22.1
       graceful-fs: 4.2.11
       html-entities: 2.6.0
-      http-proxy-middleware: 2.0.9(@types/express@4.17.21)
+      http-proxy-middleware: 2.0.9(@types/express@4.17.21)(debug@4.4.3)
       ipaddr.js: 2.2.0
       launch-editor: 2.9.1
       open: 8.4.2
@@ -42515,7 +42491,7 @@ snapshots:
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.103.0)
+      webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.103.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild

From 1905af07837666da3bb90dbaefe0d55c7343a9a4 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 2 Jun 2026 11:35:32 -0700
Subject: [PATCH 38/67] build-cli: clone inner base-repo under outputDir, not
 analysisDir

The collect-and-compare orchestrator was cloning the cross-revision inner enlistment into <analysisDir>/base-repo, co-mingling a large scratch clone with the clean per-label analyzer reports. Add an optional baseRepoDir to CollectBundleOptions (defaulting to <analysisDir>/base-repo for standalone 'flub bundle collect') and have the orchestrator place it under <outputDir>/base-repo instead.

Update pnpm-workspace.yaml to also exclude compareBundlesOutput so fluid-build does not scan into the relocated inner enlistment.
---
 .../bundleSize/collectAndCompareBundles.ts       |  6 +++++-
 .../src/library/bundleSize/collectBundle.ts      | 16 ++++++++++------
 pnpm-workspace.yaml                              |  9 +++++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index b51f59fb5572..260f395462f3 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -101,6 +101,10 @@ export async function collectAndCompareBundles(
 		);
 	}
 	const baseRevision = resolvedBaseRevision;
+	// The inner enlistment used to build the base bundle is a scratch clone, not
+	// report data, so it lives under the output directory rather than alongside
+	// the per-label analyzer reports in analysisDir.
+	const innerRepoRoot = resolve(outputDir, "base-repo");
 	// compareBundles reads from a fixed base label ("main"); pin the base
 	// bundle's directory name to that regardless of which revision we resolved.
 	const baseLabel = "main";
@@ -154,6 +158,7 @@ export async function collectAndCompareBundles(
 				forceCleanBuild,
 				packageDir,
 				analysisDir,
+				baseRepoDir: innerRepoRoot,
 			});
 			// Record the SHA that produced this report so a subsequent run
 			// against the same merge-base can skip the rebuild.
@@ -165,7 +170,6 @@ export async function collectAndCompareBundles(
 			// on the next run is cheap; keeping it around just consumes disk
 			// (hundreds of MB once dependencies are installed).
 			if (!keepBaseRepo) {
-				const innerRepoRoot = resolve(analysisDir, "base-repo");
 				if (existsSync(innerRepoRoot)) {
 					console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
 					rmSync(innerRepoRoot, { recursive: true, force: true });
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 517ca9d02411..69d6987129e4 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -36,10 +36,14 @@ export interface CollectBundleOptions {
 	 */
 	readonly packageDir: string;
 	/**
-	 * Directory under which per-label analyzer stats are saved. The inner enlistment used for
-	 * revision mode lives at `<analysisDir>/base-repo`.
+	 * Directory under which per-label analyzer stats are saved.
 	 */
 	readonly analysisDir: string;
+	/**
+	 * (revision mode only) Directory where the inner enlistment is cloned and built. Defaults to
+	 * `<analysisDir>/base-repo` when not specified.
+	 */
+	readonly baseRepoDir?: string;
 }
 
 /**
@@ -248,9 +252,9 @@ async function ensureInnerRepoAtRevision(
  * Collects a single bundle from either the outer enlistment (local mode) or a
  * separate inner enlistment checked out to a specific revision (revision mode).
  *
- * In revision mode, the inner repo at `<analysisDir>/base-repo` is cloned from the
- * outer repo's `origin` remote on first use and reused thereafter. The outer
- * repo's working tree, branch, and stash are never modified.
+ * In revision mode, the inner repo (at {@link CollectBundleOptions.baseRepoDir}, defaulting to
+ * `<analysisDir>/base-repo`) is cloned from the outer repo's `origin` remote on first use and
+ * reused thereafter. The outer repo's working tree, branch, and stash are never modified.
  */
 export async function collectBundle(options: CollectBundleOptions): Promise<void> {
 	const { mode, revision, forceCleanBuild, packageDir, analysisDir } = options;
@@ -262,7 +266,7 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 	const label = sanitizeForFileName(options.label);
 
 	const outerRepoRoot = await getRepoRoot(packageDir);
-	const innerRepoRoot = resolve(analysisDir, "base-repo");
+	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
 
 	let activeRepoRoot: string;
 	let activePackageRoot: string;
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index aad02bdcb927..19235ace759d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -120,10 +120,15 @@ packages:
   - "packages/**"
   - "tools/markdown-magic"
 
-  # exclude inner FluidFramework enlistment used by examples/utils/bundle-size-tests
-  # for cross-revision bundle comparison (see examples/utils/bundle-size-tests/scripts/collectBundle.ts).
+  # exclude bundle-analysis output directories, which can contain package.json files from
+  # webpack bundle stats (e.g. examples/utils/bundle-size-tests).
   - "!**/bundleAnalysis/**"
 
+  # exclude the inner FluidFramework enlistment used by examples/utils/bundle-size-tests for
+  # cross-revision bundle comparison (see `flub bundle collect-and-compare`, which clones the
+  # inner repo into <outputDir>/base-repo).
+  - "!**/compareBundlesOutput/**"
+
   # exclude any package.json files that are inside src or output directories
   - "!**/dist/**"
   - "!**/lib/**"

From 8d2bc192586d4f6bd4b586c4a8566df539cc9f21 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 2 Jun 2026 12:33:31 -0700
Subject: [PATCH 39/67] build-cli: restore docs/build-perf.md to bash
 line-continuation form

The bundle-scripts refactor commit accidentally regenerated build-perf.md on Windows, replacing the bash line-continuation char (\\) in its examples with the cmd caret (^). CI regenerates the doc on Linux and flags it as an extraneous modified file. Restore the file to match main; it is unrelated to the bundle commands.
---
 build-tools/packages/build-cli/docs/build-perf.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/build-perf.md b/build-tools/packages/build-cli/docs/build-perf.md
index 54a14f48744f..b1663f949174 100644
--- a/build-tools/packages/build-cli/docs/build-perf.md
+++ b/build-tools/packages/build-cli/docs/build-perf.md
@@ -75,7 +75,7 @@ DESCRIPTION
 EXAMPLES
   Collect public (PR) build data.
 
-    $ flub build-perf collect --mode public --project public --buildDefId 11 --outputDir ./output --adoApiToken ^
+    $ flub build-perf collect --mode public --project public --buildDefId 11 --outputDir ./output --adoApiToken \
       $ADO_TOKEN
 ```
 
@@ -108,7 +108,7 @@ DESCRIPTION
 EXAMPLES
   Deploy dashboard for public mode.
 
-    $ flub build-perf deploy --mode public --aswaHostname myapp.azurestaticapps.net --dataDir ./data ^
+    $ flub build-perf deploy --mode public --aswaHostname myapp.azurestaticapps.net --dataDir ./data \
       --deploymentToken $SWA_TOKEN
 ```
 

From 99caaddf7a6768ffa4c5d674407bb9bdf4688a88 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 2 Jun 2026 13:03:15 -0700
Subject: [PATCH 40/67] build-cli: reuse findGitRootSync and path.relative in
 collectBundle

Replace two ad-hoc simple-git helpers in collectBundle with existing utilities:

- getRepoRoot (git rev-parse --show-toplevel) -> findGitRootSync from
  @fluid-tools/build-infrastructure (synchronous, no subprocess wrapper).
- getPackageWorkspacePath (git rev-parse --show-prefix) -> path.relative
  against the already-resolved repo root, dropping an extra git subprocess.

No behavior change; verified with tsc, eslint, and an end-to-end
collect-and-compare run against examples/utils/bundle-size-tests.
---
 .../src/library/bundleSize/collectBundle.ts   | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 69d6987129e4..28738d26e540 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -5,8 +5,9 @@
 
 import { execSync } from "node:child_process";
 import { copyFileSync, existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
+import { dirname, relative, resolve } from "node:path";
 
+import { findGitRootSync } from "@fluid-tools/build-infrastructure";
 import { simpleGit } from "simple-git";
 
 /**
@@ -46,25 +47,6 @@ export interface CollectBundleOptions {
 	readonly baseRepoDir?: string;
 }
 
-/**
- * Gets the repository root directory for the given working directory.
- */
-async function getRepoRoot(cwd: string): Promise<string> {
-	const output = await simpleGit(cwd).revparse(["--show-toplevel"]);
-	return output.trim();
-}
-
-/**
- * Returns the path of the given directory relative to the root of the repo that contains it,
- * e.g. `examples/utils/bundle-size-tests`. Used to locate the same package inside a
- * freshly-cloned inner repo.
- */
-async function getPackageWorkspacePath(packageDir: string): Promise<string> {
-	const output = await simpleGit(packageDir).revparse(["--show-prefix"]);
-	// `--show-prefix` returns a trailing-slash-terminated path (or empty string at the repo root).
-	return output.trim().replace(/\/$/, "");
-}
-
 /**
  * Sanitizes a string for use as a filename.
  */
@@ -265,7 +247,7 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 
 	const label = sanitizeForFileName(options.label);
 
-	const outerRepoRoot = await getRepoRoot(packageDir);
+	const outerRepoRoot = findGitRootSync(packageDir);
 	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
 
 	let activeRepoRoot: string;
@@ -278,7 +260,10 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 		// patch is preserved even if the build subsequently fails.
 		await captureLocalPatch(outerRepoRoot, resolve(analysisDir, label));
 	} else {
-		const packageWorkspacePath = await getPackageWorkspacePath(packageDir);
+		// Path of the package relative to the repo root, e.g.
+		// `examples/utils/bundle-size-tests`. Used to locate the same package
+		// inside the freshly-cloned inner repo.
+		const packageWorkspacePath = relative(outerRepoRoot, packageDir);
 		await ensureInnerRepoAtRevision(revision as string, outerRepoRoot, innerRepoRoot);
 		activeRepoRoot = innerRepoRoot;
 		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);

From 53e117acf81d4b0fef66ac7609c8acdc231938ca Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 09:56:15 -0700
Subject: [PATCH 41/67] Per-package size reporting.

---
 .../src/library/bundleSize/compareBundles.ts  | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 56b4dede3b03..db1b1d6691d2 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -54,6 +54,18 @@ interface EntrypointRow {
 	diff: number;
 }
 
+/**
+ * Per-package parsed-size comparison row. `name` is the owning npm package of
+ * the contributing modules (e.g. `@fluidframework/tree`, `@sinclair/typebox`),
+ * or a synthetic bucket label (e.g. `other @fluidframework/*`).
+ */
+interface PackageSizeRow {
+	name: string;
+	baseSize: number;
+	currentSize: number;
+	diff: number;
+}
+
 /** Structured comparison report written to the JSON output file. */
 interface ComparisonReport {
 	/** ISO timestamp of when the comparison was generated */
@@ -70,6 +82,18 @@ interface ComparisonReport {
 	gzipChangedAssets: GzipRow[];
 	/** Per-entrypoint total parsed-size comparison rows */
 	entrypoints: EntrypointRow[];
+	/**
+	 * Three-row headline split of the whole bundle's parsed bytes:
+	 * `@fluidframework/tree`, `other @fluidframework/* + @fluid-*`, and
+	 * `third-party`. Answers "how much of the bundle is tree" at a glance.
+	 */
+	packageBuckets: PackageSizeRow[];
+	/**
+	 * Full per-package parsed-size breakdown (one row per owning package),
+	 * sorted by current size descending. Sizes are deduplicated by module so a
+	 * module shared across entrypoints is counted once.
+	 */
+	packages: PackageSizeRow[];
 }
 
 function sanitizeForFileName(value: string): string {
@@ -119,6 +143,126 @@ function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
 	return totals;
 }
 
+/**
+ * Extracts the owning npm package name from a webpack-bundle-analyzer module
+ * `path`. Handles the three shapes that appear in this repo's bundles:
+ *
+ * - **Third-party (pnpm):** `.../node_modules/.pnpm/<key>/node_modules/<pkg>/...`
+ *   — the name after the *last* `node_modules/` is used, so a package's own
+ *   nested dependencies are attributed to themselves. Scoped packages keep
+ *   their `@scope/name`.
+ * - **Workspace packages:** `.../packages/<group>/<name>/...` — these are the
+ *   Fluid Framework source packages, published as `@fluidframework/<name>`.
+ * - **App/entry code:** anything else (e.g. the bundle-size-tests harness's own
+ *   `./src/*.ts` entry modules) is grouped under `(app/entry)`.
+ */
+function packageFromModulePath(modulePath: string): string {
+	const normalized = modulePath.replace(/\\/g, "/");
+	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
+	if (nodeModulesIndex >= 0) {
+		const rest = normalized.slice(nodeModulesIndex + "node_modules/".length);
+		const parts = rest.split("/");
+		return parts[0].startsWith("@") ? `${parts[0]}/${parts[1]}` : parts[0];
+	}
+	const packagesIndex = normalized.indexOf("packages/");
+	if (packagesIndex >= 0) {
+		// Workspace layout: packages/<group>/<name>/lib/...
+		const parts = normalized.slice(packagesIndex + "packages/".length).split("/");
+		if (parts.length >= 2) return `@fluidframework/${parts[1]}`;
+	}
+	return "(app/entry)";
+}
+
+/**
+ * Produces a stable identity for a module so the same source module reached via
+ * different entrypoints (webpack prefixes the path with the concatenating
+ * entry, e.g. `./src/sharedTree.ts + 384 modules (concatenated)/...`) collapses
+ * to a single key. Anchoring at `node_modules/` or `packages/` strips that
+ * per-entry prefix, giving "unique module" dedup semantics.
+ */
+function canonicalModuleKey(modulePath: string): string {
+	const normalized = modulePath.replace(/\\/g, "/");
+	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
+	if (nodeModulesIndex >= 0) return normalized.slice(nodeModulesIndex);
+	const packagesIndex = normalized.indexOf("packages/");
+	if (packagesIndex >= 0) return normalized.slice(packagesIndex);
+	return normalized;
+}
+
+/**
+ * Walks each asset's `groups` module tree and sums parsed sizes per owning
+ * package. Modules are deduplicated by {@link canonicalModuleKey}, so a module
+ * shared across multiple entrypoints is counted exactly once (whole-bundle
+ * "unique module size" semantics).
+ */
+function packageSizes(nodes: AnalyzerNode[]): Map<string, number> {
+	const perPackage = new Map<string, number>();
+	const seen = new Set<string>();
+
+	const visit = (node: AnalyzerNode): void => {
+		if (node.groups !== undefined && node.groups.length > 0) {
+			for (const child of node.groups) visit(child);
+			return;
+		}
+		// Leaf module node.
+		if (node.path === undefined) return;
+		const key = canonicalModuleKey(node.path);
+		if (seen.has(key)) return;
+		seen.add(key);
+		const packageName = packageFromModulePath(node.path);
+		perPackage.set(packageName, (perPackage.get(packageName) ?? 0) + (node.parsedSize ?? 0));
+	};
+
+	for (const node of nodes.filter(isJsAsset)) {
+		visit(node);
+	}
+	return perPackage;
+}
+
+/** Diffs two per-package size maps into sorted {@link PackageSizeRow}s. */
+function diffPackageSizes(
+	base: Map<string, number>,
+	current: Map<string, number>,
+): PackageSizeRow[] {
+	return [...new Set([...base.keys(), ...current.keys()])]
+		.map((name) => {
+			// Missing on a side is treated as size 0 (added/removed package).
+			const baseSize = base.get(name) ?? 0;
+			const currentSize = current.get(name) ?? 0;
+			return { name, baseSize, currentSize, diff: currentSize - baseSize };
+		})
+		.sort((a, b) => b.currentSize - a.currentSize || a.name.localeCompare(b.name));
+}
+
+/**
+ * Collapses per-package rows into the three headline buckets:
+ * `@fluidframework/tree`, `other @fluidframework/* + @fluid-*`, and `third-party`.
+ */
+function bucketPackageSizes(rows: PackageSizeRow[]): PackageSizeRow[] {
+	const buckets: Record<string, PackageSizeRow> = {
+		tree: { name: "@fluidframework/tree", baseSize: 0, currentSize: 0, diff: 0 },
+		otherFluid: {
+			name: "other @fluidframework/* + @fluid-*",
+			baseSize: 0,
+			currentSize: 0,
+			diff: 0,
+		},
+		thirdParty: { name: "third-party", baseSize: 0, currentSize: 0, diff: 0 },
+	};
+	for (const row of rows) {
+		const bucket =
+			row.name === "@fluidframework/tree"
+				? buckets.tree
+				: row.name.startsWith("@fluidframework/") || row.name.startsWith("@fluid-")
+					? buckets.otherFluid
+					: buckets.thirdParty;
+		bucket.baseSize += row.baseSize;
+		bucket.currentSize += row.currentSize;
+		bucket.diff += row.diff;
+	}
+	return [buckets.tree, buckets.otherFluid, buckets.thirdParty];
+}
+
 /**
  * Computes a structured comparison between the base and current bundles.
  * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
@@ -194,6 +338,13 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 			};
 		});
 
+	// Per-package parsed-size breakdown. Walks each side's module tree (the
+	// `groups` already parsed into `*Nodes`), dedupes modules, and diffs the
+	// resulting per-package maps — then rolls those rows up into the three
+	// headline buckets.
+	const packages = diffPackageSizes(packageSizes(baseNodes), packageSizes(currentNodes));
+	const packageBuckets = bucketPackageSizes(packages);
+
 	return {
 		comparedAt: new Date().toISOString(),
 		baseLabel,
@@ -202,6 +353,8 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 		assets,
 		gzipChangedAssets,
 		entrypoints,
+		packageBuckets,
+		packages,
 	};
 }
 
@@ -286,6 +439,38 @@ function renderAsText(report: ComparisonReport): string {
 		);
 	}
 
+	const emitPackageRows = (rows: PackageSizeRow[], nameWidth: number): void => {
+		emit(
+			"Package".padEnd(nameWidth) +
+				"Base".padStart(12) +
+				"Current".padStart(12) +
+				"Diff".padStart(12) +
+				"% Change".padStart(10),
+		);
+		emit("-".repeat(nameWidth + 46));
+		for (const row of rows) {
+			const percentChange =
+				row.baseSize > 0 && row.diff !== 0
+					? `${((row.diff / row.baseSize) * 100).toFixed(1)}%`
+					: "";
+			emit(
+				row.name.padEnd(nameWidth) +
+					String(row.baseSize).padStart(12) +
+					String(row.currentSize).padStart(12) +
+					formatDiff(row.diff).padStart(12) +
+					percentChange.padStart(10),
+			);
+		}
+	};
+
+	emit();
+	emit("=== Bundle composition by category (parsed size in bytes) ===");
+	emitPackageRows(report.packageBuckets, 40);
+
+	emit();
+	emit("=== Per-package parsed-size comparison ===");
+	emitPackageRows(report.packages, 40);
+
 	return `${lines.join("\n")}\n`;
 }
 

From 94b3c4aa20881f362597516db1e37e100bbdc28c Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 10:18:12 -0700
Subject: [PATCH 42/67] feat(build-cli): add --exact-base to bundle
 collect-and-compare

`flub bundle collect-and-compare` always resolved the base side to the
merge-base of HEAD and --base-revision (the fork point). That's the wrong
anchor when you want to compare the working tree against a specific commit
(e.g. the current commit's parent) rather than the fork point.

Add an --exact-base flag that uses --base-revision as-is, resolved via
`git rev-parse <rev>^{commit}`, instead of computing a merge-base. The
default (merge-base) behavior is unchanged, and the outer repo's working
tree, branch, and stash are still never modified.

- collectAndCompareBundles.ts: add resolveSha() helper and exactBase option;
  branch base resolution on exactBase.
- collect-and-compare.ts: add --exact-base boolean flag, example, and
  pass-through.
- docs/bundle.md: regenerate oclif readme for the new flag.
---
 build-tools/packages/build-cli/docs/bundle.md | 11 ++-
 .../commands/bundle/collect-and-compare.ts    | 11 ++-
 .../bundleSize/collectAndCompareBundles.ts    | 81 +++++++++++++++----
 3 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index 2c7d96b018e9..e806e7e66f15 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -56,8 +56,8 @@ Collect the local bundle and the base-revision (merge-base) bundle, then compare
 
 ```
 USAGE
-  $ flub bundle collect-and-compare [-v | --quiet] [--base-revision <value>] [--package-dir <value>] [--analysis-dir <value>]
-    [--output-dir <value>] [--skip-compare] [--force-clean-build] [--keep-base-repo]
+  $ flub bundle collect-and-compare [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
+    [--analysis-dir <value>] [--output-dir <value>] [--skip-compare] [--force-clean-build] [--keep-base-repo]
 
 FLAGS
   --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to
@@ -65,7 +65,10 @@ FLAGS
   --base-revision=<value>  [default: main] Revision to use as the comparison baseline (branch, tag, or commit SHA). The
                            actual base used is the merge-base of HEAD and this revision (the fork point), so
                            worktree-based setups where 'main' is in an unusual location still produce the expected
-                           comparison.
+                           comparison. Pass --exact-base to use the revision as-is instead.
+  --exact-base             Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the
+                           merge-base with HEAD. Useful for comparing the working tree against a specific commit, e.g.
+                           the current commit's parent.
   --force-clean-build      Run the full workspace clean before each build. Off by default; opt in when stale incremental
                            build state may interfere with the current revision.
   --keep-base-repo         For debugging only: keep the inner base-repo clone after collecting the base bundle. By
@@ -92,6 +95,8 @@ EXAMPLES
 
   $ flub bundle collect-and-compare --base-revision client_v2.100.0
 
+  $ flub bundle collect-and-compare --base-revision 18062854f25 --exact-base
+
   $ flub bundle collect-and-compare --force-clean-build --skip-compare
 ```
 
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
index 497d8bf28f94..2f317081f43c 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
@@ -24,6 +24,7 @@ export default class BundleCollectAndCompare extends BaseCommand<
 		"<%= config.bin %> <%= command.id %>",
 		"<%= config.bin %> <%= command.id %> --base-revision main",
 		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
+		"<%= config.bin %> <%= command.id %> --base-revision 18062854f25 --exact-base",
 		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
 	];
 
@@ -33,9 +34,16 @@ export default class BundleCollectAndCompare extends BaseCommand<
 				"Revision to use as the comparison baseline (branch, tag, or commit SHA). The " +
 				"actual base used is the merge-base of HEAD and this revision (the fork point), so " +
 				"worktree-based setups where 'main' is in an unusual location still produce the " +
-				"expected comparison.",
+				"expected comparison. Pass --exact-base to use the revision as-is instead.",
 			default: "main",
 		}),
+		"exact-base": Flags.boolean({
+			description:
+				"Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking " +
+				"the merge-base with HEAD. Useful for comparing the working tree against a specific " +
+				"commit, e.g. the current commit's parent.",
+			default: false,
+		}),
 		"package-dir": Flags.string({
 			description: "Package root whose webpack bundles are built and compared.",
 			default: ".",
@@ -87,6 +95,7 @@ export default class BundleCollectAndCompare extends BaseCommand<
 
 		await collectAndCompareBundles({
 			baseRevision: flags["base-revision"],
+			exactBase: flags["exact-base"],
 			skipCompare: flags["skip-compare"],
 			forceCleanBuild: flags["force-clean-build"],
 			keepBaseRepo: flags["keep-base-repo"],
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index 260f395462f3..09e6ec443f0f 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -16,10 +16,18 @@ import { compareBundles } from "./compareBundles.js";
  */
 export interface CollectAndCompareBundlesOptions {
 	/**
-	 * Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base
-	 * used is the merge-base of HEAD and this revision (the fork point).
+	 * Revision to use as the comparison baseline (branch, tag, or commit SHA). By default the
+	 * actual base used is the merge-base of HEAD and this revision (the fork point). When
+	 * {@link CollectAndCompareBundlesOptions.exactBase} is set, this revision is used as-is
+	 * (no merge-base).
 	 */
 	readonly baseRevision: string;
+	/**
+	 * Use {@link CollectAndCompareBundlesOptions.baseRevision} as-is (resolved via `rev-parse`)
+	 * instead of taking the merge-base with HEAD. Useful for comparing the working tree against an
+	 * exact commit (e.g. "current vs. its parent") rather than the fork point.
+	 */
+	readonly exactBase?: boolean;
 	/** Collect both bundles, but skip the comparison step. */
 	readonly skipCompare: boolean;
 	/** Run the full workspace clean before each build. */
@@ -65,12 +73,38 @@ async function resolveMergeBase(
 }
 
 /**
- * Orchestrates: {@link collectBundle} (local), then {@link collectBundle} (revision merge-base),
- * then {@link compareBundles}.
+ * Resolves a committish (branch, tag, or SHA) to its full commit SHA via
+ * `git rev-parse <rev>^{commit}`. Unlike {@link resolveMergeBase}, the revision
+ * is used exactly as given (no fork-point computation). Throws if the revision
+ * cannot be resolved locally, with guidance to fetch it first.
+ *
+ * The `^{commit}` peel ensures annotated tags resolve to the underlying commit
+ * rather than the tag object.
+ */
+async function resolveSha(packageDir: string, rev: string): Promise<string> {
+	try {
+		const output = await simpleGit(packageDir).raw(["rev-parse", `${rev}^{commit}`]);
+		const sha = output.trim();
+		if (sha.length > 0) return sha;
+	} catch {
+		// Fall through to the shared error below.
+	}
+	throw new Error(
+		`Could not resolve revision "${rev}" to a commit. ` +
+			`Ensure it exists locally (e.g. "git fetch origin ${rev}").`,
+	);
+}
+
+/**
+ * Orchestrates: {@link collectBundle} (local working tree), then
+ * {@link collectBundle} (base revision), then {@link compareBundles}.
+ *
+ * The base revision is taken as the merge-base of HEAD and `baseRevision` by
+ * default, or used as-is when `exactBase` is set.
  *
  * Labels (used as analysis subdirectory names) are determined automatically:
  * the local bundle is saved under a timestamped "current_<epoch>" label and the
- * base bundle under "main", regardless of the resolved revision SHA, so that
+ * base bundle under "main", regardless of which revision we resolved, so that
  * {@link compareBundles} can find both directories.
  *
  * The outer repo's working tree, branch, and stash are never modified.
@@ -80,6 +114,7 @@ export async function collectAndCompareBundles(
 ): Promise<void> {
 	const {
 		baseRevision: baseRevisionInput,
+		exactBase = false,
 		skipCompare,
 		forceCleanBuild,
 		keepBaseRepo,
@@ -88,19 +123,31 @@ export async function collectAndCompareBundles(
 		outputDir,
 	} = options;
 
-	const resolvedBaseRevision = await resolveMergeBase(packageDir, baseRevisionInput);
-	if (resolvedBaseRevision === undefined) {
-		throw new Error(
-			`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
-				`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
-		);
-	}
-	if (resolvedBaseRevision !== baseRevisionInput) {
-		console.log(
-			`Resolved base revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
-		);
+	// Resolve the base revision. By default we take the merge-base of HEAD and
+	// the requested revision (the fork point); with --exact-base we use the
+	// revision exactly as given (e.g. to compare against a specific parent
+	// commit rather than the fork point).
+	let baseRevision: string;
+	if (exactBase) {
+		baseRevision = await resolveSha(packageDir, baseRevisionInput);
+		if (baseRevision !== baseRevisionInput) {
+			console.log(`Resolved base revision "${baseRevisionInput}" to ${baseRevision}.`);
+		}
+	} else {
+		const resolvedBaseRevision = await resolveMergeBase(packageDir, baseRevisionInput);
+		if (resolvedBaseRevision === undefined) {
+			throw new Error(
+				`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
+					`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
+			);
+		}
+		if (resolvedBaseRevision !== baseRevisionInput) {
+			console.log(
+				`Resolved base revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
+			);
+		}
+		baseRevision = resolvedBaseRevision;
 	}
-	const baseRevision = resolvedBaseRevision;
 	// The inner enlistment used to build the base bundle is a scratch clone, not
 	// report data, so it lives under the output directory rather than alongside
 	// the per-label analyzer reports in analysisDir.

From 26dbd3492143b80bcd1d63713181df1791784bdb Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 12:47:19 -0700
Subject: [PATCH 43/67] Stop writing to bundleAnalysis, only write to
 compareBundlesOutput.

---
 build-tools/packages/build-cli/docs/bundle.md       |  8 ++++----
 .../src/commands/bundle/collect-and-compare.ts      | 13 +++++++------
 .../build-cli/src/commands/bundle/collect.ts        |  4 ++--
 .../build-cli/src/commands/bundle/compare.ts        |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index e806e7e66f15..7997e2bb6321 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -18,7 +18,7 @@ USAGE
 
 FLAGS
   --analysis-dir=<value>  Directory under which per-label analyzer stats are saved. Defaults to
-                          <package-dir>/bundleAnalysis.
+                          <package-dir>/compareBundlesOutput/analysis.
   --force-clean-build     Run the full workspace clean ('npm run clean' at the repo root) before building. Off by
                           default; opt in when stale incremental build state from a previous revision may interfere with
                           the current one.
@@ -60,8 +60,8 @@ USAGE
     [--analysis-dir <value>] [--output-dir <value>] [--skip-compare] [--force-clean-build] [--keep-base-repo]
 
 FLAGS
-  --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to
-                           <package-dir>/bundleAnalysis.
+  --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to an 'analysis'
+                           subdirectory of the output directory (e.g. <package-dir>/compareBundlesOutput/analysis).
   --base-revision=<value>  [default: main] Revision to use as the comparison baseline (branch, tag, or commit SHA). The
                            actual base used is the merge-base of HEAD and this revision (the fork point), so
                            worktree-based setups where 'main' is in an unusual location still produce the expected
@@ -112,7 +112,7 @@ USAGE
     [--current-label <value>]
 
 FLAGS
-  --analysis-dir=<value>   [default: ./bundleAnalysis] Parent directory containing analyzer.json files at
+  --analysis-dir=<value>   [default: ./compareBundlesOutput/analysis] Parent directory containing analyzer.json files at
                            {label}/analyzer.json.
   --base-label=<value>     [default: main] Label subdirectory under --analysis-dir holding the base-side bundle stats.
                            Must match the --label passed to 'flub bundle collect' in revision mode.
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
index 2f317081f43c..aa23956fb7ee 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
@@ -50,8 +50,9 @@ export default class BundleCollectAndCompare extends BaseCommand<
 		}),
 		"analysis-dir": Flags.string({
 			description:
-				"Directory under which per-label analyzer stats are saved. Defaults to " +
-				"<package-dir>/bundleAnalysis.",
+				"Directory under which per-label analyzer stats are saved. Defaults to an " +
+				"'analysis' subdirectory of the output directory (e.g. " +
+				"<package-dir>/compareBundlesOutput/analysis).",
 		}),
 		"output-dir": Flags.string({
 			description:
@@ -84,14 +85,14 @@ export default class BundleCollectAndCompare extends BaseCommand<
 		const { flags } = this;
 
 		const packageDir = resolve(flags["package-dir"]);
-		const analysisDir =
-			flags["analysis-dir"] === undefined
-				? resolve(packageDir, "bundleAnalysis")
-				: resolve(flags["analysis-dir"]);
 		const outputDir =
 			flags["output-dir"] === undefined
 				? resolve(packageDir, "compareBundlesOutput")
 				: resolve(flags["output-dir"]);
+		const analysisDir =
+			flags["analysis-dir"] === undefined
+				? resolve(outputDir, "analysis")
+				: resolve(flags["analysis-dir"]);
 
 		await collectAndCompareBundles({
 			baseRevision: flags["base-revision"],
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index 41d386b2e00a..0a408e09752a 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -53,7 +53,7 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 		"analysis-dir": Flags.string({
 			description:
 				"Directory under which per-label analyzer stats are saved. Defaults to " +
-				"<package-dir>/bundleAnalysis.",
+				"<package-dir>/compareBundlesOutput/analysis.",
 		}),
 		"force-clean-build": Flags.boolean({
 			description:
@@ -77,7 +77,7 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 		const packageDir = resolve(flags["package-dir"]);
 		const analysisDir =
 			flags["analysis-dir"] === undefined
-				? resolve(packageDir, "bundleAnalysis")
+				? resolve(packageDir, "compareBundlesOutput", "analysis")
 				: resolve(flags["analysis-dir"]);
 		const label = flags.label ?? (mode === "revision" ? (revision as string) : "current");
 
diff --git a/build-tools/packages/build-cli/src/commands/bundle/compare.ts b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
index f1985f6a9b99..78a54904f913 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
@@ -28,7 +28,7 @@ export default class BundleCompare extends BaseCommand<typeof BundleCompare> {
 	public static readonly flags = {
 		"analysis-dir": Flags.string({
 			description: "Parent directory containing analyzer.json files at {label}/analyzer.json.",
-			default: "./bundleAnalysis",
+			default: "./compareBundlesOutput/analysis",
 		}),
 		"output-dir": Flags.string({
 			description: "Directory where the .txt and .json comparison reports are written.",

From d2236c5ddde265f3102b38e94351d6db05dc0ac5 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 13:17:27 -0700
Subject: [PATCH 44/67] Reshape bundle composition buckets and clarify
 parsed-size naming

Replace the previous tree / other-Fluid / third-party / total split with
four bundle-wide rows that report tree and all Fluid Framework libraries
both with and without their third-party dependencies:

  - @fluidframework/tree + 3rd-party deps
  - @fluidframework/tree
  - Fluid Framework + 3rd-party deps
  - Fluid Framework

"Fluid Framework" sums every @fluidframework/* and @fluid-* package that
appears in the bundle. Third-party bytes are attributed in full to both
"+ deps" rows, since the flat per-package data carries no per-library
dependency graph to split shared deps between tree and the other
libraries. App/entry harness code is excluded from every bucket.

Add SizeAccumulator / addInto / combineBucket helpers to build the rows.

Rename the asset comparison fields baseStatSize/currentStatSize to
baseParsedSize/currentParsedSize and update the asset-table header from
"stat/parsed size" to "parsed size". These values were already populated
from parsedSize; only the names and header were misleading. All displayed
sizes (assets, entrypoints, per-package, composition buckets) are parsed
bytes.
---
 .../src/library/bundleSize/compareBundles.ts  | 116 ++++++++++++------
 1 file changed, 78 insertions(+), 38 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index db1b1d6691d2..c824de5fda18 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -35,8 +35,8 @@ export interface CompareBundlesOptions {
 
 interface AssetComparison {
 	name: string;
-	baseStatSize: number;
-	currentStatSize: number;
+	baseParsedSize: number;
+	currentParsedSize: number;
 	diff: number;
 }
 
@@ -57,7 +57,7 @@ interface EntrypointRow {
 /**
  * Per-package parsed-size comparison row. `name` is the owning npm package of
  * the contributing modules (e.g. `@fluidframework/tree`, `@sinclair/typebox`),
- * or a synthetic bucket label (e.g. `other @fluidframework/*`).
+ * or a synthetic bucket label (e.g. `Fluid Framework (incl. tree)`).
  */
 interface PackageSizeRow {
 	name: string;
@@ -83,9 +83,11 @@ interface ComparisonReport {
 	/** Per-entrypoint total parsed-size comparison rows */
 	entrypoints: EntrypointRow[];
 	/**
-	 * Three-row headline split of the whole bundle's parsed bytes:
-	 * `@fluidframework/tree`, `other @fluidframework/* + @fluid-*`, and
-	 * `third-party`. Answers "how much of the bundle is tree" at a glance.
+	 * Four-row headline split of the bundle's parsed bytes, all bundle-wide:
+	 * `@fluidframework/tree + 3rd-party deps`, `@fluidframework/tree`,
+	 * `Fluid Framework + 3rd-party deps`, and `Fluid Framework`. Lets you read
+	 * tree and all of Fluid Framework both with and without their third-party
+	 * dependencies. App/entry harness code is excluded.
 	 */
 	packageBuckets: PackageSizeRow[];
 	/**
@@ -234,33 +236,71 @@ function diffPackageSizes(
 		.sort((a, b) => b.currentSize - a.currentSize || a.name.localeCompare(b.name));
 }
 
+/** Whether a package name belongs to Fluid Framework (any `@fluidframework/*` or `@fluid-*`). */
+function isFluidPackage(name: string): boolean {
+	return name.startsWith("@fluidframework/") || name.startsWith("@fluid-");
+}
+
+/** Running parsed-size accumulator (base/current/diff) for a bucket. */
+interface SizeAccumulator {
+	baseSize: number;
+	currentSize: number;
+	diff: number;
+}
+
+function addInto(acc: SizeAccumulator, row: PackageSizeRow): void {
+	acc.baseSize += row.baseSize;
+	acc.currentSize += row.currentSize;
+	acc.diff += row.diff;
+}
+
+function combineBucket(name: string, ...parts: SizeAccumulator[]): PackageSizeRow {
+	return {
+		name,
+		baseSize: parts.reduce((sum, part) => sum + part.baseSize, 0),
+		currentSize: parts.reduce((sum, part) => sum + part.currentSize, 0),
+		diff: parts.reduce((sum, part) => sum + part.diff, 0),
+	};
+}
+
 /**
- * Collapses per-package rows into the three headline buckets:
- * `@fluidframework/tree`, `other @fluidframework/* + @fluid-*`, and `third-party`.
+ * Collapses per-package rows into four headline buckets, all computed
+ * bundle-wide (no webpack entrypoints):
+ *
+ * - `@fluidframework/tree + 3rd-party deps` — tree's own bytes plus every
+ *   third-party package in the bundle.
+ * - `@fluidframework/tree` — tree's own bytes only.
+ * - `Fluid Framework + 3rd-party deps` — all Fluid Framework library bytes
+ *   (`@fluidframework/*` and `@fluid-*`, including tree) plus every third-party
+ *   package in the bundle.
+ * - `Fluid Framework` — all Fluid Framework library bytes only.
+ *
+ * Third-party bytes are attributed in full to both `+ deps` rows: the flat
+ * per-package data carries no per-library dependency graph, so shared
+ * third-party deps cannot be split between tree and the other Fluid libraries.
+ * App/entry harness code (the bundle-size-tests `./src/*` entries) is excluded
+ * from every bucket.
  */
 function bucketPackageSizes(rows: PackageSizeRow[]): PackageSizeRow[] {
-	const buckets: Record<string, PackageSizeRow> = {
-		tree: { name: "@fluidframework/tree", baseSize: 0, currentSize: 0, diff: 0 },
-		otherFluid: {
-			name: "other @fluidframework/* + @fluid-*",
-			baseSize: 0,
-			currentSize: 0,
-			diff: 0,
-		},
-		thirdParty: { name: "third-party", baseSize: 0, currentSize: 0, diff: 0 },
-	};
+	const treeOwn: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
+	const fluidOwn: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
+	const thirdParty: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
+
 	for (const row of rows) {
-		const bucket =
-			row.name === "@fluidframework/tree"
-				? buckets.tree
-				: row.name.startsWith("@fluidframework/") || row.name.startsWith("@fluid-")
-					? buckets.otherFluid
-					: buckets.thirdParty;
-		bucket.baseSize += row.baseSize;
-		bucket.currentSize += row.currentSize;
-		bucket.diff += row.diff;
+		if (row.name === "@fluidframework/tree") addInto(treeOwn, row);
+		if (isFluidPackage(row.name)) {
+			addInto(fluidOwn, row);
+		} else if (row.name !== "(app/entry)") {
+			addInto(thirdParty, row);
+		}
 	}
-	return [buckets.tree, buckets.otherFluid, buckets.thirdParty];
+
+	return [
+		combineBucket("@fluidframework/tree + 3rd-party deps", treeOwn, thirdParty),
+		combineBucket("@fluidframework/tree", treeOwn),
+		combineBucket("Fluid Framework + 3rd-party deps", fluidOwn, thirdParty),
+		combineBucket("Fluid Framework", fluidOwn),
+	];
 }
 
 /**
@@ -290,13 +330,13 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 		.sort()
 		.map((name) => {
 			const { base, compare } = bundleComparison[name];
-			const baseStatSize = base?.parsedSize ?? 0;
-			const currentStatSize = compare?.parsedSize ?? 0;
+			const baseParsedSize = base?.parsedSize ?? 0;
+			const currentParsedSize = compare?.parsedSize ?? 0;
 			return {
 				name,
-				baseStatSize,
-				currentStatSize,
-				diff: currentStatSize - baseStatSize,
+				baseParsedSize,
+				currentParsedSize,
+				diff: currentParsedSize - baseParsedSize,
 			};
 		});
 
@@ -378,7 +418,7 @@ function renderAsText(report: ComparisonReport): string {
 	emit();
 	emit(`=== Bundle Size Comparison: ${report.baseLabel} -> ${report.currentLabel} ===`);
 	emit();
-	emit("All assets (stat/parsed size in bytes):");
+	emit("All assets (parsed size in bytes):");
 	emit(
 		"Asset".padEnd(40) +
 			"Base".padStart(12) +
@@ -389,13 +429,13 @@ function renderAsText(report: ComparisonReport): string {
 	emit("-".repeat(88));
 	for (const row of report.assets) {
 		const percentChange =
-			row.baseStatSize > 0 && row.diff !== 0
-				? `${((row.diff / row.baseStatSize) * 100).toFixed(1)}%`
+			row.baseParsedSize > 0 && row.diff !== 0
+				? `${((row.diff / row.baseParsedSize) * 100).toFixed(1)}%`
 				: "";
 		emit(
 			(row.name + (row.diff === 0 ? "" : " *")).padEnd(40) +
-				String(row.baseStatSize).padStart(12) +
-				String(row.currentStatSize).padStart(12) +
+				String(row.baseParsedSize).padStart(12) +
+				String(row.currentParsedSize).padStart(12) +
 				formatDiff(row.diff).padStart(12) +
 				percentChange.padStart(10),
 		);

From 11c1716cfbf66489fa5e902f7c3e8cffae8ed7cc Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 13:50:22 -0700
Subject: [PATCH 45/67] test(bundle-size-tests): add fluidFrameworkAll
 aggregate entrypoint

Single entrypoint importing every other bundle-size-tests entrypoint so webpack emits one deduplicated, tree-shaking-honest bundle representing the full Fluid Framework footprint. Summing per-entrypoint sizes double-counts shared modules; this gives a real total.
---
 .../src/fluidFrameworkAll.ts                  | 55 +++++++++++++++++++
 .../bundle-size-tests/webpack.config.cjs      |  8 +++
 2 files changed, 63 insertions(+)
 create mode 100644 examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts

diff --git a/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts b/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts
new file mode 100644
index 000000000000..c92704250e4c
--- /dev/null
+++ b/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { apisToBundle as aqueduct } from "./aqueduct.js";
+import { apisToBundle as azureClient } from "./azureClient.js";
+import { apisToBundle as connectionState } from "./connectionState.js";
+import { apisToBundle as containerRuntime } from "./containerRuntimeBundle.js";
+import { apisToBundle as experimentalSharedTree } from "./experimentalSharedTree.js";
+import { apisToBundle as fluidFramework } from "./fluidFramework.js";
+import { apisToBundle as loader } from "./loader.js";
+import { apisToBundle as odspClient } from "./odspClient.js";
+import { apisToBundle as odspDriver } from "./odspDriver.js";
+import { apisToBundle as odspPrefetchSnapshot } from "./odspPrefetchSnapshot.js";
+import { apisToBundle as sharedDirectory } from "./sharedDirectory.js";
+import { apisToBundle as sharedMap } from "./sharedMap.js";
+import { apisToBundle as sharedMatrix } from "./sharedMatrix.js";
+import { apisToBundle as sharedString } from "./sharedString.js";
+import { apisToBundle as sharedTree } from "./sharedTree.js";
+import { apisToBundle as sharedTreeAttributes } from "./sharedTreeAttributes.js";
+
+/**
+ * Aggregate entrypoint that pulls in every other bundle-size-tests entrypoint so
+ * webpack emits a single chunk containing the deduplicated union of all of them.
+ *
+ * Summing the individual per-entrypoint asset sizes double-counts any module
+ * shared between entrypoints, so it cannot yield a real total. This entrypoint
+ * lets webpack dedupe shared modules exactly once while still tree-shaking away
+ * anything none of the entrypoints actually use, giving a single
+ * customer-representative "full Fluid Framework footprint" number.
+ *
+ * `debugAssert` is intentionally excluded: it is a side-effect-only module that
+ * throws at evaluation time and exposes no `apisToBundle` to invoke.
+ */
+export function apisToBundle(): void {
+	// Reference every entrypoint so none of them are tree-shaken out of this
+	// aggregate bundle. The return values are intentionally unused.
+	aqueduct();
+	azureClient();
+	connectionState();
+	containerRuntime();
+	experimentalSharedTree();
+	fluidFramework();
+	loader();
+	odspClient();
+	odspDriver();
+	odspPrefetchSnapshot();
+	sharedDirectory();
+	sharedMap();
+	sharedMatrix();
+	sharedString();
+	sharedTree();
+	sharedTreeAttributes();
+}
diff --git a/examples/utils/bundle-size-tests/webpack.config.cjs b/examples/utils/bundle-size-tests/webpack.config.cjs
index f33c45a30b8e..80af422015fb 100644
--- a/examples/utils/bundle-size-tests/webpack.config.cjs
+++ b/examples/utils/bundle-size-tests/webpack.config.cjs
@@ -74,6 +74,7 @@ module.exports = {
 		directory: "./src/sharedDirectory",
 		experimentalSharedTree: "./src/experimentalSharedTree",
 		fluidFramework: "./src/fluidFramework",
+		fluidFrameworkAll: "./src/fluidFrameworkAll",
 		loader: "./src/loader",
 		map: "./src/sharedMap",
 		matrix: "./src/sharedMatrix",
@@ -90,6 +91,13 @@ module.exports = {
 	},
 	resolve: {
 		extensions: [".tsx", ".ts", ".js"],
+		// This package is an ESM package ("type": "module") compiled with node16 module
+		// resolution, so its relative imports carry explicit `.js` extensions (e.g.
+		// fluidFrameworkAll.ts importing "./sharedTree.js"). Map those back to the `.ts`
+		// sources so webpack's resolver can find them.
+		extensionAlias: {
+			".js": [".ts", ".js"],
+		},
 		// Block the Node-core `assert` polyfill from being bundled. It's very large in browser
 		// builds; consumers should use the assert API in @fluidframework/core-utils instead.
 		fallback: {

From c7de3cfb425296b1a3a80cc4c19c0224846d7dd3 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 4 Jun 2026 16:31:00 -0700
Subject: [PATCH 46/67] fix(build-cli): attribute concatenated modules to their
 real owning package

---
 .../src/library/bundleSize/compareBundles.ts  | 88 ++++++++++++++++---
 1 file changed, 76 insertions(+), 12 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index c824de5fda18..63bff9c2dccb 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -47,6 +47,21 @@ interface GzipRow {
 	diff: number;
 }
 
+/**
+ * One row of the entrypoint totals table. Unlike the synthetic composition
+ * buckets ({@link ComparisonReport.packageBuckets}), every row here corresponds
+ * to a *real* webpack entrypoint — i.e. an actual bundle a consumer downloads,
+ * with shared modules deduplicated within that single bundle. `entrypointName`
+ * is the webpack entry key (e.g. `sharedTree`, `azureClient`, or the aggregate
+ * `fluidFrameworkAll`), and the sizes are that bundle's total parsed bytes.
+ *
+ * Because each row is a self-contained shipped bundle, these sizes are
+ * tree-shaking-honest: a module dropped from an entrypoint shrinks that row even
+ * if other entrypoints still ship it. The flip side is that rows intentionally
+ * overlap (a module shared by N entrypoints is counted in all N), so the rows
+ * must NOT be summed to get a bundle-wide total — use the dedicated
+ * `fluidFrameworkAll` aggregate entrypoint for a single real total instead.
+ */
 interface EntrypointRow {
 	entrypointName: string;
 	baseSize: number;
@@ -80,7 +95,12 @@ interface ComparisonReport {
 	assets: AssetComparison[];
 	/** Gzip size comparison rows for assets whose parsed size changed */
 	gzipChangedAssets: GzipRow[];
-	/** Per-entrypoint total parsed-size comparison rows */
+	/**
+	 * Per-entrypoint total parsed-size comparison rows. Each row maps to a real
+	 * webpack entrypoint (a real shipped bundle); see {@link EntrypointRow}. Rows
+	 * overlap and must not be summed — the aggregate `fluidFrameworkAll`
+	 * entrypoint provides the single deduplicated bundle-wide total.
+	 */
 	entrypoints: EntrypointRow[];
 	/**
 	 * Four-row headline split of the bundle's parsed bytes, all bundle-wide:
@@ -145,6 +165,31 @@ function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
 	return totals;
 }
 
+/**
+ * Strips webpack's module-concatenation (scope-hoisting) wrapper prefix from a
+ * module `path`, returning the path of the *real* module.
+ *
+ * When webpack concatenates modules, every concatenated leaf's `path` is
+ * prefixed with the concatenation root, e.g.:
+ *
+ * ```
+ * ./../../packages/framework/fluid-framework/lib/index.js + 268 modules (concatenated)/../../packages/dds/tree/lib/treeFactory.js
+ * ```
+ *
+ * The text before the last `(concatenated)/` is the wrapper (the barrel that
+ * pulled the module in); the text after it is the real module. Naively reading
+ * the package from such a path picks up the wrapper (here `fluid-framework`)
+ * instead of the true owner (`tree`), so all hoisted modules collapse onto the
+ * barrel package. Anchoring on the last `(concatenated)/` recovers the real
+ * module path. Paths without the marker are returned unchanged.
+ */
+function stripConcatenationWrapper(modulePath: string): string {
+	const normalized = modulePath.replace(/\\/g, "/");
+	const marker = "(concatenated)/";
+	const markerIndex = normalized.lastIndexOf(marker);
+	return markerIndex >= 0 ? normalized.slice(markerIndex + marker.length) : normalized;
+}
+
 /**
  * Extracts the owning npm package name from a webpack-bundle-analyzer module
  * `path`. Handles the three shapes that appear in this repo's bundles:
@@ -157,9 +202,13 @@ function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
  *   Fluid Framework source packages, published as `@fluidframework/<name>`.
  * - **App/entry code:** anything else (e.g. the bundle-size-tests harness's own
  *   `./src/*.ts` entry modules) is grouped under `(app/entry)`.
+ *
+ * Concatenated-module wrapper prefixes are stripped first (see
+ * {@link stripConcatenationWrapper}) so scope-hoisted modules are attributed to
+ * their true owning package rather than the concatenating barrel.
  */
 function packageFromModulePath(modulePath: string): string {
-	const normalized = modulePath.replace(/\\/g, "/");
+	const normalized = stripConcatenationWrapper(modulePath);
 	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
 	if (nodeModulesIndex >= 0) {
 		const rest = normalized.slice(nodeModulesIndex + "node_modules/".length);
@@ -179,11 +228,13 @@ function packageFromModulePath(modulePath: string): string {
  * Produces a stable identity for a module so the same source module reached via
  * different entrypoints (webpack prefixes the path with the concatenating
  * entry, e.g. `./src/sharedTree.ts + 384 modules (concatenated)/...`) collapses
- * to a single key. Anchoring at `node_modules/` or `packages/` strips that
- * per-entry prefix, giving "unique module" dedup semantics.
+ * to a single key. The concatenation wrapper prefix is stripped first (see
+ * {@link stripConcatenationWrapper}), then anchoring at `node_modules/` or
+ * `packages/` removes any remaining per-entry prefix, giving "unique module"
+ * dedup semantics.
  */
 function canonicalModuleKey(modulePath: string): string {
-	const normalized = modulePath.replace(/\\/g, "/");
+	const normalized = stripConcatenationWrapper(modulePath);
 	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
 	if (nodeModulesIndex >= 0) return normalized.slice(nodeModulesIndex);
 	const packagesIndex = normalized.indexOf("packages/");
@@ -192,12 +243,12 @@ function canonicalModuleKey(modulePath: string): string {
 }
 
 /**
- * Walks each asset's `groups` module tree and sums parsed sizes per owning
- * package. Modules are deduplicated by {@link canonicalModuleKey}, so a module
- * shared across multiple entrypoints is counted exactly once (whole-bundle
- * "unique module size" semantics).
+ * Walks a set of asset nodes' `groups` module trees and sums parsed sizes per
+ * owning package. Modules are deduplicated by {@link canonicalModuleKey} using
+ * a single shared `seen` set, so a module reached more than once within this
+ * asset set is counted exactly once.
  */
-function packageSizes(nodes: AnalyzerNode[]): Map<string, number> {
+function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 	const perPackage = new Map<string, number>();
 	const seen = new Set<string>();
 
@@ -215,12 +266,21 @@ function packageSizes(nodes: AnalyzerNode[]): Map<string, number> {
 		perPackage.set(packageName, (perPackage.get(packageName) ?? 0) + (node.parsedSize ?? 0));
 	};
 
-	for (const node of nodes.filter(isJsAsset)) {
+	for (const node of assets) {
 		visit(node);
 	}
 	return perPackage;
 }
 
+/**
+ * Whole-bundle per-package parsed sizes: dedupes modules across every `.js`
+ * asset, so a module shared across multiple entrypoints is counted exactly once
+ * ("unique module size" semantics).
+ */
+function packageSizes(nodes: AnalyzerNode[]): Map<string, number> {
+	return accumulatePackageSizes(nodes.filter(isJsAsset));
+}
+
 /** Diffs two per-package size maps into sorted {@link PackageSizeRow}s. */
 function diffPackageSizes(
 	base: Map<string, number>,
@@ -462,7 +522,11 @@ function renderAsText(report: ComparisonReport): string {
 	}
 
 	emit();
-	emit("=== Named entrypoint total asset sizes ===");
+	// Every row in this table is a REAL webpack entrypoint (a real shipped
+	// bundle, shared modules deduped within it), unlike the synthetic composition
+	// buckets below. Rows overlap and must not be summed; the `fluidFrameworkAll`
+	// aggregate entrypoint gives the single deduplicated bundle-wide total.
+	emit("=== Named entrypoint total asset sizes (each row is a real entrypoint) ===");
 	emit(
 		"Entrypoint".padEnd(30) +
 			"Base".padStart(12) +

From da91a294fde89622327452467e1795cd71f0f183 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 10:40:13 -0700
Subject: [PATCH 47/67] refactor(build-cli): pin composition buckets to
 entrypoints, data-driven definitions

---
 .../src/library/bundleSize/compareBundles.ts  | 167 +++++++++++-------
 1 file changed, 107 insertions(+), 60 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 63bff9c2dccb..52aad735eeed 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -103,17 +103,17 @@ interface ComparisonReport {
 	 */
 	entrypoints: EntrypointRow[];
 	/**
-	 * Four-row headline split of the bundle's parsed bytes, all bundle-wide:
-	 * `@fluidframework/tree + 3rd-party deps`, `@fluidframework/tree`,
-	 * `Fluid Framework + 3rd-party deps`, and `Fluid Framework`. Lets you read
-	 * tree and all of Fluid Framework both with and without their third-party
-	 * dependencies. App/entry harness code is excluded.
+	 * Headline buckets, each pinned to a real entrypoint (never summed across
+	 * entrypoints): SharedTree from `sharedTree`, Fluid Framework from
+	 * `fluidFrameworkAll`, each available with and without third-party deps.
+	 * Defined by {@link bucketDefinitions}.
 	 */
 	packageBuckets: PackageSizeRow[];
 	/**
 	 * Full per-package parsed-size breakdown (one row per owning package),
-	 * sorted by current size descending. Sizes are deduplicated by module so a
-	 * module shared across entrypoints is counted once.
+	 * sorted by current size descending. Scoped to the `fluidFrameworkAll`
+	 * aggregate entrypoint and deduplicated by module, so each package is counted
+	 * once as it appears in that single real bundle.
 	 */
 	packages: PackageSizeRow[];
 }
@@ -272,13 +272,26 @@ function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 	return perPackage;
 }
 
+/** Entrypoint asset for the full deduplicated Fluid Framework footprint (`bundle-size-tests/src/fluidFrameworkAll.ts`). */
+const aggregateEntrypointAsset = "fluidFrameworkAll.js";
+
+/** Entrypoint asset for SharedTree's own bundle (`bundle-size-tests/src/sharedTree.ts`). */
+const treeEntrypointAsset = "sharedTree.js";
+
 /**
- * Whole-bundle per-package parsed sizes: dedupes modules across every `.js`
- * asset, so a module shared across multiple entrypoints is counted exactly once
- * ("unique module size" semantics).
+ * Per-package parsed sizes for a single named entrypoint asset. Walks only that
+ * one asset's module tree, deduping shared modules within it, so every package
+ * is counted exactly once as it actually appears in that real bundle. Returns an
+ * empty map (and warns) if the asset is missing, rather than falling back to a
+ * misleading whole-bundle total.
  */
-function packageSizes(nodes: AnalyzerNode[]): Map<string, number> {
-	return accumulatePackageSizes(nodes.filter(isJsAsset));
+function packageSizesForAsset(nodes: AnalyzerNode[], assetLabel: string): Map<string, number> {
+	const asset = nodes.find((node) => node.label === assetLabel);
+	if (asset === undefined) {
+		console.warn(`Warning: entrypoint asset "${assetLabel}" not found; reporting it as size 0.`);
+		return new Map();
+	}
+	return accumulatePackageSizes([asset]);
 }
 
 /** Diffs two per-package size maps into sorted {@link PackageSizeRow}s. */
@@ -314,53 +327,75 @@ function addInto(acc: SizeAccumulator, row: PackageSizeRow): void {
 	acc.diff += row.diff;
 }
 
-function combineBucket(name: string, ...parts: SizeAccumulator[]): PackageSizeRow {
-	return {
-		name,
-		baseSize: parts.reduce((sum, part) => sum + part.baseSize, 0),
-		currentSize: parts.reduce((sum, part) => sum + part.currentSize, 0),
-		diff: parts.reduce((sum, part) => sum + part.diff, 0),
-	};
+/** Whether a package's bytes are third-party (not a Fluid library, not harness code). */
+function isThirdPartyPackage(name: string): boolean {
+	return !isFluidPackage(name) && name !== "(app/entry)";
 }
 
 /**
- * Collapses per-package rows into four headline buckets, all computed
- * bundle-wide (no webpack entrypoints):
- *
- * - `@fluidframework/tree + 3rd-party deps` — tree's own bytes plus every
- *   third-party package in the bundle.
- * - `@fluidframework/tree` — tree's own bytes only.
- * - `Fluid Framework + 3rd-party deps` — all Fluid Framework library bytes
- *   (`@fluidframework/*` and `@fluid-*`, including tree) plus every third-party
- *   package in the bundle.
- * - `Fluid Framework` — all Fluid Framework library bytes only.
- *
- * Third-party bytes are attributed in full to both `+ deps` rows: the flat
- * per-package data carries no per-library dependency graph, so shared
- * third-party deps cannot be split between tree and the other Fluid libraries.
- * App/entry harness code (the bundle-size-tests `./src/*` entries) is excluded
- * from every bucket.
+ * One headline bucket: which entrypoint to measure, and whether to fold in that
+ * bundle's third-party deps on top of its Fluid Framework bytes. Add a row to
+ * {@link bucketDefinitions} to add a bucket — the rendering is fully
+ * data-driven.
  */
-function bucketPackageSizes(rows: PackageSizeRow[]): PackageSizeRow[] {
-	const treeOwn: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
-	const fluidOwn: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
-	const thirdParty: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
-
-	for (const row of rows) {
-		if (row.name === "@fluidframework/tree") addInto(treeOwn, row);
-		if (isFluidPackage(row.name)) {
-			addInto(fluidOwn, row);
-		} else if (row.name !== "(app/entry)") {
-			addInto(thirdParty, row);
-		}
-	}
+interface BucketDefinition {
+	label: string;
+	/** Entrypoint asset whose deduplicated module tree this bucket is measured from. */
+	asset: string;
+	/** Whether to also include every third-party package in the same bundle. */
+	withThirdParty: boolean;
+}
 
-	return [
-		combineBucket("@fluidframework/tree + 3rd-party deps", treeOwn, thirdParty),
-		combineBucket("@fluidframework/tree", treeOwn),
-		combineBucket("Fluid Framework + 3rd-party deps", fluidOwn, thirdParty),
-		combineBucket("Fluid Framework", fluidOwn),
-	];
+/**
+ * Headline buckets, each pinned to a real entrypoint — never summed across
+ * entrypoints, which would double-count shared modules. SharedTree is measured
+ * from its own `sharedTree` bundle; Fluid Framework from the `fluidFrameworkAll`
+ * aggregate bundle. Each bucket counts every Fluid Framework package in its
+ * bundle (the entrypoint's full Fluid footprint, not just one package); a
+ * `+ 3rd-party deps` row also folds in every third-party package in that same
+ * bundle. Third-party bytes can't be split between libraries (the flat
+ * per-package data has no dependency graph). Harness code is always excluded
+ * (see {@link isThirdPartyPackage}).
+ */
+const bucketDefinitions: readonly BucketDefinition[] = [
+	{
+		label: "SharedTree + 3rd-party deps",
+		asset: treeEntrypointAsset,
+		withThirdParty: true,
+	},
+	{
+		label: "SharedTree",
+		asset: treeEntrypointAsset,
+		withThirdParty: false,
+	},
+	{
+		label: "Fluid Framework + 3rd-party deps",
+		asset: aggregateEntrypointAsset,
+		withThirdParty: true,
+	},
+	{
+		label: "Fluid Framework",
+		asset: aggregateEntrypointAsset,
+		withThirdParty: false,
+	},
+];
+
+/**
+ * Computes the headline buckets from {@link bucketDefinitions}. `rowsForAsset`
+ * returns the entrypoint-scoped, diffed per-package rows for a given asset.
+ */
+function bucketPackageSizes(
+	rowsForAsset: (asset: string) => PackageSizeRow[],
+): PackageSizeRow[] {
+	return bucketDefinitions.map((def) => {
+		const acc: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
+		for (const row of rowsForAsset(def.asset)) {
+			if (isFluidPackage(row.name) || (def.withThirdParty && isThirdPartyPackage(row.name))) {
+				addInto(acc, row);
+			}
+		}
+		return { name: def.label, ...acc };
+	});
 }
 
 /**
@@ -438,12 +473,24 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 			};
 		});
 
-	// Per-package parsed-size breakdown. Walks each side's module tree (the
-	// `groups` already parsed into `*Nodes`), dedupes modules, and diffs the
-	// resulting per-package maps — then rolls those rows up into the three
-	// headline buckets.
-	const packages = diffPackageSizes(packageSizes(baseNodes), packageSizes(currentNodes));
-	const packageBuckets = bucketPackageSizes(packages);
+	// Per-package parsed-size breakdowns, each scoped to a single real
+	// entrypoint (not a sum over entrypoints). Cached per asset because each
+	// entrypoint feeds more than one headline bucket. Each walk dedupes modules
+	// within its asset before the two sides are diffed.
+	const rowsByAsset = new Map<string, PackageSizeRow[]>();
+	const rowsForAsset = (asset: string): PackageSizeRow[] => {
+		let rows = rowsByAsset.get(asset);
+		if (rows === undefined) {
+			rows = diffPackageSizes(
+				packageSizesForAsset(baseNodes, asset),
+				packageSizesForAsset(currentNodes, asset),
+			);
+			rowsByAsset.set(asset, rows);
+		}
+		return rows;
+	};
+	const packageBuckets = bucketPackageSizes(rowsForAsset);
+	const packages = rowsForAsset(aggregateEntrypointAsset);
 
 	return {
 		comparedAt: new Date().toISOString(),

From 37247a73fa58a59c36a8d18ec092488247bf7443 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 10:57:02 -0700
Subject: [PATCH 48/67] refactor(build-cli): unify comparison rows and table
 rendering in compareBundles

---
 .../src/library/bundleSize/compareBundles.ts  | 471 ++++++++----------
 1 file changed, 214 insertions(+), 257 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 52aad735eeed..643f9adc3fdf 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -9,6 +9,7 @@ import { resolve } from "node:path";
 import type { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 
 import { compareJsonReports } from "./compareJsonReports.js";
+import type { BundlesComparison } from "./types.js";
 
 /**
  * A single node from webpack-bundle-analyzer's JSON report
@@ -33,94 +34,61 @@ export interface CompareBundlesOptions {
 	readonly currentLabel: string;
 }
 
-interface AssetComparison {
-	name: string;
-	baseParsedSize: number;
-	currentParsedSize: number;
-	diff: number;
-}
-
-interface GzipRow {
-	name: string;
-	baseGzipSize: number;
-	currentGzipSize: number;
-	diff: number;
-}
-
 /**
- * One row of the entrypoint totals table. Unlike the synthetic composition
- * buckets ({@link ComparisonReport.packageBuckets}), every row here corresponds
- * to a *real* webpack entrypoint — i.e. an actual bundle a consumer downloads,
- * with shared modules deduplicated within that single bundle. `entrypointName`
- * is the webpack entry key (e.g. `sharedTree`, `azureClient`, or the aggregate
- * `fluidFrameworkAll`), and the sizes are that bundle's total parsed bytes.
- *
- * Because each row is a self-contained shipped bundle, these sizes are
- * tree-shaking-honest: a module dropped from an entrypoint shrinks that row even
- * if other entrypoints still ship it. The flip side is that rows intentionally
- * overlap (a module shared by N entrypoints is counted in all N), so the rows
- * must NOT be summed to get a bundle-wide total — use the dedicated
- * `fluidFrameworkAll` aggregate entrypoint for a single real total instead.
+ * One comparison row: a named measurement — an asset, entrypoint, owning
+ * package, or synthetic composition bucket — sized on both the base and current
+ * side, with `diff = current - base`. Every output set in the report is a list
+ * of these, so they share one factory ({@link makeRow}) and one renderer
+ * ({@link renderTable}). The unit of `base`/`current` depends on which list the
+ * row lives in: parsed bytes for most, gzip bytes for `gzipChangedAssets`.
  */
-interface EntrypointRow {
-	entrypointName: string;
-	baseSize: number;
-	currentSize: number;
+interface ComparisonRow {
+	name: string;
+	base: number;
+	current: number;
 	diff: number;
 }
 
-/**
- * Per-package parsed-size comparison row. `name` is the owning npm package of
- * the contributing modules (e.g. `@fluidframework/tree`, `@sinclair/typebox`),
- * or a synthetic bucket label (e.g. `Fluid Framework (incl. tree)`).
- */
-interface PackageSizeRow {
-	name: string;
-	baseSize: number;
-	currentSize: number;
-	diff: number;
+/** Builds a {@link ComparisonRow}, deriving `diff` from the two sides. */
+function makeRow(name: string, base: number, current: number): ComparisonRow {
+	return { name, base, current, diff: current - base };
 }
 
 /** Structured comparison report written to the JSON output file. */
 interface ComparisonReport {
-	/** ISO timestamp of when the comparison was generated */
+	/** ISO timestamp of when the comparison was generated. */
 	comparedAt: string;
-	/** Label subdirectory holding the base-side bundle stats */
+	/** Label subdirectory holding the base-side bundle stats. */
 	baseLabel: string;
-	/** Label subdirectory holding the current-side bundle stats */
+	/** Label subdirectory holding the current-side bundle stats. */
 	currentLabel: string;
-	/** Parent directory containing the per-label bundle stats */
+	/** Parent directory containing the per-label bundle stats. */
 	analysisDirectory: string;
-	/** Per-asset parsed-size comparison rows */
-	assets: AssetComparison[];
-	/** Gzip size comparison rows for assets whose parsed size changed */
-	gzipChangedAssets: GzipRow[];
+	/** Parsed-size rows for every emitted JS asset (changed or not). */
+	assets: ComparisonRow[];
+	/** Gzip-size rows, limited to assets whose parsed size changed. */
+	gzipChangedAssets: ComparisonRow[];
 	/**
-	 * Per-entrypoint total parsed-size comparison rows. Each row maps to a real
-	 * webpack entrypoint (a real shipped bundle); see {@link EntrypointRow}. Rows
-	 * overlap and must not be summed — the aggregate `fluidFrameworkAll`
-	 * entrypoint provides the single deduplicated bundle-wide total.
+	 * Per-entrypoint total parsed-size rows. Each row is a real shipped bundle;
+	 * see {@link compareEntrypointTotals}. Rows overlap and must not be summed —
+	 * the aggregate `fluidFrameworkAll` entrypoint is the single deduplicated
+	 * bundle-wide total.
 	 */
-	entrypoints: EntrypointRow[];
+	entrypoints: ComparisonRow[];
 	/**
-	 * Headline buckets, each pinned to a real entrypoint (never summed across
-	 * entrypoints): SharedTree from `sharedTree`, Fluid Framework from
-	 * `fluidFrameworkAll`, each available with and without third-party deps.
-	 * Defined by {@link bucketDefinitions}.
+	 * Headline composition buckets, each pinned to a real entrypoint (never
+	 * summed across entrypoints); see {@link bucketDefinitions}.
 	 */
-	packageBuckets: PackageSizeRow[];
+	packageBuckets: ComparisonRow[];
 	/**
-	 * Full per-package parsed-size breakdown (one row per owning package),
-	 * sorted by current size descending. Scoped to the `fluidFrameworkAll`
-	 * aggregate entrypoint and deduplicated by module, so each package is counted
-	 * once as it appears in that single real bundle.
+	 * Full per-package breakdown (one row per owning package, sorted by current
+	 * size descending), scoped to the `fluidFrameworkAll` aggregate entrypoint and
+	 * deduplicated by module.
 	 */
-	packages: PackageSizeRow[];
+	packages: ComparisonRow[];
 }
 
-function sanitizeForFileName(value: string): string {
-	return value.replaceAll(/[^\w.-]/g, "_");
-}
+// --- Loading analyzer reports & asset helpers ---
 
 /**
  * Loads webpack-bundle-analyzer's JSON report for a label. If the file does not
@@ -165,6 +133,8 @@ function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
 	return totals;
 }
 
+// --- Module -> owning-package attribution ---
+
 /**
  * Strips webpack's module-concatenation (scope-hoisting) wrapper prefix from a
  * module `path`, returning the path of the *real* module.
@@ -272,6 +242,8 @@ function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 	return perPackage;
 }
 
+// --- Composition buckets ---
+
 /** Entrypoint asset for the full deduplicated Fluid Framework footprint (`bundle-size-tests/src/fluidFrameworkAll.ts`). */
 const aggregateEntrypointAsset = "fluidFrameworkAll.js";
 
@@ -288,25 +260,23 @@ const treeEntrypointAsset = "sharedTree.js";
 function packageSizesForAsset(nodes: AnalyzerNode[], assetLabel: string): Map<string, number> {
 	const asset = nodes.find((node) => node.label === assetLabel);
 	if (asset === undefined) {
-		console.warn(`Warning: entrypoint asset "${assetLabel}" not found; reporting it as size 0.`);
+		console.warn(
+			`Warning: entrypoint asset "${assetLabel}" not found; reporting it as size 0.`,
+		);
 		return new Map();
 	}
 	return accumulatePackageSizes([asset]);
 }
 
-/** Diffs two per-package size maps into sorted {@link PackageSizeRow}s. */
+/** Diffs two per-package size maps into {@link ComparisonRow}s, largest first. */
 function diffPackageSizes(
 	base: Map<string, number>,
 	current: Map<string, number>,
-): PackageSizeRow[] {
+): ComparisonRow[] {
+	// Missing on a side is treated as size 0 (added/removed package).
 	return [...new Set([...base.keys(), ...current.keys()])]
-		.map((name) => {
-			// Missing on a side is treated as size 0 (added/removed package).
-			const baseSize = base.get(name) ?? 0;
-			const currentSize = current.get(name) ?? 0;
-			return { name, baseSize, currentSize, diff: currentSize - baseSize };
-		})
-		.sort((a, b) => b.currentSize - a.currentSize || a.name.localeCompare(b.name));
+		.map((name) => makeRow(name, base.get(name) ?? 0, current.get(name) ?? 0))
+		.sort((a, b) => b.current - a.current || a.name.localeCompare(b.name));
 }
 
 /** Whether a package name belongs to Fluid Framework (any `@fluidframework/*` or `@fluid-*`). */
@@ -314,19 +284,6 @@ function isFluidPackage(name: string): boolean {
 	return name.startsWith("@fluidframework/") || name.startsWith("@fluid-");
 }
 
-/** Running parsed-size accumulator (base/current/diff) for a bucket. */
-interface SizeAccumulator {
-	baseSize: number;
-	currentSize: number;
-	diff: number;
-}
-
-function addInto(acc: SizeAccumulator, row: PackageSizeRow): void {
-	acc.baseSize += row.baseSize;
-	acc.currentSize += row.currentSize;
-	acc.diff += row.diff;
-}
-
 /** Whether a package's bytes are third-party (not a Fluid library, not harness code). */
 function isThirdPartyPackage(name: string): boolean {
 	return !isFluidPackage(name) && name !== "(app/entry)";
@@ -382,103 +339,106 @@ const bucketDefinitions: readonly BucketDefinition[] = [
 
 /**
  * Computes the headline buckets from {@link bucketDefinitions}. `rowsForAsset`
- * returns the entrypoint-scoped, diffed per-package rows for a given asset.
+ * returns the entrypoint-scoped, diffed per-package rows for a given asset; each
+ * bucket sums its bundle's Fluid packages (plus third-party deps when asked).
  */
 function bucketPackageSizes(
-	rowsForAsset: (asset: string) => PackageSizeRow[],
-): PackageSizeRow[] {
+	rowsForAsset: (asset: string) => ComparisonRow[],
+): ComparisonRow[] {
 	return bucketDefinitions.map((def) => {
-		const acc: SizeAccumulator = { baseSize: 0, currentSize: 0, diff: 0 };
+		let base = 0;
+		let current = 0;
 		for (const row of rowsForAsset(def.asset)) {
 			if (isFluidPackage(row.name) || (def.withThirdParty && isThirdPartyPackage(row.name))) {
-				addInto(acc, row);
+				base += row.base;
+				current += row.current;
 			}
 		}
-		return { name: def.label, ...acc };
+		return makeRow(def.label, base, current);
 	});
 }
 
+// --- Comparison computation ---
+
 /**
- * Computes a structured comparison between the base and current bundles.
- * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
- * report) and does no other I/O. Parsed and gzip sizes come straight from that
- * report, so no webpack stats decompression or on-disk gzipping is needed.
- *
- * The per-asset size diff is produced by the shared {@link compareJsonReports}
- * primitive; this function adds the JS-asset filter, gzip-changed rows, and
- * per-entrypoint aggregation (which needs the raw `isInitialByEntrypoint` data
- * not carried by the comparison's `BundleData`).
+ * Parsed-size rows for every emitted JS asset (source maps excluded). Sizes come
+ * straight from the shared {@link compareJsonReports} primitive; an asset
+ * present on only one side is treated as size 0 on the other.
  */
-function computeComparison(options: CompareBundlesOptions): ComparisonReport {
-	const { baseLabel, currentLabel, analysisDirectory } = options;
-
-	const baseNodes = loadAnalyzer(analysisDirectory, baseLabel);
-	const currentNodes = loadAnalyzer(analysisDirectory, currentLabel);
-
-	// Shared primitive: per-asset { base?, compare? } size data keyed by asset
-	// label. It filters to `isAsset` entries; we further restrict to JS assets
-	// (excluding source maps) below to match this report's scope.
-	const bundleComparison = compareJsonReports(baseNodes, currentNodes);
-
-	const assets: AssetComparison[] = Object.keys(bundleComparison)
+function compareAssetSizes(bundleComparison: BundlesComparison): ComparisonRow[] {
+	return Object.keys(bundleComparison)
 		.filter((name) => isJsAssetName(name))
 		.sort()
 		.map((name) => {
 			const { base, compare } = bundleComparison[name];
-			const baseParsedSize = base?.parsedSize ?? 0;
-			const currentParsedSize = compare?.parsedSize ?? 0;
-			return {
-				name,
-				baseParsedSize,
-				currentParsedSize,
-				diff: currentParsedSize - baseParsedSize,
-			};
+			return makeRow(name, base?.parsedSize ?? 0, compare?.parsedSize ?? 0);
 		});
+}
 
-	const gzipChangedAssets: GzipRow[] = assets
+/**
+ * Gzip-size rows for the assets whose parsed size changed. A missing side is
+ * size 0: an asset present in only one revision (e.g. webpack auto-generated
+ * vendor chunks whose hash-based names change) is a genuine delta, not missing
+ * data.
+ */
+function compareGzipChangedAssets(
+	assets: ComparisonRow[],
+	bundleComparison: BundlesComparison,
+): ComparisonRow[] {
+	return assets
 		.filter((row) => row.diff !== 0)
 		.map((row) => {
-			// Missing assets are treated as size 0: an asset present in only one revision
-			// (e.g. webpack auto-generated vendor chunks whose hash-based names change)
-			// represents a genuine delta, not missing data.
 			const { base, compare } = bundleComparison[row.name];
-			const baseGzipSize = base?.gzipSize ?? 0;
-			const currentGzipSize = compare?.gzipSize ?? 0;
-			return {
-				name: row.name,
-				baseGzipSize,
-				currentGzipSize,
-				diff: currentGzipSize - baseGzipSize,
-			};
+			return makeRow(row.name, base?.gzipSize ?? 0, compare?.gzipSize ?? 0);
 		});
+}
 
-	// Sum each entrypoint's initial-chunk parsed sizes. This reads the raw nodes
-	// directly because `isInitialByEntrypoint` is not part of the comparison's
-	// per-asset `BundleData`.
+/**
+ * Per-entrypoint total parsed-size rows, sorted by name. Reads the raw nodes
+ * directly because the per-entrypoint totals come from `isInitialByEntrypoint`,
+ * which the comparison's per-asset `BundleData` does not carry. Webpack's
+ * numeric-id split chunks are filtered out so only named entrypoints remain.
+ */
+function compareEntrypointTotals(
+	baseNodes: AnalyzerNode[],
+	currentNodes: AnalyzerNode[],
+): ComparisonRow[] {
 	const baseEntrypoints = entrypointSizes(baseNodes);
 	const currentEntrypoints = entrypointSizes(currentNodes);
-	const entrypoints: EntrypointRow[] = [
-		...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)]),
-	]
-		.filter((entrypointName) => !/^\d/.test(entrypointName))
+	return [...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)])]
+		.filter((name) => !/^\d/.test(name))
 		.sort()
-		.map((entrypointName) => {
-			const baseSize = baseEntrypoints[entrypointName] ?? 0;
-			const currentSize = currentEntrypoints[entrypointName] ?? 0;
-			return {
-				entrypointName,
-				baseSize,
-				currentSize,
-				diff: currentSize - baseSize,
-			};
-		});
+		.map((name) => makeRow(name, baseEntrypoints[name] ?? 0, currentEntrypoints[name] ?? 0));
+}
 
-	// Per-package parsed-size breakdowns, each scoped to a single real
-	// entrypoint (not a sum over entrypoints). Cached per asset because each
-	// entrypoint feeds more than one headline bucket. Each walk dedupes modules
-	// within its asset before the two sides are diffed.
-	const rowsByAsset = new Map<string, PackageSizeRow[]>();
-	const rowsForAsset = (asset: string): PackageSizeRow[] => {
+/**
+ * Computes a structured comparison between the base and current bundles.
+ * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
+ * report) and does no other I/O. Parsed and gzip sizes come straight from that
+ * report, so no webpack stats decompression or on-disk gzipping is needed. Each
+ * output set is produced by its own focused helper:
+ *
+ * - {@link compareAssetSizes} / {@link compareGzipChangedAssets} — per-asset.
+ * - {@link compareEntrypointTotals} — per real entrypoint.
+ * - {@link bucketPackageSizes} / `packages` — per-package, scoped to a single
+ *   entrypoint via the memoized `rowsForAsset` below.
+ */
+function computeComparison(options: CompareBundlesOptions): ComparisonReport {
+	const { baseLabel, currentLabel, analysisDirectory } = options;
+
+	const baseNodes = loadAnalyzer(analysisDirectory, baseLabel);
+	const currentNodes = loadAnalyzer(analysisDirectory, currentLabel);
+
+	// Shared primitive: per-asset { base?, compare? } size data keyed by asset
+	// label, restricted to JS assets (excluding source maps) by the helpers below.
+	const bundleComparison = compareJsonReports(baseNodes, currentNodes);
+	const assets = compareAssetSizes(bundleComparison);
+
+	// Per-package rows are each scoped to a single real entrypoint (not a sum
+	// over entrypoints), deduping modules within that asset before diffing.
+	// Memoized because each entrypoint feeds more than one headline bucket.
+	const rowsByAsset = new Map<string, ComparisonRow[]>();
+	const rowsForAsset = (asset: string): ComparisonRow[] => {
 		let rows = rowsByAsset.get(asset);
 		if (rows === undefined) {
 			rows = diffPackageSizes(
@@ -489,8 +449,6 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 		}
 		return rows;
 	};
-	const packageBuckets = bucketPackageSizes(rowsForAsset);
-	const packages = rowsForAsset(aggregateEntrypointAsset);
 
 	return {
 		comparedAt: new Date().toISOString(),
@@ -498,19 +456,69 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 		currentLabel,
 		analysisDirectory,
 		assets,
-		gzipChangedAssets,
-		entrypoints,
-		packageBuckets,
-		packages,
+		gzipChangedAssets: compareGzipChangedAssets(assets, bundleComparison),
+		entrypoints: compareEntrypointTotals(baseNodes, currentNodes),
+		packageBuckets: bucketPackageSizes(rowsForAsset),
+		packages: rowsForAsset(aggregateEntrypointAsset),
 	};
 }
 
+// --- Text rendering ---
+
 /** Formats a signed diff as "-", "+N", or "-N". */
 function formatDiff(diff: number): string {
 	if (diff === 0) return "-";
 	return diff > 0 ? `+${diff}` : `${diff}`;
 }
 
+/** Column widths shared by every comparison table. */
+const nameColumnWidth = 40;
+const valueColumnWidth = 12;
+const percentColumnWidth = 10;
+
+/** One rendered section: a banner heading over a {@link ComparisonRow} table. */
+interface TableSpec {
+	/** Banner text (rendered inside `=== ... ===`). */
+	heading: string;
+	/** Header for the name column (e.g. "Asset", "Entrypoint", "Package"). */
+	nameHeader: string;
+	/** Rows to render. */
+	rows: ComparisonRow[];
+	/** Append a base-relative "% Change" column. */
+	showPercent?: boolean;
+	/** Flag changed rows with a trailing " *". */
+	markChanged?: boolean;
+}
+
+/** Renders one {@link TableSpec} (banner, header, separator, rows) via `emit`. */
+function renderTable(emit: (line?: string) => void, spec: TableSpec): void {
+	const { heading, nameHeader, rows, showPercent = false, markChanged = false } = spec;
+	const cell = (value: string): string => value.padStart(valueColumnWidth);
+
+	let header =
+		nameHeader.padEnd(nameColumnWidth) + cell("Base") + cell("Current") + cell("Diff");
+	if (showPercent) header += "% Change".padStart(percentColumnWidth);
+
+	emit();
+	emit(`=== ${heading} ===`);
+	emit(header);
+	emit("-".repeat(header.length));
+	for (const row of rows) {
+		const name = row.name + (markChanged && row.diff !== 0 ? " *" : "");
+		let line =
+			name.padEnd(nameColumnWidth) +
+			cell(String(row.base)) +
+			cell(String(row.current)) +
+			cell(formatDiff(row.diff));
+		if (showPercent) {
+			const percent =
+				row.base > 0 && row.diff !== 0 ? `${((row.diff / row.base) * 100).toFixed(1)}%` : "";
+			line += percent.padStart(percentColumnWidth);
+		}
+		emit(line);
+	}
+}
+
 /**
  * Renders a {@link ComparisonReport} as a human-readable text report.
  * Also echoes each line to the console.
@@ -524,105 +532,54 @@ function renderAsText(report: ComparisonReport): string {
 
 	emit();
 	emit(`=== Bundle Size Comparison: ${report.baseLabel} -> ${report.currentLabel} ===`);
-	emit();
-	emit("All assets (parsed size in bytes):");
-	emit(
-		"Asset".padEnd(40) +
-			"Base".padStart(12) +
-			"Current".padStart(12) +
-			"Diff".padStart(12) +
-			"% Change".padStart(10),
-	);
-	emit("-".repeat(88));
-	for (const row of report.assets) {
-		const percentChange =
-			row.baseParsedSize > 0 && row.diff !== 0
-				? `${((row.diff / row.baseParsedSize) * 100).toFixed(1)}%`
-				: "";
-		emit(
-			(row.name + (row.diff === 0 ? "" : " *")).padEnd(40) +
-				String(row.baseParsedSize).padStart(12) +
-				String(row.currentParsedSize).padStart(12) +
-				formatDiff(row.diff).padStart(12) +
-				percentChange.padStart(10),
-		);
-	}
 
+	// Asset-level sections: per-emitted-file sizes, independent of entrypoints.
+	renderTable(emit, {
+		heading: "All assets (parsed size in bytes)",
+		nameHeader: "Asset",
+		rows: report.assets,
+		showPercent: true,
+		markChanged: true,
+	});
 	if (report.gzipChangedAssets.length > 0) {
-		emit();
-		emit("=== Gzip sizes for changed assets ===");
-		emit(
-			"Asset".padEnd(40) +
-				"Base Gzip".padStart(14) +
-				"Current Gzip".padStart(14) +
-				"Diff".padStart(12),
-		);
-		emit("-".repeat(82));
-		for (const row of report.gzipChangedAssets) {
-			emit(
-				row.name.padEnd(40) +
-					String(row.baseGzipSize).padStart(14) +
-					String(row.currentGzipSize).padStart(14) +
-					formatDiff(row.diff).padStart(12),
-			);
-		}
+		renderTable(emit, {
+			heading: "Gzip sizes for changed assets",
+			nameHeader: "Asset",
+			rows: report.gzipChangedAssets,
+		});
 	}
 
-	emit();
-	// Every row in this table is a REAL webpack entrypoint (a real shipped
-	// bundle, shared modules deduped within it), unlike the synthetic composition
-	// buckets below. Rows overlap and must not be summed; the `fluidFrameworkAll`
-	// aggregate entrypoint gives the single deduplicated bundle-wide total.
-	emit("=== Named entrypoint total asset sizes (each row is a real entrypoint) ===");
-	emit(
-		"Entrypoint".padEnd(30) +
-			"Base".padStart(12) +
-			"Current".padStart(12) +
-			"Diff".padStart(12),
-	);
-	emit("-".repeat(68));
-	for (const row of report.entrypoints) {
-		emit(
-			row.entrypointName.padEnd(30) +
-				String(row.baseSize).padStart(12) +
-				String(row.currentSize).padStart(12) +
-				formatDiff(row.diff).padStart(12),
-		);
-	}
+	// Entrypoint-level section: each row is a real shipped bundle. Rows overlap
+	// and must not be summed; the `fluidFrameworkAll` aggregate entrypoint gives
+	// the single deduplicated bundle-wide total.
+	renderTable(emit, {
+		heading: "Named entrypoint total asset sizes (each row is a real entrypoint)",
+		nameHeader: "Entrypoint",
+		rows: report.entrypoints,
+	});
 
-	const emitPackageRows = (rows: PackageSizeRow[], nameWidth: number): void => {
-		emit(
-			"Package".padEnd(nameWidth) +
-				"Base".padStart(12) +
-				"Current".padStart(12) +
-				"Diff".padStart(12) +
-				"% Change".padStart(10),
-		);
-		emit("-".repeat(nameWidth + 46));
-		for (const row of rows) {
-			const percentChange =
-				row.baseSize > 0 && row.diff !== 0
-					? `${((row.diff / row.baseSize) * 100).toFixed(1)}%`
-					: "";
-			emit(
-				row.name.padEnd(nameWidth) +
-					String(row.baseSize).padStart(12) +
-					String(row.currentSize).padStart(12) +
-					formatDiff(row.diff).padStart(12) +
-					percentChange.padStart(10),
-			);
-		}
-	};
+	// Package-level sections: composition buckets, then the full breakdown. Both
+	// are scoped to real entrypoints (see bucketDefinitions / ComparisonReport).
+	renderTable(emit, {
+		heading: "Bundle composition by category (parsed size in bytes)",
+		nameHeader: "Package",
+		rows: report.packageBuckets,
+		showPercent: true,
+	});
+	renderTable(emit, {
+		heading: "Per-package parsed-size comparison",
+		nameHeader: "Package",
+		rows: report.packages,
+		showPercent: true,
+	});
 
-	emit();
-	emit("=== Bundle composition by category (parsed size in bytes) ===");
-	emitPackageRows(report.packageBuckets, 40);
+	return `${lines.join("\n")}\n`;
+}
 
-	emit();
-	emit("=== Per-package parsed-size comparison ===");
-	emitPackageRows(report.packages, 40);
+// --- File output ---
 
-	return `${lines.join("\n")}\n`;
+function sanitizeForFileName(value: string): string {
+	return value.replaceAll(/[^\w.-]/g, "_");
 }
 
 /**

From a8a53ade5741d502516e8c2583c8896f036aee15 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 12:35:37 -0700
Subject: [PATCH 49/67] refactor(build-cli): unify per-package bundle
 comparison and document the report

Merge bucketPackageSizes and the inline rowsForAsset memoization closure
into a single comparePackages(baseNodes, currentNodes) that returns both
the composition buckets and the full per-package breakdown. The
fluidFrameworkAll breakdown now reuses the rows already memoized during
the bucket pass instead of walking that asset's module tree a second time.

Also:
- Rename computeComparison -> computeBundleComparison for clarity.
- Filter the gzip asset table on its own gzip diff rather than on the
  parsed-size change set, so gzip-only changes are no longer hidden and
  parsed-only changes no longer show up as noise rows.
- Document the report's tables, measurement units (parsed vs gzip), and
  attribution rules in the bundle-size-tests README.

Behavior-preserving: bundle compare output is byte-identical.
---
 .../src/library/bundleSize/compareBundles.ts  | 145 ++++++++++--------
 examples/utils/bundle-size-tests/README.md    |  83 ++++++++++
 2 files changed, 161 insertions(+), 67 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 643f9adc3fdf..aafc5ba2f271 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -66,7 +66,7 @@ interface ComparisonReport {
 	analysisDirectory: string;
 	/** Parsed-size rows for every emitted JS asset (changed or not). */
 	assets: ComparisonRow[];
-	/** Gzip-size rows, limited to assets whose parsed size changed. */
+	/** Gzip-size rows, limited to assets whose gzip size changed. */
 	gzipChangedAssets: ComparisonRow[];
 	/**
 	 * Per-entrypoint total parsed-size rows. Each row is a real shipped bundle;
@@ -201,7 +201,7 @@ function packageFromModulePath(modulePath: string): string {
  * to a single key. The concatenation wrapper prefix is stripped first (see
  * {@link stripConcatenationWrapper}), then anchoring at `node_modules/` or
  * `packages/` removes any remaining per-entry prefix, giving "unique module"
- * dedup semantics.
+ * dedupe semantics.
  */
 function canonicalModuleKey(modulePath: string): string {
 	const normalized = stripConcatenationWrapper(modulePath);
@@ -223,6 +223,10 @@ function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 	const seen = new Set<string>();
 
 	const visit = (node: AnalyzerNode): void => {
+		// A node with children is an aggregate (asset, directory, or concatenated
+		// wrapper) whose parsedSize is just the sum of its descendants. Recurse into
+		// the children and skip the parent so those bytes are not double-counted;
+		// only childless leaf modules carry a real path and standalone size.
 		if (node.groups !== undefined && node.groups.length > 0) {
 			for (const child of node.groups) visit(child);
 			return;
@@ -244,11 +248,13 @@ function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 
 // --- Composition buckets ---
 
-/** Entrypoint asset for the full deduplicated Fluid Framework footprint (`bundle-size-tests/src/fluidFrameworkAll.ts`). */
-const aggregateEntrypointAsset = "fluidFrameworkAll.js";
-
-/** Entrypoint asset for SharedTree's own bundle (`bundle-size-tests/src/sharedTree.ts`). */
-const treeEntrypointAsset = "sharedTree.js";
+/** Named entrypoint assets the buckets and per-package breakdown are measured from. */
+const entrypointAssets = {
+	/** Entrypoint asset for the full deduplicated Fluid Framework footprint (`bundle-size-tests/src/fluidFrameworkAll.ts`). */
+	fluidFrameworkAll: "fluidFrameworkAll.js",
+	/** Entrypoint asset for SharedTree's own bundle (`bundle-size-tests/src/sharedTree.ts`). */
+	sharedTree: "sharedTree.js",
+} as const;
 
 /**
  * Per-package parsed sizes for a single named entrypoint asset. Walks only that
@@ -268,7 +274,7 @@ function packageSizesForAsset(nodes: AnalyzerNode[], assetLabel: string): Map<st
 	return accumulatePackageSizes([asset]);
 }
 
-/** Diffs two per-package size maps into {@link ComparisonRow}s, largest first. */
+/** Diffs two per-package size maps into {@link ComparisonRow}s, sorted by current size descending (ties broken by name). */
 function diffPackageSizes(
 	base: Map<string, number>,
 	current: Map<string, number>,
@@ -317,35 +323,57 @@ interface BucketDefinition {
 const bucketDefinitions: readonly BucketDefinition[] = [
 	{
 		label: "SharedTree + 3rd-party deps",
-		asset: treeEntrypointAsset,
+		asset: entrypointAssets.sharedTree,
 		withThirdParty: true,
 	},
 	{
 		label: "SharedTree",
-		asset: treeEntrypointAsset,
+		asset: entrypointAssets.sharedTree,
 		withThirdParty: false,
 	},
 	{
 		label: "Fluid Framework + 3rd-party deps",
-		asset: aggregateEntrypointAsset,
+		asset: entrypointAssets.fluidFrameworkAll,
 		withThirdParty: true,
 	},
 	{
 		label: "Fluid Framework",
-		asset: aggregateEntrypointAsset,
+		asset: entrypointAssets.fluidFrameworkAll,
 		withThirdParty: false,
 	},
 ];
 
 /**
- * Computes the headline buckets from {@link bucketDefinitions}. `rowsForAsset`
- * returns the entrypoint-scoped, diffed per-package rows for a given asset; each
- * bucket sums its bundle's Fluid packages (plus third-party deps when asked).
+ * Computes the per-package outputs from the raw nodes: the headline composition
+ * buckets ({@link bucketDefinitions}) and the full per-package breakdown for the
+ * `fluidFrameworkAll` aggregate entrypoint. Both derive from the same
+ * entrypoint-scoped, diffed per-package rows, so each asset's rows are computed
+ * once (memoized) and reused across every bucket that references it and the full
+ * breakdown. Each bucket sums its bundle's Fluid packages (plus third-party deps
+ * when asked).
  */
-function bucketPackageSizes(
-	rowsForAsset: (asset: string) => ComparisonRow[],
-): ComparisonRow[] {
-	return bucketDefinitions.map((def) => {
+function comparePackages(
+	baseNodes: AnalyzerNode[],
+	currentNodes: AnalyzerNode[],
+): { packageBuckets: ComparisonRow[]; packages: ComparisonRow[] } {
+	// Per-package rows are each scoped to a single real entrypoint (not a sum
+	// over entrypoints), deduping modules within that asset before diffing.
+	// Memoized because each entrypoint feeds more than one headline bucket as
+	// well as the full per-package breakdown.
+	const rowsByAsset = new Map<string, ComparisonRow[]>();
+	const rowsForAsset = (asset: string): ComparisonRow[] => {
+		let rows = rowsByAsset.get(asset);
+		if (rows === undefined) {
+			rows = diffPackageSizes(
+				packageSizesForAsset(baseNodes, asset),
+				packageSizesForAsset(currentNodes, asset),
+			);
+			rowsByAsset.set(asset, rows);
+		}
+		return rows;
+	};
+
+	const packageBuckets = bucketDefinitions.map((def) => {
 		let base = 0;
 		let current = 0;
 		for (const row of rowsForAsset(def.asset)) {
@@ -356,40 +384,32 @@ function bucketPackageSizes(
 		}
 		return makeRow(def.label, base, current);
 	});
+
+	return {
+		packageBuckets,
+		packages: rowsForAsset(entrypointAssets.fluidFrameworkAll),
+	};
 }
 
 // --- Comparison computation ---
 
 /**
- * Parsed-size rows for every emitted JS asset (source maps excluded). Sizes come
- * straight from the shared {@link compareJsonReports} primitive; an asset
- * present on only one side is treated as size 0 on the other.
+ * Per-asset rows for one size field of every emitted JS asset (source maps
+ * excluded), sorted by name. Sizes come straight from the shared
+ * {@link compareJsonReports} primitive; an asset present on only one side is
+ * treated as size 0 on the other. Drives both the parsed-size and gzip-size
+ * asset tables.
  */
-function compareAssetSizes(bundleComparison: BundlesComparison): ComparisonRow[] {
+function compareAssetField(
+	bundleComparison: BundlesComparison,
+	field: "parsedSize" | "gzipSize",
+): ComparisonRow[] {
 	return Object.keys(bundleComparison)
-		.filter((name) => isJsAssetName(name))
+		.filter(isJsAssetName)
 		.sort()
 		.map((name) => {
 			const { base, compare } = bundleComparison[name];
-			return makeRow(name, base?.parsedSize ?? 0, compare?.parsedSize ?? 0);
-		});
-}
-
-/**
- * Gzip-size rows for the assets whose parsed size changed. A missing side is
- * size 0: an asset present in only one revision (e.g. webpack auto-generated
- * vendor chunks whose hash-based names change) is a genuine delta, not missing
- * data.
- */
-function compareGzipChangedAssets(
-	assets: ComparisonRow[],
-	bundleComparison: BundlesComparison,
-): ComparisonRow[] {
-	return assets
-		.filter((row) => row.diff !== 0)
-		.map((row) => {
-			const { base, compare } = bundleComparison[row.name];
-			return makeRow(row.name, base?.gzipSize ?? 0, compare?.gzipSize ?? 0);
+			return makeRow(name, base?.[field] ?? 0, compare?.[field] ?? 0);
 		});
 }
 
@@ -418,12 +438,12 @@ function compareEntrypointTotals(
  * report, so no webpack stats decompression or on-disk gzipping is needed. Each
  * output set is produced by its own focused helper:
  *
- * - {@link compareAssetSizes} / {@link compareGzipChangedAssets} — per-asset.
+ * - {@link compareAssetField} — per-asset (parsed and gzip).
  * - {@link compareEntrypointTotals} — per real entrypoint.
- * - {@link bucketPackageSizes} / `packages` — per-package, scoped to a single
- *   entrypoint via the memoized `rowsForAsset` below.
+ * - {@link comparePackages} — the headline buckets and full per-package
+ * breakdown, sharing one memoized per-asset row computation.
  */
-function computeComparison(options: CompareBundlesOptions): ComparisonReport {
+function computeBundleComparison(options: CompareBundlesOptions): ComparisonReport {
 	const { baseLabel, currentLabel, analysisDirectory } = options;
 
 	const baseNodes = loadAnalyzer(analysisDirectory, baseLabel);
@@ -432,23 +452,14 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 	// Shared primitive: per-asset { base?, compare? } size data keyed by asset
 	// label, restricted to JS assets (excluding source maps) by the helpers below.
 	const bundleComparison = compareJsonReports(baseNodes, currentNodes);
-	const assets = compareAssetSizes(bundleComparison);
+	const assets = compareAssetField(bundleComparison, "parsedSize");
 
-	// Per-package rows are each scoped to a single real entrypoint (not a sum
-	// over entrypoints), deduping modules within that asset before diffing.
-	// Memoized because each entrypoint feeds more than one headline bucket.
-	const rowsByAsset = new Map<string, ComparisonRow[]>();
-	const rowsForAsset = (asset: string): ComparisonRow[] => {
-		let rows = rowsByAsset.get(asset);
-		if (rows === undefined) {
-			rows = diffPackageSizes(
-				packageSizesForAsset(baseNodes, asset),
-				packageSizesForAsset(currentNodes, asset),
-			);
-			rowsByAsset.set(asset, rows);
-		}
-		return rows;
-	};
+	// The gzip table reports only the assets whose gzip size actually changed.
+	const gzipChangedAssets = compareAssetField(bundleComparison, "gzipSize").filter(
+		(row) => row.diff !== 0,
+	);
+
+	const { packageBuckets, packages } = comparePackages(baseNodes, currentNodes);
 
 	return {
 		comparedAt: new Date().toISOString(),
@@ -456,10 +467,10 @@ function computeComparison(options: CompareBundlesOptions): ComparisonReport {
 		currentLabel,
 		analysisDirectory,
 		assets,
-		gzipChangedAssets: compareGzipChangedAssets(assets, bundleComparison),
+		gzipChangedAssets,
 		entrypoints: compareEntrypointTotals(baseNodes, currentNodes),
-		packageBuckets: bucketPackageSizes(rowsForAsset),
-		packages: rowsForAsset(aggregateEntrypointAsset),
+		packageBuckets,
+		packages,
 	};
 }
 
@@ -614,7 +625,7 @@ function writeOutputFiles(
  * `.txt` and structured `.json` comparison reports to `outputDirectory`.
  */
 export function compareBundles(options: CompareBundlesOptions): void {
-	const report = computeComparison(options);
+	const report = computeBundleComparison(options);
 	const textContent = renderAsText(report);
 	writeOutputFiles(options.outputDirectory, report, textContent);
 }
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index 932915f7c8f0..5e5ec2891cd8 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -99,6 +99,89 @@ rebuild.
 
 Both directories are removed by `npm run clean`.
 
+### Understanding the report
+
+The comparison report is emitted in two forms with identical data: a
+human-readable `.txt` table dump and a structured `.json` file. Every table is a
+list of rows, and each row reports the same three numbers for one named thing — a
+`Base` size, a `Current` size, and their `Diff` (`Current - Base`, so negative
+means smaller). Some tables add a base-relative `% Change` column.
+
+Two different size _measurements_ appear in the report, both read straight from
+webpack-bundle-analyzer's `analyzer.json` (no separate gzipping or stats
+decompression is done):
+
+- **Parsed size** — the minified bytes of the code as it ships, before transport
+  compression. This is the default unit for every table except the gzip one.
+- **Gzip size** — the gzipped bytes, i.e. what actually goes over the wire.
+
+The report measures the bundle at four different _granularities_, each answering a
+different question:
+
+| Table                                        | Granularity | Unit   | What it answers                                                       |
+| -------------------------------------------- | ----------- | ------ | -------------------------------------------------------------------- |
+| All assets                                   | Asset       | Parsed | How did each emitted `.js` file change?                              |
+| Gzip sizes for changed assets                | Asset       | Gzip   | For the assets whose gzip size moved, what is the over-the-wire delta?|
+| Named entrypoint total asset sizes           | Entrypoint  | Parsed | How big is each shipped entrypoint bundle in total?                  |
+| Bundle composition by category               | Package set | Parsed | How is a bundle split between Fluid Framework and third-party code?  |
+| Per-package parsed-size comparison           | Package     | Parsed | Which individual package contributed each chunk of bytes?           |
+
+#### Asset tables
+
+An **asset** is a single file webpack emits (e.g. `sharedTree.js`). The _All
+assets_ table lists every emitted `.js` asset (source maps excluded) whether it
+changed or not, marking changed rows with a trailing `*`; it is the canonical
+"here is everything that ships" inventory.
+
+The _Gzip sizes for changed assets_ table is a focused supplement: it lists only
+the assets whose **gzip** size actually changed, so it stays short and signal-only.
+Note its filter is on the gzip delta itself — an asset can move in parsed size but
+not gzip (compression absorbs the change), or vice versa, so this table is not
+simply the changed rows of the parsed table re-expressed in gzip bytes.
+
+#### Entrypoint table
+
+An **entrypoint** is a bundle a consumer actually loads. Its total is the sum of
+the parsed sizes of the assets that are initial chunks of that entrypoint (per
+analyzer.json's `isInitialByEntrypoint`). These rows **overlap and must not be
+summed**: many entrypoints share the same underlying packages, so adding them
+double-counts shared code. The `fluidFrameworkAll` entrypoint is the single
+deduplicated whole-framework total.
+
+#### Package-level tables
+
+The last two tables attribute bytes to the npm package that owns each module.
+This attribution is deliberately careful:
+
+- **Module -> package.** Each module's path is mapped to its owning package:
+  third-party packages by the name after the last `node_modules/`, Fluid source
+  packages by their `packages/<group>/<name>` workspace path (reported as
+  `@fluidframework/<name>`), and the harness's own entry modules as `(app/entry)`.
+- **Scope-hoisting is undone.** When webpack concatenates (scope-hoists) modules
+  it prefixes each module's path with the concatenating barrel. That prefix is
+  stripped before attribution so hoisted modules are credited to their _real_
+  owning package rather than collapsing onto the barrel.
+- **Deduplicated per bundle.** Within a given entrypoint, a module reached more
+  than once is counted exactly once.
+
+Because shared modules can't be split across entrypoints without double-counting,
+each package-level measurement is **pinned to a single real entrypoint** rather
+than summed across the whole report. SharedTree is measured from its own
+`sharedTree` bundle; the framework-wide numbers are measured from the
+`fluidFrameworkAll` aggregate bundle.
+
+The _Bundle composition by category_ table rolls those per-package sizes up into
+headline buckets. For each pinned entrypoint it reports the bundle's total Fluid
+Framework bytes, and a companion `+ 3rd-party deps` row that also folds in every
+third-party package in that same bundle. (Third-party bytes can't be split
+between the Fluid libraries that pull them in, because the flat per-package data
+carries no dependency graph; harness code is always excluded.)
+
+The _Per-package parsed-size comparison_ table is the full breakdown for the
+`fluidFrameworkAll` aggregate bundle: one row per owning package, sorted by
+current size descending, so the biggest contributors — and the biggest movers —
+are easy to find.
+
 <!-- AUTO-GENERATED-CONTENT:START (README_FOOTER) -->
 
 <!-- prettier-ignore-start -->

From c2c47d856d3b8ff7f07ceb2915fa31ae74196a2d Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 12:51:05 -0700
Subject: [PATCH 50/67] refactor(build-cli): extract moduleAnchor and clarify
 attribution naming

packageFromModulePath and canonicalModuleKey both stripped the
concatenation wrapper and then ran the same "last node_modules/, else
first packages/" anchoring logic. Pull that shared step into a single
moduleAnchor helper that returns the matched marker and index, so each
function reduces to consuming the anchor it needs.

Also rename the "(app/entry)" concept from "harness" to "synthetic
entrypoint" across the comments and README (the data label is unchanged),
and rename moduleAnchor's parameter to modulePath for clarity.

No behavior change: bundle compare output is byte-identical.
---
 .../src/library/bundleSize/compareBundles.ts  | 58 +++++++++++--------
 examples/utils/bundle-size-tests/README.md    |  4 +-
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index aafc5ba2f271..aa24f962b582 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -160,6 +160,24 @@ function stripConcatenationWrapper(modulePath: string): string {
 	return markerIndex >= 0 ? normalized.slice(markerIndex + marker.length) : normalized;
 }
 
+/**
+ * Locates the path segment that identifies a module's owning package: the
+ * *last* `node_modules/` (so a package's own nested dependencies are attributed
+ * to themselves), or failing that the *first* `packages/` (the workspace source
+ * layout). Returns the matched marker and its index, or `undefined` for paths
+ * belonging to neither (e.g. the synthetic entrypoint's own modules). Both
+ * {@link packageFromModulePath} and {@link canonicalModuleKey} anchor here.
+ */
+function moduleAnchor(
+	modulePath: string,
+): { marker: "node_modules/" | "packages/"; index: number } | undefined {
+	const nodeModulesIndex = modulePath.lastIndexOf("node_modules/");
+	if (nodeModulesIndex >= 0) return { marker: "node_modules/", index: nodeModulesIndex };
+	const packagesIndex = modulePath.indexOf("packages/");
+	if (packagesIndex >= 0) return { marker: "packages/", index: packagesIndex };
+	return undefined;
+}
+
 /**
  * Extracts the owning npm package name from a webpack-bundle-analyzer module
  * `path`. Handles the three shapes that appear in this repo's bundles:
@@ -170,8 +188,8 @@ function stripConcatenationWrapper(modulePath: string): string {
  *   their `@scope/name`.
  * - **Workspace packages:** `.../packages/<group>/<name>/...` — these are the
  *   Fluid Framework source packages, published as `@fluidframework/<name>`.
- * - **App/entry code:** anything else (e.g. the bundle-size-tests harness's own
- *   `./src/*.ts` entry modules) is grouped under `(app/entry)`.
+ * - **App/entry code:** anything else (e.g. the bundle-size-tests synthetic
+ *   entrypoint's own `./src/*.ts` modules) is grouped under `(app/entry)`.
  *
  * Concatenated-module wrapper prefixes are stripped first (see
  * {@link stripConcatenationWrapper}) so scope-hoisted modules are attributed to
@@ -179,19 +197,14 @@ function stripConcatenationWrapper(modulePath: string): string {
  */
 function packageFromModulePath(modulePath: string): string {
 	const normalized = stripConcatenationWrapper(modulePath);
-	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
-	if (nodeModulesIndex >= 0) {
-		const rest = normalized.slice(nodeModulesIndex + "node_modules/".length);
-		const parts = rest.split("/");
+	const anchor = moduleAnchor(normalized);
+	if (anchor === undefined) return "(app/entry)";
+	const parts = normalized.slice(anchor.index + anchor.marker.length).split("/");
+	if (anchor.marker === "node_modules/") {
 		return parts[0].startsWith("@") ? `${parts[0]}/${parts[1]}` : parts[0];
 	}
-	const packagesIndex = normalized.indexOf("packages/");
-	if (packagesIndex >= 0) {
-		// Workspace layout: packages/<group>/<name>/lib/...
-		const parts = normalized.slice(packagesIndex + "packages/".length).split("/");
-		if (parts.length >= 2) return `@fluidframework/${parts[1]}`;
-	}
-	return "(app/entry)";
+	// Workspace layout: packages/<group>/<name>/lib/...
+	return parts.length >= 2 ? `@fluidframework/${parts[1]}` : "(app/entry)";
 }
 
 /**
@@ -199,17 +212,14 @@ function packageFromModulePath(modulePath: string): string {
  * different entrypoints (webpack prefixes the path with the concatenating
  * entry, e.g. `./src/sharedTree.ts + 384 modules (concatenated)/...`) collapses
  * to a single key. The concatenation wrapper prefix is stripped first (see
- * {@link stripConcatenationWrapper}), then anchoring at `node_modules/` or
- * `packages/` removes any remaining per-entry prefix, giving "unique module"
- * dedupe semantics.
+ * {@link stripConcatenationWrapper}), then anchoring at the owning-package
+ * segment (see {@link moduleAnchor}) removes any remaining per-entry prefix,
+ * giving "unique module" dedupe semantics.
  */
 function canonicalModuleKey(modulePath: string): string {
 	const normalized = stripConcatenationWrapper(modulePath);
-	const nodeModulesIndex = normalized.lastIndexOf("node_modules/");
-	if (nodeModulesIndex >= 0) return normalized.slice(nodeModulesIndex);
-	const packagesIndex = normalized.indexOf("packages/");
-	if (packagesIndex >= 0) return normalized.slice(packagesIndex);
-	return normalized;
+	const anchor = moduleAnchor(normalized);
+	return anchor === undefined ? normalized : normalized.slice(anchor.index);
 }
 
 /**
@@ -290,7 +300,7 @@ function isFluidPackage(name: string): boolean {
 	return name.startsWith("@fluidframework/") || name.startsWith("@fluid-");
 }
 
-/** Whether a package's bytes are third-party (not a Fluid library, not harness code). */
+/** Whether a package's bytes are third-party (not a Fluid library, not synthetic entrypoint code). */
 function isThirdPartyPackage(name: string): boolean {
 	return !isFluidPackage(name) && name !== "(app/entry)";
 }
@@ -317,8 +327,8 @@ interface BucketDefinition {
  * bundle (the entrypoint's full Fluid footprint, not just one package); a
  * `+ 3rd-party deps` row also folds in every third-party package in that same
  * bundle. Third-party bytes can't be split between libraries (the flat
- * per-package data has no dependency graph). Harness code is always excluded
- * (see {@link isThirdPartyPackage}).
+ * per-package data has no dependency graph). Synthetic entrypoint code is always
+ * excluded (see {@link isThirdPartyPackage}).
  */
 const bucketDefinitions: readonly BucketDefinition[] = [
 	{
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index 5e5ec2891cd8..32dfc34ccdf2 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -156,7 +156,7 @@ This attribution is deliberately careful:
 - **Module -> package.** Each module's path is mapped to its owning package:
   third-party packages by the name after the last `node_modules/`, Fluid source
   packages by their `packages/<group>/<name>` workspace path (reported as
-  `@fluidframework/<name>`), and the harness's own entry modules as `(app/entry)`.
+  `@fluidframework/<name>`), and the synthetic entrypoint's own modules as `(app/entry)`.
 - **Scope-hoisting is undone.** When webpack concatenates (scope-hoists) modules
   it prefixes each module's path with the concatenating barrel. That prefix is
   stripped before attribution so hoisted modules are credited to their _real_
@@ -175,7 +175,7 @@ headline buckets. For each pinned entrypoint it reports the bundle's total Fluid
 Framework bytes, and a companion `+ 3rd-party deps` row that also folds in every
 third-party package in that same bundle. (Third-party bytes can't be split
 between the Fluid libraries that pull them in, because the flat per-package data
-carries no dependency graph; harness code is always excluded.)
+carries no dependency graph; synthetic entrypoint code is always excluded.)
 
 The _Per-package parsed-size comparison_ table is the full breakdown for the
 `fluidFrameworkAll` aggregate bundle: one row per owning package, sorted by

From 5a297326ecfaef9f5f96e05700013ecf16dc34bc Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 13:03:14 -0700
Subject: [PATCH 51/67] docs(build-cli): clarify that local mode never mutates
 the outer repo

Document, in the CollectBundleOptions.mode JSDoc, the --mode flag help, and
the local-mode branch + captureLocalPatch doc, that local collection builds
the outer enlistment exactly as it sits on disk: its git state (working tree,
branch, revision) is never modified, and the captured staged-changes patch is
only a reproducibility record that is never applied.
---
 .../build-cli/src/commands/bundle/collect.ts     |  4 ++--
 .../src/library/bundleSize/collectBundle.ts      | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index 0a408e09752a..1e2a4a3c5361 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -30,8 +30,8 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 	public static readonly flags = {
 		mode: Flags.string({
 			description:
-				"local: collect from the outer enlistment. revision: collect from a separate " +
-				"inner enlistment checked out at --revision.",
+				"local: collect from the outer enlistment (its git state is never modified). " +
+				"revision: collect from a separate inner enlistment checked out at --revision.",
 			options: ["local", "revision"] as const,
 			default: "local",
 		}),
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 28738d26e540..5fb2f4f57843 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -17,6 +17,10 @@ export interface CollectBundleOptions {
 	/**
 	 * `local`: collect from the outer enlistment that contains {@link CollectBundleOptions.packageDir}.
 	 * `revision`: collect from a separate inner enlistment checked out at {@link CollectBundleOptions.revision}.
+	 *
+	 * In `local` mode the outer enlistment is built exactly as it sits on disk: its git state
+	 * (working tree, branch, and revision) is never modified. All checkout/fetch happens only in
+	 * the inner repo used by `revision` mode.
 	 */
 	readonly mode: "local" | "revision";
 	/**
@@ -146,6 +150,10 @@ function saveStats(label: string, sourcePackageRoot: string, analysisDir: string
  * excluded (they're often noisy / random) but a warning is printed if any are
  * detected so the user can `git add` the relevant pieces and re-run.
  *
+ * This is purely a record: the patch is never applied, and the outer repo's
+ * working tree and revision are left untouched. Local mode builds the enlistment
+ * exactly as it sits on disk.
+ *
  * The patch is written as `staged-changes.patch` inside the per-label directory.
  */
 async function captureLocalPatch(repoRoot: string, labelDirectory: string): Promise<void> {
@@ -256,8 +264,12 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 	if (mode === "local") {
 		activeRepoRoot = outerRepoRoot;
 		activePackageRoot = packageDir;
-		// Capture the staged diff up front, before any build steps. This way the
-		// patch is preserved even if the build subsequently fails.
+		// Local mode builds the outer enlistment exactly as it sits on disk: we
+		// never check out, stash, or otherwise mutate its working tree or revision.
+		// The captured patch is therefore only a reproducibility record of what was
+		// staged at collection time — it is never applied. Capture it up front,
+		// before any build steps, so the patch is preserved even if the build
+		// subsequently fails.
 		await captureLocalPatch(outerRepoRoot, resolve(analysisDir, label));
 	} else {
 		// Path of the package relative to the repo root, e.g.

From 1c044543d6d5cac3c48479f9e8db4a0910cf88d5 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 5 Jun 2026 13:21:47 -0700
Subject: [PATCH 52/67] docs(build-cli): move bundle command docs to
 bundleDetails.md

Relocate the conceptual `flub bundle` documentation (how the commands fit
together and how to read the comparison report) out of the bundle-size-tests
package README and into build-cli's docs/bundleDetails.md, following the same
*Details.md convention as typetestDetails.md. Link to it from each bundle
command's description so it is discoverable via --help and the generated
bundle.md, and trim the package README to its package-specific wrapper plus a
pointer to the new doc.
---
 build-tools/packages/build-cli/docs/bundle.md |  13 +-
 .../packages/build-cli/docs/bundleDetails.md  | 164 ++++++++++++++++++
 .../commands/bundle/collect-and-compare.ts    |   3 +-
 .../build-cli/src/commands/bundle/collect.ts  |   3 +-
 .../build-cli/src/commands/bundle/compare.ts  |   3 +-
 examples/utils/bundle-size-tests/README.md    | 148 +---------------
 6 files changed, 185 insertions(+), 149 deletions(-)
 create mode 100644 build-tools/packages/build-cli/docs/bundleDetails.md

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index 7997e2bb6321..ba81c296a186 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -24,8 +24,8 @@ FLAGS
                           the current one.
   --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
                           revision in revision mode, or "current" in local mode.
-  --mode=<option>         [default: local] local: collect from the outer enlistment. revision: collect from a separate
-                          inner enlistment checked out at --revision.
+  --mode=<option>         [default: local] local: collect from the outer enlistment (its git state is never modified).
+                          revision: collect from a separate inner enlistment checked out at --revision.
                           <options: local|revision>
   --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
                           collected.
@@ -40,6 +40,9 @@ DESCRIPTION
   Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked
   out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
 
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
+
 EXAMPLES
   $ flub bundle collect
 
@@ -88,6 +91,9 @@ DESCRIPTION
   Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree,
   branch, and stash are never modified.
 
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
+
 EXAMPLES
   $ flub bundle collect-and-compare
 
@@ -130,6 +136,9 @@ DESCRIPTION
   Compare the two bundles previously collected by 'flub bundle collect' (base = --base-label, current =
   --current-label).
 
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
+
 EXAMPLES
   $ flub bundle compare
 
diff --git a/build-tools/packages/build-cli/docs/bundleDetails.md b/build-tools/packages/build-cli/docs/bundleDetails.md
new file mode 100644
index 000000000000..4c22736c4851
--- /dev/null
+++ b/build-tools/packages/build-cli/docs/bundleDetails.md
@@ -0,0 +1,164 @@
+# Further information about `flub bundle`
+
+The `flub bundle` commands measure how a change affects a package's webpack
+bundle by building the bundle on two different revisions and diffing the
+per-asset and per-entrypoint sizes, so regressions (or wins) are easy to spot
+before pushing.
+
+See [bundle.md](./bundle.md) for the generated command reference. This document
+explains how the commands fit together and how to read the comparison report.
+
+## The commands
+
+| Command                           | Responsibility                                                   |
+| --------------------------------- | --------------------------------------------------------------- |
+| `flub bundle collect`             | Build one bundle and save its stats under a label.              |
+| `flub bundle compare`             | Diff two already-collected bundles and write the report.        |
+| `flub bundle collect-and-compare` | Orchestrate both collect steps plus the compare step end-to-end. |
+
+Each command self-describes its flags via `--help`:
+
+```sh
+flub bundle collect --help
+flub bundle compare --help
+flub bundle collect-and-compare --help
+```
+
+## Typical workflow
+
+In almost every case you just want the one-shot orchestrator:
+
+```sh
+flub bundle collect-and-compare
+```
+
+This compares your working tree against the merge-base of `HEAD` and `main` —
+i.e. the point your branch forked from — so the diff reflects only your own
+changes, not unrelated commits that have since landed on `main`. Use
+`--base-revision` to compare against a different branch, tag, or commit; the
+merge-base of that revision and `HEAD` is what actually gets built.
+
+Reach for the lower-level commands when the orchestrator's flow doesn't fit:
+
+- **`flub bundle compare` on its own** — when both bundles are already collected
+  and you only want to re-run the diff (e.g. tweaking the report, or comparing
+  two labels the orchestrator wouldn't pair automatically). It reads each side's
+  previously saved `analyzer.json` and writes a fresh report without rebuilding
+  anything.
+- **`flub bundle collect` on its own** — when you want to capture a single bundle
+  without immediately diffing it, or to pre-populate a label for a later
+  comparison.
+
+## How collection works
+
+`flub bundle collect` runs in one of two modes:
+
+- **local** — builds the bundle from the outer enlistment (your working tree,
+  including staged changes). The staged diff is captured alongside the report so
+  the measurement is reproducible. The outer repo's git state (working tree,
+  branch, revision) is never modified.
+- **revision** — builds the bundle from a _separate_ inner clone of the repo
+  checked out at a specific commit. The inner clone is created on first use as a
+  shallow clone of your `origin` remote and the requested commit is fetched
+  shallowly, keeping it small. The outer repo's working tree, branch, and stash
+  are never touched.
+
+Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
+(webpack-bundle-analyzer's JSON report). That single file carries per-asset
+parsed/gzip sizes and entrypoint membership — everything the comparison needs —
+so it is the only artifact saved per label; the larger webpack stats and `build/`
+outputs are not retained.
+
+The orchestrator runs `flub bundle collect` once in each mode: local for the
+current side, revision for the base side. The base-side report is cached and
+keyed by the resolved SHA, so a re-run against the same merge-base skips the
+rebuild.
+
+## Outputs
+
+- Each label's `analyzer.json` is saved under `<analysis-dir>/<label>/`. This is
+  also where the cached base report and the inner repo clone live.
+- Comparison reports (`.txt` and `.json`) are written to the output directory.
+
+## Understanding the report
+
+The comparison report is emitted in two forms with identical data: a
+human-readable `.txt` table dump and a structured `.json` file. Every table is a
+list of rows, and each row reports the same three numbers for one named thing — a
+`Base` size, a `Current` size, and their `Diff` (`Current - Base`, so negative
+means smaller). Some tables add a base-relative `% Change` column.
+
+Two different size _measurements_ appear in the report, both read straight from
+webpack-bundle-analyzer's `analyzer.json` (no separate gzipping or stats
+decompression is done):
+
+- **Parsed size** — the minified bytes of the code as it ships, before transport
+  compression. This is the default unit for every table except the gzip one.
+- **Gzip size** — the gzipped bytes, i.e. what actually goes over the wire.
+
+The report measures the bundle at four different _granularities_, each answering a
+different question:
+
+| Table                                        | Granularity | Unit   | What it answers                                                       |
+| -------------------------------------------- | ----------- | ------ | -------------------------------------------------------------------- |
+| All assets                                   | Asset       | Parsed | How did each emitted `.js` file change?                              |
+| Gzip sizes for changed assets                | Asset       | Gzip   | For the assets whose gzip size moved, what is the over-the-wire delta?|
+| Named entrypoint total asset sizes           | Entrypoint  | Parsed | How big is each shipped entrypoint bundle in total?                  |
+| Bundle composition by category               | Package set | Parsed | How is a bundle split between Fluid Framework and third-party code?  |
+| Per-package parsed-size comparison           | Package     | Parsed | Which individual package contributed each chunk of bytes?           |
+
+### Asset tables
+
+An **asset** is a single file webpack emits (e.g. `sharedTree.js`). The _All
+assets_ table lists every emitted `.js` asset (source maps excluded) whether it
+changed or not, marking changed rows with a trailing `*`; it is the canonical
+"here is everything that ships" inventory.
+
+The _Gzip sizes for changed assets_ table is a focused supplement: it lists only
+the assets whose **gzip** size actually changed, so it stays short and signal-only.
+Note its filter is on the gzip delta itself — an asset can move in parsed size but
+not gzip (compression absorbs the change), or vice versa, so this table is not
+simply the changed rows of the parsed table re-expressed in gzip bytes.
+
+### Entrypoint table
+
+An **entrypoint** is a bundle a consumer actually loads. Its total is the sum of
+the parsed sizes of the assets that are initial chunks of that entrypoint (per
+analyzer.json's `isInitialByEntrypoint`). These rows **overlap and must not be
+summed**: many entrypoints share the same underlying packages, so adding them
+double-counts shared code. The `fluidFrameworkAll` entrypoint is the single
+deduplicated whole-framework total.
+
+### Package-level tables
+
+The last two tables attribute bytes to the npm package that owns each module.
+This attribution is deliberately careful:
+
+- **Module -> package.** Each module's path is mapped to its owning package:
+  third-party packages by the name after the last `node_modules/`, Fluid source
+  packages by their `packages/<group>/<name>` workspace path (reported as
+  `@fluidframework/<name>`), and the synthetic entrypoint's own modules as `(app/entry)`.
+- **Scope-hoisting is undone.** When webpack concatenates (scope-hoists) modules
+  it prefixes each module's path with the concatenating barrel. That prefix is
+  stripped before attribution so hoisted modules are credited to their _real_
+  owning package rather than collapsing onto the barrel.
+- **Deduplicated per bundle.** Within a given entrypoint, a module reached more
+  than once is counted exactly once.
+
+Because shared modules can't be split across entrypoints without double-counting,
+each package-level measurement is **pinned to a single real entrypoint** rather
+than summed across the whole report. SharedTree is measured from its own
+`sharedTree` bundle; the framework-wide numbers are measured from the
+`fluidFrameworkAll` aggregate bundle.
+
+The _Bundle composition by category_ table rolls those per-package sizes up into
+headline buckets. For each pinned entrypoint it reports the bundle's total Fluid
+Framework bytes, and a companion `+ 3rd-party deps` row that also folds in every
+third-party package in that same bundle. (Third-party bytes can't be split
+between the Fluid libraries that pull them in, because the flat per-package data
+carries no dependency graph; synthetic entrypoint code is always excluded.)
+
+The _Per-package parsed-size comparison_ table is the full breakdown for the
+`fluidFrameworkAll` aggregate bundle: one row per owning package, sorted by
+current size descending, so the biggest contributors — and the biggest movers —
+are easy to find.
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
index aa23956fb7ee..881632a462e7 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
@@ -18,7 +18,8 @@ export default class BundleCollectAndCompare extends BaseCommand<
 > {
 	public static readonly description =
 		"Collect the local bundle and the base-revision (merge-base) bundle, then compare them. " +
-		"The outer repo's working tree, branch, and stash are never modified.";
+		"The outer repo's working tree, branch, and stash are never modified.\n\n" +
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index 1e2a4a3c5361..175707ca7f68 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -19,7 +19,8 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 	public static readonly description =
 		"Build and collect a bundle, either from the outer enlistment (local mode) or from a " +
 		"separate inner enlistment checked out to a specific revision (revision mode). The outer " +
-		"repo's working tree, branch, and stash are never modified.";
+		"repo's working tree, branch, and stash are never modified.\n\n" +
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
diff --git a/build-tools/packages/build-cli/src/commands/bundle/compare.ts b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
index 78a54904f913..552a2663f027 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/compare.ts
@@ -17,7 +17,8 @@ import { BaseCommand } from "../../library/commands/base.js";
 export default class BundleCompare extends BaseCommand<typeof BundleCompare> {
 	public static readonly description =
 		"Compare the two bundles previously collected by 'flub bundle collect' " +
-		"(base = --base-label, current = --current-label).";
+		"(base = --base-label, current = --current-label).\n\n" +
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index 32dfc34ccdf2..c881c72d7fc5 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -10,13 +10,9 @@ sizes, so regressions (or wins) are easy to spot before pushing.
 
 The workflow is implemented as the `flub bundle` command topic in
 [`@fluid-tools/build-cli`](../../../build-tools/packages/build-cli); this package
-just invokes it with the appropriate context. The relevant commands are:
-
-| Command                          | Responsibility                                                   |
-| -------------------------------- | --------------------------------------------------------------- |
-| `flub bundle collect`            | Build one bundle and save its stats under a label.              |
-| `flub bundle compare`            | Diff two already-collected bundles and write the report.        |
-| `flub bundle collect-and-compare`| Orchestrate both collect steps plus the compare step end-to-end. |
+just invokes it with the appropriate context. See
+[bundleDetails.md](../../../build-tools/packages/build-cli/docs/bundleDetails.md)
+for how the commands fit together and how to read the comparison report.
 
 ### Running
 
@@ -32,62 +28,9 @@ To pass flags, forward them after `--`:
 npm run compare:bundles -- --base-revision client_v2.100.0
 ```
 
-Each command self-describes its flags via `--help`:
-
-```sh
-flub bundle collect --help
-flub bundle compare --help
-flub bundle collect-and-compare --help
-```
-
-### Typical workflow
-
-In almost every case you just want the one-shot orchestrator:
-
-```sh
-npm run compare:bundles
-```
-
 This compares your working tree against the merge-base of `HEAD` and `main` —
 i.e. the point your branch forked from — so the diff reflects only your own
-changes, not unrelated commits that have since landed on `main`. Use
-`--base-revision` to compare against a different branch, tag, or commit; the
-merge-base of that revision and `HEAD` is what actually gets built.
-
-Reach for the lower-level commands when the orchestrator's flow doesn't fit:
-
-- **`flub bundle compare` on its own** — when both bundles are already collected
-  and you only want to re-run the diff (e.g. tweaking the report, or comparing
-  two labels the orchestrator wouldn't pair automatically). It reads each side's
-  previously saved `analyzer.json` and writes a fresh report without rebuilding
-  anything.
-- **`flub bundle collect` on its own** — when you want to capture a single bundle
-  without immediately diffing it, or to pre-populate a label for a later
-  comparison.
-
-### How collection works
-
-`flub bundle collect` runs in one of two modes:
-
-- **local** — builds the bundle from the outer enlistment (your working tree,
-  including staged changes). The staged diff is captured alongside the report so
-  the measurement is reproducible.
-- **revision** — builds the bundle from a _separate_ inner clone of the repo
-  checked out at a specific commit. The inner clone is created on first use as a
-  shallow clone of your `origin` remote and the requested commit is fetched
-  shallowly, keeping it small. The outer repo's working tree, branch, and stash
-  are never touched.
-
-Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
-(webpack-bundle-analyzer's JSON report). That single file carries per-asset
-parsed/gzip sizes and entrypoint membership — everything the comparison needs —
-so it is the only artifact saved per label; the larger webpack stats and `build/`
-outputs are not retained.
-
-The orchestrator runs `flub bundle collect` once in each mode: local for the
-current side, revision for the base side. The base-side report is cached and
-keyed by the resolved SHA, so a re-run against the same merge-base skips the
-rebuild.
+changes, not unrelated commits that have since landed on `main`.
 
 ### Outputs
 
@@ -99,89 +42,6 @@ rebuild.
 
 Both directories are removed by `npm run clean`.
 
-### Understanding the report
-
-The comparison report is emitted in two forms with identical data: a
-human-readable `.txt` table dump and a structured `.json` file. Every table is a
-list of rows, and each row reports the same three numbers for one named thing — a
-`Base` size, a `Current` size, and their `Diff` (`Current - Base`, so negative
-means smaller). Some tables add a base-relative `% Change` column.
-
-Two different size _measurements_ appear in the report, both read straight from
-webpack-bundle-analyzer's `analyzer.json` (no separate gzipping or stats
-decompression is done):
-
-- **Parsed size** — the minified bytes of the code as it ships, before transport
-  compression. This is the default unit for every table except the gzip one.
-- **Gzip size** — the gzipped bytes, i.e. what actually goes over the wire.
-
-The report measures the bundle at four different _granularities_, each answering a
-different question:
-
-| Table                                        | Granularity | Unit   | What it answers                                                       |
-| -------------------------------------------- | ----------- | ------ | -------------------------------------------------------------------- |
-| All assets                                   | Asset       | Parsed | How did each emitted `.js` file change?                              |
-| Gzip sizes for changed assets                | Asset       | Gzip   | For the assets whose gzip size moved, what is the over-the-wire delta?|
-| Named entrypoint total asset sizes           | Entrypoint  | Parsed | How big is each shipped entrypoint bundle in total?                  |
-| Bundle composition by category               | Package set | Parsed | How is a bundle split between Fluid Framework and third-party code?  |
-| Per-package parsed-size comparison           | Package     | Parsed | Which individual package contributed each chunk of bytes?           |
-
-#### Asset tables
-
-An **asset** is a single file webpack emits (e.g. `sharedTree.js`). The _All
-assets_ table lists every emitted `.js` asset (source maps excluded) whether it
-changed or not, marking changed rows with a trailing `*`; it is the canonical
-"here is everything that ships" inventory.
-
-The _Gzip sizes for changed assets_ table is a focused supplement: it lists only
-the assets whose **gzip** size actually changed, so it stays short and signal-only.
-Note its filter is on the gzip delta itself — an asset can move in parsed size but
-not gzip (compression absorbs the change), or vice versa, so this table is not
-simply the changed rows of the parsed table re-expressed in gzip bytes.
-
-#### Entrypoint table
-
-An **entrypoint** is a bundle a consumer actually loads. Its total is the sum of
-the parsed sizes of the assets that are initial chunks of that entrypoint (per
-analyzer.json's `isInitialByEntrypoint`). These rows **overlap and must not be
-summed**: many entrypoints share the same underlying packages, so adding them
-double-counts shared code. The `fluidFrameworkAll` entrypoint is the single
-deduplicated whole-framework total.
-
-#### Package-level tables
-
-The last two tables attribute bytes to the npm package that owns each module.
-This attribution is deliberately careful:
-
-- **Module -> package.** Each module's path is mapped to its owning package:
-  third-party packages by the name after the last `node_modules/`, Fluid source
-  packages by their `packages/<group>/<name>` workspace path (reported as
-  `@fluidframework/<name>`), and the synthetic entrypoint's own modules as `(app/entry)`.
-- **Scope-hoisting is undone.** When webpack concatenates (scope-hoists) modules
-  it prefixes each module's path with the concatenating barrel. That prefix is
-  stripped before attribution so hoisted modules are credited to their _real_
-  owning package rather than collapsing onto the barrel.
-- **Deduplicated per bundle.** Within a given entrypoint, a module reached more
-  than once is counted exactly once.
-
-Because shared modules can't be split across entrypoints without double-counting,
-each package-level measurement is **pinned to a single real entrypoint** rather
-than summed across the whole report. SharedTree is measured from its own
-`sharedTree` bundle; the framework-wide numbers are measured from the
-`fluidFrameworkAll` aggregate bundle.
-
-The _Bundle composition by category_ table rolls those per-package sizes up into
-headline buckets. For each pinned entrypoint it reports the bundle's total Fluid
-Framework bytes, and a companion `+ 3rd-party deps` row that also folds in every
-third-party package in that same bundle. (Third-party bytes can't be split
-between the Fluid libraries that pull them in, because the flat per-package data
-carries no dependency graph; synthetic entrypoint code is always excluded.)
-
-The _Per-package parsed-size comparison_ table is the full breakdown for the
-`fluidFrameworkAll` aggregate bundle: one row per owning package, sorted by
-current size descending, so the biggest contributors — and the biggest movers —
-are easy to find.
-
 <!-- AUTO-GENERATED-CONTENT:START (README_FOOTER) -->
 
 <!-- prettier-ignore-start -->

From c02b47dbcb52397f0fd239bdcb271b8a61994e50 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 9 Jun 2026 11:42:36 -0700
Subject: [PATCH 53/67] Lint fix.

---
 .../packages/build-cli/src/library/bundleSize/compareBundles.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index aa24f962b582..53f618c1d24d 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -183,7 +183,7 @@ function moduleAnchor(
  * `path`. Handles the three shapes that appear in this repo's bundles:
  *
  * - **Third-party (pnpm):** `.../node_modules/.pnpm/<key>/node_modules/<pkg>/...`
- *   — the name after the *last* `node_modules/` is used, so a package's own
+ *   the name after the *last* `node_modules/` is used, so a package's own
  *   nested dependencies are attributed to themselves. Scoped packages keep
  *   their `@scope/name`.
  * - **Workspace packages:** `.../packages/<group>/<name>/...` — these are the

From 894d768531679a314ec2e24e78028a68ae1779d1 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Tue, 9 Jun 2026 14:08:39 -0700
Subject: [PATCH 54/67] Lint fix.

---
 .../src/library/bundleSize/compareBundles.ts          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 53f618c1d24d..79be60d0c7a1 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -182,14 +182,13 @@ function moduleAnchor(
  * Extracts the owning npm package name from a webpack-bundle-analyzer module
  * `path`. Handles the three shapes that appear in this repo's bundles:
  *
- * - **Third-party (pnpm):** `.../node_modules/.pnpm/<key>/node_modules/<pkg>/...`
- *   the name after the *last* `node_modules/` is used, so a package's own
- *   nested dependencies are attributed to themselves. Scoped packages keep
- *   their `@scope/name`.
+ * - **Third-party (pnpm):** `.../node_modules/.pnpm/<key>/node_modules/<pkg>/...` —
+ * the name after the *last* `node_modules/` is used, so a package's own nested
+ * dependencies are attributed to themselves. Scoped packages keep their `@scope/name`.
  * - **Workspace packages:** `.../packages/<group>/<name>/...` — these are the
- *   Fluid Framework source packages, published as `@fluidframework/<name>`.
+ * Fluid Framework source packages, published as `@fluidframework/<name>`.
  * - **App/entry code:** anything else (e.g. the bundle-size-tests synthetic
- *   entrypoint's own `./src/*.ts` modules) is grouped under `(app/entry)`.
+ * entrypoint's own `./src/*.ts` modules) is grouped under `(app/entry)`.
  *
  * Concatenated-module wrapper prefixes are stripped first (see
  * {@link stripConcatenationWrapper}) so scope-hoisted modules are attributed to

From 4f9a53a92432fa9f1e60c09b859ddb18536cbad6 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 12 Jun 2026 12:13:11 -0700
Subject: [PATCH 55/67] feat(build-cli): clone inner repo from outer enlistment
 on disk in revision mode

Revision-mode bundle collection previously created the inner repo by shallow-cloning the outer repo's origin remote and fetching the requested commit by SHA, which required the commit to exist on origin and depended on network access plus uploadpack.allowReachableSHA1InWant.

Clone the inner repo directly from the outer enlistment on disk instead. No remote or network access is involved, and every object the outer repo already has (including merge-base SHAs that aren't branch tips) is available without a fetch; the requested revision is checked out detached. The commit now only needs to exist locally. Removes the now-unused getOuterOriginUrl helper and updates bundleDetails.md.
---
 .../packages/build-cli/docs/bundleDetails.md  | 10 ++--
 .../src/library/bundleSize/collectBundle.ts   | 60 ++++++-------------
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundleDetails.md b/build-tools/packages/build-cli/docs/bundleDetails.md
index 4c22736c4851..568fd4fc58b5 100644
--- a/build-tools/packages/build-cli/docs/bundleDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleDetails.md
@@ -58,10 +58,12 @@ Reach for the lower-level commands when the orchestrator's flow doesn't fit:
   the measurement is reproducible. The outer repo's git state (working tree,
   branch, revision) is never modified.
 - **revision** — builds the bundle from a _separate_ inner clone of the repo
-  checked out at a specific commit. The inner clone is created on first use as a
-  shallow clone of your `origin` remote and the requested commit is fetched
-  shallowly, keeping it small. The outer repo's working tree, branch, and stash
-  are never touched.
+  checked out at a specific commit. The inner clone is created on first use by
+  cloning directly from the outer enlistment on disk — no remote or network
+  access is involved, and every object the outer repo already has (including
+  merge-base commits that aren't branch tips) is available without a fetch. The
+  requested commit must therefore already exist locally in the outer repo. The
+  outer repo's working tree, branch, and stash are never touched.
 
 Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
 (webpack-bundle-analyzer's JSON report). That single file carries per-asset
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 5fb2f4f57843..b7e0a947bd1c 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -174,27 +174,16 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
 	console.log(`Saved staged-changes patch to: ${patchPath}`);
 }
 
-/**
- * Returns the URL of the outer repo's `origin` remote, used as the source
- * for cloning the inner repo.
- */
-async function getOuterOriginUrl(outerRepoRoot: string): Promise<string> {
-	const { value } = await simpleGit(outerRepoRoot).getConfig("remote.origin.url");
-	if (value === null || value.length === 0) {
-		throw new Error(`Could not read remote.origin.url from ${outerRepoRoot}.`);
-	}
-	return value;
-}
-
 /**
  * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot`
  * and is checked out at the requested revision.
  *
- * On first call, performs a shallow clone of the outer repo's `origin` remote
- * (`--depth=1 --no-tags --no-checkout`). On every call (including the first),
- * the requested revision is fetched shallowly (`fetch --depth=1 origin <rev>`)
- * and checked out detached. This keeps the inner repo's `.git` directory small
- * even after many revisions have been visited.
+ * On first call, clones the inner repo directly from the outer enlistment on
+ * disk (`--no-tags --no-checkout`). Because the source is a local repository,
+ * no remote or network access is involved and every commit already present in
+ * the outer repo (including merge-base SHAs that aren't branch tips) is
+ * available without a separate fetch. On every call the requested revision is
+ * checked out detached.
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
@@ -204,38 +193,24 @@ async function ensureInnerRepoAtRevision(
 	innerRepoRoot: string,
 ): Promise<void> {
 	if (!existsSync(resolve(innerRepoRoot, ".git"))) {
-		const originUrl = await getOuterOriginUrl(outerRepoRoot);
 		mkdirSync(dirname(innerRepoRoot), { recursive: true });
-		console.log(`\nShallow-cloning inner repo from ${originUrl} into ${innerRepoRoot}...`);
-		// Clone shallow with no checkout: we'll fetch and check out the exact
-		// revision the caller requested below. --filter=blob:none isn't needed
-		// on top of --depth=1.
-		await simpleGit(dirname(innerRepoRoot)).clone(originUrl, innerRepoRoot, [
-			"--depth=1",
+		console.log(`\nCloning inner repo from ${outerRepoRoot} into ${innerRepoRoot}...`);
+		// Clone from the outer enlistment on disk: this avoids any remote/network
+		// access and gives the inner repo every object the outer repo already has,
+		// so the requested revision can be checked out below without a fetch.
+		// --no-checkout because we check out the exact revision explicitly below.
+		await simpleGit(dirname(innerRepoRoot)).clone(outerRepoRoot, innerRepoRoot, [
 			"--no-tags",
 			"--no-checkout",
 		]);
 	}
 
 	const innerGit = simpleGit(innerRepoRoot);
-	console.log(`\nFetching revision "${revision}" (shallow) into inner repo...`);
-	// Fetch only the requested commit at depth 1. By naming the SHA directly
-	// we skip fetching any branch tips first, which is what keeps the inner
-	// repo's `.git` small. This relies on the server allowing fetch-by-SHA:
-	// `uploadpack.allowReachableSHA1InWant` lets clients ask for any commit
-	// reachable from an advertised ref (not just the ref tips themselves).
-	// GitHub enables this on every repo; without it, we'd have to fetch a
-	// branch and walk history to the SHA, defeating --depth=1 for any
-	// non-tip commit (which is the common case here, since the merge-base
-	// usually isn't `main` HEAD).
-	await innerGit.fetch(["--depth=1", "origin", revision]);
-
 	console.log(`Checking out revision "${revision}" in inner repo...`);
 	// Use detached HEAD checkout so we don't have to manage local branch state.
-	// FETCH_HEAD is set by the fetch above and is guaranteed to point at the
-	// requested commit, even when `revision` is a SHA the local clone hasn't
-	// otherwise heard of.
-	await innerGit.raw(["checkout", "--detach", "FETCH_HEAD"]);
+	// The revision is resolved against the objects copied from the outer repo
+	// during the clone above.
+	await innerGit.raw(["checkout", "--detach", revision]);
 }
 
 /**
@@ -243,8 +218,9 @@ async function ensureInnerRepoAtRevision(
  * separate inner enlistment checked out to a specific revision (revision mode).
  *
  * In revision mode, the inner repo (at {@link CollectBundleOptions.baseRepoDir}, defaulting to
- * `<analysisDir>/base-repo`) is cloned from the outer repo's `origin` remote on first use and
- * reused thereafter. The outer repo's working tree, branch, and stash are never modified.
+ * `<analysisDir>/base-repo`) is cloned from the outer enlistment on disk on first use and
+ * reused thereafter. No remote or network access is involved. The outer repo's working tree,
+ * branch, and stash are never modified.
  */
 export async function collectBundle(options: CollectBundleOptions): Promise<void> {
 	const { mode, revision, forceCleanBuild, packageDir, analysisDir } = options;

From 9fbcdd3f3275507b0bbe070c6d9887319cca68b4 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 11:26:26 -0700
Subject: [PATCH 56/67] refactor(build-cli): move verbose bundle-script
 comments into @remarks

Relocate the longer explanatory inline comments in the bundle size scripts (collectBundle, collectAndCompareBundles, compareBundles) into @remarks blocks on the owning functions' doc comments, decluttering the function bodies while preserving the rationale.

Short structural one-liners (e.g. section labels in renderAsText, the leaf-node marker, and the compareJsonReports shared-primitive note) are left inline. Comment-only change: no behavior, signatures, or public API affected.
---
 .../bundleSize/collectAndCompareBundles.ts    | 44 +++++++++--------
 .../src/library/bundleSize/collectBundle.ts   | 47 ++++++++++---------
 .../src/library/bundleSize/compareBundles.ts  | 30 +++++++-----
 3 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index 09e6ec443f0f..a2340105f53b 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -108,6 +108,24 @@ async function resolveSha(packageDir: string, rev: string): Promise<string> {
  * {@link compareBundles} can find both directories.
  *
  * The outer repo's working tree, branch, and stash are never modified.
+ *
+ * @remarks
+ * The base label is pinned to "main" because {@link compareBundles} reads from a
+ * fixed base label. The current side is timestamped (unix epoch seconds) so
+ * successive runs, which may carry different uncommitted changes, don't clobber
+ * each other; the same label is passed to {@link collectBundle} and
+ * {@link compareBundles} so they agree on the directory.
+ *
+ * The inner enlistment used to build the base bundle is a scratch clone, not
+ * report data, so it lives under the output directory rather than alongside the
+ * per-label analyzer reports in `analysisDir`. Because the inner repo is only
+ * ever checked out at a clean revision, its build output for a given SHA is
+ * deterministic: the SHA that produced the base report is recorded in a sidecar
+ * `revision.txt`, so a subsequent run against the same merge-base can reuse the
+ * cached report and skip the rebuild. Once the report is saved the inner repo is
+ * deleted by default (it re-creates cheaply via shallow clone, and keeping it
+ * consumes hundreds of MB once dependencies are installed); pass
+ * {@link CollectAndCompareBundlesOptions.keepBaseRepo} to retain it.
  */
 export async function collectAndCompareBundles(
 	options: CollectAndCompareBundlesOptions,
@@ -123,10 +141,7 @@ export async function collectAndCompareBundles(
 		outputDir,
 	} = options;
 
-	// Resolve the base revision. By default we take the merge-base of HEAD and
-	// the requested revision (the fork point); with --exact-base we use the
-	// revision exactly as given (e.g. to compare against a specific parent
-	// commit rather than the fork point).
+	// Resolve the base revision (merge-base of HEAD by default; exact with --exact-base).
 	let baseRevision: string;
 	if (exactBase) {
 		baseRevision = await resolveSha(packageDir, baseRevisionInput);
@@ -148,23 +163,10 @@ export async function collectAndCompareBundles(
 		}
 		baseRevision = resolvedBaseRevision;
 	}
-	// The inner enlistment used to build the base bundle is a scratch clone, not
-	// report data, so it lives under the output directory rather than alongside
-	// the per-label analyzer reports in analysisDir.
 	const innerRepoRoot = resolve(outputDir, "base-repo");
-	// compareBundles reads from a fixed base label ("main"); pin the base
-	// bundle's directory name to that regardless of which revision we resolved.
 	const baseLabel = "main";
-	// The current side is timestamped (unix epoch seconds) so successive runs,
-	// which may carry different uncommitted changes, don't clobber each other.
-	// We pass the same label to collectBundle and compareBundles so they agree
-	// on the directory.
 	const currentLabel = `current_${Math.floor(Date.now() / 1000)}`;
 
-	// The inner repo is only ever checked out at a clean revision; its build
-	// output for a given SHA is deterministic, so a cached base report from a
-	// prior run for the same SHA can be reused. We track the SHA used to produce
-	// the base report in a sidecar revision.txt file.
 	const baseLabelDirectory = resolve(analysisDir, baseLabel);
 	const baseAnalyzerPath = resolve(baseLabelDirectory, "analyzer.json");
 	const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
@@ -207,15 +209,11 @@ export async function collectAndCompareBundles(
 				analysisDir,
 				baseRepoDir: innerRepoRoot,
 			});
-			// Record the SHA that produced this report so a subsequent run
-			// against the same merge-base can skip the rebuild.
+			// Record the SHA so a later run against the same merge-base can skip the rebuild.
 			mkdirSync(baseLabelDirectory, { recursive: true });
 			writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
 
-			// Delete the inner repo now that the report is saved. It's a
-			// shallow clone of the outer repo's `origin`, so re-creating it
-			// on the next run is cheap; keeping it around just consumes disk
-			// (hundreds of MB once dependencies are installed).
+			// Delete the inner repo now that the report is saved (re-created cheaply next run).
 			if (!keepBaseRepo) {
 				if (existsSync(innerRepoRoot)) {
 					console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index b7e0a947bd1c..34be0db03673 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -113,6 +113,11 @@ function buildBundles(packageRoot: string): void {
  * compareBundles.ts needs — so the (large) webpack stats and `build/` outputs
  * do not need to be retained.
  *
+ * @remarks
+ * Uses copy + unlink instead of `renameSync` because the source and destination
+ * may live on different drives (e.g. `D:` -> `C:\Users\<user>\AppData\Local\Temp`),
+ * which causes `renameSync` to fail with `EXDEV` on Windows.
+ *
  * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
  * @param sourcePackageRoot - Package root that produced the webpack output.
  * @param analysisDir - Directory under which per-label stats are saved.
@@ -135,9 +140,6 @@ function saveStats(label: string, sourcePackageRoot: string, analysisDir: string
 	}
 
 	mkdirSync(labelDirectory, { recursive: true });
-	// Use copy + unlink instead of renameSync because the source and destination
-	// may live on different drives (e.g. D: -> C:\Users\<user>\AppData\Local\Temp),
-	// which causes renameSync to fail with EXDEV on Windows.
 	copyFileSync(analyzerJsonOutputPath, destAnalyzerPath);
 	unlinkSync(analyzerJsonOutputPath);
 	console.log(`Saved analyzer report to: ${destAnalyzerPath}`);
@@ -178,12 +180,17 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
  * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot`
  * and is checked out at the requested revision.
  *
+ * @remarks
  * On first call, clones the inner repo directly from the outer enlistment on
  * disk (`--no-tags --no-checkout`). Because the source is a local repository,
  * no remote or network access is involved and every commit already present in
  * the outer repo (including merge-base SHAs that aren't branch tips) is
- * available without a separate fetch. On every call the requested revision is
- * checked out detached.
+ * available without a separate fetch. `--no-checkout` is used because the exact
+ * revision is checked out explicitly afterwards.
+ *
+ * On every call the requested revision is checked out with a detached HEAD, so
+ * there is no local branch state to manage; it is resolved against the objects
+ * copied from the outer repo during the clone.
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
@@ -195,10 +202,6 @@ async function ensureInnerRepoAtRevision(
 	if (!existsSync(resolve(innerRepoRoot, ".git"))) {
 		mkdirSync(dirname(innerRepoRoot), { recursive: true });
 		console.log(`\nCloning inner repo from ${outerRepoRoot} into ${innerRepoRoot}...`);
-		// Clone from the outer enlistment on disk: this avoids any remote/network
-		// access and gives the inner repo every object the outer repo already has,
-		// so the requested revision can be checked out below without a fetch.
-		// --no-checkout because we check out the exact revision explicitly below.
 		await simpleGit(dirname(innerRepoRoot)).clone(outerRepoRoot, innerRepoRoot, [
 			"--no-tags",
 			"--no-checkout",
@@ -207,9 +210,6 @@ async function ensureInnerRepoAtRevision(
 
 	const innerGit = simpleGit(innerRepoRoot);
 	console.log(`Checking out revision "${revision}" in inner repo...`);
-	// Use detached HEAD checkout so we don't have to manage local branch state.
-	// The revision is resolved against the objects copied from the outer repo
-	// during the clone above.
 	await innerGit.raw(["checkout", "--detach", revision]);
 }
 
@@ -217,10 +217,18 @@ async function ensureInnerRepoAtRevision(
  * Collects a single bundle from either the outer enlistment (local mode) or a
  * separate inner enlistment checked out to a specific revision (revision mode).
  *
+ * @remarks
  * In revision mode, the inner repo (at {@link CollectBundleOptions.baseRepoDir}, defaulting to
  * `<analysisDir>/base-repo`) is cloned from the outer enlistment on disk on first use and
- * reused thereafter. No remote or network access is involved. The outer repo's working tree,
- * branch, and stash are never modified.
+ * reused thereafter. No remote or network access is involved.
+ *
+ * In local mode the outer enlistment is built exactly as it sits on disk: its working tree and
+ * revision are never checked out, stashed, or otherwise mutated. The captured patch is therefore
+ * only a reproducibility record of what was staged at collection time — it is never applied. It is
+ * captured up front, before any build steps, so it is preserved even if the build subsequently
+ * fails.
+ *
+ * The outer repo's working tree, branch, and stash are never modified.
  */
 export async function collectBundle(options: CollectBundleOptions): Promise<void> {
 	const { mode, revision, forceCleanBuild, packageDir, analysisDir } = options;
@@ -240,17 +248,10 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 	if (mode === "local") {
 		activeRepoRoot = outerRepoRoot;
 		activePackageRoot = packageDir;
-		// Local mode builds the outer enlistment exactly as it sits on disk: we
-		// never check out, stash, or otherwise mutate its working tree or revision.
-		// The captured patch is therefore only a reproducibility record of what was
-		// staged at collection time — it is never applied. Capture it up front,
-		// before any build steps, so the patch is preserved even if the build
-		// subsequently fails.
 		await captureLocalPatch(outerRepoRoot, resolve(analysisDir, label));
 	} else {
-		// Path of the package relative to the repo root, e.g.
-		// `examples/utils/bundle-size-tests`. Used to locate the same package
-		// inside the freshly-cloned inner repo.
+		// Locate the same package inside the freshly-cloned inner repo via its
+		// path relative to the repo root (e.g. `examples/utils/bundle-size-tests`).
 		const packageWorkspacePath = relative(outerRepoRoot, packageDir);
 		await ensureInnerRepoAtRevision(revision as string, outerRepoRoot, innerRepoRoot);
 		activeRepoRoot = innerRepoRoot;
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 79be60d0c7a1..3ea1a23b9b0e 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -226,16 +226,19 @@ function canonicalModuleKey(modulePath: string): string {
  * owning package. Modules are deduplicated by {@link canonicalModuleKey} using
  * a single shared `seen` set, so a module reached more than once within this
  * asset set is counted exactly once.
+ *
+ * @remarks
+ * A node with children is an aggregate (asset, directory, or concatenated
+ * wrapper) whose `parsedSize` is just the sum of its descendants. The walk
+ * recurses into the children and skips the parent so those bytes are not
+ * double-counted; only childless leaf modules carry a real path and standalone
+ * size.
  */
 function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 	const perPackage = new Map<string, number>();
 	const seen = new Set<string>();
 
 	const visit = (node: AnalyzerNode): void => {
-		// A node with children is an aggregate (asset, directory, or concatenated
-		// wrapper) whose parsedSize is just the sum of its descendants. Recurse into
-		// the children and skip the parent so those bytes are not double-counted;
-		// only childless leaf modules carry a real path and standalone size.
 		if (node.groups !== undefined && node.groups.length > 0) {
 			for (const child of node.groups) visit(child);
 			return;
@@ -365,10 +368,6 @@ function comparePackages(
 	baseNodes: AnalyzerNode[],
 	currentNodes: AnalyzerNode[],
 ): { packageBuckets: ComparisonRow[]; packages: ComparisonRow[] } {
-	// Per-package rows are each scoped to a single real entrypoint (not a sum
-	// over entrypoints), deduping modules within that asset before diffing.
-	// Memoized because each entrypoint feeds more than one headline bucket as
-	// well as the full per-package breakdown.
 	const rowsByAsset = new Map<string, ComparisonRow[]>();
 	const rowsForAsset = (asset: string): ComparisonRow[] => {
 		let rows = rowsByAsset.get(asset);
@@ -542,6 +541,14 @@ function renderTable(emit: (line?: string) => void, spec: TableSpec): void {
 /**
  * Renders a {@link ComparisonReport} as a human-readable text report.
  * Also echoes each line to the console.
+ *
+ * @remarks
+ * Sections are emitted in order: asset-level (per-emitted-file sizes, independent
+ * of entrypoints), entrypoint-level, then package-level (composition buckets
+ * followed by the full breakdown). Entrypoint rows overlap and must not be
+ * summed; the `fluidFrameworkAll` aggregate entrypoint gives the single
+ * deduplicated bundle-wide total. The package-level sections are scoped to real
+ * entrypoints (see {@link bucketDefinitions} / {@link ComparisonReport}).
  */
 function renderAsText(report: ComparisonReport): string {
 	const lines: string[] = [];
@@ -569,17 +576,14 @@ function renderAsText(report: ComparisonReport): string {
 		});
 	}
 
-	// Entrypoint-level section: each row is a real shipped bundle. Rows overlap
-	// and must not be summed; the `fluidFrameworkAll` aggregate entrypoint gives
-	// the single deduplicated bundle-wide total.
+	// Entrypoint-level section: each row is a real shipped bundle.
 	renderTable(emit, {
 		heading: "Named entrypoint total asset sizes (each row is a real entrypoint)",
 		nameHeader: "Entrypoint",
 		rows: report.entrypoints,
 	});
 
-	// Package-level sections: composition buckets, then the full breakdown. Both
-	// are scoped to real entrypoints (see bucketDefinitions / ComparisonReport).
+	// Package-level sections: composition buckets, then the full breakdown.
 	renderTable(emit, {
 		heading: "Bundle composition by category (parsed size in bytes)",
 		nameHeader: "Package",

From ea02e6f21b729b07587d2b3fd60911a6e3b86a21 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 12:59:21 -0700
Subject: [PATCH 57/67] fix(build-cli): correctly resolve revision-mode
 checkout targets

In bundle revision mode the inner repo is a clone of the outer repo, so a branch from the outer repo exists in the clone only as a remote-tracking ref (origin/<branch>). A bare branch name therefore failed to resolve under 'git checkout --detach', and relative committishes such as HEAD~2 resolved against the inner clone's HEAD (the wrong commit).

ensureInnerRepoAtRevision now selects the checkout target explicitly: an exact branch is checked out by its qualified origin/<branch> name (readable, never turned into a SHA), while anything else - a commit SHA, tag, or committish - is resolved to a commit SHA in the outer repo (the source of truth for HEAD and relative refs) and that SHA, which the full clone already contains, is checked out. Branch detection uses a non-throwing 'git for-each-ref' probe.

Also broadens the --revision flag help to mention committishes. Validated end-to-end by collecting a branch (tbrosman/eslint-config-13), HEAD~2, and a bare SHA.
---
 .../build-cli/src/commands/bundle/collect.ts  |  5 ++-
 .../src/library/bundleSize/collectBundle.ts   | 42 +++++++++++++++++--
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index 175707ca7f68..fdaf09f069cb 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -38,8 +38,9 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 		}),
 		revision: Flags.string({
 			description:
-				"(revision mode only, required) Branch, tag, or commit SHA to check out in the " +
-				"inner repo before building. Also used as the default label.",
+				"(revision mode only, required) Branch, tag, commit SHA, or any committish (e.g. " +
+				"HEAD~2) to check out in the inner repo before building. Non-branch revisions are " +
+				"resolved against the outer repo. Also used as the default label.",
 		}),
 		label: Flags.string({
 			description:
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 34be0db03673..478f730bd38f 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -24,7 +24,9 @@ export interface CollectBundleOptions {
 	 */
 	readonly mode: "local" | "revision";
 	/**
-	 * (revision mode only) Branch, tag, or commit SHA to check out in the inner repo before building.
+	 * (revision mode only) Revision to check out in the inner repo before building. May be a
+	 * branch, tag, commit SHA, or any committish (e.g. `HEAD~2`); non-branch revisions are
+	 * resolved against the outer repo.
 	 */
 	readonly revision?: string;
 	/**
@@ -189,8 +191,23 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
  * revision is checked out explicitly afterwards.
  *
  * On every call the requested revision is checked out with a detached HEAD, so
- * there is no local branch state to manage; it is resolved against the objects
- * copied from the outer repo during the clone.
+ * there is no local branch state to manage. The checkout target is chosen as
+ * follows:
+ *
+ * - A branch from the outer repo is mirrored in the clone as a remote-tracking
+ *   ref, so it is checked out by its qualified name `origin/<branch>` (a bare
+ *   branch name would not resolve here — git would look for a remote literally
+ *   named `<branch>`). Branch names are never turned into a SHA, so the checkout
+ *   stays readable.
+ * - Anything else — a commit SHA, a tag, or a relative committish such as
+ *   `HEAD^4` — is meaningful only in the outer repo (a relative ref evaluated in
+ *   the clone would resolve against the clone's HEAD, i.e. the wrong commit), so
+ *   it is resolved to a commit SHA in the outer repo and that SHA, which the full
+ *   clone already contains, is checked out.
+ *
+ * Branch detection uses `for-each-ref`, which echoes the ref when the revision
+ * names a branch and otherwise prints nothing while exiting 0, so the non-branch
+ * case is a normal empty result rather than a thrown error.
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
@@ -209,8 +226,25 @@ async function ensureInnerRepoAtRevision(
 	}
 
 	const innerGit = simpleGit(innerRepoRoot);
+
+	// Pick the checkout target (see @remarks): a branch is checked out by its
+	// origin/<branch> name; everything else is resolved to a SHA in the outer repo.
+	const remoteBranchRef = `refs/remotes/origin/${revision}`;
+	const matchedRef = (
+		await innerGit.raw(["for-each-ref", "--format=%(refname)", remoteBranchRef])
+	).trim();
+
+	let checkoutTarget: string;
+	if (matchedRef === remoteBranchRef) {
+		checkoutTarget = `origin/${revision}`;
+	} else {
+		checkoutTarget = (
+			await simpleGit(outerRepoRoot).raw(["rev-parse", `${revision}^{commit}`])
+		).trim();
+	}
+
 	console.log(`Checking out revision "${revision}" in inner repo...`);
-	await innerGit.raw(["checkout", "--detach", revision]);
+	await innerGit.raw(["checkout", "--detach", checkoutTarget]);
 }
 
 /**

From 4a234e7900eb801bc85564258053cf116f25c9fc Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 14:56:22 -0700
Subject: [PATCH 58/67] refactor(build-cli): consolidate bundle collection into
 collectBundle and simplify collect flags

Move revision resolution (merge-base/exact), base-report caching via a
revision.txt sidecar, and default label generation (timestamped
current_<epoch>) out of the collect-and-compare orchestrator and into
collectBundle, which now returns the label it saved under.
collectAndCompareBundles is reduced to sequencing collect/collect/compare
and deleting the scratch inner repo after the comparison.

Redesign the collect command around committish-driven flags, replacing the
--mode/--revision/--exact-base trio:
  - --revision <committish>: build that committish resolved as-is
  - --merge-base <committish>: build the merge-base of HEAD and the committish
The two are mutually exclusive; omitting both collects the local working tree.
CollectBundleOptions.exactBase is replaced with resolution: 'exact' | 'merge-base'.

Also remove the unused --skip-compare flag from collect-and-compare, simplify
ensureInnerRepoAtRevision to check out an already-resolved SHA, and regenerate
docs/bundle.md.
---
 build-tools/packages/build-cli/docs/bundle.md |  25 +-
 .../commands/bundle/collect-and-compare.ts    |   7 +-
 .../build-cli/src/commands/bundle/collect.ts  |  64 +++--
 .../bundleSize/collectAndCompareBundles.ts    | 195 ++++----------
 .../src/library/bundleSize/collectBundle.ts   | 237 +++++++++++++-----
 5 files changed, 268 insertions(+), 260 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index ba81c296a186..7233ebcc6b5d 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -13,7 +13,7 @@ Build and collect a bundle, either from the outer enlistment (local mode) or fro
 
 ```
 USAGE
-  $ flub bundle collect [-v | --quiet] [--mode local|revision] [--revision <value>] [--label <value>] [--package-dir
+  $ flub bundle collect [-v | --quiet] [--revision <value> | --merge-base <value>] [--label <value>] [--package-dir
     <value>] [--analysis-dir <value>] [--force-clean-build]
 
 FLAGS
@@ -23,14 +23,14 @@ FLAGS
                           default; opt in when stale incremental build state from a previous revision may interfere with
                           the current one.
   --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
-                          revision in revision mode, or "current" in local mode.
-  --mode=<option>         [default: local] local: collect from the outer enlistment (its git state is never modified).
-                          revision: collect from a separate inner enlistment checked out at --revision.
-                          <options: local|revision>
+                          revision in revision mode, or a timestamped "current_<epoch>" in local mode.
+  --merge-base=<value>    Collect a bundle for the merge-base of HEAD and this committish (the fork point). Selects
+                          revision mode and is mutually exclusive with --revision. Also used as the default label.
   --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
                           collected.
-  --revision=<value>      (revision mode only, required) Branch, tag, or commit SHA to check out in the inner repo
-                          before building. Also used as the default label.
+  --revision=<value>      Collect a bundle for this committish (branch, tag, commit SHA, or any committish like HEAD~2),
+                          resolved as-is via 'git rev-parse'. Selects revision mode and is mutually exclusive with
+                          --merge-base; omit both to collect the local working tree. Also used as the default label.
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
@@ -46,9 +46,11 @@ DESCRIPTION
 EXAMPLES
   $ flub bundle collect
 
-  $ flub bundle collect --mode revision --revision main
+  $ flub bundle collect --revision main
 
-  $ flub bundle collect --mode revision --revision client_v2.100.0
+  $ flub bundle collect --merge-base main
+
+  $ flub bundle collect --revision client_v2.100.0
 ```
 
 _See code: [src/commands/bundle/collect.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect.ts)_
@@ -60,7 +62,7 @@ Collect the local bundle and the base-revision (merge-base) bundle, then compare
 ```
 USAGE
   $ flub bundle collect-and-compare [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
-    [--analysis-dir <value>] [--output-dir <value>] [--skip-compare] [--force-clean-build] [--keep-base-repo]
+    [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
 
 FLAGS
   --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to an 'analysis'
@@ -81,7 +83,6 @@ FLAGS
   --output-dir=<value>     Directory where the comparison reports are written. Defaults to
                            <package-dir>/compareBundlesOutput.
   --package-dir=<value>    [default: .] Package root whose webpack bundles are built and compared.
-  --skip-compare           Collect both bundles, but skip the comparison step.
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
@@ -103,7 +104,7 @@ EXAMPLES
 
   $ flub bundle collect-and-compare --base-revision 18062854f25 --exact-base
 
-  $ flub bundle collect-and-compare --force-clean-build --skip-compare
+  $ flub bundle collect-and-compare --force-clean-build --keep-base-repo
 ```
 
 _See code: [src/commands/bundle/collect-and-compare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts)_
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
index 881632a462e7..bd11b8835fd3 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
@@ -26,7 +26,7 @@ export default class BundleCollectAndCompare extends BaseCommand<
 		"<%= config.bin %> <%= command.id %> --base-revision main",
 		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
 		"<%= config.bin %> <%= command.id %> --base-revision 18062854f25 --exact-base",
-		"<%= config.bin %> <%= command.id %> --force-clean-build --skip-compare",
+		"<%= config.bin %> <%= command.id %> --force-clean-build --keep-base-repo",
 	];
 
 	public static readonly flags = {
@@ -60,10 +60,6 @@ export default class BundleCollectAndCompare extends BaseCommand<
 				"Directory where the comparison reports are written. Defaults to " +
 				"<package-dir>/compareBundlesOutput.",
 		}),
-		"skip-compare": Flags.boolean({
-			description: "Collect both bundles, but skip the comparison step.",
-			default: false,
-		}),
 		"force-clean-build": Flags.boolean({
 			description:
 				"Run the full workspace clean before each build. Off by default; opt in when stale " +
@@ -98,7 +94,6 @@ export default class BundleCollectAndCompare extends BaseCommand<
 		await collectAndCompareBundles({
 			baseRevision: flags["base-revision"],
 			exactBase: flags["exact-base"],
-			skipCompare: flags["skip-compare"],
 			forceCleanBuild: flags["force-clean-build"],
 			keepBaseRepo: flags["keep-base-repo"],
 			packageDir,
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index fdaf09f069cb..1a1c63baaa26 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -24,28 +24,31 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
-		"<%= config.bin %> <%= command.id %> --mode revision --revision main",
-		"<%= config.bin %> <%= command.id %> --mode revision --revision client_v2.100.0",
+		"<%= config.bin %> <%= command.id %> --revision main",
+		"<%= config.bin %> <%= command.id %> --merge-base main",
+		"<%= config.bin %> <%= command.id %> --revision client_v2.100.0",
 	];
 
 	public static readonly flags = {
-		mode: Flags.string({
+		revision: Flags.string({
 			description:
-				"local: collect from the outer enlistment (its git state is never modified). " +
-				"revision: collect from a separate inner enlistment checked out at --revision.",
-			options: ["local", "revision"] as const,
-			default: "local",
+				"Collect a bundle for this committish (branch, tag, commit SHA, or any committish " +
+				"like HEAD~2), resolved as-is via 'git rev-parse'. Selects revision mode and is " +
+				"mutually exclusive with --merge-base; omit both to collect the local working tree. " +
+				"Also used as the default label.",
+			exclusive: ["merge-base"],
 		}),
-		revision: Flags.string({
+		"merge-base": Flags.string({
 			description:
-				"(revision mode only, required) Branch, tag, commit SHA, or any committish (e.g. " +
-				"HEAD~2) to check out in the inner repo before building. Non-branch revisions are " +
-				"resolved against the outer repo. Also used as the default label.",
+				"Collect a bundle for the merge-base of HEAD and this committish (the fork point). " +
+				"Selects revision mode and is mutually exclusive with --revision. Also used as the " +
+				"default label.",
+			exclusive: ["revision"],
 		}),
 		label: Flags.string({
 			description:
 				"Override the directory name under which bundle stats are saved. Defaults to the " +
-				'sanitized revision in revision mode, or "current" in local mode.',
+				'sanitized revision in revision mode, or a timestamped "current_<epoch>" in local mode.',
 		}),
 		"package-dir": Flags.string({
 			description:
@@ -70,26 +73,39 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 	public async run(): Promise<void> {
 		const { flags } = this;
 
-		const mode = flags.mode as "local" | "revision";
-		const { revision } = flags;
-		if (mode === "revision" && (revision === undefined || revision.length === 0)) {
-			this.error("--mode revision requires --revision <rev>.", { exit: 1 });
-		}
-
 		const packageDir = resolve(flags["package-dir"]);
 		const analysisDir =
 			flags["analysis-dir"] === undefined
 				? resolve(packageDir, "compareBundlesOutput", "analysis")
 				: resolve(flags["analysis-dir"]);
-		const label = flags.label ?? (mode === "revision" ? (revision as string) : "current");
 
-		await collectBundle({
-			mode,
-			revision,
-			label,
+		const common = {
+			label: flags.label,
 			forceCleanBuild: flags["force-clean-build"],
 			packageDir,
 			analysisDir,
-		});
+		};
+
+		// The presence of --revision/--merge-base (mutually exclusive) selects revision
+		// mode and how the committish is resolved; with neither, collect the local working tree.
+		const exactRevision = flags.revision;
+		const mergeBaseRevision = flags["merge-base"];
+		if (exactRevision !== undefined) {
+			await collectBundle({
+				...common,
+				mode: "revision",
+				revision: exactRevision,
+				resolution: "exact",
+			});
+		} else if (mergeBaseRevision !== undefined) {
+			await collectBundle({
+				...common,
+				mode: "revision",
+				revision: mergeBaseRevision,
+				resolution: "merge-base",
+			});
+		} else {
+			await collectBundle({ ...common, mode: "local" });
+		}
 	}
 }
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index a2340105f53b..9c711cc0d0e3 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -3,11 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, rmSync } from "node:fs";
 import { resolve } from "node:path";
 
-import { simpleGit } from "simple-git";
-
 import { collectBundle } from "./collectBundle.js";
 import { compareBundles } from "./compareBundles.js";
 
@@ -28,8 +26,6 @@ export interface CollectAndCompareBundlesOptions {
 	 * exact commit (e.g. "current vs. its parent") rather than the fork point.
 	 */
 	readonly exactBase?: boolean;
-	/** Collect both bundles, but skip the comparison step. */
-	readonly skipCompare: boolean;
 	/** Run the full workspace clean before each build. */
 	readonly forceCleanBuild: boolean;
 	/** For debugging only: keep the inner base-repo clone after collecting the base bundle. */
@@ -42,98 +38,41 @@ export interface CollectAndCompareBundlesOptions {
 	readonly outputDir: string;
 }
 
-/**
- * Resolves the merge-base (best common ancestor) of two committishes (branch,
- * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
- * resolved (e.g. unknown branch, detached state with no shared history).
- *
- * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
- * symmetric — per the git documentation, `git merge-base a b` outputs a commit
- * reachable from both `a` and `b`, so argument order does not affect the result
- * (order only matters for the 3+ commit and `--fork-point` forms, which we do
- * not use here).
- *
- * Using merge-base instead of a raw branch tip means the comparison is taken
- * against the actual fork point, which is what users typically want — and it
- * works for worktree-based setups where `main` may not exist as a local branch
- * at the location they expect.
- */
-async function resolveMergeBase(
-	packageDir: string,
-	rev: string,
-	otherRev = "HEAD",
-): Promise<string | undefined> {
-	try {
-		const output = await simpleGit(packageDir).raw(["merge-base", rev, otherRev]);
-		const sha = output.trim();
-		return sha.length > 0 ? sha : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
-/**
- * Resolves a committish (branch, tag, or SHA) to its full commit SHA via
- * `git rev-parse <rev>^{commit}`. Unlike {@link resolveMergeBase}, the revision
- * is used exactly as given (no fork-point computation). Throws if the revision
- * cannot be resolved locally, with guidance to fetch it first.
- *
- * The `^{commit}` peel ensures annotated tags resolve to the underlying commit
- * rather than the tag object.
- */
-async function resolveSha(packageDir: string, rev: string): Promise<string> {
-	try {
-		const output = await simpleGit(packageDir).raw(["rev-parse", `${rev}^{commit}`]);
-		const sha = output.trim();
-		if (sha.length > 0) return sha;
-	} catch {
-		// Fall through to the shared error below.
-	}
-	throw new Error(
-		`Could not resolve revision "${rev}" to a commit. ` +
-			`Ensure it exists locally (e.g. "git fetch origin ${rev}").`,
-	);
-}
-
 /**
  * Orchestrates: {@link collectBundle} (local working tree), then
  * {@link collectBundle} (base revision), then {@link compareBundles}.
  *
  * The base revision is taken as the merge-base of HEAD and `baseRevision` by
- * default, or used as-is when `exactBase` is set.
+ * default, or used as-is when `exactBase` is set; that resolution, and caching
+ * of the base report, are handled inside {@link collectBundle}.
  *
- * Labels (used as analysis subdirectory names) are determined automatically:
- * the local bundle is saved under a timestamped "current_<epoch>" label and the
- * base bundle under "main", regardless of which revision we resolved, so that
- * {@link compareBundles} can find both directories.
+ * Labels (used as analysis subdirectory names) are determined automatically: the
+ * local bundle is saved under a timestamped "current_<epoch>" label (generated
+ * by {@link collectBundle} and returned for the comparison) and the base bundle
+ * under "main", so that {@link compareBundles} can find both directories.
  *
  * The outer repo's working tree, branch, and stash are never modified.
  *
  * @remarks
  * The base label is pinned to "main" because {@link compareBundles} reads from a
- * fixed base label. The current side is timestamped (unix epoch seconds) so
- * successive runs, which may carry different uncommitted changes, don't clobber
- * each other; the same label is passed to {@link collectBundle} and
- * {@link compareBundles} so they agree on the directory.
+ * fixed base label. The current label is timestamped by {@link collectBundle}
+ * (so successive runs carrying different uncommitted changes don't clobber each
+ * other) and the returned value is passed straight to {@link compareBundles} so
+ * they agree on the directory.
  *
  * The inner enlistment used to build the base bundle is a scratch clone, not
  * report data, so it lives under the output directory rather than alongside the
- * per-label analyzer reports in `analysisDir`. Because the inner repo is only
- * ever checked out at a clean revision, its build output for a given SHA is
- * deterministic: the SHA that produced the base report is recorded in a sidecar
- * `revision.txt`, so a subsequent run against the same merge-base can reuse the
- * cached report and skip the rebuild. Once the report is saved the inner repo is
- * deleted by default (it re-creates cheaply via shallow clone, and keeping it
- * consumes hundreds of MB once dependencies are installed); pass
+ * per-label analyzer reports in `analysisDir`. Once the comparison is complete
+ * the inner repo is deleted by default (it re-creates cheaply via clone, and
+ * keeping it consumes hundreds of MB once dependencies are installed); pass
  * {@link CollectAndCompareBundlesOptions.keepBaseRepo} to retain it.
  */
 export async function collectAndCompareBundles(
 	options: CollectAndCompareBundlesOptions,
 ): Promise<void> {
 	const {
-		baseRevision: baseRevisionInput,
+		baseRevision,
 		exactBase = false,
-		skipCompare,
 		forceCleanBuild,
 		keepBaseRepo,
 		packageDir,
@@ -141,97 +80,49 @@ export async function collectAndCompareBundles(
 		outputDir,
 	} = options;
 
-	// Resolve the base revision (merge-base of HEAD by default; exact with --exact-base).
-	let baseRevision: string;
-	if (exactBase) {
-		baseRevision = await resolveSha(packageDir, baseRevisionInput);
-		if (baseRevision !== baseRevisionInput) {
-			console.log(`Resolved base revision "${baseRevisionInput}" to ${baseRevision}.`);
-		}
-	} else {
-		const resolvedBaseRevision = await resolveMergeBase(packageDir, baseRevisionInput);
-		if (resolvedBaseRevision === undefined) {
-			throw new Error(
-				`Could not find merge-base of HEAD and "${baseRevisionInput}". ` +
-					`Ensure the revision exists locally (e.g. "git fetch origin ${baseRevisionInput}").`,
-			);
-		}
-		if (resolvedBaseRevision !== baseRevisionInput) {
-			console.log(
-				`Resolved base revision "${baseRevisionInput}" to merge-base ${resolvedBaseRevision}.`,
-			);
-		}
-		baseRevision = resolvedBaseRevision;
-	}
 	const innerRepoRoot = resolve(outputDir, "base-repo");
 	const baseLabel = "main";
-	const currentLabel = `current_${Math.floor(Date.now() / 1000)}`;
-
-	const baseLabelDirectory = resolve(analysisDir, baseLabel);
-	const baseAnalyzerPath = resolve(baseLabelDirectory, "analyzer.json");
-	const baseRevisionMarkerPath = resolve(baseLabelDirectory, "revision.txt");
-	const cachedBaseRevision = existsSync(baseRevisionMarkerPath)
-		? readFileSync(baseRevisionMarkerPath, "utf8").trim()
-		: undefined;
-	const baseStatsAreCached =
-		!forceCleanBuild && existsSync(baseAnalyzerPath) && cachedBaseRevision === baseRevision;
 
 	try {
 		console.log(`\n${"=".repeat(80)}`);
-		console.log(`Collecting local bundle (label: ${currentLabel})...`);
+		console.log("Collecting local bundle...");
 		console.log("=".repeat(80));
-		await collectBundle({
+		const currentLabel = await collectBundle({
 			mode: "local",
-			label: currentLabel,
 			forceCleanBuild,
 			packageDir,
 			analysisDir,
 		});
 
 		console.log(`\n${"=".repeat(80)}`);
-		if (baseStatsAreCached) {
-			console.log(
-				`Reusing cached base bundle (revision: ${baseRevision}, label: ${baseLabel}).`,
-			);
-			console.log(`  Report: ${baseAnalyzerPath}`);
-			console.log("=".repeat(80));
-		} else {
-			console.log(
-				`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`,
-			);
-			console.log("=".repeat(80));
-			await collectBundle({
-				mode: "revision",
-				revision: baseRevision,
-				label: baseLabel,
-				forceCleanBuild,
-				packageDir,
-				analysisDir,
-				baseRepoDir: innerRepoRoot,
-			});
-			// Record the SHA so a later run against the same merge-base can skip the rebuild.
-			mkdirSync(baseLabelDirectory, { recursive: true });
-			writeFileSync(baseRevisionMarkerPath, `${baseRevision}\n`);
+		console.log(`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`);
+		console.log("=".repeat(80));
+		await collectBundle({
+			mode: "revision",
+			revision: baseRevision,
+			resolution: exactBase ? "exact" : "merge-base",
+			label: baseLabel,
+			forceCleanBuild,
+			packageDir,
+			analysisDir,
+			baseRepoDir: innerRepoRoot,
+		});
 
-			// Delete the inner repo now that the report is saved (re-created cheaply next run).
-			if (!keepBaseRepo) {
-				if (existsSync(innerRepoRoot)) {
-					console.log(`Deleting inner base-repo at ${innerRepoRoot}...`);
-					rmSync(innerRepoRoot, { recursive: true, force: true });
-				}
-			}
-		}
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("Running bundle comparison...");
+		console.log("=".repeat(80));
+		compareBundles({
+			analysisDirectory: analysisDir,
+			outputDirectory: outputDir,
+			baseLabel,
+			currentLabel,
+		});
 
-		if (!skipCompare) {
-			console.log(`\n${"=".repeat(80)}`);
-			console.log("Running bundle comparison...");
-			console.log("=".repeat(80));
-			compareBundles({
-				analysisDirectory: analysisDir,
-				outputDirectory: outputDir,
-				baseLabel,
-				currentLabel,
-			});
+		// Delete the inner repo now that the comparison is complete (re-created
+		// cheaply on the next run). Pass keepBaseRepo to retain it for debugging.
+		if (!keepBaseRepo && existsSync(innerRepoRoot)) {
+			console.log(`\nDeleting inner base-repo at ${innerRepoRoot}...`);
+			rmSync(innerRepoRoot, { recursive: true, force: true });
 		}
 
 		console.log(`\n${"=".repeat(80)}`);
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 478f730bd38f..483811d48509 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -4,7 +4,14 @@
  */
 
 import { execSync } from "node:child_process";
-import { copyFileSync, existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
+import {
+	copyFileSync,
+	existsSync,
+	mkdirSync,
+	readFileSync,
+	unlinkSync,
+	writeFileSync,
+} from "node:fs";
 import { dirname, relative, resolve } from "node:path";
 
 import { findGitRootSync } from "@fluid-tools/build-infrastructure";
@@ -24,16 +31,23 @@ export interface CollectBundleOptions {
 	 */
 	readonly mode: "local" | "revision";
 	/**
-	 * (revision mode only) Revision to check out in the inner repo before building. May be a
-	 * branch, tag, commit SHA, or any committish (e.g. `HEAD~2`); non-branch revisions are
-	 * resolved against the outer repo.
+	 * (revision mode only) Committish to build in the inner repo (branch, tag, commit SHA, or any
+	 * committish like `HEAD~2`). Combined with {@link CollectBundleOptions.resolution} to pick the
+	 * commit that is built. Resolved against the outer repo. Also used as the default label.
 	 */
 	readonly revision?: string;
+	/**
+	 * (revision mode only) How {@link CollectBundleOptions.revision} is resolved to the commit that
+	 * is built: `exact` uses the committish as-is (via `git rev-parse`); `merge-base` uses its
+	 * merge-base with HEAD (the fork point). Defaults to `merge-base`. Ignored in local mode.
+	 */
+	readonly resolution?: "exact" | "merge-base";
 	/**
 	 * Directory name (under {@link CollectBundleOptions.analysisDir}) to save the collected bundle
-	 * stats into. Sanitized for filesystem use before being applied.
+	 * stats into. Sanitized for filesystem use before being applied. Defaults to the sanitized
+	 * revision in revision mode, or a timestamped `current_<epoch>` in local mode.
 	 */
-	readonly label: string;
+	readonly label?: string;
 	/**
 	 * Run the full workspace clean (`npm run clean` at the repo root) before building.
 	 */
@@ -60,6 +74,59 @@ function sanitizeForFileName(value: string): string {
 	return value.replaceAll(/[^\w.-]/g, "_");
 }
 
+/**
+ * Resolves the merge-base (best common ancestor) of two committishes (branch,
+ * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
+ * resolved (e.g. unknown branch, detached state with no shared history).
+ *
+ * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
+ * symmetric — per the git documentation, `git merge-base a b` outputs a commit
+ * reachable from both `a` and `b`, so argument order does not affect the result
+ * (order only matters for the 3+ commit and `--fork-point` forms, which we do
+ * not use here).
+ *
+ * Using merge-base instead of a raw branch tip means the comparison is taken
+ * against the actual fork point, which is what users typically want — and it
+ * works for worktree-based setups where `main` may not exist as a local branch
+ * at the location they expect.
+ */
+async function resolveMergeBase(
+	repoRoot: string,
+	rev: string,
+	otherRev = "HEAD",
+): Promise<string | undefined> {
+	try {
+		const output = await simpleGit(repoRoot).raw(["merge-base", rev, otherRev]);
+		const sha = output.trim();
+		return sha.length > 0 ? sha : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Resolves a committish (branch, tag, or SHA) to its full commit SHA via
+ * `git rev-parse <rev>^{commit}`. Unlike {@link resolveMergeBase}, the revision
+ * is used exactly as given (no fork-point computation). Throws if the revision
+ * cannot be resolved locally, with guidance to fetch it first.
+ *
+ * The `^{commit}` peel ensures annotated tags resolve to the underlying commit
+ * rather than the tag object.
+ */
+async function resolveSha(repoRoot: string, rev: string): Promise<string> {
+	try {
+		const output = await simpleGit(repoRoot).raw(["rev-parse", `${rev}^{commit}`]);
+		const sha = output.trim();
+		if (sha.length > 0) return sha;
+	} catch {
+		// Fall through to the shared error below.
+	}
+	throw new Error(
+		`Could not resolve revision "${rev}" to a commit. ` +
+			`Ensure it exists locally (e.g. "git fetch origin ${rev}").`,
+	);
+}
+
 /**
  * Runs a command inheriting stdio, throwing on failure.
  */
@@ -179,40 +246,26 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
 }
 
 /**
- * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot`
- * and is checked out at the requested revision.
+ * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot` and
+ * is checked out at the given commit SHA.
  *
  * @remarks
  * On first call, clones the inner repo directly from the outer enlistment on
- * disk (`--no-tags --no-checkout`). Because the source is a local repository,
- * no remote or network access is involved and every commit already present in
- * the outer repo (including merge-base SHAs that aren't branch tips) is
- * available without a separate fetch. `--no-checkout` is used because the exact
- * revision is checked out explicitly afterwards.
+ * disk (`--no-tags --no-checkout`). Because the source is a local repository, no
+ * remote or network access is involved and every commit already present in the
+ * outer repo (including merge-base SHAs that aren't branch tips) is available
+ * without a separate fetch. `--no-checkout` is used because the SHA is checked
+ * out explicitly afterwards.
  *
- * On every call the requested revision is checked out with a detached HEAD, so
- * there is no local branch state to manage. The checkout target is chosen as
- * follows:
- *
- * - A branch from the outer repo is mirrored in the clone as a remote-tracking
- *   ref, so it is checked out by its qualified name `origin/<branch>` (a bare
- *   branch name would not resolve here — git would look for a remote literally
- *   named `<branch>`). Branch names are never turned into a SHA, so the checkout
- *   stays readable.
- * - Anything else — a commit SHA, a tag, or a relative committish such as
- *   `HEAD^4` — is meaningful only in the outer repo (a relative ref evaluated in
- *   the clone would resolve against the clone's HEAD, i.e. the wrong commit), so
- *   it is resolved to a commit SHA in the outer repo and that SHA, which the full
- *   clone already contains, is checked out.
- *
- * Branch detection uses `for-each-ref`, which echoes the ref when the revision
- * names a branch and otherwise prints nothing while exiting 0, so the non-branch
- * case is a normal empty result rather than a thrown error.
+ * The SHA is checked out with a detached HEAD, so there is no local branch state
+ * to manage. Callers resolve the user's revision to a SHA in the outer repo
+ * before calling, so any committish — branch, tag, or relative ref such as
+ * `HEAD^4` — is handled uniformly here.
  *
  * Never modifies the outer repo's working tree, branch, or stash.
  */
 async function ensureInnerRepoAtRevision(
-	revision: string,
+	sha: string,
 	outerRepoRoot: string,
 	innerRepoRoot: string,
 ): Promise<void> {
@@ -225,36 +278,36 @@ async function ensureInnerRepoAtRevision(
 		]);
 	}
 
-	const innerGit = simpleGit(innerRepoRoot);
-
-	// Pick the checkout target (see @remarks): a branch is checked out by its
-	// origin/<branch> name; everything else is resolved to a SHA in the outer repo.
-	const remoteBranchRef = `refs/remotes/origin/${revision}`;
-	const matchedRef = (
-		await innerGit.raw(["for-each-ref", "--format=%(refname)", remoteBranchRef])
-	).trim();
-
-	let checkoutTarget: string;
-	if (matchedRef === remoteBranchRef) {
-		checkoutTarget = `origin/${revision}`;
-	} else {
-		checkoutTarget = (
-			await simpleGit(outerRepoRoot).raw(["rev-parse", `${revision}^{commit}`])
-		).trim();
-	}
+	console.log(`Checking out ${sha} in inner repo...`);
+	await simpleGit(innerRepoRoot).raw(["checkout", "--detach", sha]);
+}
 
-	console.log(`Checking out revision "${revision}" in inner repo...`);
-	await innerGit.raw(["checkout", "--detach", checkoutTarget]);
+/**
+ * Logs the standard "collection complete" banner.
+ */
+function logCollectionComplete(mode: string, label: string, labelDirectory: string): void {
+	console.log(`\n${"=".repeat(80)}`);
+	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
+	console.log(`  Stats directory: ${labelDirectory}`);
+	console.log("=".repeat(80));
 }
 
 /**
  * Collects a single bundle from either the outer enlistment (local mode) or a
- * separate inner enlistment checked out to a specific revision (revision mode).
+ * separate inner enlistment checked out to a specific revision (revision mode),
+ * and returns the (sanitized) label its stats were saved under.
  *
  * @remarks
- * In revision mode, the inner repo (at {@link CollectBundleOptions.baseRepoDir}, defaulting to
- * `<analysisDir>/base-repo`) is cloned from the outer enlistment on disk on first use and
- * reused thereafter. No remote or network access is involved.
+ * In revision mode, the user's {@link CollectBundleOptions.revision} is resolved to a concrete
+ * commit SHA in the outer repo — its merge-base with HEAD (the fork point) or the committish
+ * as-is, per {@link CollectBundleOptions.resolution}. The inner repo (at
+ * {@link CollectBundleOptions.baseRepoDir}, defaulting to `<analysisDir>/base-repo`) is cloned from
+ * the outer enlistment on disk on first use and reused thereafter. No remote or network access is
+ * involved.
+ *
+ * Because a clean revision builds deterministically, the resolved SHA is recorded in a sidecar
+ * `revision.txt` next to the stats; a later run that resolves to the same SHA reuses the cached
+ * report and skips the rebuild (unless {@link CollectBundleOptions.forceCleanBuild} is set).
  *
  * In local mode the outer enlistment is built exactly as it sits on disk: its working tree and
  * revision are never checked out, stashed, or otherwise mutated. The captured patch is therefore
@@ -264,30 +317,80 @@ async function ensureInnerRepoAtRevision(
  *
  * The outer repo's working tree, branch, and stash are never modified.
  */
-export async function collectBundle(options: CollectBundleOptions): Promise<void> {
-	const { mode, revision, forceCleanBuild, packageDir, analysisDir } = options;
+export async function collectBundle(options: CollectBundleOptions): Promise<string> {
+	const {
+		mode,
+		revision,
+		resolution = "merge-base",
+		forceCleanBuild,
+		packageDir,
+		analysisDir,
+	} = options;
 
 	if (mode === "revision" && (revision === undefined || revision.length === 0)) {
 		throw new Error("revision mode requires a revision.");
 	}
 
-	const label = sanitizeForFileName(options.label);
+	const label = sanitizeForFileName(
+		options.label ??
+			(mode === "revision"
+				? (revision as string)
+				: `current_${Math.floor(Date.now() / 1000)}`),
+	);
 
 	const outerRepoRoot = findGitRootSync(packageDir);
 	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
+	const labelDirectory = resolve(analysisDir, label);
 
 	let activeRepoRoot: string;
 	let activePackageRoot: string;
+	// Set in revision mode to the resolved SHA, recorded alongside the stats so a
+	// later run against the same revision can reuse the report. Undefined in local mode.
+	let resolvedRevision: string | undefined;
 
 	if (mode === "local") {
 		activeRepoRoot = outerRepoRoot;
 		activePackageRoot = packageDir;
-		await captureLocalPatch(outerRepoRoot, resolve(analysisDir, label));
+		await captureLocalPatch(outerRepoRoot, labelDirectory);
 	} else {
-		// Locate the same package inside the freshly-cloned inner repo via its
-		// path relative to the repo root (e.g. `examples/utils/bundle-size-tests`).
+		// Resolve the user's revision to a concrete SHA in the outer repo: the
+		// merge-base with HEAD (the fork point), or the committish as-is for "exact".
+		if (resolution === "exact") {
+			resolvedRevision = await resolveSha(outerRepoRoot, revision as string);
+		} else {
+			const mergeBase = await resolveMergeBase(outerRepoRoot, revision as string);
+			if (mergeBase === undefined) {
+				throw new Error(
+					`Could not find merge-base of HEAD and "${revision as string}". ` +
+						`Ensure the revision exists locally (e.g. "git fetch origin ${revision as string}").`,
+				);
+			}
+			resolvedRevision = mergeBase;
+		}
+		if (resolvedRevision !== revision) {
+			console.log(
+				`Resolved revision "${revision as string}" to ` +
+					`${resolution === "exact" ? "" : "merge-base "}${resolvedRevision}.`,
+			);
+		}
+
+		// Reuse a previously-collected report when the recorded SHA matches.
+		const analyzerPath = resolve(labelDirectory, "analyzer.json");
+		const revisionMarkerPath = resolve(labelDirectory, "revision.txt");
+		const cachedRevision = existsSync(revisionMarkerPath)
+			? readFileSync(revisionMarkerPath, "utf8").trim()
+			: undefined;
+		if (!forceCleanBuild && existsSync(analyzerPath) && cachedRevision === resolvedRevision) {
+			console.log(`Reusing cached bundle (revision: ${resolvedRevision}, label: ${label}).`);
+			console.log(`  Report: ${analyzerPath}`);
+			logCollectionComplete(mode, label, labelDirectory);
+			return label;
+		}
+
+		// Locate the same package inside the inner repo via its path relative to
+		// the repo root (e.g. `examples/utils/bundle-size-tests`).
 		const packageWorkspacePath = relative(outerRepoRoot, packageDir);
-		await ensureInnerRepoAtRevision(revision as string, outerRepoRoot, innerRepoRoot);
+		await ensureInnerRepoAtRevision(resolvedRevision, outerRepoRoot, innerRepoRoot);
 		activeRepoRoot = innerRepoRoot;
 		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
 		if (!existsSync(activePackageRoot)) {
@@ -305,9 +408,11 @@ export async function collectBundle(options: CollectBundleOptions): Promise<void
 	buildWorkspace(activePackageRoot);
 	buildBundles(activePackageRoot);
 	saveStats(label, activePackageRoot, analysisDir);
+	// Record the SHA so a later run against the same revision can skip the rebuild.
+	if (resolvedRevision !== undefined) {
+		writeFileSync(resolve(labelDirectory, "revision.txt"), `${resolvedRevision}\n`);
+	}
 
-	console.log(`\n${"=".repeat(80)}`);
-	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
-	console.log(`  Stats directory: ${resolve(analysisDir, label)}`);
-	console.log("=".repeat(80));
+	logCollectionComplete(mode, label, labelDirectory);
+	return label;
 }

From 90031257e26b07c078662d5ad8788ec65980d240 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 15:21:29 -0700
Subject: [PATCH 59/67] refactor(build-cli): rename bundle collect-and-compare
 command to collectAndCompare

Rename the command file to camelCase to match the repo's command-naming
convention (e.g. `flub generate compatLayerGeneration`). This changes the
invoked command from `flub bundle collect-and-compare` to
`flub bundle collectAndCompare`, consistent with its siblings collect/compare.

Update the bundle-size-tests compare:bundles script, the pnpm-workspace.yaml
comment, and bundleDetails.md to the new name, and regenerate docs/bundle.md.
---
 build-tools/packages/build-cli/docs/bundle.md  | 18 +++++++++---------
 .../packages/build-cli/docs/bundleDetails.md   |  6 +++---
 ...ect-and-compare.ts => collectAndCompare.ts} |  0
 examples/utils/bundle-size-tests/package.json  |  2 +-
 pnpm-workspace.yaml                            |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename build-tools/packages/build-cli/src/commands/bundle/{collect-and-compare.ts => collectAndCompare.ts} (100%)

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index 7233ebcc6b5d..dd0af99c6f63 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -4,7 +4,7 @@
 Bundle commands collect and compare webpack bundle sizes across revisions.
 
 * [`flub bundle collect`](#flub-bundle-collect)
-* [`flub bundle collect-and-compare`](#flub-bundle-collect-and-compare)
+* [`flub bundle collectAndCompare`](#flub-bundle-collectandcompare)
 * [`flub bundle compare`](#flub-bundle-compare)
 
 ## `flub bundle collect`
@@ -55,13 +55,13 @@ EXAMPLES
 
 _See code: [src/commands/bundle/collect.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect.ts)_
 
-## `flub bundle collect-and-compare`
+## `flub bundle collectAndCompare`
 
 Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree, branch, and stash are never modified.
 
 ```
 USAGE
-  $ flub bundle collect-and-compare [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
+  $ flub bundle collectAndCompare [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
     [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
 
 FLAGS
@@ -96,18 +96,18 @@ DESCRIPTION
   https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
 
 EXAMPLES
-  $ flub bundle collect-and-compare
+  $ flub bundle collectAndCompare
 
-  $ flub bundle collect-and-compare --base-revision main
+  $ flub bundle collectAndCompare --base-revision main
 
-  $ flub bundle collect-and-compare --base-revision client_v2.100.0
+  $ flub bundle collectAndCompare --base-revision client_v2.100.0
 
-  $ flub bundle collect-and-compare --base-revision 18062854f25 --exact-base
+  $ flub bundle collectAndCompare --base-revision 18062854f25 --exact-base
 
-  $ flub bundle collect-and-compare --force-clean-build --keep-base-repo
+  $ flub bundle collectAndCompare --force-clean-build --keep-base-repo
 ```
 
-_See code: [src/commands/bundle/collect-and-compare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts)_
+_See code: [src/commands/bundle/collectAndCompare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts)_
 
 ## `flub bundle compare`
 
diff --git a/build-tools/packages/build-cli/docs/bundleDetails.md b/build-tools/packages/build-cli/docs/bundleDetails.md
index 568fd4fc58b5..ee970bbbec04 100644
--- a/build-tools/packages/build-cli/docs/bundleDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleDetails.md
@@ -14,14 +14,14 @@ explains how the commands fit together and how to read the comparison report.
 | --------------------------------- | --------------------------------------------------------------- |
 | `flub bundle collect`             | Build one bundle and save its stats under a label.              |
 | `flub bundle compare`             | Diff two already-collected bundles and write the report.        |
-| `flub bundle collect-and-compare` | Orchestrate both collect steps plus the compare step end-to-end. |
+| `flub bundle collectAndCompare`   | Orchestrate both collect steps plus the compare step end-to-end. |
 
 Each command self-describes its flags via `--help`:
 
 ```sh
 flub bundle collect --help
 flub bundle compare --help
-flub bundle collect-and-compare --help
+flub bundle collectAndCompare --help
 ```
 
 ## Typical workflow
@@ -29,7 +29,7 @@ flub bundle collect-and-compare --help
 In almost every case you just want the one-shot orchestrator:
 
 ```sh
-flub bundle collect-and-compare
+flub bundle collectAndCompare
 ```
 
 This compares your working tree against the merge-base of `HEAD` and `main` —
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts b/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
similarity index 100%
rename from build-tools/packages/build-cli/src/commands/bundle/collect-and-compare.ts
rename to build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index c735ed1346b5..f55a6ddc14f9 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,7 +21,7 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis bundleAnalyzerJson compareBundlesOutput \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"compare:bundles": "flub bundle collect-and-compare",
+		"compare:bundles": "flub bundle collectAndCompare",
 		"eslint": "eslint --quiet --format stylish src",
 		"eslint:fix": "eslint --quiet --format stylish src --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 769a717de1f7..973b69eadc22 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -146,7 +146,7 @@ packages:
   - "!**/bundleAnalysis/**"
 
   # exclude the inner FluidFramework enlistment used by examples/utils/bundle-size-tests for
-  # cross-revision bundle comparison (see `flub bundle collect-and-compare`, which clones the
+  # cross-revision bundle comparison (see `flub bundle collectAndCompare`, which clones the
   # inner repo into <outputDir>/base-repo).
   - "!**/compareBundlesOutput/**"
 

From 7e7fd0ec458381bea915bc2b798aaae510f6abb8 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 16:04:42 -0700
Subject: [PATCH 60/67] refactor(build-cli): split revision/merge-base
 resolution in collectBundle

Replace CollectBundleOptions.resolution with a dedicated mergeBaseOf committish:
revision is always built as-is, mergeBaseOf builds the merge-base with HEAD, so
specifying a revision no longer silently resolves to the fork point. Update the
collect command (--merge-base) and the collect-and-compare orchestrator to match.

Restructure collectBundle into clear phases (validate, resolve+cache, prepare env,
build, save) via resolveBuildRevision/prepareRevisionBuild helpers, and tighten the
helper doc comments.
---
 .../build-cli/src/commands/bundle/collect.ts  |  14 +-
 .../bundleSize/collectAndCompareBundles.ts    |   3 +-
 .../src/library/bundleSize/collectBundle.ts   | 275 ++++++++----------
 3 files changed, 132 insertions(+), 160 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
index 1a1c63baaa26..1b75e0882c31 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collect.ts
@@ -91,19 +91,9 @@ export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
 		const exactRevision = flags.revision;
 		const mergeBaseRevision = flags["merge-base"];
 		if (exactRevision !== undefined) {
-			await collectBundle({
-				...common,
-				mode: "revision",
-				revision: exactRevision,
-				resolution: "exact",
-			});
+			await collectBundle({ ...common, mode: "revision", revision: exactRevision });
 		} else if (mergeBaseRevision !== undefined) {
-			await collectBundle({
-				...common,
-				mode: "revision",
-				revision: mergeBaseRevision,
-				resolution: "merge-base",
-			});
+			await collectBundle({ ...common, mode: "revision", mergeBaseOf: mergeBaseRevision });
 		} else {
 			await collectBundle({ ...common, mode: "local" });
 		}
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index 9c711cc0d0e3..f83237838d37 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -99,8 +99,7 @@ export async function collectAndCompareBundles(
 		console.log("=".repeat(80));
 		await collectBundle({
 			mode: "revision",
-			revision: baseRevision,
-			resolution: exactBase ? "exact" : "merge-base",
+			...(exactBase ? { revision: baseRevision } : { mergeBaseOf: baseRevision }),
 			label: baseLabel,
 			forceCleanBuild,
 			packageDir,
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 483811d48509..a82fd3e026d4 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -23,7 +23,8 @@ import { simpleGit } from "simple-git";
 export interface CollectBundleOptions {
 	/**
 	 * `local`: collect from the outer enlistment that contains {@link CollectBundleOptions.packageDir}.
-	 * `revision`: collect from a separate inner enlistment checked out at {@link CollectBundleOptions.revision}.
+	 * `revision`: collect from a separate inner enlistment checked out at the commit resolved from
+	 * {@link CollectBundleOptions.revision} or {@link CollectBundleOptions.mergeBaseOf}.
 	 *
 	 * In `local` mode the outer enlistment is built exactly as it sits on disk: its git state
 	 * (working tree, branch, and revision) is never modified. All checkout/fetch happens only in
@@ -31,17 +32,18 @@ export interface CollectBundleOptions {
 	 */
 	readonly mode: "local" | "revision";
 	/**
-	 * (revision mode only) Committish to build in the inner repo (branch, tag, commit SHA, or any
-	 * committish like `HEAD~2`). Combined with {@link CollectBundleOptions.resolution} to pick the
-	 * commit that is built. Resolved against the outer repo. Also used as the default label.
+	 * (revision mode only) Committish (branch, tag, commit SHA, or any committish like `HEAD~2`)
+	 * to build as-is, resolved via `git rev-parse`. Mutually exclusive with
+	 * {@link CollectBundleOptions.mergeBaseOf}. Resolved against the outer repo. Also used as the
+	 * default label.
 	 */
 	readonly revision?: string;
 	/**
-	 * (revision mode only) How {@link CollectBundleOptions.revision} is resolved to the commit that
-	 * is built: `exact` uses the committish as-is (via `git rev-parse`); `merge-base` uses its
-	 * merge-base with HEAD (the fork point). Defaults to `merge-base`. Ignored in local mode.
+	 * (revision mode only) Committish whose merge-base with HEAD (the fork point) is built instead
+	 * of the committish itself. Mutually exclusive with {@link CollectBundleOptions.revision}.
+	 * Resolved against the outer repo. Also used as the default label.
 	 */
-	readonly resolution?: "exact" | "merge-base";
+	readonly mergeBaseOf?: string;
 	/**
 	 * Directory name (under {@link CollectBundleOptions.analysisDir}) to save the collected bundle
 	 * stats into. Sanitized for filesystem use before being applied. Defaults to the sanitized
@@ -75,20 +77,9 @@ function sanitizeForFileName(value: string): string {
 }
 
 /**
- * Resolves the merge-base (best common ancestor) of two committishes (branch,
- * tag, or SHA). Returns the full SHA, or undefined if either rev cannot be
- * resolved (e.g. unknown branch, detached state with no shared history).
- *
- * `otherRev` defaults to `HEAD`. The two-commit form of `git merge-base` is
- * symmetric — per the git documentation, `git merge-base a b` outputs a commit
- * reachable from both `a` and `b`, so argument order does not affect the result
- * (order only matters for the 3+ commit and `--fork-point` forms, which we do
- * not use here).
- *
- * Using merge-base instead of a raw branch tip means the comparison is taken
- * against the actual fork point, which is what users typically want — and it
- * works for worktree-based setups where `main` may not exist as a local branch
- * at the location they expect.
+ * Returns the merge-base of `rev` and `otherRev` (default `HEAD`) via
+ * `git merge-base`, or undefined if it cannot be resolved. See
+ * {@link https://git-scm.com/docs/git-merge-base}.
  */
 async function resolveMergeBase(
 	repoRoot: string,
@@ -105,13 +96,9 @@ async function resolveMergeBase(
 }
 
 /**
- * Resolves a committish (branch, tag, or SHA) to its full commit SHA via
- * `git rev-parse <rev>^{commit}`. Unlike {@link resolveMergeBase}, the revision
- * is used exactly as given (no fork-point computation). Throws if the revision
- * cannot be resolved locally, with guidance to fetch it first.
- *
- * The `^{commit}` peel ensures annotated tags resolve to the underlying commit
- * rather than the tag object.
+ * Resolves `rev` to its full commit SHA via `git rev-parse <rev>^{commit}`, or
+ * throws if it cannot be resolved locally. See
+ * {@link https://git-scm.com/docs/git-rev-parse}.
  */
 async function resolveSha(repoRoot: string, rev: string): Promise<string> {
 	try {
@@ -176,11 +163,9 @@ function buildBundles(packageRoot: string): void {
 }
 
 /**
- * Saves webpack-bundle-analyzer's JSON report into the per-label directory under
- * the persistent analysis root. This `analyzer.json` carries per-asset
- * parsed/gzip sizes and entrypoint membership, which is everything
- * compareBundles.ts needs — so the (large) webpack stats and `build/` outputs
- * do not need to be retained.
+ * Saves webpack-bundle-analyzer's `analyzer.json` report into the per-label directory under
+ * the persistent analysis root. This report is sufficient for the comparison, so the (large)
+ * webpack stats and `build/` outputs do not need to be retained.
  *
  * @remarks
  * Uses copy + unlink instead of `renameSync` because the source and destination
@@ -215,17 +200,9 @@ function saveStats(label: string, sourcePackageRoot: string, analysisDir: string
 }
 
 /**
- * Captures the outer repo's currently-staged diff to a sibling file next to
- * the bundle stats, so the analysis is reproducible even with uncommitted
- * changes. Only staged changes are recorded; unstaged changes are intentionally
- * excluded (they're often noisy / random) but a warning is printed if any are
- * detected so the user can `git add` the relevant pieces and re-run.
- *
- * This is purely a record: the patch is never applied, and the outer repo's
- * working tree and revision are left untouched. Local mode builds the enlistment
- * exactly as it sits on disk.
- *
- * The patch is written as `staged-changes.patch` inside the per-label directory.
+ * Records the outer repo's staged diff as `staged-changes.patch` in the per-label
+ * directory so the analysis is reproducible. The patch is never applied; unstaged
+ * changes are excluded, with a warning if any are present.
  */
 async function captureLocalPatch(repoRoot: string, labelDirectory: string): Promise<void> {
 	const git = simpleGit(repoRoot);
@@ -246,23 +223,14 @@ async function captureLocalPatch(repoRoot: string, labelDirectory: string): Prom
 }
 
 /**
- * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot` and
- * is checked out at the given commit SHA.
+ * Ensures the inner FluidFramework enlistment exists under `innerRepoRoot` and is
+ * checked out (detached) at `sha`.
  *
  * @remarks
- * On first call, clones the inner repo directly from the outer enlistment on
- * disk (`--no-tags --no-checkout`). Because the source is a local repository, no
- * remote or network access is involved and every commit already present in the
- * outer repo (including merge-base SHAs that aren't branch tips) is available
- * without a separate fetch. `--no-checkout` is used because the SHA is checked
- * out explicitly afterwards.
- *
- * The SHA is checked out with a detached HEAD, so there is no local branch state
- * to manage. Callers resolve the user's revision to a SHA in the outer repo
- * before calling, so any committish — branch, tag, or relative ref such as
- * `HEAD^4` — is handled uniformly here.
- *
- * Never modifies the outer repo's working tree, branch, or stash.
+ * On first call, clones from the outer enlistment on disk (`--no-tags --no-checkout`),
+ * so no network is involved and every commit in the outer repo — including merge-base
+ * SHAs that aren't branch tips — is already available. Callers pass an already-resolved
+ * SHA, so any committish is handled uniformly. Never touches the outer repo's git state.
  */
 async function ensureInnerRepoAtRevision(
 	sha: string,
@@ -292,123 +260,138 @@ function logCollectionComplete(mode: string, label: string, labelDirectory: stri
 	console.log("=".repeat(80));
 }
 
+/**
+ * Resolves the revision-mode committish to a concrete SHA in `outerRepoRoot`: `revision` as-is,
+ * or the merge-base of HEAD and `mergeBaseOf`. Exactly one of the two is expected to be set.
+ */
+async function resolveBuildRevision(
+	outerRepoRoot: string,
+	revision: string | undefined,
+	mergeBaseOf: string | undefined,
+): Promise<string> {
+	const committish = (revision ?? mergeBaseOf) as string;
+	let resolved: string;
+	if (revision !== undefined) {
+		resolved = await resolveSha(outerRepoRoot, committish);
+	} else {
+		const mergeBase = await resolveMergeBase(outerRepoRoot, committish);
+		if (mergeBase === undefined) {
+			throw new Error(
+				`Could not find merge-base of HEAD and "${committish}". ` +
+					`Ensure the revision exists locally (e.g. "git fetch origin ${committish}").`,
+			);
+		}
+		resolved = mergeBase;
+	}
+	if (resolved !== committish) {
+		console.log(
+			`Resolved revision "${committish}" to ` +
+				`${revision !== undefined ? "" : "merge-base "}${resolved}.`,
+		);
+	}
+	return resolved;
+}
+
+/**
+ * Prepares a revision-mode build: checks out the inner repo at `sha`, installs deps, and returns
+ * the inner repo + package roots. Throws if the package doesn't exist at that revision.
+ */
+async function prepareRevisionBuild(
+	sha: string,
+	outerRepoRoot: string,
+	packageDir: string,
+	innerRepoRoot: string,
+): Promise<{ repoRoot: string; packageRoot: string }> {
+	await ensureInnerRepoAtRevision(sha, outerRepoRoot, innerRepoRoot);
+	// Same package inside the inner repo, via its path relative to the repo root.
+	const packageRoot = resolve(innerRepoRoot, relative(outerRepoRoot, packageDir));
+	if (!existsSync(packageRoot)) {
+		throw new Error(
+			`Expected package not found in inner repo at ${packageRoot}. ` +
+				`The revision "${sha}" may predate this package.`,
+		);
+	}
+	installDependencies(innerRepoRoot);
+	return { repoRoot: innerRepoRoot, packageRoot };
+}
+
 /**
  * Collects a single bundle from either the outer enlistment (local mode) or a
  * separate inner enlistment checked out to a specific revision (revision mode),
  * and returns the (sanitized) label its stats were saved under.
  *
  * @remarks
- * In revision mode, the user's {@link CollectBundleOptions.revision} is resolved to a concrete
- * commit SHA in the outer repo — its merge-base with HEAD (the fork point) or the committish
- * as-is, per {@link CollectBundleOptions.resolution}. The inner repo (at
- * {@link CollectBundleOptions.baseRepoDir}, defaulting to `<analysisDir>/base-repo`) is cloned from
- * the outer enlistment on disk on first use and reused thereafter. No remote or network access is
- * involved.
- *
- * Because a clean revision builds deterministically, the resolved SHA is recorded in a sidecar
- * `revision.txt` next to the stats; a later run that resolves to the same SHA reuses the cached
- * report and skips the rebuild (unless {@link CollectBundleOptions.forceCleanBuild} is set).
- *
- * In local mode the outer enlistment is built exactly as it sits on disk: its working tree and
- * revision are never checked out, stashed, or otherwise mutated. The captured patch is therefore
- * only a reproducibility record of what was staged at collection time — it is never applied. It is
- * captured up front, before any build steps, so it is preserved even if the build subsequently
- * fails.
+ * In revision mode, {@link CollectBundleOptions.revision} is built as-is and
+ * {@link CollectBundleOptions.mergeBaseOf} at its merge-base with HEAD (the fork point); the
+ * resolved SHA is recorded in a sidecar `revision.txt`, letting a later run with the same SHA
+ * reuse the cached report (unless {@link CollectBundleOptions.forceCleanBuild} is set). Builds
+ * happen in the inner repo (see {@link ensureInnerRepoAtRevision}).
  *
- * The outer repo's working tree, branch, and stash are never modified.
+ * In local mode the working tree is built exactly as it sits on disk; the only side effect is the
+ * up-front staged-patch record (see {@link captureLocalPatch}). The outer repo's git state is
+ * never modified.
  */
 export async function collectBundle(options: CollectBundleOptions): Promise<string> {
-	const {
-		mode,
-		revision,
-		resolution = "merge-base",
-		forceCleanBuild,
-		packageDir,
-		analysisDir,
-	} = options;
+	const { mode, revision, mergeBaseOf, forceCleanBuild, packageDir, analysisDir } = options;
 
-	if (mode === "revision" && (revision === undefined || revision.length === 0)) {
-		throw new Error("revision mode requires a revision.");
+	// Validate.
+	if (mode === "revision" && revision === undefined && mergeBaseOf === undefined) {
+		throw new Error("revision mode requires either revision or mergeBaseOf.");
 	}
 
+	// Resolve names and paths.
+	const outerRepoRoot = findGitRootSync(packageDir);
+	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
 	const label = sanitizeForFileName(
 		options.label ??
 			(mode === "revision"
-				? (revision as string)
+				? ((revision ?? mergeBaseOf) as string)
 				: `current_${Math.floor(Date.now() / 1000)}`),
 	);
-
-	const outerRepoRoot = findGitRootSync(packageDir);
-	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
 	const labelDirectory = resolve(analysisDir, label);
 
-	let activeRepoRoot: string;
-	let activePackageRoot: string;
-	// Set in revision mode to the resolved SHA, recorded alongside the stats so a
-	// later run against the same revision can reuse the report. Undefined in local mode.
-	let resolvedRevision: string | undefined;
-
-	if (mode === "local") {
-		activeRepoRoot = outerRepoRoot;
-		activePackageRoot = packageDir;
-		await captureLocalPatch(outerRepoRoot, labelDirectory);
-	} else {
-		// Resolve the user's revision to a concrete SHA in the outer repo: the
-		// merge-base with HEAD (the fork point), or the committish as-is for "exact".
-		if (resolution === "exact") {
-			resolvedRevision = await resolveSha(outerRepoRoot, revision as string);
-		} else {
-			const mergeBase = await resolveMergeBase(outerRepoRoot, revision as string);
-			if (mergeBase === undefined) {
-				throw new Error(
-					`Could not find merge-base of HEAD and "${revision as string}". ` +
-						`Ensure the revision exists locally (e.g. "git fetch origin ${revision as string}").`,
-				);
-			}
-			resolvedRevision = mergeBase;
-		}
-		if (resolvedRevision !== revision) {
-			console.log(
-				`Resolved revision "${revision as string}" to ` +
-					`${resolution === "exact" ? "" : "merge-base "}${resolvedRevision}.`,
-			);
-		}
-
-		// Reuse a previously-collected report when the recorded SHA matches.
+	// In revision mode, resolve the committish to a SHA and reuse the cached report if it matches.
+	const resolvedRevision =
+		mode === "revision"
+			? await resolveBuildRevision(outerRepoRoot, revision, mergeBaseOf)
+			: undefined;
+	if (resolvedRevision !== undefined && !forceCleanBuild) {
 		const analyzerPath = resolve(labelDirectory, "analyzer.json");
-		const revisionMarkerPath = resolve(labelDirectory, "revision.txt");
-		const cachedRevision = existsSync(revisionMarkerPath)
-			? readFileSync(revisionMarkerPath, "utf8").trim()
+		const markerPath = resolve(labelDirectory, "revision.txt");
+		const cachedRevision = existsSync(markerPath)
+			? readFileSync(markerPath, "utf8").trim()
 			: undefined;
-		if (!forceCleanBuild && existsSync(analyzerPath) && cachedRevision === resolvedRevision) {
+		if (existsSync(analyzerPath) && cachedRevision === resolvedRevision) {
 			console.log(`Reusing cached bundle (revision: ${resolvedRevision}, label: ${label}).`);
 			console.log(`  Report: ${analyzerPath}`);
 			logCollectionComplete(mode, label, labelDirectory);
 			return label;
 		}
+	}
 
-		// Locate the same package inside the inner repo via its path relative to
-		// the repo root (e.g. `examples/utils/bundle-size-tests`).
-		const packageWorkspacePath = relative(outerRepoRoot, packageDir);
-		await ensureInnerRepoAtRevision(resolvedRevision, outerRepoRoot, innerRepoRoot);
-		activeRepoRoot = innerRepoRoot;
-		activePackageRoot = resolve(innerRepoRoot, packageWorkspacePath);
-		if (!existsSync(activePackageRoot)) {
-			throw new Error(
-				`Expected package not found in inner repo at ${activePackageRoot}. ` +
-					`The revision "${revision as string}" may predate this package.`,
-			);
-		}
-		installDependencies(activeRepoRoot);
+	// Prepare the build environment: the local working tree, or the inner repo at the revision.
+	let repoRoot = outerRepoRoot;
+	let packageRoot = packageDir;
+	if (mode === "local") {
+		await captureLocalPatch(outerRepoRoot, labelDirectory);
+	} else {
+		({ repoRoot, packageRoot } = await prepareRevisionBuild(
+			resolvedRevision as string,
+			outerRepoRoot,
+			packageDir,
+			innerRepoRoot,
+		));
 	}
 
+	// Build.
 	if (forceCleanBuild) {
-		cleanWorkspace(activeRepoRoot);
+		cleanWorkspace(repoRoot);
 	}
-	buildWorkspace(activePackageRoot);
-	buildBundles(activePackageRoot);
-	saveStats(label, activePackageRoot, analysisDir);
-	// Record the SHA so a later run against the same revision can skip the rebuild.
+	buildWorkspace(packageRoot);
+	buildBundles(packageRoot);
+
+	// Save stats, recording the SHA so a later run against the same revision can skip the rebuild.
+	saveStats(label, packageRoot, analysisDir);
 	if (resolvedRevision !== undefined) {
 		writeFileSync(resolve(labelDirectory, "revision.txt"), `${resolvedRevision}\n`);
 	}

From 5533f94a05d98bf6ef99d3c56a071cc00c758228 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 16:47:54 -0700
Subject: [PATCH 61/67] refactor(build-cli): reorganize and tidy
 collectBundle.ts internals

Group the helpers into labeled sections (utilities, git resolution, build
steps, environment prep, output, orchestrator) so related functions sit
together. Merge buildWorkspace/buildBundles into a single buildPackage, make
resolveMergeBase throw on failure (symmetric with resolveSha), simplify
resolveBuildRevision to (committish, useMergeBase) with no cast, and hoist the
analyzer.json / revision.txt filenames into shared constants.

No behavior change.
---
 .../src/library/bundleSize/collectBundle.ts   | 256 +++++++++---------
 1 file changed, 129 insertions(+), 127 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index a82fd3e026d4..bc0fcec7b36b 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -17,6 +17,12 @@ import { dirname, relative, resolve } from "node:path";
 import { findGitRootSync } from "@fluid-tools/build-infrastructure";
 import { simpleGit } from "simple-git";
 
+/** Filename of the per-label analyzer report. */
+const ANALYZER_FILE = "analyzer.json";
+
+/** Filename of the sidecar recording the SHA a revision-mode report was built from. */
+const REVISION_MARKER_FILE = "revision.txt";
+
 /**
  * Options for {@link collectBundle}.
  */
@@ -69,6 +75,8 @@ export interface CollectBundleOptions {
 	readonly baseRepoDir?: string;
 }
 
+// --- Utilities ---
+
 /**
  * Sanitizes a string for use as a filename.
  */
@@ -77,24 +85,14 @@ function sanitizeForFileName(value: string): string {
 }
 
 /**
- * Returns the merge-base of `rev` and `otherRev` (default `HEAD`) via
- * `git merge-base`, or undefined if it cannot be resolved. See
- * {@link https://git-scm.com/docs/git-merge-base}.
+ * Runs a command inheriting stdio, throwing on failure.
  */
-async function resolveMergeBase(
-	repoRoot: string,
-	rev: string,
-	otherRev = "HEAD",
-): Promise<string | undefined> {
-	try {
-		const output = await simpleGit(repoRoot).raw(["merge-base", rev, otherRev]);
-		const sha = output.trim();
-		return sha.length > 0 ? sha : undefined;
-	} catch {
-		return undefined;
-	}
+function run(command: string, cwd: string): void {
+	execSync(command, { cwd, stdio: "inherit" });
 }
 
+// --- Git revision resolution ---
+
 /**
  * Resolves `rev` to its full commit SHA via `git rev-parse <rev>^{commit}`, or
  * throws if it cannot be resolved locally. See
@@ -115,12 +113,50 @@ async function resolveSha(repoRoot: string, rev: string): Promise<string> {
 }
 
 /**
- * Runs a command inheriting stdio, throwing on failure.
+ * Resolves the merge-base of `rev` and `otherRev` (default `HEAD`) to a commit SHA via
+ * `git merge-base`, or throws if none can be found locally. See
+ * {@link https://git-scm.com/docs/git-merge-base}.
  */
-function run(command: string, cwd: string): void {
-	execSync(command, { cwd, stdio: "inherit" });
+async function resolveMergeBase(
+	repoRoot: string,
+	rev: string,
+	otherRev = "HEAD",
+): Promise<string> {
+	try {
+		const output = await simpleGit(repoRoot).raw(["merge-base", rev, otherRev]);
+		const sha = output.trim();
+		if (sha.length > 0) return sha;
+	} catch {
+		// Fall through to the shared error below.
+	}
+	throw new Error(
+		`Could not find merge-base of "${rev}" and "${otherRev}". ` +
+			`Ensure the revision exists locally (e.g. "git fetch origin ${rev}").`,
+	);
 }
 
+/**
+ * Resolves a committish to a concrete SHA in `outerRepoRoot` — the committish as-is, or (when
+ * `useMergeBase`) its merge-base with HEAD (the fork point).
+ */
+async function resolveBuildRevision(
+	outerRepoRoot: string,
+	committish: string,
+	useMergeBase: boolean,
+): Promise<string> {
+	const resolved = useMergeBase
+		? await resolveMergeBase(outerRepoRoot, committish)
+		: await resolveSha(outerRepoRoot, committish);
+	if (resolved !== committish) {
+		console.log(
+			`Resolved revision "${committish}" to ${useMergeBase ? "merge-base " : ""}${resolved}.`,
+		);
+	}
+	return resolved;
+}
+
+// --- Build steps ---
+
 /**
  * Enables corepack and installs dependencies in the given repo.
  */
@@ -144,60 +180,18 @@ function cleanWorkspace(repoRoot: string): void {
 }
 
 /**
- * Compiles this package and its transitive dependencies so webpack has the
- * `lib/` outputs it needs. Uses `build:compile` to avoid the lint / docs / api-report
- * tasks pulled in by the full `build` target, which are unnecessary for bundle
- * collection and prone to unrelated failures across revisions.
+ * Compiles this package and its dependencies, then builds its webpack bundles. Uses
+ * `build:compile` (not the full `build`) to skip the lint / docs / api-report tasks, which are
+ * unnecessary here and prone to unrelated failures across revisions.
  */
-function buildWorkspace(packageRoot: string): void {
+function buildPackage(packageRoot: string): void {
 	console.log(`\nCompiling bundle-size-tests and its dependencies in ${packageRoot}...`);
 	run("npm run build:compile", packageRoot);
-}
-
-/**
- * Builds bundles using webpack inside the given package root.
- */
-function buildBundles(packageRoot: string): void {
 	console.log(`\nBuilding bundles with webpack in ${packageRoot}...`);
 	run("npm run webpack", packageRoot);
 }
 
-/**
- * Saves webpack-bundle-analyzer's `analyzer.json` report into the per-label directory under
- * the persistent analysis root. This report is sufficient for the comparison, so the (large)
- * webpack stats and `build/` outputs do not need to be retained.
- *
- * @remarks
- * Uses copy + unlink instead of `renameSync` because the source and destination
- * may live on different drives (e.g. `D:` -> `C:\Users\<user>\AppData\Local\Temp`),
- * which causes `renameSync` to fail with `EXDEV` on Windows.
- *
- * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
- * @param sourcePackageRoot - Package root that produced the webpack output.
- * @param analysisDir - Directory under which per-label stats are saved.
- */
-function saveStats(label: string, sourcePackageRoot: string, analysisDir: string): void {
-	const analyzerJsonOutputPath = resolve(
-		sourcePackageRoot,
-		"bundleAnalyzerJson",
-		"analyzer.json",
-	);
-
-	const labelDirectory = resolve(analysisDir, label);
-	const destAnalyzerPath = resolve(labelDirectory, "analyzer.json");
-
-	if (!existsSync(analyzerJsonOutputPath)) {
-		throw new Error(
-			`Analyzer report not found at ${analyzerJsonOutputPath}. ` +
-				`Check that webpack ran successfully.`,
-		);
-	}
-
-	mkdirSync(labelDirectory, { recursive: true });
-	copyFileSync(analyzerJsonOutputPath, destAnalyzerPath);
-	unlinkSync(analyzerJsonOutputPath);
-	console.log(`Saved analyzer report to: ${destAnalyzerPath}`);
-}
+// --- Environment prep ---
 
 /**
  * Records the outer repo's staged diff as `staged-changes.patch` in the per-label
@@ -250,48 +244,6 @@ async function ensureInnerRepoAtRevision(
 	await simpleGit(innerRepoRoot).raw(["checkout", "--detach", sha]);
 }
 
-/**
- * Logs the standard "collection complete" banner.
- */
-function logCollectionComplete(mode: string, label: string, labelDirectory: string): void {
-	console.log(`\n${"=".repeat(80)}`);
-	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
-	console.log(`  Stats directory: ${labelDirectory}`);
-	console.log("=".repeat(80));
-}
-
-/**
- * Resolves the revision-mode committish to a concrete SHA in `outerRepoRoot`: `revision` as-is,
- * or the merge-base of HEAD and `mergeBaseOf`. Exactly one of the two is expected to be set.
- */
-async function resolveBuildRevision(
-	outerRepoRoot: string,
-	revision: string | undefined,
-	mergeBaseOf: string | undefined,
-): Promise<string> {
-	const committish = (revision ?? mergeBaseOf) as string;
-	let resolved: string;
-	if (revision !== undefined) {
-		resolved = await resolveSha(outerRepoRoot, committish);
-	} else {
-		const mergeBase = await resolveMergeBase(outerRepoRoot, committish);
-		if (mergeBase === undefined) {
-			throw new Error(
-				`Could not find merge-base of HEAD and "${committish}". ` +
-					`Ensure the revision exists locally (e.g. "git fetch origin ${committish}").`,
-			);
-		}
-		resolved = mergeBase;
-	}
-	if (resolved !== committish) {
-		console.log(
-			`Resolved revision "${committish}" to ` +
-				`${revision !== undefined ? "" : "merge-base "}${resolved}.`,
-		);
-	}
-	return resolved;
-}
-
 /**
  * Prepares a revision-mode build: checks out the inner repo at `sha`, installs deps, and returns
  * the inner repo + package roots. Throws if the package doesn't exist at that revision.
@@ -315,6 +267,57 @@ async function prepareRevisionBuild(
 	return { repoRoot: innerRepoRoot, packageRoot };
 }
 
+// --- Output ---
+
+/**
+ * Saves webpack-bundle-analyzer's `analyzer.json` report into the per-label directory under
+ * the persistent analysis root. This report is sufficient for the comparison, so the (large)
+ * webpack stats and `build/` outputs do not need to be retained.
+ *
+ * @remarks
+ * Uses copy + unlink instead of `renameSync` because the source and destination
+ * may live on different drives (e.g. `D:` -> `C:\Users\<user>\AppData\Local\Temp`),
+ * which causes `renameSync` to fail with `EXDEV` on Windows.
+ *
+ * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
+ * @param sourcePackageRoot - Package root that produced the webpack output.
+ * @param analysisDir - Directory under which per-label stats are saved.
+ */
+function saveStats(label: string, sourcePackageRoot: string, analysisDir: string): void {
+	const analyzerJsonOutputPath = resolve(
+		sourcePackageRoot,
+		"bundleAnalyzerJson",
+		ANALYZER_FILE,
+	);
+
+	const labelDirectory = resolve(analysisDir, label);
+	const destAnalyzerPath = resolve(labelDirectory, ANALYZER_FILE);
+
+	if (!existsSync(analyzerJsonOutputPath)) {
+		throw new Error(
+			`Analyzer report not found at ${analyzerJsonOutputPath}. ` +
+				`Check that webpack ran successfully.`,
+		);
+	}
+
+	mkdirSync(labelDirectory, { recursive: true });
+	copyFileSync(analyzerJsonOutputPath, destAnalyzerPath);
+	unlinkSync(analyzerJsonOutputPath);
+	console.log(`Saved analyzer report to: ${destAnalyzerPath}`);
+}
+
+/**
+ * Logs the standard "collection complete" banner.
+ */
+function logCollectionComplete(mode: string, label: string, labelDirectory: string): void {
+	console.log(`\n${"=".repeat(80)}`);
+	console.log(`✓ Bundle collection complete (mode: ${mode}, label: ${label}).`);
+	console.log(`  Stats directory: ${labelDirectory}`);
+	console.log("=".repeat(80));
+}
+
+// --- Orchestrator ---
+
 /**
  * Collects a single bundle from either the outer enlistment (local mode) or a
  * separate inner enlistment checked out to a specific revision (revision mode),
@@ -334,30 +337,30 @@ async function prepareRevisionBuild(
 export async function collectBundle(options: CollectBundleOptions): Promise<string> {
 	const { mode, revision, mergeBaseOf, forceCleanBuild, packageDir, analysisDir } = options;
 
-	// Validate.
-	if (mode === "revision" && revision === undefined && mergeBaseOf === undefined) {
-		throw new Error("revision mode requires either revision or mergeBaseOf.");
-	}
-
-	// Resolve names and paths.
+	// Resolve names and paths. In revision mode, the committish selects what to build.
+	const committish = mode === "revision" ? (revision ?? mergeBaseOf) : undefined;
 	const outerRepoRoot = findGitRootSync(packageDir);
 	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
 	const label = sanitizeForFileName(
-		options.label ??
-			(mode === "revision"
-				? ((revision ?? mergeBaseOf) as string)
-				: `current_${Math.floor(Date.now() / 1000)}`),
+		options.label ?? committish ?? `current_${Math.floor(Date.now() / 1000)}`,
 	);
 	const labelDirectory = resolve(analysisDir, label);
 
 	// In revision mode, resolve the committish to a SHA and reuse the cached report if it matches.
-	const resolvedRevision =
-		mode === "revision"
-			? await resolveBuildRevision(outerRepoRoot, revision, mergeBaseOf)
-			: undefined;
+	let resolvedRevision: string | undefined;
+	if (mode === "revision") {
+		if (committish === undefined) {
+			throw new Error("revision mode requires either revision or mergeBaseOf.");
+		}
+		resolvedRevision = await resolveBuildRevision(
+			outerRepoRoot,
+			committish,
+			revision === undefined,
+		);
+	}
 	if (resolvedRevision !== undefined && !forceCleanBuild) {
-		const analyzerPath = resolve(labelDirectory, "analyzer.json");
-		const markerPath = resolve(labelDirectory, "revision.txt");
+		const analyzerPath = resolve(labelDirectory, ANALYZER_FILE);
+		const markerPath = resolve(labelDirectory, REVISION_MARKER_FILE);
 		const cachedRevision = existsSync(markerPath)
 			? readFileSync(markerPath, "utf8").trim()
 			: undefined;
@@ -383,17 +386,16 @@ export async function collectBundle(options: CollectBundleOptions): Promise<stri
 		));
 	}
 
-	// Build.
+	// Clean (if needed) and build the bundles.
 	if (forceCleanBuild) {
 		cleanWorkspace(repoRoot);
 	}
-	buildWorkspace(packageRoot);
-	buildBundles(packageRoot);
+	buildPackage(packageRoot);
 
 	// Save stats, recording the SHA so a later run against the same revision can skip the rebuild.
 	saveStats(label, packageRoot, analysisDir);
 	if (resolvedRevision !== undefined) {
-		writeFileSync(resolve(labelDirectory, "revision.txt"), `${resolvedRevision}\n`);
+		writeFileSync(resolve(labelDirectory, REVISION_MARKER_FILE), `${resolvedRevision}\n`);
 	}
 
 	logCollectionComplete(mode, label, labelDirectory);

From 9105efdb2e9cbb18db0d08a867fa7f6b8bc758c8 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Wed, 17 Jun 2026 17:07:02 -0700
Subject: [PATCH 62/67] refactor(build-cli): drop entrypoint table and defer
 base-repo cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the "Named entrypoint total asset sizes" table from the bundle comparison
(compareBundles) and its bundleDetails.md docs, plus the now-unused entrypoint
helpers — those sizes are already captured in the per-asset table.

In collectAndCompare, delete the scratch inner repo only after the report is
written and the completion banner is shown, so the user sees results before the
slow cleanup. Also rename the analyzer/revision filename constants to camelCase
to match the bundleSize module and trim an overly verbose doc comment.
---
 .../packages/build-cli/docs/bundleDetails.md  | 16 +----
 .../bundleSize/collectAndCompareBundles.ts    | 46 ++++--------
 .../src/library/bundleSize/collectBundle.ts   | 16 ++---
 .../src/library/bundleSize/compareBundles.ts  | 72 ++-----------------
 4 files changed, 31 insertions(+), 119 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundleDetails.md b/build-tools/packages/build-cli/docs/bundleDetails.md
index ee970bbbec04..16285bd3f738 100644
--- a/build-tools/packages/build-cli/docs/bundleDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleDetails.md
@@ -2,7 +2,7 @@
 
 The `flub bundle` commands measure how a change affects a package's webpack
 bundle by building the bundle on two different revisions and diffing the
-per-asset and per-entrypoint sizes, so regressions (or wins) are easy to spot
+per-asset and per-package sizes, so regressions (or wins) are easy to spot
 before pushing.
 
 See [bundle.md](./bundle.md) for the generated command reference. This document
@@ -67,7 +67,7 @@ Reach for the lower-level commands when the orchestrator's flow doesn't fit:
 
 Each build runs webpack, which emits `bundleAnalyzerJson/analyzer.json`
 (webpack-bundle-analyzer's JSON report). That single file carries per-asset
-parsed/gzip sizes and entrypoint membership — everything the comparison needs —
+parsed/gzip sizes and per-module breakdowns — everything the comparison needs —
 so it is the only artifact saved per label; the larger webpack stats and `build/`
 outputs are not retained.
 
@@ -98,14 +98,13 @@ decompression is done):
   compression. This is the default unit for every table except the gzip one.
 - **Gzip size** — the gzipped bytes, i.e. what actually goes over the wire.
 
-The report measures the bundle at four different _granularities_, each answering a
+The report measures the bundle at three different _granularities_, each answering a
 different question:
 
 | Table                                        | Granularity | Unit   | What it answers                                                       |
 | -------------------------------------------- | ----------- | ------ | -------------------------------------------------------------------- |
 | All assets                                   | Asset       | Parsed | How did each emitted `.js` file change?                              |
 | Gzip sizes for changed assets                | Asset       | Gzip   | For the assets whose gzip size moved, what is the over-the-wire delta?|
-| Named entrypoint total asset sizes           | Entrypoint  | Parsed | How big is each shipped entrypoint bundle in total?                  |
 | Bundle composition by category               | Package set | Parsed | How is a bundle split between Fluid Framework and third-party code?  |
 | Per-package parsed-size comparison           | Package     | Parsed | Which individual package contributed each chunk of bytes?           |
 
@@ -122,15 +121,6 @@ Note its filter is on the gzip delta itself — an asset can move in parsed size
 not gzip (compression absorbs the change), or vice versa, so this table is not
 simply the changed rows of the parsed table re-expressed in gzip bytes.
 
-### Entrypoint table
-
-An **entrypoint** is a bundle a consumer actually loads. Its total is the sum of
-the parsed sizes of the assets that are initial chunks of that entrypoint (per
-analyzer.json's `isInitialByEntrypoint`). These rows **overlap and must not be
-summed**: many entrypoints share the same underlying packages, so adding them
-double-counts shared code. The `fluidFrameworkAll` entrypoint is the single
-deduplicated whole-framework total.
-
 ### Package-level tables
 
 The last two tables attribute bytes to the npm package that owns each module.
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index f83237838d37..6c0acdead33d 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -39,33 +39,12 @@ export interface CollectAndCompareBundlesOptions {
 }
 
 /**
- * Orchestrates: {@link collectBundle} (local working tree), then
- * {@link collectBundle} (base revision), then {@link compareBundles}.
- *
- * The base revision is taken as the merge-base of HEAD and `baseRevision` by
- * default, or used as-is when `exactBase` is set; that resolution, and caching
- * of the base report, are handled inside {@link collectBundle}.
- *
- * Labels (used as analysis subdirectory names) are determined automatically: the
- * local bundle is saved under a timestamped "current_<epoch>" label (generated
- * by {@link collectBundle} and returned for the comparison) and the base bundle
- * under "main", so that {@link compareBundles} can find both directories.
- *
- * The outer repo's working tree, branch, and stash are never modified.
- *
- * @remarks
- * The base label is pinned to "main" because {@link compareBundles} reads from a
- * fixed base label. The current label is timestamped by {@link collectBundle}
- * (so successive runs carrying different uncommitted changes don't clobber each
- * other) and the returned value is passed straight to {@link compareBundles} so
- * they agree on the directory.
- *
- * The inner enlistment used to build the base bundle is a scratch clone, not
- * report data, so it lives under the output directory rather than alongside the
- * per-label analyzer reports in `analysisDir`. Once the comparison is complete
- * the inner repo is deleted by default (it re-creates cheaply via clone, and
- * keeping it consumes hundreds of MB once dependencies are installed); pass
- * {@link CollectAndCompareBundlesOptions.keepBaseRepo} to retain it.
+ * Orchestrates {@link collectBundle} (local working tree) and {@link collectBundle} (base
+ * revision), then {@link compareBundles}. The base is the merge-base of HEAD and `baseRevision`,
+ * or the revision as-is when `exactBase` is set. Labels are automatic: the local bundle under a
+ * timestamped `current_<epoch>` label and the base under `main`. The scratch inner repo used to
+ * build the base is deleted afterward unless {@link CollectAndCompareBundlesOptions.keepBaseRepo}
+ * is set; the outer repo is never modified.
  */
 export async function collectAndCompareBundles(
 	options: CollectAndCompareBundlesOptions,
@@ -117,16 +96,17 @@ export async function collectAndCompareBundles(
 			currentLabel,
 		});
 
-		// Delete the inner repo now that the comparison is complete (re-created
-		// cheaply on the next run). Pass keepBaseRepo to retain it for debugging.
+		console.log(`\n${"=".repeat(80)}`);
+		console.log("✓ Bundle collection and comparison complete!");
+		console.log("=".repeat(80));
+
+		// Delete the inner repo last, after the report is written and the completion banner is
+		// shown, so the user has the results before this slow cleanup runs. (Re-created cheaply on
+		// the next run; pass keepBaseRepo to retain it for debugging.)
 		if (!keepBaseRepo && existsSync(innerRepoRoot)) {
 			console.log(`\nDeleting inner base-repo at ${innerRepoRoot}...`);
 			rmSync(innerRepoRoot, { recursive: true, force: true });
 		}
-
-		console.log(`\n${"=".repeat(80)}`);
-		console.log("✓ Bundle collection and comparison complete!");
-		console.log("=".repeat(80));
 	} catch (error) {
 		console.error("\n✖ Error:", error instanceof Error ? error.message : String(error));
 		throw error;
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index bc0fcec7b36b..9ff802f5b56d 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -18,10 +18,10 @@ import { findGitRootSync } from "@fluid-tools/build-infrastructure";
 import { simpleGit } from "simple-git";
 
 /** Filename of the per-label analyzer report. */
-const ANALYZER_FILE = "analyzer.json";
+const analyzerFileName = "analyzer.json";
 
 /** Filename of the sidecar recording the SHA a revision-mode report was built from. */
-const REVISION_MARKER_FILE = "revision.txt";
+const revisionMarkerFileName = "revision.txt";
 
 /**
  * Options for {@link collectBundle}.
@@ -276,7 +276,7 @@ async function prepareRevisionBuild(
  *
  * @remarks
  * Uses copy + unlink instead of `renameSync` because the source and destination
- * may live on different drives (e.g. `D:` -> `C:\Users\<user>\AppData\Local\Temp`),
+ * may live on different drives (e.g. `D:` to `C:\Users\<user>\AppData\Local\Temp`),
  * which causes `renameSync` to fail with `EXDEV` on Windows.
  *
  * @param label - Sanitized label for this build (e.g., "main", "client_v2.100.0").
@@ -287,11 +287,11 @@ function saveStats(label: string, sourcePackageRoot: string, analysisDir: string
 	const analyzerJsonOutputPath = resolve(
 		sourcePackageRoot,
 		"bundleAnalyzerJson",
-		ANALYZER_FILE,
+		analyzerFileName,
 	);
 
 	const labelDirectory = resolve(analysisDir, label);
-	const destAnalyzerPath = resolve(labelDirectory, ANALYZER_FILE);
+	const destAnalyzerPath = resolve(labelDirectory, analyzerFileName);
 
 	if (!existsSync(analyzerJsonOutputPath)) {
 		throw new Error(
@@ -359,8 +359,8 @@ export async function collectBundle(options: CollectBundleOptions): Promise<stri
 		);
 	}
 	if (resolvedRevision !== undefined && !forceCleanBuild) {
-		const analyzerPath = resolve(labelDirectory, ANALYZER_FILE);
-		const markerPath = resolve(labelDirectory, REVISION_MARKER_FILE);
+		const analyzerPath = resolve(labelDirectory, analyzerFileName);
+		const markerPath = resolve(labelDirectory, revisionMarkerFileName);
 		const cachedRevision = existsSync(markerPath)
 			? readFileSync(markerPath, "utf8").trim()
 			: undefined;
@@ -395,7 +395,7 @@ export async function collectBundle(options: CollectBundleOptions): Promise<stri
 	// Save stats, recording the SHA so a later run against the same revision can skip the rebuild.
 	saveStats(label, packageRoot, analysisDir);
 	if (resolvedRevision !== undefined) {
-		writeFileSync(resolve(labelDirectory, REVISION_MARKER_FILE), `${resolvedRevision}\n`);
+		writeFileSync(resolve(labelDirectory, revisionMarkerFileName), `${resolvedRevision}\n`);
 	}
 
 	logCollectionComplete(mode, label, labelDirectory);
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index 3ea1a23b9b0e..e224b712fc2c 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -35,8 +35,8 @@ export interface CompareBundlesOptions {
 }
 
 /**
- * One comparison row: a named measurement — an asset, entrypoint, owning
- * package, or synthetic composition bucket — sized on both the base and current
+ * One comparison row: a named measurement — an asset, owning package, or
+ * synthetic composition bucket — sized on both the base and current
  * side, with `diff = current - base`. Every output set in the report is a list
  * of these, so they share one factory ({@link makeRow}) and one renderer
  * ({@link renderTable}). The unit of `base`/`current` depends on which list the
@@ -68,13 +68,6 @@ interface ComparisonReport {
 	assets: ComparisonRow[];
 	/** Gzip-size rows, limited to assets whose gzip size changed. */
 	gzipChangedAssets: ComparisonRow[];
-	/**
-	 * Per-entrypoint total parsed-size rows. Each row is a real shipped bundle;
-	 * see {@link compareEntrypointTotals}. Rows overlap and must not be summed —
-	 * the aggregate `fluidFrameworkAll` entrypoint is the single deduplicated
-	 * bundle-wide total.
-	 */
-	entrypoints: ComparisonRow[];
 	/**
 	 * Headline composition buckets, each pinned to a real entrypoint (never
 	 * summed across entrypoints); see {@link bucketDefinitions}.
@@ -111,28 +104,6 @@ function isJsAssetName(name: string): boolean {
 	return name.endsWith(".js") && !name.endsWith(".map");
 }
 
-/** Whether an analyzer node is an emitted `.js` asset (excluding source maps). */
-function isJsAsset(node: AnalyzerNode): boolean {
-	return isJsAssetName(node.label);
-}
-
-/**
- * Sums each entrypoint's initial-chunk parsed sizes. analyzer.json tags every
- * asset with the entrypoints it is an initial chunk of via isInitialByEntrypoint.
- */
-function entrypointSizes(nodes: AnalyzerNode[]): Record<string, number> {
-	const totals: Record<string, number> = {};
-	for (const node of nodes.filter(isJsAsset)) {
-		for (const [entrypointName, isInitial] of Object.entries(
-			node.isInitialByEntrypoint ?? {},
-		)) {
-			if (isInitial !== true) continue;
-			totals[entrypointName] = (totals[entrypointName] ?? 0) + (node.parsedSize ?? 0);
-		}
-	}
-	return totals;
-}
-
 // --- Module -> owning-package attribution ---
 
 /**
@@ -421,24 +392,6 @@ function compareAssetField(
 		});
 }
 
-/**
- * Per-entrypoint total parsed-size rows, sorted by name. Reads the raw nodes
- * directly because the per-entrypoint totals come from `isInitialByEntrypoint`,
- * which the comparison's per-asset `BundleData` does not carry. Webpack's
- * numeric-id split chunks are filtered out so only named entrypoints remain.
- */
-function compareEntrypointTotals(
-	baseNodes: AnalyzerNode[],
-	currentNodes: AnalyzerNode[],
-): ComparisonRow[] {
-	const baseEntrypoints = entrypointSizes(baseNodes);
-	const currentEntrypoints = entrypointSizes(currentNodes);
-	return [...new Set([...Object.keys(baseEntrypoints), ...Object.keys(currentEntrypoints)])]
-		.filter((name) => !/^\d/.test(name))
-		.sort()
-		.map((name) => makeRow(name, baseEntrypoints[name] ?? 0, currentEntrypoints[name] ?? 0));
-}
-
 /**
  * Computes a structured comparison between the base and current bundles.
  * Pure data: reads each side's `analyzer.json` (webpack-bundle-analyzer's JSON
@@ -447,7 +400,6 @@ function compareEntrypointTotals(
  * output set is produced by its own focused helper:
  *
  * - {@link compareAssetField} — per-asset (parsed and gzip).
- * - {@link compareEntrypointTotals} — per real entrypoint.
  * - {@link comparePackages} — the headline buckets and full per-package
  * breakdown, sharing one memoized per-asset row computation.
  */
@@ -476,7 +428,6 @@ function computeBundleComparison(options: CompareBundlesOptions): ComparisonRepo
 		analysisDirectory,
 		assets,
 		gzipChangedAssets,
-		entrypoints: compareEntrypointTotals(baseNodes, currentNodes),
 		packageBuckets,
 		packages,
 	};
@@ -499,7 +450,7 @@ const percentColumnWidth = 10;
 interface TableSpec {
 	/** Banner text (rendered inside `=== ... ===`). */
 	heading: string;
-	/** Header for the name column (e.g. "Asset", "Entrypoint", "Package"). */
+	/** Header for the name column (e.g. "Asset" or "Package"). */
 	nameHeader: string;
 	/** Rows to render. */
 	rows: ComparisonRow[];
@@ -543,12 +494,10 @@ function renderTable(emit: (line?: string) => void, spec: TableSpec): void {
  * Also echoes each line to the console.
  *
  * @remarks
- * Sections are emitted in order: asset-level (per-emitted-file sizes, independent
- * of entrypoints), entrypoint-level, then package-level (composition buckets
- * followed by the full breakdown). Entrypoint rows overlap and must not be
- * summed; the `fluidFrameworkAll` aggregate entrypoint gives the single
- * deduplicated bundle-wide total. The package-level sections are scoped to real
- * entrypoints (see {@link bucketDefinitions} / {@link ComparisonReport}).
+ * Sections are emitted in order: asset-level (per-emitted-file sizes) then
+ * package-level (composition buckets followed by the full breakdown). The
+ * package-level sections are each scoped to a single real entrypoint asset
+ * (see {@link bucketDefinitions} / {@link ComparisonReport}).
  */
 function renderAsText(report: ComparisonReport): string {
 	const lines: string[] = [];
@@ -576,13 +525,6 @@ function renderAsText(report: ComparisonReport): string {
 		});
 	}
 
-	// Entrypoint-level section: each row is a real shipped bundle.
-	renderTable(emit, {
-		heading: "Named entrypoint total asset sizes (each row is a real entrypoint)",
-		nameHeader: "Entrypoint",
-		rows: report.entrypoints,
-	});
-
 	// Package-level sections: composition buckets, then the full breakdown.
 	renderTable(emit, {
 		heading: "Bundle composition by category (parsed size in bytes)",

From 2a1b46da00e1dbd170723cd5655cb31688478f97 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 18 Jun 2026 12:31:29 -0700
Subject: [PATCH 63/67] feat(build-cli): auto-detect freshest remote main as
 default bundle base

Move the default-base resolution into collectBundle: when revision mode is requested without an explicit revision/mergeBaseOf, it now defaults to the 'main' branch of the freshest remote pointing at microsoft/FluidFramework (via pickFreshestRemote) at its merge-base with HEAD, rather than relying on the local 'main' which may be stale or absent in worktree setups.

collectAndCompare no longer resolves the base itself; its --base-revision flag has no default and is passed through as undefined when omitted, so an explicit value (including 'main') is always honored as given. Updates docs and regenerates docs/bundle.md.
---
 build-tools/packages/build-cli/docs/bundle.md | 47 ++++++-----
 .../src/commands/bundle/collectAndCompare.ts  |  7 +-
 .../bundleSize/collectAndCompareBundles.ts    | 18 +++--
 .../src/library/bundleSize/collectBundle.ts   | 80 ++++++++++++++-----
 4 files changed, 107 insertions(+), 45 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
index dd0af99c6f63..d7152a4ffaa8 100644
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ b/build-tools/packages/build-cli/docs/bundle.md
@@ -65,24 +65,35 @@ USAGE
     [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
 
 FLAGS
-  --analysis-dir=<value>   Directory under which per-label analyzer stats are saved. Defaults to an 'analysis'
-                           subdirectory of the output directory (e.g. <package-dir>/compareBundlesOutput/analysis).
-  --base-revision=<value>  [default: main] Revision to use as the comparison baseline (branch, tag, or commit SHA). The
-                           actual base used is the merge-base of HEAD and this revision (the fork point), so
-                           worktree-based setups where 'main' is in an unusual location still produce the expected
-                           comparison. Pass --exact-base to use the revision as-is instead.
-  --exact-base             Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the
-                           merge-base with HEAD. Useful for comparing the working tree against a specific commit, e.g.
-                           the current commit's parent.
-  --force-clean-build      Run the full workspace clean before each build. Off by default; opt in when stale incremental
-                           build state may interfere with the current revision.
-  --keep-base-repo         For debugging only: keep the inner base-repo clone after collecting the base bundle. By
-                           default the inner repo is deleted once stats are saved, since it can be re-created cheaply
-                           via shallow clone on the next run. Pass this flag to inspect the inner repo's working tree or
-                           build output (e.g. when a build is failing inside the inner repo).
-  --output-dir=<value>     Directory where the comparison reports are written. Defaults to
-                           <package-dir>/compareBundlesOutput.
-  --package-dir=<value>    [default: .] Package root whose webpack bundles are built and compared.
+  --analysis-dir=<value>
+      Directory under which per-label analyzer stats are saved. Defaults to an 'analysis' subdirectory of the output
+      directory (e.g. <package-dir>/compareBundlesOutput/analysis).
+
+  --base-revision=<value>
+      Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base used is the merge-base of
+      HEAD and this revision (the fork point), so worktree-based setups where 'main' is in an unusual location still
+      produce the expected comparison. When omitted, the baseline is auto-detected as the freshest 'main' of a remote
+      pointing at microsoft/FluidFramework — the local 'main' is not used, since it may be stale. An explicit value
+      (including 'main') is always honored as given. Pass --exact-base to use the revision as-is instead.
+
+  --exact-base
+      Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the merge-base with HEAD.
+      Useful for comparing the working tree against a specific commit, e.g. the current commit's parent.
+
+  --force-clean-build
+      Run the full workspace clean before each build. Off by default; opt in when stale incremental build state may
+      interfere with the current revision.
+
+  --keep-base-repo
+      For debugging only: keep the inner base-repo clone after collecting the base bundle. By default the inner repo is
+      deleted once stats are saved, since it can be re-created cheaply via shallow clone on the next run. Pass this flag
+      to inspect the inner repo's working tree or build output (e.g. when a build is failing inside the inner repo).
+
+  --output-dir=<value>
+      Directory where the comparison reports are written. Defaults to <package-dir>/compareBundlesOutput.
+
+  --package-dir=<value>
+      [default: .] Package root whose webpack bundles are built and compared.
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts b/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
index bd11b8835fd3..0ff37d704d52 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
+++ b/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
@@ -35,8 +35,11 @@ export default class BundleCollectAndCompare extends BaseCommand<
 				"Revision to use as the comparison baseline (branch, tag, or commit SHA). The " +
 				"actual base used is the merge-base of HEAD and this revision (the fork point), so " +
 				"worktree-based setups where 'main' is in an unusual location still produce the " +
-				"expected comparison. Pass --exact-base to use the revision as-is instead.",
-			default: "main",
+				"expected comparison. When omitted, the baseline is auto-detected as the freshest " +
+				"'main' of a remote pointing at microsoft/FluidFramework — the local 'main' is not " +
+				"used, since it may be stale. An explicit value (including 'main') is always honored " +
+				"as given. Pass --exact-base to use the revision as-is instead.",
+			// No default: an omitted base-revision triggers freshest-remote 'main' auto-detection.
 		}),
 		"exact-base": Flags.boolean({
 			description:
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
index 6c0acdead33d..da6c7740c6f3 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectAndCompareBundles.ts
@@ -17,9 +17,10 @@ export interface CollectAndCompareBundlesOptions {
 	 * Revision to use as the comparison baseline (branch, tag, or commit SHA). By default the
 	 * actual base used is the merge-base of HEAD and this revision (the fork point). When
 	 * {@link CollectAndCompareBundlesOptions.exactBase} is set, this revision is used as-is
-	 * (no merge-base).
+	 * (no merge-base). When omitted, {@link collectBundle} auto-detects the freshest "main" of a
+	 * remote pointing at microsoft/FluidFramework and uses its merge-base with HEAD.
 	 */
-	readonly baseRevision: string;
+	readonly baseRevision?: string;
 	/**
 	 * Use {@link CollectAndCompareBundlesOptions.baseRevision} as-is (resolved via `rev-parse`)
 	 * instead of taking the merge-base with HEAD. Useful for comparing the working tree against an
@@ -41,10 +42,11 @@ export interface CollectAndCompareBundlesOptions {
 /**
  * Orchestrates {@link collectBundle} (local working tree) and {@link collectBundle} (base
  * revision), then {@link compareBundles}. The base is the merge-base of HEAD and `baseRevision`,
- * or the revision as-is when `exactBase` is set. Labels are automatic: the local bundle under a
- * timestamped `current_<epoch>` label and the base under `main`. The scratch inner repo used to
- * build the base is deleted afterward unless {@link CollectAndCompareBundlesOptions.keepBaseRepo}
- * is set; the outer repo is never modified.
+ * or the revision as-is when `exactBase` is set; when `baseRevision` is omitted, the base defaults
+ * to the freshest canonical "main" at its merge-base with HEAD. Labels are automatic: the local
+ * bundle under a timestamped `current_<epoch>` label and the base under `main`. The scratch inner
+ * repo used to build the base is deleted afterward unless
+ * {@link CollectAndCompareBundlesOptions.keepBaseRepo} is set; the outer repo is never modified.
  */
 export async function collectAndCompareBundles(
 	options: CollectAndCompareBundlesOptions,
@@ -74,7 +76,9 @@ export async function collectAndCompareBundles(
 		});
 
 		console.log(`\n${"=".repeat(80)}`);
-		console.log(`Collecting base bundle (revision: ${baseRevision}, label: ${baseLabel})...`);
+		console.log(
+			`Collecting base bundle (revision: ${baseRevision ?? "auto-detect freshest main"}, label: ${baseLabel})...`,
+		);
 		console.log("=".repeat(80));
 		await collectBundle({
 			mode: "revision",
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
index 9ff802f5b56d..7b195eff69a0 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/collectBundle.ts
@@ -17,6 +17,8 @@ import { dirname, relative, resolve } from "node:path";
 import { findGitRootSync } from "@fluid-tools/build-infrastructure";
 import { simpleGit } from "simple-git";
 
+import { pickFreshestRemote } from "../git/pickFreshestRemote.js";
+
 /** Filename of the per-label analyzer report. */
 const analyzerFileName = "analyzer.json";
 
@@ -48,6 +50,10 @@ export interface CollectBundleOptions {
 	 * (revision mode only) Committish whose merge-base with HEAD (the fork point) is built instead
 	 * of the committish itself. Mutually exclusive with {@link CollectBundleOptions.revision}.
 	 * Resolved against the outer repo. Also used as the default label.
+	 *
+	 * When neither this nor {@link CollectBundleOptions.revision} is set in revision mode, the base
+	 * defaults to the freshest canonical "main" (see {@link resolveDefaultBaseCommittish}) at its
+	 * merge-base with HEAD.
 	 */
 	readonly mergeBaseOf?: string;
 	/**
@@ -155,6 +161,30 @@ async function resolveBuildRevision(
 	return resolved;
 }
 
+/** Matches a remote URL that points at the canonical microsoft/FluidFramework repo. */
+const canonicalFluidRemoteUrl = /(^|[/:])microsoft\/fluidframework(\.git)?$/i;
+
+/**
+ * Resolves the default base committish used when revision mode is requested without an explicit
+ * `revision`/`mergeBaseOf`: the `main` branch of the freshest remote pointing at
+ * microsoft/FluidFramework (preferred over the local `main`, which may be stale or absent in
+ * worktree setups). Falls back to the local `main` with a warning when no such remote is
+ * configured or fetched.
+ */
+function resolveDefaultBaseCommittish(): string {
+	const remote = pickFreshestRemote("main", (url) => canonicalFluidRemoteUrl.test(url));
+	if (remote === undefined) {
+		console.warn(
+			'Could not auto-detect a remote pointing at microsoft/FluidFramework; using local "main" ' +
+				"as the base, which may be stale.",
+		);
+		return "main";
+	}
+	const ref = `${remote}/main`;
+	console.log(`Auto-detected base revision "${ref}" (freshest "main").`);
+	return ref;
+}
+
 // --- Build steps ---
 
 /**
@@ -325,10 +355,12 @@ function logCollectionComplete(mode: string, label: string, labelDirectory: stri
  *
  * @remarks
  * In revision mode, {@link CollectBundleOptions.revision} is built as-is and
- * {@link CollectBundleOptions.mergeBaseOf} at its merge-base with HEAD (the fork point); the
- * resolved SHA is recorded in a sidecar `revision.txt`, letting a later run with the same SHA
- * reuse the cached report (unless {@link CollectBundleOptions.forceCleanBuild} is set). Builds
- * happen in the inner repo (see {@link ensureInnerRepoAtRevision}).
+ * {@link CollectBundleOptions.mergeBaseOf} at its merge-base with HEAD (the fork point); when
+ * neither is given, the base defaults to the freshest canonical "main" at its merge-base with
+ * HEAD (see {@link resolveDefaultBaseCommittish}). The resolved SHA is recorded in a sidecar
+ * `revision.txt`, letting a later run with the same SHA reuse the cached report (unless
+ * {@link CollectBundleOptions.forceCleanBuild} is set). Builds happen in the inner repo (see
+ * {@link ensureInnerRepoAtRevision}).
  *
  * In local mode the working tree is built exactly as it sits on disk; the only side effect is the
  * up-front staged-patch record (see {@link captureLocalPatch}). The outer repo's git state is
@@ -337,27 +369,39 @@ function logCollectionComplete(mode: string, label: string, labelDirectory: stri
 export async function collectBundle(options: CollectBundleOptions): Promise<string> {
 	const { mode, revision, mergeBaseOf, forceCleanBuild, packageDir, analysisDir } = options;
 
-	// Resolve names and paths. In revision mode, the committish selects what to build.
-	const committish = mode === "revision" ? (revision ?? mergeBaseOf) : undefined;
 	const outerRepoRoot = findGitRootSync(packageDir);
 	const innerRepoRoot = options.baseRepoDir ?? resolve(analysisDir, "base-repo");
-	const label = sanitizeForFileName(
-		options.label ?? committish ?? `current_${Math.floor(Date.now() / 1000)}`,
-	);
-	const labelDirectory = resolve(analysisDir, label);
 
-	// In revision mode, resolve the committish to a SHA and reuse the cached report if it matches.
+	// In revision mode, decide what to build, how to resolve it, and resolve it to a SHA:
+	//   - revision    → build that committish as-is (rev-parse).
+	//   - mergeBaseOf → build its merge-base with HEAD (the fork point).
+	//   - neither     → default to the freshest canonical "main" at its merge-base with HEAD. This
+	//     is the orchestrator's pass-through of an omitted base: the local "main" may be stale, so
+	//     "<remote>/main" is auto-detected, and an unspecified base means "where this branch forked
+	//     from upstream main".
+	let committish: string | undefined;
 	let resolvedRevision: string | undefined;
 	if (mode === "revision") {
-		if (committish === undefined) {
-			throw new Error("revision mode requires either revision or mergeBaseOf.");
+		let useMergeBase: boolean;
+		if (revision !== undefined) {
+			committish = revision;
+			useMergeBase = false;
+		} else if (mergeBaseOf !== undefined) {
+			committish = mergeBaseOf;
+			useMergeBase = true;
+		} else {
+			committish = resolveDefaultBaseCommittish();
+			useMergeBase = true;
 		}
-		resolvedRevision = await resolveBuildRevision(
-			outerRepoRoot,
-			committish,
-			revision === undefined,
-		);
+		resolvedRevision = await resolveBuildRevision(outerRepoRoot, committish, useMergeBase);
 	}
+
+	const label = sanitizeForFileName(
+		options.label ?? committish ?? `current_${Math.floor(Date.now() / 1000)}`,
+	);
+	const labelDirectory = resolve(analysisDir, label);
+
+	// Reuse the cached report when the resolved SHA matches a previous revision-mode run.
 	if (resolvedRevision !== undefined && !forceCleanBuild) {
 		const analyzerPath = resolve(labelDirectory, analyzerFileName);
 		const markerPath = resolve(labelDirectory, revisionMarkerFileName);

From a4172416d4e123d074acc0914e0a6c744357a026 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Thu, 18 Jun 2026 13:55:29 -0700
Subject: [PATCH 64/67] refactor(build-cli): move bundle commands into
 generate/check topics

Retopic and rename the bundle-analysis commands so they live under the standardized generate/check topics:

- 'bundle collect' -> 'generate bundleAnalysisRepo'
- 'bundle compare' -> 'check bundleAnalysisReposComparison'
- 'bundle collectAndCompare' -> 'generate bundleAnalysisReposWithComparison'

Removes the now-empty 'bundle' oclif topic, renames the companion doc to bundleAnalysisRepoDetails.md (a durable, easy-to-find name), updates all command cross-references (compare:bundles script, bundle-size-tests README, pnpm-workspace comment), and regenerates the oclif manifest and docs. The underlying library functions are unchanged.
---
 build-tools/packages/build-cli/README.md      |   1 -
 build-tools/packages/build-cli/docs/bundle.md | 162 ------------------
 ...etails.md => bundleAnalysisRepoDetails.md} |  51 +++---
 build-tools/packages/build-cli/docs/check.md  |  42 +++++
 .../packages/build-cli/docs/generate.md       | 115 +++++++++++++
 build-tools/packages/build-cli/package.json   |   3 -
 .../bundleAnalysisReposComparison.ts}         |  14 +-
 .../bundleAnalysisRepo.ts}                    |   8 +-
 .../bundleAnalysisReposWithComparison.ts}     |   6 +-
 examples/utils/bundle-size-tests/README.md    |   6 +-
 examples/utils/bundle-size-tests/package.json |   2 +-
 pnpm-workspace.yaml                           |   4 +-
 12 files changed, 206 insertions(+), 208 deletions(-)
 delete mode 100644 build-tools/packages/build-cli/docs/bundle.md
 rename build-tools/packages/build-cli/docs/{bundleDetails.md => bundleAnalysisRepoDetails.md} (77%)
 rename build-tools/packages/build-cli/src/commands/{bundle/compare.ts => check/bundleAnalysisReposComparison.ts} (78%)
 rename build-tools/packages/build-cli/src/commands/{bundle/collect.ts => generate/bundleAnalysisRepo.ts} (94%)
 rename build-tools/packages/build-cli/src/commands/{bundle/collectAndCompare.ts => generate/bundleAnalysisReposWithComparison.ts} (96%)

diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index fdce80cb3b66..ff37c120d012 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -36,7 +36,6 @@ USAGE
 * [`flub autocomplete`](docs/autocomplete.md) - Display autocomplete installation instructions.
 * [`flub build-perf`](docs/build-perf.md) - Build performance observability commands for collecting, processing, and analyzing build metrics.
 * [`flub bump`](docs/bump.md) - Bump the version of packages, release groups, and their dependencies.
-* [`flub bundle`](docs/bundle.md) - Bundle commands collect and compare webpack bundle sizes across revisions.
 * [`flub check`](docs/check.md) - Check commands are used to verify repo state, apply policy, etc.
 * [`flub commands`](docs/commands.md) - List all flub commands.
 * [`flub exec`](docs/exec.md) - Run a shell command in the context of a package or release group.
diff --git a/build-tools/packages/build-cli/docs/bundle.md b/build-tools/packages/build-cli/docs/bundle.md
deleted file mode 100644
index d7152a4ffaa8..000000000000
--- a/build-tools/packages/build-cli/docs/bundle.md
+++ /dev/null
@@ -1,162 +0,0 @@
-`flub bundle`
-=============
-
-Bundle commands collect and compare webpack bundle sizes across revisions.
-
-* [`flub bundle collect`](#flub-bundle-collect)
-* [`flub bundle collectAndCompare`](#flub-bundle-collectandcompare)
-* [`flub bundle compare`](#flub-bundle-compare)
-
-## `flub bundle collect`
-
-Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
-
-```
-USAGE
-  $ flub bundle collect [-v | --quiet] [--revision <value> | --merge-base <value>] [--label <value>] [--package-dir
-    <value>] [--analysis-dir <value>] [--force-clean-build]
-
-FLAGS
-  --analysis-dir=<value>  Directory under which per-label analyzer stats are saved. Defaults to
-                          <package-dir>/compareBundlesOutput/analysis.
-  --force-clean-build     Run the full workspace clean ('npm run clean' at the repo root) before building. Off by
-                          default; opt in when stale incremental build state from a previous revision may interfere with
-                          the current one.
-  --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
-                          revision in revision mode, or a timestamped "current_<epoch>" in local mode.
-  --merge-base=<value>    Collect a bundle for the merge-base of HEAD and this committish (the fork point). Selects
-                          revision mode and is mutually exclusive with --revision. Also used as the default label.
-  --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
-                          collected.
-  --revision=<value>      Collect a bundle for this committish (branch, tag, commit SHA, or any committish like HEAD~2),
-                          resolved as-is via 'git rev-parse'. Selects revision mode and is mutually exclusive with
-                          --merge-base; omit both to collect the local working tree. Also used as the default label.
-
-LOGGING FLAGS
-  -v, --verbose  Enable verbose logging.
-      --quiet    Disable all logging.
-
-DESCRIPTION
-  Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked
-  out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
-
-  To learn more see the detailed documentation at
-  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
-
-EXAMPLES
-  $ flub bundle collect
-
-  $ flub bundle collect --revision main
-
-  $ flub bundle collect --merge-base main
-
-  $ flub bundle collect --revision client_v2.100.0
-```
-
-_See code: [src/commands/bundle/collect.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collect.ts)_
-
-## `flub bundle collectAndCompare`
-
-Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree, branch, and stash are never modified.
-
-```
-USAGE
-  $ flub bundle collectAndCompare [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
-    [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
-
-FLAGS
-  --analysis-dir=<value>
-      Directory under which per-label analyzer stats are saved. Defaults to an 'analysis' subdirectory of the output
-      directory (e.g. <package-dir>/compareBundlesOutput/analysis).
-
-  --base-revision=<value>
-      Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base used is the merge-base of
-      HEAD and this revision (the fork point), so worktree-based setups where 'main' is in an unusual location still
-      produce the expected comparison. When omitted, the baseline is auto-detected as the freshest 'main' of a remote
-      pointing at microsoft/FluidFramework — the local 'main' is not used, since it may be stale. An explicit value
-      (including 'main') is always honored as given. Pass --exact-base to use the revision as-is instead.
-
-  --exact-base
-      Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the merge-base with HEAD.
-      Useful for comparing the working tree against a specific commit, e.g. the current commit's parent.
-
-  --force-clean-build
-      Run the full workspace clean before each build. Off by default; opt in when stale incremental build state may
-      interfere with the current revision.
-
-  --keep-base-repo
-      For debugging only: keep the inner base-repo clone after collecting the base bundle. By default the inner repo is
-      deleted once stats are saved, since it can be re-created cheaply via shallow clone on the next run. Pass this flag
-      to inspect the inner repo's working tree or build output (e.g. when a build is failing inside the inner repo).
-
-  --output-dir=<value>
-      Directory where the comparison reports are written. Defaults to <package-dir>/compareBundlesOutput.
-
-  --package-dir=<value>
-      [default: .] Package root whose webpack bundles are built and compared.
-
-LOGGING FLAGS
-  -v, --verbose  Enable verbose logging.
-      --quiet    Disable all logging.
-
-DESCRIPTION
-  Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree,
-  branch, and stash are never modified.
-
-  To learn more see the detailed documentation at
-  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
-
-EXAMPLES
-  $ flub bundle collectAndCompare
-
-  $ flub bundle collectAndCompare --base-revision main
-
-  $ flub bundle collectAndCompare --base-revision client_v2.100.0
-
-  $ flub bundle collectAndCompare --base-revision 18062854f25 --exact-base
-
-  $ flub bundle collectAndCompare --force-clean-build --keep-base-repo
-```
-
-_See code: [src/commands/bundle/collectAndCompare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts)_
-
-## `flub bundle compare`
-
-Compare the two bundles previously collected by 'flub bundle collect' (base = --base-label, current = --current-label).
-
-```
-USAGE
-  $ flub bundle compare [-v | --quiet] [--analysis-dir <value>] [--output-dir <value>] [--base-label <value>]
-    [--current-label <value>]
-
-FLAGS
-  --analysis-dir=<value>   [default: ./compareBundlesOutput/analysis] Parent directory containing analyzer.json files at
-                           {label}/analyzer.json.
-  --base-label=<value>     [default: main] Label subdirectory under --analysis-dir holding the base-side bundle stats.
-                           Must match the --label passed to 'flub bundle collect' in revision mode.
-  --current-label=<value>  [default: current] Label subdirectory under --analysis-dir holding the current-side bundle
-                           stats. Must match the --label passed to 'flub bundle collect' in local mode (the orchestrator
-                           passes a timestamped label like 'current_<epoch>').
-  --output-dir=<value>     [default: ./compareBundlesOutput] Directory where the .txt and .json comparison reports are
-                           written.
-
-LOGGING FLAGS
-  -v, --verbose  Enable verbose logging.
-      --quiet    Disable all logging.
-
-DESCRIPTION
-  Compare the two bundles previously collected by 'flub bundle collect' (base = --base-label, current =
-  --current-label).
-
-  To learn more see the detailed documentation at
-  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md
-
-EXAMPLES
-  $ flub bundle compare
-
-  $ flub bundle compare --base-label some-revision
-
-  $ flub bundle compare --analysis-dir /some/other/path
-```
-
-_See code: [src/commands/bundle/compare.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/bundle/compare.ts)_
diff --git a/build-tools/packages/build-cli/docs/bundleDetails.md b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
similarity index 77%
rename from build-tools/packages/build-cli/docs/bundleDetails.md
rename to build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
index 16285bd3f738..52748a25c9b4 100644
--- a/build-tools/packages/build-cli/docs/bundleDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
@@ -1,27 +1,28 @@
-# Further information about `flub bundle`
+# Further information about the bundle-analysis commands
 
-The `flub bundle` commands measure how a change affects a package's webpack
+The bundle-analysis commands measure how a change affects a package's webpack
 bundle by building the bundle on two different revisions and diffing the
 per-asset and per-package sizes, so regressions (or wins) are easy to spot
 before pushing.
 
-See [bundle.md](./bundle.md) for the generated command reference. This document
-explains how the commands fit together and how to read the comparison report.
+See [generate.md](./generate.md) and [check.md](./check.md) for the generated
+command reference. This document explains how the commands fit together and how
+to read the comparison report.
 
 ## The commands
 
-| Command                           | Responsibility                                                   |
-| --------------------------------- | --------------------------------------------------------------- |
-| `flub bundle collect`             | Build one bundle and save its stats under a label.              |
-| `flub bundle compare`             | Diff two already-collected bundles and write the report.        |
-| `flub bundle collectAndCompare`   | Orchestrate both collect steps plus the compare step end-to-end. |
+| Command                                           | Responsibility                                                   |
+| ------------------------------------------------- | ---------------------------------------------------------------- |
+| `flub generate bundleAnalysisRepo`                | Build one bundle and save its stats under a label.               |
+| `flub check bundleAnalysisReposComparison`        | Diff two already-collected bundles and write the report.         |
+| `flub generate bundleAnalysisReposWithComparison` | Orchestrate both collect steps plus the compare step end-to-end. |
 
 Each command self-describes its flags via `--help`:
 
 ```sh
-flub bundle collect --help
-flub bundle compare --help
-flub bundle collectAndCompare --help
+flub generate bundleAnalysisRepo --help
+flub check bundleAnalysisReposComparison --help
+flub generate bundleAnalysisReposWithComparison --help
 ```
 
 ## Typical workflow
@@ -29,7 +30,7 @@ flub bundle collectAndCompare --help
 In almost every case you just want the one-shot orchestrator:
 
 ```sh
-flub bundle collectAndCompare
+flub generate bundleAnalysisReposWithComparison
 ```
 
 This compares your working tree against the merge-base of `HEAD` and `main` —
@@ -40,18 +41,18 @@ merge-base of that revision and `HEAD` is what actually gets built.
 
 Reach for the lower-level commands when the orchestrator's flow doesn't fit:
 
-- **`flub bundle compare` on its own** — when both bundles are already collected
-  and you only want to re-run the diff (e.g. tweaking the report, or comparing
-  two labels the orchestrator wouldn't pair automatically). It reads each side's
-  previously saved `analyzer.json` and writes a fresh report without rebuilding
-  anything.
-- **`flub bundle collect` on its own** — when you want to capture a single bundle
-  without immediately diffing it, or to pre-populate a label for a later
-  comparison.
+- **`flub check bundleAnalysisReposComparison` on its own** — when both bundles are
+  already collected and you only want to re-run the diff (e.g. tweaking the
+  report, or comparing two labels the orchestrator wouldn't pair automatically).
+  It reads each side's previously saved `analyzer.json` and writes a fresh report
+  without rebuilding anything.
+- **`flub generate bundleAnalysisRepo` on its own** — when you want to capture a
+  single bundle without immediately diffing it, or to pre-populate a label for a
+  later comparison.
 
 ## How collection works
 
-`flub bundle collect` runs in one of two modes:
+`flub generate bundleAnalysisRepo` runs in one of two modes:
 
 - **local** — builds the bundle from the outer enlistment (your working tree,
   including staged changes). The staged diff is captured alongside the report so
@@ -71,9 +72,9 @@ parsed/gzip sizes and per-module breakdowns — everything the comparison needs
 so it is the only artifact saved per label; the larger webpack stats and `build/`
 outputs are not retained.
 
-The orchestrator runs `flub bundle collect` once in each mode: local for the
-current side, revision for the base side. The base-side report is cached and
-keyed by the resolved SHA, so a re-run against the same merge-base skips the
+The orchestrator runs `flub generate bundleAnalysisRepo` once in each mode: local
+for the current side, revision for the base side. The base-side report is cached
+and keyed by the resolved SHA, so a re-run against the same merge-base skips the
 rebuild.
 
 ## Outputs
diff --git a/build-tools/packages/build-cli/docs/check.md b/build-tools/packages/build-cli/docs/check.md
index 53dcdfb5bcfb..518513b639c2 100644
--- a/build-tools/packages/build-cli/docs/check.md
+++ b/build-tools/packages/build-cli/docs/check.md
@@ -4,6 +4,7 @@
 Check commands are used to verify repo state, apply policy, etc.
 
 * [`flub check buildVersion`](#flub-check-buildversion)
+* [`flub check bundleAnalysisReposComparison`](#flub-check-bundleanalysisreposcomparison)
 * [`flub check bundleSize`](#flub-check-bundlesize)
 * [`flub check changeset`](#flub-check-changeset)
 * [`flub check latestVersions VERSION PACKAGE_OR_RELEASE_GROUP`](#flub-check-latestversions-version-package_or_release_group)
@@ -67,6 +68,47 @@ DESCRIPTION
 
 _See code: [src/commands/check/buildVersion.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/check/buildVersion.ts)_
 
+## `flub check bundleAnalysisReposComparison`
+
+Compare the two bundles previously collected by 'flub generate bundleAnalysisRepo' (base = --base-label, current = --current-label).
+
+```
+USAGE
+  $ flub check bundleAnalysisReposComparison [-v | --quiet] [--analysis-dir <value>] [--output-dir <value>] [--base-label <value>]
+    [--current-label <value>]
+
+FLAGS
+  --analysis-dir=<value>   [default: ./compareBundlesOutput/analysis] Parent directory containing analyzer.json files at
+                           {label}/analyzer.json.
+  --base-label=<value>     [default: main] Label subdirectory under --analysis-dir holding the base-side bundle stats.
+                           Must match the --label passed to 'flub generate bundleAnalysisRepo' in revision mode.
+  --current-label=<value>  [default: current] Label subdirectory under --analysis-dir holding the current-side bundle
+                           stats. Must match the --label passed to 'flub generate bundleAnalysisRepo' in local mode (the
+                           orchestrator passes a timestamped label like 'current_<epoch>').
+  --output-dir=<value>     [default: ./compareBundlesOutput] Directory where the .txt and .json comparison reports are
+                           written.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Compare the two bundles previously collected by 'flub generate bundleAnalysisRepo' (base = --base-label, current =
+  --current-label).
+
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
+
+EXAMPLES
+  $ flub check bundleAnalysisReposComparison
+
+  $ flub check bundleAnalysisReposComparison --base-label some-revision
+
+  $ flub check bundleAnalysisReposComparison --analysis-dir /some/other/path
+```
+
+_See code: [src/commands/check/bundleAnalysisReposComparison.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts)_
+
 ## `flub check bundleSize`
 
 Compare the locally-collected bundle reports against the CI build of the merge-base commit (between HEAD and a target ref) and print the diff. By default, the target is auto-detected as `<canonical-remote>/main` where `<canonical-remote>` is whichever remote points at `microsoft/FluidFramework`; pass `--target` to override. Prints a human-readable summary by default; pass --json for the structured result.
diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 1c82ee5ff667..fc3420b3a4cb 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -5,6 +5,8 @@ Generate commands are used to create/update code, docs, readmes, etc.
 
 * [`flub generate assertTags`](#flub-generate-asserttags)
 * [`flub generate buildVersion`](#flub-generate-buildversion)
+* [`flub generate bundleAnalysisRepo`](#flub-generate-bundleanalysisrepo)
+* [`flub generate bundleAnalysisReposWithComparison`](#flub-generate-bundleanalysisreposwithcomparison)
 * [`flub generate bundleStats`](#flub-generate-bundlestats)
 * [`flub generate changelog`](#flub-generate-changelog)
 * [`flub generate changeset`](#flub-generate-changeset)
@@ -118,6 +120,119 @@ EXAMPLES
 
 _See code: [src/commands/generate/buildVersion.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/generate/buildVersion.ts)_
 
+## `flub generate bundleAnalysisRepo`
+
+Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
+
+```
+USAGE
+  $ flub generate bundleAnalysisRepo [-v | --quiet] [--revision <value> | --merge-base <value>] [--label <value>] [--package-dir
+    <value>] [--analysis-dir <value>] [--force-clean-build]
+
+FLAGS
+  --analysis-dir=<value>  Directory under which per-label analyzer stats are saved. Defaults to
+                          <package-dir>/compareBundlesOutput/analysis.
+  --force-clean-build     Run the full workspace clean ('npm run clean' at the repo root) before building. Off by
+                          default; opt in when stale incremental build state from a previous revision may interfere with
+                          the current one.
+  --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
+                          revision in revision mode, or a timestamped "current_<epoch>" in local mode.
+  --merge-base=<value>    Collect a bundle for the merge-base of HEAD and this committish (the fork point). Selects
+                          revision mode and is mutually exclusive with --revision. Also used as the default label.
+  --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
+                          collected.
+  --revision=<value>      Collect a bundle for this committish (branch, tag, commit SHA, or any committish like HEAD~2),
+                          resolved as-is via 'git rev-parse'. Selects revision mode and is mutually exclusive with
+                          --merge-base; omit both to collect the local working tree. Also used as the default label.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Build and collect a bundle, either from the outer enlistment (local mode) or from a separate inner enlistment checked
+  out to a specific revision (revision mode). The outer repo's working tree, branch, and stash are never modified.
+
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
+
+EXAMPLES
+  $ flub generate bundleAnalysisRepo
+
+  $ flub generate bundleAnalysisRepo --revision main
+
+  $ flub generate bundleAnalysisRepo --merge-base main
+
+  $ flub generate bundleAnalysisRepo --revision client_v2.100.0
+```
+
+_See code: [src/commands/generate/bundleAnalysisRepo.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts)_
+
+## `flub generate bundleAnalysisReposWithComparison`
+
+Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree, branch, and stash are never modified.
+
+```
+USAGE
+  $ flub generate bundleAnalysisReposWithComparison [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
+    [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
+
+FLAGS
+  --analysis-dir=<value>
+      Directory under which per-label analyzer stats are saved. Defaults to an 'analysis' subdirectory of the output
+      directory (e.g. <package-dir>/compareBundlesOutput/analysis).
+
+  --base-revision=<value>
+      Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base used is the merge-base of
+      HEAD and this revision (the fork point), so worktree-based setups where 'main' is in an unusual location still
+      produce the expected comparison. When omitted, the baseline is auto-detected as the freshest 'main' of a remote
+      pointing at microsoft/FluidFramework — the local 'main' is not used, since it may be stale. An explicit value
+      (including 'main') is always honored as given. Pass --exact-base to use the revision as-is instead.
+
+  --exact-base
+      Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the merge-base with HEAD.
+      Useful for comparing the working tree against a specific commit, e.g. the current commit's parent.
+
+  --force-clean-build
+      Run the full workspace clean before each build. Off by default; opt in when stale incremental build state may
+      interfere with the current revision.
+
+  --keep-base-repo
+      For debugging only: keep the inner base-repo clone after collecting the base bundle. By default the inner repo is
+      deleted once stats are saved, since it can be re-created cheaply via shallow clone on the next run. Pass this flag
+      to inspect the inner repo's working tree or build output (e.g. when a build is failing inside the inner repo).
+
+  --output-dir=<value>
+      Directory where the comparison reports are written. Defaults to <package-dir>/compareBundlesOutput.
+
+  --package-dir=<value>
+      [default: .] Package root whose webpack bundles are built and compared.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  Collect the local bundle and the base-revision (merge-base) bundle, then compare them. The outer repo's working tree,
+  branch, and stash are never modified.
+
+  To learn more see the detailed documentation at
+  https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
+
+EXAMPLES
+  $ flub generate bundleAnalysisReposWithComparison
+
+  $ flub generate bundleAnalysisReposWithComparison --base-revision main
+
+  $ flub generate bundleAnalysisReposWithComparison --base-revision client_v2.100.0
+
+  $ flub generate bundleAnalysisReposWithComparison --base-revision 18062854f25 --exact-base
+
+  $ flub generate bundleAnalysisReposWithComparison --force-clean-build --keep-base-repo
+```
+
+_See code: [src/commands/generate/bundleAnalysisReposWithComparison.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts)_
+
 ## `flub generate bundleStats`
 
 Find all bundle analysis artifacts and copy them into a central location to upload as build artifacts for later consumption
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index 4228935c674b..f96a6e403785 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -225,9 +225,6 @@
 			"bump": {
 				"description": "Bump the version of packages, release groups, and their dependencies."
 			},
-			"bundle": {
-				"description": "Bundle commands collect and compare webpack bundle sizes across revisions."
-			},
 			"check": {
 				"description": "Check commands are used to verify repo state, apply policy, etc."
 			},
diff --git a/build-tools/packages/build-cli/src/commands/bundle/compare.ts b/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
similarity index 78%
rename from build-tools/packages/build-cli/src/commands/bundle/compare.ts
rename to build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
index 552a2663f027..0641face6011 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/compare.ts
+++ b/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
@@ -10,15 +10,17 @@ import { compareBundles } from "../../library/bundleSize/index.js";
 import { BaseCommand } from "../../library/commands/base.js";
 
 /**
- * Compares the two bundles previously collected by `flub bundle collect`
+ * Compares the two bundles previously collected by `flub generate bundleAnalysisRepo`
  * (base = --base-label, current = --current-label) and writes human-readable `.txt` and
  * structured `.json` comparison reports.
  */
-export default class BundleCompare extends BaseCommand<typeof BundleCompare> {
+export default class CheckBundleAnalysisReposComparison extends BaseCommand<
+	typeof CheckBundleAnalysisReposComparison
+> {
 	public static readonly description =
-		"Compare the two bundles previously collected by 'flub bundle collect' " +
+		"Compare the two bundles previously collected by 'flub generate bundleAnalysisRepo' " +
 		"(base = --base-label, current = --current-label).\n\n" +
-		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
@@ -38,13 +40,13 @@ export default class BundleCompare extends BaseCommand<typeof BundleCompare> {
 		"base-label": Flags.string({
 			description:
 				"Label subdirectory under --analysis-dir holding the base-side bundle stats. " +
-				"Must match the --label passed to 'flub bundle collect' in revision mode.",
+				"Must match the --label passed to 'flub generate bundleAnalysisRepo' in revision mode.",
 			default: "main",
 		}),
 		"current-label": Flags.string({
 			description:
 				"Label subdirectory under --analysis-dir holding the current-side bundle stats. " +
-				"Must match the --label passed to 'flub bundle collect' in local mode (the " +
+				"Must match the --label passed to 'flub generate bundleAnalysisRepo' in local mode (the " +
 				"orchestrator passes a timestamped label like 'current_<epoch>').",
 			default: "current",
 		}),
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collect.ts b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
similarity index 94%
rename from build-tools/packages/build-cli/src/commands/bundle/collect.ts
rename to build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
index 1b75e0882c31..4078ea03951c 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collect.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
@@ -13,14 +13,16 @@ import { BaseCommand } from "../../library/commands/base.js";
  * Builds and collects a single bundle, either from the outer enlistment (local mode) or from a
  * separate inner enlistment checked out to a specific revision (revision mode). The collected
  * webpack-bundle-analyzer report is saved under `<analysis-dir>/<label>/analyzer.json` for later
- * comparison by `flub bundle compare`.
+ * comparison by `flub check bundleAnalysisReposComparison`.
  */
-export default class BundleCollect extends BaseCommand<typeof BundleCollect> {
+export default class GenerateBundleAnalysisRepo extends BaseCommand<
+	typeof GenerateBundleAnalysisRepo
+> {
 	public static readonly description =
 		"Build and collect a bundle, either from the outer enlistment (local mode) or from a " +
 		"separate inner enlistment checked out to a specific revision (revision mode). The outer " +
 		"repo's working tree, branch, and stash are never modified.\n\n" +
-		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
diff --git a/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
similarity index 96%
rename from build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
rename to build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
index 0ff37d704d52..1056b2f55cb1 100644
--- a/build-tools/packages/build-cli/src/commands/bundle/collectAndCompare.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
@@ -13,13 +13,13 @@ import { BaseCommand } from "../../library/commands/base.js";
  * Orchestrates a local bundle collection, a base-revision (merge-base) bundle collection, and a
  * comparison between them. The outer repo's working tree, branch, and stash are never modified.
  */
-export default class BundleCollectAndCompare extends BaseCommand<
-	typeof BundleCollectAndCompare
+export default class GenerateBundleAnalysisReposWithComparison extends BaseCommand<
+	typeof GenerateBundleAnalysisReposWithComparison
 > {
 	public static readonly description =
 		"Collect the local bundle and the base-revision (merge-base) bundle, then compare them. " +
 		"The outer repo's working tree, branch, and stash are never modified.\n\n" +
-		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleDetails.md";
+		"To learn more see the detailed documentation at https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md";
 
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index c881c72d7fc5..06b3bb4e513a 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -8,10 +8,12 @@ This package can measure how a change affects its webpack bundle by building the
 bundle on two different revisions and diffing the per-asset and per-entrypoint
 sizes, so regressions (or wins) are easy to spot before pushing.
 
-The workflow is implemented as the `flub bundle` command topic in
+The workflow is implemented as the bundle-analysis commands (`flub generate
+bundleAnalysisRepo`, `flub check bundleAnalysisReposComparison`, and the
+`flub generate bundleAnalysisReposWithComparison` orchestrator) in
 [`@fluid-tools/build-cli`](../../../build-tools/packages/build-cli); this package
 just invokes it with the appropriate context. See
-[bundleDetails.md](../../../build-tools/packages/build-cli/docs/bundleDetails.md)
+[bundleAnalysisRepoDetails.md](../../../build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md)
 for how the commands fit together and how to read the comparison report.
 
 ### Running
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index f55a6ddc14f9..d3965ac307ce 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -21,7 +21,7 @@
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"clean": "rimraf --glob build dist lib bundleAnalysis bundleAnalyzerJson compareBundlesOutput \"**/*.tsbuildinfo\" \"**/*.build.log\" nyc",
-		"compare:bundles": "flub bundle collectAndCompare",
+		"compare:bundles": "flub generate bundleAnalysisReposWithComparison",
 		"eslint": "eslint --quiet --format stylish src",
 		"eslint:fix": "eslint --quiet --format stylish src --fix --fix-type problem,suggestion,layout",
 		"explore:tree": "fluid-build . --task webpack && source-map-explorer ./build/sharedTree.js --html bundleAnalysis/reportTree.html",
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 973b69eadc22..199493572e90 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -146,8 +146,8 @@ packages:
   - "!**/bundleAnalysis/**"
 
   # exclude the inner FluidFramework enlistment used by examples/utils/bundle-size-tests for
-  # cross-revision bundle comparison (see `flub bundle collectAndCompare`, which clones the
-  # inner repo into <outputDir>/base-repo).
+  # cross-revision bundle comparison (see `flub generate bundleAnalysisReposWithComparison`, which clones
+  # the inner repo into <outputDir>/base-repo).
   - "!**/compareBundlesOutput/**"
 
   # exclude any package.json files that are inside src or output directories

From 3b50cf46aa4b71ca260af4ac63b9b6002fc04104 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 19 Jun 2026 09:39:54 -0700
Subject: [PATCH 65/67] chore(build-cli): remove spurious changes from bundle
 tooling

- eslint.config.mts: drop the leftover projectService override block, orphaned after the bundle scripts (and tsconfig.scripts.json) moved out of the package.

- pnpm-lock.yaml: revert incidental semver 7.7.3 -> 7.7.4 drift under @arethetypeswrong/core (a transitive dep nothing in this PR touches).

- package.json: remove the orphaned 'compile' fluidBuild task whose build:scripts dependency was already deleted.

- bundleSize/index.ts: stop re-exporting compareJsonReports, which is only used via direct import and consumed by no command through the index.

- README.md: correct the Outputs section to the actual compareBundlesOutput/ paths (analysis/<label>/, root reports, base-repo/).
---
 .../build-cli/src/library/bundleSize/index.ts     |  2 +-
 examples/utils/bundle-size-tests/README.md        | 15 +++++++++------
 .../utils/bundle-size-tests/eslint.config.mts     |  9 ---------
 examples/utils/bundle-size-tests/package.json     |  6 ------
 pnpm-lock.yaml                                    |  2 +-
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/build-tools/packages/build-cli/src/library/bundleSize/index.ts b/build-tools/packages/build-cli/src/library/bundleSize/index.ts
index 41c3c5fc8fb6..8e4cf85ea6dd 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/index.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/index.ts
@@ -9,7 +9,7 @@ export {
 } from "./collectAndCompareBundles.js";
 export { type CollectBundleOptions, collectBundle } from "./collectBundle.js";
 export { type CompareBundlesOptions, compareBundles } from "./compareBundles.js";
-export { compareJsonReports, compareJsonReportsByPackage } from "./compareJsonReports.js";
+export { compareJsonReportsByPackage } from "./compareJsonReports.js";
 export { extractAnalyzerJsonsFromArtifact } from "./extractAnalyzerJsonsFromArtifact.js";
 export {
 	type ReadAnalyzerJsonsResult,
diff --git a/examples/utils/bundle-size-tests/README.md b/examples/utils/bundle-size-tests/README.md
index 06b3bb4e513a..88f7f7d6b787 100644
--- a/examples/utils/bundle-size-tests/README.md
+++ b/examples/utils/bundle-size-tests/README.md
@@ -36,13 +36,16 @@ changes, not unrelated commits that have since landed on `main`.
 
 ### Outputs
 
-- Each label's `analyzer.json` is saved under `bundleAnalysis/<label>/`
-  (gitignored). This is also where the cached base report and the inner repo
-  clone live.
-- Comparison reports (`.txt` and `.json`) are written to `compareBundlesOutput/`
-  (gitignored).
+Everything is written under `compareBundlesOutput/` (gitignored):
 
-Both directories are removed by `npm run clean`.
+- Each label's `analyzer.json` is saved under `compareBundlesOutput/analysis/<label>/`.
+- Comparison reports (`.txt` and `.json`) are written to the root of
+  `compareBundlesOutput/`.
+- The base revision is built in a scratch clone under
+  `compareBundlesOutput/base-repo/`, which is deleted automatically unless
+  `--keep-base-repo` is passed.
+
+The whole `compareBundlesOutput/` directory is removed by `npm run clean`.
 
 <!-- AUTO-GENERATED-CONTENT:START (README_FOOTER) -->
 
diff --git a/examples/utils/bundle-size-tests/eslint.config.mts b/examples/utils/bundle-size-tests/eslint.config.mts
index 6a0219e9f413..7a6d122ed2c2 100644
--- a/examples/utils/bundle-size-tests/eslint.config.mts
+++ b/examples/utils/bundle-size-tests/eslint.config.mts
@@ -8,15 +8,6 @@ import { recommended } from "@fluidframework/eslint-config-fluid/flat.mts";
 
 const config: Linter.Config[] = [
 	...recommended,
-	{
-		files: ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],
-		languageOptions: {
-			parserOptions: {
-				projectService: false,
-				project: ["./tsconfig.json", "./src/test/tsconfig.json"],
-			},
-		},
-	},
 	{
 		rules: {
 			"@typescript-eslint/consistent-type-imports": "off",
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index d3965ac307ce..67492a6c1409 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -85,12 +85,6 @@
 				"...",
 				"webpack"
 			],
-			"compile": {
-				"dependsOn": [
-					"..."
-				],
-				"script": false
-			},
 			"webpack": [
 				"^build:esnext"
 			],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b82978c2a169..4254e39ed4fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27977,7 +27977,7 @@ snapshots:
       cjs-module-lexer: 1.4.1
       fflate: 0.8.2
       lru-cache: 11.2.6
-      semver: 7.7.4
+      semver: 7.7.3
       typescript: 5.6.1-rc
       validate-npm-package-name: 5.0.1
 

From c1076d3007a45e8c253c7618bd42923746c079e7 Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 19 Jun 2026 11:04:34 -0700
Subject: [PATCH 66/67] refactor(build-cli): drop fluidFrameworkAll aggregate;
 restore jiti dep

Remove the fluidFrameworkAll aggregate entrypoint and everything that fed off it: delete examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts, its webpack entry, and the now-unneeded extensionAlias resolver config.

In compareBundles.ts, re-scope the composition buckets and the per-package breakdown to the sharedTree entrypoint, drop the two Fluid Framework buckets, and update bundleAnalysisRepoDetails.md to match.

Clarify the bucketDefinitions docstring with a plain-language description of the (app/entry) exclusion and fix the malformed '@ remarks' tag.

Restore the jiti devDependency (and its lockfile entry) to bundle-size-tests. jiti is required for eslint 9 to load the TypeScript eslint.config.mts and was over-removed alongside the script-only deps; this realigns the package with the other 173 client packages that declare it.
---
 .../docs/bundleAnalysisRepoDetails.md         | 22 ++++----
 .../src/library/bundleSize/compareBundles.ts  | 42 ++++++--------
 examples/utils/bundle-size-tests/package.json |  1 +
 .../src/fluidFrameworkAll.ts                  | 55 -------------------
 .../bundle-size-tests/webpack.config.cjs      |  8 ---
 pnpm-lock.yaml                                |  3 +
 6 files changed, 31 insertions(+), 100 deletions(-)
 delete mode 100644 examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts

diff --git a/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
index 52748a25c9b4..eec586e2a12a 100644
--- a/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
@@ -140,18 +140,18 @@ This attribution is deliberately careful:
 
 Because shared modules can't be split across entrypoints without double-counting,
 each package-level measurement is **pinned to a single real entrypoint** rather
-than summed across the whole report. SharedTree is measured from its own
-`sharedTree` bundle; the framework-wide numbers are measured from the
-`fluidFrameworkAll` aggregate bundle.
+than summed across the whole report. Every package-level table is measured from
+SharedTree's own `sharedTree` bundle.
 
 The _Bundle composition by category_ table rolls those per-package sizes up into
-headline buckets. For each pinned entrypoint it reports the bundle's total Fluid
-Framework bytes, and a companion `+ 3rd-party deps` row that also folds in every
-third-party package in that same bundle. (Third-party bytes can't be split
-between the Fluid libraries that pull them in, because the flat per-package data
-carries no dependency graph; synthetic entrypoint code is always excluded.)
+headline buckets. For the pinned `sharedTree` entrypoint it reports the bundle's
+total Fluid Framework bytes, and a companion `+ 3rd-party deps` row that also
+folds in every third-party package in that same bundle. (Third-party bytes can't
+be split between the Fluid libraries that pull them in, because the flat
+per-package data carries no dependency graph; synthetic entrypoint code is always
+excluded.)
 
 The _Per-package parsed-size comparison_ table is the full breakdown for the
-`fluidFrameworkAll` aggregate bundle: one row per owning package, sorted by
-current size descending, so the biggest contributors — and the biggest movers —
-are easy to find.
+`sharedTree` bundle: one row per owning package, sorted by current size
+descending, so the biggest contributors — and the biggest movers — are easy to
+find.
diff --git a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
index e224b712fc2c..de814ac8b761 100644
--- a/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
+++ b/build-tools/packages/build-cli/src/library/bundleSize/compareBundles.ts
@@ -74,9 +74,8 @@ interface ComparisonReport {
 	 */
 	packageBuckets: ComparisonRow[];
 	/**
-	 * Full per-package breakdown (one row per owning package, sorted by current
-	 * size descending), scoped to the `fluidFrameworkAll` aggregate entrypoint and
-	 * deduplicated by module.
+	 * Full per-package breakdown. Format: one row per owning package, sorted by current
+	 * size descending.
 	 */
 	packages: ComparisonRow[];
 }
@@ -233,8 +232,6 @@ function accumulatePackageSizes(assets: AnalyzerNode[]): Map<string, number> {
 
 /** Named entrypoint assets the buckets and per-package breakdown are measured from. */
 const entrypointAssets = {
-	/** Entrypoint asset for the full deduplicated Fluid Framework footprint (`bundle-size-tests/src/fluidFrameworkAll.ts`). */
-	fluidFrameworkAll: "fluidFrameworkAll.js",
 	/** Entrypoint asset for SharedTree's own bundle (`bundle-size-tests/src/sharedTree.ts`). */
 	sharedTree: "sharedTree.js",
 } as const;
@@ -273,7 +270,7 @@ function isFluidPackage(name: string): boolean {
 	return name.startsWith("@fluidframework/") || name.startsWith("@fluid-");
 }
 
-/** Whether a package's bytes are third-party (not a Fluid library, not synthetic entrypoint code). */
+/** Whether a package's bytes are third-party (not a Fluid library, and not the entry file's own `(app/entry)` code). */
 function isThirdPartyPackage(name: string): boolean {
 	return !isFluidPackage(name) && name !== "(app/entry)";
 }
@@ -294,14 +291,17 @@ interface BucketDefinition {
 
 /**
  * Headline buckets, each pinned to a real entrypoint — never summed across
- * entrypoints, which would double-count shared modules. SharedTree is measured
- * from its own `sharedTree` bundle; Fluid Framework from the `fluidFrameworkAll`
- * aggregate bundle. Each bucket counts every Fluid Framework package in its
- * bundle (the entrypoint's full Fluid footprint, not just one package); a
- * `+ 3rd-party deps` row also folds in every third-party package in that same
- * bundle. Third-party bytes can't be split between libraries (the flat
- * per-package data has no dependency graph). Synthetic entrypoint code is always
- * excluded (see {@link isThirdPartyPackage}).
+ * entrypoints, which would double-count shared modules. Each bucket sums every
+ * Fluid Framework package in its bundle (the entrypoint's full Fluid footprint,
+ * not just one package); the companion `+ 3rd-party deps` bucket additionally
+ * folds in every third-party package in that same bundle.
+ *
+ * @remarks
+ * Third-party bytes can't be split between the libraries that pull them in as the flat
+ * per-package data has no dependency graph. The entry file's own code — the small
+ * `bundle-size-tests` module that imports the package being measured, reported
+ * as `(app/entry)` — is never counted, since it isn't shipped library code (see
+ * {@link isThirdPartyPackage}).
  */
 const bucketDefinitions: readonly BucketDefinition[] = [
 	{
@@ -314,22 +314,12 @@ const bucketDefinitions: readonly BucketDefinition[] = [
 		asset: entrypointAssets.sharedTree,
 		withThirdParty: false,
 	},
-	{
-		label: "Fluid Framework + 3rd-party deps",
-		asset: entrypointAssets.fluidFrameworkAll,
-		withThirdParty: true,
-	},
-	{
-		label: "Fluid Framework",
-		asset: entrypointAssets.fluidFrameworkAll,
-		withThirdParty: false,
-	},
 ];
 
 /**
  * Computes the per-package outputs from the raw nodes: the headline composition
  * buckets ({@link bucketDefinitions}) and the full per-package breakdown for the
- * `fluidFrameworkAll` aggregate entrypoint. Both derive from the same
+ * `sharedTree` entrypoint. Both derive from the same
  * entrypoint-scoped, diffed per-package rows, so each asset's rows are computed
  * once (memoized) and reused across every bucket that references it and the full
  * breakdown. Each bucket sums its bundle's Fluid packages (plus third-party deps
@@ -366,7 +356,7 @@ function comparePackages(
 
 	return {
 		packageBuckets,
-		packages: rowsForAsset(entrypointAssets.fluidFrameworkAll),
+		packages: rowsForAsset(entrypointAssets.sharedTree),
 	};
 }
 
diff --git a/examples/utils/bundle-size-tests/package.json b/examples/utils/bundle-size-tests/package.json
index 67492a6c1409..b1fbcf283f43 100644
--- a/examples/utils/bundle-size-tests/package.json
+++ b/examples/utils/bundle-size-tests/package.json
@@ -64,6 +64,7 @@
 		"@types/mocha": "^10.0.10",
 		"@types/node": "catalog:types",
 		"eslint": "catalog:eslint",
+		"jiti": "^2.6.1",
 		"mocha": "^11.7.5",
 		"puppeteer": "^23.6.0",
 		"rimraf": "^6.1.3",
diff --git a/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts b/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts
deleted file mode 100644
index c92704250e4c..000000000000
--- a/examples/utils/bundle-size-tests/src/fluidFrameworkAll.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { apisToBundle as aqueduct } from "./aqueduct.js";
-import { apisToBundle as azureClient } from "./azureClient.js";
-import { apisToBundle as connectionState } from "./connectionState.js";
-import { apisToBundle as containerRuntime } from "./containerRuntimeBundle.js";
-import { apisToBundle as experimentalSharedTree } from "./experimentalSharedTree.js";
-import { apisToBundle as fluidFramework } from "./fluidFramework.js";
-import { apisToBundle as loader } from "./loader.js";
-import { apisToBundle as odspClient } from "./odspClient.js";
-import { apisToBundle as odspDriver } from "./odspDriver.js";
-import { apisToBundle as odspPrefetchSnapshot } from "./odspPrefetchSnapshot.js";
-import { apisToBundle as sharedDirectory } from "./sharedDirectory.js";
-import { apisToBundle as sharedMap } from "./sharedMap.js";
-import { apisToBundle as sharedMatrix } from "./sharedMatrix.js";
-import { apisToBundle as sharedString } from "./sharedString.js";
-import { apisToBundle as sharedTree } from "./sharedTree.js";
-import { apisToBundle as sharedTreeAttributes } from "./sharedTreeAttributes.js";
-
-/**
- * Aggregate entrypoint that pulls in every other bundle-size-tests entrypoint so
- * webpack emits a single chunk containing the deduplicated union of all of them.
- *
- * Summing the individual per-entrypoint asset sizes double-counts any module
- * shared between entrypoints, so it cannot yield a real total. This entrypoint
- * lets webpack dedupe shared modules exactly once while still tree-shaking away
- * anything none of the entrypoints actually use, giving a single
- * customer-representative "full Fluid Framework footprint" number.
- *
- * `debugAssert` is intentionally excluded: it is a side-effect-only module that
- * throws at evaluation time and exposes no `apisToBundle` to invoke.
- */
-export function apisToBundle(): void {
-	// Reference every entrypoint so none of them are tree-shaken out of this
-	// aggregate bundle. The return values are intentionally unused.
-	aqueduct();
-	azureClient();
-	connectionState();
-	containerRuntime();
-	experimentalSharedTree();
-	fluidFramework();
-	loader();
-	odspClient();
-	odspDriver();
-	odspPrefetchSnapshot();
-	sharedDirectory();
-	sharedMap();
-	sharedMatrix();
-	sharedString();
-	sharedTree();
-	sharedTreeAttributes();
-}
diff --git a/examples/utils/bundle-size-tests/webpack.config.cjs b/examples/utils/bundle-size-tests/webpack.config.cjs
index 80af422015fb..f33c45a30b8e 100644
--- a/examples/utils/bundle-size-tests/webpack.config.cjs
+++ b/examples/utils/bundle-size-tests/webpack.config.cjs
@@ -74,7 +74,6 @@ module.exports = {
 		directory: "./src/sharedDirectory",
 		experimentalSharedTree: "./src/experimentalSharedTree",
 		fluidFramework: "./src/fluidFramework",
-		fluidFrameworkAll: "./src/fluidFrameworkAll",
 		loader: "./src/loader",
 		map: "./src/sharedMap",
 		matrix: "./src/sharedMatrix",
@@ -91,13 +90,6 @@ module.exports = {
 	},
 	resolve: {
 		extensions: [".tsx", ".ts", ".js"],
-		// This package is an ESM package ("type": "module") compiled with node16 module
-		// resolution, so its relative imports carry explicit `.js` extensions (e.g.
-		// fluidFrameworkAll.ts importing "./sharedTree.js"). Map those back to the `.ts`
-		// sources so webpack's resolver can find them.
-		extensionAlias: {
-			".js": [".ts", ".js"],
-		},
 		// Block the Node-core `assert` polyfill from being bundled. It's very large in browser
 		// builds; consumers should use the assert API in @fluidframework/core-utils instead.
 		fallback: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4254e39ed4fd..517c5ab34cfb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4865,6 +4865,9 @@ importers:
       eslint:
         specifier: catalog:eslint
         version: 9.39.1(jiti@2.6.1)
+      jiti:
+        specifier: ^2.6.1
+        version: 2.6.1
       mocha:
         specifier: ^11.7.5
         version: 11.7.5

From a747d1fd4ea7afaa810316b3b3ccf842928b62ff Mon Sep 17 00:00:00 2001
From: Tommy Brosman <tbrosman@microsoft.com>
Date: Fri, 19 Jun 2026 11:59:58 -0700
Subject: [PATCH 67/67] refactor(build-cli): trim bundle-analysis command flags
 to defaults

Remove the --analysis-dir, --output-dir, --force-clean-build, and --label flags from the bundle-analysis commands (generate bundleAnalysisRepo, generate bundleAnalysisReposWithComparison, check bundleAnalysisReposComparison). Each command now derives its paths from --package-dir and the fixed compareBundlesOutput convention (per-label analyzer stats under compareBundlesOutput/analysis/<label>/, reports at compareBundlesOutput/), always builds without the workspace clean, and lets labels be auto-generated.

Keep --base-label/--current-label on the compare command, since pairing specific labels is needed for other workflows.

Define the 'label' concept in bundleAnalysisRepoDetails.md (the subdirectory each collected bundle's analyzer.json lands in) and make the collect command's --revision/--merge-base help self-explanatory now that --label is gone.

Fix a stale --force-clean-build example and regenerate the command docs.
---
 .../docs/bundleAnalysisRepoDetails.md         | 11 ++++-
 build-tools/packages/build-cli/docs/check.md  | 20 ++++------
 .../packages/build-cli/docs/generate.md       | 40 +++++--------------
 .../check/bundleAnalysisReposComparison.ts    | 24 ++++-------
 .../commands/generate/bundleAnalysisRepo.ts   | 32 +++------------
 .../bundleAnalysisReposWithComparison.ts      | 31 ++------------
 6 files changed, 45 insertions(+), 113 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
index eec586e2a12a..d72956dacf5d 100644
--- a/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
+++ b/build-tools/packages/build-cli/docs/bundleAnalysisRepoDetails.md
@@ -17,6 +17,13 @@ to read the comparison report.
 | `flub check bundleAnalysisReposComparison`        | Diff two already-collected bundles and write the report.         |
 | `flub generate bundleAnalysisReposWithComparison` | Orchestrate both collect steps plus the compare step end-to-end. |
 
+Each collected bundle is identified by a **label** — the name of the subdirectory
+under `compareBundlesOutput/analysis/` where that bundle's `analyzer.json` is written.
+`flub generate bundleAnalysisRepo` assigns the label automatically: the sanitized
+revision it built in revision mode, or a timestamped `current_<epoch>` for the
+local working tree. `flub check bundleAnalysisReposComparison` then selects which
+two saved bundles to diff by their labels (`--base-label` and `--current-label`).
+
 Each command self-describes its flags via `--help`:
 
 ```sh
@@ -79,9 +86,9 @@ rebuild.
 
 ## Outputs
 
-- Each label's `analyzer.json` is saved under `<analysis-dir>/<label>/`. This is
+- Each label's `analyzer.json` is saved under `compareBundlesOutput/analysis/<label>/`. This is
   also where the cached base report and the inner repo clone live.
-- Comparison reports (`.txt` and `.json`) are written to the output directory.
+- Comparison reports (`.txt` and `.json`) are written to `compareBundlesOutput/`.
 
 ## Understanding the report
 
diff --git a/build-tools/packages/build-cli/docs/check.md b/build-tools/packages/build-cli/docs/check.md
index 518513b639c2..cc089378e106 100644
--- a/build-tools/packages/build-cli/docs/check.md
+++ b/build-tools/packages/build-cli/docs/check.md
@@ -74,19 +74,15 @@ Compare the two bundles previously collected by 'flub generate bundleAnalysisRep
 
 ```
 USAGE
-  $ flub check bundleAnalysisReposComparison [-v | --quiet] [--analysis-dir <value>] [--output-dir <value>] [--base-label <value>]
-    [--current-label <value>]
+  $ flub check bundleAnalysisReposComparison [-v | --quiet] [--base-label <value>] [--current-label <value>]
 
 FLAGS
-  --analysis-dir=<value>   [default: ./compareBundlesOutput/analysis] Parent directory containing analyzer.json files at
-                           {label}/analyzer.json.
-  --base-label=<value>     [default: main] Label subdirectory under --analysis-dir holding the base-side bundle stats.
-                           Must match the --label passed to 'flub generate bundleAnalysisRepo' in revision mode.
-  --current-label=<value>  [default: current] Label subdirectory under --analysis-dir holding the current-side bundle
-                           stats. Must match the --label passed to 'flub generate bundleAnalysisRepo' in local mode (the
-                           orchestrator passes a timestamped label like 'current_<epoch>').
-  --output-dir=<value>     [default: ./compareBundlesOutput] Directory where the .txt and .json comparison reports are
-                           written.
+  --base-label=<value>     [default: main] Label subdirectory under compareBundlesOutput/analysis holding the base-side
+                           bundle stats. Matches the label 'flub generate bundleAnalysisRepo' saves in revision mode
+                           (the sanitized revision).
+  --current-label=<value>  [default: current] Label subdirectory under compareBundlesOutput/analysis holding the
+                           current-side bundle stats. Matches the label 'flub generate bundleAnalysisRepo' saves in
+                           local mode (a timestamped 'current_<epoch>').
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
@@ -103,8 +99,6 @@ EXAMPLES
   $ flub check bundleAnalysisReposComparison
 
   $ flub check bundleAnalysisReposComparison --base-label some-revision
-
-  $ flub check bundleAnalysisReposComparison --analysis-dir /some/other/path
 ```
 
 _See code: [src/commands/check/bundleAnalysisReposComparison.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts)_
diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index fc3420b3a4cb..a37f72b78b71 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -126,24 +126,17 @@ Build and collect a bundle, either from the outer enlistment (local mode) or fro
 
 ```
 USAGE
-  $ flub generate bundleAnalysisRepo [-v | --quiet] [--revision <value> | --merge-base <value>] [--label <value>] [--package-dir
-    <value>] [--analysis-dir <value>] [--force-clean-build]
+  $ flub generate bundleAnalysisRepo [-v | --quiet] [--revision <value> | --merge-base <value>] [--package-dir <value>]
 
 FLAGS
-  --analysis-dir=<value>  Directory under which per-label analyzer stats are saved. Defaults to
-                          <package-dir>/compareBundlesOutput/analysis.
-  --force-clean-build     Run the full workspace clean ('npm run clean' at the repo root) before building. Off by
-                          default; opt in when stale incremental build state from a previous revision may interfere with
-                          the current one.
-  --label=<value>         Override the directory name under which bundle stats are saved. Defaults to the sanitized
-                          revision in revision mode, or a timestamped "current_<epoch>" in local mode.
-  --merge-base=<value>    Collect a bundle for the merge-base of HEAD and this committish (the fork point). Selects
-                          revision mode and is mutually exclusive with --revision. Also used as the default label.
-  --package-dir=<value>   [default: .] Package root whose webpack bundles are built and whose analyzer.json is
-                          collected.
-  --revision=<value>      Collect a bundle for this committish (branch, tag, commit SHA, or any committish like HEAD~2),
-                          resolved as-is via 'git rev-parse'. Selects revision mode and is mutually exclusive with
-                          --merge-base; omit both to collect the local working tree. Also used as the default label.
+  --merge-base=<value>   Collect a bundle for the merge-base of HEAD and this committish (the fork point). Selects
+                         revision mode and is mutually exclusive with --revision. Also used as the label (the
+                         subdirectory name the bundle's stats are saved under).
+  --package-dir=<value>  [default: .] Package root whose webpack bundles are built and whose analyzer.json is collected.
+  --revision=<value>     Collect a bundle for this committish (branch, tag, commit SHA, or any committish like HEAD~2),
+                         resolved as-is via 'git rev-parse'. Selects revision mode and is mutually exclusive with
+                         --merge-base; omit both to collect the local working tree. Also used as the label (the
+                         subdirectory name the bundle's stats are saved under).
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
@@ -175,13 +168,9 @@ Collect the local bundle and the base-revision (merge-base) bundle, then compare
 ```
 USAGE
   $ flub generate bundleAnalysisReposWithComparison [-v | --quiet] [--base-revision <value>] [--exact-base] [--package-dir <value>]
-    [--analysis-dir <value>] [--output-dir <value>] [--force-clean-build] [--keep-base-repo]
+    [--keep-base-repo]
 
 FLAGS
-  --analysis-dir=<value>
-      Directory under which per-label analyzer stats are saved. Defaults to an 'analysis' subdirectory of the output
-      directory (e.g. <package-dir>/compareBundlesOutput/analysis).
-
   --base-revision=<value>
       Revision to use as the comparison baseline (branch, tag, or commit SHA). The actual base used is the merge-base of
       HEAD and this revision (the fork point), so worktree-based setups where 'main' is in an unusual location still
@@ -193,18 +182,11 @@ FLAGS
       Use --base-revision exactly as given (resolved via 'git rev-parse') instead of taking the merge-base with HEAD.
       Useful for comparing the working tree against a specific commit, e.g. the current commit's parent.
 
-  --force-clean-build
-      Run the full workspace clean before each build. Off by default; opt in when stale incremental build state may
-      interfere with the current revision.
-
   --keep-base-repo
       For debugging only: keep the inner base-repo clone after collecting the base bundle. By default the inner repo is
       deleted once stats are saved, since it can be re-created cheaply via shallow clone on the next run. Pass this flag
       to inspect the inner repo's working tree or build output (e.g. when a build is failing inside the inner repo).
 
-  --output-dir=<value>
-      Directory where the comparison reports are written. Defaults to <package-dir>/compareBundlesOutput.
-
   --package-dir=<value>
       [default: .] Package root whose webpack bundles are built and compared.
 
@@ -228,7 +210,7 @@ EXAMPLES
 
   $ flub generate bundleAnalysisReposWithComparison --base-revision 18062854f25 --exact-base
 
-  $ flub generate bundleAnalysisReposWithComparison --force-clean-build --keep-base-repo
+  $ flub generate bundleAnalysisReposWithComparison --keep-base-repo
 ```
 
 _See code: [src/commands/generate/bundleAnalysisReposWithComparison.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts)_
diff --git a/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts b/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
index 0641face6011..25147a00c981 100644
--- a/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
+++ b/build-tools/packages/build-cli/src/commands/check/bundleAnalysisReposComparison.ts
@@ -25,29 +25,20 @@ export default class CheckBundleAnalysisReposComparison extends BaseCommand<
 	public static readonly examples = [
 		"<%= config.bin %> <%= command.id %>",
 		"<%= config.bin %> <%= command.id %> --base-label some-revision",
-		"<%= config.bin %> <%= command.id %> --analysis-dir /some/other/path",
 	];
 
 	public static readonly flags = {
-		"analysis-dir": Flags.string({
-			description: "Parent directory containing analyzer.json files at {label}/analyzer.json.",
-			default: "./compareBundlesOutput/analysis",
-		}),
-		"output-dir": Flags.string({
-			description: "Directory where the .txt and .json comparison reports are written.",
-			default: "./compareBundlesOutput",
-		}),
 		"base-label": Flags.string({
 			description:
-				"Label subdirectory under --analysis-dir holding the base-side bundle stats. " +
-				"Must match the --label passed to 'flub generate bundleAnalysisRepo' in revision mode.",
+				"Label subdirectory under compareBundlesOutput/analysis holding the base-side bundle stats. " +
+				"Matches the label 'flub generate bundleAnalysisRepo' saves in revision mode (the sanitized revision).",
 			default: "main",
 		}),
 		"current-label": Flags.string({
 			description:
-				"Label subdirectory under --analysis-dir holding the current-side bundle stats. " +
-				"Must match the --label passed to 'flub generate bundleAnalysisRepo' in local mode (the " +
-				"orchestrator passes a timestamped label like 'current_<epoch>').",
+				"Label subdirectory under compareBundlesOutput/analysis holding the current-side bundle stats. " +
+				"Matches the label 'flub generate bundleAnalysisRepo' saves in local mode (a timestamped " +
+				"'current_<epoch>').",
 			default: "current",
 		}),
 		...BaseCommand.flags,
@@ -55,9 +46,10 @@ export default class CheckBundleAnalysisReposComparison extends BaseCommand<
 
 	public async run(): Promise<void> {
 		const { flags } = this;
+		const outputDir = resolve("compareBundlesOutput");
 		compareBundles({
-			analysisDirectory: resolve(flags["analysis-dir"]),
-			outputDirectory: resolve(flags["output-dir"]),
+			analysisDirectory: resolve(outputDir, "analysis"),
+			outputDirectory: outputDir,
 			baseLabel: flags["base-label"],
 			currentLabel: flags["current-label"],
 		});
diff --git a/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
index 4078ea03951c..33e1a895ded8 100644
--- a/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisRepo.ts
@@ -12,7 +12,8 @@ import { BaseCommand } from "../../library/commands/base.js";
 /**
  * Builds and collects a single bundle, either from the outer enlistment (local mode) or from a
  * separate inner enlistment checked out to a specific revision (revision mode). The collected
- * webpack-bundle-analyzer report is saved under `<analysis-dir>/<label>/analyzer.json` for later
+ * webpack-bundle-analyzer report is saved under
+ * `<package-dir>/compareBundlesOutput/analysis/<label>/analyzer.json` for later
  * comparison by `flub check bundleAnalysisReposComparison`.
  */
 export default class GenerateBundleAnalysisRepo extends BaseCommand<
@@ -37,38 +38,21 @@ export default class GenerateBundleAnalysisRepo extends BaseCommand<
 				"Collect a bundle for this committish (branch, tag, commit SHA, or any committish " +
 				"like HEAD~2), resolved as-is via 'git rev-parse'. Selects revision mode and is " +
 				"mutually exclusive with --merge-base; omit both to collect the local working tree. " +
-				"Also used as the default label.",
+				"Also used as the label (the subdirectory name the bundle's stats are saved under).",
 			exclusive: ["merge-base"],
 		}),
 		"merge-base": Flags.string({
 			description:
 				"Collect a bundle for the merge-base of HEAD and this committish (the fork point). " +
 				"Selects revision mode and is mutually exclusive with --revision. Also used as the " +
-				"default label.",
+				"label (the subdirectory name the bundle's stats are saved under).",
 			exclusive: ["revision"],
 		}),
-		label: Flags.string({
-			description:
-				"Override the directory name under which bundle stats are saved. Defaults to the " +
-				'sanitized revision in revision mode, or a timestamped "current_<epoch>" in local mode.',
-		}),
 		"package-dir": Flags.string({
 			description:
 				"Package root whose webpack bundles are built and whose analyzer.json is collected.",
 			default: ".",
 		}),
-		"analysis-dir": Flags.string({
-			description:
-				"Directory under which per-label analyzer stats are saved. Defaults to " +
-				"<package-dir>/compareBundlesOutput/analysis.",
-		}),
-		"force-clean-build": Flags.boolean({
-			description:
-				"Run the full workspace clean ('npm run clean' at the repo root) before building. " +
-				"Off by default; opt in when stale incremental build state from a previous revision " +
-				"may interfere with the current one.",
-			default: false,
-		}),
 		...BaseCommand.flags,
 	} as const;
 
@@ -76,14 +60,10 @@ export default class GenerateBundleAnalysisRepo extends BaseCommand<
 		const { flags } = this;
 
 		const packageDir = resolve(flags["package-dir"]);
-		const analysisDir =
-			flags["analysis-dir"] === undefined
-				? resolve(packageDir, "compareBundlesOutput", "analysis")
-				: resolve(flags["analysis-dir"]);
+		const analysisDir = resolve(packageDir, "compareBundlesOutput", "analysis");
 
 		const common = {
-			label: flags.label,
-			forceCleanBuild: flags["force-clean-build"],
+			forceCleanBuild: false,
 			packageDir,
 			analysisDir,
 		};
diff --git a/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
index 1056b2f55cb1..77bda21328d8 100644
--- a/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/bundleAnalysisReposWithComparison.ts
@@ -26,7 +26,7 @@ export default class GenerateBundleAnalysisReposWithComparison extends BaseComma
 		"<%= config.bin %> <%= command.id %> --base-revision main",
 		"<%= config.bin %> <%= command.id %> --base-revision client_v2.100.0",
 		"<%= config.bin %> <%= command.id %> --base-revision 18062854f25 --exact-base",
-		"<%= config.bin %> <%= command.id %> --force-clean-build --keep-base-repo",
+		"<%= config.bin %> <%= command.id %> --keep-base-repo",
 	];
 
 	public static readonly flags = {
@@ -52,23 +52,6 @@ export default class GenerateBundleAnalysisReposWithComparison extends BaseComma
 			description: "Package root whose webpack bundles are built and compared.",
 			default: ".",
 		}),
-		"analysis-dir": Flags.string({
-			description:
-				"Directory under which per-label analyzer stats are saved. Defaults to an " +
-				"'analysis' subdirectory of the output directory (e.g. " +
-				"<package-dir>/compareBundlesOutput/analysis).",
-		}),
-		"output-dir": Flags.string({
-			description:
-				"Directory where the comparison reports are written. Defaults to " +
-				"<package-dir>/compareBundlesOutput.",
-		}),
-		"force-clean-build": Flags.boolean({
-			description:
-				"Run the full workspace clean before each build. Off by default; opt in when stale " +
-				"incremental build state may interfere with the current revision.",
-			default: false,
-		}),
 		"keep-base-repo": Flags.boolean({
 			description:
 				"For debugging only: keep the inner base-repo clone after collecting the base " +
@@ -85,19 +68,13 @@ export default class GenerateBundleAnalysisReposWithComparison extends BaseComma
 		const { flags } = this;
 
 		const packageDir = resolve(flags["package-dir"]);
-		const outputDir =
-			flags["output-dir"] === undefined
-				? resolve(packageDir, "compareBundlesOutput")
-				: resolve(flags["output-dir"]);
-		const analysisDir =
-			flags["analysis-dir"] === undefined
-				? resolve(outputDir, "analysis")
-				: resolve(flags["analysis-dir"]);
+		const outputDir = resolve(packageDir, "compareBundlesOutput");
+		const analysisDir = resolve(outputDir, "analysis");
 
 		await collectAndCompareBundles({
 			baseRevision: flags["base-revision"],
 			exactBase: flags["exact-base"],
-			forceCleanBuild: flags["force-clean-build"],
+			forceCleanBuild: false,
 			keepBaseRepo: flags["keep-base-repo"],
 			packageDir,
 			analysisDir,