tegami 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/cli/index.d.ts

@@ -1,6 +1,4 @@
-import { p as PublishPlan, t as Awaitable, w as Draft } from "../types-BHT_9k9p.js";
-import { n as Tegami } from "../index-syNgzQTi.js";
-import { Command } from "commander";
+import { O as Draft, _ as PublishPlan, t as Awaitable, u as Tegami } from "../types-DKZsadC8.js";
 
 //#region src/cli/index.d.ts
 interface TegamiCLIOptions {
@@ -8,6 +6,10 @@ interface TegamiCLIOptions {
   version?: () => Awaitable<Draft>;
   publish?: () => Awaitable<PublishPlan>;
 }
-declare function createCli(tegami: Tegami, options?: TegamiCLIOptions): Command;
+interface TegamiCLI {
+  parseAsync(argv?: string[]): Promise<void>;
+}
+declare function createCli(tegami: Tegami, options?: TegamiCLIOptions): TegamiCLI;
+declare function runCli(tegami: Tegami, options?: TegamiCLIOptions): Promise<void>;
 //#endregion
-export { TegamiCLIOptions, createCli };
+export { TegamiCLI, TegamiCLIOptions, createCli, runCli };

package/dist/cli/index.js

@@ -1,14 +1,10 @@
-import { r as formatNpmDistTag } from "../semver-EKJ8yK5U.js";
 import { i as renderChangelog, n as generateFromCommits, t as changelogFilename } from "../generate-BfYdNTFi.js";
-import { n as execFailure, o as isCI, r as handlePluginError, t as CancelledError } from "../error-We7chQVJ.js";
-import { i as findIssueCommentByPrefix, l as updateIssueComment, o as getPullRequest, t as createIssueComment } from "../api-CGfXmmEM.js";
+import { o as isCI, r as handlePluginError, t as CancelledError } from "../error-We7chQVJ.js";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import path, { basename, join, relative } from "node:path";
+import path, { join, relative } from "node:path";
 import { x } from "tinyexec";
-import z from "zod";
-import { resolveCommand } from "package-manager-detector";
 import { autocompleteMultiselect, confirm, intro, isCancel, multiline, note, outro, select, spinner } from "@clack/prompts";
-import { Command, InvalidArgumentError } from "commander";
+import { parseArgs } from "node:util";
 //#region src/utils/git-changes.ts
 async function getChangedPackages(graph, cwd) {
 	return resolveChangedPackages(graph, await getChangedFilePaths(cwd), cwd);
@@ -203,7 +199,6 @@ async function promptPackageBumpTypes(selectedPackages) {
 }
 //#endregion
 //#region src/cli/init-agent.ts
-const CHANGELOG_DOCS_URL$1 = "https://tegami.fuma-nama.dev/changelog";
 async function initAgent(context, options = {}) {
 	const output = path.resolve(context.cwd, options.output ?? "AGENTS.md");
 	const content = renderAgentsMd(context);
@@ -233,7 +228,7 @@ function renderAgentsMd(context) {
 		"",
 		`Create pending changelog files under \`${changelogDir}/\` as \`YYYY-MM-DD-{hash}.md\`.`,
 		"",
-		`See the [changelog format docs](${CHANGELOG_DOCS_URL$1}) for details.`,
+		`See the [changelog format docs](https://tegami.fuma-nama.dev/changelog) for details.`,
 		"",
 		"### Example",
 		"",
@@ -266,225 +261,231 @@ function renderAgentsMd(context) {
 	].join("\n");
 }
 //#endregion
-//#region src/cli/pr.ts
-const TEGAMI_DOCS_URL = "https://tegami.fuma-nama.dev";
-const CHANGELOG_DOCS_URL = `${TEGAMI_DOCS_URL}/changelog`;
-const COMMENT_MARKER = "<!-- tegami -->";
-async function buildPrPreview(context, draft, options = {}) {
-	const pullRequest = await resolvePullRequest(context, options);
-	const tegamiCommandRaw = resolveCommand(context.npm?.client ?? "npm", "run", ["tegami"]);
-	const tegamiCommand = [tegamiCommandRaw.command, ...tegamiCommandRaw.args].join(" ");
-	const prChangelogFiles = await listPullRequestChangelogFiles(context, pullRequest.baseSha, pullRequest.headSha);
-	const createLink = createChangelogUrl(context, pullRequest.headRepo, pullRequest.headRef, changelogFilename());
-	const lines = [
-		"### Tegami",
-		"",
-		`This repository uses [Tegami](${TEGAMI_DOCS_URL}) to manage releases. When your changes affect published packages, add a changelog file under \`.tegami/\` before merging.`,
-		"",
-		`[**Create a changelog →**](${createLink}) · [Changelog format](${CHANGELOG_DOCS_URL})`,
-		""
-	];
-	const pendingPackages = [];
-	for (const pkg of context.graph.getPackages()) {
-		const plan = draft.getPackageDraft(pkg.id);
-		if (!plan) continue;
-		const bumped = plan.bumpVersion(pkg);
-		if (!bumped || !pkg.version || bumped === pkg.version) continue;
-		pendingPackages.push({
-			name: pkg.name,
-			type: plan.type ?? "—",
-			from: pkg.version,
-			to: bumped,
-			distTag: plan.npm?.distTag
-		});
-	}
-	const prChangelogs = draft.getChangelogs().filter((entry) => prChangelogFiles.has(entry.filename));
-	if (pendingPackages.length > 0) {
-		lines.push("#### Release preview", "", "| Package | Bump | Version |", "| --- | --- | --- |");
-		for (const { name, type, from, to, distTag } of pendingPackages) lines.push(`| \`${name}\` | ${type} | \`${from}\` → \`${to}\`${formatNpmDistTag(distTag)} |`);
-		lines.push("");
+//#region src/cli/core.ts
+function createTegamiCliRegistry(tegami) {
+	const commands = /* @__PURE__ */ new Map();
+	function getChildCommands(command) {
+		const out = [];
+		const prefix = command.path.join("\0");
+		for (const [key, candidate] of commands) if (key.startsWith(prefix) && key.length > prefix.length) out.push(candidate);
+		return out;
 	}
-	if (prChangelogs.length > 0) {
-		lines.push("#### Changelogs in this PR", "", "| Changelog | Title |", "| --- | --- |");
-		for (const entry of prChangelogs) for (const section of entry.sections) lines.push(`| \`${entry.filename}\` | ${section.title} |`);
-		lines.push("");
-	} else if (pendingPackages.length === 0) lines.push("#### No changelogs yet", "", "This PR has no pending changelog files. If your changes require a release, add a changelog before merging.", "");
-	else if (prChangelogFiles.size === 0) lines.push("This PR does not add changelog files. Pending changelogs from other branches are included in the preview above.", "");
-	lines.push(`Run \`${tegamiCommand}\` locally to create a changelog interactively.`, "", `<sub>Managed by [Tegami](${TEGAMI_DOCS_URL}).</sub>`, "");
-	return lines.join("\n");
+	return {
+		command(path, options) {
+			const definition = {
+				path: path.length === 0 ? [] : path.split(/\s+/),
+				positionals: [],
+				description: options?.description,
+				options: [],
+				resolve: options?.resolve ?? true
+			};
+			commands.set(definition.path.join("\0"), definition);
+			const api = {
+				option(name, { short, description = "", type }) {
+					definition.options.push({
+						name,
+						short,
+						type,
+						description
+					});
+					return api;
+				},
+				positional(name, required) {
+					definition.positionals.push({
+						name,
+						required: required ?? true
+					});
+					return api;
+				},
+				action(fn) {
+					definition.action = fn;
+				}
+			};
+			return api;
+		},
+		help: () => formatRootHelp(commands),
+		async parse(argv) {
+			if (argv[0] === "--help" || argv[0] === "-h") {
+				console.log(formatRootHelp(commands));
+				return;
+			}
+			const match = findCommand(commands, argv);
+			if (!match) throw new Error(`Unknown command: ${argv[0]}`);
+			const args = argv.slice(match.path.length);
+			if (args.includes("--help") || args.includes("-h")) {
+				console.log(formatCommandHelp(match, getChildCommands(match)));
+				return;
+			}
+			if (!match.action) {
+				if (args.length === 0) {
+					console.log(formatCommandHelp(match, getChildCommands(match)));
+					return;
+				}
+				throw new Error(`Unknown command: ${argv.slice(0, match.path.length + 1).join(" ")}`);
+			}
+			const { values, positionals } = parseCommandArgs(match, args);
+			const context = match.resolve ? await tegami._internal.context() : await tegami._internal.contextUnresolved();
+			await match.action({
+				context,
+				values,
+				positionals
+			});
+		}
+	};
 }
-async function postPrComment(body) {
-	const repo = process.env.GITHUB_REPOSITORY;
-	if (!repo) {
-		outro("GITHUB_REPOSITORY is required.");
-		return;
-	}
-	const pr = await readPullRequestFromWorkflowRunEvent();
-	if (!pr.found) {
-		outro(pr.reason);
-		return;
-	}
-	const markedBody = `${COMMENT_MARKER}\n${body}`;
-	const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
-	const existingId = await findIssueCommentByPrefix(repo, pr.number, COMMENT_MARKER, token);
-	if (existingId) {
-		await updateIssueComment(repo, existingId, markedBody, token);
-		return;
+function formatUsage(command) {
+	return [...command.path, ...command.positionals.map((positional) => positional.required ? `<${positional.name}>` : `[${positional.name}]`)].join(" ");
+}
+function findCommand(commands, argv) {
+	if (argv.length === 0) return commands.get("");
+	for (let i = 0; i < argv.length; i++) {
+		const search = argv.slice(0, argv.length - i).join("\0");
+		const res = commands.get(search);
+		if (res) return res;
 	}
-	await createIssueComment(repo, pr.number, markedBody, token);
 }
-const eventSchema = z.looseObject({ workflow_run: z.looseObject({
-	event: z.literal("pull_request", { error: "The preview workflow was not triggered by a pull request." }),
-	conclusion: z.literal("success", { error: "The preview workflow did not complete successfully." }),
-	pull_requests: z.array(z.looseObject({ number: z.int() }), { error: "The preview workflow is not associated with a pull request." }).min(1)
-}, { error: "A workflow_run event is required." }) });
-async function readPullRequestFromWorkflowRunEvent() {
-	const eventPath = process.env.GITHUB_EVENT_PATH;
-	if (!eventPath) return {
-		found: false,
-		reason: "GITHUB_EVENT_PATH is required."
+function parseCommandArgs(command, args) {
+	const optionConfig = { help: {
+		type: "boolean",
+		short: "h"
+	} };
+	for (const option of command.options) optionConfig[option.name] = {
+		type: option.type,
+		short: option.short
 	};
-	let raw;
-	try {
-		raw = JSON.parse(await readFile(eventPath, "utf8"));
-	} catch {
-		return {
-			found: false,
-			reason: "Failed to read workflow_run event."
-		};
+	const parsed = parseArgs({
+		args,
+		options: optionConfig,
+		strict: true,
+		allowPositionals: command.positionals.length > 0
+	});
+	const positionals = {};
+	if (parsed.positionals.length > command.positionals.length) throw new Error("Too many arguments");
+	for (const positional of command.positionals) {
+		const value = parsed.positionals.shift();
+		if (value === void 0 && positional.required) throw new Error(`missing required argument: ${positional.name}`);
+		if (value === void 0) continue;
+		positionals[positional.name] = value;
 	}
-	const { error, data } = eventSchema.safeParse(raw);
-	if (error) return {
-		found: false,
-		reason: z.prettifyError(error)
-	};
 	return {
-		found: true,
-		number: data.workflow_run.pull_requests[0].number
+		values: parsed.values,
+		positionals
 	};
 }
-async function resolvePullRequest(context, options) {
-	const repo = context.github?.repo ?? process.env.GITHUB_REPOSITORY;
-	if (!repo) throw new Error("GITHUB_REPOSITORY is required.");
-	const token = context.github?.token ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
-	if (!repo) throw new Error("GITHUB_TOKEN is required.");
-	if (options.number !== void 0) {
-		if (!Number.isInteger(options.number) || options.number <= 0) throw new Error("--number must be a positive integer.");
-		const data = await getPullRequest(repo, options.number, token);
-		return {
-			repo,
-			headRepo: data.headRepository ? `${data.headRepository.owner.login}/${data.headRepository.name}` : repo,
-			headRef: data.headRefName,
-			baseSha: data.baseRefOid,
-			headSha: data.headRefOid
-		};
+function formatRootHelp(commands) {
+	let width = 0;
+	const rows = [];
+	for (const command of commands.values()) {
+		if (command.path.length === 0) continue;
+		const key = formatUsage(command);
+		width = Math.max(width, key.length);
+		rows.push([key, command.description ?? ""]);
 	}
-	const event = await readPullRequestEvent();
-	if (event) return {
-		repo,
-		...event
-	};
-	throw new Error("A pull request event or --number is required.");
+	return `${[
+		"Usage: tegami [command]",
+		"",
+		commands.get("")?.description ?? "create changelogs",
+		"",
+		"Commands:",
+		...rows.map(([usage, description]) => `  ${usage.padEnd(width)}   ${description}`),
+		"",
+		"Run without a command to open the changelog TUI."
+	].join("\n")}\n`;
 }
-async function readPullRequestEvent() {
-	const eventPath = process.env.GITHUB_EVENT_PATH;
-	if (!eventPath) return;
-	let event;
-	try {
-		event = JSON.parse(await readFile(eventPath, "utf8"));
-	} catch {
-		return;
+function formatCommandHelp(command, childCommands) {
+	let width = 0;
+	let childWidth = 0;
+	const optionRows = command.options.map((option) => {
+		const short = option.short ? `-${option.short}, ` : "";
+		const long = `--${option.name}`;
+		const key = option.type === "string" ? `${short}${long} <value>` : `${short}${long}`;
+		width = Math.max(width, key.length);
+		return [key, option.description ?? ""];
+	});
+	const childRows = childCommands.map((child) => {
+		const key = formatUsage(child);
+		childWidth = Math.max(childWidth, key.length);
+		return [key, child.description ?? ""];
+	});
+	const lines = [];
+	if (command.action) lines.push(`Usage: ${formatUsage(command)}`, "");
+	if (command.description) lines.push(command.description, "");
+	if (optionRows.length > 0) {
+		lines.push("Options:");
+		for (const [flags, description] of optionRows) lines.push(`  ${flags.padEnd(width)}   ${description}`);
+		lines.push("");
 	}
-	const pullRequest = event.pull_request;
-	if (!pullRequest) return;
-	return {
-		headRepo: pullRequest.head.repo.full_name,
-		headRef: pullRequest.head.ref,
-		baseSha: pullRequest.base.sha,
-		headSha: pullRequest.head.sha
-	};
-}
-async function listPullRequestChangelogFiles(context, baseSha, headSha) {
-	const dir = relative(context.cwd, context.changelogDir);
-	const result = await x("git", [
-		"diff",
-		"--name-only",
-		"--diff-filter=ACMRD",
-		`${baseSha}...${headSha}`,
-		"--",
-		`${dir}/`
-	], { nodeOptions: { cwd: context.cwd } });
-	if (result.exitCode !== 0) throw execFailure("Failed to list pull request changelog files.", result);
-	const files = /* @__PURE__ */ new Set();
-	for (const line of result.stdout.split("\n")) {
-		const trimmed = line.trim();
-		if (trimmed.endsWith(".md")) files.add(basename(trimmed));
+	if (childRows.length > 0) {
+		lines.push("Commands:");
+		for (const [usage, description] of childRows) lines.push(`  ${usage.padEnd(childWidth)}   ${description}`);
+		lines.push("");
 	}
-	return files;
-}
-function createChangelogUrl(context, repo, branch, filename) {
-	const filePath = join(relative(context.cwd, context.changelogDir), filename).replaceAll("\\", "/");
-	return `https://github.com/${repo}/new/${branch.split("/").map(encodeURIComponent).join("/")}?${new URLSearchParams({ filename: filePath })}`;
+	return lines.join("\n");
 }
 //#endregion
 //#region src/cli/index.ts
 function createCli(tegami, options = {}) {
-	const program = new Command();
-	program.name("tegami").description("create changelogs").action(() => runAction(tegami, () => runChangelogTui(tegami)));
-	program.command("version").description("draft version changes and write the publish lock").action(() => runAction(tegami, async () => {
+	const $cli = init();
+	async function init() {
+		const ctx = await tegami._internal.contextUnresolved();
+		const cli = createTegamiCliRegistry(tegami);
+		registerCoreCommands(cli, tegami, options);
+		for (const plugin of ctx.plugins) await handlePluginError(plugin, "initCli", () => plugin.initCli?.call(ctx, cli));
+		return cli;
+	}
+	return { async parseAsync(argv = process.argv.slice(2)) {
+		try {
+			await (await $cli).parse(argv);
+		} catch (error) {
+			if (error instanceof CancelledError) outro(error.message);
+			else {
+				note(error instanceof Error ? error.message : String(error), "Error");
+				outro("Command failed.");
+			}
+			process.exit(1);
+		}
+	} };
+}
+async function runCli(tegami, options = {}) {
+	await createCli(tegami, options).parseAsync();
+}
+function registerCoreCommands(cli, tegami, options) {
+	cli.command("", { description: "create changelog files interactively" }).action(async () => {
+		await runChangelogTui(tegami);
+	});
+	cli.command("version", { description: "draft version changes and write the publish lock" }).action(async () => {
 		await versionPackages(tegami, { cli: options });
-	}));
-	program.command("ci").description("version and publish packages").action(() => runAction(tegami, async () => {
+	});
+	cli.command("ci", { description: "version and publish packages" }).action(async () => {
 		if (await versionPackages(tegami, { cli: options })) return;
 		await publishPackages(tegami, { cli: options });
-	}));
-	program.command("check-publish").description("exit with code 1 if no publishing needed, otherwise 0").action(() => runAction(tegami, async () => {
+	});
+	cli.command("check-publish", { description: "exit with code 1 if no publishing needed, otherwise 0" }).action(async () => {
 		const status = await tegami.publishStatus();
 		process.exit(status === "pending" ? 0 : 1);
-	}));
-	const programPr = program.command("pr");
-	programPr.command("preview").description("(should be executed in a GitHub action) show a pull request release preview and changelog guidance").option("--artifact <path>", "write preview markdown to a file").option("--number <number>", "pull request number", (value) => {
-		const number = Number(value);
-		if (!Number.isInteger(number) || number <= 0) throw new InvalidArgumentError("--number must be a positive integer.");
-		return number;
-	}).action((commandOptions) => runAction(tegami, async () => {
-		const context = await tegami._internal.context();
-		const body = await buildPrPreview(context, await tegami.draft(), commandOptions);
-		if (commandOptions.artifact) {
-			const artifactPath = path.resolve(context.cwd, commandOptions.artifact);
-			await writeFile(artifactPath, body);
-			if (!isCI()) {
-				note(path.relative(context.cwd, artifactPath) || commandOptions.artifact, "Release preview");
-				outro("Release preview ready.");
-			}
-			return;
-		}
-		if (isCI()) {
-			process.stdout.write(`${body}\n`);
-			return;
-		}
-		note(body, "Release preview");
-		outro("Release preview ready.");
-	}));
-	programPr.command("comment").description("(should be used with 'pr preview') post the pull request release preview as a comment").argument("<artifact>", "the file path of GitHub artifact").action(async (artifact) => {
-		try {
-			await postPrComment(await readFile(artifact, "utf8"));
-			outro("Pull request comment updated.");
-		} catch (error) {
-			note(error instanceof Error ? error.message : String(error), "Error");
-			outro("Command failed.");
-			process.exit(1);
-		}
 	});
-	program.command("publish").description("publish packages from the publish lock").option("--dry-run", "validate the publish lock without publishing packages").action((commandOptions) => runAction(tegami, async () => {
+	cli.command("publish", { description: "publish packages from the publish lock" }).option("dry-run", {
+		type: "boolean",
+		description: "validate the publish lock without publishing"
+	}).action(async ({ values }) => {
 		await publishPackages(tegami, {
-			...commandOptions,
+			dryRun: values["dry-run"],
 			cli: options
 		});
-	}));
-	program.command("cleanup").description("remove the publish lock after all packages have been published").action(() => runAction(tegami, () => runCleanup(tegami)));
-	program.command("init-agent").description("write AGENTS.md with changelog instructions for AI agents").option("-o, --output <path>", "output path", "AGENTS.md").action((commandOptions) => runAction(tegami, () => runInitAgent(tegami, commandOptions)));
-	return program;
+	});
+	cli.command("cleanup", { description: "remove the publish lock after all packages have been published" }).action(async () => {
+		await runCleanup(tegami);
+	});
+	cli.command("init-agent", {
+		description: "write AGENTS.md with changelog instructions for AI agents",
+		resolve: false
+	}).option("output", {
+		type: "string",
+		short: "o",
+		description: "output path"
+	}).action(async ({ values }) => {
+		await runInitAgent(tegami, { output: values.output ?? "AGENTS.md" });
+	});
 }
 async function versionPackages(tegami, options) {
 	intro("Version Packages");
@@ -492,7 +493,7 @@ async function versionPackages(tegami, options) {
 	const context = await tegami._internal.context();
 	const draft = customVersion ? await customVersion() : await tegami.draft();
 	if (!draft.canApply()) throw new Error(`The draft from custom "version" hook must not be applied`);
-	for (const plugin of context.plugins) await handlePluginError(plugin, "cli.draftCreated", () => plugin.cli?.draftCreated?.call(context, draft));
+	for (const plugin of context.plugins) await handlePluginError(plugin, "initCliDraft", () => plugin.initCliDraft?.call(context, draft));
 	if (!draft.hasPending()) {
 		note("No pending version changes matched workspace packages.", "Nothing to version");
 		outro("No versions changed.");
@@ -522,7 +523,7 @@ async function versionPackages(tegami, options) {
 		throw error;
 	}
 	s.stop("Package versions updated");
-	for (const plugin of context.plugins) await handlePluginError(plugin, "cli.draftApplied", () => plugin.cli?.draftApplied?.call(context, draft));
+	for (const plugin of context.plugins) await handlePluginError(plugin, "applyCliDraft", () => plugin.applyCliDraft?.call(context, draft));
 	outro("Publish lock written.");
 	return true;
 }
@@ -589,19 +590,5 @@ async function runCleanup(tegami) {
 	}
 	outro(`Publish lock at ${lockPath} is still pending. Publish it before cleanup.`);
 }
-async function runAction(tegami, action) {
-	try {
-		const context = await tegami._internal.context();
-		for (const plugin of context.plugins) await handlePluginError(plugin, "cli.init", () => plugin.cli?.init?.call(context));
-		await action();
-	} catch (error) {
-		if (error instanceof CancelledError) outro(error.message);
-		else {
-			note(error instanceof Error ? error.message : String(error), "Error");
-			outro("Command failed.");
-		}
-		process.exit(1);
-	}
-}
 //#endregion
-export { createCli };
+export { createCli, runCli };