From 925535141c24842ab686c1da7a23fabdf95fa868 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 17:37:58 +0000
Subject: [PATCH 1/6] Initial plan


From 5457c7d97d02b40bb5ce849a8c03e8c015700f11 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 17:45:01 +0000
Subject: [PATCH 2/6] Swap changelog command implementations and mark vnext as
 deprecated

Co-authored-by: tylerbutler <19589+tylerbutler@users.noreply.github.com>
---
 .../src/commands/generate/changelog.ts        | 132 +++++-------------
 .../src/commands/vnext/generate/changelog.ts  | 131 ++++++++++++-----
 2 files changed, 136 insertions(+), 127 deletions(-)

diff --git a/build-tools/packages/build-cli/src/commands/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/generate/changelog.ts
index 74959339b308..9c864ac9a322 100644
--- a/build-tools/packages/build-cli/src/commands/generate/changelog.ts
+++ b/build-tools/packages/build-cli/src/commands/generate/changelog.ts
@@ -3,49 +3,40 @@
  * Licensed under the MIT License.
  */
 
-import { readFile, writeFile } from "node:fs/promises";
-import {
-	type VersionBumpType,
-	bumpVersionScheme,
-	isInternalVersionScheme,
-} from "@fluid-tools/version-tools";
-import { FluidRepo, type Package } from "@fluidframework/build-tools";
 import { ux } from "@oclif/core";
 import { command as execCommand } from "execa";
-import { inc } from "semver";
-import { CleanOptions } from "simple-git";
+import { parse } from "semver";
 
-import { checkFlags, releaseGroupFlag, semverFlag } from "../../flags.js";
+import { setVersion } from "@fluid-tools/build-infrastructure";
+import { releaseGroupNameFlag, semverFlag } from "../../flags.js";
+// eslint-disable-next-line import/no-internal-modules
+import { updateChangelogs } from "../../library/changelogs.js";
 // eslint-disable-next-line import/no-internal-modules
 import { canonicalizeChangesets } from "../../library/changesets.js";
-import { BaseCommand } from "../../library/index.js";
-import { isReleaseGroup } from "../../releaseGroups.js";
-
-async function replaceInFile(
-	search: string,
-	replace: string,
-	filePath: string,
-): Promise<void> {
-	const content = await readFile(filePath, "utf8");
-	const newContent = content.replace(new RegExp(search, "g"), replace);
-	await writeFile(filePath, newContent, "utf8");
-}
-
-export default class GenerateChangeLogCommand extends BaseCommand<
+import { BaseCommandWithBuildProject } from "../../library/index.js";
+
+/**
+ * Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+ *
+ * The reason we use a search/replace approach to update the version strings in the changelogs is largely because of
+ * https://github.com/changesets/changesets/issues/595. What we would like to do is generate the changelogs without
+ * doing version bumping, but that feature does not exist in the changeset tools.
+ */
+export default class GenerateChangeLogCommand extends BaseCommandWithBuildProject<
 	typeof GenerateChangeLogCommand
 > {
-	static readonly description = "Generate a changelog for packages based on changesets.";
+	static readonly description =
+		"Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!";
+
+	static readonly aliases = ["vnext:generate:changelogs"];
 
 	static readonly flags = {
-		releaseGroup: releaseGroupFlag({
-			required: true,
-		}),
+		releaseGroup: releaseGroupNameFlag({ required: true }),
 		version: semverFlag({
 			description:
 				"The version for which to generate the changelog. If this is not provided, the version of the package according to package.json will be used.",
 		}),
-		install: checkFlags.install,
-		...BaseCommand.flags,
+		...BaseCommandWithBuildProject.flags,
 	} as const;
 
 	static readonly examples = [
@@ -55,51 +46,24 @@ export default class GenerateChangeLogCommand extends BaseCommand<
 		},
 	];
 
-	private async processPackage(pkg: Package, bumpType: VersionBumpType): Promise<void> {
-		const { directory, version: pkgVersion } = pkg;
-
-		// This is the version that the changesets tooling calculates by default. It does a bump of the highest semver type
-		// in the changesets on the current version. We search for that version in the generated changelog and replace it
-		// with the one that we want.
-		const changesetsCalculatedVersion = isInternalVersionScheme(pkgVersion)
-			? bumpVersionScheme(pkgVersion, bumpType, "internal")
-			: inc(pkgVersion, bumpType);
-		const versionToUse = this.flags.version?.version ?? pkgVersion;
-
-		// Replace the changeset version with the correct version.
-		await replaceInFile(
-			`## ${changesetsCalculatedVersion}\n`,
-			`## ${versionToUse}\n`,
-			`${directory}/CHANGELOG.md`,
-		);
-
-		// For changelogs that had no changesets applied to them, add in a 'dependency updates only' section.
-		await replaceInFile(
-			`## ${versionToUse}\n\n## `,
-			`## ${versionToUse}\n\nDependency updates only.\n\n## `,
-			`${directory}/CHANGELOG.md`,
-		);
-	}
-
 	public async run(): Promise<void> {
-		const context = await this.getContext();
-
-		const gitRoot = context.root;
+		const buildProject = this.getBuildProject();
 
-		const { install, releaseGroup } = this.flags;
+		const { releaseGroup: releaseGroupName, version: versionOverride } = this.flags;
 
+		const releaseGroup = buildProject.releaseGroups.get(releaseGroupName);
 		if (releaseGroup === undefined) {
-			this.error("ReleaseGroup is possibly 'undefined'");
+			this.error(`Can't find release group named '${releaseGroupName}'`, { exit: 1 });
 		}
 
-		const monorepo =
-			releaseGroup === undefined ? undefined : context.repo.releaseGroups.get(releaseGroup);
-		if (monorepo === undefined) {
-			this.error(`Release group ${releaseGroup} not found in repo config`, { exit: 1 });
+		const releaseGroupRoot = releaseGroup.workspace.directory;
+		const releaseGroupVersion = parse(releaseGroup.version);
+		if (releaseGroupVersion === null) {
+			this.error(`Version isn't a valid semver string: '${releaseGroup.version}'`, {
+				exit: 1,
+			});
 		}
 
-		const releaseGroupRoot = monorepo?.directory ?? gitRoot;
-
 		// Strips additional custom metadata from the source files before we call `changeset version`,
 		// because the changeset tools - like @changesets/cli - only work on canonical changesets.
 		const bumpType = await canonicalizeChangesets(releaseGroupRoot, this.logger);
@@ -109,32 +73,19 @@ export default class GenerateChangeLogCommand extends BaseCommand<
 		await execCommand("pnpm exec changeset version", { cwd: releaseGroupRoot });
 		ux.action.stop();
 
-		const packagesToCheck = isReleaseGroup(releaseGroup)
-			? context.packagesInReleaseGroup(releaseGroup)
-			: // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				[context.fullPackageMap.get(releaseGroup)!];
-
-		if (install) {
-			const installed = await FluidRepo.ensureInstalled(packagesToCheck);
-
-			if (!installed) {
-				this.error(`Error installing dependencies for: ${releaseGroup}`);
-			}
-		}
-
-		const repo = await context.getGitRepository();
+		const packagesToCheck = releaseGroup.packages;
 
-		// git add the deleted changesets (`changeset version` deletes them)
-		await repo.gitClient.add(".changeset/**");
+		// restore the package versions that were changed by `changeset version`
+		await setVersion(packagesToCheck, releaseGroupVersion);
 
-		// git restore the package.json files that were changed by `changeset version`
-		await repo.gitClient.raw("restore", "**package.json");
+		// Extract the version string from the SemVer object if provided
+		const versionString = versionOverride?.version;
 
 		// Calls processPackage on all packages.
 		ux.action.start("Processing changelog updates");
 		const processPromises: Promise<void>[] = [];
 		for (const pkg of packagesToCheck) {
-			processPromises.push(this.processPackage(pkg, bumpType));
+			processPromises.push(updateChangelogs(pkg, bumpType, versionString));
 		}
 		const results = await Promise.allSettled(processPromises);
 		const failures = results.filter((p) => p.status === "rejected");
@@ -146,15 +97,6 @@ export default class GenerateChangeLogCommand extends BaseCommand<
 				{ exit: 1 },
 			);
 		}
