@zjex/git-workflow 0.3.10 → 0.4.1

package/src/commands/stash.ts

@@ -1,6 +1,7 @@
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 import { select, input } from "@inquirer/prompts";
 import ora from "ora";
+import boxen from "boxen";
 import {
   colors,
   theme,
@@ -222,19 +223,187 @@ function applyStash(index: number, pop: boolean): void {
 
 async function showDiff(index: number): Promise<void> {
   try {
-    execSync(`git stash show -p --color=always stash@{${index}}`, {
-      stdio: "inherit",
-    });
-    console.log();
+    // 获取差异内容（不使用颜色，我们自己格式化）
+    const diffOutput = execOutput(
+      `git stash show -p --no-color stash@{${index}}`
+    );
+
+    if (!diffOutput) {
+      console.log(colors.yellow("没有差异内容"));
+      await input({
+        message: colors.dim("按 Enter 返回菜单..."),
+        theme,
+      });
+      return;
+    }
+
+    // 获取统计信息
+    const statsOutput = execOutput(`git stash show --stat stash@{${index}}`);
+
+    // 解析差异内容，按文件分组
+    const files = parseDiffByFile(diffOutput);
+
+    // 构建完整输出
+    let fullOutput = "";
+
+    // 添加统计信息
+    if (statsOutput) {
+      const statsBox = boxen(statsOutput, {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "double",
+        borderColor: "yellow",
+        title: `📊 Stash #${index} 统计`,
+        titleAlignment: "center",
+      });
+      fullOutput += statsBox + "\n";
+    }
+
+    // 为每个文件创建边框
+    for (const file of files) {
+      const fileContent = formatFileDiff(file);
+      const fileBox = boxen(fileContent, {
+        padding: { top: 0, bottom: 0, left: 1, right: 1 },
+        margin: { top: 0, bottom: 1, left: 0, right: 0 },
+        borderStyle: "round",
+        borderColor: "cyan",
+        title: `📄 ${file.path}`,
+        titleAlignment: "left",
+      });
+      fullOutput += fileBox + "\n";
+    }
+
+    // 使用 less 分页器显示，等待用户退出
+    await startPager(fullOutput);
+  } catch (error) {
+    console.log(colors.red("无法显示差异"));
     await input({
       message: colors.dim("按 Enter 返回菜单..."),
       theme,
     });
-  } catch {
-    console.log(colors.red("无法显示差异"));
   }
 }
 
+/**
+ * 解析差异内容，按文件分组
+ */
+interface FileDiff {
+  path: string;
+  lines: string[];
+}
+
+function parseDiffByFile(diffOutput: string): FileDiff[] {
+  const files: FileDiff[] = [];
+  const lines = diffOutput.split("\n");
+  let currentFile: FileDiff | null = null;
+
+  for (const line of lines) {
+    // 检测文件头
+    if (line.startsWith("diff --git")) {
+      // 保存上一个文件
+      if (currentFile && currentFile.lines.length > 0) {
+        files.push(currentFile);
+      }
+
+      // 提取文件路径
+      const match = line.match(/diff --git a\/(.*?) b\/(.*?)$/);
+      const path = match ? match[2] : "unknown";
+
+      currentFile = { path, lines: [] };
+    } else if (currentFile) {
+      // 跳过 index 和 --- +++ 行
+      if (
+        line.startsWith("index ") ||
+        line.startsWith("--- ") ||
+        line.startsWith("+++ ")
+      ) {
+        continue;
+      }
+
+      currentFile.lines.push(line);
+    }
+  }
+
+  // 保存最后一个文件
+  if (currentFile && currentFile.lines.length > 0) {
+    files.push(currentFile);
+  }
+
+  return files;
+}
+
+/**
+ * 格式化文件差异内容
+ */
+function formatFileDiff(file: FileDiff): string {
+  const formattedLines: string[] = [];
+
+  for (const line of file.lines) {
+    if (line.startsWith("@@")) {
+      // 位置信息 - 使用蓝色
+      formattedLines.push(colors.blue(line));
+    } else if (line.startsWith("+")) {
+      // 新增行 - 使用绿色
+      formattedLines.push(colors.green(line));
+    } else if (line.startsWith("-")) {
+      // 删除行 - 使用红色
+      formattedLines.push(colors.red(line));
+    } else {
+      // 上下文行 - 使用灰色
+      formattedLines.push(colors.dim(line));
+    }
+  }
+
+  return formattedLines.join("\n");
+}
+
+/**
+ * 启动分页器显示内容
+ */
+function startPager(content: string): Promise<void> {
+  return new Promise((resolve) => {
+    const pager = process.env.PAGER || "less";
+
+    try {
+      // -R: 支持ANSI颜色代码
+      // -S: 不换行长行
+      // -F: 如果内容少于一屏则直接退出
+      // -X: 不清屏
+      // -i: 忽略大小写搜索
+      const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+        stdio: ["pipe", "inherit", "inherit"],
+        env: { ...process.env, LESS: "-R -S -F -X -i" },
+      });
+
+      // 处理 stdin 的 EPIPE 错误（当 less 提前退出时）
+      pagerProcess.stdin.on("error", (err: NodeJS.ErrnoException) => {
+        if (err.code !== "EPIPE") {
+          console.error(err);
+        }
+      });
+
+      // 将内容写入分页器
+      pagerProcess.stdin.write(content);
+      pagerProcess.stdin.end();
+
+      // 等待分页器退出后返回菜单
+      pagerProcess.on("exit", () => {
+        resolve();
+      });
+
+      // 处理错误
+      pagerProcess.on("error", () => {
+        console.log(content);
+        resolve();
+      });
+    } catch (error) {
+      // 如果出错，直接输出内容
+      console.log(content);
+      resolve();
+    }
+  });
+}
+
 async function createBranchFromStash(index: number): Promise<void> {
   const type = await select({
     message: "选择分支类型:",

package/src/commands/tag.ts

@@ -624,3 +624,123 @@ export async function updateTag(): Promise<void> {
     }
   }
 }
+
+/**
+ * 清理无效标签（不包含数字的标签）
+ */
+export async function cleanInvalidTags(): Promise<void> {
+  const fetchSpinner = ora("正在获取 tags...").start();
+  exec("git fetch --tags", true);
+  fetchSpinner.stop();
+
+  divider();
+
+  // 获取所有标签
+  const allTags = execOutput("git tag -l").split("\n").filter(Boolean);
+
+  // 过滤出无效标签（不包含数字）
+  const invalidTags = allTags.filter((tag) => !/\d/.test(tag));
+
+  if (invalidTags.length === 0) {
+    console.log(colors.green("✅ 没有找到无效标签"));
+    return;
+  }
+
+  console.log(colors.yellow(`❌ 找到 ${invalidTags.length} 个无效标签：`));
+  console.log("");
+
+  // 显示每个无效标签的详细信息
+  for (const tag of invalidTags) {
+    try {
+      const commitHash = execOutput(`git rev-list -n 1 "${tag}"`).trim();
+      const commitDate = execOutput(`git log -1 --format=%ai "${tag}"`).trim();
+      const commitMsg = execOutput(`git log -1 --format=%s "${tag}"`).trim();
+
+      console.log(colors.red(`  标签: ${tag}`));
+      console.log(colors.dim(`    Commit: ${commitHash}`));
+      console.log(colors.dim(`    日期: ${commitDate}`));
+      console.log(colors.dim(`    消息: ${commitMsg}`));
+      console.log("");
+    } catch {
+      console.log(colors.red(`  标签: ${tag}`));
+      console.log(colors.dim(`    (无法获取提交信息)`));
+      console.log("");
+    }
+  }
+
+  divider();
+
+  const shouldClean = await select({
+    message: "是否删除这些无效标签？",
+    choices: [
+      { name: "是，删除所有无效标签", value: true },
+      { name: "否，取消操作", value: false },
+    ],
+    theme,
+  });
+
+  if (!shouldClean) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  divider();
+
+  // 删除本地标签
+  const localSpinner = ora("正在删除本地无效标签...").start();
+  let localSuccess = 0;
+  let localFailed = 0;
+
+  for (const tag of invalidTags) {
+    try {
+      execSync(`git tag -d "${tag}"`, { stdio: "pipe" });
+      localSuccess++;
+    } catch {
+      localFailed++;
+    }
+  }
+
+  if (localFailed === 0) {
+    localSpinner.succeed(`本地标签已删除: ${localSuccess} 个`);
+  } else {
+    localSpinner.warn(
+      `本地标签删除: 成功 ${localSuccess} 个，失败 ${localFailed} 个`
+    );
+  }
+
+  // 询问是否删除远程标签
+  const deleteRemote = await select({
+    message: "是否同时删除远程的无效标签？",
+    choices: [
+      { name: "是", value: true },
+      { name: "否", value: false },
+    ],
+    theme,
+  });
+
+  if (deleteRemote) {
+    const remoteSpinner = ora("正在删除远程无效标签...").start();
+    let remoteSuccess = 0;
+    let remoteFailed = 0;
+
+    for (const tag of invalidTags) {
+      try {
+        execSync(`git push origin --delete "${tag}"`, { stdio: "pipe" });
+        remoteSuccess++;
+      } catch {
+        remoteFailed++;
+      }
+    }
+
+    if (remoteFailed === 0) {
+      remoteSpinner.succeed(`远程标签已删除: ${remoteSuccess} 个`);
+    } else {
+      remoteSpinner.warn(
+        `远程标签删除: 成功 ${remoteSuccess} 个，失败 ${remoteFailed} 个`
+      );
+    }
+  }
+
+  console.log("");
+  console.log(colors.green("✨ 清理完成！"));
+}

package/src/index.ts

@@ -15,7 +15,13 @@ 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, deleteTag, updateTag } from "./commands/tag.js";
+import {
+  listTags,
+  createTag,
+  deleteTag,
+  updateTag,
+  cleanInvalidTags,
+} from "./commands/tag.js";
 import { release } from "./commands/release.js";
 import { init } from "./commands/init.js";
 import { stash } from "./commands/stash.js";
