@zjex/git-workflow 0.2.9 → 0.2.11

package/README.md

@@ -1,10 +1,12 @@
 # @zjex/git-workflow
 
 <p align="center">
-  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/v/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm version"></a>
-  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/dm/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="npm downloads"></a>
-  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/l/@zjex/git-workflow.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="license"></a>
-  <img src="https://img.shields.io/badge/node-%3E%3D18-28CF8D?style=flat&colorA=18181B" alt="node version">
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/v/@zjex/git-workflow?style=flat&colorA=18181B&colorB=F0DB4F" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/@zjex/git-workflow"><img src="https://img.shields.io/npm/dt/@zjex/git-workflow?style=flat&colorA=18181B&colorB=3178C6" alt="npm downloads"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow"><img src="https://img.shields.io/github/stars/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=F59E0B" alt="github stars"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/@zjex/git-workflow?style=flat&colorA=18181B&colorB=10B981" alt="license"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D18-339933?style=flat&logo=node.js&logoColor=white&colorA=18181B" alt="node version"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow/issues"><img src="https://img.shields.io/github/issues/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=EC4899" alt="issues"></a>
 </p>
 
 <p align="center">

package/dist/index.js

@@ -635,6 +635,130 @@ function doCreateTag(tagName) {
     );
   }
 }
