@ucdjs/release-scripts 0.1.0-beta.32 → 0.1.0-beta.34

package/dist/index.mjs

@@ -1,21 +1,98 @@
 import { t as Eta } from "./eta-BV8TCRDW.mjs";
 import { Console, Context, Data, Effect, Layer, Schema } from "effect";
+import process from "node:process";
 import path from "node:path";
 import { Command, CommandExecutor } from "@effect/platform";
 import { NodeCommandExecutor, NodeFileSystem } from "@effect/platform-node";
 import * as CommitParser from "commit-parser";
-import process from "node:process";
 import semver from "semver";
 import fs from "node:fs/promises";
 import prompts from "prompts";
 
+//#region src/options.ts
+const DEFAULT_PR_BODY_TEMPLATE = `## Summary\n\nThis PR contains the following changes:\n\n- Updated package versions\n- Updated changelogs\n\n## Packages\n\nThe following packages will be released:\n\n{{packages}}`;
+const DEFAULT_CHANGELOG_TEMPLATE = `# Changelog\n\n{{releases}}`;
+const DEFAULT_TYPES = {
+	feat: {
+		title: "🚀 Features",
+		color: "green"
+	},
+	fix: {
+		title: "🐞 Bug Fixes",
+		color: "red"
+	},
+	refactor: {
+		title: "🔧 Code Refactoring",
+		color: "blue"
+	},
+	perf: {
+		title: "🏎 Performance",
+		color: "orange"
+	},
+	docs: {
+		title: "📚 Documentation",
+		color: "purple"
+	},
+	style: {
+		title: "🎨 Styles",
+		color: "pink"
+	}
+};
+function normalizeReleaseScriptsOptions(options) {
+	const { workspaceRoot = process.cwd(), githubToken = "", repo: fullRepo, packages = true, branch = {}, globalCommitMode = "dependencies", pullRequest = {}, changelog = {}, types = {}, dryRun = false, npm = {}, prompts = {} } = options;
+	const token = githubToken.trim();
+	if (!token) throw new Error("GitHub token is required. Pass it in via options.");
+	if (!fullRepo || !fullRepo.trim() || !fullRepo.includes("/")) throw new Error("Repository (repo) is required. Specify in 'owner/repo' format (e.g., 'octocat/hello-world').");
+	const [owner, repo] = fullRepo.split("/");
+	if (!owner || !repo) throw new Error(`Invalid repo format: "${fullRepo}". Expected format: "owner/repo" (e.g., "octocat/hello-world").`);
+	const normalizedPackages = typeof packages === "object" && !Array.isArray(packages) ? {
+		exclude: packages.exclude ?? [],
+		include: packages.include ?? [],
+		excludePrivate: packages.excludePrivate ?? false
+	} : packages;
+	const isCI = process.env.CI === "true" || process.env.GITHUB_ACTIONS === "true";
+	return {
+		dryRun,
+		workspaceRoot,
+		githubToken: token,
+		owner,
+		repo,
+		packages: normalizedPackages,
+		branch: {
+			release: branch.release ?? "release/next",
+			default: branch.default ?? "main"
+		},
+		globalCommitMode,
+		pullRequest: {
+			title: pullRequest.title ?? "chore: release new version",
+			body: pullRequest.body ?? DEFAULT_PR_BODY_TEMPLATE
+		},
+		changelog: {
+			enabled: changelog.enabled ?? true,
+			template: changelog.template ?? DEFAULT_CHANGELOG_TEMPLATE,
+			emojis: changelog.emojis ?? true
+		},
+		types: options.types ? {
+			...DEFAULT_TYPES,
+			...types
+		} : DEFAULT_TYPES,
+		npm: {
+			otp: npm.otp,
+			provenance: npm.provenance ?? true
+		},
+		prompts: { versions: prompts.versions ?? !isCI }
+	};
+}
+var ReleaseScriptsOptions = class extends Context.Tag("@ucdjs/release-scripts/ReleaseScriptsOptions")() {};
+
+//#endregion
 //#region src/utils/changelog-formatters.ts
 const eta$1 = new Eta();
 /**
 * Pure function to parse commits into changelog entries
 */
 function parseCommits(commits) {
-	return commits.filter((commit) => commit.isConventional).map((commit) => ({
+	return commits.filter((commit) => commit.isConventional).filter((commit) => commit.type !== "chore").map((commit) => ({
 		type: commit.type || "other",
 		scope: commit.scope,
 		description: commit.description,
@@ -25,6 +102,11 @@ function parseCommits(commits) {
 		references: commit.references.map((ref) => ({
 			type: ref.type,
 			value: ref.value
+		})),
+		authors: commit.authors.map((author) => ({
+			name: author.name,
+			email: author.email,
+			profile: author.profile
 		}))
 	}));
 }
@@ -43,10 +125,7 @@ function groupByType(entries) {
 /**
 * Changelog template for Eta rendering
 */
-const CHANGELOG_TEMPLATE = `# <%= it.packageName %> v<%= it.version %>
-
-**Previous version**: \`<%= it.previousVersion %>\`
-**New version**: \`<%= it.version %>\`
+const CHANGELOG_ENTRY_TEMPLATE = `## <%= it.version %>
 
 <% if (it.entries.length === 0) { %>
 *No conventional commits found.*
@@ -55,25 +134,58 @@ const CHANGELOG_TEMPLATE = `# <%= it.packageName %> v<%= it.version %>
 <% const typeOrder = ["breaking", "feat", "fix", "perf", "docs", "style", "refactor", "test", "build", "ci", "chore"]; %>
 <% const typeLabels = {
   breaking: "💥 Breaking Changes",
-  feat: "✨ Features",
-  fix: "🐛 Bug Fixes",
+  feat: "🚀 Features",
+  fix: "🐞 Bug Fixes",
   perf: "⚡ Performance",
-  docs: "📝 Documentation",
-  style: "💄 Styling",
-  refactor: "♻️ Refactoring",
-  test: "✅ Tests",
-  build: "📦 Build",
-  ci: "👷 CI",
-  chore: "🔧 Chores"
+  docs: "Documentation",
+  style: "Styling",
+  refactor: "Refactoring",
+  test: "Tests",
+  build: "Build",
+  ci: "CI",
+  chore: "Chores"
+}; %>
+
+<% const formatAuthor = (entry) => {
+  const author = entry.authors && entry.authors.length > 0 ? entry.authors[0] : null;
+  if (!author) return "unknown";
+  if (author.profile && author.profile.includes("github.com/")) {
+    const username = author.profile.split("github.com/")[1];
+    return "@" + username;
+  }
+  return author.name || "unknown";
+}; %>
+
+<% const commitUrl = (hash) => it.repo ? "https://github.com/" + it.repo + "/commit/" + hash : ""; %>
+
+<% const formatLine = (entry) => {
+  const authorText = formatAuthor(entry);
+  const commitLink = commitUrl(entry.hash);
+  const hashPart = commitLink
+    ? " [<samp>(" + entry.shortHash + ")</samp>](" + commitLink + ")"
+    : " <samp>(" + entry.shortHash + ")</samp>";
+  return entry.description + " &nbsp;-&nbsp; by " + authorText + hashPart;
 }; %>
 
 <% for (const type of typeOrder) { %>
 <% const entries = groups.get(type); %>
 <% if (entries && entries.length > 0) { %>
-## <%= typeLabels[type] || type.charAt(0).toUpperCase() + type.slice(1) %>
+### &nbsp;&nbsp;&nbsp;<%= typeLabels[type] || type.charAt(0).toUpperCase() + type.slice(1) %>
 
-<% for (const entry of entries) { %>
-- <% if (entry.scope) { %>**<%= entry.scope %>**: <% } %><%= entry.description %><% if (entry.references.length > 0) { %> (<%= entry.references.map(r => "#" + r.value).join(", ") %>)<% } %> (\`<%= entry.shortHash %>\`)
+<% const unscoped = entries.filter(e => !e.scope); %>
+<% const scoped = entries.filter(e => e.scope); %>
+
+<% for (const entry of unscoped) { %>
+- <%= formatLine(entry) %>
+<% } %>
+
+<% const scopes = [...new Set(scoped.map(e => e.scope))]; %>
+<% for (const scope of scopes) { %>
+- **<%= scope %>**:
+  <% const scopeEntries = scoped.filter(e => e.scope === scope); %>
+  <% for (const entry of scopeEntries) { %>
+  - <%= formatLine(entry) %>
+  <% } %>
 <% } %>
 
 <% } %>
@@ -81,37 +193,56 @@ const CHANGELOG_TEMPLATE = `# <%= it.packageName %> v<%= it.version %>
 
 <% for (const [type, entries] of groups) { %>
 <% if (!typeOrder.includes(type)) { %>
-## <%= type.charAt(0).toUpperCase() + type.slice(1) %>
+### &nbsp;&nbsp;&nbsp;<%= type.charAt(0).toUpperCase() + type.slice(1) %>
 
 <% for (const entry of entries) { %>
-- <% if (entry.scope) { %>**<%= entry.scope %>**: <% } %><%= entry.description %> (\`<%= entry.shortHash %>\`)
+- <%= formatLine(entry) %>
 <% } %>
 
 <% } %>
 <% } %>
+
+<% if (it.repo) { %>
+##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](https://github.com/<%= it.repo %>/compare/v<%= it.previousVersion %>...v<%= it.version %>)
+<% } %>
 <% } %>`;
 /**
 * Pure function to format changelog as markdown
 */
-function formatChangelogMarkdown(changelog) {
+function formatChangelogEntryMarkdown(changelog) {
 	const groups = groupByType(changelog.entries);
-	return eta$1.renderString(CHANGELOG_TEMPLATE, {
+	return eta$1.renderString(CHANGELOG_ENTRY_TEMPLATE, {
 		packageName: changelog.packageName,
 		version: changelog.version,
 		previousVersion: changelog.previousVersion,
 		entries: changelog.entries,
-		groupedEntries: groups
+		groupedEntries: groups,
+		repo: changelog.repo
 	});
 }
+function appendChangelogEntry(existingContent, changelogEntry, packageName) {
+	const entry = changelogEntry.trim();
+	if (!entry) return existingContent ?? `# ${packageName}\n`;
+	if (!existingContent || existingContent.trim() === "") return `# ${packageName}\n\n${entry}\n`;
+	const lines = existingContent.split("\n");
+	const firstLine = lines[0]?.trim() ?? "";
+	if (!firstLine.startsWith("# ")) return `# ${packageName}\n\n${entry}\n\n${existingContent.trim()}\n`;
+	let insertIndex = 1;
+	while (insertIndex < lines.length && lines[insertIndex]?.trim() === "") insertIndex++;
+	const rest = lines.slice(insertIndex).join("\n").trim();
+	if (rest) return `${firstLine}\n\n${entry}\n\n${rest}\n`;
+	return `${firstLine}\n\n${entry}\n`;
+}
 /**
 * Pure function to create a changelog object
 */
-function createChangelog(packageName, version, previousVersion, commits) {
+function createChangelog(packageName, version, previousVersion, commits, repo) {
 	return {
 		packageName,
 		version,
 		previousVersion,
-		entries: parseCommits(commits)
+		entries: parseCommits(commits),
+		repo
 	};
 }
 
@@ -119,12 +250,19 @@ function createChangelog(packageName, version, previousVersion, commits) {
 //#region src/services/changelog.service.ts
 var ChangelogService = class extends Effect.Service()("@ucdjs/release-scripts/ChangelogService", {
 	effect: Effect.gen(function* () {
+		const config = yield* ReleaseScriptsOptions;
 		function generateChangelog(pkg, newVersion, commits) {
 			return Effect.gen(function* () {
-				const changelog = createChangelog(pkg.name, newVersion, pkg.version, commits);
+				const changelog = createChangelog(pkg.name, newVersion, pkg.version, commits, `${config.owner}/${config.repo}`);
+				const entryMarkdown = formatChangelogEntryMarkdown(changelog);
 				return {
 					changelog,
-					markdown: formatChangelogMarkdown(changelog),
+					markdown: appendChangelogEntry(yield* Effect.tryPromise({
+						try: async () => {
+							return await (await import("node:fs/promises")).readFile(`${pkg.path}/CHANGELOG.md`, "utf-8");
+						},
+						catch: (err) => err
+					}).pipe(Effect.catchAll(() => Effect.succeed(""))), entryMarkdown, pkg.name),
 					filePath: `${pkg.path}/CHANGELOG.md`
 				};
 			});
@@ -213,83 +351,6 @@ var NPMError = class extends Data.TaggedError("NPMError") {};
 var PublishError = class extends Data.TaggedError("PublishError") {};
 var TagError = class extends Data.TaggedError("TagError") {};
 
-//#endregion
-//#region src/options.ts
-const DEFAULT_PR_BODY_TEMPLATE = `## Summary\n\nThis PR contains the following changes:\n\n- Updated package versions\n- Updated changelogs\n\n## Packages\n\nThe following packages will be released:\n\n{{packages}}`;
-const DEFAULT_CHANGELOG_TEMPLATE = `# Changelog\n\n{{releases}}`;
-const DEFAULT_TYPES = {
-	feat: {
-		title: "🚀 Features",
-		color: "green"
-	},
-	fix: {
-		title: "🐞 Bug Fixes",
-		color: "red"
-	},
-	refactor: {
-		title: "🔧 Code Refactoring",
-		color: "blue"
-	},
-	perf: {
-		title: "🏎 Performance",
-		color: "orange"
-	},
-	docs: {
-		title: "📚 Documentation",
-		color: "purple"
-	},
-	style: {
-		title: "🎨 Styles",
-		color: "pink"
-	}
-};
-function normalizeReleaseScriptsOptions(options) {
-	const { workspaceRoot = process.cwd(), githubToken = "", repo: fullRepo, packages = true, branch = {}, globalCommitMode = "dependencies", pullRequest = {}, changelog = {}, types = {}, dryRun = false, npm = {}, prompts = {} } = options;
-	const token = githubToken.trim();
-	if (!token) throw new Error("GitHub token is required. Pass it in via options.");
-	if (!fullRepo || !fullRepo.trim() || !fullRepo.includes("/")) throw new Error("Repository (repo) is required. Specify in 'owner/repo' format (e.g., 'octocat/hello-world').");
-	const [owner, repo] = fullRepo.split("/");
-	if (!owner || !repo) throw new Error(`Invalid repo format: "${fullRepo}". Expected format: "owner/repo" (e.g., "octocat/hello-world").`);
-	const normalizedPackages = typeof packages === "object" && !Array.isArray(packages) ? {
-		exclude: packages.exclude ?? [],
-		include: packages.include ?? [],
-		excludePrivate: packages.excludePrivate ?? false
-	} : packages;
-	const isCI = process.env.CI === "true" || process.env.GITHUB_ACTIONS === "true";
-	return {
-		dryRun,
-		workspaceRoot,
-		githubToken: token,
-		owner,
-		repo,
-		packages: normalizedPackages,
-		branch: {
-			release: branch.release ?? "release/next",
-			default: branch.default ?? "main"
-		},
-		globalCommitMode,
-		pullRequest: {
-			title: pullRequest.title ?? "chore: release new version",
-			body: pullRequest.body ?? DEFAULT_PR_BODY_TEMPLATE
-		},
-		changelog: {
-			enabled: changelog.enabled ?? true,
-			template: changelog.template ?? DEFAULT_CHANGELOG_TEMPLATE,
-			emojis: changelog.emojis ?? true
-		},
-		types: options.types ? {
-			...DEFAULT_TYPES,
-			...types
-		} : DEFAULT_TYPES,
-		npm: {
-			otp: npm.otp,
-			provenance: npm.provenance ?? true
-		},
-		prompts: { versions: prompts.versions ?? !isCI }
-	};
-}
-var ReleaseScriptsOptions = class extends Context.Tag("@ucdjs/release-scripts/ReleaseScriptsOptions")() {};
-
 //#endregion
 //#region src/services/git.service.ts
 var GitService = class extends Effect.Service()("@ucdjs/release-scripts/GitService", {
@@ -784,6 +845,9 @@ var WorkspaceService = class extends Effect.Service()("@ucdjs/release-scripts/Wo
 				message: `Invalid package.json for ${pkgPath}`,
 				cause: e,
 				operation: "readPackageJson"
+			})), Effect.map((validated) => ({
+				...json,
+				...validated
 			})))));
 		}
 		function writePackageJson(pkgPath, json) {
@@ -1009,32 +1073,32 @@ var VersionCalculatorService = class extends Effect.Service()("@ucdjs/release-sc
 
 //#endregion
 //#region src/services/version-prompt.service.ts
+const GREY = "\x1B[90m";
+const RESET = "\x1B[0m";
+const NON_VERSIONING_TYPES = new Set([
+	"chore",
+	"docs",
+	"style",
+	"test",
+	"ci",
+	"build",
+	"refactor"
+]);
+function isVersioningCommit(commit) {
+	return !NON_VERSIONING_TYPES.has(commit.type) || commit.isBreaking;
+}
 function formatCommit(commit) {
-	const typeEmoji = getTypeEmoji(commit.type);
+	const isGreyed = !isVersioningCommit(commit);
 	const scope = commit.scope ? `(${commit.scope})` : "";
-	const breaking = commit.isBreaking ? "!" : "";
-	const header = commit.isConventional ? `${typeEmoji} ${commit.type}${scope}${breaking}: ${commit.description}` : commit.message.split("\n")[0] ?? commit.message;
-	const refs = commit.references.map((r) => r.type === "pull-request" ? `#${r.value}` : `#${r.value}`).join(" ");
-	return refs ? `${header} (${refs})` : header;
-}
-function getTypeEmoji(type) {
-	return {
-		feat: "✨",
-		fix: "🐛",
-		docs: "📚",
-		style: "💎",
-		refactor: "🔧",
-		perf: "🏎️",
-		test: "🧪",
-		build: "📦",
-		ci: "👷",
-		chore: "🔧",
-		revert: "⏪"
-	}[type] || "📝";
+	const description = commit.isConventional ? commit.description : commit.message.split("\n")[0] ?? commit.message;
+	const line = `${commit.shortHash}  ${commit.type.padEnd(12)}${scope.padEnd(10)}: ${description}`;
+	return isGreyed ? `${GREY}${line}${RESET}` : line;
 }
 function formatCommits(commits) {
 	if (commits.length === 0) return "  No commits since the last version";
-	return commits.slice(0, 10).map((c) => `  ${formatCommit(c)}`).join("\n") + (commits.length > 10 ? `\n  ... and ${commits.length - 10} more` : "");
+	const lines = commits.slice(0, 10).map((c) => `  ${formatCommit(c)}`);
+	if (commits.length > 10) lines.push(`  ${GREY}... and ${commits.length - 10} more${RESET}`);
+	return lines.join("\n");
 }
 function getPrereleaseInfo(version) {
 	const parsed = semver.parse(version);
@@ -1081,8 +1145,8 @@ function generateVersionOptions(currentVersion, conventionalBump, prereleaseInfo
 			}
 		});
 	}
-	const conventionalVersion = conventionalBump !== "none" ? semver.inc(currentVersion, conventionalBump) : currentVersion;
-	if (conventionalVersion && conventionalVersion !== currentVersion) options.push({
+	const conventionalVersion = conventionalBump !== "none" ? semver.inc(currentVersion, conventionalBump) : null;
+	if (conventionalVersion) options.push({
 		title: `conventional ${conventionalVersion}`,
 		value: {
 			version: conventionalVersion,
@@ -1156,6 +1220,11 @@ function generateVersionOptions(currentVersion, conventionalBump, prereleaseInfo
 	});
 	return options;
 }
+function findDefaultIndex(options, conventionalBump) {
+	if (conventionalBump === "none") return 0;
+	const conventionalIndex = options.findIndex((o) => o.title.startsWith("conventional"));
+	return conventionalIndex >= 0 ? conventionalIndex : 0;
+}
 async function promptForCustomVersion(currentVersion) {
 	return (await prompts({
 		type: "text",
@@ -1171,27 +1240,37 @@ var VersionPromptService = class extends Effect.Service()("@ucdjs/release-script
 	effect: Effect.gen(function* () {
 		const config = yield* ReleaseScriptsOptions;
 		let applyToAllRemainingChoice = null;
+		let isCancelled = false;
 		function promptForVersion(pkg, conventionalBump, remainingCount) {
 			return Effect.async((resume) => {
+				if (isCancelled) {
+					resume(Effect.succeed({
+						newVersion: pkg.version,
+						bumpType: "none",
+						applyToAllRemaining: false,
+						cancelled: true
+					}));
+					return;
+				}
 				const allCommits = [...pkg.commits, ...pkg.globalCommits];
 				const prereleaseInfo = getPrereleaseInfo(pkg.version);
+				const commitCount = allCommits.length;
 				console.log("");
-				console.log(`\x1B[1m${pkg.name}\x1B[0m`);
-				console.log(`Current version: ${pkg.version}`);
-				console.log("");
-				console.log("Commits:");
+				console.log(`${commitCount} commit${commitCount === 1 ? "" : "s"} since the last version:`);
 				console.log(formatCommits(allCommits));
 				console.log("");
 				if (applyToAllRemainingChoice) {
 					const result = {
 						newVersion: applyToAllRemainingChoice.version === "custom" ? pkg.version : applyToAllRemainingChoice.version,
 						bumpType: applyToAllRemainingChoice.bumpType,
-						applyToAllRemaining: false
+						applyToAllRemaining: false,
+						cancelled: false
 					};
 					resume(Effect.succeed(result));
 					return;
 				}
 				const options = generateVersionOptions(pkg.version, conventionalBump, prereleaseInfo);
+				const defaultIndex = findDefaultIndex(options, conventionalBump);
 				if (remainingCount > 1) options.push({
 					title: "apply-to-all ›",
 					value: {
@@ -1202,18 +1281,21 @@ var VersionPromptService = class extends Effect.Service()("@ucdjs/release-script
 				prompts({
 					type: "select",
 					name: "choice",
-					message: `Select version`,
+					message: `Current version ${pkg.version}`,
 					choices: options.map((o) => ({
 						title: o.title,
 						value: o.value
 					})),
+					initial: defaultIndex,
 					hint: "Use arrow keys to navigate, enter to select"
 				}).then(async (response) => {
 					if (!response.choice) {
+						isCancelled = true;
 						const result = {
 							newVersion: pkg.version,
 							bumpType: "none",
-							applyToAllRemaining: false
+							applyToAllRemaining: false,
+							cancelled: true
 						};
 						resume(Effect.succeed(result));
 						return;
@@ -1227,39 +1309,66 @@ var VersionPromptService = class extends Effect.Service()("@ucdjs/release-script
 							choices: applyOptions.map((o) => ({
 								title: o.title,
 								value: o.value
-							}))
+							})),
+							initial: findDefaultIndex(applyOptions, conventionalBump)
 						});
-						if (applyResponse.choice) {
-							if (applyResponse.choice.version === "custom") {
-								const customVersion = await promptForCustomVersion(pkg.version);
-								if (customVersion) applyToAllRemainingChoice = {
-									version: customVersion,
-									bumpType: applyResponse.choice.bumpType
-								};
-							} else applyToAllRemainingChoice = applyResponse.choice;
-							const result = {
-								newVersion: applyToAllRemainingChoice?.version || pkg.version,
-								bumpType: applyToAllRemainingChoice?.bumpType || "none",
-								applyToAllRemaining: true
+						if (!applyResponse.choice) {
+							isCancelled = true;
+							resume(Effect.succeed({
+								newVersion: pkg.version,
+								bumpType: "none",
+								applyToAllRemaining: false,
+								cancelled: true
+							}));
+							return;
+						}
+						if (applyResponse.choice.version === "custom") {
+							const customVersion = await promptForCustomVersion(pkg.version);
+							if (!customVersion) {
+								isCancelled = true;
+								resume(Effect.succeed({
+									newVersion: pkg.version,
+									bumpType: "none",
+									applyToAllRemaining: false,
+									cancelled: true
+								}));
+								return;
+							}
+							applyToAllRemainingChoice = {
+								version: customVersion,
+								bumpType: applyResponse.choice.bumpType
 							};
-							resume(Effect.succeed(result));
-						} else promptForVersion(pkg, conventionalBump, remainingCount).pipe(Effect.runPromise).then((r) => resume(Effect.succeed(r)));
+						} else applyToAllRemainingChoice = applyResponse.choice;
+						const result = {
+							newVersion: applyToAllRemainingChoice?.version || pkg.version,
+							bumpType: applyToAllRemainingChoice?.bumpType || "none",
+							applyToAllRemaining: true,
+							cancelled: false
+						};
+						resume(Effect.succeed(result));
 						return;
 					}
 					let selectedVersion = response.choice.version;
-					let selectedBumpType = response.choice.bumpType;
+					const selectedBumpType = response.choice.bumpType;
 					if (selectedVersion === "custom") {
 						const customVersion = await promptForCustomVersion(pkg.version);
-						if (customVersion) selectedVersion = customVersion;
-						else {
-							selectedVersion = pkg.version;
-							selectedBumpType = "none";
+						if (!customVersion) {
+							isCancelled = true;
+							resume(Effect.succeed({
+								newVersion: pkg.version,
+								bumpType: "none",
+								applyToAllRemaining: false,
+								cancelled: true
+							}));
+							return;
 						}
+						selectedVersion = customVersion;
 					}
 					const result = {
 						newVersion: selectedVersion,
 						bumpType: selectedBumpType,
-						applyToAllRemaining: false
+						applyToAllRemaining: false,
+						cancelled: false
 					};
 					resume(Effect.succeed(result));
 				});
@@ -1270,6 +1379,7 @@ var VersionPromptService = class extends Effect.Service()("@ucdjs/release-script
 			isEnabled: config.prompts.versions,
 			resetApplyToAll: () => {
 				applyToAllRemainingChoice = null;
+				isCancelled = false;
 			}
 		};
 	}),
@@ -1473,36 +1583,38 @@ function constructPrepareProgram(config) {
 		const versionPrompt = yield* VersionPromptService;
 		const workspace = yield* WorkspaceService;
 		yield* git.workspace.assertWorkspaceReady;
+		const startingBranch = yield* git.branches.get;
+		if (startingBranch !== config.branch.default) return yield* Effect.fail(/* @__PURE__ */ new Error(`Prepare must be run on the default branch "${config.branch.default}". Current branch: "${startingBranch}"`));
 		let releasePullRequest = yield* github.getPullRequestByBranch(config.branch.release);
 		const isNewRelease = !releasePullRequest;
 		const branchExists = yield* git.branches.exists(config.branch.release);
 		if (!branchExists) {
-			yield* Console.log(`🌿 Creating release branch "${config.branch.release}" from "${config.branch.default}"...`);
+			yield* Console.log(`Creating release branch "${config.branch.release}" from "${config.branch.default}"...`);
 			yield* git.branches.create(config.branch.release, config.branch.default);
-			yield* Console.log(`✅ Release branch created.`);
+			yield* Console.log(`Release branch created.`);
 		}
 		if ((yield* git.branches.get) !== config.branch.release) {
 			yield* git.branches.checkout(config.branch.release);
-			yield* Console.log(`✅ Checked out to release branch "${config.branch.release}".`);
+			yield* Console.log(`Checked out to release branch "${config.branch.release}".`);
 		}
 		if (!isNewRelease || branchExists) {
-			yield* Console.log(`🔄 Rebasing "${config.branch.release}" onto "${config.branch.default}"...`);
+			yield* Console.log(`Rebasing "${config.branch.release}" onto "${config.branch.default}"...`);
 			yield* git.branches.rebase(config.branch.default);
-			yield* Console.log(`✅ Rebase complete.`);
+			yield* Console.log(`Rebase complete.`);
 		}
 		const overrides = yield* loadOverrides({
 			sha: config.branch.default,
 			overridesPath: ".github/ucdjs-release.overrides.json"
 		});
-		if (Object.keys(overrides).length > 0) yield* Console.log("📋 Loaded version overrides:", overrides);
+		if (Object.keys(overrides).length > 0) yield* Console.log("Loaded version overrides:", overrides);
 		const originalBranch = yield* git.branches.get;
 		yield* git.branches.checkout(config.branch.default);
 		const packages = yield* workspace.discoverWorkspacePackages.pipe(Effect.flatMap(mergePackageCommitsIntoPackages), Effect.flatMap((pkgs) => mergeCommitsAffectingGloballyIntoPackage(pkgs, config.globalCommitMode)));
-		yield* Console.log(`📦 Discovered ${packages.length} packages with commits.`);
+		yield* Console.log(`Discovered ${packages.length} packages with commits.`);
 		yield* dependencyGraph.topologicalOrder(packages);
 		const releases = [];
 		if (versionPrompt.isEnabled) {
-			yield* Console.log("\n🎯 Interactive version selection enabled.\n");
+			yield* Console.log("\nInteractive version selection enabled.\n");
 			versionPrompt.resetApplyToAll();
 			for (let i = 0; i < packages.length; i++) {
 				const pkg = packages[i];
@@ -1528,6 +1640,14 @@ function constructPrepareProgram(config) {
 					continue;
 				}
 				const result = yield* versionPrompt.promptForVersion(pkg, conventionalBump, remainingCount);
+				if (result.cancelled) {
+					yield* Console.log("\nCancelled by user.");
+					if (startingBranch !== (yield* git.branches.get)) {
+						yield* git.branches.checkout(startingBranch);
+						yield* Console.log(`Switched back to "${startingBranch}".`);
+					}
+					return yield* Effect.fail(/* @__PURE__ */ new Error("Release preparation cancelled."));
+				}
 				releases.push({
 					package: {
 						name: pkg.name,
@@ -1548,12 +1668,12 @@ function constructPrepareProgram(config) {
 			releases.push(...calculatedReleases);
 		}
 		const releasesCount = releases.length;
-		yield* Console.log(`\n📊 ${releasesCount} package${releasesCount === 1 ? "" : "s"} will be released.`);
+		yield* Console.log(`\n${releasesCount} package${releasesCount === 1 ? "" : "s"} will be released.`);
 		yield* git.branches.checkout(originalBranch);
-		yield* Console.log("✏️  Updating package.json files...");
+		yield* Console.log("Updating package.json files...");
 		yield* packageUpdater.applyReleases(packages, releases);
-		yield* Console.log("✅ package.json files updated.");
-		yield* Console.log("📝 Generating changelogs...");
+		yield* Console.log("package.json files updated.");
+		yield* Console.log("Generating changelogs...");
 		const changelogFiles = [];
 		for (const release of releases) {
 			const pkg = packages.find((p) => p.name === release.package.name);
@@ -1567,28 +1687,28 @@ function constructPrepareProgram(config) {
 			});
 			changelogFiles.push(result.filePath);
 		}
-		yield* Console.log(`✅ Generated ${changelogFiles.length} changelog file${changelogFiles.length === 1 ? "" : "s"}.`);
+		yield* Console.log(`Generated ${changelogFiles.length} changelog file${changelogFiles.length === 1 ? "" : "s"}.`);
 		const filesToStage = [...releases.map((r) => `${r.package.path}/package.json`), ...changelogFiles];
-		yield* Console.log(`📌 Staging ${filesToStage.length} file${filesToStage.length === 1 ? "" : "s"}...`);
+		yield* Console.log(`Staging ${filesToStage.length} file${filesToStage.length === 1 ? "" : "s"}...`);
 		yield* git.commits.stage(filesToStage);
 		const commitMessage = `chore(release): prepare release
 
 ${releasesCount} package${releasesCount === 1 ? "" : "s"} updated:
 ${releases.map((r) => `  - ${r.package.name}@${r.newVersion}`).join("\n")}`;
-		yield* Console.log("💾 Creating commit...");
+		yield* Console.log("Creating commit...");
 		yield* git.commits.write(commitMessage);
-		yield* Console.log("✅ Commit created.");
-		yield* Console.log(`⬆️  Pushing to "${config.branch.release}"...`);
+		yield* Console.log("Commit created.");
+		yield* Console.log(`Pushing to "${config.branch.release}"...`);
 		if (isNewRelease && !branchExists) yield* git.commits.push(config.branch.release);
 		else yield* git.commits.forcePush(config.branch.release);
-		yield* Console.log(`✅ Push complete.`);
+		yield* Console.log(`Push complete.`);
 		const prBody = yield* github.generateReleasePRBody(releases.map((r) => ({
 			packageName: r.package.name,
 			version: r.newVersion,
 			previousVersion: r.package.version
 		})));
 		if (isNewRelease) {
-			yield* Console.log("📋 Creating release pull request...");
+			yield* Console.log("Creating release pull request...");
 			releasePullRequest = yield* github.createPullRequest({
 				title: config.pullRequest.title,
 				body: prBody,
@@ -1596,15 +1716,17 @@ ${releases.map((r) => `  - ${r.package.name}@${r.newVersion}`).join("\n")}`;
 				base: config.branch.default,
 				draft: true
 			});
-			yield* Console.log(`✅ Release pull request #${releasePullRequest.number} created.`);
+			yield* Console.log(`Release pull request #${releasePullRequest.number} created.`);
 		} else {
-			yield* Console.log("📄 Updating pull request...");
+			yield* Console.log("Updating pull request...");
 			yield* github.updatePullRequest(releasePullRequest.number, { body: prBody });
-			yield* Console.log("✅ Pull request updated.");
+			yield* Console.log("Pull request updated.");
+		}
+		yield* Console.log(`\nRelease preparation complete! View PR: #${releasePullRequest.number}`);
+		if (startingBranch !== (yield* git.branches.get)) {
+			yield* git.branches.checkout(startingBranch);
+			yield* Console.log(`Switched back to "${startingBranch}".`);
 		}
-		yield* Console.log(`\n🎉 Release preparation complete! View PR: #${releasePullRequest.number}`);
-		yield* git.branches.checkout(config.branch.default);
-		yield* Console.log(`✅ Switched back to "${config.branch.default}".`);
 	});
 }
 
@@ -1633,9 +1755,9 @@ function constructPublishProgram(config) {
 		yield* git.workspace.assertWorkspaceReady;
 		const currentBranch = yield* git.branches.get;
 		if (currentBranch !== config.branch.default) return yield* Effect.fail(/* @__PURE__ */ new Error(`Publish must be run on the default branch "${config.branch.default}". Current branch: "${currentBranch}"`));
-		yield* Console.log(`✅ On default branch "${config.branch.default}".`);
+		yield* Console.log(`On default branch "${config.branch.default}".`);
 		const publicPackages = (yield* workspace.discoverWorkspacePackages).filter((pkg) => !pkg.packageJson.private);
-		yield* Console.log(`📦 Found ${publicPackages.length} public package${publicPackages.length === 1 ? "" : "s"} to check.`);
+		yield* Console.log(`Found ${publicPackages.length} public package${publicPackages.length === 1 ? "" : "s"} to check.`);
 		const orderedPackages = yield* dependencyGraph.topologicalOrder(publicPackages);
 		const results = [];
 		for (const updateOrder of orderedPackages) {
@@ -1643,7 +1765,7 @@ function constructPublishProgram(config) {
 			const version = pkg.version;
 			const tagName = `${pkg.name}@${version}`;
 			if (yield* npm.versionExists(pkg.name, version)) {
-				yield* Console.log(`⏭️  Skipping ${pkg.name}@${version} - already published.`);
+				yield* Console.log(`Skipping ${pkg.name}@${version} - already published.`);
 				results.push({
 					packageName: pkg.name,
 					version,
@@ -1652,11 +1774,11 @@ function constructPublishProgram(config) {
 				});
 				continue;
 			}
-			yield* Console.log(`🔨 Building ${pkg.name}...`);
+			yield* Console.log(`Building ${pkg.name}...`);
 			yield* buildPackage(pkg.path);
-			yield* Console.log(`✅ Build complete for ${pkg.name}.`);
+			yield* Console.log(`Build complete for ${pkg.name}.`);
 			const distTag = getDistTag(version);
-			yield* Console.log(`🚀 Publishing ${pkg.name}@${version} with tag "${distTag}"...`);
+			yield* Console.log(`Publishing ${pkg.name}@${version} with tag "${distTag}"...`);
 			const publishResult = yield* npm.publish({
 				packagePath: pkg.path,
 				tagName: distTag,
@@ -1668,13 +1790,13 @@ function constructPublishProgram(config) {
 				error: err
 			})));
 			if (publishResult.success) {
-				yield* Console.log(`✅ Published ${pkg.name}@${version}.`);
+				yield* Console.log(`Published ${pkg.name}@${version}.`);
 				if (!config.dryRun) {
-					yield* Console.log(`🏷️  Creating tag ${tagName}...`);
+					yield* Console.log(`Creating tag ${tagName}...`);
 					yield* git.tags.create(tagName, `Release ${tagName}`);
 					yield* git.tags.push(tagName);
-					yield* Console.log(`✅ Tag ${tagName} created and pushed.`);
-				} else yield* Console.log(`🏷️  [Dry Run] Would create and push tag ${tagName}.`);
+					yield* Console.log(`Tag ${tagName} created and pushed.`);
+				} else yield* Console.log(`[Dry Run] Would create and push tag ${tagName}.`);
 				results.push({
 					packageName: pkg.name,
 					version,
@@ -1682,7 +1804,7 @@ function constructPublishProgram(config) {
 				});
 			} else {
 				const error = publishResult.error;
-				yield* Console.log(`❌ Failed to publish ${pkg.name}@${version}: ${error.message}`);
+				yield* Console.log(`Failed to publish ${pkg.name}@${version}: ${error.message}`);
 				results.push({
 					packageName: pkg.name,
 					version,
@@ -1694,17 +1816,17 @@ function constructPublishProgram(config) {
 		const published = results.filter((r) => r.status === "published");
 		const skipped = results.filter((r) => r.status === "skipped");
 		const failed = results.filter((r) => r.status === "failed");
-		yield* Console.log("\n📊 Publish Summary:");
+		yield* Console.log("\nPublish Summary:");
 		yield* Console.log(`   Published: ${published.length}`);
 		yield* Console.log(`   Skipped: ${skipped.length}`);
 		yield* Console.log(`   Failed: ${failed.length}`);
 		if (failed.length > 0) {
-			yield* Console.log("\n❌ Failed packages:");
+			yield* Console.log("\nFailed packages:");
 			for (const f of failed) yield* Console.log(`   - ${f.packageName}@${f.version}: ${f.reason}`);
 			return yield* Effect.fail(/* @__PURE__ */ new Error("Some packages failed to publish."));
 		}
-		if (published.length === 0 && skipped.length > 0) yield* Console.log("\n✅ All packages were already published.");
-		else if (published.length > 0) yield* Console.log("\n🎉 Publish complete!");
+		if (published.length === 0 && skipped.length > 0) yield* Console.log("\nAll packages were already published.");
+		else if (published.length > 0) yield* Console.log("\nPublish complete!");
 	});
 }
 
@@ -1790,10 +1912,10 @@ function constructVerifyProgram(config) {
 		yield* git.workspace.assertWorkspaceReady;
 		const releasePullRequest = yield* github.getPullRequestByBranch(config.branch.release);
 		if (!releasePullRequest || !releasePullRequest.head) return yield* Effect.fail(/* @__PURE__ */ new Error(`Release pull request for branch "${config.branch.release}" does not exist.`));
-		yield* Console.log(`✅ Release pull request #${releasePullRequest.number} exists.`);
+		yield* Console.log(`Release pull request #${releasePullRequest.number} exists.`);
 		if ((yield* git.branches.get) !== config.branch.default) {
 			yield* git.branches.checkout(config.branch.default);
-			yield* Console.log(`✅ Checked out to default branch "${config.branch.default}".`);
+			yield* Console.log(`Checked out to default branch "${config.branch.default}".`);
 		}
 		const overrides = yield* loadOverrides({
 			sha: releasePullRequest.head.sha,
@@ -1813,8 +1935,8 @@ function constructVerifyProgram(config) {
 			branchSnapshots.set(pkg.name, snapshot);
 		}
 		const drift = findDrift(packages, releases, branchSnapshots);
-		if (drift.length === 0) yield* Console.log("✅ Release branch is in sync with expected releases.");
-		else yield* Console.log("❌ Release branch is out of sync:", drift);
+		if (drift.length === 0) yield* Console.log("Release branch is in sync with expected releases.");
+		else yield* Console.log("Release branch is out of sync:", drift);
 		const status = drift.length === 0 ? {
 			state: "success",
 			description: "Release artifacts in sync",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.32",
+  "version": "0.1.0-beta.34",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",