@@ -119,7 +125,7 @@ async function mainMenu(): Promise<void> {
         value: "hotfix",
       },
       {
-        name: `[3] 🗑️  删除分支               ${colors.dim("gw d")}`,
+        name: `[3] 🗑️  删除分支               ${colors.dim("gw brd")}`,
         value: "delete",
       },
       {
@@ -143,15 +149,15 @@ async function mainMenu(): Promise<void> {
         value: "tags",
       },
       {
-        name: `[9] 📦 发布版本               ${colors.dim("gw r")}`,
+        name: `[9] � 发布版本               ${colors.dim("gw r")}`,
         value: "release",
       },
       {
-        name: `[a] 💾 管理 stash             ${colors.dim("gw s")}`,
+        name: `[a] � 管理 stash             ${colors.dim("gw s")}`,
         value: "stash",
       },
       {
-        name: `[b] 📊 查看日志               ${colors.dim("gw log")}`,
+        name: `[b] � 查看日志               ${colors.dim("gw log")}`,
         value: "log",
       },
       {
@@ -263,9 +269,8 @@ cli
   });
 
 cli
-  .command("delete [branch]", "删除本地/远程分支")
-  .alias("del")
-  .alias("d")
+  .command("br:del [branch]", "删除本地/远程分支")
+  .alias("brd")
   .action(async (branch?: string) => {
     await checkForUpdates(version, "@zjex/git-workflow");
     checkGitRepo();
@@ -291,7 +296,7 @@ cli
   });
 
 cli
