tegami 0.1.0-beta.1 → 0.1.0-beta.2

package/dist/{checks-CKBRRjgQ.js → checks-Fz8-N09y.js}

@@ -1,14 +1,10 @@
 import { n as handlePluginError } from "./error-DBK-9uBa.js";
-import { n as jsonCodec } from "./schemas-Cc4h6bq5.js";
+import { n as jsonCodec, t as bumpTypeSchema } from "./schemas-CurBAaW5.js";
 import z$1 from "zod";
 import { readFile } from "fs/promises";
 //#region src/plans/store.ts
 const packagePlanStoreSchema = z$1.object({
-	type: z$1.enum([
-		"major",
-		"minor",
-		"patch"
-	]).optional(),
+	type: bumpTypeSchema.optional(),
 	changelogIds: z$1.array(z$1.string()).optional(),
 	bumpReasons: z$1.array(z$1.string()).optional(),
 	npm: z$1.object({ distTag: z$1.string().optional() }).optional(),
@@ -23,14 +19,11 @@ const planStoreSchema = jsonCodec(z$1.object({
 	changelogs: z$1.record(z$1.string(), z$1.object({
 		filename: z$1.string(),
 		subject: z$1.string().optional(),
-		packages: z$1.array(z$1.string()),
-		type: z$1.enum([
-			"major",
-			"minor",
-			"patch"
-		]),
-		title: z$1.string(),
-		content: z$1.string()
+		packages: z$1.record(z$1.string(), bumpTypeSchema),
+		sections: z$1.array(z$1.object({
+			title: z$1.string(),
+			content: z$1.string()
+		}))
 	})),
 	/** package id -> package info */
 	packages: z$1.record(z$1.string(), packagePlanStoreSchema)
@@ -46,10 +39,8 @@ function createPlanStore(draft, context) {
 	for (const entry of draft.getChangelogs()) store.changelogs[entry.id] = {
 		filename: entry.filename,
 		subject: entry.subject,
-		packages: Array.from(entry.packages),
-		type: entry.type,
-		title: entry.title,
-		content: entry.content
+		packages: Object.fromEntries(entry.packages.entries()),
+		sections: entry.sections
 	};
 	for (const pkg of context.graph.getPackages()) {
 		const plan = draft.getPackagePlan(pkg.id);

package/dist/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { C as PublishResult, a as Awaitable, t as Tegami, w as DraftPlan } from "../index-Da6P6gSc.js";
+import { C as PublishResult, O as DraftPlan, _ as Tegami, t as Awaitable } from "../types-BNhcu4-X.js";
 import { Command } from "commander";
 
 //#region src/cli/index.d.ts

package/dist/cli/index.js

@@ -1,9 +1,11 @@
 import { n as handlePluginError } from "../error-DBK-9uBa.js";
-import { t as assertPublishPlanFinished } from "../checks-CKBRRjgQ.js";
+import { t as bumpDepth } from "../semver-CPtl0XNq.js";
+import { t as assertPublishPlanFinished } from "../checks-Fz8-N09y.js";
 import { t as isCI } from "../constants-B9qjNfvr.js";
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { confirm, intro, isCancel, multiselect, note, outro, select, spinner, text } from "@clack/prompts";
+import { dump } from "js-yaml";
+import { autocompleteMultiselect, confirm, intro, isCancel, multiline, note, outro, select, spinner } from "@clack/prompts";
 import { Command } from "commander";
 //#region src/cli/index.ts
 var CancelledError = class extends Error {
@@ -40,18 +42,29 @@ async function createChangelogs(tegami, _options) {
 	const context = await tegami._internal.context();
 	await assertPublishPlanFinished(context);
 	intro("Create changelogs");
-	const packages = context.graph.getPackages();
 	let selectedPackages = [];
-	if (isCI()) selectedPackages = [];
-	else {
-		const selected = await multiselect({
+	if (!isCI()) {
+		const packages = context.graph.getPackages();
+		const useShortname = /* @__PURE__ */ new Map();
+		for (const pkg of packages) if (useShortname.has(pkg.name)) useShortname.set(pkg.name, false);
+		else useShortname.set(pkg.name, true);
+		const getPackageLabel = (pkg) => {
+			return useShortname.get(pkg.name) ? pkg.name : pkg.id;
+		};
+		const selectOptions = [];
+		for (const group of context.graph.getGroups()) selectOptions.push({
+			label: `Group ${group.name}`,
+			value: `group:${group.name}`,
+			hint: group.packages.map(getPackageLabel).join(", ")
+		});
+		for (const pkg of packages) selectOptions.push({
+			label: getPackageLabel(pkg),
+			value: pkg.id
+		});
+		const selected = await autocompleteMultiselect({
 			message: "Select packages (leave empty to auto-generate from commits)",
 			required: false,
-			options: packages.map((pkg) => ({
-				value: pkg.id,
-				label: pkg.id,
-				hint: pkg.version
-			}))
+			options: selectOptions
 		});
 		if (isCancel(selected)) throw new CancelledError();
 		selectedPackages = selected;
@@ -95,9 +108,10 @@ async function createChangelogs(tegami, _options) {
 		]
 	});
 	if (isCancel(type)) throw new CancelledError();
-	const message = await text({
-		message: "Change message",
-		placeholder: "Add a concise release note",
+	const message = await multiline({
+		message: "Describe change (Markdown supported, press tab then enter to exit)",
+		placeholder: "The first line is heading\n\nAdditional description.",
+		showSubmit: true,
 		validate(value) {
 			if (!value?.trim()) return "Enter a message.";
 		}
@@ -190,13 +204,15 @@ async function runCleanup(tegami) {
 	outro(`Publish plan at ${planPath} is still pending. Publish it before cleanup.`);
 }
 function renderManualChangelog(packages, type, message) {
-	const heading = "#".repeat(type === "major" ? 1 : type === "minor" ? 2 : 3);
+	const prefix = "#".repeat(bumpDepth(type));
+	const packageMap = {};
+	for (const name of packages) packageMap[name] = type;
 	return [
 		"---",
-		`packages: ${JSON.stringify(packages)}`,
+		dump({ packages: packageMap }).trim(),
 		"---",
 		"",
-		`${heading} ${message}`,
+		`${prefix} ${message}`,
 		""
 	].join("\n");
 }

package/dist/generators/simple.d.ts

@@ -1,4 +1,4 @@
-import { s as LogGenerator } from "../index-Da6P6gSc.js";
+import { r as LogGenerator } from "../types-BNhcu4-X.js";
 
 //#region src/generators/simple.d.ts
 declare function simpleGenerator(): LogGenerator;

package/dist/generators/simple.js

@@ -1,17 +1,18 @@
-import { r as formatPackageVersion } from "../semver-mWK2Khi2.js";
+import { i as formatPackageVersion } from "../semver-CPtl0XNq.js";
 //#region src/generators/simple.ts
 function simpleGenerator() {
 	return { generate({ changelogs, version, packageName, plan }) {
-		return [
-			`## ${formatPackageVersion(packageName, version, plan.npm?.distTag)}`,
-			"",
-			...changelogs.flatMap((entry) => [
-				`### ${entry.title}`,
-				"",
-				entry.content,
-				""
-			])
-		].join("\n").trim();
+		const lines = [`## ${formatPackageVersion(packageName, version, plan.npm?.distTag)}`, ""];
+		for (const entry of changelogs) {
+			let sectionDepth = 4;
+			if (entry.subject) lines.push(`### ${entry.subject}`, "");
+			else sectionDepth--;
+			for (const section of entry.sections) {
+				const prefix = "#".repeat(sectionDepth);
+				lines.push(`${prefix} ${section.title}`, "", section.content, "");
+			}
+		}
+		return lines.join("\n").trim();
 	} };
 }
 //#endregion

package/dist/{graph-CUgwuRW5.js → graph-B22NBRUG.js}

@@ -1,4 +1,4 @@
-import { t as bumpVersion } from "./semver-mWK2Khi2.js";
+import { n as bumpVersion } from "./semver-CPtl0XNq.js";
 //#region src/graph.ts
 /** Package discovered in the workspace. */
 var WorkspacePackage = class {

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { C as PublishResult, D as PackageGroup, E as PackageGraph, O as WorkspacePackage, S as PublishOptions, T as PackagePlan, c as PackageOptions, d as TegamiPlugin, f as TegamiPluginOption, i as CreatedChangelog, l as RegistryClient, n as tegami, o as GroupOptions, r as CreateChangelogOptions, s as LogGenerator, t as Tegami, u as TegamiOptions, w as DraftPlan, x as PackagePublishResult } from "./index-Da6P6gSc.js";
+import { C as PublishResult, D as WorkspacePackage, E as PackageGroup, O as DraftPlan, S as PublishOptions, T as PackageGraph, _ as Tegami, a as RegistryClient, b as CreatedChangelog, c as TegamiPluginOption, i as PackageOptions, k as PackagePlan, n as GroupOptions, o as TegamiOptions, r as LogGenerator, s as TegamiPlugin, v as tegami, x as PackagePublishResult, y as CreateChangelogOptions } from "./types-BNhcu4-X.js";
 export { type CreateChangelogOptions, type CreatedChangelog, type DraftPlan, type GroupOptions, type LogGenerator, type PackageGraph, type PackageGroup, type PackageOptions, type PackagePlan, type PackagePublishResult, type PublishOptions, type PublishResult, type RegistryClient, Tegami, type TegamiOptions, type TegamiPlugin, type TegamiPluginOption, type WorkspacePackage, tegami };

package/dist/index.js

@@ -1,15 +1,16 @@
 import { n as handlePluginError } from "./error-DBK-9uBa.js";
-import { i as maxBump } from "./semver-mWK2Khi2.js";
-import { t as PackageGraph } from "./graph-CUgwuRW5.js";
+import { a as maxBump } from "./semver-CPtl0XNq.js";
+import { t as PackageGraph } from "./graph-B22NBRUG.js";
 import { cargo } from "./providers/cargo.js";
-import { t as changelogFrontmatterSchema } from "./schemas-Cc4h6bq5.js";
+import { t as bumpTypeSchema } from "./schemas-CurBAaW5.js";
 import { npm } from "./providers/npm.js";
 import { simpleGenerator } from "./generators/simple.js";
-import { i as readPlanStore, n as publishPlanStatus, r as createPlanStore, t as assertPublishPlanFinished } from "./checks-CKBRRjgQ.js";
+import { i as readPlanStore, n as publishPlanStatus, r as createPlanStore, t as assertPublishPlanFinished } from "./checks-Fz8-N09y.js";
 import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import path, { basename, dirname, join } from "node:path";
 import { x } from "tinyexec";
 import { load } from "js-yaml";
+import z$1 from "zod";
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { toMarkdown } from "mdast-util-to-markdown";
 //#region src/changelog/create.ts
@@ -268,10 +269,10 @@ var DraftPlan = class {
 	addChangelog(entry) {
 		this.changelogs.set(entry.id, entry);
 		const { graph } = this.context;
-		const groupPackages = /* @__PURE__ */ new Set();
-		for (const name of entry.packages) for (const pkg of graph.getByName(name)) groupPackages.add(pkg);
-		for (const pkg of groupPackages) {
-			const plan = this.bumpPackage(pkg, { type: entry.type });
+		const groupPackages = /* @__PURE__ */ new Map();
+		for (const [name, bumpType] of entry.packages) for (const pkg of graph.getByName(name)) groupPackages.set(pkg, bumpType);
+		for (const [pkg, bumpType] of groupPackages) {
+			const plan = this.bumpPackage(pkg, { type: bumpType });
 			plan.changelogs ??= [];
 			plan.changelogs.push(entry);
 		}
@@ -381,6 +382,10 @@ function frontmatter(input) {
 }
 //#endregion
 //#region src/changelog/parse.ts
+const changelogFrontmatterSchema = z$1.object({
+	subject: z$1.string().optional(),
+	packages: z$1.union([z$1.array(z$1.string()), z$1.record(z$1.string(), bumpTypeSchema.or(z$1.null()))]).optional()
+});
 async function getChangelogFiles(context) {
 	return (await readdir(context.changelogDir).catch(() => [])).filter((file) => file.endsWith(".md"));
 }
@@ -390,29 +395,37 @@ async function readChangelogEntries(context) {
 	return (await Promise.all(files.map(async (file) => {
 		const filePath = join(dir, file);
 		return parseChangelogFile(filePath, await readFile(filePath, "utf8"));
-	}))).flat();
+	}))).filter((v) => v !== void 0);
 }
 /** Parse one changelog markdown file into release entries. */
 function parseChangelogFile(file, content) {
 	const parsed = frontmatter(content);
 	const data = changelogFrontmatterSchema.parse(parsed.data);
+	if (!data.packages) return;
 	const tree = fromMarkdown(parsed.content);
-	const entries = [];
+	let bumpType;
+	const packages = /* @__PURE__ */ new Map();
+	const sections = [];
+	const filename = basename(file);
 	for (const section of getHeadingSections(tree)) {
-		const type = headingToBump(section.heading.depth);
-		if (!type) continue;
-		const filename = basename(file);
-		entries.push({
-			id: `${filename}:${entries.length}`,
-			filename,
-			subject: data.subject,
-			packages: new Set(data.packages),
-			type,
+		const sectionBumpType = headingToBump(section.heading.depth);
+		if (sectionBumpType) bumpType = bumpType ? maxBump(bumpType, sectionBumpType) : sectionBumpType;
+		sections.push({
+			depth: section.heading.depth,
 			title: headingText(section.heading),
 			content: sectionToMarkdown(section.children)
 		});
 	}
-	return entries;
+	if (!bumpType) return;
+	if (Array.isArray(data.packages)) for (const pkg of data.packages) packages.set(pkg, bumpType);
+	else for (const [k, v] of Object.entries(data.packages)) packages.set(k, v ?? bumpType);
+	return {
+		id: filename,
+		filename,
+		subject: data.subject,
+		packages,
+		sections
+	};
 }
 function getHeadingSections(tree) {
 	const sections = [];
@@ -468,7 +481,7 @@ async function publishFromPlan(context, store, options) {
 			const entry = store.changelogs[id];
 			if (entry) changelogs.push({
 				...entry,
-				packages: new Set(entry.packages),
+				packages: new Map(Object.entries(entry.packages)),
 				id
 			});
 		}

package/dist/plugins/git.d.ts

@@ -1,4 +1,4 @@
-import { d as TegamiPlugin } from "../index-Da6P6gSc.js";
+import { s as TegamiPlugin } from "../types-BNhcu4-X.js";
 
 //#region src/plugins/git.d.ts
 interface GitPluginOptions {

package/dist/plugins/github.d.ts

@@ -1,4 +1,4 @@
-import { a as Awaitable, d as TegamiPlugin, w as DraftPlan, x as PackagePublishResult } from "../index-Da6P6gSc.js";
+import { O as DraftPlan, s as TegamiPlugin, t as Awaitable, w as TegamiContext, x as PackagePublishResult } from "../types-BNhcu4-X.js";
 import { GitPluginOptions } from "./git.js";
 
 //#region src/plugins/github.d.ts
@@ -34,12 +34,14 @@ interface VersionPullRequestOptions {
 interface GitHubPluginOptions extends GitPluginOptions {
   /** GitHub repository. */
   repo?: string;
+  /** Optional GitHub token for Git & GitHub operations. */
+  token?: string;
   /** Override release details for a single package, return `false` to skip. */
-  onCreateRelease?: (result: PackagePublishResult) => Awaitable<GithubRelease | false>;
+  onCreateRelease?: (this: TegamiContext, result: PackagePublishResult) => Awaitable<GithubRelease | false>;
   /** Override release details when multiple packages share a git tag, return `false` to skip. */
-  onCreateGroupedRelease?: (packages: PackagePublishResult[]) => Awaitable<GithubRelease | false>;
+  onCreateGroupedRelease?: (this: TegamiContext, packages: PackagePublishResult[]) => Awaitable<GithubRelease | false>;
   /** Override details for "Version Packages" PR. */
-  onCreateVersionPullRequest?: (publishPlan: DraftPlan) => Awaitable<VersionPullRequest | false>;
+  onCreateVersionPullRequest?: (this: TegamiContext, publishPlan: DraftPlan) => Awaitable<VersionPullRequest | false>;
   cli?: {
     /**
      * Open a version pull request after versioning.

package/dist/plugins/github.js

@@ -1,7 +1,8 @@
 import { t as execFailure } from "../error-DBK-9uBa.js";
-import { n as formatNpmDistTag, r as formatPackageVersion } from "../semver-mWK2Khi2.js";
+import { i as formatPackageVersion, r as formatNpmDistTag } from "../semver-CPtl0XNq.js";
 import { t as isCI } from "../constants-B9qjNfvr.js";
 import { git } from "./git.js";
+import { join, relative } from "node:path";
 import { x } from "tinyexec";
 import { prerelease } from "semver";
 //#region src/plugins/github.ts
@@ -22,18 +23,18 @@ function github(options = {}) {
 		const result = await x("gh", args);
 		if (result.exitCode !== 0) throw execFailure(`Failed to create GitHub release for ${gitTag}.`, result);
 	}
-	async function createRelease(pkg) {
+	async function createRelease(context, pkg) {
 		if (!pkg.gitTag) return;
-		const release = await options.onCreateRelease?.(pkg) ?? {};
+		const release = await options.onCreateRelease?.call(context, pkg) ?? {};
 		if (release === false) return;
-		await runGithubRelease(pkg.gitTag, release.title ?? defaultTitle(pkg), release.notes ?? defaultNotes(pkg), release.prerelease ?? prerelease(pkg.version) !== null);
+		await runGithubRelease(pkg.gitTag, release.title ?? defaultTitle(pkg), release.notes ?? await defaultNotes(context, pkg), release.prerelease ?? prerelease(pkg.version) !== null);
 	}
-	async function createGroupedRelease(packages) {
+	async function createGroupedRelease(context, packages) {
 		const primary = packages[0];
 		if (!primary?.gitTag) return;
-		const release = await options.onCreateGroupedRelease?.(packages) ?? {};
+		const release = await options.onCreateGroupedRelease?.call(context, packages) ?? {};
 		if (release === false) return;
-		await runGithubRelease(primary.gitTag, release.title ?? defaultGroupedTitle(packages), release.notes ?? defaultGroupedNotes(packages), release.prerelease ?? packages.some((pkg) => prerelease(pkg.version) !== null));
+		await runGithubRelease(primary.gitTag, release.title ?? defaultGroupedTitle(packages), release.notes ?? await defaultGroupedNotes(context, packages), release.prerelease ?? packages.some((pkg) => prerelease(pkg.version) !== null));
 	}
 	function resolvePROptions() {
 		const setting = options.cli?.versionPr ?? isCI();
@@ -49,20 +50,41 @@ function github(options = {}) {
 			const distTagTxt = formatNpmDistTag(packagePlan.npm?.distTag);
 			packageLines.push(`- ${pkg.name}@${cliOriginalPackageVersions.get(pkg.id) ?? pkg.version} → ${pkg.name}@${pkg.version}${distTagTxt}${publishTxt}`);
 		}
-		const changelogLines = draft.getChangelogs().map((entry) => `- ${entry.title}`);
-		const sections = ["## Summary", ...packageLines];
+		const changelogLines = [];
+		for (const entry of draft.getChangelogs()) {
+			changelogLines.push(`### ${entry.subject ?? `\`${entry.filename}\``}`, "");
+			for (const section of entry.sections) {
+				changelogLines.push(`#### ${section.title}`, "");
+				changelogLines.push(section.content);
+			}
+		}
+		const sections = [
+			"## Summary",
+			"",
+			"Merge this PR to publish the versioned packages.",
+			"",
+			...packageLines
+		];
 		if (changelogLines.length > 0) sections.push("", "## Changelogs", ...changelogLines);
-		sections.push("", "Merge this PR to publish the versioned packages.");
+		sections.push("");
 		return sections.join("\n");
 	}
 	const cliOriginalPackageVersions = /* @__PURE__ */ new Map();
 	return [git(options), {
 		name: "github",
+		init() {
+			const repository = options.repo ?? process.env.GITHUB_REPOSITORY;
+			const token = options.token ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
+			this.github = {
+				repo: repository,
+				token
+			};
+		},
 		cli: {
 			async init() {
 				if (!isCI()) return;
-				const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
-				const repository = options.repo ?? process.env.GITHUB_REPOSITORY;
+				const repository = this.github?.repo;
+				const token = this.github?.token;
 				if (!token || !repository) return;
 				const result = await x("git", [
 					"remote",
@@ -80,7 +102,7 @@ function github(options = {}) {
 				const [enabled, config] = resolvePROptions();
 				if (!enabled || !await hasGitChanges(cwd)) return;
 				const { branch = "tegami/version-packages", base = "main" } = config;
-				const basePR = await options.onCreateVersionPullRequest?.(draft);
+				const basePR = await options.onCreateVersionPullRequest?.call(this, draft);
 				if (basePR === false) return;
 				const pr = {
 					title: basePR?.title ?? "Version Packages",
@@ -109,7 +131,22 @@ function github(options = {}) {
 					branch
 				], gitOptions);
 				if (result.exitCode !== 0) throw execFailure("Failed to push the version branch to origin. Ensure `origin` is configured and you have push access.", result);
-				if (await hasOpenPullRequest(branch, options.repo)) return;
+				const openPr = await findOpenPullRequest(branch, options.repo);
+				if (openPr !== void 0) {
+					const editArgs = [
+						"pr",
+						"edit",
+						String(openPr),
+						"--title",
+						pr.title,
+						"--body",
+						pr.body
+					];
+					if (options.repo) editArgs.push("--repo", options.repo);
+					const editResult = await x("gh", editArgs);
+					if (editResult.exitCode !== 0) throw execFailure("Failed to update the version pull request.", editResult);
+					return;
+				}
 				const args = [
 					"pr",
 					"create",
@@ -129,15 +166,15 @@ function github(options = {}) {
 		},
 		async afterPublish(result) {
 			if (result.state !== "created") return;
-			for (const packages of groupPackagesByGitTag(result.packages).values()) if (packages.length > 1) await createGroupedRelease(packages);
-			else await createRelease(packages[0]);
+			for (const packages of groupPackagesByGitTag(result.packages).values()) if (packages.length > 1) await createGroupedRelease(this, packages);
+			else await createRelease(this, packages[0]);
 		}
 	}];
 }
 async function hasGitChanges(cwd) {
 	return (await x("git", ["status", "--porcelain"], { nodeOptions: { cwd } })).stdout.trim().length > 0;
 }
-async function hasOpenPullRequest(branch, repo) {
+async function findOpenPullRequest(branch, repo) {
 	const args = [
 		"pr",
 		"list",
@@ -151,7 +188,7 @@ async function hasOpenPullRequest(branch, repo) {
 	if (repo) args.push("--repo", repo);
 	const result = await x("gh", args);
 	if (result.exitCode !== 0) throw execFailure("Failed to check for an existing version pull request.", result);
-	return result.stdout.trim() !== "[]";
+	return JSON.parse(result.stdout)[0]?.number;
 }
 function groupPackagesByGitTag(packages) {
 	const groups = /* @__PURE__ */ new Map();
@@ -171,16 +208,46 @@ function defaultGroupedTitle(packages) {
 	const distTag = packages.every((pkg) => pkg.npm?.distTag === primary.npm?.distTag) ? primary.npm?.distTag : void 0;
 	return formatPackageVersion(primary.gitTag.slice(0, primary.gitTag.lastIndexOf("@")), primary.version, distTag);
 }
-function defaultNotes(pkg) {
-	if (pkg.changelogs.length > 0) return pkg.changelogs.map((entry) => [`### ${entry.title}`, entry.content].filter(Boolean).join("\n\n")).join("\n\n");
+function formatCommitLink(commit, repo) {
+	const short = commit.slice(0, 7);
+	if (!repo) return `\`${short}\``;
+	return `[${short}](https://github.com/${repo}/commit/${commit})`;
+}
+async function resolveChangelogEntryCommit(context, filename) {
+	const result = await x("git", [
+		"log",
+		"--diff-filter=A",
+		"-1",
+		"--format=%H",
+		"--",
+		relative(context.cwd, join(context.changelogDir, filename))
+	], { nodeOptions: { cwd: context.cwd } });
+	if (result.exitCode !== 0) return;
+	return result.stdout.trim() || void 0;
+}
+async function renderChangelogEntryNotes(context, entry) {
+	const repo = context.github?.repo;
+	const commit = await resolveChangelogEntryCommit(context, entry.filename);
+	const commitSuffix = commit ? ` (${formatCommitLink(commit, repo)})` : "";
+	const lines = [];
+	for (const section of entry.sections) {
+		lines.push(`### ${section.title}${commitSuffix}`, "");
+		if (section.content) lines.push(section.content, "");
+	}
+	return lines.join("\n").trim();
+}
+async function defaultNotes(context, pkg) {
+	if (pkg.changelogs.length > 0) return (await Promise.all(pkg.changelogs.map(async (entry) => renderChangelogEntryNotes(context, entry)))).join("\n\n");
 	return `Published ${formatPackageVersion(pkg.name, pkg.version, pkg.npm?.distTag)}.`;
 }
-function defaultGroupedNotes(packages) {
+async function defaultGroupedNotes(context, packages) {
 	const changelogs = /* @__PURE__ */ new Map();
 	for (const pkg of packages) for (const entry of pkg.changelogs) changelogs.set(entry.id, entry);
 	const sections = [packages.map((pkg) => `- ${formatPackageVersion(pkg.name, pkg.version, pkg.npm?.distTag)}`).join("\n")];
-	if (changelogs.size > 0) sections.push("", Array.from(changelogs.values()).map((entry) => [`### ${entry.title}`, entry.content].filter(Boolean).join("\n\n")).join("\n\n"));
-	else sections.push("", `Published ${packages[0].gitTag}.`);
+	if (changelogs.size > 0) {
+		const notes = await Promise.all(Array.from(changelogs.values()).map((entry) => renderChangelogEntryNotes(context, entry)));
+		sections.push("", notes.join("\n\n"));
+	} else sections.push("", `Published ${packages[0].gitTag}.`);
 	return sections.join("\n");
 }
 //#endregion

package/dist/providers/cargo.d.ts

@@ -1,2 +1,2 @@
-import { g as cargo, h as CargoRegistryClient, m as CargoPluginOptions, p as CargoPackage } from "../index-Da6P6gSc.js";
+import { d as CargoRegistryClient, f as cargo, l as CargoPackage, u as CargoPluginOptions } from "../types-BNhcu4-X.js";
 export { CargoPackage, CargoPluginOptions, CargoRegistryClient, cargo };

package/dist/providers/cargo.js

@@ -1,5 +1,5 @@
 import { r as isNodeError } from "../error-DBK-9uBa.js";
-import { n as WorkspacePackage } from "../graph-CUgwuRW5.js";
+import { n as WorkspacePackage } from "../graph-B22NBRUG.js";
 import { readFile, writeFile } from "node:fs/promises";
 import { join, normalize } from "node:path";
 import { x } from "tinyexec";

package/dist/providers/npm.d.ts

@@ -1,2 +1,2 @@
-import { _ as NpmPackage, b as npm, v as NpmPluginOptions, y as NpmRegistryClient } from "../index-Da6P6gSc.js";
+import { g as npm, h as NpmRegistryClient, m as NpmPluginOptions, p as NpmPackage } from "../types-BNhcu4-X.js";
 export { NpmPackage, NpmPluginOptions, NpmRegistryClient, npm };

package/dist/providers/npm.js

@@ -1,6 +1,6 @@
 import { r as isNodeError, t as execFailure } from "../error-DBK-9uBa.js";
-import { n as WorkspacePackage } from "../graph-CUgwuRW5.js";
-import { i as pnpmWorkspaceSchema, r as packageManifestSchema } from "../schemas-Cc4h6bq5.js";
+import { n as WorkspacePackage } from "../graph-B22NBRUG.js";
+import { i as pnpmWorkspaceSchema, r as packageManifestSchema } from "../schemas-CurBAaW5.js";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { x } from "tinyexec";

package/dist/{schemas-Cc4h6bq5.js → schemas-CurBAaW5.js}

@@ -1,10 +1,11 @@
 import { z } from "zod";
 //#region src/schemas.ts
-const changelogFrontmatterSchema = z.object({
-	subject: z.string().optional(),
-	packages: z.array(z.string()).default([])
-});
 const stringRecordSchema = z.record(z.string(), z.string());
+const bumpTypeSchema = z.enum([
+	"major",
+	"minor",
+	"patch"
+]);
 const jsonCodec = (schema) => z.codec(z.string(), schema, {
 	decode: (jsonString, ctx) => {
 		try {
@@ -38,4 +39,4 @@ const packageManifestSchema = z.looseObject({
 	optionalDependencies: stringRecordSchema.optional()
 });
 //#endregion
-export { pnpmWorkspaceSchema as i, jsonCodec as n, packageManifestSchema as r, changelogFrontmatterSchema as t };
+export { pnpmWorkspaceSchema as i, jsonCodec as n, packageManifestSchema as r, bumpTypeSchema as t };

package/dist/{semver-mWK2Khi2.js → semver-CPtl0XNq.js}

@@ -11,6 +11,11 @@ const WEIGHTS = {
 	minor: 2,
 	patch: 1
 };
+const DEPTH = {
+	major: 1,
+	minor: 2,
+	patch: 3
+};
 const PRE = {
 	major: "premajor",
 	minor: "preminor",
@@ -20,6 +25,9 @@ function maxBump(a, b) {
 	if (WEIGHTS[a] > WEIGHTS[b]) return a;
 	return b;
 }
+function bumpDepth(type) {
+	return DEPTH[type];
+}
 function bumpVersion(version, type, prerelease) {
 	let next = version;
 	if (prerelease) {
@@ -30,4 +38,4 @@ function bumpVersion(version, type, prerelease) {
 	return next;
 }
 //#endregion
-export { maxBump as i, formatNpmDistTag as n, formatPackageVersion as r, bumpVersion as t };
+export { maxBump as a, formatPackageVersion as i, bumpVersion as n, formatNpmDistTag as r, bumpDepth as t };

package/dist/{index-Da6P6gSc.d.ts → types-BNhcu4-X.d.ts}

@@ -5,58 +5,19 @@ import { AgentName } from "package-manager-detector";
 //#region src/utils/semver.d.ts
 type BumpType = "major" | "minor" | "patch";
 //#endregion
-//#region src/graph.d.ts
-/** Package discovered in the workspace. */
-declare abstract class WorkspacePackage {
-  abstract readonly name: string;
-  abstract readonly path: string;
-  abstract readonly manager: string;
-  abstract readonly version: string;
-  get id(): string;
-  private opts;
-  /** note: this will only be available after package graph is resolved */
-  getPackageOptions(): PackageOptions;
-  setPackageOptions(options: PackageOptions): void;
-  /** create an empty draft plan. */
-  onPlan(_context: TegamiContext): PackagePlan;
-}
-interface PackageGroup {
-  name: string;
-  options: GroupOptions;
-  packages: WorkspacePackage[];
-}
-/** Dependency graph for discovered workspace packages. */
-declare class PackageGraph {
-  private readonly packages;
-  private readonly groups;
-  constructor(packages?: WorkspacePackage[]);
-  getPackages(): WorkspacePackage[];
-  /** Get a package by exact id. */
-  get(id: string): WorkspacePackage | undefined;
-  /** Get packages by id, `group:name`, or every package matching a name. */
-  getByName(nameOrId: string): WorkspacePackage[];
-  /** scan package into graph, if the package id already exists, replace the existing one in graph */
-  add(pkg: WorkspacePackage): void;
-  delete(id: string): void;
-  getPackageGroup(pkgId: string): PackageGroup | undefined;
-  getGroups(): PackageGroup[];
-  getGroup(name: string): PackageGroup | undefined;
-  registerGroup(name: string, options: GroupOptions): PackageGroup;
-  addGroupMember(groupId: string, id: string): void;
-  removeGroupMember(group: string, id: string): void;
-  unregisterGroup(name: string): void;
-}
-//#endregion
 //#region src/changelog/parse.d.ts
 interface ChangelogEntry {
   id: string;
   /** file name like `my-change.md` */
   filename: string;
   subject?: string;
-  packages: Set<string>;
-  type: BumpType;
-  title: string;
-  content: string;
+  packages: Map<string, BumpType>;
+  /** will not be empty */
+  sections: {
+    depth: number;
+    title: string;
+    content: string;
+  }[];
 }
 //#endregion
 //#region src/plans/draft.d.ts
@@ -117,6 +78,68 @@ type CleanupResult = {
   reason: "missing" | "pending";
 };
 //#endregion
+//#region src/graph.d.ts
+/** Package discovered in the workspace. */
+declare abstract class WorkspacePackage {
+  abstract readonly name: string;
+  abstract readonly path: string;
+  abstract readonly manager: string;
+  abstract readonly version: string;
+  get id(): string;
+  private opts;
+  /** note: this will only be available after package graph is resolved */
+  getPackageOptions(): PackageOptions;
+  setPackageOptions(options: PackageOptions): void;
+  /** create an empty draft plan. */
+  onPlan(_context: TegamiContext): PackagePlan;
+}
+interface PackageGroup {
+  name: string;
+  options: GroupOptions;
+  packages: WorkspacePackage[];
+}
+/** Dependency graph for discovered workspace packages. */
+declare class PackageGraph {
+  private readonly packages;
+  private readonly groups;
+  constructor(packages?: WorkspacePackage[]);
+  getPackages(): WorkspacePackage[];
+  /** Get a package by exact id. */
+  get(id: string): WorkspacePackage | undefined;
+  /** Get packages by id, `group:name`, or every package matching a name. */
+  getByName(nameOrId: string): WorkspacePackage[];
+  /** scan package into graph, if the package id already exists, replace the existing one in graph */
+  add(pkg: WorkspacePackage): void;
+  delete(id: string): void;
+  getPackageGroup(pkgId: string): PackageGroup | undefined;
+  getGroups(): PackageGroup[];
+  getGroup(name: string): PackageGroup | undefined;
+  registerGroup(name: string, options: GroupOptions): PackageGroup;
+  addGroupMember(groupId: string, id: string): void;
+  removeGroupMember(group: string, id: string): void;
+  unregisterGroup(name: string): void;
+}
+//#endregion
+//#region src/context.d.ts
+interface TegamiContext {
+  /** absolute path */
+  cwd: string;
+  /** absolute path */
+  changelogDir: string;
+  /** absolute path */
+  planPath: string;
+  options: TegamiOptions;
+  plugins: TegamiPlugin[];
+  graph: PackageGraph;
+  /** error if doesn't exist */
+  getRegistryClient(pkgOrId: WorkspacePackage | string): RegistryClient;
+  /** additional context when GitHub plugin is configured */
+  github?: {
+    repo?: string;
+    token?: string;
+  };
+}
+//#endregion
 //#region src/plans/store.d.ts
 declare const packagePlanStoreSchema: z$1.ZodObject<{
   type: z$1.ZodOptional<z$1.ZodEnum<{
@@ -139,14 +162,15 @@ declare const planStoreSchema: z$1.ZodCodec<z$1.ZodString, z$1.ZodObject<{
   changelogs: z$1.ZodRecord<z$1.ZodString, z$1.ZodObject<{
     filename: z$1.ZodString;
     subject: z$1.ZodOptional<z$1.ZodString>;
-    packages: z$1.ZodArray<z$1.ZodString>;
-    type: z$1.ZodEnum<{
+    packages: z$1.ZodRecord<z$1.ZodString, z$1.ZodEnum<{
       major: "major";
       minor: "minor";
       patch: "patch";
-    }>;
-    title: z$1.ZodString;
-    content: z$1.ZodString;
+    }>>;
+    sections: z$1.ZodArray<z$1.ZodObject<{
+      title: z$1.ZodString;
+      content: z$1.ZodString;
+    }, z$1.core.$strip>>;
   }, z$1.core.$strip>>;
   packages: z$1.ZodRecord<z$1.ZodString, z$1.ZodObject<{
     type: z$1.ZodOptional<z$1.ZodEnum<{
@@ -198,6 +222,40 @@ type PackagePublishResult = ({
   changelogs: ChangelogEntry[];
 };
 //#endregion
+//#region src/changelog/create.d.ts
+interface CreateChangelogOptions {
+  /** Start revision. Defaults to the latest reachable git tag, or all history if none exists. */
+  from?: string;
+  /** End revision. Defaults to HEAD. */
+  to?: string;
+}
+interface CreatedChangelog {
+  filename: string;
+  path: string;
+  packages: string[];
+  changes: number;
+}
+//#endregion
+//#region src/index.d.ts
+interface Tegami {
+  /** Create pending changelog files from git commit history. */
+  generateChangelog(options?: CreateChangelogOptions): Promise<CreatedChangelog[]>;
+  /** Build a draft from pending changelog files. */
+  draft(): Promise<DraftPlan>;
+  /** Publish the current publish plan. */
+  publish(options?: PublishOptions): Promise<PublishResult>;
+  /** Remove the publish plan file after it has finished successfully. */
+  cleanup(): Promise<CleanupResult>;
+  /** Internal APIs, do not use it unless you know what you are doing */
+  _internal: {
+    context(): Promise<TegamiContext>;
+    graph(): Promise<PackageGraph>;
+    options: TegamiOptions;
+  };
+}
+/** Create a Tegami project handle. */
+declare function tegami<const Groups extends string = string>(options?: TegamiOptions<Groups>): Tegami;
+//#endregion
 //#region src/schemas.d.ts
 declare const packageManifestSchema: z.ZodObject<{
   name: z.ZodString;
@@ -418,50 +476,4 @@ interface RegistryClient {
   }): Promise<void>;
 }
 //#endregion
-//#region src/context.d.ts
-interface TegamiContext {
-  cwd: string;
-  changelogDir: string;
-  planPath: string;
-  options: TegamiOptions;
-  plugins: TegamiPlugin[];
-  graph: PackageGraph;
-  /** error if doesn't exist */
-  getRegistryClient(pkgOrId: WorkspacePackage | string): RegistryClient;
-}
-//#endregion
-//#region src/changelog/create.d.ts
-interface CreateChangelogOptions {
-  /** Start revision. Defaults to the latest reachable git tag, or all history if none exists. */
-  from?: string;
-  /** End revision. Defaults to HEAD. */
-  to?: string;
-}
-interface CreatedChangelog {
-  filename: string;
-  path: string;
-  packages: string[];
-  changes: number;
-}
-//#endregion
-//#region src/index.d.ts
-interface Tegami {
-  /** Create pending changelog files from git commit history. */
-  generateChangelog(options?: CreateChangelogOptions): Promise<CreatedChangelog[]>;
-  /** Build a draft from pending changelog files. */
-  draft(): Promise<DraftPlan>;
-  /** Publish the current publish plan. */
-  publish(options?: PublishOptions): Promise<PublishResult>;
-  /** Remove the publish plan file after it has finished successfully. */
-  cleanup(): Promise<CleanupResult>;
-  /** Internal APIs, do not use it unless you know what you are doing */
-  _internal: {
-    context(): Promise<TegamiContext>;
-    graph(): Promise<PackageGraph>;
-    options: TegamiOptions;
-  };
-}
-/** Create a Tegami project handle. */
-declare function tegami<const Groups extends string = string>(options?: TegamiOptions<Groups>): Tegami;
-//#endregion
-export { PublishResult as C, PackageGroup as D, PackageGraph as E, WorkspacePackage as O, PublishOptions as S, PackagePlan as T, NpmPackage as _, Awaitable as a, npm as b, PackageOptions as c, TegamiPlugin as d, TegamiPluginOption as f, cargo as g, CargoRegistryClient as h, CreatedChangelog as i, RegistryClient as l, CargoPluginOptions as m, tegami as n, GroupOptions as o, CargoPackage as p, CreateChangelogOptions as r, LogGenerator as s, Tegami as t, TegamiOptions as u, NpmPluginOptions as v, DraftPlan as w, PackagePublishResult as x, NpmRegistryClient as y };
+export { PublishResult as C, WorkspacePackage as D, PackageGroup as E, DraftPlan as O, PublishOptions as S, PackageGraph as T, Tegami as _, RegistryClient as a, CreatedChangelog as b, TegamiPluginOption as c, CargoRegistryClient as d, cargo as f, npm as g, NpmRegistryClient as h, PackageOptions as i, PackagePlan as k, CargoPackage as l, NpmPluginOptions as m, GroupOptions as n, TegamiOptions as o, NpmPackage as p, LogGenerator as r, TegamiPlugin as s, Awaitable as t, CargoPluginOptions as u, tegami as v, TegamiContext as w, PackagePublishResult as x, CreateChangelogOptions as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tegami",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.2",
   "description": "Utility for package versioning & publish",
   "license": "MIT",
   "author": "Fuma Nama",