@qlover/fe-release 5.0.2 → 5.0.5

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.2";
+var version = "5.0.5";
 
 // 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: {
@@ -1662,17 +1669,27 @@ var ChangesetVersion = class extends import_scripts_context4.ScriptPlugin {
     });
     this.context.setWorkspaces(newWorkspaces);
   }
+  printWorksapces() {
+    const workspaces = this.context.workspaces;
+    this.logger.info(
+      `ChangesetVersion Workspaces (${workspaces?.length}):
+${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
+    );
+  }
   async onSuccess() {
     if (this.mode === "publish") {
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     if (this.mode === "both") {
       await this.runVersionFlow();
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     await this.runVersionFlow();
+    this.printWorksapces();
   }
   logDryRun(message) {
     this.logger.info(`[dry-run] ${message}`);
@@ -1711,18 +1728,59 @@ var ChangesetVersion = class extends import_scripts_context4.ScriptPlugin {
     this.syncWorkspaces(this.context.workspaces ?? workspaces);
   }
   async runChangesetPublish() {
+    const workspaces = this.context.workspaces ?? [];
     if (this.context.dryRun) {
       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
+      ).map((workspace) => workspace.tagName);
+      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")}`
+      );
       return;
     }
     await this.step({
       label: "Changeset Publish",
       task: () => this.context.runChangesetsCli("publish")
     });