-
-		// git add the changelog changes
-		await repo.gitClient.add("**CHANGELOG.md");
-
-		// Cleanup: git restore any edits that aren't staged
-		await repo.gitClient.raw("restore", ".");
-
-		// Cleanup: git clean any untracked files
-		await repo.gitClient.clean(CleanOptions.RECURSIVE + CleanOptions.FORCE);
 		ux.action.stop();
 
 		this.log("Commit and open a PR!");
diff --git a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
index 582f7eb5523e..f271b83bce2c 100644
--- a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
+++ b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
@@ -3,40 +3,58 @@
  * Licensed under the MIT License.
  */
 
+import { readFile, writeFile } from "node:fs/promises";
+import {
+	type VersionBumpType,
+	bumpVersionScheme,
+	isInternalVersionScheme,
+} from "@fluid-tools/version-tools";
+import { FluidRepo, type Package } from "@fluidframework/build-tools";
 import { ux } from "@oclif/core";
 import { command as execCommand } from "execa";
-import { parse } from "semver";
+import { inc } from "semver";
+import { CleanOptions } from "simple-git";
 
-import { setVersion } from "@fluid-tools/build-infrastructure";
-import { releaseGroupNameFlag, semverFlag } from "../../../flags.js";
-// eslint-disable-next-line import/no-internal-modules
-import { updateChangelogs } from "../../../library/changelogs.js";
+import { checkFlags, releaseGroupFlag, semverFlag } from "../../../flags.js";
 // eslint-disable-next-line import/no-internal-modules
 import { canonicalizeChangesets } from "../../../library/changesets.js";
-import { BaseCommandWithBuildProject } from "../../../library/index.js";
+import { BaseCommand } from "../../../library/index.js";
+import { isReleaseGroup } from "../../../releaseGroups.js";
+
+async function replaceInFile(
+	search: string,
+	replace: string,
+	filePath: string,
+): Promise<void> {
+	const content = await readFile(filePath, "utf8");
+	const newContent = content.replace(new RegExp(search, "g"), replace);
+	await writeFile(filePath, newContent, "utf8");
+}
 
 /**
- * Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
- *
- * The reason we use a search/replace approach to update the version strings in the changelogs is largely because of
- * https://github.com/changesets/changesets/issues/595. What we would like to do is generate the changelogs without
- * doing version bumping, but that feature does not exist in the changeset tools.
+ * @deprecated This command is deprecated. Use 'flub generate changelog' instead.
  */
-export default class GenerateChangeLogCommand extends BaseCommandWithBuildProject<
+export default class GenerateChangeLogCommand extends BaseCommand<
 	typeof GenerateChangeLogCommand
 > {
 	static readonly description =
-		"Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!";
+		"[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.";
 
-	static readonly aliases = ["vnext:generate:changelogs"];
+	static readonly deprecateAliases = true;
+	static readonly deprecated = {
+		message: "This command is deprecated. Use 'flub generate changelog' instead.",
+	};
 
 	static readonly flags = {
-		releaseGroup: releaseGroupNameFlag({ required: true }),
+		releaseGroup: releaseGroupFlag({
+			required: true,
+		}),
 		version: semverFlag({
 			description:
 				"The version for which to generate the changelog. If this is not provided, the version of the package according to package.json will be used.",
 		}),
-		...BaseCommandWithBuildProject.flags,
+		install: checkFlags.install,
+		...BaseCommand.flags,
 	} as const;
 
 	static readonly examples = [
@@ -46,24 +64,51 @@ export default class GenerateChangeLogCommand extends BaseCommandWithBuildProjec
 		},
 	];
 
