@hallaxius/forge 0.1.2 → 0.1.4

package/src/commands/remote.ts

@@ -1,107 +1,107 @@
-import type { Command } from "commander";
-import * as git from "../lib/git.js";
-import { error, info, success } from "../lib/logger.js";
-import { confirm, createTable } from "../lib/ui.js";
-
-export default function register(program: Command): void {
-	const remote = program.command("remote").description("Manage remotes");
-
-	remote
-		.command("add <name> <url>")
-		.description("Add a new remote")
-		.action(async (name, url) => {
-			try {
-				await git.remoteAdd(name, url);
-				success(`Remote '${name}' added (${url}).`);
-			} catch (err) {
-				error(
-					`Failed to add remote: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-
-	remote
-		.command("remove <name>")
-		.description("Remove a remote")
-		.action(async (name) => {
-			try {
-				const confirmed = await confirm(
-					`Are you sure you want to remove remote '${name}'?`,
-					false,
-				);
-
-				if (!confirmed) {
-					info("Canceled.");
-					return;
-				}
-
-				await git.remoteRemove(name);
-				success(`Remote '${name}' removed.`);
-			} catch (err) {
-				error(
-					`Failed to remove remote: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-
-	remote
-		.command("set-url <name> <new-url>")
-		.description("Change a remote URL")
-		.action(async (name, newUrl) => {
-			try {
-				await git.remoteSetUrl(name, newUrl);
-				success(`Remote '${name}' URL updated to ${newUrl}.`);
-			} catch (err) {
-				error(
-					`Failed to update remote URL: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-
-	remote
-		.command("rename <old-name> <new-name>")
-		.description("Rename a remote")
-		.action(async (oldName, newName) => {
-			try {
-				await git.remoteRename(oldName, newName);
-				success(`Remote '${oldName}' renamed to '${newName}'.`);
-			} catch (err) {
-				error(
-					`Failed to rename remote: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-
-	remote
-		.command("get-url <name>")
-		.description("Get the URL of a remote")
-		.action(async (name) => {
-			try {
-				const url = await git.remoteGetUrl(name);
-				info(`Remote '${name}': ${url}`);
-			} catch (err) {
-				error(
-					`Failed to get remote URL: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-
-	remote.action(async () => {
-		try {
-			const remotes = await git.remoteList();
-
-			if (remotes.length === 0) {
-				info("No remotes configured.");
-				return;
-			}
-
-			const rows = remotes.map((r) => [r.name, r.url]);
-			info("Remotes:");
-			console.log(createTable(["Name", "URL"], rows));
-		} catch (err) {
-			error(
-				`Failed to list remotes: ${err instanceof Error ? err.message : String(err)}`,
-			);
-		}
-	});
-}
+import type { Command } from "commander";
+import * as git from "../lib/git.js";
+import { error, text } from "../lib/logger.js";
+import { confirm, createTable } from "../lib/ui.js";
+
+export default function register(program: Command): void {
+	const remote = program.command("remote").description("Manage remotes");
+
+	remote
+		.command("add <name> <url>")
+		.description("Add a new remote")
+		.action(async (name, url) => {
+			try {
+				await git.remoteAdd(name, url);
+				text(`Remote '${name}' added (${url}).`);
+			} catch (err) {
+				error(
+					`Failed to add remote: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+
+	remote
+		.command("remove <name>")
+		.description("Remove a remote")
+		.action(async (name) => {
+			try {
+				const confirmed = await confirm(
+					`Are you sure you want to remove remote '${name}'?`,
+					false,
+				);
+
+				if (!confirmed) {
+					text("Canceled.");
+					return;
+				}
+
+				await git.remoteRemove(name);
+				text(`Remote '${name}' removed.`);
+			} catch (err) {
+				error(
+					`Failed to remove remote: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+
+	remote
+		.command("set-url <name> <new-url>")
+		.description("Change a remote URL")
+		.action(async (name, newUrl) => {
+			try {
+				await git.remoteSetUrl(name, newUrl);
+				text(`Remote '${name}' URL updated to ${newUrl}.`);
+			} catch (err) {
+				error(
+					`Failed to update remote URL: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+
+	remote
+		.command("rename <old-name> <new-name>")
+		.description("Rename a remote")
+		.action(async (oldName, newName) => {
+			try {
+				await git.remoteRename(oldName, newName);
+				text(`Remote '${oldName}' renamed to '${newName}'.`);
+			} catch (err) {
+				error(
+					`Failed to rename remote: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+
+	remote
+		.command("get-url <name>")
+		.description("Get the URL of a remote")
+		.action(async (name) => {
+			try {
+				const url = await git.remoteGetUrl(name);
+				text(`Remote '${name}': ${url}`);
+			} catch (err) {
+				error(
+					`Failed to get remote URL: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+
+	remote.action(async () => {
+		try {
+			const remotes = await git.remoteList();
+
+			if (remotes.length === 0) {
+				text("No remotes configured.");
+				return;
+			}
+
+			const rows = remotes.map((r) => [r.name, r.url]);
+			text("Remotes:");
+			text(createTable(["Name", "URL"], rows));
+		} catch (err) {
+			error(
+				`Failed to list remotes: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
+	});
+}

package/src/commands/reset.ts

@@ -1,30 +1,30 @@
-import type { Command } from "commander";
-import { ConfigManager } from "../lib/config.js";
-import { error, info, success, warning } from "../lib/logger.js";
-import { confirm } from "../lib/ui.js";
-
-export default function register(program: Command): void {
-	program
-		.command("reset")
-		.description("Reset all configuration")
-		.action(async () => {
-			try {
-				warning("This will delete all Forge configuration.");
-				const proceed = await confirm(
-					"Are you sure? This will delete all configuration",
-				);
-				if (!proceed) {
-					info("Reset cancelled.");
-					return;
-				}
-
-				const config = new ConfigManager();
-				config.clear();
-				success("Configuration reset successfully.");
-			} catch (err) {
-				error(
-					`Reset failed: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-}
+import type { Command } from "commander";
+import { ConfigManager } from "../lib/config.js";
+import { error, text, warning } from "../lib/logger.js";
+import { confirm } from "../lib/ui.js";
+
+export default function register(program: Command): void {
+	program
+		.command("reset")
+		.description("Reset all configuration")
+		.action(async () => {
+			try {
+				warning("This will delete all Forge configuration.");
+				const proceed = await confirm(
+					"Are you sure? This will delete all configuration",
+				);
+				if (!proceed) {
+					text("Reset cancelled.");
+					return;
+				}
+
+				const config = new ConfigManager();
+				config.clear();
+				text("Configuration reset successfully.");
+			} catch (err) {
+				error(
+					`Reset failed: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+}

package/src/commands/setup.ts

@@ -1,95 +1,93 @@
-import type { Command } from "commander";
-import { encryptToken } from "../lib/auth.js";
-import { ConfigManager } from "../lib/config.js";
-import { error, info, newline, success, warning } from "../lib/logger.js";
-import { confirm, input, password, showBox } from "../lib/ui.js";
-import {
-	validateEmail,
-	validateGitHubToken,
-	validateGitInstalled,
-} from "../lib/validators.js";
-
-export default function register(program: Command): void {
-	program
-		.command("setup")
-		.description("Interactive setup wizard")
-		.action(async () => {
-			try {
-				const config = new ConfigManager();
-
-				if (config.isConfigured()) {
-					warning("Forge is already configured. You are about to reconfigure.");
-					const proceed = await confirm("Continue with reconfiguration?");
-					if (!proceed) {
-						info("Setup cancelled.");
-						return;
-					}
-				}
-
-				const gitInstalled = await validateGitInstalled();
-				if (!gitInstalled) {
-					error("Git is not installed. Please install Git first.");
-					return;
-				}
-
-				newline();
-				info("Starting setup...");
-				newline();
-
-				const name = await input("Your name");
-
-				let email = await input("Your email");
-				while (!validateEmail(email)) {
-					error("Invalid email format.");
-					email = await input("Your email");
-				}
-
-				let token = await input("GitHub token (optional)");
-				if (token && !validateGitHubToken(token)) {
-					warning("Token format looks unusual. It will be saved as-is.");
-				}
-
-				if (token) {
-					const encrypt = await confirm(
-						"Encrypt token with a master password?",
-						false,
-					);
-					if (encrypt) {
-						const masterPassword = await password("Master password:");
-						token = await encryptToken(token, masterPassword);
-						success("Token encrypted successfully.");
-					}
-				}
-
-				config.set("user", { name, email });
-				config.set("github", { token });
-				config.set("preferences", {
-					autoPush: false,
-					commitTemplate: "",
-					editor: process.env.EDITOR || "vim",
-				});
-
-				newline();
-				const tokenStatus = token
-					? token.includes(":")
-						? "Set (encrypted)"
-						: "Set"
-					: "Not set";
-				showBox(
-					"Configuration Complete",
-					[
-						`User:     ${name} <${email}>`,
-						`Token:    ${tokenStatus}`,
-						`Git:      Installed`,
-						`Config:   ${config.getPath()}`,
-					].join("\n"),
-				);
-
-				success("Forge is ready to use!");
-			} catch (err) {
-				error(
-					`Setup failed: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-}
+import type { Command } from "commander";
+import { encryptToken, generateMachineKey } from "../lib/auth.js";
+import { ConfigManager } from "../lib/config.js";
+import { error, newline, text, warning } from "../lib/logger.js";
+import { confirm, input, password } from "../lib/ui.js";
+import { validateEmail } from "../lib/validators.js";
+
+export default function register(program: Command): void {
+	program
+		.command("setup")
+		.description("Interactive setup wizard")
+		.action(async () => {
+			try {
+				const config = new ConfigManager();
+
+				if (config.isConfigured()) {
+					warning("Forge is already configured. You are about to reconfigure.");
+					const proceed = await confirm("Continue with reconfiguration?");
+					if (!proceed) {
+						text("Setup cancelled.");
+						return;
+					}
+				}
+
+				newline();
+				text("Starting setup...");
+				newline();
+
+				const name = await input("Your name");
+
+				let email = await input("Your email");
+				while (!validateEmail(email)) {
+					error("Invalid email format.");
+					email = await input("Your email");
+				}
+
+				const rawToken = await input(
+					"GitHub token (required for remote operations)",
+				);
+				if (!rawToken) {
+					error(
+						"GitHub token is required. Get one at https://github.com/settings/tokens",
+					);
+					return;
+				}
+
+				const useMasterPassword = await confirm(
+					"Protect token with a master password? (recommended)",
+					true,
+				);
+
+				const machineKey = generateMachineKey();
+				let hasMasterPassword = false;
+
+				if (useMasterPassword) {
+					const mp = await password("Master password:");
+					const encryptedKey = await encryptToken(machineKey, mp);
+					config.set("auth.machineKey", encryptedKey);
+					config.set("auth.hasMasterPassword", true);
+					hasMasterPassword = true;
+				} else {
+					config.set("auth.machineKey", machineKey);
+					config.set("auth.hasMasterPassword", false);
+				}
+
+				const encryptedToken = await encryptToken(rawToken, machineKey);
+				config.set("github.encryptedToken", encryptedToken);
+
+				config.set("user", { name, email });
+				config.set("preferences", {
+					autoPush: false,
+					commitTemplate: "",
+					editor: process.env.EDITOR || "vim",
+				});
+
+				newline();
+				text(
+					[
+						`User:     ${name} <${email}>`,
+						`Token:    Set (encrypted)`,
+						`Security: ${hasMasterPassword ? "Master password protected" : "Machine key"}`,
+						`Config:   ${config.getPath()}`,
+					].join("\n"),
+				);
+
+				text("Forge is ready to use!");
+			} catch (err) {
+				error(
+					`Setup failed: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+}

package/src/commands/stash.ts

@@ -1,44 +1,44 @@
-import type { Command } from "commander";
-import * as git from "../lib/git.js";
-import { error, info, success } from "../lib/logger.js";
-import { createTable, input, withSpinner } from "../lib/ui.js";
-
-export default function register(program: Command): void {
-	program
-		.command("stash")
-		.description("Manage stashes")
-		.option("--pop", "Apply and remove latest stash")
-		.option("--list", "List all stashes")
-		.action(async (options) => {
-			try {
-				if (options.pop) {
-					const result = await withSpinner("Applying stash...", () =>
-						git.stashPop(),
-					);
-					success(`Stash popped: ${result}`);
-					return;
-				}
-
-				if (options.list) {
-					const stashes = await git.stashList();
-					if (stashes.length === 0) {
-						info("No stashes found.");
-						return;
-					}
-
-					const rows = stashes.map((s) => [String(s.index), s.description]);
-					info("Stashes:");
-					console.log(createTable(["#", "Description"], rows));
-					return;
-				}
-
-				const _message = await input("Stash message (optional)");
-				const result = await withSpinner("Stashing...", () => git.stash());
-				success(`Stash saved: ${result}`);
-			} catch (err) {
-				error(
-					`Stash operation failed: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
-		});
-}
+import type { Command } from "commander";
+import * as git from "../lib/git.js";
+import { error, text } from "../lib/logger.js";
+import { createTable, input, withSpinner } from "../lib/ui.js";
+
+export default function register(program: Command): void {
+	program
+		.command("stash")
+		.description("Manage stashes")
+		.option("--pop", "Apply and remove latest stash")
+		.option("--list", "List all stashes")
+		.action(async (options) => {
+			try {
+				if (options.pop) {
+					const result = await withSpinner("Applying stash...", () =>
+						git.stashPop(),
+					);
+					text(`Stash popped: ${result}`);
+					return;
+				}
+
+				if (options.list) {
+					const stashes = await git.stashList();
+					if (stashes.length === 0) {
+						text("No stashes found.");
+						return;
+					}
+
+					const rows = stashes.map((s) => [String(s.index), s.description]);
+					text("Stashes:");
+					text(createTable(["#", "Description"], rows));
+					return;
+				}
+
+				const _message = await input("Stash message (optional)");
+				const result = await withSpinner("Stashing...", () => git.stash());
+				text(`Stash saved: ${result}`);
+			} catch (err) {
+				error(
+					`Stash operation failed: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
+		});
+}