-    const workspaces = this.context.workspaces;
-    if (workspaces && workspaces.length > 0) {
+    if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    await this.step({
+      label: "Push Release Tags",
+      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+    });
+  }
+  /**
+   * 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`).
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const tags = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
+    ).map((workspace) => workspace.tagName);
+    const uniqueTags = [...new Set(tags)];
+    if (uniqueTags.length === 0) {
+      this.logger.warn(
+        "No workspace.tagName found after publish sync; skip tag push"
+      );
+      return;
+    }
+    this.logger.info(
+      `Pushing ${uniqueTags.length} release tag(s) to origin:
+${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+    );
+    await this.shell.exec([
+      "git",
+      "push",
+      "origin",
+      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+    ]);
   }
   syncWorkspaces(workspaces) {
     let newWorkspaces = this.mergeWorkspaces(workspaces);
@@ -1813,10 +1871,11 @@ ${lines.join("\n")}`
         dependencyReleaseOf: workspace.dependencyReleaseOf,
         lastTag: workspace.lastTag
       });
-      if (newWorkspace.newVersion && newWorkspace.newVersion !== newWorkspace.version) {
+      const releaseVersion = newWorkspace.newVersion || newWorkspace.version;
+      if (releaseVersion) {
         newWorkspace.tagName = this.generateTagName({
           ...newWorkspace,
-          version: newWorkspace.newVersion
+          version: releaseVersion
         });
       }
       return newWorkspace;
@@ -1935,7 +1994,9 @@ ${lines.join("\n")}`
   getIncrementLabels() {
     const fromConfig = this.context.parameters.workspaces?.changeLabels;
     if (Array.isArray(fromConfig) && fromConfig.length > 0) {
-      return fromConfig.filter((label) => typeof label === "string");
+      return fromConfig.filter(
+        (label) => typeof label === "string"
+      );
     }
     return this.readGithubEventLabelNames();
   }
@@ -1950,7 +2011,9 @@ ${lines.join("\n")}`
       if (!Array.isArray(labels)) {
         return [];
       }
-      return labels.map((label) => label?.name).filter((name) => typeof name === "string" && name.length > 0);
+      return labels.map((label) => label?.name).filter(
+        (name) => typeof name === "string" && name.length > 0
+      );
     } catch (error) {
       this.logger.debug("Failed to read labels from GITHUB_EVENT_PATH", error);
       return [];
@@ -3319,23 +3382,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(
@@ -3343,7 +3416,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)
@@ -3381,7 +3455,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.2";
+var version = "5.0.5";
 
 // 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: {
@@ -1642,17 +1649,27 @@ var ChangesetVersion = class extends ScriptPlugin2 {
     });
     this.context.setWorkspaces(newWorkspaces);
   }
+  printWorksapces() {
+    const workspaces = this.context.workspaces;
+    this.logger.info(
+      `ChangesetVersion Workspaces (${workspaces?.length}):
+${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
+    );
+  }
   async onSuccess() {
     if (this.mode === "publish") {
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     if (this.mode === "both") {
       await this.runVersionFlow();
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     await this.runVersionFlow();
+    this.printWorksapces();
   }
   logDryRun(message) {
     this.logger.info(`[dry-run] ${message}`);
@@ -1691,18 +1708,59 @@ var ChangesetVersion = class extends ScriptPlugin2 {
     this.syncWorkspaces(this.context.workspaces ?? workspaces);
   }
   async runChangesetPublish() {
+    const workspaces = this.context.workspaces ?? [];
     if (this.context.dryRun) {
       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
+      ).map((workspace) => workspace.tagName);
+      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")}`
+      );
       return;
     }
     await this.step({
       label: "Changeset Publish",
       task: () => this.context.runChangesetsCli("publish")
     });
-    const workspaces = this.context.workspaces;
-    if (workspaces && workspaces.length > 0) {
+    if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    await this.step({
+      label: "Push Release Tags",
+      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+    });
+  }
+  /**
+   * 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`).
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const tags = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
+    ).map((workspace) => workspace.tagName);
+    const uniqueTags = [...new Set(tags)];
+    if (uniqueTags.length === 0) {
+      this.logger.warn(
+        "No workspace.tagName found after publish sync; skip tag push"
+      );
+      return;
+    }
+    this.logger.info(
+      `Pushing ${uniqueTags.length} release tag(s) to origin:
+${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+    );
+    await this.shell.exec([
+      "git",
+      "push",
+      "origin",
+      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+    ]);
   }
   syncWorkspaces(workspaces) {
     let newWorkspaces = this.mergeWorkspaces(workspaces);
@@ -1793,10 +1851,11 @@ ${lines.join("\n")}`
         dependencyReleaseOf: workspace.dependencyReleaseOf,
         lastTag: workspace.lastTag
       });
-      if (newWorkspace.newVersion && newWorkspace.newVersion !== newWorkspace.version) {
+      const releaseVersion = newWorkspace.newVersion || newWorkspace.version;
+      if (releaseVersion) {
         newWorkspace.tagName = this.generateTagName({
           ...newWorkspace,
-          version: newWorkspace.newVersion
+          version: releaseVersion
         });
       }
       return newWorkspace;
@@ -1915,7 +1974,9 @@ ${lines.join("\n")}`
   getIncrementLabels() {
     const fromConfig = this.context.parameters.workspaces?.changeLabels;
     if (Array.isArray(fromConfig) && fromConfig.length > 0) {
-      return fromConfig.filter((label) => typeof label === "string");
+      return fromConfig.filter(
+        (label) => typeof label === "string"
+      );
     }
     return this.readGithubEventLabelNames();
   }
@@ -1930,7 +1991,9 @@ ${lines.join("\n")}`
       if (!Array.isArray(labels)) {
         return [];
       }
-      return labels.map((label) => label?.name).filter((name) => typeof name === "string" && name.length > 0);
+      return labels.map((label) => label?.name).filter(
+        (name) => typeof name === "string" && name.length > 0
+      );
     } catch (error) {
       this.logger.debug("Failed to read labels from GITHUB_EVENT_PATH", error);
       return [];
@@ -3299,23 +3362,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(
@@ -3323,7 +3396,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)
@@ -3361,7 +3435,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: {
@@ -1667,17 +1674,27 @@ var ChangesetVersion = class extends import_scripts_context4.ScriptPlugin {
     });
     this.context.setWorkspaces(newWorkspaces);
   }
+  printWorksapces() {
+    const workspaces = this.context.workspaces;
+    this.logger.info(
+      `ChangesetVersion Workspaces (${workspaces?.length}):
+${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
+    );
+  }
   async onSuccess() {
     if (this.mode === "publish") {
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     if (this.mode === "both") {
       await this.runVersionFlow();
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     await this.runVersionFlow();
+    this.printWorksapces();
   }
   logDryRun(message) {
     this.logger.info(`[dry-run] ${message}`);
@@ -1716,18 +1733,59 @@ var ChangesetVersion = class extends import_scripts_context4.ScriptPlugin {
     this.syncWorkspaces(this.context.workspaces ?? workspaces);
   }
   async runChangesetPublish() {
+    const workspaces = this.context.workspaces ?? [];
     if (this.context.dryRun) {
       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
+      ).map((workspace) => workspace.tagName);
+      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")}`
+      );
       return;
     }
     await this.step({
       label: "Changeset Publish",
       task: () => this.context.runChangesetsCli("publish")
     });
-    const workspaces = this.context.workspaces;
-    if (workspaces && workspaces.length > 0) {
+    if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    await this.step({
+      label: "Push Release Tags",
+      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+    });
+  }
+  /**
+   * 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`).
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const tags = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
+    ).map((workspace) => workspace.tagName);
+    const uniqueTags = [...new Set(tags)];
+    if (uniqueTags.length === 0) {
+      this.logger.warn(
+        "No workspace.tagName found after publish sync; skip tag push"
+      );
+      return;
+    }
+    this.logger.info(
+      `Pushing ${uniqueTags.length} release tag(s) to origin:
+${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+    );
+    await this.shell.exec([
+      "git",
+      "push",
+      "origin",
+      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+    ]);
   }
   syncWorkspaces(workspaces) {
     let newWorkspaces = this.mergeWorkspaces(workspaces);
@@ -1818,10 +1876,11 @@ ${lines.join("\n")}`
         dependencyReleaseOf: workspace.dependencyReleaseOf,
         lastTag: workspace.lastTag
       });
-      if (newWorkspace.newVersion && newWorkspace.newVersion !== newWorkspace.version) {
+      const releaseVersion = newWorkspace.newVersion || newWorkspace.version;
+      if (releaseVersion) {
         newWorkspace.tagName = this.generateTagName({
           ...newWorkspace,
-          version: newWorkspace.newVersion
+          version: releaseVersion
         });
       }
       return newWorkspace;
@@ -1940,7 +1999,9 @@ ${lines.join("\n")}`
   getIncrementLabels() {
     const fromConfig = this.context.parameters.workspaces?.changeLabels;
     if (Array.isArray(fromConfig) && fromConfig.length > 0) {
-      return fromConfig.filter((label) => typeof label === "string");
+      return fromConfig.filter(
+        (label) => typeof label === "string"
+      );
     }
     return this.readGithubEventLabelNames();
   }
@@ -1955,7 +2016,9 @@ ${lines.join("\n")}`
       if (!Array.isArray(labels)) {
         return [];
       }
-      return labels.map((label) => label?.name).filter((name) => typeof name === "string" && name.length > 0);
+      return labels.map((label) => label?.name).filter(
+        (name) => typeof name === "string" && name.length > 0
+      );
     } catch (error) {
       this.logger.debug("Failed to read labels from GITHUB_EVENT_PATH", error);
       return [];
@@ -3324,23 +3387,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(
@@ -3348,7 +3421,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)
@@ -3386,7 +3460,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;
 }
 
 /**
@@ -839,6 +855,11 @@ interface ChangeLogInterface {
  *   when `ignoreNonUpdatedPackages` is enabled)
  * - **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)
+ * 2. Sync workspaces from disk so `tagName` is set from the release version
+ * 3. Push `workspace.tagName` refs to `origin`
+ *
  * Version flow (`mode: 'version'` or first half of `'both'`):
  * 1. Write `.changeset/*.md` files for directly changed packages only
  * 2. Run `changeset version` (optionally with `changelog: false` when `onlyVersion`)
@@ -966,10 +987,18 @@ declare class ChangesetVersion extends ScriptPlugin<ReleaseContext, ChangesetVer
      */
     protected validateNpmToken(): Promise<void>;
     onExec(_context: ReleaseContext): Promise<void>;
