relizy 1.4.5 → 1.4.7

package/dist/shared/{relizy.-Cr2hO3N.mjs → relizy.d-S4lcvu.mjs}

@@ -7,7 +7,7 @@ import { getGitDiff, parseCommits, resolveRepoConfig, getRepoConfig, formatCompa
 import { defu } from 'defu';
 import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import path, { join, relative, sep } from 'node:path';
-import { confirm, input } from '@inquirer/prompts';
+import { select, confirm, input } from '@inquirer/prompts';
 import fastGlob from 'fast-glob';
 import * as semver from 'semver';
 import { convert } from 'convert-gitmoji';
@@ -131,6 +131,250 @@ function topologicalSort(packages) {
   return sorted;
 }
 
+function shellSingleQuote(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+async function isAncestor(ancestor, descendant, cwd) {
+  try {
+    await execPromise(
+      `git merge-base --is-ancestor ${shellSingleQuote(ancestor)} ${shellSingleQuote(descendant)}`,
+      { cwd, noStderr: true, noStdout: true, noSuccess: true, noError: true }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function getCommitSubject(ref, cwd) {
+  try {
+    const { stdout } = await execPromise(
+      `git log -1 --format=%s ${shellSingleQuote(ref)}`,
+      { cwd, noStderr: true, noStdout: true, noSuccess: true, noError: true }
+    );
+    return stdout.trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function findReachableCommitBySubject(subject, to, cwd) {
+  try {
+    const { stdout } = await execPromise(
+      `git log ${shellSingleQuote(to)} --grep=${shellSingleQuote(subject)} --fixed-strings --format=%H -n 1`,
+      { cwd, noStderr: true, noStdout: true, noSuccess: true, noError: true }
+    );
+    return stdout.trim().split("\n")[0]?.trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function tagExists(tag, cwd) {
+  try {
+    const tagRef = `refs/tags/${tag}`;
+    await execPromise(
+      `git rev-parse --verify --quiet ${shellSingleQuote(tagRef)}`,
+      { cwd, noStderr: true, noStdout: true, noSuccess: true, noError: true }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function retagAnnotatedLocal({
+  tag,
+  commit,
+  message,
+  signed,
+  cwd,
+  logLevel
+}) {
+  const sign = signed ? "-s " : "";
+  await execPromise(
+    `git tag -f ${sign}-a ${shellSingleQuote(tag)} ${shellSingleQuote(commit)} -m ${shellSingleQuote(message)}`,
+    { cwd, logLevel, noStderr: true, noStdout: true }
+  );
+}
+async function pushTagForce(tag, cwd, logLevel) {
+  await execPromise(
+    `git push origin ${shellSingleQuote(tag)} --force`,
+    { cwd, logLevel, noStderr: true, noStdout: true }
+  );
+}
+
+const sessionCache = /* @__PURE__ */ new Map();
+function resetRewrittenTagCache() {
+  sessionCache.clear();
+}
+function short(sha) {
+  return sha.slice(0, 9);
+}
+function extractVersionFromRef(ref) {
+  const atIndex = ref.lastIndexOf("@");
+  const candidate = atIndex >= 0 ? ref.slice(atIndex + 1) : ref;
+  return candidate.startsWith("v") ? candidate.slice(1) : candidate;
+}
+function resolveStrategy(config) {
+  const isTTY = Boolean(process$1.stdout?.isTTY);
+  const strategy = config.onRewrittenTag ?? (!config.bump?.yes && isTTY ? "prompt" : "ephemeral");
+  if (strategy === "prompt" && !isTTY) {
+    return "ephemeral";
+  }
+  return strategy;
+}
+function buildExplanation({
+  from,
+  to,
+  twin,
+  subject
+}) {
+  const lines = [
+    `\u26A0\uFE0F  Tag "${from}" points to a commit that is no longer in the history of "${to}".`,
+    `It was most likely rewritten by a "git rebase" after the tag was created.`,
+    `Generating a changelog from it would span the whole divergent range (often the entire history since the last stable release, with duplicated commits) instead of the real changes.`
+  ];
+  if (twin) {
+    const subjectSuffix = subject ? ` ("${subject}")` : "";
+    lines.push(`Equivalent commit found on "${to}": ${short(twin)}${subjectSuffix}.`);
+  } else {
+    lines.push(`No equivalent commit could be found on "${to}".`);
+  }
+  lines.push(`Tip: never rebase "develop"/"main" (commits that are tagged or pushed are immutable). Integrate branches via merge or fast-forward instead.`);
+  return lines.join("\n");
+}
+async function rebind({
+  from,
+  twin,
+  config,
+  dryRun,
+  push
+}) {
+  const message = config.templates?.tagMessage?.replaceAll("{{newVersion}}", extractVersionFromRef(from)) || from;
+  if (dryRun) {
+    logger.info(`[dry-run] git tag -f -a ${from} ${short(twin)} -m "${message}" (re-bind orphaned tag)`);
+    if (push) {
+      logger.info(`[dry-run] git push origin ${from} --force`);
+    }
+    return from;
+  }
+  await retagAnnotatedLocal({
+    tag: from,
+    commit: twin,
+    message,
+    signed: config.signTags,
+    cwd: config.cwd,
+    logLevel: config.logLevel
+  });
+  logger.success(`Re-bound tag "${from}" -> ${short(twin)} locally.`);
+  if (push) {
+    await pushTagForce(from, config.cwd, config.logLevel);
+    logger.success(`Force-pushed tag "${from}" to origin.`);
+  } else {
+    logger.info(`To publish the corrected tag later: git push origin ${from} --force`);
+  }
+  return from;
+}
+async function promptOrphan({
+  from,
+  twin,
+  config,
+  dryRun,
+  explanation
+}) {
+  logger.warn(explanation);
+  const choices = [];
+  if (twin) {
+    choices.push({ name: `Use equivalent commit ${short(twin)} for this run only (recommended, non-destructive)`, value: "ephemeral" });
+    choices.push({ name: `Re-bind tag "${from}" -> ${short(twin)} locally (push it manually later)`, value: "rebind-local" });
+    choices.push({ name: `Re-bind tag "${from}" -> ${short(twin)} locally AND force-push to origin`, value: "rebind-push" });
+  }
+  choices.push({ name: `Keep the orphaned tag (changelog will span the full divergent range)`, value: "keep" });
+  choices.push({ name: `Abort`, value: "abort" });
+  let answer;
+  try {
+    answer = await select({
+      message: `How should relizy handle the rewritten tag "${from}"?`,
+      choices,
+      default: twin ? "ephemeral" : "keep"
+    });
+  } catch (error) {
+    const userHasExited = error instanceof Error && error.name === "ExitPromptError";
+    logger.log("");
+    logger.fail(userHasExited ? "Cancelled" : "Error while resolving rewritten tag");
+    process$1.exit(userHasExited ? 0 : 1);
+  }
+  switch (answer) {
+    case "ephemeral":
+      logger.info(`Using equivalent commit ${short(twin)} as the changelog base for this run.`);
+      return twin;
+    case "rebind-local":
+      return rebind({ from, twin, config, dryRun, push: false });
+    case "rebind-push": {
+      const confirmed = await confirm({
+        message: `Force-push tag "${from}" to origin? This rewrites the already-published tag.`,
+        default: false
+      }).catch(() => false);
+      if (!confirmed) {
+        logger.info("Skipping force-push; re-binding the tag locally only.");
+        return rebind({ from, twin, config, dryRun, push: false });
+      }
+      return rebind({ from, twin, config, dryRun, push: true });
+    }
+    case "keep":
+      logger.warn(`Keeping orphaned tag "${from}"; the changelog range may be incorrect.`);
+      return from;
+    case "abort":
+    default:
+      logger.log("");
+      logger.fail("Aborted. Re-bind the tag or fix your history, then retry.");
+      process$1.exit(0);
+  }
+}
+async function reconcileFromTag({
+  from,
+  to,
+  config,
+  dryRun = false
+}) {
+  if (config.detectRewrittenTags === false || !from || from === to) {
+    return from;
+  }
+  const cwd = config.cwd;
+  if (!await tagExists(from, cwd)) {
+    return from;
+  }
+  const cached = sessionCache.get(from);
+  if (cached !== void 0) {
+    return cached;
+  }
+  if (await isAncestor(from, to, cwd)) {
+    sessionCache.set(from, from);
+    return from;
+  }
+  const subject = await getCommitSubject(from, cwd);
+  const twin = subject ? await findReachableCommitBySubject(subject, to, cwd) : null;
+  const explanation = buildExplanation({ from, to, twin, subject });
+  const strategy = resolveStrategy(config);
+  let result;
+  if (strategy === "error") {
+    logger.error(explanation);
+    throw new Error(`Tag "${from}" was rewritten (rebased) and is no longer reachable from "${to}". Re-bind the tag or fix your history.`);
+  } else if (strategy === "prompt") {
+    result = await promptOrphan({ from, twin, config, dryRun, explanation });
+  } else if (!twin) {
+    logger.warn(explanation);
+    logger.warn(`Falling back to the original tag "${from}"; the changelog range may be incorrect.`);
+    result = from;
+  } else if (strategy === "rebind") {
+    logger.warn(explanation);
+    result = await rebind({ from, twin, config, dryRun, push: false });
+  } else {
+    logger.warn(explanation);
+    logger.info(`Using equivalent commit ${short(twin)} as the changelog base for this run (tag "${from}" left untouched).`);
+    result = twin;
+  }
+  sessionCache.set(from, result);
+  return result;
+}
+
 function getFirstPackageCommitHash(packagePath, cwd) {
   const relativePath = relative(cwd, packagePath);
   try {
@@ -175,7 +419,8 @@ async function getRootPackage({
   from,
   to,
   suffix,
-  changelog
+  changelog,
+  dryRun = false
 }) {
   try {
     const packageJson = readPackageJson(config.cwd);
@@ -187,7 +432,8 @@ async function getRootPackage({
       from,
       to,
       config,
-      changelog
+      changelog,
+      dryRun
     });
     let newVersion;
     if (config.monorepo?.versionMode !== "independent") {
@@ -296,7 +542,8 @@ async function getPackages({
   config,
   suffix,
   force,
-  includeAll = false
+  includeAll = false,
+  dryRun = false
 }) {
   const patterns = config.monorepo?.packages;
   const readedPackages = readPackages({
@@ -349,7 +596,8 @@ async function getPackages({
         from,
         to,
         config,
-        changelog: false
+        changelog: false,
+        dryRun
       });
       foundPaths.add(matchPath);
       const dependencies = getPackageDependencies({
@@ -427,19 +675,21 @@ async function getPackageCommits({
   from,
   to,
   config,
-  changelog
+  changelog,
+  dryRun = false
 }) {
   logger.debug(`Analyzing commits for ${pkg.name} since ${from} to ${to}`);
-  let actualFrom = from;
+  let actualFrom;
   if (from === NEW_PACKAGE_MARKER) {
     const firstPackageCommit = getFirstPackageCommitHash(pkg.path, config.cwd);
-    if (firstPackageCommit) {
-      logger.debug(`${pkg.name} is a new package, using first package commit: ${firstPackageCommit.slice(0, 8)}`);
-      actualFrom = `${firstPackageCommit}^`;
-    } else {
+    if (!firstPackageCommit) {
       logger.debug(`${pkg.name} has no commits yet, returning empty`);
       return [];
     }
+    logger.debug(`${pkg.name} is a new package, using first package commit: ${firstPackageCommit.slice(0, 8)}`);
+    actualFrom = `${firstPackageCommit}^`;
+  } else {
+    actualFrom = await reconcileFromTag({ from, to, config, dryRun });
   }
   const changelogConfig = {
     ...config,
@@ -1536,7 +1786,8 @@ async function getPackagesOrBumpedPackages({
   config,
   bumpResult,
   suffix,
-  force
+  force,
+  dryRun = false
 }) {
   if (bumpResult?.bumpedPackages && bumpResult.bumpedPackages.length > 0) {
     return bumpResult.bumpedPackages;
@@ -1544,7 +1795,8 @@ async function getPackagesOrBumpedPackages({
   return await getPackages({
     config,
     suffix,
-    force
+    force,
+    dryRun
   });
 }
 
@@ -1975,7 +2227,8 @@ function getDefaultConfig() {
       }
     },
     logLevel: "default",
-    safetyCheck: true
+    safetyCheck: true,
+    detectRewrittenTags: true
   };
 }
 function resolveTemplateDefaults(config) {
@@ -2589,68 +2842,139 @@ function groupBy(items, key) {
   return groups;
 }
 
-function fromTagIsFirstCommit(fromTag, cwd) {
-  return fromTag === getFirstCommit(cwd);
+function resolveSections(include) {
+  return {
+    title: include?.title ?? true,
+    compareLink: include?.compareLink ?? true,
+    body: include?.body ?? true,
+    contributors: include?.contributors ?? true
+  };
 }
-async function generateChangelog({
+function resolveChangelogTags({
   pkg,
   config,
-  dryRun,
-  newVersion,
-  minify
+  newVersion
 }) {
-  let fromTag = config.from || pkg.fromTag || getFirstCommit(config.cwd);
-  const isFirstCommit = fromTagIsFirstCommit(fromTag, config.cwd);
-  if (isFirstCommit) {
-    fromTag = config.monorepo?.versionMode === "independent" ? getIndependentTag({ version: "0.0.0", name: pkg.name }) : config.templates.tagBody.replace("{{newVersion}}", "0.0.0");
+  const isIndependent = config.monorepo?.versionMode === "independent";
+  const gitFromRef = config.from || pkg.fromTag || getFirstCommit(config.cwd);
+  const isFirstCommit = gitFromRef === getFirstCommit(config.cwd);
+  const displayFromTag = isFirstCommit ? isIndependent ? getIndependentTag({ version: "0.0.0", name: pkg.name }) : config.templates.tagBody.replace("{{newVersion}}", "0.0.0") : gitFromRef;
+  const gitToRef = config.to || getCurrentGitRef(config.cwd);
+  const displayToTag = config.to || (isIndependent ? getIndependentTag({ version: newVersion, name: pkg.name }) : config.templates.tagBody.replace("{{newVersion}}", newVersion));
+  if (!displayToTag) {
+    throw new Error(`No tag found for ${pkg.name}`);
   }
-  let toTag = config.to;
-  if (!toTag) {
-    toTag = config.monorepo?.versionMode === "independent" ? getIndependentTag({ version: newVersion, name: pkg.name }) : config.templates.tagBody.replace("{{newVersion}}", newVersion);
+  return { gitFromRef, gitToRef, displayFromTag, displayToTag, isFirstCommit };
+}
+function renderTitle({
+  fromTag,
+  toTag,
+  config
+}) {
+  const template = config.templates?.changelogTitle || "{{oldVersion}}...{{newVersion}}";
+  const changelogTitle = template.replace("{{oldVersion}}", fromTag).replace("{{newVersion}}", toTag).replace("{{date}}", (/* @__PURE__ */ new Date()).toISOString().split("T")[0]);
+  return `## ${changelogTitle}`;
+}
+async function renderChangelogParts({
+  commits,
+  config,
+  fromTag,
+  toTag,
+  isFirstCommit,
+  sections,
+  minify,
+  transformBody
+}) {
+  const parts = [];
+  if (sections.title) {
+    parts.push(renderTitle({ fromTag, toTag, config }));
   }
-  if (!toTag) {
-    throw new Error(`No tag found for ${pkg.name}`);
+  if (sections.compareLink && !minify) {
+    const compareLink = buildCompareLink({ config, from: fromTag, to: toTag, isFirstCommit });
+    if (compareLink) {
+      parts.push(compareLink);
+    }
   }
-  logger.debug(`Generating changelog for ${pkg.name} - from ${fromTag} to ${toTag}`);
+  if (sections.body) {
+    let body = buildChangelogBody({ commits, config, minify });
+    if (transformBody && body) {
+      body = await transformBody(body);
+    }
+    if (body) {
+      parts.push(body);
+    }
+  }
+  if (sections.contributors && !minify) {
+    const contributors = await buildContributors({ commits, config });
+    if (contributors) {
+      parts.push(contributors);
+    }
+  }
+  return parts;
+}
+function isFullChangelogOutput(sections, minify) {
+  return !minify && sections.title && sections.compareLink && sections.body && sections.contributors;
+}
+async function generateChangelog({
+  pkg,
+  config,
+  dryRun,
+  newVersion,
+  minify,
+  include,
+  transformBody
+}) {
+  const sections = resolveSections(include);
+  const { gitFromRef, gitToRef, displayFromTag, displayToTag, isFirstCommit } = resolveChangelogTags({ pkg, config, newVersion });
+  logger.debug(`Generating changelog for ${pkg.name} - git ${gitFromRef}..${gitToRef} - display ${displayFromTag}...${displayToTag}`);
   try {
-    config = {
-      ...config,
-      from: fromTag,
-      to: toTag
-    };
-    const generatedChangelog = await generateMarkDown({
-      commits: pkg.commits,
-      config,
-      from: fromTag,
+    const commits = await getPackageCommits({
+      pkg,
+      from: gitFromRef,
+      to: gitToRef,
+      config: { ...config, from: gitFromRef, to: gitToRef },
+      changelog: true,
+      dryRun
+    });
+    const displayConfig = { ...config, from: displayFromTag, to: displayToTag };
+    const parts = await renderChangelogParts({
+      commits,
+      config: displayConfig,
+      fromTag: displayFromTag,
+      toTag: displayToTag,
       isFirstCommit,
-      to: toTag,
-      minify
+      sections,
+      minify,
+      transformBody
     });
-    let changelog = generatedChangelog;
-    if (pkg.commits.length === 0) {
+    let changelog = parts.filter(Boolean).join("\n\n").trim();
+    const isFullOutput = isFullChangelogOutput(sections, minify);
+    if (commits.length === 0 && sections.body && isFullOutput) {
       changelog = `${changelog}
 
-${config.templates.emptyChangelogContent}`;
+${displayConfig.templates.emptyChangelogContent}`;
+    }
+    if (isFullOutput) {
+      const changelogResult = await executeHook("generate:changelog", displayConfig, dryRun, {
+        commits,
+        changelog
+      });
+      changelog = changelogResult || changelog;
     }
-    const changelogResult = await executeHook("generate:changelog", config, dryRun, {
-      commits: pkg.commits,
-      changelog
-    });
-    changelog = changelogResult || changelog;
     logger.verbose(`Output changelog for ${pkg.name}:
 ${changelog}`);
-    logger.debug(`Changelog generated for ${pkg.name} (${pkg.commits.length} commits)`);
+    logger.debug(`Changelog generated for ${pkg.name} (${commits.length} commits)`);
     logger.verbose(`Final changelog for ${pkg.name}:
 
 ${changelog}
 
 `);
     if (dryRun) {
-      logger.info(`[dry-run] ${pkg.name} - Generate changelog ${fromTag}...${toTag}`);
+      logger.info(`[dry-run] ${pkg.name} - Generate changelog ${displayFromTag}...${displayToTag}`);
     }
     return changelog;
   } catch (error) {
-    throw new Error(`Error generating changelog for ${pkg.name} (${fromTag}...${toTag}): ${getErrorMessage(error)}`, { cause: error });
+    throw new Error(`Error generating changelog for ${pkg.name}: ${getErrorMessage(error)}`, { cause: error });
   }
 }
 function writeChangelogToFile({
@@ -2900,6 +3224,52 @@ function handleFallback(config, rawBody, error) {
   return rawBody;
 }
 
+async function publishIndependentRelease({
+  pkg,
+  config,
+  dryRun,
+  repoConfig
+}) {
+  const newVersion = isBumpedPackage(pkg) && pkg.newVersion || pkg.version;
+  const from = config.from || pkg.fromTag;
+  const to = config.to || getIndependentTag({ version: newVersion, name: pkg.name });
+  if (!from) {
+    logger.warn(`No from tag found for ${pkg.name}, skipping release`);
+    return void 0;
+  }
+  const toTag = dryRun ? "HEAD" : to;
+  logger.debug(`Processing ${pkg.name}: ${from} \u2192 ${toTag}`);
+  const releaseBody = await generateChangelog({
+    pkg: { ...pkg, fromTag: from },
+    config,
+    dryRun,
+    newVersion,
+    include: { title: false, compareLink: true, body: true, contributors: true },
+    transformBody: isAIProviderReleaseEnabled(config) ? (body) => generateAIProviderReleaseBody({ config, rawBody: body }) : void 0
+  });
+  const release = {
+    tag_name: to,
+    name: to,
+    body: releaseBody,
+    prerelease: isPrerelease(newVersion)
+  };
+  logger.debug(`Creating release for ${to}${release.prerelease ? " (prerelease)" : ""}`);
+  if (dryRun) {
+    logger.info(`[dry-run] Publish GitHub release for ${release.tag_name}`);
+    logger.box("[dry-run] Release Preview", `Tag: ${release.tag_name}
+
+${releaseBody}`);
+  } else {
+    logger.debug(`Publishing release ${to} to GitHub...`);
+    await createGithubRelease({ ...config, from, to, repo: repoConfig }, release);
+  }
+  return {
+    name: pkg.name,
+    tag: release.tag_name,
+    version: newVersion,
+    prerelease: release.prerelease
+  };
+}
 async function githubIndependentMode({
   config,
   dryRun,
@@ -2919,60 +3289,15 @@ async function githubIndependentMode({
     config,
     bumpResult,
     suffix,
-    force
+    force,
+    dryRun
   }));
   logger.info(`Creating ${packages.length} GitHub release(s)`);
   const postedReleases = [];
   for (const pkg of packages) {
-    const newVersion = isBumpedPackage(pkg) && pkg.newVersion || pkg.version;
-    const from = config.from || pkg.fromTag;
-    const to = config.to || getIndependentTag({ version: newVersion, name: pkg.name });
-    if (!from) {
-      logger.warn(`No from tag found for ${pkg.name}, skipping release`);
-      continue;
-    }
-    const toTag = dryRun ? "HEAD" : to;
-    logger.debug(`Processing ${pkg.name}: ${from} \u2192 ${toTag}`);
-    const isFirstCommit = from === getFirstCommit(config.cwd);
-    const compareLink = buildCompareLink({ config, from, to, isFirstCommit });
-    let body = buildChangelogBody({ commits: pkg.commits, config });
-    const contributors = await buildContributors({ commits: pkg.commits, config });
-    if (isAIProviderReleaseEnabled(config)) {
-      body = await generateAIProviderReleaseBody({ config, rawBody: body });
-    }
-    const releaseBody = [compareLink, body, contributors].filter(Boolean).join("\n\n").trim();
-    const release = {
-      tag_name: to,
-      name: to,
-      body: releaseBody,
-      prerelease: isPrerelease(newVersion)
-    };
-    logger.debug(`Creating release for ${to}${release.prerelease ? " (prerelease)" : ""}`);
-    if (dryRun) {
-      logger.info(`[dry-run] Publish GitHub release for ${release.tag_name}`);
-      postedReleases.push({
-        name: pkg.name,
-        tag: release.tag_name,
-        version: newVersion,
-        prerelease: release.prerelease
-      });
-      logger.box("[dry-run] Release Preview", `Tag: ${release.tag_name}
-
-${releaseBody}`);
-    } else {
-      logger.debug(`Publishing release ${to} to GitHub...`);
-      await createGithubRelease({
-        ...config,
-        from,
-        to,
-        repo: repoConfig
-      }, release);
-      postedReleases.push({
-        name: pkg.name,
-        tag: release.tag_name,
-        version: newVersion,
-        prerelease: release.prerelease
-      });
+    const posted = await publishIndependentRelease({ pkg, config, dryRun, repoConfig });
+    if (posted) {
+      postedReleases.push(posted);
     }
   }
   if (postedReleases.length === 0) {
@@ -3000,14 +3325,14 @@ async function githubUnified({
   const to = config.to || config.templates.tagBody.replace("{{newVersion}}", newVersion);
   const firstCommit = getFirstCommit(config.cwd);
   const from = config.from || rootPackage.fromTag || firstCommit;
-  const isFirstCommit = from === firstCommit;
-  const compareLink = buildCompareLink({ config, from, to, isFirstCommit });
-  let body = buildChangelogBody({ commits: rootPackage.commits, config });
-  const contributors = await buildContributors({ commits: rootPackage.commits, config });
-  if (isAIProviderReleaseEnabled(config)) {
-    body = await generateAIProviderReleaseBody({ config, rawBody: body });
-  }
-  const releaseBody = [compareLink, body, contributors].filter(Boolean).join("\n\n").trim();
+  const releaseBody = await generateChangelog({
+    pkg: { ...rootPackage, fromTag: from },
+    config,
+    dryRun,
+    newVersion,
+    include: { title: false, compareLink: true, body: true, contributors: true },
+    transformBody: isAIProviderReleaseEnabled(config) ? (body) => generateAIProviderReleaseBody({ config, rawBody: body }) : void 0
+  });
   const release = {
     tag_name: to,
     name: to,
@@ -3086,7 +3411,8 @@ async function github(options) {
       suffix: options.suffix,
       changelog: true,
       from,
-      to
+      to,
+      dryRun
     });
     return await githubUnified({
       config,
@@ -3173,7 +3499,8 @@ async function gitlabIndependentMode({
     config,
     bumpResult,
     suffix,
-    force
+    force,
+    dryRun
   }));
   logger.info(`Creating ${packages.length} GitLab release(s) for independent packages`);
   logger.debug("Getting current branch...");
@@ -3193,18 +3520,25 @@ async function gitlabIndependentMode({
       continue;
     }
     logger.debug(`Processing ${pkg.name}: ${from} \u2192 ${to}`);
-    const isFirstCommit = from === getFirstCommit(config.cwd);
-    const compareLink = buildCompareLink({ config, from, to, isFirstCommit });
-    let body = buildChangelogBody({ commits: pkg.commits, config });
-    const contributors = await buildContributors({ commits: pkg.commits, config });
-    if (!body) {
+    const bodyOnly = await generateChangelog({
+      pkg: { ...pkg, fromTag: from },
+      config,
+      dryRun,
+      newVersion,
+      include: { title: false, compareLink: false, body: true, contributors: false }
+    });
+    if (!bodyOnly.trim()) {
       logger.warn(`No changelog found for ${pkg.name}`);
       continue;
     }
-    if (isAIProviderReleaseEnabled(config)) {
-      body = await generateAIProviderReleaseBody({ config, rawBody: body });
-    }
-    const releaseBody = [compareLink, body, contributors].filter(Boolean).join("\n\n").trim();
+    const releaseBody = await generateChangelog({
+      pkg: { ...pkg, fromTag: from },
+      config,
+      dryRun,
+      newVersion,
+      include: { title: false, compareLink: true, body: true, contributors: true },
+      transformBody: isAIProviderReleaseEnabled(config) ? (body) => generateAIProviderReleaseBody({ config, rawBody: body }) : void 0
+    });
     const release = {
       tag_name: to,
       name: to,
@@ -3250,14 +3584,14 @@ async function gitlabUnified({
   const to = config.templates.tagBody.replace("{{newVersion}}", newVersion);
   const firstCommit = getFirstCommit(config.cwd);
   const from = config.from || rootPackage.fromTag || firstCommit;
-  const isFirstCommit = from === firstCommit;
-  const compareLink = buildCompareLink({ config, from, to, isFirstCommit });
-  let body = buildChangelogBody({ commits: rootPackage.commits, config });
-  const contributors = await buildContributors({ commits: rootPackage.commits, config });
-  if (isAIProviderReleaseEnabled(config)) {
-    body = await generateAIProviderReleaseBody({ config, rawBody: body });
-  }
-  const releaseBody = [compareLink, body, contributors].filter(Boolean).join("\n\n").trim();
+  const releaseBody = await generateChangelog({
+    pkg: { ...rootPackage, fromTag: from },
+    config,
+    dryRun,
+    newVersion,
+    include: { title: false, compareLink: true, body: true, contributors: true },
+    transformBody: isAIProviderReleaseEnabled(config) ? (body) => generateAIProviderReleaseBody({ config, rawBody: body }) : void 0
+  });
   logger.debug("Getting current branch...");
   const { stdout: currentBranch } = await execPromise("git rev-parse --abbrev-ref HEAD", {
     noSuccess: true,
@@ -3340,7 +3674,8 @@ async function gitlab(options = {}) {
       suffix: options.suffix,
       changelog: true,
       from,
-      to
+      to,
+      dryRun
     });
     logger.debug(`Root package: ${getIndependentTag({ name: rootPackage.name, version: newVersion })}`);
     return await gitlabUnified({
@@ -3754,7 +4089,7 @@ function extractChangelogSummary(changelog, { stripBoldMarkers = false, maxLengt
   if (changelog.trim() === "") {
     return "";
   }
-  let cleaned = changelog.split("\n").filter((line) => !line.startsWith("#")).join("\n");
+  let cleaned = changelog.split("\n").filter((line) => !line.startsWith("#") && line.trim() !== "").join("\n");
   if (stripBoldMarkers) {
     cleaned = cleaned.replace(/\*\*([^*]+):\*\*/g, "$1:");
   }
@@ -3814,7 +4149,7 @@ function formatPackagesForSlack(packages) {
     return "";
   }
   return packages.map(
-    (pkg) => pkg.hasTransition ? `\u2022 **${pkg.name}** : \`${pkg.oldVersion}\` \u2192 \`${pkg.newVersion}\`` : `\u2022 **${pkg.name}** : \`${pkg.version}\``
+    (pkg) => pkg.hasTransition ? `\u2022 *${pkg.name}* : \`${pkg.oldVersion}\` \u2192 \`${pkg.newVersion}\`` : `\u2022 *${pkg.name}* : \`${pkg.version}\``
   ).join("\n");
 }
 function formatSlackMessage({ projectName, version, changelog, releaseUrl, changelogUrl, template, contributors = [], packages = [], postMaxLength = 2500 }) {
@@ -4188,7 +4523,8 @@ async function bumpUnifiedMode({
     from,
     to,
     suffix,
-    changelog: false
+    changelog: false,
+    dryRun
   });
   const currentVersion = rootPackage.version;
   const newVersion = rootPackage.newVersion;
@@ -4202,7 +4538,8 @@ async function bumpUnifiedMode({
     config,
     suffix,
     force,
-    includeAll: true
+    includeAll: true,
+    dryRun
   });
   if (packages.length === 0) {
     logger.debug("No packages to bump");
@@ -4272,7 +4609,8 @@ async function bumpSelectiveMode({
     from,
     to,
     suffix,
-    changelog: false
+    changelog: false,
+    dryRun
   });
   const currentVersion = rootPackage.version;
   const newVersion = rootPackage.newVersion;
@@ -4285,7 +4623,8 @@ async function bumpSelectiveMode({
   const packages = await getPackages({
     config,
     suffix,
-    force
+    force,
+    dryRun
   });
   if (packages.length === 0) {
     logger.debug("No packages to bump");
@@ -4353,7 +4692,8 @@ async function bumpIndependentMode({
   const packagesToBump = await getPackages({
     config,
     suffix,
-    force
+    force,
+    dryRun
   });
   if (packagesToBump.length === 0) {
     logger.debug("No packages to bump");
@@ -4406,7 +4746,7 @@ async function bumpCanaryMode({
   logger.debug("Starting bump in canary mode");
   if (config.monorepo?.versionMode === "independent") {
     const sha2 = getShortCommitSha(config.cwd);
-    const packages2 = await getPackages({ config, suffix: void 0, force: false });
+    const packages2 = await getPackages({ config, suffix: void 0, force: false, dryRun });
     if (packages2.length === 0) {
       logger.debug("No packages to bump");
       return { bumped: false };
@@ -4429,7 +4769,8 @@ async function bumpCanaryMode({
     from,
     to,
     config,
-    changelog: false
+    changelog: false,
+    dryRun
   });
   const releaseType = determineSemverChange(commits, config.types);
   const sha = getShortCommitSha(config.cwd);
@@ -4446,7 +4787,8 @@ async function bumpCanaryMode({
     config,
     suffix: void 0,
     force: false,
-    includeAll: isUnified
+    includeAll: isUnified,
+    dryRun
   });
   if (packages.length === 0) {
     logger.debug("No packages to bump");
@@ -4627,11 +4969,12 @@ async function generateIndependentRootChangelog({
   logger.debug("Generating aggregated root changelog for independent mode");
   const packageChangelogs = [];
   for (const pkg of packages) {
+    const newVersion = isBumpedPackage(pkg) && pkg.newVersion || pkg.version;
     const changelog2 = await generateChangelog({
       pkg,
       config,
       dryRun,
-      newVersion: isBumpedPackage(pkg) && pkg.newVersion || pkg.version
+      newVersion
     });
     if (changelog2) {
       packageChangelogs.push(changelog2);
@@ -4694,7 +5037,8 @@ async function generateSimpleRootChangelog({
     suffix,
     changelog: true,
     from: fromTag,
-    to
+    to,
+    dryRun
   });
   logger.debug(`Generating ${rootPackage.name} changelog (${fromTag}...${to})`);
   const rootChangelog = await generateChangelog({
@@ -4743,7 +5087,8 @@ async function changelog(options = {}) {
       config,
       bumpResult: options.bumpResult,
       suffix: options.suffix,
-      force: options.force ?? false
+      force: options.force ?? false,
+      dryRun
     });
     if (config.changelog?.rootChangelog && config.monorepo?.versionMode) {
       if (config.monorepo.versionMode === "independent") {
@@ -4769,13 +5114,7 @@ async function changelog(options = {}) {
     let generatedCount = 0;
     for await (const pkg of packages) {
       const newVersion = options.bumpResult?.bumpedPackages?.find((p) => p.name === pkg.name)?.newVersion || pkg.newVersion || pkg.version;
-      const { from, to } = await resolveTags({
-        config,
-        step: "changelog",
-        pkg,
-        newVersion
-      });
-      logger.debug(`Processing ${pkg.name} (${from}...${to})`);
+      logger.debug(`Processing ${pkg.name}`);
       const changelog2 = await generateChangelog({
         pkg,
         config,
@@ -5242,7 +5581,8 @@ async function publish(options = {}) {
       config,
       bumpResult: options.bumpResult,
       suffix: options.suffix,
-      force: options.force ?? false
+      force: options.force ?? false,
+      dryRun
     });
     const packages = filterOutPrivatePackages(discoveredPackages);
     if (discoveredPackages.length !== packages.length) {
@@ -5572,10 +5912,25 @@ async function social(options = {}) {
       suffix: void 0,
       changelog: true,
       from: fromTag,
-      to
+      to,
+      dryRun
+    });
+    const minifiedBody = await generateChangelog({
+      pkg: { ...rootPackage, fromTag },
+      config,
+      dryRun,
+      newVersion,
+      include: { title: false, compareLink: false, body: true, contributors: false },
+      minify: true
+    });
+    const richBody = await generateChangelog({
+      pkg: { ...rootPackage, fromTag },
+      config,
+      dryRun,
+      newVersion,
+      include: { title: false, compareLink: false, body: true, contributors: false },
+      minify: false
     });
-    const minifiedBody = buildChangelogBody({ commits: rootPackage.commits, config, minify: true });
-    const richBody = buildChangelogBody({ commits: rootPackage.commits, config, minify: false });
     const hasContent = !!minifiedBody.trim();
     const twitterReleaseUrl = getReleaseUrl(config, to);
     const twitterChangelogUrl = config.social?.changelogUrl;
@@ -5625,13 +5980,21 @@ ${twitterChangelog}`);
       newVersion,
       tag: to
     });
+    const changelogCommits = await getPackageCommits({
+      pkg: rootPackage,
+      from: fromTag,
+      to: "HEAD",
+      config,
+      changelog: true,
+      dryRun
+    });
     const slackResponse = await handleSlackPost({
       config,
       changelog: slackChangelog,
       dryRun,
       newVersion,
       tag: to,
-      commits: rootPackage.commits,
+      commits: changelogCommits,
       bumpedPackages: options.bumpResult?.bumpedPackages
     });
     const results = [];
@@ -6002,4 +6365,4 @@ Git provider: ${provider}`);
   }
 }
 
-export { PR_COMMENT_MARKER as $, getModifiedReleaseFilePatterns as A, createCommitAndTags as B, pushCommitAndTags as C, rollbackModifiedFiles as D, getFirstCommit as E, getCurrentGitBranch as F, getCurrentGitRef as G, getShortCommitSha as H, github as I, createGitlabRelease as J, gitlab as K, buildCompareLink as L, buildChangelogBody as M, collectContributorNames as N, buildContributors as O, generateMarkDown as P, parseChangelogMarkdown as Q, detectPackageManager as R, determinePublishTag as S, getPackagesToPublishInSelectiveMode as T, getPackagesToPublishInIndependentMode as U, getAuthCommand as V, publishPackage as W, collectPackageBumps as X, findGitHubPR as Y, findGitLabMR as Z, detectPullRequest as _, buildCommentBody as a, postPrComment as a0, readPackageJson as a1, getRootPackage as a2, readPackages as a3, getPackages as a4, getPackageCommits as a5, hasLernaJson as a6, getSlackToken as a7, getSlackWebhookUrl as a8, formatChangelogForSlack as a9, determineReleaseType as aA, writeVersion as aB, getPackageNewVersion as aC, updateLernaVersion as aD, extractVersionFromPackageTag as aE, isPrerelease as aF, isStableReleaseType as aG, isPrereleaseReleaseType as aH, isGraduating as aI, getPreid as aJ, isChangedPreid as aK, getBumpedPackageIndependently as aL, confirmBump as aM, getBumpedIndependentPackages as aN, shouldFilterPrereleaseTags as aO, extractVersionFromTag as aP, getCanaryVersion as aQ, isTagVersionCompatibleWithCurrent as aR, formatPackagesForSlack as aa, formatSlackMessage as ab, postReleaseToSlack as ac, extractChangelogSummary as ad, getReleaseUrl as ae, getIndependentTag as af, getLastStableTag as ag, getLastTag as ah, getLastRepoTag as ai, getLastPackageTag as aj, NEW_PACKAGE_MARKER as ak, resolveTags as al, getTwitterCredentials as am, formatTweetMessage as an, postReleaseToTwitter as ao, executeHook as ap, isInCI as aq, getCIName as ar, executeFormatCmd as as, executeBuildCmd as at, isBumpedPackage as au, filterOutPrivatePackages as av, getPackagesOrBumpedPackages as aw, isGraduatingToStableBetweenVersion as ax, capReleaseTypeForZeroMajor as ay, determineSemverChange as az, bump as b, changelog as c, providerReleaseSafetyCheck as d, providerRelease as e, publishSafetyCheck as f, publish as g, social as h, generateChangelog as i, getDefaultConfig as j, defineConfig as k, loadRelizyConfig as l, mergeTypes as m, getPackageDependencies as n, getDependentsOf as o, prComment as p, expandPackagesToBumpWithDependents as q, release as r, socialSafetyCheck as s, topologicalSort as t, getGitStatus as u, checkGitStatusIfDirty as v, writeChangelogToFile as w, fetchGitTags as x, detectGitProvider as y, parseGitRemoteUrl as z };
+export { getAuthCommand as $, getModifiedReleaseFilePatterns as A, createCommitAndTags as B, pushCommitAndTags as C, rollbackModifiedFiles as D, getFirstCommit as E, getCurrentGitBranch as F, getCurrentGitRef as G, getShortCommitSha as H, isAncestor as I, getCommitSubject as J, findReachableCommitBySubject as K, tagExists as L, retagAnnotatedLocal as M, pushTagForce as N, github as O, createGitlabRelease as P, gitlab as Q, buildCompareLink as R, buildChangelogBody as S, collectContributorNames as T, buildContributors as U, generateMarkDown as V, parseChangelogMarkdown as W, detectPackageManager as X, determinePublishTag as Y, getPackagesToPublishInSelectiveMode as Z, getPackagesToPublishInIndependentMode as _, buildCommentBody as a, publishPackage as a0, collectPackageBumps as a1, findGitHubPR as a2, findGitLabMR as a3, detectPullRequest as a4, PR_COMMENT_MARKER as a5, postPrComment as a6, readPackageJson as a7, getRootPackage as a8, readPackages as a9, executeFormatCmd as aA, executeBuildCmd as aB, isBumpedPackage as aC, filterOutPrivatePackages as aD, getPackagesOrBumpedPackages as aE, isGraduatingToStableBetweenVersion as aF, capReleaseTypeForZeroMajor as aG, determineSemverChange as aH, determineReleaseType as aI, writeVersion as aJ, getPackageNewVersion as aK, updateLernaVersion as aL, extractVersionFromPackageTag as aM, isPrerelease as aN, isStableReleaseType as aO, isPrereleaseReleaseType as aP, isGraduating as aQ, getPreid as aR, isChangedPreid as aS, getBumpedPackageIndependently as aT, confirmBump as aU, getBumpedIndependentPackages as aV, shouldFilterPrereleaseTags as aW, extractVersionFromTag as aX, getCanaryVersion as aY, isTagVersionCompatibleWithCurrent as aZ, getPackages as aa, getPackageCommits as ab, hasLernaJson as ac, resetRewrittenTagCache as ad, reconcileFromTag as ae, getSlackToken as af, getSlackWebhookUrl as ag, formatChangelogForSlack as ah, formatPackagesForSlack as ai, formatSlackMessage as aj, postReleaseToSlack as ak, extractChangelogSummary as al, getReleaseUrl as am, getIndependentTag as an, getLastStableTag as ao, getLastTag as ap, getLastRepoTag as aq, getLastPackageTag as ar, NEW_PACKAGE_MARKER as as, resolveTags as at, getTwitterCredentials as au, formatTweetMessage as av, postReleaseToTwitter as aw, executeHook as ax, isInCI as ay, getCIName as az, bump as b, changelog as c, providerReleaseSafetyCheck as d, providerRelease as e, publishSafetyCheck as f, publish as g, social as h, generateChangelog as i, getDefaultConfig as j, defineConfig as k, loadRelizyConfig as l, mergeTypes as m, getPackageDependencies as n, getDependentsOf as o, prComment as p, expandPackagesToBumpWithDependents as q, release as r, socialSafetyCheck as s, topologicalSort as t, getGitStatus as u, checkGitStatusIfDirty as v, writeChangelogToFile as w, fetchGitTags as x, detectGitProvider as y, parseGitRemoteUrl as z };