@qlover/fe-release 5.0.4 → 5.0.6

package/dist/cli.cjs

@@ -28,7 +28,7 @@ var import_commander = require("commander");
 
 // package.json
 var description = "A tool for releasing front-end projects, supporting multiple release modes and configurations, simplifying the release process and improving efficiency.";
-var version = "5.0.4";
+var version = "5.0.6";
 
 // src/cli.ts
 var import_semver = __toESM(require("semver"), 1);
@@ -69,16 +69,23 @@ var releaseJson = {
     autoMergeReleasePR: false,
     pushChangeLabels: false,
     skipCreateReleasePR: false,
-    PRTitle: "Release ${env} ${pkgName} ${tagName}",
+    /** Used when releasing 1–2 packages */
+    PRTitle: "Release ${spaces}",
+    /** Used when releasing more than 2 packages */
+    PRTitleMany: "Release ${count} packages: ${spaces}",
     PRBody: "## Changelog\n\n${changelog}",
-    batchPRBody: "\n## ${name} ${newVersion}\n${changelog}\n",
+    /**
+     * Per-workspace section in the PR body (single and multi package).
+     * `${changeTypeSection}` is Patch/Minor/Major Changes from increment.
+     */
+    batchPRBody: "\n### ${name}@${newVersion}\n\n#### ${changeTypeSection}\n\n${changelog}\n",
     branchName: "release/${repoName}-${releaseId}",
     releaseTagName: "release-tag-${count}-patch-${releaseId}",
     commitMessage: "chore(release): ${spaces}",
     label: {
       name: "CI-Release",
       color: "1A7F37",
-      description: "Release PR"
+      description: "Automated release PR (merge to publish)"
     }
   },
   changesetVersion: {
@@ -585,6 +592,9 @@ function workspaceVersionSummary(workspace) {
 function shouldProcessWorkspace(workspace, ignoreNonUpdatedPackages) {
   return !(ignoreNonUpdatedPackages && workspace.dependencyRelease);
 }
+function isPrivateWorkspace(workspace) {
+  return workspace.packageJson?.private === true;
+}
 function readJson(path) {
   const packageJsonContent = (0, import_fs.readFileSync)(path, "utf-8");
   return JSON.parse(packageJsonContent);
@@ -1726,9 +1736,18 @@ ${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
       this.logDryRun("Would run: changeset publish, publish packages and tags");
       const preview = this.mergeWorkspaces(workspaces);
       this.context.setWorkspaces(preview);
-      const previewTags = preview.filter(
-        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && workspace.tagName
+      const previewTags = this.collectPushableReleaseTags(preview);
+      const privateTags = preview.filter(
+        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
       ).map((workspace) => workspace.tagName);
+      if (privateTags.length > 0) {
+        this.logDryRun(
+          `Would create local tag(s) for private package(s):
+${[
+            ...new Set(privateTags)
+          ].map((tag) => `  ${tag}`).join("\n")}`
+        );
+      }
       this.logDryRun(
         previewTags.length === 0 ? "Would push release tag(s) from workspace.tagName: none" : `Would push release tag(s) from workspace.tagName:
 ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
@@ -1742,37 +1761,106 @@ ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
     if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    const syncedWorkspaces = this.context.workspaces ?? workspaces;
+    await this.step({
+      label: "Create Private Package Tags",
+      task: () => this.ensurePrivateReleaseTags(syncedWorkspaces)
+    });
     await this.step({
       label: "Push Release Tags",
-      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+      task: () => this.pushWorkspaceReleaseTags(syncedWorkspaces)
     });
   }
   /**
-   * Push release tags from synced workspaces' `tagName` fields.
+   * Collect tag names that should be pushed after `changeset publish`.
    *
-   * `changeset publish` only creates tags locally. After {@link syncWorkspaces},
-   * each publishable workspace should already have `tagName` (e.g. `pkg@1.2.3`).
+   * Includes public packages (tagged by changesets) and private packages
+   * (tagged by {@link ensurePrivateReleaseTags}). Skips dependency-release
+   * workspaces.
    */
-  async pushWorkspaceReleaseTags(workspaces) {
+  collectPushableReleaseTags(workspaces) {
     const tags = workspaces.filter(
       (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
     ).map((workspace) => workspace.tagName);
-    const uniqueTags = [...new Set(tags)];
+    return [...new Set(tags)];
+  }
+  /**
+   * List local git tag names (short refs under `refs/tags/`).
+   */
+  async listLocalTags() {
+    const output = await this.shell.exec(
+      'git for-each-ref --format="%(refname:short)" refs/tags/',
+      { dryRun: false, silent: true }
+    );
+    const tags = output.split("\n").map((line) => line.trim()).filter(Boolean);
+    return new Set(tags);
+  }
+  /**
+   * Create local git tags for private packages after `changeset publish`.
+   *
+   * Changesets skips npm publish and tagging for `private: true` packages.
+   * Release still needs those tags as changelog baselines, so create them here.
+   */
+  async ensurePrivateReleaseTags(workspaces) {
+    const privateWorkspaces = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
+    );
+    if (privateWorkspaces.length === 0) {
+      return;
+    }
+    const localTags = await this.listLocalTags();
+    for (const workspace of privateWorkspaces) {
+      const tagName = workspace.tagName;
+      if (localTags.has(tagName)) {
+        this.logger.debug(`Private package tag already exists: ${tagName}`);
+        continue;
+      }
+      this.logger.info(
+        `Create local release tag for private package: ${tagName}`
+      );
+      await this.shell.exec(["git", "tag", tagName]);
+      localTags.add(tagName);
+    }
+  }
+  /**
+   * Push release tags from synced workspaces' `tagName` fields.
+   *
+   * After {@link syncWorkspaces} and {@link ensurePrivateReleaseTags}, push
+   * tags that exist as local refs. Missing public-package tags are skipped
+   * (changeset may have skipped publish); they are not invented here.
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const uniqueTags = this.collectPushableReleaseTags(workspaces);
     if (uniqueTags.length === 0) {
       this.logger.warn(
         "No workspace.tagName found after publish sync; skip tag push"
       );
       return;
     }
+    const localTags = await this.listLocalTags();
+    const existingTags = uniqueTags.filter((tag) => localTags.has(tag));
+    const missingTags = uniqueTags.filter((tag) => !localTags.has(tag));
+    if (missingTags.length > 0) {
+      this.logger.warn(
+        `Skip push for missing local tag(s):
+${missingTags.map((tag) => `  ${tag}`).join("\n")}`
+      );
+    }
+    if (existingTags.length === 0) {
+      this.logger.warn(
+        "No local release tags found to push after publish; skip tag push"
+      );
+      return;
+    }
     this.logger.info(
-      `Pushing ${uniqueTags.length} release tag(s) to origin:
-${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+      `Pushing ${existingTags.length} release tag(s) to origin:
+${existingTags.map((tag) => `  ${tag}`).join("\n")}`
     );
     await this.shell.exec([
       "git",
       "push",
       "origin",
-      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+      ...existingTags.map((tag) => `"refs/tags/${tag}"`)
     ]);
   }
   syncWorkspaces(workspaces) {
@@ -3375,23 +3463,33 @@ var ReleaseFormatter = class {
     if (workspaces.length === 0) {
       return "";
     }
-    if (workspaces.length === 1) {
-      return workspaces[0].changelog || "";
-    }
+    const changeTypeSection = this.getChangeTypeSection();
+    const batchTpl = this.config.batchPRBody || releaseJson.github.batchPRBody;
     return workspaces.map(
-      (workspace) => this.templateEngine.render(
-        this.config.batchPRBody || releaseJson.github.batchPRBody,
-        {
-          ...workspace,
-          // Prefer bumped version in PR changelog section headers
-          version: workspace.newVersion || workspace.version,
-          newVersion: workspace.newVersion || workspace.version
-        }
-      )
+      (workspace) => this.templateEngine.render(batchTpl, {
+        ...workspace,
+        // Prefer bumped version in PR changelog section headers
+        version: workspace.newVersion || workspace.version,
+        newVersion: workspace.newVersion || workspace.version,
+        changeTypeSection
+      })
     ).join("\n");
   }
+  /**
+   * Map semver increment to Changesets-style section title.
+   */
+  getChangeTypeSection() {
+    const increment = (this.config.increment || "patch").toLowerCase();
+    if (increment === "major") {
+      return "Major Changes";
+    }
+    if (increment === "minor") {
+      return "Minor Changes";
+    }
+    return "Patch Changes";
+  }
   formatPRTagName(workspaces, releaseBranchResult) {
-    if (workspaces.length <= 1) {
+    if (workspaces.length === 0) {
       return releaseBranchResult.releaseTagName;
     }
     return workspaces.map(
@@ -3399,7 +3497,8 @@ var ReleaseFormatter = class {
     ).join(" ");
   }
   getPRTitle(releaseBranchResult, context, workspaces = []) {
-    const prTitleTpl = this.config.PRTitle || releaseJson.github.PRTitle;
+    const count = workspaces.length;
+    const prTitleTpl = count > 2 ? this.config.PRTitleMany || this.config.PRTitle || releaseJson.github.PRTitleMany : this.config.PRTitle || releaseJson.github.PRTitle;
     return this.templateEngine.render(
       prTitleTpl,
       this.buildPRTemplateVars(workspaces, releaseBranchResult, context)
@@ -3437,7 +3536,8 @@ var Github = class extends GitBase {
       repoName: this.context.options.repoName,
       authorName: this.context.options.authorName,
       env: this.context.options.releaseEnv,
-      releaseId: this.context.releaseId
+      releaseId: this.context.releaseId,
+      increment: this.context.parameters.changesetVersion?.increment || releaseJson.changesetVersion.increment
     });
     this.logger.info(`Github mode: ${this.mode}`);
   }

package/dist/cli.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 
 // package.json
 var description = "A tool for releasing front-end projects, supporting multiple release modes and configurations, simplifying the release process and improving efficiency.";
-var version = "5.0.4";
+var version = "5.0.6";
 
 // src/cli.ts
 import semver from "semver";
@@ -46,16 +46,23 @@ var releaseJson = {
     autoMergeReleasePR: false,
     pushChangeLabels: false,
     skipCreateReleasePR: false,
-    PRTitle: "Release ${env} ${pkgName} ${tagName}",
+    /** Used when releasing 1–2 packages */
+    PRTitle: "Release ${spaces}",
+    /** Used when releasing more than 2 packages */
+    PRTitleMany: "Release ${count} packages: ${spaces}",
     PRBody: "## Changelog\n\n${changelog}",
-    batchPRBody: "\n## ${name} ${newVersion}\n${changelog}\n",
+    /**
+     * Per-workspace section in the PR body (single and multi package).
+     * `${changeTypeSection}` is Patch/Minor/Major Changes from increment.
+     */
+    batchPRBody: "\n### ${name}@${newVersion}\n\n#### ${changeTypeSection}\n\n${changelog}\n",
     branchName: "release/${repoName}-${releaseId}",
     releaseTagName: "release-tag-${count}-patch-${releaseId}",
     commitMessage: "chore(release): ${spaces}",
     label: {
       name: "CI-Release",
       color: "1A7F37",
-      description: "Release PR"
+      description: "Automated release PR (merge to publish)"
     }
   },
   changesetVersion: {
@@ -565,6 +572,9 @@ function workspaceVersionSummary(workspace) {
 function shouldProcessWorkspace(workspace, ignoreNonUpdatedPackages) {
   return !(ignoreNonUpdatedPackages && workspace.dependencyRelease);
 }
+function isPrivateWorkspace(workspace) {
+  return workspace.packageJson?.private === true;
+}
 function readJson(path) {
   const packageJsonContent = readFileSync(path, "utf-8");
   return JSON.parse(packageJsonContent);
@@ -1706,9 +1716,18 @@ ${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
       this.logDryRun("Would run: changeset publish, publish packages and tags");
       const preview = this.mergeWorkspaces(workspaces);
       this.context.setWorkspaces(preview);
-      const previewTags = preview.filter(
-        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && workspace.tagName
+      const previewTags = this.collectPushableReleaseTags(preview);
+      const privateTags = preview.filter(
+        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
       ).map((workspace) => workspace.tagName);
+      if (privateTags.length > 0) {
+        this.logDryRun(
+          `Would create local tag(s) for private package(s):
+${[
+            ...new Set(privateTags)
+          ].map((tag) => `  ${tag}`).join("\n")}`
+        );
+      }
       this.logDryRun(
         previewTags.length === 0 ? "Would push release tag(s) from workspace.tagName: none" : `Would push release tag(s) from workspace.tagName:
 ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
@@ -1722,37 +1741,106 @@ ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
     if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    const syncedWorkspaces = this.context.workspaces ?? workspaces;
+    await this.step({
+      label: "Create Private Package Tags",
+      task: () => this.ensurePrivateReleaseTags(syncedWorkspaces)
+    });
     await this.step({
       label: "Push Release Tags",
-      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+      task: () => this.pushWorkspaceReleaseTags(syncedWorkspaces)
     });
   }
   /**
-   * Push release tags from synced workspaces' `tagName` fields.
+   * Collect tag names that should be pushed after `changeset publish`.
    *
-   * `changeset publish` only creates tags locally. After {@link syncWorkspaces},
-   * each publishable workspace should already have `tagName` (e.g. `pkg@1.2.3`).
+   * Includes public packages (tagged by changesets) and private packages
+   * (tagged by {@link ensurePrivateReleaseTags}). Skips dependency-release
+   * workspaces.
    */
-  async pushWorkspaceReleaseTags(workspaces) {
+  collectPushableReleaseTags(workspaces) {
     const tags = workspaces.filter(
       (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
     ).map((workspace) => workspace.tagName);
-    const uniqueTags = [...new Set(tags)];
+    return [...new Set(tags)];
+  }
+  /**
+   * List local git tag names (short refs under `refs/tags/`).
+   */
+  async listLocalTags() {
+    const output = await this.shell.exec(
+      'git for-each-ref --format="%(refname:short)" refs/tags/',
+      { dryRun: false, silent: true }
+    );
+    const tags = output.split("\n").map((line) => line.trim()).filter(Boolean);
+    return new Set(tags);
+  }
+  /**
+   * Create local git tags for private packages after `changeset publish`.
+   *
+   * Changesets skips npm publish and tagging for `private: true` packages.
+   * Release still needs those tags as changelog baselines, so create them here.
+   */
+  async ensurePrivateReleaseTags(workspaces) {
+    const privateWorkspaces = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
+    );
+    if (privateWorkspaces.length === 0) {
+      return;
+    }
+    const localTags = await this.listLocalTags();
+    for (const workspace of privateWorkspaces) {
+      const tagName = workspace.tagName;
+      if (localTags.has(tagName)) {
+        this.logger.debug(`Private package tag already exists: ${tagName}`);
+        continue;
+      }
+      this.logger.info(
+        `Create local release tag for private package: ${tagName}`
+      );
+      await this.shell.exec(["git", "tag", tagName]);
+      localTags.add(tagName);
+    }
+  }
+  /**
+   * Push release tags from synced workspaces' `tagName` fields.
+   *
+   * After {@link syncWorkspaces} and {@link ensurePrivateReleaseTags}, push
+   * tags that exist as local refs. Missing public-package tags are skipped
+   * (changeset may have skipped publish); they are not invented here.
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const uniqueTags = this.collectPushableReleaseTags(workspaces);
     if (uniqueTags.length === 0) {
       this.logger.warn(
         "No workspace.tagName found after publish sync; skip tag push"
       );
       return;
     }
+    const localTags = await this.listLocalTags();
+    const existingTags = uniqueTags.filter((tag) => localTags.has(tag));
+    const missingTags = uniqueTags.filter((tag) => !localTags.has(tag));
+    if (missingTags.length > 0) {
+      this.logger.warn(
+        `Skip push for missing local tag(s):
+${missingTags.map((tag) => `  ${tag}`).join("\n")}`
+      );
+    }
+    if (existingTags.length === 0) {
+      this.logger.warn(
+        "No local release tags found to push after publish; skip tag push"
+      );
+      return;
+    }
     this.logger.info(
-      `Pushing ${uniqueTags.length} release tag(s) to origin:
-${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+      `Pushing ${existingTags.length} release tag(s) to origin:
+${existingTags.map((tag) => `  ${tag}`).join("\n")}`
     );
     await this.shell.exec([
       "git",
       "push",
       "origin",
-      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+      ...existingTags.map((tag) => `"refs/tags/${tag}"`)
     ]);
   }
   syncWorkspaces(workspaces) {
@@ -3355,23 +3443,33 @@ var ReleaseFormatter = class {
     if (workspaces.length === 0) {
       return "";
     }
-    if (workspaces.length === 1) {
-      return workspaces[0].changelog || "";
-    }
+    const changeTypeSection = this.getChangeTypeSection();
+    const batchTpl = this.config.batchPRBody || releaseJson.github.batchPRBody;
     return workspaces.map(
-      (workspace) => this.templateEngine.render(
-        this.config.batchPRBody || releaseJson.github.batchPRBody,
-        {
-          ...workspace,
-          // Prefer bumped version in PR changelog section headers
-          version: workspace.newVersion || workspace.version,
-          newVersion: workspace.newVersion || workspace.version
-        }
-      )
+      (workspace) => this.templateEngine.render(batchTpl, {
+        ...workspace,
+        // Prefer bumped version in PR changelog section headers
+        version: workspace.newVersion || workspace.version,
+        newVersion: workspace.newVersion || workspace.version,
+        changeTypeSection
+      })
     ).join("\n");
   }
+  /**
+   * Map semver increment to Changesets-style section title.
+   */
+  getChangeTypeSection() {
+    const increment = (this.config.increment || "patch").toLowerCase();
+    if (increment === "major") {
+      return "Major Changes";
+    }
+    if (increment === "minor") {
+      return "Minor Changes";
+    }
+    return "Patch Changes";
+  }
   formatPRTagName(workspaces, releaseBranchResult) {
-    if (workspaces.length <= 1) {
+    if (workspaces.length === 0) {
       return releaseBranchResult.releaseTagName;
     }
     return workspaces.map(
@@ -3379,7 +3477,8 @@ var ReleaseFormatter = class {
     ).join(" ");
   }
   getPRTitle(releaseBranchResult, context, workspaces = []) {
-    const prTitleTpl = this.config.PRTitle || releaseJson.github.PRTitle;
+    const count = workspaces.length;
+    const prTitleTpl = count > 2 ? this.config.PRTitleMany || this.config.PRTitle || releaseJson.github.PRTitleMany : this.config.PRTitle || releaseJson.github.PRTitle;
     return this.templateEngine.render(
       prTitleTpl,
       this.buildPRTemplateVars(workspaces, releaseBranchResult, context)
@@ -3417,7 +3516,8 @@ var Github = class extends GitBase {
       repoName: this.context.options.repoName,
       authorName: this.context.options.authorName,
       env: this.context.options.releaseEnv,
-      releaseId: this.context.releaseId
+      releaseId: this.context.releaseId,
+      increment: this.context.parameters.changesetVersion?.increment || releaseJson.changesetVersion.increment
     });
     this.logger.info(`Github mode: ${this.mode}`);
   }

package/dist/index.cjs

@@ -66,16 +66,23 @@ var releaseJson = {
     autoMergeReleasePR: false,
     pushChangeLabels: false,
     skipCreateReleasePR: false,
-    PRTitle: "Release ${env} ${pkgName} ${tagName}",
+    /** Used when releasing 1–2 packages */
+    PRTitle: "Release ${spaces}",
+    /** Used when releasing more than 2 packages */
+    PRTitleMany: "Release ${count} packages: ${spaces}",
     PRBody: "## Changelog\n\n${changelog}",
-    batchPRBody: "\n## ${name} ${newVersion}\n${changelog}\n",
+    /**
+     * Per-workspace section in the PR body (single and multi package).
+     * `${changeTypeSection}` is Patch/Minor/Major Changes from increment.
+     */
+    batchPRBody: "\n### ${name}@${newVersion}\n\n#### ${changeTypeSection}\n\n${changelog}\n",
     branchName: "release/${repoName}-${releaseId}",
     releaseTagName: "release-tag-${count}-patch-${releaseId}",
     commitMessage: "chore(release): ${spaces}",
     label: {
       name: "CI-Release",
       color: "1A7F37",
-      description: "Release PR"
+      description: "Automated release PR (merge to publish)"
     }
   },
   changesetVersion: {
@@ -590,6 +597,9 @@ function workspaceVersionSummary(workspace) {
 function shouldProcessWorkspace(workspace, ignoreNonUpdatedPackages) {
   return !(ignoreNonUpdatedPackages && workspace.dependencyRelease);
 }
+function isPrivateWorkspace(workspace) {
+  return workspace.packageJson?.private === true;
+}
 function readJson(path) {
   const packageJsonContent = (0, import_fs.readFileSync)(path, "utf-8");
   return JSON.parse(packageJsonContent);
@@ -1731,9 +1741,18 @@ ${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
       this.logDryRun("Would run: changeset publish, publish packages and tags");
       const preview = this.mergeWorkspaces(workspaces);
       this.context.setWorkspaces(preview);
-      const previewTags = preview.filter(
-        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && workspace.tagName
+      const previewTags = this.collectPushableReleaseTags(preview);
+      const privateTags = preview.filter(
+        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
       ).map((workspace) => workspace.tagName);
+      if (privateTags.length > 0) {
+        this.logDryRun(
+          `Would create local tag(s) for private package(s):
+${[
+            ...new Set(privateTags)
+          ].map((tag) => `  ${tag}`).join("\n")}`
+        );
+      }
       this.logDryRun(
         previewTags.length === 0 ? "Would push release tag(s) from workspace.tagName: none" : `Would push release tag(s) from workspace.tagName:
 ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
@@ -1747,37 +1766,106 @@ ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
     if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    const syncedWorkspaces = this.context.workspaces ?? workspaces;
+    await this.step({
+      label: "Create Private Package Tags",
+      task: () => this.ensurePrivateReleaseTags(syncedWorkspaces)
+    });
     await this.step({
       label: "Push Release Tags",
-      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+      task: () => this.pushWorkspaceReleaseTags(syncedWorkspaces)
     });
   }
   /**
-   * Push release tags from synced workspaces' `tagName` fields.
+   * Collect tag names that should be pushed after `changeset publish`.
    *
-   * `changeset publish` only creates tags locally. After {@link syncWorkspaces},
-   * each publishable workspace should already have `tagName` (e.g. `pkg@1.2.3`).
+   * Includes public packages (tagged by changesets) and private packages
+   * (tagged by {@link ensurePrivateReleaseTags}). Skips dependency-release
+   * workspaces.
    */
-  async pushWorkspaceReleaseTags(workspaces) {
+  collectPushableReleaseTags(workspaces) {
     const tags = workspaces.filter(
       (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
     ).map((workspace) => workspace.tagName);
-    const uniqueTags = [...new Set(tags)];
+    return [...new Set(tags)];
+  }
+  /**
+   * List local git tag names (short refs under `refs/tags/`).
+   */
+  async listLocalTags() {
+    const output = await this.shell.exec(
+      'git for-each-ref --format="%(refname:short)" refs/tags/',
+      { dryRun: false, silent: true }
+    );
+    const tags = output.split("\n").map((line) => line.trim()).filter(Boolean);
+    return new Set(tags);
+  }
+  /**
+   * Create local git tags for private packages after `changeset publish`.
+   *
+   * Changesets skips npm publish and tagging for `private: true` packages.
+   * Release still needs those tags as changelog baselines, so create them here.
+   */
+  async ensurePrivateReleaseTags(workspaces) {
+    const privateWorkspaces = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
+    );
+    if (privateWorkspaces.length === 0) {
+      return;
+    }
+    const localTags = await this.listLocalTags();
+    for (const workspace of privateWorkspaces) {
+      const tagName = workspace.tagName;
+      if (localTags.has(tagName)) {
+        this.logger.debug(`Private package tag already exists: ${tagName}`);
+        continue;
+      }
+      this.logger.info(
+        `Create local release tag for private package: ${tagName}`
+      );
+      await this.shell.exec(["git", "tag", tagName]);
+      localTags.add(tagName);
+    }
+  }
+  /**
+   * Push release tags from synced workspaces' `tagName` fields.
+   *
+   * After {@link syncWorkspaces} and {@link ensurePrivateReleaseTags}, push
+   * tags that exist as local refs. Missing public-package tags are skipped
+   * (changeset may have skipped publish); they are not invented here.
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const uniqueTags = this.collectPushableReleaseTags(workspaces);
     if (uniqueTags.length === 0) {
       this.logger.warn(
         "No workspace.tagName found after publish sync; skip tag push"
       );
       return;
     }
+    const localTags = await this.listLocalTags();
+    const existingTags = uniqueTags.filter((tag) => localTags.has(tag));
+    const missingTags = uniqueTags.filter((tag) => !localTags.has(tag));
+    if (missingTags.length > 0) {
+      this.logger.warn(
+        `Skip push for missing local tag(s):
+${missingTags.map((tag) => `  ${tag}`).join("\n")}`
+      );
+    }
+    if (existingTags.length === 0) {
+      this.logger.warn(
+        "No local release tags found to push after publish; skip tag push"
+      );
+      return;
+    }
     this.logger.info(
-      `Pushing ${uniqueTags.length} release tag(s) to origin:
-${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+      `Pushing ${existingTags.length} release tag(s) to origin:
+${existingTags.map((tag) => `  ${tag}`).join("\n")}`
     );
     await this.shell.exec([
       "git",
       "push",
       "origin",
-      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+      ...existingTags.map((tag) => `"refs/tags/${tag}"`)
     ]);
   }
   syncWorkspaces(workspaces) {
@@ -3380,23 +3468,33 @@ var ReleaseFormatter = class {
     if (workspaces.length === 0) {
       return "";
     }
-    if (workspaces.length === 1) {
-      return workspaces[0].changelog || "";
-    }
+    const changeTypeSection = this.getChangeTypeSection();
+    const batchTpl = this.config.batchPRBody || releaseJson.github.batchPRBody;
     return workspaces.map(
-      (workspace) => this.templateEngine.render(
-        this.config.batchPRBody || releaseJson.github.batchPRBody,
-        {
-          ...workspace,
-          // Prefer bumped version in PR changelog section headers
-          version: workspace.newVersion || workspace.version,
-          newVersion: workspace.newVersion || workspace.version
-        }
-      )
+      (workspace) => this.templateEngine.render(batchTpl, {
+        ...workspace,
+        // Prefer bumped version in PR changelog section headers
+        version: workspace.newVersion || workspace.version,
+        newVersion: workspace.newVersion || workspace.version,
+        changeTypeSection
+      })
     ).join("\n");
   }
+  /**
+   * Map semver increment to Changesets-style section title.
+   */
+  getChangeTypeSection() {
+    const increment = (this.config.increment || "patch").toLowerCase();
+    if (increment === "major") {
+      return "Major Changes";
+    }
+    if (increment === "minor") {
+      return "Minor Changes";
+    }
+    return "Patch Changes";
+  }
   formatPRTagName(workspaces, releaseBranchResult) {
-    if (workspaces.length <= 1) {
+    if (workspaces.length === 0) {
       return releaseBranchResult.releaseTagName;
     }
     return workspaces.map(
@@ -3404,7 +3502,8 @@ var ReleaseFormatter = class {
     ).join(" ");
   }
   getPRTitle(releaseBranchResult, context, workspaces = []) {
-    const prTitleTpl = this.config.PRTitle || releaseJson.github.PRTitle;
+    const count = workspaces.length;
+    const prTitleTpl = count > 2 ? this.config.PRTitleMany || this.config.PRTitle || releaseJson.github.PRTitleMany : this.config.PRTitle || releaseJson.github.PRTitle;
     return this.templateEngine.render(
       prTitleTpl,
       this.buildPRTemplateVars(workspaces, releaseBranchResult, context)
@@ -3442,7 +3541,8 @@ var Github = class extends GitBase {
       repoName: this.context.options.repoName,
       authorName: this.context.options.authorName,
       env: this.context.options.releaseEnv,
-      releaseId: this.context.releaseId
+      releaseId: this.context.releaseId,
+      increment: this.context.parameters.changesetVersion?.increment || releaseJson.changesetVersion.increment
     });
     this.logger.info(`Github mode: ${this.mode}`);
   }

package/dist/index.d.ts

@@ -216,11 +216,19 @@ interface ReleaseFormatterConfig {
         more: string;
     };
     /**
-     * Pull request title template
+     * Pull request title template (1–2 packages)
      *
-     * @default {@link DEFAULT_PR_TITLE}
+     * @default {@link releaseJson.github.PRTitle}
      */
     PRTitle?: string;
+    /**
+     * Pull request title template when releasing more than 2 packages
+     *
+     * Falls back to {@link PRTitle} when unset.
+     *
+     * @default {@link releaseJson.github.PRTitleMany}
+     */
+    PRTitleMany?: string;
     /**
      * Pull request body template
      *
@@ -228,11 +236,19 @@ interface ReleaseFormatterConfig {
      */
     PRBody?: string;
     /**
-     * Template for each workspace section in a multi-workspace PR body
+     * Template for each workspace section in the PR body
+     *
+     * Used for both single- and multi-workspace releases.
+     * Supports `${changeTypeSection}` (Patch/Minor/Major Changes).
      *
      * @default from release.json
      */
     batchPRBody?: string;
+    /**
+     * Semver increment used to title changelog sections (patch | minor | major)
+     * @default 'patch'
+     */
+    increment?: string;
 }
 
 /**
@@ -840,9 +856,10 @@ interface ChangeLogInterface {
  * - **onSuccess**: run version and/or publish flow based on `mode`
  *
  * Publish flow (`mode: 'publish'` or second half of `'both'`):
- * 1. Run `changeset publish` (npm publish + local `git tag` only)
+ * 1. Run `changeset publish` (npm publish + local `git tag` for public packages)
  * 2. Sync workspaces from disk so `tagName` is set from the release version
- * 3. Push `workspace.tagName` refs to `origin`
+ * 3. Create local tags for `private` packages (changesets skips tagging them)
+ * 4. Push `workspace.tagName` refs that exist locally to `origin`
  *
  * Version flow (`mode: 'version'` or first half of `'both'`):
  * 1. Write `.changeset/*.md` files for directly changed packages only
@@ -976,11 +993,31 @@ declare class ChangesetVersion extends ScriptPlugin<ReleaseContext, ChangesetVer
     protected logDryRun(message: string): void;
     protected runVersionFlow(): Promise<void>;
     protected runChangesetPublish(): Promise<void>;
+    /**
+     * Collect tag names that should be pushed after `changeset publish`.
+     *
+     * Includes public packages (tagged by changesets) and private packages
+     * (tagged by {@link ensurePrivateReleaseTags}). Skips dependency-release
+     * workspaces.
+     */
+    protected collectPushableReleaseTags(workspaces: WorkspaceInterface[]): string[];
+    /**
+     * List local git tag names (short refs under `refs/tags/`).
+     */
+    protected listLocalTags(): Promise<Set<string>>;
+    /**
+     * Create local git tags for private packages after `changeset publish`.
+     *
+     * Changesets skips npm publish and tagging for `private: true` packages.
+     * Release still needs those tags as changelog baselines, so create them here.
+     */
+    protected ensurePrivateReleaseTags(workspaces: WorkspaceInterface[]): Promise<void>;
     /**
      * Push release tags from synced workspaces' `tagName` fields.
      *
-     * `changeset publish` only creates tags locally. After {@link syncWorkspaces},
-     * each publishable workspace should already have `tagName` (e.g. `pkg@1.2.3`).
+     * After {@link syncWorkspaces} and {@link ensurePrivateReleaseTags}, push
+     * tags that exist as local refs. Missing public-package tags are skipped
+     * (changeset may have skipped publish); they are not invented here.
      */
     protected pushWorkspaceReleaseTags(workspaces: WorkspaceInterface[]): Promise<void>;
     protected syncWorkspaces(workspaces: WorkspaceInterface[]): void;
@@ -1415,16 +1452,23 @@ declare const releaseJson: {
         readonly autoMergeReleasePR: false;
         readonly pushChangeLabels: false;
         readonly skipCreateReleasePR: false;
-        readonly PRTitle: "Release ${env} ${pkgName} ${tagName}";
+        /** Used when releasing 1–2 packages */
+        readonly PRTitle: "Release ${spaces}";
+        /** Used when releasing more than 2 packages */
+        readonly PRTitleMany: "Release ${count} packages: ${spaces}";
         readonly PRBody: "## Changelog\n\n${changelog}";
-        readonly batchPRBody: "\n## ${name} ${newVersion}\n${changelog}\n";
+        /**
+         * Per-workspace section in the PR body (single and multi package).
+         * `${changeTypeSection}` is Patch/Minor/Major Changes from increment.
+         */
+        readonly batchPRBody: "\n### ${name}@${newVersion}\n\n#### ${changeTypeSection}\n\n${changelog}\n";
         readonly branchName: "release/${repoName}-${releaseId}";
         readonly releaseTagName: "release-tag-${count}-patch-${releaseId}";
         readonly commitMessage: "chore(release): ${spaces}";
         readonly label: {
             readonly name: "CI-Release";
             readonly color: "1A7F37";
-            readonly description: "Release PR";
+            readonly description: "Automated release PR (merge to publish)";
         };
     };
     readonly changesetVersion: {

package/dist/index.js

@@ -14,16 +14,23 @@ var releaseJson = {
     autoMergeReleasePR: false,
     pushChangeLabels: false,
     skipCreateReleasePR: false,
-    PRTitle: "Release ${env} ${pkgName} ${tagName}",
+    /** Used when releasing 1–2 packages */
+    PRTitle: "Release ${spaces}",
+    /** Used when releasing more than 2 packages */
+    PRTitleMany: "Release ${count} packages: ${spaces}",
     PRBody: "## Changelog\n\n${changelog}",
-    batchPRBody: "\n## ${name} ${newVersion}\n${changelog}\n",
+    /**
+     * Per-workspace section in the PR body (single and multi package).
+     * `${changeTypeSection}` is Patch/Minor/Major Changes from increment.
+     */
+    batchPRBody: "\n### ${name}@${newVersion}\n\n#### ${changeTypeSection}\n\n${changelog}\n",
     branchName: "release/${repoName}-${releaseId}",
     releaseTagName: "release-tag-${count}-patch-${releaseId}",
     commitMessage: "chore(release): ${spaces}",
     label: {
       name: "CI-Release",
       color: "1A7F37",
-      description: "Release PR"
+      description: "Automated release PR (merge to publish)"
     }
   },
   changesetVersion: {
@@ -541,6 +548,9 @@ function workspaceVersionSummary(workspace) {
 function shouldProcessWorkspace(workspace, ignoreNonUpdatedPackages) {
   return !(ignoreNonUpdatedPackages && workspace.dependencyRelease);
 }
+function isPrivateWorkspace(workspace) {
+  return workspace.packageJson?.private === true;
+}
 function readJson(path) {
   const packageJsonContent = readFileSync(path, "utf-8");
   return JSON.parse(packageJsonContent);
@@ -1682,9 +1692,18 @@ ${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
       this.logDryRun("Would run: changeset publish, publish packages and tags");
       const preview = this.mergeWorkspaces(workspaces);
       this.context.setWorkspaces(preview);
-      const previewTags = preview.filter(
-        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && workspace.tagName
+      const previewTags = this.collectPushableReleaseTags(preview);
+      const privateTags = preview.filter(
+        (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
       ).map((workspace) => workspace.tagName);
+      if (privateTags.length > 0) {
+        this.logDryRun(
+          `Would create local tag(s) for private package(s):
+${[
+            ...new Set(privateTags)
+          ].map((tag) => `  ${tag}`).join("\n")}`
+        );
+      }
       this.logDryRun(
         previewTags.length === 0 ? "Would push release tag(s) from workspace.tagName: none" : `Would push release tag(s) from workspace.tagName:
 ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
@@ -1698,37 +1717,106 @@ ${previewTags.map((tag) => `  ${tag}`).join("\n")}`
     if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    const syncedWorkspaces = this.context.workspaces ?? workspaces;
+    await this.step({
+      label: "Create Private Package Tags",
+      task: () => this.ensurePrivateReleaseTags(syncedWorkspaces)
+    });
     await this.step({
       label: "Push Release Tags",
-      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+      task: () => this.pushWorkspaceReleaseTags(syncedWorkspaces)
     });
   }
   /**
-   * Push release tags from synced workspaces' `tagName` fields.
+   * Collect tag names that should be pushed after `changeset publish`.
    *
-   * `changeset publish` only creates tags locally. After {@link syncWorkspaces},
-   * each publishable workspace should already have `tagName` (e.g. `pkg@1.2.3`).
+   * Includes public packages (tagged by changesets) and private packages
+   * (tagged by {@link ensurePrivateReleaseTags}). Skips dependency-release
+   * workspaces.
    */
-  async pushWorkspaceReleaseTags(workspaces) {
+  collectPushableReleaseTags(workspaces) {
     const tags = workspaces.filter(
       (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
     ).map((workspace) => workspace.tagName);
-    const uniqueTags = [...new Set(tags)];
+    return [...new Set(tags)];
+  }
+  /**
+   * List local git tag names (short refs under `refs/tags/`).
+   */
+  async listLocalTags() {
+    const output = await this.shell.exec(
+      'git for-each-ref --format="%(refname:short)" refs/tags/',
+      { dryRun: false, silent: true }
+    );
+    const tags = output.split("\n").map((line) => line.trim()).filter(Boolean);
+    return new Set(tags);
+  }
+  /**
+   * Create local git tags for private packages after `changeset publish`.
+   *
+   * Changesets skips npm publish and tagging for `private: true` packages.
+   * Release still needs those tags as changelog baselines, so create them here.
+   */
+  async ensurePrivateReleaseTags(workspaces) {
+    const privateWorkspaces = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && isPrivateWorkspace(workspace) && !!workspace.tagName
+    );
+    if (privateWorkspaces.length === 0) {
+      return;
+    }
+    const localTags = await this.listLocalTags();
+    for (const workspace of privateWorkspaces) {
+      const tagName = workspace.tagName;
+      if (localTags.has(tagName)) {
+        this.logger.debug(`Private package tag already exists: ${tagName}`);
+        continue;
+      }
+      this.logger.info(
+        `Create local release tag for private package: ${tagName}`
+      );
+      await this.shell.exec(["git", "tag", tagName]);
+      localTags.add(tagName);
+    }
+  }
+  /**
+   * Push release tags from synced workspaces' `tagName` fields.
+   *
+   * After {@link syncWorkspaces} and {@link ensurePrivateReleaseTags}, push
+   * tags that exist as local refs. Missing public-package tags are skipped
+   * (changeset may have skipped publish); they are not invented here.
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const uniqueTags = this.collectPushableReleaseTags(workspaces);
     if (uniqueTags.length === 0) {
       this.logger.warn(
         "No workspace.tagName found after publish sync; skip tag push"
       );
       return;
     }
+    const localTags = await this.listLocalTags();
+    const existingTags = uniqueTags.filter((tag) => localTags.has(tag));
+    const missingTags = uniqueTags.filter((tag) => !localTags.has(tag));
+    if (missingTags.length > 0) {
+      this.logger.warn(
+        `Skip push for missing local tag(s):
+${missingTags.map((tag) => `  ${tag}`).join("\n")}`
+      );
+    }
+    if (existingTags.length === 0) {
+      this.logger.warn(
+        "No local release tags found to push after publish; skip tag push"
+      );
+      return;
+    }
     this.logger.info(
-      `Pushing ${uniqueTags.length} release tag(s) to origin:
-${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+      `Pushing ${existingTags.length} release tag(s) to origin:
+${existingTags.map((tag) => `  ${tag}`).join("\n")}`
     );
     await this.shell.exec([
       "git",
       "push",
       "origin",
-      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+      ...existingTags.map((tag) => `"refs/tags/${tag}"`)
     ]);
   }
   syncWorkspaces(workspaces) {
@@ -3331,23 +3419,33 @@ var ReleaseFormatter = class {
     if (workspaces.length === 0) {
       return "";
     }
-    if (workspaces.length === 1) {
-      return workspaces[0].changelog || "";
-    }
+    const changeTypeSection = this.getChangeTypeSection();
+    const batchTpl = this.config.batchPRBody || releaseJson.github.batchPRBody;
     return workspaces.map(
-      (workspace) => this.templateEngine.render(
-        this.config.batchPRBody || releaseJson.github.batchPRBody,
-        {
-          ...workspace,
-          // Prefer bumped version in PR changelog section headers
-          version: workspace.newVersion || workspace.version,
-          newVersion: workspace.newVersion || workspace.version
-        }
-      )
+      (workspace) => this.templateEngine.render(batchTpl, {
+        ...workspace,
+        // Prefer bumped version in PR changelog section headers
+        version: workspace.newVersion || workspace.version,
+        newVersion: workspace.newVersion || workspace.version,
+        changeTypeSection
+      })
     ).join("\n");
   }
+  /**
+   * Map semver increment to Changesets-style section title.
+   */
+  getChangeTypeSection() {
+    const increment = (this.config.increment || "patch").toLowerCase();
+    if (increment === "major") {
+      return "Major Changes";
+    }
+    if (increment === "minor") {
+      return "Minor Changes";
+    }
+    return "Patch Changes";
+  }
   formatPRTagName(workspaces, releaseBranchResult) {
-    if (workspaces.length <= 1) {
+    if (workspaces.length === 0) {
       return releaseBranchResult.releaseTagName;
     }
     return workspaces.map(
@@ -3355,7 +3453,8 @@ var ReleaseFormatter = class {
     ).join(" ");
   }
   getPRTitle(releaseBranchResult, context, workspaces = []) {
-    const prTitleTpl = this.config.PRTitle || releaseJson.github.PRTitle;
+    const count = workspaces.length;
+    const prTitleTpl = count > 2 ? this.config.PRTitleMany || this.config.PRTitle || releaseJson.github.PRTitleMany : this.config.PRTitle || releaseJson.github.PRTitle;
     return this.templateEngine.render(
       prTitleTpl,
       this.buildPRTemplateVars(workspaces, releaseBranchResult, context)
@@ -3393,7 +3492,8 @@ var Github = class extends GitBase {
       repoName: this.context.options.repoName,
       authorName: this.context.options.authorName,
       env: this.context.options.releaseEnv,
-      releaseId: this.context.releaseId
+      releaseId: this.context.releaseId,
+      increment: this.context.parameters.changesetVersion?.increment || releaseJson.changesetVersion.increment
     });
     this.logger.info(`Github mode: ${this.mode}`);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qlover/fe-release",
   "description": "A tool for releasing front-end projects, supporting multiple release modes and configurations, simplifying the release process and improving efficiency.",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "type": "module",
   "private": false,
   "homepage": "https://github.com/qlover/fe-base/tree/master/packages/fe-release",
@@ -60,9 +60,9 @@
     "p-limit": "^6.2.0",
     "semver": "^7.5.4",
     "@qlover/env-loader": "1.0.2",
-    "@qlover/fe-corekit": "3.3.0",
-    "@qlover/scripts-context": "2.3.3",
-    "@qlover/logger": "1.2.1"
+    "@qlover/fe-corekit": "3.4.4",
+    "@qlover/logger": "1.2.1",
+    "@qlover/scripts-context": "2.3.3"
   },
   "scripts": {
     "lint": "eslint src --fix",