+    protected printWorksapces(): void;
     onSuccess(): Promise<void>;
     protected logDryRun(message: string): void;
     protected runVersionFlow(): Promise<void>;
     protected runChangesetPublish(): 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`).
+     */
+    protected pushWorkspaceReleaseTags(workspaces: WorkspaceInterface[]): Promise<void>;
     protected syncWorkspaces(workspaces: WorkspaceInterface[]): void;
     /**
      * Rebuild `dependencyRelease` changelogs after source packages have `newVersion`.
@@ -1402,16 +1431,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: {
@@ -1618,17 +1625,27 @@ var ChangesetVersion = class extends ScriptPlugin2 {
     });
     this.context.setWorkspaces(newWorkspaces);
   }
+  printWorksapces() {
+    const workspaces = this.context.workspaces;
+    this.logger.info(
+      `ChangesetVersion Workspaces (${workspaces?.length}):
+${workspaces?.map((workspace) => workspace.toString()).join("\n")}`
+    );
+  }
   async onSuccess() {
     if (this.mode === "publish") {
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     if (this.mode === "both") {
       await this.runVersionFlow();
       await this.runChangesetPublish();
+      this.printWorksapces();
       return;
     }
     await this.runVersionFlow();
+    this.printWorksapces();
   }
   logDryRun(message) {
     this.logger.info(`[dry-run] ${message}`);
@@ -1667,18 +1684,59 @@ var ChangesetVersion = class extends ScriptPlugin2 {
     this.syncWorkspaces(this.context.workspaces ?? workspaces);
   }
   async runChangesetPublish() {
+    const workspaces = this.context.workspaces ?? [];
     if (this.context.dryRun) {
       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
+      ).map((workspace) => workspace.tagName);
+      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")}`
+      );
       return;
     }
     await this.step({
       label: "Changeset Publish",
       task: () => this.context.runChangesetsCli("publish")
     });