+	private async processPackage(pkg: Package, bumpType: VersionBumpType): Promise<void> {
+		const { directory, version: pkgVersion } = pkg;
+
+		// This is the version that the changesets tooling calculates by default. It does a bump of the highest semver type
+		// in the changesets on the current version. We search for that version in the generated changelog and replace it
+		// with the one that we want.
+		const changesetsCalculatedVersion = isInternalVersionScheme(pkgVersion)
+			? bumpVersionScheme(pkgVersion, bumpType, "internal")
+			: inc(pkgVersion, bumpType);
+		const versionToUse = this.flags.version?.version ?? pkgVersion;
+
+		// Replace the changeset version with the correct version.
+		await replaceInFile(
+			`## ${changesetsCalculatedVersion}\n`,
+			`## ${versionToUse}\n`,
+			`${directory}/CHANGELOG.md`,
+		);
+
+		// For changelogs that had no changesets applied to them, add in a 'dependency updates only' section.
+		await replaceInFile(
+			`## ${versionToUse}\n\n## `,
+			`## ${versionToUse}\n\nDependency updates only.\n\n## `,
+			`${directory}/CHANGELOG.md`,
+		);
+	}
+
 	public async run(): Promise<void> {
-		const buildProject = this.getBuildProject();
+		const context = await this.getContext();
+
+		const gitRoot = context.root;
 
-		const { releaseGroup: releaseGroupName, version: versionOverride } = this.flags;
+		const { install, releaseGroup } = this.flags;
 
-		const releaseGroup = buildProject.releaseGroups.get(releaseGroupName);
 		if (releaseGroup === undefined) {
-			this.error(`Can't find release group named '${releaseGroupName}'`, { exit: 1 });
+			this.error("ReleaseGroup is possibly 'undefined'");
 		}
 
-		const releaseGroupRoot = releaseGroup.workspace.directory;
-		const releaseGroupVersion = parse(releaseGroup.version);
-		if (releaseGroupVersion === null) {
-			this.error(`Version isn't a valid semver string: '${releaseGroup.version}'`, {
-				exit: 1,
-			});
+		const monorepo =
+			releaseGroup === undefined ? undefined : context.repo.releaseGroups.get(releaseGroup);
+		if (monorepo === undefined) {
+			this.error(`Release group ${releaseGroup} not found in repo config`, { exit: 1 });
 		}
 
+		const releaseGroupRoot = monorepo?.directory ?? gitRoot;
+
 		// Strips additional custom metadata from the source files before we call `changeset version`,
 		// because the changeset tools - like @changesets/cli - only work on canonical changesets.
 		const bumpType = await canonicalizeChangesets(releaseGroupRoot, this.logger);
@@ -73,19 +118,32 @@ export default class GenerateChangeLogCommand extends BaseCommandWithBuildProjec
 		await execCommand("pnpm exec changeset version", { cwd: releaseGroupRoot });
 		ux.action.stop();
 
-		const packagesToCheck = releaseGroup.packages;
+		const packagesToCheck = isReleaseGroup(releaseGroup)
+			? context.packagesInReleaseGroup(releaseGroup)
+			: // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				[context.fullPackageMap.get(releaseGroup)!];
 
-		// restore the package versions that were changed by `changeset version`
-		await setVersion(packagesToCheck, releaseGroupVersion);
+		if (install) {
+			const installed = await FluidRepo.ensureInstalled(packagesToCheck);
 
-		// Extract the version string from the SemVer object if provided
-		const versionString = versionOverride?.version;
+			if (!installed) {
+				this.error(`Error installing dependencies for: ${releaseGroup}`);
+			}
+		}
+
+		const repo = await context.getGitRepository();
+
+		// git add the deleted changesets (`changeset version` deletes them)
+		await repo.gitClient.add(".changeset/**");
+
+		// git restore the package.json files that were changed by `changeset version`
+		await repo.gitClient.raw("restore", "**package.json");
 
 		// Calls processPackage on all packages.
 		ux.action.start("Processing changelog updates");
 		const processPromises: Promise<void>[] = [];
 		for (const pkg of packagesToCheck) {
-			processPromises.push(updateChangelogs(pkg, bumpType, versionString));
+			processPromises.push(this.processPackage(pkg, bumpType));
 		}
 		const results = await Promise.allSettled(processPromises);
 		const failures = results.filter((p) => p.status === "rejected");
@@ -97,6 +155,15 @@ export default class GenerateChangeLogCommand extends BaseCommandWithBuildProjec
 				{ exit: 1 },
 			);
 		}
+
+		// git add the changelog changes
+		await repo.gitClient.add("**CHANGELOG.md");
+
+		// Cleanup: git restore any edits that aren't staged
+		await repo.gitClient.raw("restore", ".");
+
+		// Cleanup: git clean any untracked files
+		await repo.gitClient.clean(CleanOptions.RECURSIVE + CleanOptions.FORCE);
 		ux.action.stop();
 
 		this.log("Commit and open a PR!");

From 736cf726ec30d09cb6865be3a65f3c3d6ff39bcb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 18:19:22 +0000
Subject: [PATCH 3/6] Update JSDoc comment and regenerate documentation for
 deprecated vnext command

Co-authored-by: tylerbutler <19589+tylerbutler@users.noreply.github.com>
---
 .../packages/build-cli/docs/generate.md        | 18 +++++++++---------
 build-tools/packages/build-cli/docs/vnext.md   |  6 ++++--
 .../src/commands/vnext/generate/changelog.ts   |  6 ++++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/generate.md b/build-tools/packages/build-cli/docs/generate.md
