relizy 1.5.0 → 1.6.0

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 import { printBanner, logger } from '@maz-ui/node';
 import { Command } from 'commander';
-import { av as isInCI, S as getCIName, f as bump, h as changelog, aM as publish, aK as providerRelease, b3 as social, aJ as prComment, aV as release } from './shared/relizy.CobLJLr_.mjs';
+import { aA as isInCI, U as getCIName, h as bump, j as changelog, aR as publish, aP as providerRelease, b8 as social, aO as prComment, a_ as release } from './shared/relizy.DhYBvZNi.mjs';
 import 'node:child_process';
 import '@maz-ui/utils/helpers/formatJson';
 import 'c12';

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { LogLevel } from '@maz-ui/node';
-import { GitCommit, ChangelogConfig as ChangelogConfig$1, SemverBumpType } from 'changelogen';
+import { RawGitCommit, GitCommit, ChangelogConfig as ChangelogConfig$1, SemverBumpType } from 'changelogen';
 import { ReleaseType } from 'semver';
 import { DeepPartial } from '@maz-ui/utils/ts-helpers/DeepPartial';
 import * as _slack_web_api from '@slack/web-api';
@@ -194,11 +194,61 @@ declare function createCommitAndTags({ config, noVerify, bumpedPackages, newVers
     dryRun?: boolean;
     logLevel: LogLevel;
 }): Promise<string[]>;
