diff --git a/build-tools/packages/build-cli/README.md b/build-tools/packages/build-cli/README.md
index e5f5530d05d7..61e390cdfe86 100644
--- a/build-tools/packages/build-cli/README.md
+++ b/build-tools/packages/build-cli/README.md
@@ -40,6 +40,7 @@ USAGE
 * [`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/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/legacy.md b/build-tools/packages/build-cli/docs/legacy.md
new file mode 100644
index 000000000000..d9bd4c073d6e
--- /dev/null
+++ b/build-tools/packages/build-cli/docs/legacy.md
@@ -0,0 +1,37 @@
+`flub legacy`
+=============
+
+Legacy commands that have been replaced by newer implementations.
+
+* [`flub legacy generate changelog`](#flub-legacy-generate-changelog)
+
+## `flub legacy generate changelog`
+
+[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.
+
+```
+USAGE
+  $ flub legacy generate changelog -g client|server|azure|build-tools|gitrest|historian [-v | --quiet] [--version <value>]
+    [--install]
+
+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.
+
+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 legacy generate changelog --releaseGroup client
+```
+
+_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 23fcb2ba0916..9d589ec1a759 100644
--- a/build-tools/packages/build-cli/docs/vnext.md
+++ b/build-tools/packages/build-cli/docs/vnext.md
@@ -35,7 +35,7 @@ _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] Generate a changelog for packages based on changesets. Note that this process deletes the changeset files! Use 'flub generate changelog' instead.
 
 ```
 USAGE
@@ -51,7 +51,8 @@ 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. Note that this process deletes the changeset
+  files! Use 'flub generate changelog' instead.
 
 ALIASES
   $ flub vnext generate changelogs
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
index e6b1f84fd809..a8b3ab6040e4 100644
--- a/build-tools/packages/build-cli/package.json
+++ b/build-tools/packages/build-cli/package.json
@@ -228,6 +228,9 @@
 			"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."
 			},
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/legacy/generate/changelog.ts b/build-tools/packages/build-cli/src/commands/legacy/generate/changelog.ts
new file mode 100644
index 000000000000..df47bc79f368
--- /dev/null
+++ b/build-tools/packages/build-cli/src/commands/legacy/generate/changelog.ts
@@ -0,0 +1,177 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * 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 { checkFlags, releaseGroupFlag, semverFlag } from "../../../flags.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");
+}
+
+/**
+ * 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<
+	typeof GenerateChangeLogCommand
+> {
+	static readonly description =
+		"[DEPRECATED] Generate a changelog for packages based on changesets. Use 'flub generate changelog' instead.";
+
+	static readonly deprecateAliases = true;
+	static readonly deprecated = {
+		message: "This command is deprecated. Use 'flub generate changelog' instead.",
+	};
+
+	static readonly flags = {
+		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.",
+		}),
+		install: checkFlags.install,
+		...BaseCommand.flags,
+	} as const;
+
+	static readonly examples = [
+		{
+			description: "Generate changelogs for the client release group.",
+			command: "<%= config.bin %> <%= command.id %> --releaseGroup client",
+		},
+	];
+
+	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 { install, releaseGroup } = this.flags;
+
+		if (releaseGroup === undefined) {
+			this.error("ReleaseGroup is possibly 'undefined'");
+		}
+
+		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);
+
+		// 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 = 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();
+
+		// 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(this.processPackage(pkg, bumpType));
+		}
+		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 },
+			);
+		}
+
+		// 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..63047b82e125 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
@@ -21,12 +21,19 @@ import { BaseCommandWithBuildProject } from "../../../library/index.js";
  * 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 =
-		"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. 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"];
 
diff --git a/build-tools/packages/build-cli/src/test/commands/legacy/generate/changelog.test.ts b/build-tools/packages/build-cli/src/test/commands/legacy/generate/changelog.test.ts
new file mode 100644
index 000000000000..a3444c707fd0
--- /dev/null
+++ b/build-tools/packages/build-cli/src/test/commands/legacy/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("legacy 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
+	 * - 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
index 5a0fa678b055..8d8399a3ea6d 100644
--- 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
@@ -19,9 +19,24 @@ describe("vnext generate changelog command", () => {
 	 * - changelogs.test.ts tests updateChangelogs()
 	 * - canonicalizeChangesets.test.ts tests canonicalizeChangesets()
 	 *
-	 * These integration tests should be expanded when the command is ready for production use.
+	 * 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