index 62a696cb8507..b872f7a4f2b8 100644
--- a/build-tools/packages/build-cli/docs/generate.md
+++ b/build-tools/packages/build-cli/docs/generate.md
@@ -140,26 +140,26 @@ _See code: [src/commands/generate/bundleStats.ts](https://github.com/microsoft/F
 
 ## `flub generate changelog`
 
-Generate a changelog for packages based on changesets.
+Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
 
 ```
 USAGE
-  $ flub generate changelog -g client|server|azure|build-tools|gitrest|historian [-v | --quiet] [--version <value>]
-    [--install]
+  $ flub generate changelog -g <value> [-v | --quiet] [--version <value>]
 
 FLAGS
-  -g, --releaseGroup=<option>  (required) Name of a release group.
-                               <options: client|server|azure|build-tools|gitrest|historian>
-      --[no-]install           Update lockfiles by running 'npm install' automatically.
-      --version=<value>        The version for which to generate the changelog. If this is not provided, the version of
-                               the package according to package.json will be used.
+  -g, --releaseGroup=<value>  (required) The name of a release group.
+      --version=<value>       The version for which to generate the changelog. If this is not provided, the version of
+                              the package according to package.json will be used.
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
       --quiet    Disable all logging.
 
 DESCRIPTION
-  Generate a changelog for packages based on changesets.
+  Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+
+ALIASES
+  $ flub vnext generate changelogs
 
 EXAMPLES
   Generate changelogs for the client release group.
diff --git a/build-tools/packages/build-cli/docs/vnext.md b/build-tools/packages/build-cli/docs/vnext.md
index 23fcb2ba0916..9f51aeee7644 100644
--- a/build-tools/packages/build-cli/docs/vnext.md
+++ b/build-tools/packages/build-cli/docs/vnext.md
@@ -35,7 +35,9 @@ _See code: [src/commands/vnext/check/latestVersions.ts](https://github.com/micro
 
 ## `flub vnext generate changelog`
 
-Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
+
+[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
 
 ```
 USAGE
@@ -51,7 +53,7 @@ LOGGING FLAGS
       --quiet    Disable all logging.
 
 DESCRIPTION
-  Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+  [DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
 
 ALIASES
   $ flub vnext generate changelogs
diff --git a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
index f271b83bce2c..df47bc79f368 100644
--- a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
+++ b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
@@ -32,6 +32,12 @@ async function replaceInFile(
 }
 
 /**
+ * Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+ *
+ * The reason we use a search/replace approach to update the version strings in the changelogs is largely because of
+ * https://github.com/changesets/changesets/issues/595. What we would like to do is generate the changelogs without
+ * doing version bumping, but that feature does not exist in the changeset tools.
+ *
  * @deprecated This command is deprecated. Use 'flub generate changelog' instead.
  */
 export default class GenerateChangeLogCommand extends BaseCommand<

From f7b0cc2651873e6bed17ed0cfc3f3dab388c5ee6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 18:28:19 +0000
Subject: [PATCH 4/6] Move deprecated changelog command from vnext to
 deprecated namespace

Co-authored-by: tylerbutler <19589+tylerbutler@users.noreply.github.com>
---
 build-tools/packages/build-cli/README.md      |   1 +
 .../packages/build-cli/docs/deprecated.md     |  37 +++++
 build-tools/packages/build-cli/docs/vnext.md  |  33 ----
 build-tools/packages/build-cli/package.json   |   3 +
 .../generate/changelog.ts                     |   0
 .../deprecated/generate/changelog.test.ts     |  88 +++++++++++
 .../commands/vnext/generate/changelog.test.ts | 144 ------------------
 7 files changed, 129 insertions(+), 177 deletions(-)
 create mode 100644 build-tools/packages/build-cli/docs/deprecated.md
 rename build-tools/packages/build-cli/src/commands/{vnext => deprecated}/generate/changelog.ts (100%)
 create mode 100644 build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts
 delete mode 100644 build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts

diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index e5f5530d05d7..03a156dda42a 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -36,6 +36,7 @@ USAGE
 * [`flub bump`](docs/bump.md) - Bump the version of packages, release groups, and their dependencies.
 * [`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 deprecated`](docs/deprecated.md) - Deprecated commands that have been replaced by newer implementations.
 * [`flub exec`](docs/exec.md) - Run a shell command in the context of a package or release group.
 * [`flub generate`](docs/generate.md) - Generate commands are used to create/update code, docs, readmes, etc.
 * [`flub help`](docs/help.md) - Display help for flub.
diff --git a/build-tools/packages/build-cli/docs/deprecated.md b/build-tools/packages/build-cli/docs/deprecated.md
new file mode 100644
index 000000000000..1b5cc474a1ae
--- /dev/null
+++ b/build-tools/packages/build-cli/docs/deprecated.md
@@ -0,0 +1,37 @@
+`flub deprecated`
+=================
+
+Deprecated commands that have been replaced by newer implementations.
+
+* [`flub deprecated generate changelog`](#flub-deprecated-generate-changelog)
+
+## `flub deprecated generate changelog`
+
+**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
+
+[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
+
+```
+USAGE
+  $ flub deprecated generate changelog -g <value> [-v | --quiet] [--version <value>] [--install]
+
+FLAGS
+  -g, --releaseGroup=<value>  (required) Name of a release group.
+      --[no-]install          Update lockfiles by running 'npm install' automatically.
+      --version=<value>       The version for which to generate the changelog. If this is not provided, the version of
+                              the package according to package.json will be used.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  [DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
+
+EXAMPLES
+  Generate changelogs for the client release group.
+
+    $ flub deprecated generate changelog --releaseGroup client
+```
+
+_See code: [src/commands/deprecated/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts)_
diff --git a/build-tools/packages/build-cli/docs/vnext.md b/build-tools/packages/build-cli/docs/vnext.md
index 9f51aeee7644..4d10421abf3d 100644
--- a/build-tools/packages/build-cli/docs/vnext.md
+++ b/build-tools/packages/build-cli/docs/vnext.md
@@ -4,7 +4,6 @@
 Vnext commands are new implementations of standard flub commands using new infrastructure.
 
 * [`flub vnext check latestVersions`](#flub-vnext-check-latestversions)
-* [`flub vnext generate changelog`](#flub-vnext-generate-changelog)
 
 ## `flub vnext check latestVersions`
 
@@ -33,35 +32,3 @@ DESCRIPTION
 
 _See code: [src/commands/vnext/check/latestVersions.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/vnext/check/latestVersions.ts)_
 
-## `flub vnext generate changelog`
-
-**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
-
-[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
-
-```
-USAGE
-  $ flub vnext generate changelog -g <value> [-v | --quiet] [--version <value>]
-
-FLAGS
-  -g, --releaseGroup=<value>  (required) The name of a release group.
-      --version=<value>       The version for which to generate the changelog. If this is not provided, the version of
-                              the package according to package.json will be used.
-
-LOGGING FLAGS
-  -v, --verbose  Enable verbose logging.
-      --quiet    Disable all logging.
-
-DESCRIPTION
-  [DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
-
-ALIASES
-  $ flub vnext generate changelogs
-
-EXAMPLES
-  Generate changelogs for the client release group.
-
-    $ flub vnext generate changelog --releaseGroup client
-```
-
-_See code: [src/commands/vnext/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts)_
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index e6b1f84fd809..51ab5cf82738 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -225,6 +225,9 @@
 			"check": {
 				"description": "Check commands are used to verify repo state, apply policy, etc."
 			},
+			"deprecated": {
+				"description": "Deprecated commands that have been replaced by newer implementations."
+			},
 			"generate": {
 				"description": "Generate commands are used to create/update code, docs, readmes, etc."
 			},
diff --git a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts
similarity index 100%
rename from build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
rename to build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts
diff --git a/build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts b/build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts
new file mode 100644
index 000000000000..18cd7b2818d4
--- /dev/null
+++ b/build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { strict as assert } from "node:assert";
+import { describe, it } from "mocha";
+
+describe("deprecated generate changelog command", () => {
+	/**
+	 * NOTE: These are placeholder tests for the deprecated generate changelog command.
+	 * Full integration tests would require:
+	 * - Mocking the build project infrastructure
+	 * - Setting up temporary git repositories
+	 * - Creating realistic changeset files
+	 * - Mocking the changeset CLI tool
+	 *
+	 * The core functionality is tested in the library unit tests:
+	 * - changelogs.test.ts tests updateChangelogs()
+	 * - canonicalizeChangesets.test.ts tests canonicalizeChangesets()
+	 *
+	 * This command is deprecated in favor of 'flub generate changelog'.
+	 */
+
+	describe("command behavior", () => {
+		it("should validate that release group is required", () => {
+			// The command requires --releaseGroup flag
+			// This is enforced by oclif flag validation
+			assert.ok(true);
+		});
+
+		it("should accept optional --version flag", () => {
+			// The command accepts an optional --version flag
+			// The version is validated as semver by the semverFlag parser
+			assert.ok(true);
+		});
+
+		it("should handle release group not found error", () => {
+			// When context.repo.releaseGroups.get() returns undefined
+			// The command should call this.error() with appropriate message
+			assert.ok(true);
+		});
+	});
+
+	describe("workflow", () => {
+		it("should follow correct execution order", () => {
+			// Expected workflow:
+			// 1. Get context and release group
+			// 2. Call canonicalizeChangesets() to strip metadata and get bump type
+			// 3. Execute `pnpm exec changeset version`
+			// 4. Perform git operations (add, restore)
+			// 5. Call processPackage() for each package in parallel
+			// 6. Perform cleanup git operations
+			// 7. Output "Commit and open a PR!"
+			assert.ok(true);
+		});
+
+		it("should use git operations to manage changesets", () => {
+			// After `changeset version`:
+			// - Add deleted changesets
+			// - Restore package.json files
+			// - Add changelog changes
+			// - Clean untracked files
+			assert.ok(true);
+		});
+
+		it("should process all packages in parallel", () => {
+			// processPackage() should be called for all packages in parallel
+			// using Promise.allSettled() to handle individual failures
+			assert.ok(true);
+		});
+	});
+
+	describe("deprecation", () => {
+		it("should be marked as deprecated", () => {
+			// The command has:
+			// - @deprecated JSDoc tag
+			// - deprecated property with migration message
+			// - [DEPRECATED] prefix in description
+			assert.ok(true);
+		});
+
+		it("should direct users to use flub generate changelog", () => {
+			// Deprecation message should tell users to use 'flub generate changelog'
+			assert.ok(true);
+		});
+	});
+});
diff --git a/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts b/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts
deleted file mode 100644
index 5a0fa678b055..000000000000
--- a/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { strict as assert } from "node:assert";
-import { describe, it } from "mocha";
-
-describe("vnext generate changelog command", () => {
-	/**
-	 * NOTE: These are placeholder tests for the vnext generate changelog command.
-	 * Full integration tests would require:
-	 * - Mocking the build project infrastructure
-	 * - Setting up temporary git repositories
-	 * - Creating realistic changeset files
-	 * - Mocking the changeset CLI tool
-	 *
-	 * The core functionality is tested in the library unit tests:
-	 * - changelogs.test.ts tests updateChangelogs()
-	 * - canonicalizeChangesets.test.ts tests canonicalizeChangesets()
-	 *
-	 * These integration tests should be expanded when the command is ready for production use.
-	 */
-
-	describe("command behavior", () => {
-		it("should validate that release group is required", () => {
-			// The command requires --releaseGroup flag
-			// This is enforced by oclif flag validation
-			assert.ok(true);
-		});
-
-		it("should accept optional --version flag", () => {
-			// The command accepts an optional --version flag
-			// The version is validated as semver by the semverFlag parser
-			assert.ok(true);
-		});
-
-		it("should handle release group not found error", () => {
-			// When buildProject.releaseGroups.get() returns undefined
-			// The command should call this.error() with appropriate message
-			assert.ok(true);
-		});
-
-		it("should handle invalid version format", () => {
-			// When parse(releaseGroup.version) returns null
-			// The command should call this.error() with appropriate message
-			assert.ok(true);
-		});
-	});
-
-	describe("workflow", () => {
-		it("should follow correct execution order", () => {
-			// Expected workflow:
-			// 1. Get build project and release group
-			// 2. Parse and validate release group version
-			// 3. Call canonicalizeChangesets() to strip metadata and get bump type
-			// 4. Execute `pnpm exec changeset version`
-			// 5. Restore package versions with setVersion()
-			// 6. Call updateChangelogs() for each package in parallel
-			// 7. Report any failures
-			// 8. Output "Commit and open a PR!"
-			assert.ok(true);
-		});
-
-		it("should use setVersion to restore package.json versions", () => {
-			// After `changeset version` modifies package.json files,
-			// the command should use setVersion() to restore them to the original version
-			assert.ok(true);
-		});
-
-		it("should process all packages in parallel", () => {
-			// updateChangelogs() should be called for all packages in parallel
-			// using Promise.allSettled() to handle individual failures
-			assert.ok(true);
-		});
-	});
-
-	describe("version parameter handling", () => {
-		it("should pass version override to updateChangelogs when provided", () => {
-			// When --version flag is provided:
-			// 1. Extract .version property from SemVer object
-			// 2. Pass versionString to updateChangelogs()
-			assert.ok(true);
-		});
-
-		it("should pass undefined to updateChangelogs when version not provided", () => {
-			// When --version flag is not provided:
-			// updateChangelogs() receives undefined and falls back to package.json version
-			assert.ok(true);
-		});
-	});
-
-	describe("error handling", () => {
-		it("should handle empty changesets directory", () => {
-			// When canonicalizeChangesets() throws error about no changesets
-			// The error should bubble up and halt execution
-			assert.ok(true);
-		});
-
-		it("should collect and report all package processing failures", () => {
-			// When updateChangelogs() fails for some packages:
-			// 1. Continue processing other packages (Promise.allSettled)
-			// 2. Collect all failure reasons
-			// 3. Report combined error message
-			// 4. Exit with code 1
-			assert.ok(true);
-		});
-	});
-
-	describe("integration with library functions", () => {
-		it("should use canonicalizeChangesets from library/changesets", () => {
-			// Imports and calls canonicalizeChangesets(releaseGroupRoot, this.logger)
-			// Returns bump type (major, minor, or patch)
-			assert.ok(true);
-		});
-
-		it("should use updateChangelogs from library/changelogs", () => {
-			// Imports and calls updateChangelogs(pkg, bumpType, versionString)
-			// Processes changelog replacements for each package
-			assert.ok(true);
-		});
-
-		it("should use setVersion from @fluid-tools/build-infrastructure", () => {
-			// Imports and calls setVersion(packagesToCheck, releaseGroupVersion)
-			// Restores package.json versions after changeset version modifies them
-			assert.ok(true);
-		});
-	});
-
-	describe("command output", () => {
-		it("should show progress indicators during execution", () => {
-			// Uses ux.action.start/stop for:
-			// - "Running `changeset version`"
-			// - "Processing changelog updates"
-			assert.ok(true);
-		});
-
-		it("should output success message after completion", () => {
-			// After successful processing, outputs:
-			// "Commit and open a PR!"
-			assert.ok(true);
-		});
-	});
-});

From 4fded1ee4f0a23f888178ff529dc9928106d753c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:10:20 +0000
Subject: [PATCH 5/6] Rename deprecated to legacy and restore vnext command as
 deprecated

Co-authored-by: tylerbutler <19589+tylerbutler@users.noreply.github.com>
---
 build-tools/packages/build-cli/README.md      |   2 +-
 .../docs/{deprecated.md => legacy.md}         |  16 +-
 build-tools/packages/build-cli/docs/vnext.md  |  34 ++++
 build-tools/packages/build-cli/package.json   |   8 +-
 .../generate/changelog.ts                     |   0
 .../src/commands/vnext/generate/changelog.ts  | 111 ++++++++++++
 .../generate/changelog.test.ts                |   4 +-
 .../commands/vnext/generate/changelog.test.ts | 159 ++++++++++++++++++
 8 files changed, 319 insertions(+), 15 deletions(-)
 rename build-tools/packages/build-cli/docs/{deprecated.md => legacy.md} (59%)
 rename build-tools/packages/build-cli/src/commands/{deprecated => legacy}/generate/changelog.ts (100%)
 create mode 100644 build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
 rename build-tools/packages/build-cli/src/test/commands/{deprecated => legacy}/generate/changelog.test.ts (95%)
 create mode 100644 build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts

diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index 03a156dda42a..61e390cdfe86 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -36,11 +36,11 @@ USAGE
 * [`flub bump`](docs/bump.md) - Bump the version of packages, release groups, and their dependencies.
 * [`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 deprecated`](docs/deprecated.md) - Deprecated commands that have been replaced by newer implementations.
 * [`flub exec`](docs/exec.md) - Run a shell command in the context of a package or release group.
 * [`flub generate`](docs/generate.md) - Generate commands are used to create/update code, docs, readmes, etc.
 * [`flub help`](docs/help.md) - Display help for flub.
 * [`flub info`](docs/info.md) - Get info about the repo, release groups, and packages.
+* [`flub legacy`](docs/legacy.md) - Legacy commands that have been replaced by newer implementations.
 * [`flub list`](docs/list.md) - List packages in a release group in topological order.
 * [`flub merge`](docs/merge.md) - Sync branches depending on the batch size passed
 * [`flub modify`](docs/modify.md) - Modify commands are used to modify projects to add or remove dependencies, update Fluid imports, etc.
diff --git a/build-tools/packages/build-cli/docs/deprecated.md b/build-tools/packages/build-cli/docs/legacy.md
similarity index 59%
rename from build-tools/packages/build-cli/docs/deprecated.md
rename to build-tools/packages/build-cli/docs/legacy.md
index 1b5cc474a1ae..fefc226d2afd 100644
--- a/build-tools/packages/build-cli/docs/deprecated.md
+++ b/build-tools/packages/build-cli/docs/legacy.md
@@ -1,11 +1,11 @@
-`flub deprecated`
-=================
+`flub legacy`
+=============
 
-Deprecated commands that have been replaced by newer implementations.
+Legacy commands that have been replaced by newer implementations.
 
-* [`flub deprecated generate changelog`](#flub-deprecated-generate-changelog)
+* [`flub legacy generate changelog`](#flub-legacy-generate-changelog)
 
-## `flub deprecated generate changelog`
+## `flub legacy generate changelog`
 
 **Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
 
@@ -13,7 +13,7 @@ Deprecated commands that have been replaced by newer implementations.
 
 ```
 USAGE
-  $ flub deprecated generate changelog -g <value> [-v | --quiet] [--version <value>] [--install]
+  $ flub legacy generate changelog -g <value> [-v | --quiet] [--version <value>] [--install]
 
 FLAGS
   -g, --releaseGroup=<value>  (required) Name of a release group.
@@ -31,7 +31,7 @@ DESCRIPTION
 EXAMPLES
   Generate changelogs for the client release group.
 
-    $ flub deprecated generate changelog --releaseGroup client
+    $ flub legacy generate changelog --releaseGroup client
 ```
 
-_See code: [src/commands/deprecated/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts)_
+_See code: [src/commands/legacy/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/legacy/generate/changelog.ts)_
diff --git a/build-tools/packages/build-cli/docs/vnext.md b/build-tools/packages/build-cli/docs/vnext.md
index 4d10421abf3d..70177f9e2a43 100644
--- a/build-tools/packages/build-cli/docs/vnext.md
+++ b/build-tools/packages/build-cli/docs/vnext.md
@@ -4,6 +4,7 @@
 Vnext commands are new implementations of standard flub commands using new infrastructure.
 
 * [`flub vnext check latestVersions`](#flub-vnext-check-latestversions)
+* [`flub vnext generate changelog`](#flub-vnext-generate-changelog)
 
 ## `flub vnext check latestVersions`
 
@@ -32,3 +33,36 @@ DESCRIPTION
 
 _See code: [src/commands/vnext/check/latestVersions.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/vnext/check/latestVersions.ts)_
 
+## `flub vnext generate changelog`
+
+**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
+
+[DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.
+
+```
+USAGE
+  $ flub vnext generate changelog -g <value> [-v | --quiet] [--version <value>]
+
+FLAGS
+  -g, --releaseGroup=<value>  (required) The name of a release group.
+      --version=<value>       The version for which to generate the changelog. If this is not provided, the version of
+                              the package according to package.json will be used.
+
+LOGGING FLAGS
+  -v, --verbose  Enable verbose logging.
+      --quiet    Disable all logging.
+
+DESCRIPTION
+  [DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.
+
+ALIASES
+  $ flub vnext generate changelogs
+
+EXAMPLES
+  Generate changelogs for the client release group.
+
+    $ flub vnext generate changelog --releaseGroup client
+```
+
+_See code: [src/commands/vnext/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts)_
+
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index 51ab5cf82738..502cf92bfdf6 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -225,17 +225,17 @@
 			"check": {
 				"description": "Check commands are used to verify repo state, apply policy, etc."
 			},
-			"deprecated": {
-				"description": "Deprecated commands that have been replaced by newer implementations."
-			},
 			"generate": {
 				"description": "Generate commands are used to create/update code, docs, readmes, etc."
 			},
+			"legacy": {
+				"description": "Legacy commands that have been replaced by newer implementations."
+			},
 			"modify": {
 				"description": "Modify commands are used to modify projects to add or remove dependencies, update Fluid imports, etc."
 			},
 			"release": {
-				"description": "Release commands are used to manage the Fluid release process."
+				"description": "Release commands are used to manage the Fluid Release process."
 			},
 			"publish": {
 				"description": "Publish commands are used to publish packages to an npm registry."
diff --git a/build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/legacy/generate/changelog.ts
similarity index 100%
rename from build-tools/packages/build-cli/src/commands/deprecated/generate/changelog.ts
rename to build-tools/packages/build-cli/src/commands/legacy/generate/changelog.ts
diff --git a/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
new file mode 100644
index 000000000000..63047b82e125
--- /dev/null
+++ b/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts
@@ -0,0 +1,111 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { ux } from "@oclif/core";
+import { command as execCommand } from "execa";
+import { parse } from "semver";
+
+import { setVersion } from "@fluid-tools/build-infrastructure";
+import { releaseGroupNameFlag, semverFlag } from "../../../flags.js";
+// eslint-disable-next-line import/no-internal-modules
+import { updateChangelogs } from "../../../library/changelogs.js";
+// eslint-disable-next-line import/no-internal-modules
+import { canonicalizeChangesets } from "../../../library/changesets.js";
+import { BaseCommandWithBuildProject } from "../../../library/index.js";
+
+/**
+ * Generate a changelog for packages based on changesets. Note that this process deletes the changeset files!
+ *
+ * The reason we use a search/replace approach to update the version strings in the changelogs is largely because of
+ * https://github.com/changesets/changesets/issues/595. What we would like to do is generate the changelogs without
+ * doing version bumping, but that feature does not exist in the changeset tools.
+ *
+ * @deprecated This command is deprecated. Use 'flub generate changelog' instead.
+ */
+export default class GenerateChangeLogCommand extends BaseCommandWithBuildProject<
+	typeof GenerateChangeLogCommand
+> {
+	static readonly description =
+		"[DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.";
+
+	static readonly deprecateAliases = true;
+	static readonly deprecated = {
+		message: "This command is deprecated. Use 'flub generate changelog' instead.",
+	};
+
+	static readonly aliases = ["vnext:generate:changelogs"];
+
+	static readonly flags = {
+		releaseGroup: releaseGroupNameFlag({ required: true }),
+		version: semverFlag({
+			description:
+				"The version for which to generate the changelog. If this is not provided, the version of the package according to package.json will be used.",
+		}),
+		...BaseCommandWithBuildProject.flags,
+	} as const;
+
+	static readonly examples = [
+		{
+			description: "Generate changelogs for the client release group.",
+			command: "<%= config.bin %> <%= command.id %> --releaseGroup client",
+		},
+	];
+
+	public async run(): Promise<void> {
+		const buildProject = this.getBuildProject();
+
+		const { releaseGroup: releaseGroupName, version: versionOverride } = this.flags;
+
+		const releaseGroup = buildProject.releaseGroups.get(releaseGroupName);
+		if (releaseGroup === undefined) {
+			this.error(`Can't find release group named '${releaseGroupName}'`, { exit: 1 });
+		}
+
+		const releaseGroupRoot = releaseGroup.workspace.directory;
+		const releaseGroupVersion = parse(releaseGroup.version);
+		if (releaseGroupVersion === null) {
+			this.error(`Version isn't a valid semver string: '${releaseGroup.version}'`, {
+				exit: 1,
+			});
+		}
+
+		// Strips additional custom metadata from the source files before we call `changeset version`,
+		// because the changeset tools - like @changesets/cli - only work on canonical changesets.
+		const bumpType = await canonicalizeChangesets(releaseGroupRoot, this.logger);
+
+		// The `changeset version` command applies the changesets to the changelogs
+		ux.action.start("Running `changeset version`");
+		await execCommand("pnpm exec changeset version", { cwd: releaseGroupRoot });
+		ux.action.stop();
+
+		const packagesToCheck = releaseGroup.packages;
+
+		// restore the package versions that were changed by `changeset version`
+		await setVersion(packagesToCheck, releaseGroupVersion);
+
+		// Extract the version string from the SemVer object if provided
+		const versionString = versionOverride?.version;
+
+		// Calls processPackage on all packages.
+		ux.action.start("Processing changelog updates");
+		const processPromises: Promise<void>[] = [];
+		for (const pkg of packagesToCheck) {
+			processPromises.push(updateChangelogs(pkg, bumpType, versionString));
+		}
+		const results = await Promise.allSettled(processPromises);
+		const failures = results.filter((p) => p.status === "rejected");
+		if (failures.length > 0) {
+			this.error(
+				`Error processing packages; failure reasons:\n${failures
+					.map((p) => (p as PromiseRejectedResult).reason as string)
+					.join(", ")}`,
+				{ exit: 1 },
+			);
+		}
+		ux.action.stop();
+
+		this.log("Commit and open a PR!");
+	}
+}
diff --git a/build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts b/build-tools/packages/build-cli/src/test/commands/legacy/generate/changelog.test.ts
similarity index 95%
rename from build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts
rename to build-tools/packages/build-cli/src/test/commands/legacy/generate/changelog.test.ts
index 18cd7b2818d4..a3444c707fd0 100644
--- a/build-tools/packages/build-cli/src/test/commands/deprecated/generate/changelog.test.ts
+++ b/build-tools/packages/build-cli/src/test/commands/legacy/generate/changelog.test.ts
@@ -6,9 +6,9 @@
 import { strict as assert } from "node:assert";
 import { describe, it } from "mocha";
 
-describe("deprecated generate changelog command", () => {
+describe("legacy generate changelog command", () => {
 	/**
-	 * NOTE: These are placeholder tests for the deprecated generate changelog command.
+	 * NOTE: These are placeholder tests for the legacy generate changelog command.
 	 * Full integration tests would require:
 	 * - Mocking the build project infrastructure
 	 * - Setting up temporary git repositories
diff --git a/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts b/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts
new file mode 100644
index 000000000000..8d8399a3ea6d
--- /dev/null
+++ b/build-tools/packages/build-cli/src/test/commands/vnext/generate/changelog.test.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { strict as assert } from "node:assert";
+import { describe, it } from "mocha";
+
+describe("vnext generate changelog command", () => {
+	/**
+	 * NOTE: These are placeholder tests for the vnext generate changelog command.
+	 * Full integration tests would require:
+	 * - Mocking the build project infrastructure
+	 * - Setting up temporary git repositories
+	 * - Creating realistic changeset files
+	 * - Mocking the changeset CLI tool
+	 *
+	 * The core functionality is tested in the library unit tests:
+	 * - changelogs.test.ts tests updateChangelogs()
+	 * - canonicalizeChangesets.test.ts tests canonicalizeChangesets()
+	 *
+	 * This command is deprecated in favor of 'flub generate changelog'.
+	 */
+
+	describe("deprecation", () => {
+		it("should be marked as deprecated", () => {
+			// The command has:
+			// - @deprecated JSDoc tag
+			// - deprecated property with migration message
+			// - [DEPRECATED] prefix in description
+			assert.ok(true);
+		});
+
+		it("should direct users to use flub generate changelog", () => {
+			// Deprecation message should tell users to use 'flub generate changelog'
+			assert.ok(true);
+		});
+	});
+
+	describe("command behavior", () => {
+		it("should validate that release group is required", () => {
+			// The command requires --releaseGroup flag
+			// This is enforced by oclif flag validation
+			assert.ok(true);
+		});
+
+		it("should accept optional --version flag", () => {
+			// The command accepts an optional --version flag
+			// The version is validated as semver by the semverFlag parser
+			assert.ok(true);
+		});
+
+		it("should handle release group not found error", () => {
+			// When buildProject.releaseGroups.get() returns undefined
+			// The command should call this.error() with appropriate message
+			assert.ok(true);
+		});
+
+		it("should handle invalid version format", () => {
+			// When parse(releaseGroup.version) returns null
+			// The command should call this.error() with appropriate message
+			assert.ok(true);
+		});
+	});
+
+	describe("workflow", () => {
+		it("should follow correct execution order", () => {
+			// Expected workflow:
+			// 1. Get build project and release group
+			// 2. Parse and validate release group version
+			// 3. Call canonicalizeChangesets() to strip metadata and get bump type
+			// 4. Execute `pnpm exec changeset version`
+			// 5. Restore package versions with setVersion()
+			// 6. Call updateChangelogs() for each package in parallel
+			// 7. Report any failures
+			// 8. Output "Commit and open a PR!"
+			assert.ok(true);
+		});
+
+		it("should use setVersion to restore package.json versions", () => {
+			// After `changeset version` modifies package.json files,
+			// the command should use setVersion() to restore them to the original version
+			assert.ok(true);
+		});
+
+		it("should process all packages in parallel", () => {
+			// updateChangelogs() should be called for all packages in parallel
+			// using Promise.allSettled() to handle individual failures
+			assert.ok(true);
+		});
+	});
+
+	describe("version parameter handling", () => {
+		it("should pass version override to updateChangelogs when provided", () => {
+			// When --version flag is provided:
+			// 1. Extract .version property from SemVer object
+			// 2. Pass versionString to updateChangelogs()
+			assert.ok(true);
+		});
+
+		it("should pass undefined to updateChangelogs when version not provided", () => {
+			// When --version flag is not provided:
+			// updateChangelogs() receives undefined and falls back to package.json version
+			assert.ok(true);
+		});
+	});
+
+	describe("error handling", () => {
+		it("should handle empty changesets directory", () => {
+			// When canonicalizeChangesets() throws error about no changesets
+			// The error should bubble up and halt execution
+			assert.ok(true);
+		});
+
+		it("should collect and report all package processing failures", () => {
+			// When updateChangelogs() fails for some packages:
+			// 1. Continue processing other packages (Promise.allSettled)
+			// 2. Collect all failure reasons
+			// 3. Report combined error message
+			// 4. Exit with code 1
+			assert.ok(true);
+		});
+	});
+
+	describe("integration with library functions", () => {
+		it("should use canonicalizeChangesets from library/changesets", () => {
+			// Imports and calls canonicalizeChangesets(releaseGroupRoot, this.logger)
+			// Returns bump type (major, minor, or patch)
+			assert.ok(true);
+		});
+
+		it("should use updateChangelogs from library/changelogs", () => {
+			// Imports and calls updateChangelogs(pkg, bumpType, versionString)
+			// Processes changelog replacements for each package
+			assert.ok(true);
+		});
+
+		it("should use setVersion from @fluid-tools/build-infrastructure", () => {
+			// Imports and calls setVersion(packagesToCheck, releaseGroupVersion)
+			// Restores package.json versions after changeset version modifies them
+			assert.ok(true);
+		});
+	});
+
+	describe("command output", () => {
+		it("should show progress indicators during execution", () => {
+			// Uses ux.action.start/stop for:
+			// - "Running `changeset version`"
+			// - "Processing changelog updates"
+			assert.ok(true);
+		});
+
+		it("should output success message after completion", () => {
+			// After successful processing, outputs:
+			// "Commit and open a PR!"
+			assert.ok(true);
+		});
+	});
+});

From a0c118c75bf4d9413d884f17fc1503ca1ae85b0a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:22:36 +0000
Subject: [PATCH 6/6] Build and regenerate documentation and manifest

Co-authored-by: tylerbutler <19589+tylerbutler@users.noreply.github.com>
---
 build-tools/packages/build-cli/docs/legacy.md | 14 +++++++-------
 build-tools/packages/build-cli/docs/vnext.md  |  6 ++----
 build-tools/packages/build-cli/package.json   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build-tools/packages/build-cli/docs/legacy.md b/build-tools/packages/build-cli/docs/legacy.md
index fefc226d2afd..d9bd4c073d6e 100644
--- a/build-tools/packages/build-cli/docs/legacy.md
+++ b/build-tools/packages/build-cli/docs/legacy.md
@@ -7,19 +7,19 @@ Legacy commands that have been replaced by newer implementations.
 
 ## `flub legacy generate changelog`
 
-**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
-
 [DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
 
 ```
 USAGE
-  $ flub legacy generate changelog -g <value> [-v | --quiet] [--version <value>] [--install]
+  $ flub legacy generate changelog -g client|server|azure|build-tools|gitrest|historian [-v | --quiet] [--version <value>]
+    [--install]
 
 FLAGS
-  -g, --releaseGroup=<value>  (required) Name of a release group.
-      --[no-]install          Update lockfiles by running 'npm install' automatically.
-      --version=<value>       The version for which to generate the changelog. If this is not provided, the version of
-                              the package according to package.json will be used.
+  -g, --releaseGroup=<option>  (required) Name of a release group.
+                               <options: client|server|azure|build-tools|gitrest|historian>
+      --[no-]install           Update lockfiles by running 'npm install' automatically.
+      --version=<value>        The version for which to generate the changelog. If this is not provided, the version of
+                               the package according to package.json will be used.
 
 LOGGING FLAGS
   -v, --verbose  Enable verbose logging.
diff --git a/build-tools/packages/build-cli/docs/vnext.md b/build-tools/packages/build-cli/docs/vnext.md
index 70177f9e2a43..9d589ec1a759 100644
--- a/build-tools/packages/build-cli/docs/vnext.md
+++ b/build-tools/packages/build-cli/docs/vnext.md
@@ -35,8 +35,6 @@ _See code: [src/commands/vnext/check/latestVersions.ts](https://github.com/micro
 
 ## `flub vnext generate changelog`
 
-**Deprecated:** This command is deprecated. Use 'flub generate changelog' instead.
-
 [DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.
 
 ```
@@ -53,7 +51,8 @@ LOGGING FLAGS
       --quiet    Disable all logging.
 
 DESCRIPTION
-  [DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.
+  [DEPRECATED] Generate a changelog for packages based on changesets. Note that this process deletes the changeset
+  files! Use 'flub generate changelog' instead.
 
 ALIASES
   $ flub vnext generate changelogs
@@ -65,4 +64,3 @@ EXAMPLES
 ```
 
 _See code: [src/commands/vnext/generate/changelog.ts](https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-cli/src/commands/vnext/generate/changelog.ts)_
-
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index 502cf92bfdf6..a8b3ab6040e4 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -235,7 +235,7 @@
 				"description": "Modify commands are used to modify projects to add or remove dependencies, update Fluid imports, etc."
 			},
 			"release": {
-				"description": "Release commands are used to manage the Fluid Release process."
+				"description": "Release commands are used to manage the Fluid release process."
 			},
 			"publish": {
 				"description": "Publish commands are used to publish packages to an npm registry."