-declare function pushCommitAndTags({ config, dryRun, logLevel, cwd }: {
+interface GitUpstream {
+    /** Remote name, e.g. `origin` */
+    remote: string;
+    /** Remote branch ref, e.g. `refs/heads/main` */
+    mergeRef: string;
+    /** Remote-tracking ref, e.g. `refs/remotes/origin/main` */
+    trackingRef: string;
+    /** Short remote-tracking name, e.g. `origin/main` */
+    name: string;
+}
+/**
+ * Resolve the upstream of the current branch. Returns null on a detached HEAD
+ * or when the branch has no upstream configured.
+ */
+declare function getGitUpstream(cwd: string): Promise<GitUpstream | null>;
+/**
+ * Ensure the current branch contains every commit of its remote counterpart.
+ *
+ * A release commit created on a branch that is behind its remote can never be
+ * pushed. Since packages are published before the push, running this check
+ * right before publishing prevents shipping a version whose release commit is
+ * then rejected (leaving an orphan tag and the repository stuck on the
+ * previous version).
+ *
+ * Skipped (no error) on a detached HEAD, without upstream, or when the remote
+ * cannot be fetched.
+ */
+declare function assertBranchUpToDateWithRemote({ cwd }: {
+    cwd: string;
+}): Promise<void>;
+declare function pushCommitAndTags({ config, dryRun, logLevel, cwd, tags, }: {
     config: ResolvedRelizyConfig;
     dryRun: boolean;
     logLevel?: LogLevel;
     cwd: string;
+    tags?: string[];
+}): Promise<void>;
+/**
+ * Compute the git tag names a release will create, mirroring `createCommitAndTags`.
+ */
+declare function getReleaseTagNames({ config, bumpedPackages, newVersion, }: {
+    config: ResolvedRelizyConfig;
+    bumpedPackages?: BumpResultTruthy['bumpedPackages'];
+    newVersion?: string;
+}): string[];
+/**
+ * Fail early when a tag the release is about to create already exists.
+ *
+ * This typically happens after a release that published its packages and
+ * pushed its tag, but whose release commit was rejected: the branch is still
+ * on the previous version, so the next run computes the same version again.
+ */
+declare function assertReleaseTagsAvailable({ tags, cwd }: {
+    tags: string[];
+    cwd: string;
 }): Promise<void>;
 /**
  * Rollback modified files to their last committed state
@@ -249,6 +299,14 @@ declare function retagAnnotatedLocal({ tag, commit, message, signed, cwd, logLev
  * Force-push a single tag to origin. Used only after explicit confirmation.
  */
 declare function pushTagForce(tag: string, cwd?: string, logLevel?: LogLevel): Promise<void>;
+/**
+ * Drop-in replacement for changelogen's `getGitDiff`, which splits the
+ * `git log` output on `----\n` and the subject line on `|`. A commit body
+ * containing a `----` line (GitHub adds `---------` before the
+ * `Co-authored-by:` trailers of a squash merge) then loses its trailers and its
+ * `--name-status` file list, and a subject containing `|` is truncated.
+ */
+declare function getGitDiff(from: string | undefined, to?: string, cwd?: string): RawGitCommit[];
 
 declare function github(options: ProviderReleaseOptions): Promise<PostedRelease[]>;
 
@@ -869,23 +927,24 @@ declare function shouldFilterPrereleaseTags(currentVersion: string, graduating:
  */
 declare function extractVersionFromTag(tag: string, packageName?: string): string | null;
 /**
- * Checks if a tag's version is compatible with the current version.
- * A tag is compatible if its major version is less than or equal to the current major version.
+ * Computes a canary version with format `{nextVersion}-0.{preid}-{sha}`.
  *
- * This prevents accidentally using tags from future major versions (e.g., v5.0.0-beta.0)
- * when bumping a current stable version (e.g., 4.1.1 → 4.1.2).
+ * The leading numeric `0` prerelease identifier makes the canary sort below
+ * every named prerelease (alpha, beta, rc...) and the stable release of the
+ * same version, so it never matches a range like `^5.0.0-beta.0` and is never
+ * suggested by update tools. Keeping preid and sha in a single identifier also
+ * keeps the version valid when the sha is all digits with a leading zero.
  *
- * @param payload - The payload to check
+ * @param payload - The payload to compute the canary version from
  * @param payload.currentVersion - The current package version
- * @param payload.releaseType - The release type
+ * @param payload.releaseType - The release type detected from commits (defaults to patch)
  * @param payload.preid - The pre-release identifier
- * @param payload.sha - The sha of the commit
- * @returns true if the tag version's major is <= current major version
+ * @param payload.sha - The short sha of the commit
+ * @returns The canary version
  *
  * @example
- * isTagVersionCompatibleWithCurrent('4.1.1', '4.1.0') // true - same major
- * isTagVersionCompatibleWithCurrent('5.0.0-beta.0', '4.1.1') // false - newer major
- * isTagVersionCompatibleWithCurrent('3.9.9', '4.1.1') // true - older major
+ * getCanaryVersion({ currentVersion: '1.2.3', releaseType: 'minor', sha: 'a3f4b2c' }) // '1.3.0-0.canary-a3f4b2c'
+ * getCanaryVersion({ currentVersion: '5.0.0-beta.44', releaseType: 'patch', sha: 'a3f4b2c' }) // '5.0.0-0.canary-a3f4b2c'
  */
 declare function getCanaryVersion({ currentVersion, releaseType, preid, sha, }: {
     currentVersion: string;
@@ -893,6 +952,22 @@ declare function getCanaryVersion({ currentVersion, releaseType, preid, sha, }:
     preid?: string;
     sha: string;
 }): string;
+/**
+ * Checks if a tag's version is compatible with the current version.
+ * A tag is compatible if its major version is less than or equal to the current major version.
+ *
+ * This prevents accidentally using tags from future major versions (e.g., v5.0.0-beta.0)
+ * when bumping a current stable version (e.g., 4.1.1 → 4.1.2).
+ *
+ * @param tagVersion - The version extracted from the tag
+ * @param currentVersion - The current package version
+ * @returns true if the tag version's major is <= current major version
+ *
+ * @example
+ * isTagVersionCompatibleWithCurrent('4.1.1', '4.1.0') // true - same major
+ * isTagVersionCompatibleWithCurrent('5.0.0-beta.0', '4.1.1') // false - newer major
+ * isTagVersionCompatibleWithCurrent('3.9.9', '4.1.1') // true - older major
+ */
 declare function isTagVersionCompatibleWithCurrent(tagVersion: string, currentVersion: string): boolean;
 
 type VersionMode = 'unified' | 'independent' | 'selective';
@@ -2264,5 +2339,5 @@ declare function socialSafetyCheck({ config }: {
 }): Promise<void>;
 declare function social(options?: Partial<SocialOptions>): Promise<SocialResult>;
 
-export { NEW_PACKAGE_MARKER, PR_COMMENT_MARKER, buildChangelogBody, buildCommentBody, buildCompareLink, buildContributors, buildReleaseSummary, bump, capReleaseTypeForZeroMajor, changelog, checkGitStatusIfDirty, collectContributorNames, collectPackageBumps, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, detectPullRequest, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractChangelogSummary, extractVersionFromPackageTag, extractVersionFromTag, fetchGitTags, filterOutPrivatePackages, findGitHubPR, findGitLabMR, findReachableCommitBySubject, formatChangelogForSlack, formatPackagesForSlack, formatSlackMessage, formatTweetMessage, generateChangelog, generateMarkDown, getAuthCommand, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCanaryVersion, getCommitChangedFiles, getCommitSubject, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitStatus, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getModifiedReleaseFilePatterns, getNpmRegistry, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesOrBumpedPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getReleaseUrl, getRootPackage, getShortCommitSha, getSlackToken, getSlackWebhookUrl, getTwitterCredentials, github, gitlab, globDirsAbsolute, hasLernaJson, isAncestor, isBumpedPackage, isChangedPreid, isCommitOnlyInIgnoredPackages, isGraduating, isGraduatingToStableBetweenVersion, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, isTagVersionCompatibleWithCurrent, isVersionAlreadyPublishedError, isVersionPublished, loadRelizyConfig, mergeTypes, parseChangelogMarkdown, parseGitRemoteUrl, postPrComment, postReleaseToSlack, postReleaseToTwitter, prComment, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, publishSafetyCheck, pushCommitAndTags, pushTagForce, readPackageJson, readPackages, reconcileFromTag, redactSecrets, release, resetRewrittenTagCache, resolveAllConfiguredRegistryTargets, resolveIgnoredPackagePaths, resolveRegistryTargetsForPackage, resolveRegistryTargetsForPackages, resolveTags, retagAnnotatedLocal, rollbackModifiedFiles, shouldFilterPrereleaseTags, social, socialSafetyCheck, tagExists, topologicalSort, tryPostPrComment, updateLernaVersion, withRegistryNpmrc, writeChangelogToFile, writeVersion };
-export type { AIConfig, AIPromptTarget, AIProviderName, AISocialConfig, AISystemPromptOverrides, AITargetConfig, BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogInclude, ChangelogOptions, ClaudeCodeProviderOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, OnRewrittenTag, PackageBase, PackageBumpEntry, PackageManager, PostedRelease, PrCommentConfig, PrCommentMode, PrCommentOptions, PrCommentStatus, ProviderReleaseOptions, ProviderReleaseResult, PublishConfig, PublishOptions, PublishResponse, PullRequestInfo, ReadPackage, Reference, RegistryTarget, ReleaseConfig, ReleaseContext, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, ResolvedTwitterCredentials, RootPackage, SlackCredentials, SlackOptions, SlackPackageEntry, SlackSocialConfig, SocialConfig, SocialNetworkResult, SocialOptions, SocialResult, Step, TemplatesConfig, TokensConfig, TwitterCredentials, TwitterOptions, TwitterSocialConfig, VersionMode };
+export { NEW_PACKAGE_MARKER, PR_COMMENT_MARKER, assertBranchUpToDateWithRemote, assertReleaseTagsAvailable, buildChangelogBody, buildCommentBody, buildCompareLink, buildContributors, buildReleaseSummary, bump, capReleaseTypeForZeroMajor, changelog, checkGitStatusIfDirty, collectContributorNames, collectPackageBumps, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, detectPullRequest, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractChangelogSummary, extractVersionFromPackageTag, extractVersionFromTag, fetchGitTags, filterOutPrivatePackages, findGitHubPR, findGitLabMR, findReachableCommitBySubject, formatChangelogForSlack, formatPackagesForSlack, formatSlackMessage, formatTweetMessage, generateChangelog, generateMarkDown, getAuthCommand, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCanaryVersion, getCommitChangedFiles, getCommitSubject, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitDiff, getGitStatus, getGitUpstream, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getModifiedReleaseFilePatterns, getNpmRegistry, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesOrBumpedPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getReleaseTagNames, getReleaseUrl, getRootPackage, getShortCommitSha, getSlackToken, getSlackWebhookUrl, getTwitterCredentials, github, gitlab, globDirsAbsolute, hasLernaJson, isAncestor, isBumpedPackage, isChangedPreid, isCommitOnlyInIgnoredPackages, isGraduating, isGraduatingToStableBetweenVersion, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, isTagVersionCompatibleWithCurrent, isVersionAlreadyPublishedError, isVersionPublished, loadRelizyConfig, mergeTypes, parseChangelogMarkdown, parseGitRemoteUrl, postPrComment, postReleaseToSlack, postReleaseToTwitter, prComment, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, publishSafetyCheck, pushCommitAndTags, pushTagForce, readPackageJson, readPackages, reconcileFromTag, redactSecrets, release, resetRewrittenTagCache, resolveAllConfiguredRegistryTargets, resolveIgnoredPackagePaths, resolveRegistryTargetsForPackage, resolveRegistryTargetsForPackages, resolveTags, retagAnnotatedLocal, rollbackModifiedFiles, shouldFilterPrereleaseTags, social, socialSafetyCheck, tagExists, topologicalSort, tryPostPrComment, updateLernaVersion, withRegistryNpmrc, writeChangelogToFile, writeVersion };
+export type { AIConfig, AIPromptTarget, AIProviderName, AISocialConfig, AISystemPromptOverrides, AITargetConfig, BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogInclude, ChangelogOptions, ClaudeCodeProviderOptions, ConfigType, GitProvider, GitUpstream, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, OnRewrittenTag, PackageBase, PackageBumpEntry, PackageManager, PostedRelease, PrCommentConfig, PrCommentMode, PrCommentOptions, PrCommentStatus, ProviderReleaseOptions, ProviderReleaseResult, PublishConfig, PublishOptions, PublishResponse, PullRequestInfo, ReadPackage, Reference, RegistryTarget, ReleaseConfig, ReleaseContext, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, ResolvedTwitterCredentials, RootPackage, SlackCredentials, SlackOptions, SlackPackageEntry, SlackSocialConfig, SocialConfig, SocialNetworkResult, SocialOptions, SocialResult, Step, TemplatesConfig, TokensConfig, TwitterCredentials, TwitterOptions, TwitterSocialConfig, VersionMode };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { LogLevel } from '@maz-ui/node';
-import { GitCommit, ChangelogConfig as ChangelogConfig$1, SemverBumpType } from 'changelogen';
+import { RawGitCommit, GitCommit, ChangelogConfig as ChangelogConfig$1, SemverBumpType } from 'changelogen';
 import { ReleaseType } from 'semver';
 import { DeepPartial } from '@maz-ui/utils/ts-helpers/DeepPartial';
 import * as _slack_web_api from '@slack/web-api';
@@ -194,11 +194,61 @@ declare function createCommitAndTags({ config, noVerify, bumpedPackages, newVers
     dryRun?: boolean;
     logLevel: LogLevel;
 }): Promise<string[]>;
-declare function pushCommitAndTags({ config, dryRun, logLevel, cwd }: {
+interface GitUpstream {
+    /** Remote name, e.g. `origin` */
+    remote: string;
+    /** Remote branch ref, e.g. `refs/heads/main` */
+    mergeRef: string;
+    /** Remote-tracking ref, e.g. `refs/remotes/origin/main` */
+    trackingRef: string;
+    /** Short remote-tracking name, e.g. `origin/main` */
+    name: string;
+}
+/**
+ * Resolve the upstream of the current branch. Returns null on a detached HEAD
+ * or when the branch has no upstream configured.
+ */
+declare function getGitUpstream(cwd: string): Promise<GitUpstream | null>;
+/**
+ * Ensure the current branch contains every commit of its remote counterpart.
+ *
+ * A release commit created on a branch that is behind its remote can never be
+ * pushed. Since packages are published before the push, running this check
+ * right before publishing prevents shipping a version whose release commit is
+ * then rejected (leaving an orphan tag and the repository stuck on the
+ * previous version).
+ *
+ * Skipped (no error) on a detached HEAD, without upstream, or when the remote
+ * cannot be fetched.
+ */
+declare function assertBranchUpToDateWithRemote({ cwd }: {
+    cwd: string;
+}): Promise<void>;
+declare function pushCommitAndTags({ config, dryRun, logLevel, cwd, tags, }: {
     config: ResolvedRelizyConfig;
     dryRun: boolean;
     logLevel?: LogLevel;
     cwd: string;
+    tags?: string[];
+}): Promise<void>;
+/**
+ * Compute the git tag names a release will create, mirroring `createCommitAndTags`.
+ */
+declare function getReleaseTagNames({ config, bumpedPackages, newVersion, }: {
+    config: ResolvedRelizyConfig;
+    bumpedPackages?: BumpResultTruthy['bumpedPackages'];
+    newVersion?: string;
+}): string[];
+/**
+ * Fail early when a tag the release is about to create already exists.
+ *
+ * This typically happens after a release that published its packages and
+ * pushed its tag, but whose release commit was rejected: the branch is still
+ * on the previous version, so the next run computes the same version again.
+ */
+declare function assertReleaseTagsAvailable({ tags, cwd }: {
+    tags: string[];
+    cwd: string;
 }): Promise<void>;
 /**
  * Rollback modified files to their last committed state
@@ -249,6 +299,14 @@ declare function retagAnnotatedLocal({ tag, commit, message, signed, cwd, logLev
  * Force-push a single tag to origin. Used only after explicit confirmation.
  */
 declare function pushTagForce(tag: string, cwd?: string, logLevel?: LogLevel): Promise<void>;
+/**
+ * Drop-in replacement for changelogen's `getGitDiff`, which splits the
+ * `git log` output on `----\n` and the subject line on `|`. A commit body
+ * containing a `----` line (GitHub adds `---------` before the
+ * `Co-authored-by:` trailers of a squash merge) then loses its trailers and its
+ * `--name-status` file list, and a subject containing `|` is truncated.
+ */
+declare function getGitDiff(from: string | undefined, to?: string, cwd?: string): RawGitCommit[];
 
 declare function github(options: ProviderReleaseOptions): Promise<PostedRelease[]>;
 
@@ -869,23 +927,24 @@ declare function shouldFilterPrereleaseTags(currentVersion: string, graduating:
  */
 declare function extractVersionFromTag(tag: string, packageName?: string): string | null;
 /**
- * Checks if a tag's version is compatible with the current version.
- * A tag is compatible if its major version is less than or equal to the current major version.
+ * Computes a canary version with format `{nextVersion}-0.{preid}-{sha}`.
  *
- * This prevents accidentally using tags from future major versions (e.g., v5.0.0-beta.0)
- * when bumping a current stable version (e.g., 4.1.1 → 4.1.2).
+ * The leading numeric `0` prerelease identifier makes the canary sort below
+ * every named prerelease (alpha, beta, rc...) and the stable release of the
+ * same version, so it never matches a range like `^5.0.0-beta.0` and is never
+ * suggested by update tools. Keeping preid and sha in a single identifier also
+ * keeps the version valid when the sha is all digits with a leading zero.
  *
- * @param payload - The payload to check
+ * @param payload - The payload to compute the canary version from
  * @param payload.currentVersion - The current package version
- * @param payload.releaseType - The release type
+ * @param payload.releaseType - The release type detected from commits (defaults to patch)
  * @param payload.preid - The pre-release identifier
- * @param payload.sha - The sha of the commit
- * @returns true if the tag version's major is <= current major version
+ * @param payload.sha - The short sha of the commit
+ * @returns The canary version
  *
  * @example
- * isTagVersionCompatibleWithCurrent('4.1.1', '4.1.0') // true - same major
- * isTagVersionCompatibleWithCurrent('5.0.0-beta.0', '4.1.1') // false - newer major
- * isTagVersionCompatibleWithCurrent('3.9.9', '4.1.1') // true - older major
+ * getCanaryVersion({ currentVersion: '1.2.3', releaseType: 'minor', sha: 'a3f4b2c' }) // '1.3.0-0.canary-a3f4b2c'
+ * getCanaryVersion({ currentVersion: '5.0.0-beta.44', releaseType: 'patch', sha: 'a3f4b2c' }) // '5.0.0-0.canary-a3f4b2c'
  */
 declare function getCanaryVersion({ currentVersion, releaseType, preid, sha, }: {
     currentVersion: string;
@@ -893,6 +952,22 @@ declare function getCanaryVersion({ currentVersion, releaseType, preid, sha, }:
     preid?: string;
     sha: string;
 }): string;
+/**
+ * Checks if a tag's version is compatible with the current version.
+ * A tag is compatible if its major version is less than or equal to the current major version.
+ *
+ * This prevents accidentally using tags from future major versions (e.g., v5.0.0-beta.0)
+ * when bumping a current stable version (e.g., 4.1.1 → 4.1.2).
+ *
+ * @param tagVersion - The version extracted from the tag
+ * @param currentVersion - The current package version
+ * @returns true if the tag version's major is <= current major version
+ *
+ * @example
+ * isTagVersionCompatibleWithCurrent('4.1.1', '4.1.0') // true - same major
+ * isTagVersionCompatibleWithCurrent('5.0.0-beta.0', '4.1.1') // false - newer major
+ * isTagVersionCompatibleWithCurrent('3.9.9', '4.1.1') // true - older major
+ */
 declare function isTagVersionCompatibleWithCurrent(tagVersion: string, currentVersion: string): boolean;
 
 type VersionMode = 'unified' | 'independent' | 'selective';
@@ -2264,5 +2339,5 @@ declare function socialSafetyCheck({ config }: {
 }): Promise<void>;
 declare function social(options?: Partial<SocialOptions>): Promise<SocialResult>;
 
-export { NEW_PACKAGE_MARKER, PR_COMMENT_MARKER, buildChangelogBody, buildCommentBody, buildCompareLink, buildContributors, buildReleaseSummary, bump, capReleaseTypeForZeroMajor, changelog, checkGitStatusIfDirty, collectContributorNames, collectPackageBumps, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, detectPullRequest, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractChangelogSummary, extractVersionFromPackageTag, extractVersionFromTag, fetchGitTags, filterOutPrivatePackages, findGitHubPR, findGitLabMR, findReachableCommitBySubject, formatChangelogForSlack, formatPackagesForSlack, formatSlackMessage, formatTweetMessage, generateChangelog, generateMarkDown, getAuthCommand, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCanaryVersion, getCommitChangedFiles, getCommitSubject, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitStatus, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getModifiedReleaseFilePatterns, getNpmRegistry, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesOrBumpedPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getReleaseUrl, getRootPackage, getShortCommitSha, getSlackToken, getSlackWebhookUrl, getTwitterCredentials, github, gitlab, globDirsAbsolute, hasLernaJson, isAncestor, isBumpedPackage, isChangedPreid, isCommitOnlyInIgnoredPackages, isGraduating, isGraduatingToStableBetweenVersion, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, isTagVersionCompatibleWithCurrent, isVersionAlreadyPublishedError, isVersionPublished, loadRelizyConfig, mergeTypes, parseChangelogMarkdown, parseGitRemoteUrl, postPrComment, postReleaseToSlack, postReleaseToTwitter, prComment, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, publishSafetyCheck, pushCommitAndTags, pushTagForce, readPackageJson, readPackages, reconcileFromTag, redactSecrets, release, resetRewrittenTagCache, resolveAllConfiguredRegistryTargets, resolveIgnoredPackagePaths, resolveRegistryTargetsForPackage, resolveRegistryTargetsForPackages, resolveTags, retagAnnotatedLocal, rollbackModifiedFiles, shouldFilterPrereleaseTags, social, socialSafetyCheck, tagExists, topologicalSort, tryPostPrComment, updateLernaVersion, withRegistryNpmrc, writeChangelogToFile, writeVersion };
-export type { AIConfig, AIPromptTarget, AIProviderName, AISocialConfig, AISystemPromptOverrides, AITargetConfig, BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogInclude, ChangelogOptions, ClaudeCodeProviderOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, OnRewrittenTag, PackageBase, PackageBumpEntry, PackageManager, PostedRelease, PrCommentConfig, PrCommentMode, PrCommentOptions, PrCommentStatus, ProviderReleaseOptions, ProviderReleaseResult, PublishConfig, PublishOptions, PublishResponse, PullRequestInfo, ReadPackage, Reference, RegistryTarget, ReleaseConfig, ReleaseContext, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, ResolvedTwitterCredentials, RootPackage, SlackCredentials, SlackOptions, SlackPackageEntry, SlackSocialConfig, SocialConfig, SocialNetworkResult, SocialOptions, SocialResult, Step, TemplatesConfig, TokensConfig, TwitterCredentials, TwitterOptions, TwitterSocialConfig, VersionMode };
+export { NEW_PACKAGE_MARKER, PR_COMMENT_MARKER, assertBranchUpToDateWithRemote, assertReleaseTagsAvailable, buildChangelogBody, buildCommentBody, buildCompareLink, buildContributors, buildReleaseSummary, bump, capReleaseTypeForZeroMajor, changelog, checkGitStatusIfDirty, collectContributorNames, collectPackageBumps, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, detectPullRequest, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractChangelogSummary, extractVersionFromPackageTag, extractVersionFromTag, fetchGitTags, filterOutPrivatePackages, findGitHubPR, findGitLabMR, findReachableCommitBySubject, formatChangelogForSlack, formatPackagesForSlack, formatSlackMessage, formatTweetMessage, generateChangelog, generateMarkDown, getAuthCommand, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCanaryVersion, getCommitChangedFiles, getCommitSubject, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitDiff, getGitStatus, getGitUpstream, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getModifiedReleaseFilePatterns, getNpmRegistry, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesOrBumpedPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getReleaseTagNames, getReleaseUrl, getRootPackage, getShortCommitSha, getSlackToken, getSlackWebhookUrl, getTwitterCredentials, github, gitlab, globDirsAbsolute, hasLernaJson, isAncestor, isBumpedPackage, isChangedPreid, isCommitOnlyInIgnoredPackages, isGraduating, isGraduatingToStableBetweenVersion, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, isTagVersionCompatibleWithCurrent, isVersionAlreadyPublishedError, isVersionPublished, loadRelizyConfig, mergeTypes, parseChangelogMarkdown, parseGitRemoteUrl, postPrComment, postReleaseToSlack, postReleaseToTwitter, prComment, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, publishSafetyCheck, pushCommitAndTags, pushTagForce, readPackageJson, readPackages, reconcileFromTag, redactSecrets, release, resetRewrittenTagCache, resolveAllConfiguredRegistryTargets, resolveIgnoredPackagePaths, resolveRegistryTargetsForPackage, resolveRegistryTargetsForPackages, resolveTags, retagAnnotatedLocal, rollbackModifiedFiles, shouldFilterPrereleaseTags, social, socialSafetyCheck, tagExists, topologicalSort, tryPostPrComment, updateLernaVersion, withRegistryNpmrc, writeChangelogToFile, writeVersion };
+export type { AIConfig, AIPromptTarget, AIProviderName, AISocialConfig, AISystemPromptOverrides, AITargetConfig, BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogInclude, ChangelogOptions, ClaudeCodeProviderOptions, ConfigType, GitProvider, GitUpstream, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, OnRewrittenTag, PackageBase, PackageBumpEntry, PackageManager, PostedRelease, PrCommentConfig, PrCommentMode, PrCommentOptions, PrCommentStatus, ProviderReleaseOptions, ProviderReleaseResult, PublishConfig, PublishOptions, PublishResponse, PullRequestInfo, ReadPackage, Reference, RegistryTarget, ReleaseConfig, ReleaseContext, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, ResolvedTwitterCredentials, RootPackage, SlackCredentials, SlackOptions, SlackPackageEntry, SlackSocialConfig, SocialConfig, SocialNetworkResult, SocialOptions, SocialResult, Step, TemplatesConfig, TokensConfig, TwitterCredentials, TwitterOptions, TwitterSocialConfig, VersionMode };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { N as NEW_PACKAGE_MARKER, P as PR_COMMENT_MARKER, b as buildChangelogBody, a as buildCommentBody, c as buildCompareLink, d as buildContributors, e as buildReleaseSummary, f as bump, g as capReleaseTypeForZeroMajor, h as changelog, i as checkGitStatusIfDirty, j as collectContributorNames, k as collectPackageBumps, l as confirmBump, m as createCommitAndTags, n as createGitlabRelease, o as defineConfig, p as detectGitProvider, q as detectPackageManager, r as detectPullRequest, s as determinePublishTag, t as determineReleaseType, u as determineSemverChange, v as executeBuildCmd, w as executeFormatCmd, x as executeHook, y as expandPackagesToBumpWithDependents, z as extractChangelogSummary, A as extractVersionFromPackageTag, B as extractVersionFromTag, C as fetchGitTags, D as filterOutPrivatePackages, E as findGitHubPR, F as findGitLabMR, G as findReachableCommitBySubject, H as formatChangelogForSlack, I as formatPackagesForSlack, J as formatSlackMessage, K as formatTweetMessage, L as generateChangelog, M as generateMarkDown, O as getAuthCommand, Q as getBumpedIndependentPackages, R as getBumpedPackageIndependently, S as getCIName, T as getCanaryVersion, U as getCommitChangedFiles, V as getCommitSubject, W as getCurrentGitBranch, X as getCurrentGitRef, Y as getDefaultConfig, Z as getDependentsOf, _ as getFirstCommit, $ as getGitStatus, a0 as getIndependentTag, a1 as getLastPackageTag, a2 as getLastRepoTag, a3 as getLastStableTag, a4 as getLastTag, a5 as getModifiedReleaseFilePatterns, a6 as getNpmRegistry, a7 as getPackageCommits, a8 as getPackageDependencies, a9 as getPackageNewVersion, aa as getPackages, ab as getPackagesOrBumpedPackages, ac as getPackagesToPublishInIndependentMode, ad as getPackagesToPublishInSelectiveMode, ae as getPreid, af as getReleaseUrl, ag as getRootPackage, ah as getShortCommitSha, ai as getSlackToken, aj as getSlackWebhookUrl, ak as getTwitterCredentials, al as github, am as gitlab, an as globDirsAbsolute, ao as hasLernaJson, ap as isAncestor, aq as isBumpedPackage, ar as isChangedPreid, as as isCommitOnlyInIgnoredPackages, at as isGraduating, au as isGraduatingToStableBetweenVersion, av as isInCI, aw as isPrerelease, ax as isPrereleaseReleaseType, ay as isStableReleaseType, az as isTagVersionCompatibleWithCurrent, aA as isVersionAlreadyPublishedError, aB as isVersionPublished, aC as loadRelizyConfig, aD as mergeTypes, aE as parseChangelogMarkdown, aF as parseGitRemoteUrl, aG as postPrComment, aH as postReleaseToSlack, aI as postReleaseToTwitter, aJ as prComment, aK as providerRelease, aL as providerReleaseSafetyCheck, aM as publish, aN as publishPackage, aO as publishSafetyCheck, aP as pushCommitAndTags, aQ as pushTagForce, aR as readPackageJson, aS as readPackages, aT as reconcileFromTag, aU as redactSecrets, aV as release, aW as resetRewrittenTagCache, aX as resolveAllConfiguredRegistryTargets, aY as resolveIgnoredPackagePaths, aZ as resolveRegistryTargetsForPackage, a_ as resolveRegistryTargetsForPackages, a$ as resolveTags, b0 as retagAnnotatedLocal, b1 as rollbackModifiedFiles, b2 as shouldFilterPrereleaseTags, b3 as social, b4 as socialSafetyCheck, b5 as tagExists, b6 as topologicalSort, b7 as tryPostPrComment, b8 as updateLernaVersion, b9 as withRegistryNpmrc, ba as writeChangelogToFile, bb as writeVersion } from './shared/relizy.CobLJLr_.mjs';
+export { N as NEW_PACKAGE_MARKER, P as PR_COMMENT_MARKER, a as assertBranchUpToDateWithRemote, b as assertReleaseTagsAvailable, c as buildChangelogBody, d as buildCommentBody, e as buildCompareLink, f as buildContributors, g as buildReleaseSummary, h as bump, i as capReleaseTypeForZeroMajor, j as changelog, k as checkGitStatusIfDirty, l as collectContributorNames, m as collectPackageBumps, n as confirmBump, o as createCommitAndTags, p as createGitlabRelease, q as defineConfig, r as detectGitProvider, s as detectPackageManager, t as detectPullRequest, u as determinePublishTag, v as determineReleaseType, w as determineSemverChange, x as executeBuildCmd, y as executeFormatCmd, z as executeHook, A as expandPackagesToBumpWithDependents, B as extractChangelogSummary, C as extractVersionFromPackageTag, D as extractVersionFromTag, E as fetchGitTags, F as filterOutPrivatePackages, G as findGitHubPR, H as findGitLabMR, I as findReachableCommitBySubject, J as formatChangelogForSlack, K as formatPackagesForSlack, L as formatSlackMessage, M as formatTweetMessage, O as generateChangelog, Q as generateMarkDown, R as getAuthCommand, S as getBumpedIndependentPackages, T as getBumpedPackageIndependently, U as getCIName, V as getCanaryVersion, W as getCommitChangedFiles, X as getCommitSubject, Y as getCurrentGitBranch, Z as getCurrentGitRef, _ as getDefaultConfig, $ as getDependentsOf, a0 as getFirstCommit, a1 as getGitDiff, a2 as getGitStatus, a3 as getGitUpstream, a4 as getIndependentTag, a5 as getLastPackageTag, a6 as getLastRepoTag, a7 as getLastStableTag, a8 as getLastTag, a9 as getModifiedReleaseFilePatterns, aa as getNpmRegistry, ab as getPackageCommits, ac as getPackageDependencies, ad as getPackageNewVersion, ae as getPackages, af as getPackagesOrBumpedPackages, ag as getPackagesToPublishInIndependentMode, ah as getPackagesToPublishInSelectiveMode, ai as getPreid, aj as getReleaseTagNames, ak as getReleaseUrl, al as getRootPackage, am as getShortCommitSha, an as getSlackToken, ao as getSlackWebhookUrl, ap as getTwitterCredentials, aq as github, ar as gitlab, as as globDirsAbsolute, at as hasLernaJson, au as isAncestor, av as isBumpedPackage, aw as isChangedPreid, ax as isCommitOnlyInIgnoredPackages, ay as isGraduating, az as isGraduatingToStableBetweenVersion, aA as isInCI, aB as isPrerelease, aC as isPrereleaseReleaseType, aD as isStableReleaseType, aE as isTagVersionCompatibleWithCurrent, aF as isVersionAlreadyPublishedError, aG as isVersionPublished, aH as loadRelizyConfig, aI as mergeTypes, aJ as parseChangelogMarkdown, aK as parseGitRemoteUrl, aL as postPrComment, aM as postReleaseToSlack, aN as postReleaseToTwitter, aO as prComment, aP as providerRelease, aQ as providerReleaseSafetyCheck, aR as publish, aS as publishPackage, aT as publishSafetyCheck, aU as pushCommitAndTags, aV as pushTagForce, aW as readPackageJson, aX as readPackages, aY as reconcileFromTag, aZ as redactSecrets, a_ as release, a$ as resetRewrittenTagCache, b0 as resolveAllConfiguredRegistryTargets, b1 as resolveIgnoredPackagePaths, b2 as resolveRegistryTargetsForPackage, b3 as resolveRegistryTargetsForPackages, b4 as resolveTags, b5 as retagAnnotatedLocal, b6 as rollbackModifiedFiles, b7 as shouldFilterPrereleaseTags, b8 as social, b9 as socialSafetyCheck, ba as tagExists, bb as topologicalSort, bc as tryPostPrComment, bd as updateLernaVersion, be as withRegistryNpmrc, bf as writeChangelogToFile, bg as writeVersion } from './shared/relizy.DhYBvZNi.mjs';
 import '@maz-ui/node';
 import 'node:child_process';
 import 'node:process';

package/dist/shared/{relizy.CobLJLr_.mjs → relizy.DhYBvZNi.mjs}

@@ -3,7 +3,7 @@ import { execSync, spawnSync } from 'node:child_process';
 import process$1 from 'node:process';
 import { formatJson } from '@maz-ui/utils/helpers/formatJson';
 import { setupDotenv, loadConfig } from 'c12';
-import { getGitDiff, parseCommits, resolveRepoConfig, getRepoConfig, formatCompareChanges, formatReference, createGithubRelease } from 'changelogen';
+import { parseCommits, resolveRepoConfig, getRepoConfig, formatCompareChanges, formatReference, createGithubRelease } from 'changelogen';
 import { defu } from 'defu';
 import { existsSync, readFileSync, statSync, writeFileSync, rmSync } from 'node:fs';
 import path, { join, relative, sep } from 'node:path';
@@ -202,6 +202,25 @@ async function pushTagForce(tag, cwd, logLevel) {
     { cwd, logLevel, noStderr: true, noStdout: true }
   );
 }
+const COMMIT_SEPARATOR = "";
+const FIELD_SEPARATOR = "";
+function getGitDiff(from, to = "HEAD", cwd) {
+  const range = from ? `${from}...${to}` : to;
+  const output = execSync(
+    `git --no-pager log "${range}" --pretty="%x1E%s%x1F%h%x1F%an%x1F%ae%n%b" --name-status`,
+    { cwd, encoding: "utf8" }
+  ).trim();
+  return output.split(COMMIT_SEPARATOR).slice(1).map((record) => {
+    const [firstLine = "", ...body] = record.split("\n");
+    const [message = "", shortHash = "", authorName = "", authorEmail = ""] = firstLine.split(FIELD_SEPARATOR);
+    return {
+      message,
+      shortHash,
+      author: { name: authorName, email: authorEmail },
+      body: body.join("\n")
+    };
+  });
+}
 
 const sessionCache = /* @__PURE__ */ new Map();
 function resetRewrittenTagCache() {
@@ -231,7 +250,7 @@ function buildExplanation({
 }) {
   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.`,
+    `It was most likely rewritten by a "git rebase" after the tag was created, or its release commit was never pushed to "${to}" (rejected push during a release).`,
     `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) {
@@ -764,7 +783,7 @@ async function getPackageCommits({
     from: actualFrom,
     to
   };
-  const rawCommits = await getGitDiff(actualFrom, to, changelogConfig.cwd);
+  const rawCommits = getGitDiff(actualFrom, to, changelogConfig.cwd);
   const allCommits = parseCommits(rawCommits, changelogConfig);
   const hasBreakingChanges = allCommits.some((commit) => commit.isBreaking);
   logger.debug(`Has breaking changes: ${hasBreakingChanges}`);
@@ -1345,7 +1364,7 @@ function getCanaryVersion({
   if (!nextStable) {
     throw new Error(`Unable to compute canary version from "${currentVersion}" with release type "${effectiveType}"`);
   }
-  return `${nextStable}-${preid}.${sha}.0`;
+  return `${nextStable}-0.${preid}-${sha}`;
 }
 function isTagVersionCompatibleWithCurrent(tagVersion, currentVersion) {
   try {
@@ -2421,7 +2440,7 @@ async function publishToRegistryTarget({
           return;
         }
         throw new Error(
-          `Version ${packageNameAndVersion} already exists on the registry${registryLabel} and cannot be overwritten. This usually happens when re-running a release on the same commit (e.g. a canary rerun). Enable publish.skipExistingVersions (or pass --skip-existing-versions) to skip already-published versions instead of failing.`,
+          `Version ${packageNameAndVersion} already exists on the registry${registryLabel} and cannot be overwritten. This usually happens when re-running a release on the same commit (e.g. a canary rerun), or after a release that published this version but failed to push its release commit (merge its tag into your branch to recover). Enable publish.skipExistingVersions (or pass --skip-existing-versions) to skip already-published versions instead of failing.`,
           { cause: error }
         );
       } else {
@@ -2974,17 +2993,158 @@ async function createCommitAndTags({
     throw error;
   }
 }
-async function pushCommitAndTags({ config, dryRun, logLevel, cwd }) {
+const quietExec = { noStderr: true, noStdout: true, noSuccess: true, noError: true };
+async function getGitUpstream(cwd) {
+  try {
+    const branch = getCurrentGitBranch(cwd);
+    if (!branch || branch === "HEAD") {
+      return null;
+    }
+    const [{ stdout: remote }, { stdout: mergeRef }, { stdout: trackingRef }] = await Promise.all([
+      execPromise(`git config --get branch.${branch}.remote`, { cwd, ...quietExec }),
+      execPromise(`git config --get branch.${branch}.merge`, { cwd, ...quietExec }),
+      execPromise("git rev-parse --symbolic-full-name @{upstream}", { cwd, ...quietExec })
+    ]);
+    if (!remote.trim() || !mergeRef.trim() || !trackingRef.trim()) {
+      return null;
+    }
+    return {
+      remote: remote.trim(),
+      mergeRef: mergeRef.trim(),
+      trackingRef: trackingRef.trim(),
+      name: trackingRef.trim().replace(/^refs\/remotes\//, "")
+    };
+  } catch {
+    return null;
+  }
+}
+async function fetchUpstream(upstream, cwd) {
+  await execPromise(`git fetch ${upstream.remote} +${upstream.mergeRef}:${upstream.trackingRef}`, { cwd, ...quietExec });
+}
+async function assertBranchUpToDateWithRemote({ cwd }) {
+  const upstream = await getGitUpstream(cwd);
+  if (!upstream) {
+    logger.debug("No upstream branch configured, skipping remote sync check");
+    return;
+  }
+  try {
+    await fetchUpstream(upstream, cwd);
+  } catch (error) {
+    logger.warn(`Could not fetch "${upstream.name}", skipping remote sync check`);
+    logger.debug("Fetch error:", error);
+    return;
+  }
+  const { stdout } = await execPromise(`git rev-list --count HEAD..${upstream.trackingRef}`, { cwd, ...quietExec });
+  const missingCommits = Number.parseInt(stdout.trim(), 10) || 0;
+  if (missingCommits > 0) {
+    throw new Error(
+      `The current branch is behind "${upstream.name}" by ${missingCommits} commit(s): new commits were pushed while the release was running.
+Releasing now would publish packages whose release commit cannot be pushed.
+Re-run the release from the latest commit of "${upstream.name}".`
+    );
+  }
+  logger.debug(`Branch is up to date with "${upstream.name}"`);
+}
+function isPushRejectedAsBehind(error) {
+  if (!error || typeof error !== "object") {
+    return false;
+  }
+  const { message, stderr } = error;
+  const output = `${typeof message === "string" ? message : ""}
+${typeof stderr === "string" ? stderr : ""}`;
+  return output.includes("(non-fast-forward)") || output.includes("(fetch first)");
+}
+async function recoverRejectedPush({
+  config,
+  command,
+  tags,
+  pushError,
+  logLevel,
+  cwd
+}) {
+  const upstream = await getGitUpstream(cwd);
+  if (!upstream) {
+    throw pushError;
+  }
+  logger.warn(`Push rejected: "${upstream.name}" received new commits during the release. Merging them into the release commit and retrying...`);
+  try {
+    await fetchUpstream(upstream, cwd);
+    const noVerifyFlag = config.release.noVerify ? " --no-verify" : "";
+    await execPromise(`git merge --no-edit${noVerifyFlag} ${upstream.name}`, { cwd, ...quietExec });
+  } catch (mergeError) {
+    await execPromise("git merge --abort", { cwd, ...quietExec }).catch(() => {
+    });
+    if (tags.length > 0) {
+      const tagRefs = tags.map((tag) => `refs/tags/${tag}`).join(" ");
+      await execPromise(`git push ${upstream.remote} ${tagRefs}`, { cwd, ...quietExec }).catch(() => {
+      });
+    }
+    const recoverRef = tags[0] ?? "HEAD";
+    throw new Error(
+      `Push rejected: "${upstream.name}" received new commits during the release, and they could not be merged automatically into the release commit.
+The packages are already published, but the release commit is not on the branch.
+To recover, merge it manually: git fetch --tags && git merge ${recoverRef} && git push`,
+      { cause: mergeError }
+    );
+  }
+  await execPromise(command, { noStderr: true, noStdout: true, logLevel, cwd });
+  logger.success(`Merged "${upstream.name}" into the release commit and pushed`);
+}
+async function pushCommitAndTags({
+  config,
+  dryRun,
+  logLevel,
+  cwd,
+  tags = []
+}) {
   logger.start("Start push changes and tags");
   const command = config.release.gitTag ? "git push --follow-tags" : "git push";
   if (dryRun) {
     logger.info(`[dry-run] ${command}`);
   } else {
     logger.debug(`Executing: ${command}`);
-    await execPromise(command, { noStderr: true, noStdout: true, logLevel, cwd });
+    try {
+      await execPromise(command, { noStderr: true, noStdout: true, noError: true, logLevel, cwd });
+    } catch (error) {
+      if (!isPushRejectedAsBehind(error)) {
+        logger.error(`${command} failed`, error);
+        throw error;
+      }
+      await recoverRejectedPush({ config, command, tags, pushError: error, logLevel, cwd });
+    }
   }
   logger.success("Pushing changes and tags completed!");
 }
+function getReleaseTagNames({
+  config,
+  bumpedPackages,
+  newVersion
+}) {
+  if (!config.release.gitTag) {
+    return [];
+  }
+  if (config.monorepo?.versionMode === "independent") {
+    return (bumpedPackages ?? []).filter((pkg) => pkg.newVersion).map((pkg) => getIndependentTag({ name: pkg.name, version: pkg.newVersion }));
+  }
+  const version = newVersion || readPackageJson(config.cwd)?.version;
+  const tagName = version ? config.templates.tagBody?.replaceAll("{{newVersion}}", version) : void 0;
+  return tagName ? [tagName] : [];
+}
+async function assertReleaseTagsAvailable({ tags, cwd }) {
+  for (const tag of tags) {
+    if (!await tagExists(tag, cwd)) {
+      continue;
+    }
+    if (await isAncestor(tag, "HEAD", cwd)) {
+      throw new Error(`Tag "${tag}" already exists. Check the versions in your package.json files, they are behind the latest release.`);
+    }
+    throw new Error(
+      `Tag "${tag}" already exists but is not part of the current branch history.
+A previous release most likely published this version and pushed its tag, but its release commit was never pushed to the branch.
+To recover, merge the release commit, then re-run the release: git fetch --tags && git merge ${tag} && git push`
+    );
+  }
+}
 async function rollbackModifiedFiles({
   config
 }) {
@@ -3061,6 +3221,7 @@ function getShortCommitSha(cwd, length = 7) {
 
 const CHANGELOG_RELEASE_HEAD_REGEX = /^#{2,}\s+(?:\S.*)?(v?(\d+\.\d+\.\d+(-[a-zA-Z0-9.]+)?)).*$/gm;
 const VERSION_REGEX = /^v?(\d+\.\d+\.\d+(-[a-zA-Z0-9.]+)?)$/;
+const GITHUB_NOREPLY_EMAIL_REGEX = /^(?:\d+\+)?([^@]+)@users\.noreply\.github\.com$/i;
 function buildCompareLink({ config, from, to, isFirstCommit }) {
   if (!config.repo || !from || !to) {
     return "";
@@ -3106,16 +3267,13 @@ function collectContributorNames({ commits, config }) {
     return [];
   }
   const names = /* @__PURE__ */ new Set();
-  for (const commit of commits) {
-    if (!commit.author) {
-      continue;
-    }
-    const name = formatName(commit.author.name);
+  for (const author of commits.flatMap(getCommitAuthors)) {
+    const name = formatName(author.name);
     if (!name || name.includes("[bot]")) {
       continue;
     }
     if (config.excludeAuthors && config.excludeAuthors.some(
-      (v) => name.includes(v) || commit.author.email?.includes(v)
+      (v) => name.includes(v) || author.email?.includes(v)
     )) {
       continue;
     }
@@ -3123,6 +3281,12 @@ function collectContributorNames({ commits, config }) {
   }
   return Array.from(names);
 }
+function getCommitAuthors(commit) {
+  return [commit.author, ...commit.authors ?? []].filter(Boolean);
+}
+function getGithubUsernameFromNoreplyEmail(email) {
+  return GITHUB_NOREPLY_EMAIL_REGEX.exec(email)?.[1];
+}
 async function buildContributors({ commits, config }) {
   const names = collectContributorNames({ commits, config });
   if (names.length === 0) {
@@ -3132,13 +3296,11 @@ async function buildContributors({ commits, config }) {
   for (const name of names) {
     _authors.set(name, { email: /* @__PURE__ */ new Set(), name });
   }
-  for (const commit of commits) {
-    if (!commit.author)
-      continue;
-    const name = formatName(commit.author.name);
+  for (const author of commits.flatMap(getCommitAuthors)) {
+    const name = formatName(author.name);
     const entry = _authors.get(name);
-    if (entry && commit.author.email) {
-      entry.email.add(commit.author.email);
+    if (entry && author.email) {
+      entry.email.add(author.email);
     }
   }
   if (config.repo?.provider === "github") {
@@ -3148,6 +3310,11 @@ async function buildContributors({ commits, config }) {
         if (!meta) {
           return;
         }
+        const noreplyUsername = [...meta.email].map(getGithubUsernameFromNoreplyEmail).find(Boolean);
+        if (noreplyUsername) {
+          meta.github = noreplyUsername;
+          return;
+        }
         for (const data of [...meta.email, meta.name]) {
           const { user } = await fetch$1(`https://ungh.cc/users/find/${data}`).then((r) => r.json()).catch(() => ({ user: null }));
           if (user) {
@@ -6652,6 +6819,20 @@ function getReleaseConfig(options = {}) {
     }
   });
 }
+function shouldPushReleaseCommit(config) {
+  return Boolean(config.release.push && config.release.commit);
+}
+async function guardBeforePublish({ config, dryRun, guard }) {
+  try {
+    await guard();
+  } catch (error) {
+    if (!dryRun) {
+      logger.fail("Release aborted before publishing, rolling back modified files...");
+      await rollbackModifiedFiles({ config });
+    }
+    throw error;
+  }
+}
 async function releaseSafetyCheck({
   config,
   provider
@@ -6665,7 +6846,8 @@ async function releaseSafetyCheck({
     await Promise.all([
       providerReleaseSafetyCheck({ config, provider }),
       publishSafetyCheck({ config }),
-      socialSafetyCheck({ config })
+      socialSafetyCheck({ config }),
+      ...shouldPushReleaseCommit(config) ? [assertBranchUpToDateWithRemote({ cwd: config.cwd })] : []
     ]);
     logger.success("Safety checks passed");
   } catch (error) {
@@ -6774,6 +6956,16 @@ async function release(options = {}) {
       });
       return;
     }
+    if (config.release.commit) {
+      await guardBeforePublish({
+        config,
+        dryRun,
+        guard: () => assertReleaseTagsAvailable({
+          tags: getReleaseTagNames({ config, bumpedPackages: bumpResult.bumpedPackages, newVersion: bumpResult.newVersion }),
+          cwd: config.cwd
+        })
+      });
+    }
     logger.box("Generate changelogs");
     if (config.release.changelog) {
       await changelog({
@@ -6793,6 +6985,13 @@ async function release(options = {}) {
     } else {
       logger.info("Skipping changelog generation (--no-changelog)");
     }
+    if (shouldPushReleaseCommit(config)) {
+      await guardBeforePublish({
+        config,
+        dryRun,
+        guard: () => assertBranchUpToDateWithRemote({ cwd: config.cwd })
+      });
+    }
     logger.box("Publish packages to registry");
     let publishResponse;
     if (config.release.publish) {
@@ -6844,7 +7043,8 @@ async function release(options = {}) {
           config,
           dryRun,
           logLevel: config.logLevel,
-          cwd: config.cwd
+          cwd: config.cwd,
+          tags: createdTags
         });
         await executeHook("success:push", config, dryRun);
       } catch (error) {
@@ -6937,4 +7137,4 @@ async function release(options = {}) {
   }
 }
 
-export { getGitStatus as $, extractVersionFromPackageTag as A, extractVersionFromTag as B, fetchGitTags as C, filterOutPrivatePackages as D, findGitHubPR as E, findGitLabMR as F, findReachableCommitBySubject as G, formatChangelogForSlack as H, formatPackagesForSlack as I, formatSlackMessage as J, formatTweetMessage as K, generateChangelog as L, generateMarkDown as M, NEW_PACKAGE_MARKER as N, getAuthCommand as O, PR_COMMENT_MARKER as P, getBumpedIndependentPackages as Q, getBumpedPackageIndependently as R, getCIName as S, getCanaryVersion as T, getCommitChangedFiles as U, getCommitSubject as V, getCurrentGitBranch as W, getCurrentGitRef as X, getDefaultConfig as Y, getDependentsOf as Z, getFirstCommit as _, buildCommentBody as a, resolveTags as a$, getIndependentTag as a0, getLastPackageTag as a1, getLastRepoTag as a2, getLastStableTag as a3, getLastTag as a4, getModifiedReleaseFilePatterns as a5, getNpmRegistry as a6, getPackageCommits as a7, getPackageDependencies as a8, getPackageNewVersion as a9, isVersionAlreadyPublishedError as aA, isVersionPublished as aB, loadRelizyConfig as aC, mergeTypes as aD, parseChangelogMarkdown as aE, parseGitRemoteUrl as aF, postPrComment as aG, postReleaseToSlack as aH, postReleaseToTwitter as aI, prComment as aJ, providerRelease as aK, providerReleaseSafetyCheck as aL, publish as aM, publishPackage as aN, publishSafetyCheck as aO, pushCommitAndTags as aP, pushTagForce as aQ, readPackageJson as aR, readPackages as aS, reconcileFromTag as aT, redactSecrets as aU, release as aV, resetRewrittenTagCache as aW, resolveAllConfiguredRegistryTargets as aX, resolveIgnoredPackagePaths as aY, resolveRegistryTargetsForPackage as aZ, resolveRegistryTargetsForPackages as a_, getPackages as aa, getPackagesOrBumpedPackages as ab, getPackagesToPublishInIndependentMode as ac, getPackagesToPublishInSelectiveMode as ad, getPreid as ae, getReleaseUrl as af, getRootPackage as ag, getShortCommitSha as ah, getSlackToken as ai, getSlackWebhookUrl as aj, getTwitterCredentials as ak, github as al, gitlab as am, globDirsAbsolute as an, hasLernaJson as ao, isAncestor as ap, isBumpedPackage as aq, isChangedPreid as ar, isCommitOnlyInIgnoredPackages as as, isGraduating as at, isGraduatingToStableBetweenVersion as au, isInCI as av, isPrerelease as aw, isPrereleaseReleaseType as ax, isStableReleaseType as ay, isTagVersionCompatibleWithCurrent as az, buildChangelogBody as b, retagAnnotatedLocal as b0, rollbackModifiedFiles as b1, shouldFilterPrereleaseTags as b2, social as b3, socialSafetyCheck as b4, tagExists as b5, topologicalSort as b6, tryPostPrComment as b7, updateLernaVersion as b8, withRegistryNpmrc as b9, writeChangelogToFile as ba, writeVersion as bb, buildCompareLink as c, buildContributors as d, buildReleaseSummary as e, bump as f, capReleaseTypeForZeroMajor as g, changelog as h, checkGitStatusIfDirty as i, collectContributorNames as j, collectPackageBumps as k, confirmBump as l, createCommitAndTags as m, createGitlabRelease as n, defineConfig as o, detectGitProvider as p, detectPackageManager as q, detectPullRequest as r, determinePublishTag as s, determineReleaseType as t, determineSemverChange as u, executeBuildCmd as v, executeFormatCmd as w, executeHook as x, expandPackagesToBumpWithDependents as y, extractChangelogSummary as z };
+export { getDependentsOf as $, expandPackagesToBumpWithDependents as A, extractChangelogSummary as B, extractVersionFromPackageTag as C, extractVersionFromTag as D, fetchGitTags as E, filterOutPrivatePackages as F, findGitHubPR as G, findGitLabMR as H, findReachableCommitBySubject as I, formatChangelogForSlack as J, formatPackagesForSlack as K, formatSlackMessage as L, formatTweetMessage as M, NEW_PACKAGE_MARKER as N, generateChangelog as O, PR_COMMENT_MARKER as P, generateMarkDown as Q, getAuthCommand as R, getBumpedIndependentPackages as S, getBumpedPackageIndependently as T, getCIName as U, getCanaryVersion as V, getCommitChangedFiles as W, getCommitSubject as X, getCurrentGitBranch as Y, getCurrentGitRef as Z, getDefaultConfig as _, assertBranchUpToDateWithRemote as a, resetRewrittenTagCache as a$, getFirstCommit as a0, getGitDiff as a1, getGitStatus as a2, getGitUpstream as a3, getIndependentTag as a4, getLastPackageTag as a5, getLastRepoTag as a6, getLastStableTag as a7, getLastTag as a8, getModifiedReleaseFilePatterns as a9, isInCI as aA, isPrerelease as aB, isPrereleaseReleaseType as aC, isStableReleaseType as aD, isTagVersionCompatibleWithCurrent as aE, isVersionAlreadyPublishedError as aF, isVersionPublished as aG, loadRelizyConfig as aH, mergeTypes as aI, parseChangelogMarkdown as aJ, parseGitRemoteUrl as aK, postPrComment as aL, postReleaseToSlack as aM, postReleaseToTwitter as aN, prComment as aO, providerRelease as aP, providerReleaseSafetyCheck as aQ, publish as aR, publishPackage as aS, publishSafetyCheck as aT, pushCommitAndTags as aU, pushTagForce as aV, readPackageJson as aW, readPackages as aX, reconcileFromTag as aY, redactSecrets as aZ, release as a_, getNpmRegistry as aa, getPackageCommits as ab, getPackageDependencies as ac, getPackageNewVersion as ad, getPackages as ae, getPackagesOrBumpedPackages as af, getPackagesToPublishInIndependentMode as ag, getPackagesToPublishInSelectiveMode as ah, getPreid as ai, getReleaseTagNames as aj, getReleaseUrl as ak, getRootPackage as al, getShortCommitSha as am, getSlackToken as an, getSlackWebhookUrl as ao, getTwitterCredentials as ap, github as aq, gitlab as ar, globDirsAbsolute as as, hasLernaJson as at, isAncestor as au, isBumpedPackage as av, isChangedPreid as aw, isCommitOnlyInIgnoredPackages as ax, isGraduating as ay, isGraduatingToStableBetweenVersion as az, assertReleaseTagsAvailable as b, resolveAllConfiguredRegistryTargets as b0, resolveIgnoredPackagePaths as b1, resolveRegistryTargetsForPackage as b2, resolveRegistryTargetsForPackages as b3, resolveTags as b4, retagAnnotatedLocal as b5, rollbackModifiedFiles as b6, shouldFilterPrereleaseTags as b7, social as b8, socialSafetyCheck as b9, tagExists as ba, topologicalSort as bb, tryPostPrComment as bc, updateLernaVersion as bd, withRegistryNpmrc as be, writeChangelogToFile as bf, writeVersion as bg, buildChangelogBody as c, buildCommentBody as d, buildCompareLink as e, buildContributors as f, buildReleaseSummary as g, bump as h, capReleaseTypeForZeroMajor as i, changelog as j, checkGitStatusIfDirty as k, collectContributorNames as l, collectPackageBumps as m, confirmBump as n, createCommitAndTags as o, createGitlabRelease as p, defineConfig as q, detectGitProvider as r, detectPackageManager as s, detectPullRequest as t, determinePublishTag as u, determineReleaseType as v, determineSemverChange as w, executeBuildCmd as x, executeFormatCmd as y, executeHook as z };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relizy",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Changelogen adapter for monorepo management with unified and independent versioning",
   "author": "Louis Mazel <me@loicmazuel.com>",
   "license": "MIT",