-  .command("tag:delete", "删除 tag")
+  .command("tag:del", "删除 tag")
   .alias("td")
   .action(async () => {
     await checkForUpdates(version, "@zjex/git-workflow");
@@ -308,6 +313,15 @@ cli
     return updateTag();
   });
 
+cli
+  .command("tag:clean", "清理无效 tag")
+  .alias("tc")
+  .action(async () => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return cleanInvalidTags();
+  });
+
 cli
   .command("release", "交互式选择版本号并更新 package.json")
   .alias("r")
@@ -364,77 +378,80 @@ cli
     return log(logOptions);
   });
 
-cli.command("clean", "清理缓存和临时文件").action(async () => {
-  const { clearUpdateCache } = await import("./update-notifier.js");
-  const { existsSync, unlinkSync, readdirSync } = await import("fs");
-  const { homedir, tmpdir } = await import("os");
-  const { join } = await import("path");
-  const { select } = await import("@inquirer/prompts");
-
-  let cleanedCount = 0;
-  let deletedGlobalConfig = false;
-
-  // 检查全局配置文件是否存在
-  const globalConfig = join(homedir(), ".gwrc.json");
-  const hasGlobalConfig = existsSync(globalConfig);
-
-  // 如果有全局配置文件，询问是否删除
-  if (hasGlobalConfig) {
-    const shouldDeleteConfig = await select({
-      message: "检测到全局配置文件，是否删除？",
-      choices: [
-        { name: "否，保留配置文件", value: false },
-        { name: "是，删除配置文件", value: true },
-      ],
-      theme,
-    });
-
-    if (shouldDeleteConfig) {
-      try {
-        unlinkSync(globalConfig);
-        cleanedCount++;
-        deletedGlobalConfig = true;
-      } catch {
-        // 静默失败
+cli
+  .command("clean", "清理缓存和临时文件")
+  .alias("cc")
+  .action(async () => {
+    const { clearUpdateCache } = await import("./update-notifier.js");
+    const { existsSync, unlinkSync, readdirSync } = await import("fs");
+    const { homedir, tmpdir } = await import("os");
+    const { join } = await import("path");
+    const { select } = await import("@inquirer/prompts");
+
+    let cleanedCount = 0;
+    let deletedGlobalConfig = false;
+
+    // 检查全局配置文件是否存在
+    const globalConfig = join(homedir(), ".gwrc.json");
+    const hasGlobalConfig = existsSync(globalConfig);
+
+    // 如果有全局配置文件，询问是否删除
+    if (hasGlobalConfig) {
+      const shouldDeleteConfig = await select({
+        message: "检测到全局配置文件，是否删除？",
+        choices: [
+          { name: "否，保留配置文件", value: false },
+          { name: "是，删除配置文件", value: true },
+        ],
+        theme,
+      });
+
+      if (shouldDeleteConfig) {
+        try {
+          unlinkSync(globalConfig);
+          cleanedCount++;
+          deletedGlobalConfig = true;
+        } catch {
+          // 静默失败
+        }
       }
     }
-  }
 
-  // 1. 清理更新缓存
-  clearUpdateCache();
-  cleanedCount++;
-
-  // 2. 清理临时 commit 消息文件
-  try {
-    const tmpDir = tmpdir();
-    const files = readdirSync(tmpDir);
-    const gwTmpFiles = files.filter((f) => f.startsWith(".gw-commit-msg-"));
-
-    for (const file of gwTmpFiles) {
-      try {
-        unlinkSync(join(tmpDir, file));
-        cleanedCount++;
-      } catch {
-        // 静默失败
+    // 1. 清理更新缓存
+    clearUpdateCache();
+    cleanedCount++;
+
+    // 2. 清理临时 commit 消息文件
+    try {
+      const tmpDir = tmpdir();
+      const files = readdirSync(tmpDir);
+      const gwTmpFiles = files.filter((f) => f.startsWith(".gw-commit-msg-"));
+
+      for (const file of gwTmpFiles) {
+        try {
+          unlinkSync(join(tmpDir, file));
+          cleanedCount++;
+        } catch {
+          // 静默失败
+        }
       }
+    } catch {
+      // 静默失败
     }
-  } catch {
-    // 静默失败
-  }
-
-  console.log("");
-  console.log(colors.green(`✔ 已清理 ${cleanedCount} 个文件`));
 
-  if (deletedGlobalConfig) {
     console.log("");
-    console.log(colors.yellow("⚠️  全局配置文件已删除"));
-    console.log(
-      colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`)
-    );
-  }
+    console.log(colors.green(`✔ 已清理 ${cleanedCount} 个文件`));
+
+    if (deletedGlobalConfig) {
+      console.log("");
+      console.log(colors.yellow("⚠️  全局配置文件已删除"));
+      console.log(
+        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`)
+      );
+    }
 
-  console.log("");
-});
+    console.log("");
+  });
 
 // 不使用 cac 的 version，手动处理 --version 和 --help
 cli.option("-v, --version", "显示版本号");

package/src/update-notifier.ts

@@ -181,7 +181,7 @@ async function showUpdateMessage(
   console.log(
     boxen(message, {
       padding: { top: 1, bottom: 1, left: 3, right: 3 },
-      margin: 1,
+      margin: { top: 0, bottom: 0, left: 1, right: 1 },
       borderStyle: "round",
       borderColor: "yellow",
       align: "center",