+async function deleteTag() {
+  const fetchSpinner = ora2("\u6B63\u5728\u83B7\u53D6 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+  const tags = execOutput("git tag -l --sort=-v:refname").split("\n").filter(Boolean);
+  if (tags.length === 0) {
+    console.log(colors.yellow("\u6CA1\u6709\u53EF\u5220\u9664\u7684 tag"));
+    return;
+  }
+  divider();
+  const choices = tags.map((tag) => ({ name: tag, value: tag }));
+  choices.push({ name: "\u53D6\u6D88", value: "__cancel__" });
+  const tagToDelete = await select2({
+    message: "\u9009\u62E9\u8981\u5220\u9664\u7684 tag:",
+    choices,
+    theme
+  });
+  if (tagToDelete === "__cancel__") {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  const confirm = await select2({
+    message: `\u786E\u8BA4\u5220\u9664 tag: ${colors.red(tagToDelete)}?`,
+    choices: [
+      { name: "\u662F", value: true },
+      { name: "\u5426", value: false }
+    ],
+    theme
+  });
+  if (!confirm) {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  divider();
+  const spinner = ora2(`\u6B63\u5728\u5220\u9664\u672C\u5730 tag: ${tagToDelete}`).start();
+  try {
+    execSync3(`git tag -d "${tagToDelete}"`, { stdio: "pipe" });
+    spinner.succeed(`\u672C\u5730 tag \u5DF2\u5220\u9664: ${tagToDelete}`);
+  } catch {
+    spinner.fail("\u672C\u5730 tag \u5220\u9664\u5931\u8D25");
+    return;
+  }
+  const deleteRemote = await select2({
+    message: "\u662F\u5426\u540C\u65F6\u5220\u9664\u8FDC\u7A0B tag?",
+    choices: [
+      { name: "\u662F", value: true },
+      { name: "\u5426", value: false }
+    ],
+    theme
+  });
+  if (deleteRemote) {
+    const pushSpinner = ora2("\u6B63\u5728\u5220\u9664\u8FDC\u7A0B tag...").start();
+    try {
+      execSync3(`git push origin --delete "${tagToDelete}"`, { stdio: "pipe" });
+      pushSpinner.succeed(`\u8FDC\u7A0B tag \u5DF2\u5220\u9664: ${tagToDelete}`);
+    } catch {
+      pushSpinner.warn(
+        `\u8FDC\u7A0B\u5220\u9664\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin --delete ${tagToDelete}`
+      );
+    }
+  }
+}
+async function updateTag() {
+  const fetchSpinner = ora2("\u6B63\u5728\u83B7\u53D6 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+  const tags = execOutput("git tag -l --sort=-v:refname").split("\n").filter(Boolean);
+  if (tags.length === 0) {
+    console.log(colors.yellow("\u6CA1\u6709\u53EF\u4FEE\u6539\u7684 tag"));
+    return;
+  }
+  divider();
+  const choices = tags.map((tag) => ({ name: tag, value: tag }));
+  choices.push({ name: "\u53D6\u6D88", value: "__cancel__" });
+  const tagToUpdate = await select2({
+    message: "\u9009\u62E9\u8981\u4FEE\u6539\u7684 tag:",
+    choices,
+    theme
+  });
+  if (tagToUpdate === "__cancel__") {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  const newMessage = await input2({
+    message: "\u8F93\u5165\u65B0\u7684 tag \u6D88\u606F:",
+    default: `Release ${tagToUpdate}`,
+    theme
+  });
+  if (!newMessage) {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  divider();
+  const spinner = ora2(`\u6B63\u5728\u66F4\u65B0 tag: ${tagToUpdate}`).start();
+  try {
+    execSync3(`git tag -d "${tagToUpdate}"`, { stdio: "pipe" });
+    execSync3(`git tag -a "${tagToUpdate}" -m "${newMessage}"`, {
+      stdio: "pipe"
+    });
+    spinner.succeed(`Tag \u5DF2\u66F4\u65B0: ${tagToUpdate}`);
+  } catch {
+    spinner.fail("tag \u66F4\u65B0\u5931\u8D25");
+    return;
+  }
+  const pushRemote = await select2({
+    message: "\u662F\u5426\u63A8\u9001\u5230\u8FDC\u7A0B\uFF08\u4F1A\u5F3A\u5236\u8986\u76D6\uFF09?",
+    choices: [
+      { name: "\u662F", value: true },
+      { name: "\u5426", value: false }
+    ],
+    theme
+  });
+  if (pushRemote) {
+    const pushSpinner = ora2("\u6B63\u5728\u63A8\u9001\u5230\u8FDC\u7A0B...").start();
+    try {
+      execSync3(`git push origin "${tagToUpdate}" --force`, { stdio: "pipe" });
+      pushSpinner.succeed(`Tag \u5DF2\u63A8\u9001: ${tagToUpdate}`);
+    } catch {
+      pushSpinner.warn(
+        `\u8FDC\u7A0B\u63A8\u9001\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin ${tagToUpdate} --force`
+      );
+    }
+  }
+}
 
 // src/commands/release.ts
 import { readFileSync as readFileSync2, writeFileSync } from "fs";
@@ -1741,6 +1865,12 @@ Tag \u547D\u4EE4:
   gw tag [prefix]                 \u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u7C7B\u578B\u5E76\u521B\u5EFA tag
   gw t [prefix]                   \u540C\u4E0A (\u522B\u540D)
 
+  gw tag:delete                   \u5220\u9664 tag
+  gw td                           \u540C\u4E0A (\u522B\u540D)
+
+  gw tag:update                   \u4FEE\u6539 tag \u6D88\u606F
+  gw tu                           \u540C\u4E0A (\u522B\u540D)
+
 \u53D1\u5E03\u547D\u4EE4:
   gw release                      \u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u53F7\u5E76\u66F4\u65B0 package.json
   gw r                            \u540C\u4E0A (\u522B\u540D)
@@ -1766,6 +1896,8 @@ Commit \u547D\u4EE4:
   gw d feature/xxx                \u76F4\u63A5\u5220\u9664\u6307\u5B9A\u5206\u652F
   gw ts v                         \u5217\u51FA\u6240\u6709 v \u5F00\u5934\u7684 tag
   gw t                            \u4EA4\u4E92\u5F0F\u521B\u5EFA tag
+  gw td                           \u4EA4\u4E92\u5F0F\u5220\u9664 tag
+  gw tu                           \u4EA4\u4E92\u5F0F\u4FEE\u6539 tag
   gw r                            \u4EA4\u4E92\u5F0F\u53D1\u5E03\u7248\u672C
   gw s                            \u4EA4\u4E92\u5F0F\u7BA1\u7406 stash
   gw c                            \u4EA4\u4E92\u5F0F\u63D0\u4EA4\u4EE3\u7801
@@ -1963,9 +2095,8 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.9" : "0.0.0-dev";
+var version = true ? "0.2.11" : "0.0.0-dev";
 async function mainMenu() {
-  await checkForUpdates(version, "@zjex/git-workflow");
   console.log(
     colors.green(`
  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557     \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557
@@ -2002,19 +2133,27 @@ async function mainMenu() {
         value: "tag"
       },
       {
-        name: `[6] \u{1F4CB} \u5217\u51FA tags              ${colors.dim("gw ts")}`,
+        name: `[6] \u{1F5D1}\uFE0F  \u5220\u9664 tag               ${colors.dim("gw td")}`,
+        value: "tag-delete"
+      },
+      {
+        name: `[7] \u270F\uFE0F  \u4FEE\u6539 tag               ${colors.dim("gw tu")}`,
+        value: "tag-update"
+      },
+      {
+        name: `[8] \u{1F4CB} \u5217\u51FA tags              ${colors.dim("gw ts")}`,
         value: "tags"
       },
       {
-        name: `[7] \u{1F4E6} \u53D1\u5E03\u7248\u672C               ${colors.dim("gw r")}`,
+        name: `[9] \u{1F4E6} \u53D1\u5E03\u7248\u672C               ${colors.dim("gw r")}`,
         value: "release"
       },
       {
-        name: `[8] \u{1F4BE} \u7BA1\u7406 stash             ${colors.dim("gw s")}`,
+        name: `[a] \u{1F4BE} \u7BA1\u7406 stash             ${colors.dim("gw s")}`,
         value: "stash"
       },
       {
-        name: `[9] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
+        name: `[b] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
         value: "init"
       },
       { name: "[0] \u2753 \u5E2E\u52A9", value: "help" },
@@ -2040,6 +2179,14 @@ async function mainMenu() {
       checkGitRepo();
       await createTag();
       break;
+    case "tag-delete":
+      checkGitRepo();
+      await deleteTag();
+      break;
+    case "tag-update":
+      checkGitRepo();
+      await updateTag();
+      break;
     case "tags":
       checkGitRepo();
       await listTags();
@@ -2066,40 +2213,60 @@ async function mainMenu() {
   }
 }
 var cli = cac("gw");
-cli.command("", "\u663E\u793A\u4EA4\u4E92\u5F0F\u83DC\u5355").action(() => {
+cli.command("", "\u663E\u793A\u4EA4\u4E92\u5F0F\u83DC\u5355").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   return mainMenu();
 });
-cli.command("feature", "\u521B\u5EFA feature \u5206\u652F").alias("feat").alias("f").option("--base <branch>", "\u6307\u5B9A\u57FA\u7840\u5206\u652F").action((options) => {
+cli.command("feature", "\u521B\u5EFA feature \u5206\u652F").alias("feat").alias("f").option("--base <branch>", "\u6307\u5B9A\u57FA\u7840\u5206\u652F").action(async (options) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return createBranch("feature", options.base);
 });
-cli.command("hotfix", "\u521B\u5EFA hotfix \u5206\u652F").alias("fix").alias("h").option("--base <branch>", "\u6307\u5B9A\u57FA\u7840\u5206\u652F").action((options) => {
+cli.command("hotfix", "\u521B\u5EFA hotfix \u5206\u652F").alias("fix").alias("h").option("--base <branch>", "\u6307\u5B9A\u57FA\u7840\u5206\u652F").action(async (options) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return createBranch("hotfix", options.base);
 });
-cli.command("delete [branch]", "\u5220\u9664\u672C\u5730/\u8FDC\u7A0B\u5206\u652F").alias("del").alias("d").action((branch) => {
+cli.command("delete [branch]", "\u5220\u9664\u672C\u5730/\u8FDC\u7A0B\u5206\u652F").alias("del").alias("d").action(async (branch) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return deleteBranch(branch);
 });
-cli.command("tags [prefix]", "\u5217\u51FA\u6240\u6709 tag\uFF0C\u53EF\u6309\u524D\u7F00\u8FC7\u6EE4").alias("ts").action((prefix) => {
+cli.command("tags [prefix]", "\u5217\u51FA\u6240\u6709 tag\uFF0C\u53EF\u6309\u524D\u7F00\u8FC7\u6EE4").alias("ts").action(async (prefix) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return listTags(prefix);
 });
-cli.command("tag [prefix]", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u7C7B\u578B\u5E76\u521B\u5EFA tag").alias("t").action((prefix) => {
+cli.command("tag [prefix]", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u7C7B\u578B\u5E76\u521B\u5EFA tag").alias("t").action(async (prefix) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return createTag(prefix);
 });
-cli.command("release", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u53F7\u5E76\u66F4\u65B0 package.json").alias("r").action(() => {
+cli.command("tag:delete", "\u5220\u9664 tag").alias("td").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  return deleteTag();
+});
+cli.command("tag:update", "\u4FEE\u6539 tag \u6D88\u606F").alias("tu").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  return updateTag();
+});
+cli.command("release", "\u4EA4\u4E92\u5F0F\u9009\u62E9\u7248\u672C\u53F7\u5E76\u66F4\u65B0 package.json").alias("r").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   return release();
 });
-cli.command("init", "\u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6 .gwrc.json").action(() => {
+cli.command("init", "\u521D\u59CB\u5316\u914D\u7F6E\u6587\u4EF6 .gwrc.json").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   return init();
 });
-cli.command("stash", "\u4EA4\u4E92\u5F0F\u7BA1\u7406 stash").alias("s").alias("st").action(() => {
+cli.command("stash", "\u4EA4\u4E92\u5F0F\u7BA1\u7406 stash").alias("s").alias("st").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return stash();
 });
-cli.command("commit", "\u4EA4\u4E92\u5F0F\u63D0\u4EA4 (Conventional Commits + Gitmoji)").alias("c").alias("cm").action(() => {
+cli.command("commit", "\u4EA4\u4E92\u5F0F\u63D0\u4EA4 (Conventional Commits + Gitmoji)").alias("c").alias("cm").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   checkGitRepo();
   return commit();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.9",
+	"version": "0.2.11",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {
@@ -17,7 +17,7 @@
 		"version": "node scripts/version.js",
 		"release": "./scripts/release.sh",
 		"release:dry": "./scripts/release.sh --dry-run",
-		"publish:npm": "./scripts/publish.sh",
+		"publish:npm": "node scripts/publish.js",
 		"prepublishOnly": "npm run build",
 		"prepare": "husky"
 	},
@@ -52,4 +52,4 @@
 		"tsx": "^4.21.0",
 		"typescript": "^5.9.3"
 	}
-}
+}

package/scripts/publish.js

@@ -0,0 +1,274 @@
+#!/usr/bin/env node
+
+import { execSync } from "child_process";
+import { readFileSync } from "fs";
+import ora from "ora";
+import boxen from "boxen";
+
+const colors = {
+  blue: (str) => `\x1b[34m${str}\x1b[0m`,
+  green: (str) => `\x1b[32m${str}\x1b[0m`,
+  red: (str) => `\x1b[31m${str}\x1b[0m`,
+  yellow: (str) => `\x1b[33m${str}\x1b[0m`,
+  cyan: (str) => `\x1b[36m${str}\x1b[0m`,
+  dim: (str) => `\x1b[2m${str}\x1b[0m`,
+  bold: (str) => `\x1b[1m${str}\x1b[0m`,
+};
+
+const TOTAL_STEPS = 11;
+
+function exec(command, silent = false) {
+  try {
+    return execSync(command, {
+      encoding: "utf-8",
+      stdio: silent ? "pipe" : "inherit",
+    });
+  } catch (error) {
+    if (!silent) throw error;
+    return null;
+  }
+}
+
+function runStep(stepNum, stepName, command) {
+  const spinner = ora({
+    text: `${colors.blue(`[${stepNum}/${TOTAL_STEPS}]`)} ${stepName}...`,
+    spinner: "dots",
+  }).start();
+
+  try {
+    execSync(command, { encoding: "utf-8", stdio: "pipe" });
+    spinner.succeed(
+      `${colors.blue(`[${stepNum}/${TOTAL_STEPS}]`)} ${stepName}`
+    );
+    return true;
+  } catch (error) {
+    spinner.fail(`${colors.blue(`[${stepNum}/${TOTAL_STEPS}]`)} ${stepName}`);
+    console.log("");
+    console.log(colors.red("错误详情:"));
+    console.log(error.stdout || error.message);
+    return false;
+  }
+}
+
+async function main() {
+  console.log("");
+  console.log(colors.bold("🚀 开始发布流程"));
+  console.log("");
+
+  // [1] 检查 Git 仓库
+  if (!runStep(1, "检查 Git 仓库", "git rev-parse --git-dir")) {
+    console.log(colors.red("✖ 当前目录不是 git 仓库"));
+    process.exit(1);
+  }
+
+  // [2] 检查工作区状态
+  const spinner2 = ora({
+    text: `${colors.blue("[2/11]")} 检查工作区状态...`,
+    spinner: "dots",
+  }).start();
+
+  const status = exec("git status --porcelain", true);
+  if (status && status.trim()) {
+    spinner2.fail(`${colors.blue("[2/11]")} 检查工作区状态`);
+    console.log("");
+    console.log(colors.red("✖ 检测到未提交的更改，请先提交后再发布"));
+    console.log("");
+    console.log(status);
+    console.log("");
+    console.log(colors.cyan("💡 提示: 可以使用 'gw c' 提交更改"));
+    process.exit(1);
+  }
+  spinner2.succeed(`${colors.blue("[2/11]")} 检查工作区状态`);
+
+  // [3] 检查 npm 登录状态
+  const spinner3 = ora({
+    text: `${colors.blue("[3/11]")} 检查 npm 登录状态...`,
+    spinner: "dots",
+  }).start();
+
+  const npmUser = exec("npm whoami", true);
+  if (!npmUser) {
+    spinner3.fail(`${colors.blue("[3/11]")} 检查 npm 登录状态`);
+    console.log(colors.red("✖ 未登录 npm，请先执行: npm login"));
+    process.exit(1);
+  }
+  spinner3.succeed(
+    `${colors.blue("[3/11]")} 检查 npm 登录状态 ${colors.dim(
+      `(${npmUser.trim()})`
+    )}`
+  );
+
+  // 获取当前分支
+  const currentBranch = exec("git branch --show-current", true).trim();
+
+  // [4] 拉取最新代码
+  if (!runStep(4, "拉取最新代码", `git pull origin ${currentBranch}`)) {
+    process.exit(1);
+  }
+
+  // 获取当前版本
+  const pkg = JSON.parse(readFileSync("./package.json", "utf-8"));
+  const currentVersion = pkg.version;
+
+  // [5] 选择新版本号
+  console.log(`${colors.blue("[5/11]")} 选择新版本号...`);
+  console.log("");
+
+  try {
+    execSync("npm run version", { stdio: "inherit" });
+  } catch (error) {
+    console.log("");
+    console.log(colors.yellow("已取消发布"));
+    process.exit(0);
+  }
+
+  // 获取新版本
+  const newPkg = JSON.parse(readFileSync("./package.json", "utf-8"));
+  const newVersion = newPkg.version;
+
+  if (newVersion === currentVersion) {
+    console.log(colors.cyan("版本号未更改，已取消发布"));
+    process.exit(0);
+  }
+
+  // 清除上面的输出，重新显示步骤5
+  process.stdout.write("\x1b[2A"); // 向上移动2行
+  process.stdout.write("\x1b[0J"); // 清除从光标到屏幕底部
+
+  console.log(
+    `${colors.blue("[5/11]")} 选择新版本号... ${colors.green(
+      "✅"
+    )} ${colors.dim(`(${currentVersion} → ${newVersion})`)}`
+  );
+
+  // [6] 构建项目
+  if (!runStep(6, "构建项目", "npm run build")) {
+    process.exit(1);
+  }
+
+  // [7] 生成 CHANGELOG
+  if (!runStep(7, "生成 CHANGELOG", "npm run changelog")) {
+    process.exit(1);
+  }
+
+  // [8] 提交版本更新
+  const spinner8 = ora({
+    text: `${colors.blue("[8/11]")} 提交版本更新...`,
+    spinner: "dots",
+  }).start();
+
+  try {
+    execSync("git add package.json CHANGELOG.md", { stdio: "pipe" });
+    execSync(`git commit -m "🔖 chore(release): 发布 v${newVersion}"`, {
+      stdio: "pipe",
+    });
+    spinner8.succeed(
+      `${colors.blue("[8/11]")} 提交版本更新 ${colors.dim(
+        `(🔖 chore(release): 发布 v${newVersion})`
+      )}`
+    );
+  } catch (error) {
+    spinner8.fail(`${colors.blue("[8/11]")} 提交版本更新`);
+    console.log("");
+    console.log(colors.red("错误详情:"));
+    console.log(error.message);
+    process.exit(1);
+  }
+
+  // [9] 创建 Git Tag
+  const spinner9 = ora({
+    text: `${colors.blue("[9/11]")} 创建 Git Tag...`,
+    spinner: "dots",
+  }).start();
+
+  try {
+    execSync(`git tag -a "v${newVersion}" -m "Release v${newVersion}"`, {
+      stdio: "pipe",
+    });
+    spinner9.succeed(
+      `${colors.blue("[9/11]")} 创建 Git Tag ${colors.dim(`(v${newVersion})`)}`
+    );
+  } catch (error) {
+    spinner9.fail(`${colors.blue("[9/11]")} 创建 Git Tag`);
+    console.log("");
+    console.log(colors.red("错误详情:"));
+    console.log(error.message);
+    process.exit(1);
+  }
+
+  // [10] 推送到远程仓库
+  const spinner10 = ora({
+    text: `${colors.blue("[10/11]")} 推送到远程仓库...`,
+    spinner: "dots",
+  }).start();
+
+  try {
+    execSync(`git push origin ${currentBranch}`, { stdio: "pipe" });
+    execSync(`git push origin v${newVersion}`, { stdio: "pipe" });
+    spinner10.succeed(
+      `${colors.blue("[10/11]")} 推送到远程仓库 ${colors.dim(
+        `(${currentBranch}, v${newVersion})`
+      )}`
+    );
+  } catch (error) {
+    spinner10.fail(`${colors.blue("[10/11]")} 推送到远程仓库`);
+    console.log("");
+    console.log(colors.red("错误详情:"));
+    console.log(error.message);
+    process.exit(1);
+  }
+
+  // [11] 发布到 npm
+  console.log(`${colors.blue("[11/11]")} 发布到 npm...`);
+  console.log("");
+
+  try {
+    execSync("npm publish", { stdio: "inherit" });
+    console.log("");
+    console.log(
+      `${colors.blue("[11/11]")} 发布到 npm... ${colors.green("✅")}`
+    );
+  } catch (error) {
+    console.log("");
+    console.log(`${colors.blue("[11/11]")} 发布到 npm... ${colors.red("❌")}`);
+    process.exit(1);
+  }
+
+  // 成功总结
+  console.log("");
+  console.log(
+    boxen(
+      [
+        colors.bold("🎉 发布成功！"),
+        "",
+        `${colors.cyan("版本:")} ${colors.bold(`v${newVersion}`)}`,
+      ].join("\n"),
+      {
+        padding: { top: 1, bottom: 1, left: 8, right: 8 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "green",
+        align: "center",
+      }
+    )
+  );
+
+  console.log(
+    `  ${colors.dim("🔗")} ${colors.cyan("GitHub:")} ${colors.dim(
+      "\x1b[4mhttps://github.com/iamzjt-front-end/git-workflow/releases/tag/v" +
+        newVersion +
+        "\x1b[0m"
+    )}`
+  );
+  console.log(
+    `  ${colors.dim("📦")} ${colors.cyan("npm:")} ${colors.dim(
+      "\x1b[4mhttps://www.npmjs.com/package/@zjex/git-workflow\x1b[0m"
+    )}`
+  );
+  console.log("");
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});

package/scripts/publish.sh

@@ -25,20 +25,46 @@ print_dim() {
   echo -e "${DIM}  ${1}${NC}"
 }
 
-# 执行步骤（带完成标记，折叠输出）
+# 执行步骤（带 loading 动画和完成标记，折叠输出）
 run_step() {
   local step_num=$1
   local step_name=$2
   local command=$3
   
+  # 显示初始状态
   echo -ne "${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}... "
   
-  # 执行命令并捕获输出
-  if output=$(eval "$command" 2>&1); then
-    echo -e "${GREEN}✅${NC}"
+  # 创建临时文件存储输出
+  local tmp_output=$(mktemp)
+  local tmp_status=$(mktemp)
+  
+  # 在后台执行命令
+  (eval "$command" > "$tmp_output" 2>&1; echo $? > "$tmp_status") &
+  local pid=$!
+  
+  # 显示 loading 动画
+  local spin='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
+  local i=0
+  
+  while kill -0 $pid 2>/dev/null; do
+    i=$(( (i+1) % 10 ))
+    printf "\r${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}... ${spin:$i:1} "
+    sleep 0.1
+  done
+  
+  wait $pid
+  local exit_code=$(cat "$tmp_status")
+  local output=$(cat "$tmp_output")
+  
+  # 清理临时文件
+  rm -f "$tmp_output" "$tmp_status"
+  
+  # 显示结果
+  if [ "$exit_code" -eq 0 ]; then
+    printf "\r${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}... ${GREEN}✅${NC}\n"
     return 0
   else
-    echo -e "${RED}❌${NC}"
+    printf "\r${BLUE}[${step_num}/${TOTAL_STEPS}]${NC} ${step_name}... ${RED}❌${NC}\n"
     echo ""
     echo -e "${RED}错误详情:${NC}"
     echo "$output"
@@ -115,7 +141,14 @@ fi
 CURRENT_VERSION=$(node -p "require('./package.json').version")
 
 # [5] 交互式选择版本号
-run_step_interactive "5" "选择新版本号" "npm run version"
+echo -e "${BLUE}[5/${TOTAL_STEPS}]${NC} 选择新版本号..."
+echo ""
+
+# 记录当前光标位置
+tput sc
+
+# 执行版本选择
+npm run version
 
 # 获取新版本
 NEW_VERSION=$(node -p "require('./package.json').version")
@@ -125,8 +158,12 @@ if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
   exit 0
 fi
 
-# 显示版本升级信息
-echo -e "${GREEN}    ✅${NC} ${DIM}(${CURRENT_VERSION} → ${NEW_VERSION})${NC}"
+# 恢复光标位置并清除后续内容
+tput rc
+tput ed
+
+# 显示步骤5完成，带版本信息
+echo -e "${BLUE}[5/${TOTAL_STEPS}]${NC} 选择新版本号... ${GREEN}✅${NC} ${DIM}(${CURRENT_VERSION} → ${NEW_VERSION})${NC}"
 
 # [6] 构建项目
 if ! run_step "6" "构建项目" "npm run build"; then
@@ -175,7 +212,16 @@ else
 fi
 
 # [11] 发布到 npm
-if ! run_step "11" "发布到 npm" "npm publish"; then
+echo -e "${BLUE}[11/${TOTAL_STEPS}]${NC} 发布到 npm..."
+echo ""
+
+# 执行发布（保持交互式，允许 OTP 输入）
+if npm publish; then
+  echo ""
+  echo -e "${BLUE}[11/${TOTAL_STEPS}]${NC} 发布到 npm... ${GREEN}✅${NC}"
+else
+  echo ""
+  echo -e "${BLUE}[11/${TOTAL_STEPS}]${NC} 发布到 npm... ${RED}❌${NC}"
   exit 1
 fi
 

package/src/commands/help.ts

@@ -22,6 +22,12 @@ Tag 命令:
   gw tag [prefix]                 交互式选择版本类型并创建 tag
   gw t [prefix]                   同上 (别名)
 
+  gw tag:delete                   删除 tag
+  gw td                           同上 (别名)
+
+  gw tag:update                   修改 tag 消息
+  gw tu                           同上 (别名)
+
 发布命令:
   gw release                      交互式选择版本号并更新 package.json
   gw r                            同上 (别名)
@@ -47,6 +53,8 @@ Commit 命令:
   gw d feature/xxx                直接删除指定分支
   gw ts v                         列出所有 v 开头的 tag
   gw t                            交互式创建 tag
+  gw td                           交互式删除 tag
+  gw tu                           交互式修改 tag
   gw r                            交互式发布版本
   gw s                            交互式管理 stash
   gw c                            交互式提交代码

package/src/commands/tag.ts

@@ -334,3 +334,167 @@ function doCreateTag(tagName: string): void {
     );
   }
 }
+
+/**
+ * 删除 tag
+ */
+export async function deleteTag(): Promise<void> {
+  const fetchSpinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+
+  const tags = execOutput("git tag -l --sort=-v:refname")
+    .split("\n")
+    .filter(Boolean);
+
+  if (tags.length === 0) {
+    console.log(colors.yellow("没有可删除的 tag"));
+    return;
+  }
+
+  divider();
+
+  const choices = tags.map((tag) => ({ name: tag, value: tag }));
+  choices.push({ name: "取消", value: "__cancel__" });
+
+  const tagToDelete = await select({
+    message: "选择要删除的 tag:",
+    choices,
+    theme,
+  });
+
+  if (tagToDelete === "__cancel__") {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  const confirm = await select({
+    message: `确认删除 tag: ${colors.red(tagToDelete)}?`,
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (!confirm) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  divider();
+
+  const spinner = ora(`正在删除本地 tag: ${tagToDelete}`).start();
+
+  try {
+    execSync(`git tag -d "${tagToDelete}"`, { stdio: "pipe" });
+    spinner.succeed(`本地 tag 已删除: ${tagToDelete}`);
+  } catch {
+    spinner.fail("本地 tag 删除失败");
+    return;
+  }
+
+  const deleteRemote = await select({
+    message: "是否同时删除远程 tag?",
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (deleteRemote) {
+    const pushSpinner = ora("正在删除远程 tag...").start();
+    try {
+      execSync(`git push origin --delete "${tagToDelete}"`, { stdio: "pipe" });
+      pushSpinner.succeed(`远程 tag 已删除: ${tagToDelete}`);
+    } catch {
+      pushSpinner.warn(
+        `远程删除失败，可稍后手动执行: git push origin --delete ${tagToDelete}`
+      );
+    }
+  }
+}
+
+/**
+ * 修改 tag（重新打标签）
+ */
+export async function updateTag(): Promise<void> {
+  const fetchSpinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+
+  const tags = execOutput("git tag -l --sort=-v:refname")
+    .split("\n")
+    .filter(Boolean);
+
+  if (tags.length === 0) {
+    console.log(colors.yellow("没有可修改的 tag"));
+    return;
+  }
+
+  divider();
+
+  const choices = tags.map((tag) => ({ name: tag, value: tag }));
+  choices.push({ name: "取消", value: "__cancel__" });
+
+  const tagToUpdate = await select({
+    message: "选择要修改的 tag:",
+    choices,
+    theme,
+  });
+
+  if (tagToUpdate === "__cancel__") {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  const newMessage = await input({
+    message: "输入新的 tag 消息:",
+    default: `Release ${tagToUpdate}`,
+    theme,
+  });
+
+  if (!newMessage) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  divider();
+
+  const spinner = ora(`正在更新 tag: ${tagToUpdate}`).start();
+
+  try {
+    // 删除旧 tag
+    execSync(`git tag -d "${tagToUpdate}"`, { stdio: "pipe" });
+    // 创建新 tag（在同一个 commit 上）
+    execSync(`git tag -a "${tagToUpdate}" -m "${newMessage}"`, {
+      stdio: "pipe",
+    });
+    spinner.succeed(`Tag 已更新: ${tagToUpdate}`);
+  } catch {
+    spinner.fail("tag 更新失败");
+    return;
+  }
+
+  const pushRemote = await select({
+    message: "是否推送到远程（会强制覆盖）?",
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (pushRemote) {
+    const pushSpinner = ora("正在推送到远程...").start();
+    try {
+      execSync(`git push origin "${tagToUpdate}" --force`, { stdio: "pipe" });
+      pushSpinner.succeed(`Tag 已推送: ${tagToUpdate}`);
+    } catch {
+      pushSpinner.warn(
+        `远程推送失败，可稍后手动执行: git push origin ${tagToUpdate} --force`
+      );
+    }
+  }
+}

package/src/index.ts

@@ -5,7 +5,7 @@ import { select } from "@inquirer/prompts";
 import { ExitPromptError } from "@inquirer/core";
 import { checkGitRepo, theme, colors } from "./utils.js";
 import { createBranch, deleteBranch } from "./commands/branch.js";
-import { listTags, createTag } from "./commands/tag.js";
+import { listTags, createTag, deleteTag, updateTag } from "./commands/tag.js";
 import { release } from "./commands/release.js";
 import { init } from "./commands/init.js";
 import { stash } from "./commands/stash.js";
@@ -55,9 +55,6 @@ const version: string =
 
 // 交互式主菜单
 async function mainMenu(): Promise<void> {
-  // 先检查更新，等待完成后再显示主菜单
-  await checkForUpdates(version, "@zjex/git-workflow");
-
   // ASCII Art Logo
   console.log(
     colors.green(`
@@ -95,19 +92,27 @@ async function mainMenu(): Promise<void> {
         value: "tag",
       },
       {
-        name: `[6] 📋 列出 tags              ${colors.dim("gw ts")}`,
+        name: `[6] 🗑️  删除 tag               ${colors.dim("gw td")}`,
+        value: "tag-delete",
+      },
+      {
+        name: `[7] ✏️  修改 tag               ${colors.dim("gw tu")}`,
+        value: "tag-update",
+      },
+      {
+        name: `[8] 📋 列出 tags              ${colors.dim("gw ts")}`,
         value: "tags",
       },
       {
-        name: `[7] 📦 发布版本               ${colors.dim("gw r")}`,
+        name: `[9] 📦 发布版本               ${colors.dim("gw r")}`,
         value: "release",
       },
       {
-        name: `[8] 💾 管理 stash             ${colors.dim("gw s")}`,
+        name: `[a] 💾 管理 stash             ${colors.dim("gw s")}`,
         value: "stash",
       },
       {
-        name: `[9] ⚙️  初始化配置             ${colors.dim("gw init")}`,
+        name: `[b] ⚙️  初始化配置             ${colors.dim("gw init")}`,
         value: "init",
       },
       { name: "[0] ❓ 帮助", value: "help" },
@@ -134,6 +139,14 @@ async function mainMenu(): Promise<void> {
       checkGitRepo();
       await createTag();
       break;
+    case "tag-delete":
+      checkGitRepo();
+      await deleteTag();
+      break;
+    case "tag-update":
+      checkGitRepo();
+      await updateTag();
+      break;
     case "tags":
       checkGitRepo();
       await listTags();
@@ -163,7 +176,8 @@ async function mainMenu(): Promise<void> {
 const cli = cac("gw");
 
 // 默认命令 - 显示交互式菜单
-cli.command("", "显示交互式菜单").action(() => {
+cli.command("", "显示交互式菜单").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   return mainMenu();
 });
 
@@ -172,7 +186,8 @@ cli
   .alias("feat")
   .alias("f")
   .option("--base <branch>", "指定基础分支")
-  .action((options: { base?: string }) => {
+  .action(async (options: { base?: string }) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return createBranch("feature", options.base);
   });
@@ -182,7 +197,8 @@ cli
   .alias("fix")
   .alias("h")
   .option("--base <branch>", "指定基础分支")
-  .action((options: { base?: string }) => {
+  .action(async (options: { base?: string }) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return createBranch("hotfix", options.base);
   });
@@ -191,7 +207,8 @@ cli
   .command("delete [branch]", "删除本地/远程分支")
   .alias("del")
   .alias("d")
-  .action((branch?: string) => {
+  .action(async (branch?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return deleteBranch(branch);
   });
@@ -199,7 +216,8 @@ cli
 cli
   .command("tags [prefix]", "列出所有 tag，可按前缀过滤")
   .alias("ts")
-  .action((prefix?: string) => {
+  .action(async (prefix?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return listTags(prefix);
   });
@@ -207,19 +225,40 @@ cli
 cli
   .command("tag [prefix]", "交互式选择版本类型并创建 tag")
   .alias("t")
-  .action((prefix?: string) => {
+  .action(async (prefix?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return createTag(prefix);
   });
 
+cli
+  .command("tag:delete", "删除 tag")
+  .alias("td")
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return deleteTag();
+  });
+
+cli
+  .command("tag:update", "修改 tag 消息")
+  .alias("tu")
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return updateTag();
+  });
+
 cli
   .command("release", "交互式选择版本号并更新 package.json")
   .alias("r")
-  .action(() => {
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     return release();
   });
 
-cli.command("init", "初始化配置文件 .gwrc.json").action(() => {
+cli.command("init", "初始化配置文件 .gwrc.json").action(async () => {
+  await checkForUpdates(version, "@zjex/git-workflow");
   return init();
 });
 
@@ -227,7 +266,8 @@ cli
   .command("stash", "交互式管理 stash")
   .alias("s")
   .alias("st")
-  .action(() => {
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return stash();
   });
@@ -236,7 +276,8 @@ cli
   .command("commit", "交互式提交 (Conventional Commits + Gitmoji)")
   .alias("c")
   .alias("cm")
-  .action(() => {
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
     return commit();
   });

package/scripts/README.md

@@ -1,57 +0,0 @@
-# 发布脚本
-
-## 使用方法
-
-```bash
-# 预览发布流程（推荐先执行）
-npm run release:dry
-
-# 实际发布
-npm run release
-```
-
-## 优化特性
-
-### ✅ 已实现的优化
-
-1. **Dry-run 模式** - 预览发布流程，不实际执行
-2. **自动回滚** - 出错时自动恢复 package.json、删除 tag、回退 commit
-3. **多重确认** - 版本选择、CHANGELOG 预览、最终发布三次确认
-4. **完整验证**
-   - npm 登录状态检查
-   - 版本号重复检查
-   - 构建产物验证
-   - 测试运行（如果有）
-5. **CHANGELOG 预览** - 生成后显示最新内容并确认
-6. **错误处理** - 完善的错误捕获和提示
-7. **友好输出** - 带颜色的步骤提示和进度显示
-
-## 前置条件
-
-- 确保已登录 npm：`npm login`
-- 确保有 GitHub 推送权限
-- 确保在 main/master 分支（或确认在其他分支发布）
-- 确保没有未提交的更改
-
-## 发布流程
-
-1. 检查必要命令（git, node, npm）
-2. 检查 npm 登录状态
-3. 检查 git 仓库状态
-4. 拉取最新代码
-5. 选择版本号
-6. 检查版本是否已存在
-7. 运行测试（如果有）
-8. 构建项目
-9. 验证构建产物
-10. 生成 CHANGELOG
-11. 预览并确认
-12. 最终确认
-13. 提交更改
-14. 创建 tag
-15. 推送到 GitHub
-16. 发布到 npm
-
-## 使用示例
-
-详见主 README 的发布部分。

package/test-box.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-GREEN='\033[0;32m'
-CYAN='\033[0;36m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-NEW_VERSION="0.2.8"
-
-echo ""
-echo -e "${GREEN}╭──────────────────────────────╮${NC}"
-echo -e "${GREEN}│                              │${NC}"
-echo -e "${GREEN}│${NC}  ${BOLD}🎉 发布成功！${NC}           ${GREEN}│${NC}"
-echo -e "${GREEN}│                              │${NC}"
-echo -e "${GREEN}│${NC}  ${CYAN}版本:${NC} ${BOLD}v${NEW_VERSION}${NC}            ${GREEN}│${NC}"
-echo -e "${GREEN}│                              │${NC}"
-echo -e "${GREEN}╰──────────────────────────────╯${NC}"
-echo ""

package/test-full-publish.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-BLUE='\033[0;34m'
-GREEN='\033[0;32m'
-CYAN='\033[0;36m'
-DIM='\033[2m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-TOTAL_STEPS=11
-NEW_VERSION="0.2.8"
-CURRENT_BRANCH="main"
-
-echo ""
-echo -e "${BOLD}🚀 开始发布流程${NC}"
-echo ""
-
-echo -e "${BLUE}[1/${TOTAL_STEPS}]${NC} 检查 Git 仓库... ${GREEN}✅${NC}"
-echo -e "${BLUE}[2/${TOTAL_STEPS}]${NC} 检查工作区状态... ${GREEN}✅${NC}"
-echo -e "${BLUE}[3/${TOTAL_STEPS}]${NC} 检查 npm 登录状态... ${GREEN}✅${NC} ${DIM}(zjex)${NC}"
-echo -e "${BLUE}[4/${TOTAL_STEPS}]${NC} 拉取最新代码... ${GREEN}✅${NC}"
-echo -e "${BLUE}[5/${TOTAL_STEPS}]${NC} 选择新版本号... ${GREEN}✅${NC} ${DIM}(0.2.7 → 0.2.8)${NC}"
-echo -e "${BLUE}[6/${TOTAL_STEPS}]${NC} 构建项目... ${GREEN}✅${NC}"
-echo -e "${BLUE}[7/${TOTAL_STEPS}]${NC} 生成 CHANGELOG... ${GREEN}✅${NC}"
-echo -e "${BLUE}[8/${TOTAL_STEPS}]${NC} 提交版本更新... ${GREEN}✅${NC} ${DIM}(🔖 chore(release): 发布 v${NEW_VERSION})${NC}"
-echo -e "${BLUE}[9/${TOTAL_STEPS}]${NC} 创建 Git Tag... ${GREEN}✅${NC} ${DIM}(v${NEW_VERSION})${NC}"
-echo -e "${BLUE}[10/${TOTAL_STEPS}]${NC} 推送到远程仓库... ${GREEN}✅${NC} ${DIM}(${CURRENT_BRANCH}, v${NEW_VERSION})${NC}"
-echo -e "${BLUE}[11/${TOTAL_STEPS}]${NC} 发布到 npm... ${GREEN}✅${NC}"
-
-node scripts/publish-success.js "${NEW_VERSION}"