preguito 0.2.0 → 0.2.2

package/dist/cli-sea.cjs

@@ -36,7 +36,7 @@ let node_os = require("node:os");
 let node_util = require("node:util");
 let node_readline_promises = require("node:readline/promises");
 
-//#region node_modules/commander/lib/error.js
+//#region ../../node_modules/commander/lib/error.js
 var require_error = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* CommanderError class
@@ -76,7 +76,7 @@ var require_error = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/lib/argument.js
+//#region ../../node_modules/commander/lib/argument.js
 var require_argument = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const { InvalidArgumentError } = require_error();
 	var Argument = class {
@@ -201,7 +201,7 @@ var require_argument = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/lib/help.js
+//#region ../../node_modules/commander/lib/help.js
 var require_help = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const { humanReadableArgName } = require_argument();
 	/**
@@ -663,7 +663,7 @@ var require_help = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/lib/option.js
+//#region ../../node_modules/commander/lib/option.js
 var require_option = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const { InvalidArgumentError } = require_error();
 	var Option = class {
@@ -955,7 +955,7 @@ var require_option = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/lib/suggestSimilar.js
+//#region ../../node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const maxDistance = 3;
 	function editDistance(a, b) {
@@ -1011,7 +1011,7 @@ var require_suggestSimilar = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/lib/command.js
+//#region ../../node_modules/commander/lib/command.js
 var require_command = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const EventEmitter = require("node:events").EventEmitter;
 	const childProcess = require("node:child_process");
@@ -2912,7 +2912,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
 }));
 
 //#endregion
-//#region node_modules/commander/index.js
+//#region ../../node_modules/commander/index.js
 var require_commander = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const { Argument } = require_argument();
 	const { Command } = require_command();
@@ -2936,7 +2936,7 @@ var require_commander = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/commander/esm.mjs
+//#region ../../node_modules/commander/esm.mjs
 var import_commander = /* @__PURE__ */ __toESM(require_commander(), 1);
 const { program: program$1, createCommand, createArgument, createOption, CommanderError, InvalidArgumentError, InvalidOptionArgumentError, Command, Argument, Option, Help } = import_commander.default;
 
@@ -3209,7 +3209,7 @@ async function writeConfig(config) {
 
 //#endregion
 //#region src/commands/commit-parser.ts
-function parsePositionalArgs(args, config) {
+function parsePositionalArgs(args, config, bodyFromFlag) {
 	if (args.length === 0) throw new PrequitoError("No arguments provided. Usage: guito c [card_id] [shortcodes] <message...>");
 	const context = {};
 	let cursor = 0;
@@ -3229,7 +3229,8 @@ function parsePositionalArgs(args, config) {
 	const message = messageParts.join(" ");
 	return {
 		context: mergeContext(config.defaults, context),
-		message
+		message,
+		body: bodyFromFlag
 	};
 }
 function resolveShortcodes(shortcodesStr, config) {
@@ -3258,6 +3259,29 @@ function resolveShortcodes(shortcodesStr, config) {
 	return result;
 }
 
+//#endregion
+//#region src/utils/validation.ts
+const GIT_HASH_PATTERN = /^[a-f0-9]{4,40}$/i;
+const GIT_REF_FORBIDDEN_CHARS = /[\x00-\x1f\x7f ~^:?*[\\]/;
+const GIT_REF_FORBIDDEN_SEQUENCES = /\.\.|\.lock(\/|$)|@\{|\/\//;
+function validateHash(hash) {
+	if (!GIT_HASH_PATTERN.test(hash)) throw new PrequitoError(`Invalid git hash: "${hash}". Expected 4-40 hexadecimal characters.`);
+}
+function validateRefName(name, type) {
+	if (!name || name.trim() === "") throw new PrequitoError(`${type} name cannot be empty.`);
+	if (name.startsWith("-")) throw new PrequitoError(`Invalid ${type} name: "${name}". Cannot start with '-'.`);
+	if (name.endsWith(".")) throw new PrequitoError(`Invalid ${type} name: "${name}". Cannot end with '.'.`);
+	if (name.endsWith("/")) throw new PrequitoError(`Invalid ${type} name: "${name}". Cannot end with '/'.`);
+	if (GIT_REF_FORBIDDEN_CHARS.test(name)) throw new PrequitoError(`Invalid ${type} name: "${name}". Contains forbidden characters.`);
+	if (GIT_REF_FORBIDDEN_SEQUENCES.test(name)) throw new PrequitoError(`Invalid ${type} name: "${name}". Contains forbidden pattern.`);
+}
+function validateBranchName(branch) {
+	validateRefName(branch, "Branch");
+}
+function validateTagName(tag) {
+	validateRefName(tag, "Tag");
+}
+
 //#endregion
 //#region src/git/operations.ts
 const execFileAsync = (0, node_util.promisify)(node_child_process.execFile);
@@ -3306,11 +3330,16 @@ async function stageAll() {
 	await git(["add", "-A"]);
 }
 async function commit(message) {
-	return (await git([
+	const parts = message.split("\n\n");
+	const title = parts[0];
+	const body = parts.slice(1).join("\n\n");
+	const args = [
 		"commit",
 		"-m",
-		message
-	])).stdout;
+		title
+	];
+	if (body) args.push("-m", body);
+	return (await git(args)).stdout;
 }
 async function commitAmend() {
 	return (await git([
@@ -3332,6 +3361,7 @@ async function forcePushLease() {
 	return result.stdout + result.stderr;
 }
 async function checkout(branch) {
+	validateBranchName(branch);
 	await git(["checkout", branch]);
 }
 async function pull() {
@@ -3339,10 +3369,12 @@ async function pull() {
 	return result.stdout + result.stderr;
 }
 async function rebase(branch) {
+	validateBranchName(branch);
 	const result = await git(["rebase", branch]);
 	return result.stdout + result.stderr;
 }
 async function rebaseInteractiveEdit(hash) {
+	validateHash(hash);
 	const sedCmd = `sed -i 's/^pick ${hash.slice(0, 7)}/edit ${hash.slice(0, 7)}/'`;
 	const result = await git([
 		"rebase",
@@ -3369,7 +3401,8 @@ async function rebaseInteractive(count) {
 		`HEAD~${count}`
 	]);
 }
-async function pushUpstream$1(branch) {
+async function pushUpstream(branch) {
+	if (branch !== void 0) validateBranchName(branch);
 	const result = await git([
 		"push",
 		"--set-upstream",
@@ -3379,6 +3412,7 @@ async function pushUpstream$1(branch) {
 	return result.stdout + result.stderr;
 }
 async function commitFixup(hash) {
+	validateHash(hash);
 	return (await git([
 		"commit",
 		"--fixup",
@@ -3393,14 +3427,17 @@ async function resetSoft(count = 1) {
 	])).stdout;
 }
 async function createBranch(branch) {
+	validateBranchName(branch);
 	await git([
 		"checkout",
 		"-b",
 		branch
 	]);
 }
-async function stash() {
-	return (await git(["stash"])).stdout;
+async function stash(message) {
+	const args = ["stash"];
+	if (message) args.push("-m", message);
+	return (await git(args)).stdout;
 }
 async function stashPop() {
 	return (await git(["stash", "pop"])).stdout;
@@ -3424,6 +3461,7 @@ async function logGrep(keyword, count) {
 	return (await git(args)).stdout;
 }
 async function logTag(tag) {
+	validateTagName(tag);
 	return (await git([
 		"log",
 		"--oneline",
@@ -3431,12 +3469,44 @@ async function logTag(tag) {
 	])).stdout;
 }
 async function logTagAll(tag) {
+	validateTagName(tag);
 	return (await git([
 		"log",
 		"--oneline",
 		tag
 	])).stdout;
 }
+async function diff(options = []) {
+	return (await git(["diff", ...options])).stdout;
+}
+async function stashList() {
+	return (await git(["stash", "list"])).stdout;
+}
+
+//#endregion
+//#region src/utils/command.ts
+async function requireGitRepo() {
+	if (!await isGitRepo()) throw new PrequitoError("Not inside a git repository.");
+}
+function withErrorHandling(fn) {
+	return async (...args) => {
+		try {
+			await fn(...args);
+		} catch (error) {
+			if (error instanceof PrequitoError) {
+				console.error(`✖ ${error.message}`);
+				process.exit(1);
+			}
+			throw error;
+		}
+	};
+}
+function parseCount(value, defaultValue = 1) {
+	if (value === void 0) return defaultValue;
+	const num = parseInt(value, 10);
+	if (isNaN(num) || num <= 0) throw new PrequitoError("Count must be a positive integer.");
+	return num;
+}
 
 //#endregion
 //#region src/utils/spinner.ts
@@ -3483,36 +3553,23 @@ function spinner(message, options) {
 //#endregion
 //#region src/commands/commit.ts
 function registerCommitCommand(program) {
-	program.command("c").alias("commit").description("Templated commit (e.g. guito c 42 f \"msg\" -p)").argument("[args...]", "Card ID, shortcodes, and message").option("-p, --push", "Push after committing").option("-f, --force", "Push with --force-with-lease after committing").option("-d, --dry-run", "Show the generated message without executing").option("-S, --no-stage", "Skip auto-staging (git add -A)").action(async (args, opts) => {
-		try {
-			await executeCommit(args, opts);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`\u2716 ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
+	program.command("c").alias("commit").description("Templated commit (e.g. guito c 42 f \"msg\" -p)").argument("[args...]", "Card ID, shortcodes, and message").option("-p, --push", "Push after committing").option("-f, --force", "Push with --force-with-lease after committing").option("-d, --dry-run", "Show the generated message without executing").option("-S, --no-stage", "Skip auto-staging (git add -A)").action(withErrorHandling(async (args, opts) => {
+		await executeCommit(args, opts);
+	}));
 }
 async function executeCommit(args, opts) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
+	await requireGitRepo();
 	const config = await loadConfigOrDefault();
-	const { context, message } = parsePositionalArgs(args, config);
-	const commitMessage = renderTemplate(config.template, context, message);
+	const { context, message, body } = parsePositionalArgs(args, config, typeof opts.body === "string" ? opts.body : void 0);
+	const commitTitle = renderTemplate(config.template, context, message);
+	const commitMessage = body ? `${commitTitle}\n\n${body}` : commitTitle;
 	if (opts.dryRun) {
 		console.log(commitMessage);
 		return;
 	}
 	if (opts.stage !== false) await stageAll();
-	if (!await hasStagedChanges()) {
-		console.error("✖ No staged changes to commit.");
-		process.exit(1);
-	}
-	const stopCommit = spinner(`Committing: ${commitMessage}`);
+	if (!await hasStagedChanges()) throw new PrequitoError("No staged changes to commit.");
+	const stopCommit = spinner(`Committing: ${commitTitle}`);
 	await commit(commitMessage);
 	stopCommit("✔ Committed.");
 	if (opts.force) {
@@ -3529,34 +3586,11 @@ async function executeCommit(args, opts) {
 //#endregion
 //#region src/commands/amend-push.ts
 function registerAmendPushCommands(program) {
-	program.command("ap").description("Amend last commit + force push (git push --force)").action(async () => {
-		try {
-			await amendAndPush(false);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("apl").description("Amend last commit + safe force push (--force-with-lease)").action(async () => {
-		try {
-			await amendAndPush(true);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
+	program.command("ap").description("Amend last commit + force push (git push --force)").action(withErrorHandling(() => amendAndPush(false)));
+	program.command("apl").description("Amend last commit + safe force push (--force-with-lease)").action(withErrorHandling(() => amendAndPush(true)));
 }
 async function amendAndPush(useLease) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
+	await requireGitRepo();
 	const stopStage = spinner("Staging all changes...");
 	await stageAll();
 	stopStage("✔ Staged.");
@@ -3577,45 +3611,12 @@ async function amendAndPush(useLease) {
 //#endregion
 //#region src/commands/rebase.ts
 function registerRebaseCommands(program) {
-	program.command("r <branch>").alias("rebase").description("Rebase on <branch> (checkout, pull, rebase) (e.g. guito r main)").action(async (branch) => {
-		try {
-			await quickRebase(branch);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("ri <count>").description("Interactive rebase last <count> commits (e.g. guito ri 3)").action(async (count) => {
-		try {
-			await interactiveRebase(count);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("re <hash>").description("Edit rebase at <hash> (e.g. guito re abc123)").action(async (hash) => {
-		try {
-			await editRebase(hash);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
+	program.command("r <branch>").alias("rebase").description("Rebase on <branch> (checkout, pull, rebase) (e.g. guito r main)").action(withErrorHandling(quickRebase));
+	program.command("ri <count>").description("Interactive rebase last <count> commits (e.g. guito ri 3)").action(withErrorHandling(interactiveRebase));
+	program.command("re <hash>").description("Edit rebase at <hash> (e.g. guito re abc123)").action(withErrorHandling(editRebase));
 }
 async function quickRebase(branch) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
+	await requireGitRepo();
 	const currentBranch = await getCurrentBranch();
 	console.log(`→ Current branch: ${currentBranch}`);
 	let stop = spinner(`Checking out ${branch}...`);
@@ -3632,23 +3633,13 @@ async function quickRebase(branch) {
 	stop("✔ Rebase complete.");
 }
 async function interactiveRebase(count) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const num = parseInt(count, 10);
-	if (isNaN(num) || num <= 0) {
-		console.error("✖ Count must be a positive integer.");
-		process.exit(1);
-	}
+	await requireGitRepo();
+	const num = parseCount(count);
 	console.log(`→ Starting interactive rebase for the last ${num} commit(s)...`);
 	await rebaseInteractive(num);
 }
 async function editRebase(hash) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
+	await requireGitRepo();
 	console.log(`→ Starting edit rebase on commit ${hash}...`);
 	await rebaseInteractiveEdit(hash);
 	console.log("✔ Rebase paused at the target commit. Make your changes, then run:");
@@ -3969,76 +3960,32 @@ function registerConfigCommand(program) {
 //#endregion
 //#region src/commands/push.ts
 function registerPushCommands(program) {
-	program.command("p").alias("push").description("Push current branch (git push)").action(async () => {
-		try {
-			await executePush();
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("pu").description("Push + set upstream (git push --set-upstream origin <branch>)").action(async () => {
-		try {
-			await pushUpstream();
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executePush() {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const stop = spinner("Pushing...");
-	await push();
-	stop("✔ Pushed.");
-}
-async function pushUpstream() {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const branch = await getCurrentBranch();
-	const stop = spinner(`Pushing with --set-upstream origin ${branch}...`);
-	await pushUpstream$1(branch);
-	stop("✔ Pushed.");
+	program.command("p").alias("push").description("Push current branch (git push)").action(withErrorHandling(async () => {
+		await requireGitRepo();
+		const stop = spinner("Pushing...");
+		await push();
+		stop("✔ Pushed.");
+	}));
+	program.command("pu").description("Push + set upstream (git push --set-upstream origin <branch>)").action(withErrorHandling(async () => {
+		await requireGitRepo();
+		const branch = await getCurrentBranch();
+		const stop = spinner(`Pushing with --set-upstream origin ${branch}...`);
+		await pushUpstream(branch);
+		stop("✔ Pushed.");
+	}));
 }
 
 //#endregion
 //#region src/commands/fixup.ts
 function registerFixupCommand(program) {
-	program.command("cf <hash>").description("Fixup commit for <hash> (e.g. guito cf abc123 -f)").option("-p, --push", "Push after creating the fixup commit").option("-f, --force", "Push with --force-with-lease after creating").action(async (hash, opts) => {
-		try {
-			await executeFixup(hash, opts);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
+	program.command("cf <hash>").description("Fixup commit for <hash> (e.g. guito cf abc123 -f)").option("-p, --push", "Push after creating the fixup commit").option("-f, --force", "Push with --force-with-lease after creating").action(withErrorHandling(executeFixup));
 }
 async function executeFixup(hash, opts) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
+	await requireGitRepo();
 	const stopStage = spinner("Staging all changes...");
 	await stageAll();
 	stopStage("✔ Staged.");
-	if (!await hasStagedChanges()) {
-		console.error("✖ No staged changes to commit.");
-		process.exit(1);
-	}
+	if (!await hasStagedChanges()) throw new PrequitoError("No staged changes to commit.");
 	const stopCommit = spinner(`Creating fixup commit for ${hash}...`);
 	await commitFixup(hash);
 	stopCommit("✔ Fixup commit created.");
@@ -4056,221 +4003,125 @@ async function executeFixup(hash, opts) {
 //#endregion
 //#region src/commands/undo.ts
 function registerUndoCommand(program) {
-	program.command("u [count]").alias("undo").description("Undo last N commits, keep changes staged (e.g. guito u 3)").action(async (count) => {
-		try {
-			await executeUndo(count);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeUndo(count) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const num = count ? parseInt(count, 10) : 1;
-	if (isNaN(num) || num <= 0) {
-		console.error("✖ Count must be a positive integer.");
-		process.exit(1);
-	}
-	const stop = spinner(`Undoing last ${num} commit(s)...`);
-	await resetSoft(num);
-	stop(`✔ Undid last ${num} commit(s). Changes are staged.`);
-	const st = await status();
-	if (st) console.log(st);
+	program.command("u [count]").alias("undo").description("Undo last N commits, keep changes staged (e.g. guito u 3)").action(withErrorHandling(async (count) => {
+		await requireGitRepo();
+		const num = parseCount(count);
+		console.log(`→ Undoing last ${num} commit(s)...`);
+		await resetSoft(num);
+		console.log(`✔ Undid last ${num} commit(s). Changes are staged.`);
+		const st = await status();
+		if (st) console.log(st);
+	}));
 }
 
 //#endregion
 //#region src/commands/status.ts
 function registerStatusCommand(program) {
-	program.command("s").alias("status").description("Short status (git status --short)").action(async () => {
-		try {
-			await executeStatus();
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeStatus() {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const output = await status();
-	if (output) console.log(output.trimEnd());
-	else console.log("✨ Nothing to commit, working tree clean.");
+	program.command("s").alias("status").description("Short status (git status --short)").action(withErrorHandling(async () => {
+		await requireGitRepo();
+		const output = await status();
+		if (output) console.log(output.trimEnd());
+		else console.log("✨ Nothing to commit, working tree clean.");
+	}));
 }
 
 //#endregion
 //#region src/commands/switch.ts
 function registerSwitchCommand(program) {
-	program.command("sw <branch>").alias("switch").description("Switch branch, -n to create (e.g. guito sw -n feature/x)").option("-n, --new", "Create a new branch").action(async (branch, opts) => {
-		try {
-			await executeSwitch(branch, opts);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeSwitch(branch, opts) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const stop = spinner(opts.new ? `Creating and switching to ${branch}...` : `Switching to ${branch}...`);
-	if (opts.new) await createBranch(branch);
-	else await checkout(branch);
-	stop(`✔ On branch ${branch}.`);
+	program.command("sw <branch>").alias("switch").description("Switch branch, -n to create (e.g. guito sw -n feature/x)").option("-n, --new", "Create a new branch").action(withErrorHandling(async (branch, opts) => {
+		await requireGitRepo();
+		if (opts.new) {
+			console.log(`→ Creating and switching to ${branch}...`);
+			await createBranch(branch);
+		} else {
+			console.log(`→ Switching to ${branch}...`);
+			await checkout(branch);
+		}
+		console.log(`✔ On branch ${branch}.`);
+	}));
 }
 
 //#endregion
 //#region src/commands/stash.ts
 function registerStashCommands(program) {
-	program.command("st").description("Stash all changes (git stash)").action(async () => {
-		try {
-			await executeStash();
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("stp").description("Pop the latest stash (git stash pop)").action(async () => {
-		try {
-			await executeStashPop();
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeStash() {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const stop = spinner("Stashing changes...");
-	await stash();
-	stop("✔ Stashed.");
-}
-async function executeStashPop() {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const stop = spinner("Restoring stashed changes...");
-	await stashPop();
-	stop("✔ Restored.");
+	program.command("st").description("Stash all changes (git stash)").option("-m, --message <message>", "Stash with a descriptive message").action(withErrorHandling(async (opts) => {
+		await requireGitRepo();
+		if (opts.message) console.log(`→ Stashing changes: ${opts.message}...`);
+		else console.log("→ Stashing changes...");
+		await stash(opts.message);
+		console.log("✔ Stashed.");
+	}));
+	program.command("stp").description("Pop the latest stash (git stash pop)").action(withErrorHandling(async () => {
+		await requireGitRepo();
+		console.log("→ Restoring stashed changes...");
+		await stashPop();
+		console.log("✔ Restored.");
+	}));
+	program.command("stl").description("List all stashes (git stash list)").action(withErrorHandling(async () => {
+		await requireGitRepo();
+		const output = await stashList();
+		if (output) console.log(output.trimEnd());
+		else console.log("✨ No stashes found.");
+	}));
 }
 
 //#endregion
 //#region src/commands/log.ts
 function registerLogCommand(program) {
-	program.command("l [count]").alias("log").description("Compact log, default last 10 (e.g. guito l 20)").action(async (count) => {
-		try {
-			await executeLog(count);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeLog(count) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const num = count ? parseInt(count, 10) : 10;
-	if (isNaN(num) || num <= 0) {
-		console.error("✖ Count must be a positive integer.");
-		process.exit(1);
-	}
-	const output = await logOneline(num);
-	if (output) console.log(output.trimEnd());
-	else console.log("✨ No commits found.");
+	program.command("l [count]").alias("log").description("Compact log, default last 10 (e.g. guito l 20)").action(withErrorHandling(async (count) => {
+		await requireGitRepo();
+		const num = parseCount(count, 10);
+		const output = await logOneline(num);
+		if (output) console.log(output.trimEnd());
+		else console.log("✨ No commits found.");
+	}));
 }
 
 //#endregion
 //#region src/commands/find.ts
 function registerFindCommands(program) {
-	program.command("f <keyword>").alias("find").description("Search commits by message (e.g. guito f \"login\")").option("-n, --number <count>", "Limit number of results").action(async (keyword, opts) => {
-		try {
-			await executeFind(keyword, opts);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-	program.command("t <tag>").alias("tag").description("Commits since <tag> (e.g. guito t v1.0.0)").option("-a, --all", "Show all commits reachable from the tag").action(async (tag, opts) => {
-		try {
-			await executeTag(tag, opts);
-		} catch (error) {
-			if (error instanceof PrequitoError) {
-				console.error(`✖ ${error.message}`);
-				process.exit(1);
-			}
-			throw error;
-		}
-	});
-}
-async function executeFind(keyword, opts) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	const count = opts.number ? parseInt(opts.number, 10) : void 0;
-	const stop = spinner(`Searching for "${keyword}"...`);
-	const output = await logGrep(keyword, count);
-	stop("");
-	if (output) console.log(output.trimEnd());
-	else console.log(`✨ No commits found matching "${keyword}".`);
-}
-async function executeTag(tag, opts) {
-	if (!await isGitRepo()) {
-		console.error("✖ Not inside a git repository.");
-		process.exit(1);
-	}
-	if (opts.all) {
-		console.log(`🏷️  Commits reachable from ${tag}:`);
-		const output = await logTagAll(tag);
+	program.command("f <keyword>").alias("find").description("Search commits by message (e.g. guito f \"login\")").option("-n, --number <count>", "Limit number of results").action(withErrorHandling(async (keyword, opts) => {
+		await requireGitRepo();
+		const count = opts.number ? parseInt(opts.number, 10) : void 0;
+		const output = await logGrep(keyword, count);
 		if (output) console.log(output.trimEnd());
-		else console.log("✨ No commits found.");
-	} else {
-		console.log(`🏷️  Commits since ${tag}:`);
-		const output = await logTag(tag);
+		else console.log(`✨ No commits found matching "${keyword}".`);
+	}));
+	program.command("t <tag>").alias("tag").description("Commits since <tag> (e.g. guito t v1.0.0)").option("-a, --all", "Show all commits reachable from the tag").action(withErrorHandling(async (tag, opts) => {
+		await requireGitRepo();
+		if (opts.all) {
+			console.log(`🏷️  Commits reachable from ${tag}:`);
+			const output = await logTagAll(tag);
+			if (output) console.log(output.trimEnd());
+			else console.log("✨ No commits found.");
+		} else {
+			console.log(`🏷️  Commits since ${tag}:`);
+			const output = await logTag(tag);
+			if (output) console.log(output.trimEnd());
+			else console.log("✨ No commits since this tag.");
+		}
+	}));
+}
+
+//#endregion
+//#region src/commands/diff.ts
+function registerDiffCommand(program) {
+	program.command("d").alias("diff").description("Show changes (git diff)").option("-s, --staged", "Show staged changes only").option("--stat", "Show diffstat summary").option("-n, --name-only", "Show only names of changed files").action(withErrorHandling(async (opts) => {
+		await requireGitRepo();
+		const options = [];
+		if (opts.staged) options.push("--staged");
+		if (opts.stat) options.push("--stat");
+		if (opts.nameOnly) options.push("--name-only");
+		const output = await diff(options);
 		if (output) console.log(output.trimEnd());
-		else console.log("✨ No commits since this tag.");
-	}
+		else console.log("✨ No changes.");
+	}));
 }
 
 //#endregion
 //#region src/cli.ts
 const program = new Command();
-program.name("guito").description("preguito - a lazy git CLI with commit templates and shortcuts").version("0.1.0").addHelpText("before", "\n🦥 preguito v0.1.0\n   A lazy git CLI with commit templates and shortcuts.\n");
+program.name("guito").description("preguito - a lazy git CLI with commit templates and shortcuts").version("0.2.2").addHelpText("before", "\n🦥 preguito v0.1.0\n   A lazy git CLI with commit templates and shortcuts.\n");
 registerCommitCommand(program);
 registerAmendPushCommands(program);
 registerRebaseCommands(program);
@@ -4284,6 +4135,7 @@ registerSwitchCommand(program);
 registerStashCommands(program);
 registerLogCommand(program);
 registerFindCommands(program);
+registerDiffCommand(program);
 program.parse();
 
 //#endregion