relizy 1.5.1 → 1.7.0-beta.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 { aw as isInCI, S as getCIName, f as bump, h as changelog, aN as publish, aL as providerRelease, b4 as social, aK as prComment, aW as release } from './shared/relizy.DDpPSTvS.mjs';
+import { aC as isInCI, V as getCIName, h as bump, j as changelog, aT as publish, aR as providerRelease, ba as social, aQ as prComment, b0 as release } from './shared/relizy.uCxVVpbQ.mjs';
 import 'node:child_process';
 import '@maz-ui/utils/helpers/formatJson';
 import 'c12';

package/dist/index.d.mts

@@ -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
@@ -537,6 +587,13 @@ declare function postPrComment({ config, pr, body, }: {
  */
 declare function redactSecrets<T>(value: T): T;
 
+/**
+ * Resolve the commit a new package's compare link starts from: the parent of
+ * the first commit that touched the package, so the link covers the whole
+ * package history. Falls back to that first commit when it is the repository
+ * root commit (no parent). Returns null when the package has no commits yet.
+ */
+declare function getNewPackageCompareBase(packagePath: string, cwd: string): string | null;
 declare function readPackageJson(packagePath: string): ReadPackage | undefined;
 /**
  * Resolve a set of path globs (relative to `cwd`) to the absolute directories
@@ -779,6 +836,14 @@ declare function isBumpedPackage(pkg: PackageBase): pkg is PackageBase & {
 declare function filterOutPrivatePackages<T extends {
     private: boolean;
 }>(packages: T[]): T[];
+/**
+ * Keep private packages only when `monorepo.includePrivates` is enabled. They
+ * are then versioned and tagged like public ones, so they also get provider
+ * releases and appear in PR comments. Publishing ignores them regardless.
+ */
+declare function filterPrivatePackagesUnlessIncluded<T extends {
+    private: boolean;
+}>(packages: T[], includePrivates: boolean | undefined): T[];
 declare function getPackagesOrBumpedPackages({ config, bumpResult, suffix, force, dryRun, }: {
     config: ResolvedRelizyConfig;
     bumpResult: BumpResultTruthy | undefined;
@@ -2232,6 +2297,7 @@ interface CommentBodyParams {
     packages?: Array<{
         name: string;
         version: string;
+        private: boolean;
     }>;
     /** Fallback root version for standalone CLI mode */
     rootVersion?: string;
@@ -2289,5 +2355,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, getGitDiff, 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, filterPrivatePackagesUnlessIncluded, 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, getNewPackageCompareBase, 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

@@ -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
@@ -537,6 +587,13 @@ declare function postPrComment({ config, pr, body, }: {
  */
 declare function redactSecrets<T>(value: T): T;
 
+/**
+ * Resolve the commit a new package's compare link starts from: the parent of
+ * the first commit that touched the package, so the link covers the whole
+ * package history. Falls back to that first commit when it is the repository
+ * root commit (no parent). Returns null when the package has no commits yet.
+ */
+declare function getNewPackageCompareBase(packagePath: string, cwd: string): string | null;
 declare function readPackageJson(packagePath: string): ReadPackage | undefined;
 /**
  * Resolve a set of path globs (relative to `cwd`) to the absolute directories
@@ -779,6 +836,14 @@ declare function isBumpedPackage(pkg: PackageBase): pkg is PackageBase & {
 declare function filterOutPrivatePackages<T extends {
     private: boolean;
 }>(packages: T[]): T[];
+/**
+ * Keep private packages only when `monorepo.includePrivates` is enabled. They
+ * are then versioned and tagged like public ones, so they also get provider
+ * releases and appear in PR comments. Publishing ignores them regardless.
+ */
+declare function filterPrivatePackagesUnlessIncluded<T extends {
+    private: boolean;
+}>(packages: T[], includePrivates: boolean | undefined): T[];
 declare function getPackagesOrBumpedPackages({ config, bumpResult, suffix, force, dryRun, }: {
     config: ResolvedRelizyConfig;
     bumpResult: BumpResultTruthy | undefined;
@@ -2232,6 +2297,7 @@ interface CommentBodyParams {
     packages?: Array<{
         name: string;
         version: string;
+        private: boolean;
     }>;
     /** Fallback root version for standalone CLI mode */
     rootVersion?: string;
@@ -2289,5 +2355,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, getGitDiff, 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, filterPrivatePackagesUnlessIncluded, 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, getNewPackageCompareBase, 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 getGitDiff, a0 as getGitStatus, a1 as getIndependentTag, a2 as getLastPackageTag, a3 as getLastRepoTag, a4 as getLastStableTag, a5 as getLastTag, a6 as getModifiedReleaseFilePatterns, a7 as getNpmRegistry, a8 as getPackageCommits, a9 as getPackageDependencies, aa as getPackageNewVersion, ab as getPackages, ac as getPackagesOrBumpedPackages, ad as getPackagesToPublishInIndependentMode, ae as getPackagesToPublishInSelectiveMode, af as getPreid, ag as getReleaseUrl, ah as getRootPackage, ai as getShortCommitSha, aj as getSlackToken, ak as getSlackWebhookUrl, al as getTwitterCredentials, am as github, an as gitlab, ao as globDirsAbsolute, ap as hasLernaJson, aq as isAncestor, ar as isBumpedPackage, as as isChangedPreid, at as isCommitOnlyInIgnoredPackages, au as isGraduating, av as isGraduatingToStableBetweenVersion, aw as isInCI, ax as isPrerelease, ay as isPrereleaseReleaseType, az as isStableReleaseType, aA as isTagVersionCompatibleWithCurrent, aB as isVersionAlreadyPublishedError, aC as isVersionPublished, aD as loadRelizyConfig, aE as mergeTypes, aF as parseChangelogMarkdown, aG as parseGitRemoteUrl, aH as postPrComment, aI as postReleaseToSlack, aJ as postReleaseToTwitter, aK as prComment, aL as providerRelease, aM as providerReleaseSafetyCheck, aN as publish, aO as publishPackage, aP as publishSafetyCheck, aQ as pushCommitAndTags, aR as pushTagForce, aS as readPackageJson, aT as readPackages, aU as reconcileFromTag, aV as redactSecrets, aW as release, aX as resetRewrittenTagCache, aY as resolveAllConfiguredRegistryTargets, aZ as resolveIgnoredPackagePaths, a_ as resolveRegistryTargetsForPackage, a$ as resolveRegistryTargetsForPackages, b0 as resolveTags, b1 as retagAnnotatedLocal, b2 as rollbackModifiedFiles, b3 as shouldFilterPrereleaseTags, b4 as social, b5 as socialSafetyCheck, b6 as tagExists, b7 as topologicalSort, b8 as tryPostPrComment, b9 as updateLernaVersion, ba as withRegistryNpmrc, bb as writeChangelogToFile, bc as writeVersion } from './shared/relizy.DDpPSTvS.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 filterPrivatePackagesUnlessIncluded, H as findGitHubPR, I as findGitLabMR, J as findReachableCommitBySubject, K as formatChangelogForSlack, L as formatPackagesForSlack, M as formatSlackMessage, O as formatTweetMessage, Q as generateChangelog, R as generateMarkDown, S as getAuthCommand, T as getBumpedIndependentPackages, U as getBumpedPackageIndependently, V as getCIName, W as getCanaryVersion, X as getCommitChangedFiles, Y as getCommitSubject, Z as getCurrentGitBranch, _ as getCurrentGitRef, $ as getDefaultConfig, a0 as getDependentsOf, a1 as getFirstCommit, a2 as getGitDiff, a3 as getGitStatus, a4 as getGitUpstream, a5 as getIndependentTag, a6 as getLastPackageTag, a7 as getLastRepoTag, a8 as getLastStableTag, a9 as getLastTag, aa as getModifiedReleaseFilePatterns, ab as getNewPackageCompareBase, ac as getNpmRegistry, ad as getPackageCommits, ae as getPackageDependencies, af as getPackageNewVersion, ag as getPackages, ah as getPackagesOrBumpedPackages, ai as getPackagesToPublishInIndependentMode, aj as getPackagesToPublishInSelectiveMode, ak as getPreid, al as getReleaseTagNames, am as getReleaseUrl, an as getRootPackage, ao as getShortCommitSha, ap as getSlackToken, aq as getSlackWebhookUrl, ar as getTwitterCredentials, as as github, at as gitlab, au as globDirsAbsolute, av as hasLernaJson, aw as isAncestor, ax as isBumpedPackage, ay as isChangedPreid, az as isCommitOnlyInIgnoredPackages, aA as isGraduating, aB as isGraduatingToStableBetweenVersion, aC as isInCI, aD as isPrerelease, aE as isPrereleaseReleaseType, aF as isStableReleaseType, aG as isTagVersionCompatibleWithCurrent, aH as isVersionAlreadyPublishedError, aI as isVersionPublished, aJ as loadRelizyConfig, aK as mergeTypes, aL as parseChangelogMarkdown, aM as parseGitRemoteUrl, aN as postPrComment, aO as postReleaseToSlack, aP as postReleaseToTwitter, aQ as prComment, aR as providerRelease, aS as providerReleaseSafetyCheck, aT as publish, aU as publishPackage, aV as publishSafetyCheck, aW as pushCommitAndTags, aX as pushTagForce, aY as readPackageJson, aZ as readPackages, a_ as reconcileFromTag, a$ as redactSecrets, b0 as release, b1 as resetRewrittenTagCache, b2 as resolveAllConfiguredRegistryTargets, b3 as resolveIgnoredPackagePaths, b4 as resolveRegistryTargetsForPackage, b5 as resolveRegistryTargetsForPackages, b6 as resolveTags, b7 as retagAnnotatedLocal, b8 as rollbackModifiedFiles, b9 as shouldFilterPrereleaseTags, ba as social, bb as socialSafetyCheck, bc as tagExists, bd as topologicalSort, be as tryPostPrComment, bf as updateLernaVersion, bg as withRegistryNpmrc, bh as writeChangelogToFile, bi as writeVersion } from './shared/relizy.uCxVVpbQ.mjs';
 import '@maz-ui/node';
 import 'node:child_process';
 import 'node:process';

package/dist/shared/{relizy.DDpPSTvS.mjs → relizy.uCxVVpbQ.mjs}

@@ -250,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) {
@@ -414,6 +414,24 @@ function getFirstPackageCommitHash(packagePath, cwd) {
     return null;
   }
 }
+function getCommitParentHash(hash, cwd) {
+  try {
+    const parent = execSync(
+      `git rev-parse --verify --quiet "${hash}^"`,
+      { cwd, encoding: "utf8" }
+    ).trim();
+    return parent || null;
+  } catch {
+    return null;
+  }
+}
+function getNewPackageCompareBase(packagePath, cwd) {
+  const firstPackageCommit = getFirstPackageCommitHash(packagePath, cwd);
+  if (!firstPackageCommit) {
+    return null;
+  }
+  return getCommitParentHash(firstPackageCommit, cwd) || firstPackageCommit;
+}
 function readPackageJson(packagePath) {
   const packageJsonPath = join(packagePath, "package.json");
   if (!existsSync(packageJsonPath)) {
@@ -774,13 +792,13 @@ async function getPackageCommits({
       return [];
     }
     logger.debug(`${pkg.name} is a new package, using first package commit: ${firstPackageCommit.slice(0, 8)}`);
-    actualFrom = `${firstPackageCommit}^`;
+    actualFrom = getCommitParentHash(firstPackageCommit, config.cwd) ?? void 0;
   } else {
     actualFrom = await reconcileFromTag({ from, to, config, dryRun });
   }
   const changelogConfig = {
     ...config,
-    from: actualFrom,
+    from: actualFrom ?? "",
     to
   };
   const rawCommits = getGitDiff(actualFrom, to, changelogConfig.cwd);
@@ -1875,6 +1893,9 @@ function isBumpedPackage(pkg) {
 function filterOutPrivatePackages(packages) {
   return packages.filter((p) => !p.private);
 }
+function filterPrivatePackagesUnlessIncluded(packages, includePrivates) {
+  return includePrivates ? packages : filterOutPrivatePackages(packages);
+}
 async function getPackagesOrBumpedPackages({
   config,
   bumpResult,
@@ -2440,7 +2461,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 {
@@ -2993,17 +3014,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
 }) {
@@ -3310,14 +3472,16 @@ function resolveChangelogTags({
 }) {
   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 isNewPackage = gitFromRef === NEW_PACKAGE_MARKER;
+  const isFirstCommit = !isNewPackage && gitFromRef === getFirstCommit(config.cwd);
+  const displayFromTag = isFirstCommit || isNewPackage ? isIndependent ? getIndependentTag({ version: "0.0.0", name: pkg.name }) : config.templates.tagBody.replace("{{newVersion}}", "0.0.0") : gitFromRef;
+  const compareFromRef = isNewPackage ? getNewPackageCompareBase(pkg.path, config.cwd) : displayFromTag;
   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}`);
   }
-  return { gitFromRef, gitToRef, displayFromTag, displayToTag, isFirstCommit };
+  return { gitFromRef, gitToRef, displayFromTag, displayToTag, compareFromRef, isFirstCommit };
 }
 function renderTitle({
   fromTag,
@@ -3333,6 +3497,7 @@ async function renderChangelogParts({
   config,
   fromTag,
   toTag,
+  compareFromRef,
   isFirstCommit,
   sections,
   minify,
@@ -3342,8 +3507,8 @@ async function renderChangelogParts({
   if (sections.title) {
     parts.push(renderTitle({ fromTag, toTag, config }));
   }
-  if (sections.compareLink && !minify) {
-    const compareLink = buildCompareLink({ config, from: fromTag, to: toTag, isFirstCommit });
+  if (sections.compareLink && !minify && compareFromRef) {
+    const compareLink = buildCompareLink({ config, from: compareFromRef, to: toTag, isFirstCommit });
     if (compareLink) {
       parts.push(compareLink);
     }
@@ -3378,7 +3543,7 @@ async function generateChangelog({
   transformBody
 }) {
   const sections = resolveSections(include);
-  const { gitFromRef, gitToRef, displayFromTag, displayToTag, isFirstCommit } = resolveChangelogTags({ pkg, config, newVersion });
+  const { gitFromRef, gitToRef, displayFromTag, displayToTag, compareFromRef, isFirstCommit } = resolveChangelogTags({ pkg, config, newVersion });
   logger.debug(`Generating changelog for ${pkg.name} - git ${gitFromRef}..${gitToRef} - display ${displayFromTag}...${displayToTag}`);
   try {
     const commits = await getPackageCommits({
@@ -3395,6 +3560,7 @@ async function generateChangelog({
       config: displayConfig,
       fromTag: displayFromTag,
       toTag: displayToTag,
+      compareFromRef,
       isFirstCommit,
       sections,
       minify,
@@ -3738,13 +3904,13 @@ async function githubIndependentMode({
   if (!config.tokens.github && !config.repo?.token) {
     throw new Error("No GitHub token specified. Set GITHUB_TOKEN or GH_TOKEN environment variable.");
   }
-  const packages = filterOutPrivatePackages(await getPackagesOrBumpedPackages({
+  const packages = filterPrivatePackagesUnlessIncluded(await getPackagesOrBumpedPackages({
     config,
     bumpResult,
     suffix,
     force,
     dryRun
-  }));
+  }), config.monorepo?.includePrivates);
   logger.info(`Creating ${packages.length} GitHub release(s)`);
   const postedReleases = [];
   for (const pkg of packages) {
@@ -3948,13 +4114,13 @@ async function gitlabIndependentMode({
   force
 }) {
   logger.debug(`GitLab token: ${config.tokens.gitlab || config.repo?.token ? "\u2713 provided" : "\u2717 missing"}`);
-  const packages = filterOutPrivatePackages(await getPackagesOrBumpedPackages({
+  const packages = filterPrivatePackagesUnlessIncluded(await getPackagesOrBumpedPackages({
     config,
     bumpResult,
     suffix,
     force,
     dryRun
-  }));
+  }), config.monorepo?.includePrivates);
   logger.info(`Creating ${packages.length} GitLab release(s) for independent packages`);
   logger.debug("Getting current branch...");
   const { stdout: currentBranch } = await execPromise("git rev-parse --abbrev-ref HEAD", {
@@ -5640,10 +5806,12 @@ function buildMetadataLines({
   branch
 }) {
   const lines = [];
-  const versionChanged = oldVersion && oldVersion !== version;
-  lines.push(
-    versionChanged ? `- **Version**: \`${oldVersion}\` \u2192 \`${version}\`` : `- **Version**: \`${version}\``
-  );
+  if (version) {
+    const versionChanged = oldVersion && oldVersion !== version;
+    lines.push(
+      versionChanged ? `- **Version**: \`${oldVersion}\` \u2192 \`${version}\`` : `- **Version**: \`${version}\``
+    );
+  }
   if (tags.length > 0) {
     lines.push(`- **Tag(s)**: ${formatTagsList(tags)}`);
   }
@@ -5691,7 +5859,7 @@ function buildInstallPackages({
   if (packages && packages.length > 0) {
     return packages.map((p) => `${p.name}@${p.version}`);
   }
-  if (rootPackageName) {
+  if (rootPackageName && version) {
     return [`${rootPackageName}@${version}`];
   }
   return [];
@@ -5726,6 +5894,22 @@ function buildInstallLines({
   }
   return lines;
 }
+function buildPublishedInstallLines({
+  config,
+  bumpedPackages,
+  packages,
+  version,
+  distTag
+}) {
+  const publishedBumpedPackages = filterOutPrivatePackages(bumpedPackages);
+  const publishedPackages = packages && filterOutPrivatePackages(packages);
+  const hasNoPackages = bumpedPackages.length === 0 && !packages?.length;
+  const rootPackageName = hasNoPackages ? config.projectName : void 0;
+  const installCmd = getInstallCommand(config.publish?.packageManager);
+  const installPkgs = buildInstallPackages({ bumpedPackages: publishedBumpedPackages, packages: publishedPackages, version, rootPackageName });
+  const pkgNames = resolvePackageNames(publishedBumpedPackages, publishedPackages, rootPackageName);
+  return buildInstallLines({ installCmd, installPkgs, distTag, pkgNames });
+}
 function buildSuccessComment({
   config,
   branch,
@@ -5735,11 +5919,15 @@ function buildSuccessComment({
   rootVersion
 }) {
   const bumpResult = releaseContext?.bumpResult;
-  const bumpedPackages = filterOutPrivatePackages(bumpResult?.bumpedPackages ?? []);
-  const version = bumpResult?.newVersion ?? rootVersion ?? "unknown";
+  const includePrivates = config.monorepo?.includePrivates;
+  const allBumpedPackages = bumpResult?.bumpedPackages ?? [];
+  const bumpedPackages = filterPrivatePackagesUnlessIncluded(allBumpedPackages, includePrivates);
+  const listedPackages = packages && filterPrivatePackagesUnlessIncluded(packages, includePrivates);
+  const isIndependent = config.monorepo?.versionMode === "independent";
+  const version = isIndependent ? void 0 : bumpResult?.newVersion ?? rootVersion;
   const tags = releaseContext?.tags ?? [];
-  const distTag = config.publish?.tag;
-  const installCmd = getInstallCommand(config.publish?.packageManager);
+  const isPublishing = config.release.publish !== false;
+  const distTag = isPublishing ? config.publish?.tag : void 0;
   const lines = [PR_COMMENT_MARKER, "", "## \u{1F680} Release published", ""];
   const previousVersion = extractVersionFromTag(bumpResult?.fromTag ?? "") || bumpResult?.oldVersion;
   lines.push(...buildMetadataLines({
@@ -5750,10 +5938,10 @@ function buildSuccessComment({
     date,
     branch
   }));
-  lines.push(...buildPackageTableLines(bumpedPackages, packages));
-  const installPkgs = buildInstallPackages({ bumpedPackages, packages, version, rootPackageName: config.projectName });
-  const pkgNames = resolvePackageNames(bumpedPackages, packages, config.projectName);
-  lines.push(...buildInstallLines({ installCmd, installPkgs, distTag, pkgNames }));
+  lines.push(...buildPackageTableLines(bumpedPackages, listedPackages));
+  if (isPublishing) {
+    lines.push(...buildPublishedInstallLines({ config, bumpedPackages: allBumpedPackages, packages, version, distTag }));
+  }
   return lines.join("\n");
 }
 function buildNoReleaseComment({ branch, date }) {
@@ -5811,21 +5999,21 @@ async function prComment(options = {}) {
   const branch = getCurrentGitBranch(config.cwd) ?? "unknown";
   const date = getFormattedDate();
   let packages = [];
-  let rootVersion = "unknown";
+  let rootVersion;
   if (!options.releaseContext) {
     const rootPackage = readPackageJson(config.cwd);
     if (!rootPackage) {
       throw new Error("Failed to read root package.json");
     }
     rootVersion = rootPackage.version;
-    const readPkgs = filterOutPrivatePackages(readPackages({
+    const readPkgs = readPackages({
       cwd: config.cwd,
       patterns: config.monorepo?.packages,
       ignorePackageNames: config.monorepo?.ignorePackageNames,
       ignored: config.monorepo?.ignored,
       includePrivates: config.monorepo?.includePrivates
-    }));
-    packages = readPkgs.map((pkg) => ({ name: pkg.name, version: pkg.version }));
+    });
+    packages = readPkgs.map((pkg) => ({ name: pkg.name, version: pkg.version, private: pkg.private }));
   }
   const body = buildCommentBody({
     config,
@@ -6678,6 +6866,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
@@ -6691,7 +6893,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) {
@@ -6800,6 +7003,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({
@@ -6819,6 +7032,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) {
@@ -6870,7 +7090,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) {
@@ -6963,4 +7184,4 @@ async function release(options = {}) {
   }
 }
 
-export { getGitDiff 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, resolveRegistryTargetsForPackages as a$, getGitStatus as a0, getIndependentTag as a1, getLastPackageTag as a2, getLastRepoTag as a3, getLastStableTag as a4, getLastTag as a5, getModifiedReleaseFilePatterns as a6, getNpmRegistry as a7, getPackageCommits as a8, getPackageDependencies as a9, isTagVersionCompatibleWithCurrent as aA, isVersionAlreadyPublishedError as aB, isVersionPublished as aC, loadRelizyConfig as aD, mergeTypes as aE, parseChangelogMarkdown as aF, parseGitRemoteUrl as aG, postPrComment as aH, postReleaseToSlack as aI, postReleaseToTwitter as aJ, prComment as aK, providerRelease as aL, providerReleaseSafetyCheck as aM, publish as aN, publishPackage as aO, publishSafetyCheck as aP, pushCommitAndTags as aQ, pushTagForce as aR, readPackageJson as aS, readPackages as aT, reconcileFromTag as aU, redactSecrets as aV, release as aW, resetRewrittenTagCache as aX, resolveAllConfiguredRegistryTargets as aY, resolveIgnoredPackagePaths as aZ, resolveRegistryTargetsForPackage as a_, getPackageNewVersion as aa, getPackages as ab, getPackagesOrBumpedPackages as ac, getPackagesToPublishInIndependentMode as ad, getPackagesToPublishInSelectiveMode as ae, getPreid as af, getReleaseUrl as ag, getRootPackage as ah, getShortCommitSha as ai, getSlackToken as aj, getSlackWebhookUrl as ak, getTwitterCredentials as al, github as am, gitlab as an, globDirsAbsolute as ao, hasLernaJson as ap, isAncestor as aq, isBumpedPackage as ar, isChangedPreid as as, isCommitOnlyInIgnoredPackages as at, isGraduating as au, isGraduatingToStableBetweenVersion as av, isInCI as aw, isPrerelease as ax, isPrereleaseReleaseType as ay, isStableReleaseType as az, buildChangelogBody as b, resolveTags as b0, retagAnnotatedLocal as b1, rollbackModifiedFiles as b2, shouldFilterPrereleaseTags as b3, social as b4, socialSafetyCheck as b5, tagExists as b6, topologicalSort as b7, tryPostPrComment as b8, updateLernaVersion as b9, withRegistryNpmrc as ba, writeChangelogToFile as bb, writeVersion as bc, 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 { getDefaultConfig as $, expandPackagesToBumpWithDependents as A, extractChangelogSummary as B, extractVersionFromPackageTag as C, extractVersionFromTag as D, fetchGitTags as E, filterOutPrivatePackages as F, filterPrivatePackagesUnlessIncluded as G, findGitHubPR as H, findGitLabMR as I, findReachableCommitBySubject as J, formatChangelogForSlack as K, formatPackagesForSlack as L, formatSlackMessage as M, NEW_PACKAGE_MARKER as N, formatTweetMessage as O, PR_COMMENT_MARKER as P, generateChangelog as Q, generateMarkDown as R, getAuthCommand as S, getBumpedIndependentPackages as T, getBumpedPackageIndependently as U, getCIName as V, getCanaryVersion as W, getCommitChangedFiles as X, getCommitSubject as Y, getCurrentGitBranch as Z, getCurrentGitRef as _, assertBranchUpToDateWithRemote as a, redactSecrets as a$, getDependentsOf as a0, getFirstCommit as a1, getGitDiff as a2, getGitStatus as a3, getGitUpstream as a4, getIndependentTag as a5, getLastPackageTag as a6, getLastRepoTag as a7, getLastStableTag as a8, getLastTag as a9, isGraduating as aA, isGraduatingToStableBetweenVersion as aB, isInCI as aC, isPrerelease as aD, isPrereleaseReleaseType as aE, isStableReleaseType as aF, isTagVersionCompatibleWithCurrent as aG, isVersionAlreadyPublishedError as aH, isVersionPublished as aI, loadRelizyConfig as aJ, mergeTypes as aK, parseChangelogMarkdown as aL, parseGitRemoteUrl as aM, postPrComment as aN, postReleaseToSlack as aO, postReleaseToTwitter as aP, prComment as aQ, providerRelease as aR, providerReleaseSafetyCheck as aS, publish as aT, publishPackage as aU, publishSafetyCheck as aV, pushCommitAndTags as aW, pushTagForce as aX, readPackageJson as aY, readPackages as aZ, reconcileFromTag as a_, getModifiedReleaseFilePatterns as aa, getNewPackageCompareBase as ab, getNpmRegistry as ac, getPackageCommits as ad, getPackageDependencies as ae, getPackageNewVersion as af, getPackages as ag, getPackagesOrBumpedPackages as ah, getPackagesToPublishInIndependentMode as ai, getPackagesToPublishInSelectiveMode as aj, getPreid as ak, getReleaseTagNames as al, getReleaseUrl as am, getRootPackage as an, getShortCommitSha as ao, getSlackToken as ap, getSlackWebhookUrl as aq, getTwitterCredentials as ar, github as as, gitlab as at, globDirsAbsolute as au, hasLernaJson as av, isAncestor as aw, isBumpedPackage as ax, isChangedPreid as ay, isCommitOnlyInIgnoredPackages as az, assertReleaseTagsAvailable as b, release as b0, resetRewrittenTagCache as b1, resolveAllConfiguredRegistryTargets as b2, resolveIgnoredPackagePaths as b3, resolveRegistryTargetsForPackage as b4, resolveRegistryTargetsForPackages as b5, resolveTags as b6, retagAnnotatedLocal as b7, rollbackModifiedFiles as b8, shouldFilterPrereleaseTags as b9, social as ba, socialSafetyCheck as bb, tagExists as bc, topologicalSort as bd, tryPostPrComment as be, updateLernaVersion as bf, withRegistryNpmrc as bg, writeChangelogToFile as bh, writeVersion as bi, 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.1",
+  "version": "1.7.0-beta.0",
   "description": "Changelogen adapter for monorepo management with unified and independent versioning",
   "author": "Louis Mazel <me@loicmazuel.com>",
   "license": "MIT",