-    const workspaces = this.context.workspaces;
-    if (workspaces && workspaces.length > 0) {
+    if (workspaces.length > 0) {
       this.syncWorkspaces(workspaces);
     }
+    await this.step({
+      label: "Push Release Tags",
+      task: () => this.pushWorkspaceReleaseTags(this.context.workspaces ?? workspaces)
+    });
+  }
+  /**
+   * 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`).
+   */
+  async pushWorkspaceReleaseTags(workspaces) {
+    const tags = workspaces.filter(
+      (workspace) => this.shouldProcessWorkspace(workspace) && !workspace.dependencyRelease && !!workspace.tagName
+    ).map((workspace) => workspace.tagName);
+    const uniqueTags = [...new Set(tags)];
+    if (uniqueTags.length === 0) {
+      this.logger.warn(
+        "No workspace.tagName found after publish sync; skip tag push"
+      );
+      return;
+    }
+    this.logger.info(
+      `Pushing ${uniqueTags.length} release tag(s) to origin:
+${uniqueTags.map((tag) => `  ${tag}`).join("\n")}`
+    );
+    await this.shell.exec([
+      "git",
+      "push",
+      "origin",
+      ...uniqueTags.map((tag) => `"refs/tags/${tag}"`)
+    ]);
   }
   syncWorkspaces(workspaces) {
     let newWorkspaces = this.mergeWorkspaces(workspaces);
@@ -1769,10 +1827,11 @@ ${lines.join("\n")}`
         dependencyReleaseOf: workspace.dependencyReleaseOf,
         lastTag: workspace.lastTag
       });
-      if (newWorkspace.newVersion && newWorkspace.newVersion !== newWorkspace.version) {
+      const releaseVersion = newWorkspace.newVersion || newWorkspace.version;
+      if (releaseVersion) {
         newWorkspace.tagName = this.generateTagName({
           ...newWorkspace,
-          version: newWorkspace.newVersion
+          version: releaseVersion
         });
       }
       return newWorkspace;
@@ -1891,7 +1950,9 @@ ${lines.join("\n")}`
   getIncrementLabels() {
     const fromConfig = this.context.parameters.workspaces?.changeLabels;
     if (Array.isArray(fromConfig) && fromConfig.length > 0) {
-      return fromConfig.filter((label) => typeof label === "string");
+      return fromConfig.filter(
+        (label) => typeof label === "string"
+      );
     }
     return this.readGithubEventLabelNames();
   }
@@ -1906,7 +1967,9 @@ ${lines.join("\n")}`
       if (!Array.isArray(labels)) {
         return [];
       }
-      return labels.map((label) => label?.name).filter((name) => typeof name === "string" && name.length > 0);
+      return labels.map((label) => label?.name).filter(
+        (name) => typeof name === "string" && name.length > 0
+      );
     } catch (error) {
       this.logger.debug("Failed to read labels from GITHUB_EVENT_PATH", error);
       return [];
@@ -3275,23 +3338,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(
@@ -3299,7 +3372,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)
@@ -3337,7 +3411,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.2",
+  "version": "5.0.5",
   "type": "module",
   "private": false,
   "homepage": "https://github.com/qlover/fe-base/tree/master/packages/fe-release",