@zjex/git-workflow 0.2.21 → 0.2.23

package/dist/index.js

@@ -145,6 +145,14 @@ function backgroundCheck(currentVersion, packageName) {
     }
   });
 }
+function isUsingVolta() {
+  try {
+    const whichGw = execSync6("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
 async function getLatestVersion(packageName) {
   try {
     const result = execSync6(`npm view ${packageName} version`, {
@@ -192,6 +200,8 @@ async function showUpdateMessage(current, latest, packageName) {
       width: 40
     })
   );
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
   try {
     const action = await select7({
       message: "\u4F60\u60F3\u505A\u4EC0\u4E48\uFF1F",
@@ -199,7 +209,7 @@ async function showUpdateMessage(current, latest, packageName) {
         {
           name: "\u{1F680} \u7ACB\u5373\u66F4\u65B0",
           value: "update",
-          description: `\u8FD0\u884C npm install -g ${packageName}`
+          description: `\u8FD0\u884C ${updateCommand}`
         },
         {
           name: "\u23ED\uFE0F  \u7A0D\u540E\u66F4\u65B0\uFF0C\u7EE7\u7EED\u4F7F\u7528",
@@ -221,12 +231,14 @@ async function showUpdateMessage(current, latest, packageName) {
 }
 async function performUpdate(packageName) {
   console.log("");
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
   const spinner = ora5({
     text: "\u6B63\u5728\u66F4\u65B0...",
     spinner: "dots"
   }).start();
   try {
-    execSync6(`npm install -g ${packageName}@latest`, {
+    execSync6(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -238,15 +250,18 @@ async function performUpdate(packageName) {
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
-          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
+          colors.dim("\u8BF7\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u9A8C\u8BC1:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("\u6216\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40
+          align: "left",
+          width: 50
         }
       )
     );
@@ -255,7 +270,7 @@ async function performUpdate(packageName) {
     spinner.fail(colors.red("\u66F4\u65B0\u5931\u8D25"));
     console.log("");
     console.log(colors.dim("  \u4F60\u53EF\u4EE5\u624B\u52A8\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
   }
 }
@@ -640,20 +655,78 @@ async function listTags(prefix) {
   exec("git fetch --tags", true);
   spinner.stop();
   const pattern = prefix ? `${prefix}*` : "";
-  const tags = execOutput(`git tag -l ${pattern} --sort=-v:refname`).split("\n").filter(Boolean);
+  const tags = execOutput(`git tag -l ${pattern} --sort=v:refname`).split("\n").filter(Boolean);
   if (tags.length === 0) {
     console.log(
       colors.yellow(prefix ? `\u6CA1\u6709 '${prefix}' \u5F00\u5934\u7684 tag` : "\u6CA1\u6709 tag")
     );
     return;
   }
+  if (prefix) {
+    console.log(colors.green(`\u4EE5 '${prefix}' \u5F00\u5934\u7684 tags:`));
+    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
+    if (tags.length > 20) {
+      console.log(colors.yellow(`
+\u5171 ${tags.length} \u4E2A\uFF0C\u4EC5\u663E\u793A\u6700\u65B0 20 \u4E2A`));
+    }
+    return;
+  }
+  const grouped = /* @__PURE__ */ new Map();
+  tags.forEach((tag) => {
+    const prefix2 = tag.replace(/[0-9].*/, "") || "\u65E0\u524D\u7F00";
+    if (!grouped.has(prefix2)) {
+      grouped.set(prefix2, []);
+    }
+    grouped.get(prefix2).push(tag);
+  });
+  if (grouped.size === 1) {
+    console.log(colors.green("\u6240\u6709 tags:"));
+    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
+    if (tags.length > 20) {
+      console.log(colors.yellow(`
+\u5171 ${tags.length} \u4E2A\uFF0C\u4EC5\u663E\u793A\u6700\u65B0 20 \u4E2A`));
+    }
+    return;
+  }
+  console.log(colors.green("\u6240\u6709 tags (\u6309\u524D\u7F00\u5206\u7EC4):"));
+  console.log("");
+  const columns = [];
+  grouped.forEach((tagList, prefix2) => {
+    const hasMore = tagList.length > 5;
+    const displayTags = hasMore ? tagList.slice(-5) : tagList;
+    columns.push({ prefix: prefix2, tags: displayTags, hasMore });
+  });
+  const maxTagLength = Math.max(
+    ...columns.flatMap((col) => col.tags.map((t) => t.length))
+  );
+  const columnWidth = Math.max(maxTagLength + 4, 20);
+  const headers = columns.map((col) => {
+    const total = grouped.get(col.prefix).length;
+    const header = `${col.prefix} (${total})`;
+    return header.padEnd(columnWidth);
+  });
+  console.log(colors.cyan("  " + headers.join("  ")));
   console.log(
-    colors.green(prefix ? `\u4EE5 '${prefix}' \u5F00\u5934\u7684 tags:` : "\u6240\u6709 tags:")
+    colors.dim(
+      "  " + "\u2500".repeat(columnWidth * columns.length + (columns.length - 1) * 2)
+    )
   );
-  tags.slice(0, 20).forEach((tag) => console.log(`  ${tag}`));
-  if (tags.length > 20) {
-    console.log(colors.yellow(`
-\u5171 ${tags.length} \u4E2A\uFF0C\u4EC5\u663E\u793A\u524D 20 \u4E2A`));
+  const ellipsisRow = columns.map((col) => {
+    const text = col.hasMore ? "..." : "";
+    return text.padEnd(columnWidth);
+  }).join("  ");
+  if (columns.some((col) => col.hasMore)) {
+    console.log(colors.dim("  " + ellipsisRow));
+  }
+  const maxRows = Math.max(...columns.map((col) => col.tags.length));
+  for (let i = 0; i < maxRows; i++) {
+    const row = columns.map((col) => {
+      const tag = col.tags[i] || "";
+      return tag.padEnd(columnWidth);
+    }).join("  ");
+    console.log("  " + row);
   }
 }
 function getLatestTag(prefix) {
@@ -2293,8 +2366,17 @@ async function getLatestVersion2(packageName) {
     return null;
   }
 }
+function isUsingVolta2() {
+  try {
+    const whichGw = execSync7("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
 async function update(currentVersion) {
   const packageName = "@zjex/git-workflow";
+  const usingVolta = isUsingVolta2();
   console.log("");
   console.log(colors.bold("\u{1F50D} \u68C0\u67E5\u66F4\u65B0..."));
   console.log("");
@@ -2327,12 +2409,6 @@ async function update(currentVersion) {
       return;
     }
     const versionText = `${currentVersion}  \u2192  ${latestVersion}`;
-    const maxWidth = Math.max(
-      "\u{1F389} \u53D1\u73B0\u65B0\u7248\u672C\uFF01".length,
-      versionText.length,
-      "\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01".length,
-      "\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C".length
-    );
     console.log(
       boxen2(
         [
@@ -2353,7 +2429,8 @@ async function update(currentVersion) {
       )
     );
     const updateSpinner = ora6("\u6B63\u5728\u66F4\u65B0...").start();
-    execSync7(`npm install -g ${packageName}@latest`, {
+    const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
+    execSync7(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -2365,15 +2442,20 @@ async function update(currentVersion) {
         [
           colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
           "",
-          colors.dim("\u8BF7\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF\u4F7F\u7528\u65B0\u7248\u672C")
+          `\u65B0\u7248\u672C: ${colors.green(colors.bold(latestVersion))}`,
+          "",
+          colors.dim("\u8BF7\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u9A8C\u8BC1:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("\u6216\u91CD\u65B0\u6253\u5F00\u7EC8\u7AEF")
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40
+          align: "left",
+          width: 50
         }
       )
     );
@@ -2382,7 +2464,8 @@ async function update(currentVersion) {
     spinner.fail(colors.red("\u66F4\u65B0\u5931\u8D25"));
     console.log("");
     console.log(colors.dim("  \u4F60\u53EF\u4EE5\u624B\u52A8\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
     process.exit(1);
   }
@@ -2413,7 +2496,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.2.21" : "0.0.0-dev";
+var version = true ? "0.2.23" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zjex/git-workflow",
-	"version": "0.2.21",
+	"version": "0.2.23",
 	"description": "🚀 极简的 Git 工作流 CLI 工具，让分支管理和版本发布变得轻松愉快",
 	"type": "module",
 	"bin": {

package/src/commands/tag.ts

@@ -4,16 +4,23 @@ import ora from "ora";
 import { colors, theme, exec, execOutput, divider } from "../utils.js";
 import { getConfig } from "../config.js";
 
+/**
+ * 列出 tags（最新的显示在最下面，多个前缀分列展示）
+ * @param prefix 可选的 tag 前缀过滤
+ */
 export async function listTags(prefix?: string): Promise<void> {
+  // 1. 获取远程 tags
   const spinner = ora("正在获取 tags...").start();
   exec("git fetch --tags", true);
   spinner.stop();
 
+  // 2. 获取 tags 列表（按版本号升序排序，最新的在最后）
   const pattern = prefix ? `${prefix}*` : "";
-  const tags = execOutput(`git tag -l ${pattern} --sort=-v:refname`)
+  const tags = execOutput(`git tag -l ${pattern} --sort=v:refname`)
     .split("\n")
     .filter(Boolean);
 
+  // 3. 如果没有 tags，提示并返回
   if (tags.length === 0) {
     console.log(
       colors.yellow(prefix ? `没有 '${prefix}' 开头的 tag` : "没有 tag")
@@ -21,13 +28,95 @@ export async function listTags(prefix?: string): Promise<void> {
     return;
   }
 
+  // 4. 如果指定了前缀，直接显示单列（最多 20 个）
+  if (prefix) {
+    console.log(colors.green(`以 '${prefix}' 开头的 tags:`));
+    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
+    if (tags.length > 20) {
+      console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示最新 20 个`));
+    }
+    return;
+  }
+
+  // 5. 按前缀分组（提取 tag 名称中数字前的部分作为前缀）
+  const grouped = new Map<string, string[]>();
+  tags.forEach((tag) => {
+    // 提取前缀：去掉数字及之后的部分，如 "v0.1.0" -> "v"
+    const prefix = tag.replace(/[0-9].*/, "") || "无前缀";
+    if (!grouped.has(prefix)) {
+      grouped.set(prefix, []);
+    }
+    grouped.get(prefix)!.push(tag);
+  });
+
+  // 6. 如果只有一个前缀，使用单列显示（最多 20 个）
+  if (grouped.size === 1) {
+    console.log(colors.green("所有 tags:"));
+    const displayTags = tags.length > 20 ? tags.slice(-20) : tags;
+    displayTags.forEach((tag) => console.log(`  ${tag}`));
+    if (tags.length > 20) {
+      console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示最新 20 个`));
+    }
+    return;
+  }
+
+  // 7. 多个前缀，分列显示
+  console.log(colors.green("所有 tags (按前缀分组):"));
+  console.log("");
+
+  // 8. 准备每列的数据（每列最多显示 5 个最新的 tag）
+  const columns: Array<{ prefix: string; tags: string[]; hasMore: boolean }> =
+    [];
+  grouped.forEach((tagList, prefix) => {
+    const hasMore = tagList.length > 5;
+    // 取最后 5 个（最新的）
+    const displayTags = hasMore ? tagList.slice(-5) : tagList;
+    columns.push({ prefix, tags: displayTags, hasMore });
+  });
+
+  // 9. 计算每列的宽度（取所有 tag 中最长的，至少 20 字符）
+  const maxTagLength = Math.max(
+    ...columns.flatMap((col) => col.tags.map((t) => t.length))
+  );
+  const columnWidth = Math.max(maxTagLength + 4, 20);
+
+  // 10. 打印表头（显示前缀和总数）
+  const headers = columns.map((col) => {
+    const total = grouped.get(col.prefix)!.length;
+    const header = `${col.prefix} (${total})`;
+    return header.padEnd(columnWidth);
+  });
+  console.log(colors.cyan("  " + headers.join("  ")));
+
+  // 11. 打印分隔线
   console.log(
-    colors.green(prefix ? `以 '${prefix}' 开头的 tags:` : "所有 tags:")
+    colors.dim(
+      "  " + "─".repeat(columnWidth * columns.length + (columns.length - 1) * 2)
+    )
   );
-  tags.slice(0, 20).forEach((tag) => console.log(`  ${tag}`));
 
-  if (tags.length > 20) {
-    console.log(colors.yellow(`\n共 ${tags.length} 个，仅显示前 20 个`));
+  // 12. 打印省略号（如果某列有超过 5 个 tag）
+  const ellipsisRow = columns
+    .map((col) => {
+      const text = col.hasMore ? "..." : "";
+      return text.padEnd(columnWidth);
+    })
+    .join("  ");
+  if (columns.some((col) => col.hasMore)) {
+    console.log(colors.dim("  " + ellipsisRow));
+  }
+
+  // 13. 打印 tags 内容（按行打印，每行包含所有列的对应 tag）
+  const maxRows = Math.max(...columns.map((col) => col.tags.length));
+  for (let i = 0; i < maxRows; i++) {
+    const row = columns
+      .map((col) => {
+        const tag = col.tags[i] || ""; // 如果该列没有这一行，填充空字符串
+        return tag.padEnd(columnWidth);
+      })
+      .join("  ");
+    console.log("  " + row);
   }
 }
 

package/src/commands/update.ts

@@ -39,11 +39,24 @@ async function getLatestVersion(packageName: string): Promise<string | null> {
   }
 }
 
+/**
+ * 检测是否使用 Volta
+ */
+function isUsingVolta(): boolean {
+  try {
+    const whichGw = execSync("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 手动更新命令
  */
 export async function update(currentVersion: string): Promise<void> {
   const packageName = "@zjex/git-workflow";
+  const usingVolta = isUsingVolta();
 
   console.log("");
   console.log(colors.bold("🔍 检查更新..."));
@@ -85,12 +98,6 @@ export async function update(currentVersion: string): Promise<void> {
 
     // 有新版本
     const versionText = `${currentVersion}  →  ${latestVersion}`;
-    const maxWidth = Math.max(
-      "🎉 发现新版本！".length,
-      versionText.length,
-      "✨ 更新完成！".length,
-      "请重新打开终端使用新版本".length
-    );
 
     console.log(
       boxen(
@@ -115,7 +122,12 @@ export async function update(currentVersion: string): Promise<void> {
     // 开始更新
     const updateSpinner = ora("正在更新...").start();
 
-    execSync(`npm install -g ${packageName}@latest`, {
+    // 根据包管理器选择更新命令
+    const updateCommand = usingVolta
+      ? `volta install ${packageName}@latest`
+      : `npm install -g ${packageName}@latest`;
+
+    execSync(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -131,15 +143,20 @@ export async function update(currentVersion: string): Promise<void> {
         [
           colors.green(colors.bold("✨ 更新完成！")),
           "",
-          colors.dim("请重新打开终端使用新版本"),
+          `新版本: ${colors.green(colors.bold(latestVersion))}`,
+          "",
+          colors.dim("请执行以下命令验证:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("或重新打开终端"),
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40,
+          align: "left",
+          width: 50,
         }
       )
     );
@@ -150,7 +167,10 @@ export async function update(currentVersion: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    const updateCommand = usingVolta
+      ? `volta install ${packageName}@latest`
+      : `npm install -g ${packageName}@latest`;
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
     process.exit(1);
   }

package/src/update-notifier.ts

@@ -107,6 +107,18 @@ function backgroundCheck(currentVersion: string, packageName: string): void {
   });
 }
 
+/**
+ * 检测是否使用 Volta
+ */
+function isUsingVolta(): boolean {
+  try {
+    const whichGw = execSync("which gw", { encoding: "utf-8" }).trim();
+    return whichGw.includes(".volta");
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 获取 npm 上的最新版本
  */
@@ -172,6 +184,11 @@ async function showUpdateMessage(
     })
   );
 
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta
+    ? `volta install ${packageName}@latest`
+    : `npm install -g ${packageName}@latest`;
+
   try {
     const action = await select({
       message: "你想做什么？",
@@ -179,7 +196,7 @@ async function showUpdateMessage(
         {
           name: "🚀 立即更新",
           value: "update",
-          description: `运行 npm install -g ${packageName}`,
+          description: `运行 ${updateCommand}`,
         },
         {
           name: "⏭️  稍后更新，继续使用",
@@ -208,14 +225,19 @@ async function showUpdateMessage(
 async function performUpdate(packageName: string): Promise<void> {
   console.log("");
 
+  const usingVolta = isUsingVolta();
+  const updateCommand = usingVolta
+    ? `volta install ${packageName}@latest`
+    : `npm install -g ${packageName}@latest`;
+
   const spinner = ora({
     text: "正在更新...",
     spinner: "dots",
   }).start();
 
   try {
-    // 直接安装最新版本（npm 会自动覆盖旧版本）
-    execSync(`npm install -g ${packageName}@latest`, {
+    // 根据包管理器选择更新命令
+    execSync(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -231,15 +253,18 @@ async function performUpdate(packageName: string): Promise<void> {
         [
           colors.green(colors.bold("✨ 更新完成！")),
           "",
-          colors.dim("请重新打开终端使用新版本"),
+          colors.dim("请执行以下命令验证:"),
+          colors.cyan("  hash -r && gw --version"),
+          "",
+          colors.dim("或重新打开终端"),
         ].join("\n"),
         {
-          padding: { top: 1, bottom: 1, left: 3, right: 3 },
+          padding: { top: 1, bottom: 1, left: 2, right: 2 },
           margin: { top: 0, bottom: 1, left: 2, right: 2 },
           borderStyle: "round",
           borderColor: "green",
-          align: "center",
-          width: 40,
+          align: "left",
+          width: 50,
         }
       )
     );
@@ -250,7 +275,7 @@ async function performUpdate(packageName: string): Promise<void> {
     spinner.fail(colors.red("更新失败"));
     console.log("");
     console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    console.log(colors.cyan(`  npm install -g ${packageName}@latest`));
+    console.log(colors.cyan(`  ${updateCommand}`));
     console.log("");
   }
 }