@zjex/git-workflow 0.4.2 → 0.4.4

package/src/commands/tag.ts

@@ -1,7 +1,14 @@
-import { execSync } from "child_process";
 import { select, input } from "@inquirer/prompts";
 import ora from "ora";
-import { colors, theme, exec, execOutput, divider } from "../utils.js";
+import {
+  colors,
+  theme,
+  exec,
+  execOutput,
+  execAsync,
+  execWithSpinner,
+  divider,
+} from "../utils.js";
 import { getConfig } from "../config.js";
 
 /**
@@ -27,7 +34,7 @@ export async function listTags(prefix?: string): Promise<void> {
   // 4. 如果没有 tags，提示并返回
   if (tags.length === 0) {
     console.log(
-      colors.yellow(prefix ? `没有 '${prefix}' 开头的 tag` : "没有 tag")
+      colors.yellow(prefix ? `没有 '${prefix}' 开头的 tag` : "没有 tag"),
     );
     return;
   }
@@ -35,7 +42,7 @@ export async function listTags(prefix?: string): Promise<void> {
   // 5. 如果指定了前缀，直接显示单列（最多 5 个）
   if (prefix) {
     console.log(
-      colors.green(`以 '${prefix}' 开头的 tags (共 ${tags.length} 个):`)
+      colors.green(`以 '${prefix}' 开头的 tags (共 ${tags.length} 个):`),
     );
     if (tags.length > 5) {
       console.log(colors.dim("  ..."));
@@ -84,7 +91,7 @@ export async function listTags(prefix?: string): Promise<void> {
 
   // 9. 计算每列的宽度（取所有 tag 中最长的，至少 20 字符）
   const maxTagLength = Math.max(
-    ...columns.flatMap((col) => col.tags.map((t) => t.length))
+    ...columns.flatMap((col) => col.tags.map((t) => t.length)),
   );
   const columnWidth = Math.max(maxTagLength + 4, 20);
 
@@ -99,8 +106,9 @@ export async function listTags(prefix?: string): Promise<void> {
   // 11. 打印分隔线
   console.log(
     colors.dim(
-      "  " + "─".repeat(columnWidth * columns.length + (columns.length - 1) * 2)
-    )
+      "  " +
+        "─".repeat(columnWidth * columns.length + (columns.length - 1) * 2),
+    ),
   );
 
   // 12. 打印省略号（如果某列有超过 5 个 tag）
@@ -248,7 +256,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
       const choices: TagChoice[] = prefixWithDate.map(
         ({ prefix: p, latest }) => {
           return { name: `${p} (最新: ${latest})`, value: p };
-        }
+        },
       );
       choices.push({ name: "输入新前缀...", value: "__new__" });
 
@@ -273,7 +281,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
   if (!latestTag) {
     const newTag = `${prefix}1.0.0`;
     console.log(
-      colors.yellow(`未找到 '${prefix}' 开头的 tag，将创建 ${newTag}`)
+      colors.yellow(`未找到 '${prefix}' 开头的 tag，将创建 ${newTag}`),
     );
     const ok = await select({
       message: `确认创建 ${newTag}?`,
@@ -297,7 +305,7 @@ export async function createTag(inputPrefix?: string): Promise<void> {
 
   // 解析版本号，支持预发布版本如 1.0.0-beta.1
   const preReleaseMatch = version.match(
-    /^(\d+)\.(\d+)\.(\d+)-([a-zA-Z]+)\.(\d+)$/
+    /^(\d+)\.(\d+)\.(\d+)-([a-zA-Z]+)\.(\d+)$/,
   );
   const match3 = version.match(/^(\d+)\.(\d+)\.(\d+)$/);
   const match2 = version.match(/^(\d+)\.(\d+)$/);
@@ -404,33 +412,34 @@ export async function createTag(inputPrefix?: string): Promise<void> {
     return;
   }
 
-  doCreateTag(nextTag);
+  await doCreateTag(nextTag);
 }
 
-function doCreateTag(tagName: string): void {
+async function doCreateTag(tagName: string): Promise<void> {
   divider();
 
   const spinner = ora(`正在创建 tag: ${tagName}`).start();
+  const success = await execWithSpinner(
+    `git tag -a "${tagName}" -m "Release ${tagName}"`,
+    spinner,
+    `Tag 创建成功: ${tagName}`,
+    "tag 创建失败",
+  );
 
-  try {
-    execSync(`git tag -a "${tagName}" -m "Release ${tagName}"`, {
-      stdio: "pipe",
-    });
-    spinner.succeed(`Tag 创建成功: ${tagName}`);
-  } catch {
-    spinner.fail("tag 创建失败");
+  if (!success) {
     return;
   }
 
   const pushSpinner = ora("正在推送到远程...").start();
+  const pushSuccess = await execWithSpinner(
+    `git push origin "${tagName}"`,
+    pushSpinner,
+    `Tag 已推送: ${tagName}`,
+    "远程推送失败",
+  );
 
-  try {
-    execSync(`git push origin "${tagName}"`, { stdio: "pipe" });
-    pushSpinner.succeed(`Tag 已推送: ${tagName}`);
-  } catch {
-    pushSpinner.warn(
-      `远程推送失败，可稍后手动执行: git push origin ${tagName}`
-    );
+  if (!pushSuccess) {
+    console.log(colors.dim(`  可稍后手动执行: git push origin ${tagName}`));
   }
 }
 
@@ -484,12 +493,14 @@ export async function deleteTag(): Promise<void> {
   divider();
 
   const spinner = ora(`正在删除本地 tag: ${tagToDelete}`).start();
+  const localSuccess = await execWithSpinner(
+    `git tag -d "${tagToDelete}"`,
+    spinner,
+    `本地 tag 已删除: ${tagToDelete}`,
+    "本地 tag 删除失败",
+  );
 
-  try {
-    execSync(`git tag -d "${tagToDelete}"`, { stdio: "pipe" });
-    spinner.succeed(`本地 tag 已删除: ${tagToDelete}`);
-  } catch {
-    spinner.fail("本地 tag 删除失败");
+  if (!localSuccess) {
     return;
   }
 
@@ -504,12 +515,15 @@ export async function deleteTag(): Promise<void> {
 
   if (deleteRemote) {
     const pushSpinner = ora("正在删除远程 tag...").start();
-    try {
-      execSync(`git push origin --delete "${tagToDelete}"`, { stdio: "pipe" });
-      pushSpinner.succeed(`远程 tag 已删除: ${tagToDelete}`);
-    } catch {
+    const remoteSuccess = await execWithSpinner(
+      `git push origin --delete "${tagToDelete}"`,
+      pushSpinner,
+      `远程 tag 已删除: ${tagToDelete}`,
+    );
+
+    if (!remoteSuccess) {
       pushSpinner.warn(
-        `远程删除失败，可稍后手动执行: git push origin --delete ${tagToDelete}`
+        `远程删除失败，可稍后手动执行: git push origin --delete ${tagToDelete}`,
       );
     }
   }
@@ -574,32 +588,40 @@ export async function updateTag(): Promise<void> {
 
   const spinner = ora(`正在重命名 tag: ${oldTag} → ${newTag}`).start();
 
-  try {
-    // 获取旧 tag 的 commit 和消息
-    const commit = execOutput(`git rev-list -n 1 "${oldTag}"`).trim();
-    const message = execOutput(
-      `git tag -l --format='%(contents)' "${oldTag}"`
-    ).trim();
-
-    // 创建新 tag（指向同一个 commit）
-    if (message) {
-      execSync(`git tag -a "${newTag}" "${commit}" -m "${message}"`, {
-        stdio: "pipe",
-      });
-    } else {
-      execSync(`git tag "${newTag}" "${commit}"`, { stdio: "pipe" });
-    }
-
-    // 删除旧 tag
-    execSync(`git tag -d "${oldTag}"`, { stdio: "pipe" });
+  // 获取旧 tag 的 commit 和消息
+  const commit = execOutput(`git rev-list -n 1 "${oldTag}"`).trim();
+  const message = execOutput(
+    `git tag -l --format='%(contents)' "${oldTag}"`,
+  ).trim();
+
+  // 创建新 tag（指向同一个 commit）
+  let createSuccess: boolean;
+  if (message) {
+    createSuccess = await execWithSpinner(
+      `git tag -a "${newTag}" "${commit}" -m "${message}"`,
+      spinner,
+    );
+  } else {
+    createSuccess = await execWithSpinner(
+      `git tag "${newTag}" "${commit}"`,
+      spinner,
+    );
+  }
 
-    spinner.succeed(`Tag 已重命名: ${oldTag} → ${newTag}`);
-  } catch (error) {
+  if (!createSuccess) {
     spinner.fail("tag 重命名失败");
-    console.log(colors.red(String(error)));
     return;
   }
 
+  // 删除旧 tag
+  const deleteSuccess = await execAsync(`git tag -d "${oldTag}"`, spinner);
+  if (!deleteSuccess) {
+    spinner.fail("删除旧 tag 失败");
+    return;
+  }
+
+  spinner.succeed(`Tag 已重命名: ${oldTag} → ${newTag}`);
+
   const pushRemote = await select({
     message: "是否同步到远程?",
     choices: [
@@ -611,17 +633,32 @@ export async function updateTag(): Promise<void> {
 
   if (pushRemote) {
     const pushSpinner = ora("正在同步到远程...").start();
-    try {
-      // 推送新 tag
-      execSync(`git push origin "${newTag}"`, { stdio: "pipe" });
-      // 删除远程旧 tag
-      execSync(`git push origin --delete "${oldTag}"`, { stdio: "pipe" });
-      pushSpinner.succeed(`远程 tag 已同步: ${oldTag} → ${newTag}`);
-    } catch {
+
+    // 推送新 tag
+    const pushNewSuccess = await execAsync(
+      `git push origin "${newTag}"`,
+      pushSpinner,
+    );
+    if (!pushNewSuccess) {
       pushSpinner.warn(
-        `远程同步失败，可稍后手动执行:\n  git push origin ${newTag}\n  git push origin --delete ${oldTag}`
+        `远程同步失败，可稍后手动执行:\n  git push origin ${newTag}\n  git push origin --delete ${oldTag}`,
       );
+      return;
     }
+
+    // 删除远程旧 tag
+    const deleteOldSuccess = await execAsync(
+      `git push origin --delete "${oldTag}"`,
+      pushSpinner,
+    );
+    if (!deleteOldSuccess) {
+      pushSpinner.warn(
+        `远程旧 tag 删除失败，可稍后手动执行: git push origin --delete ${oldTag}`,
+      );
+      return;
+    }
+
+    pushSpinner.succeed(`远程 tag 已同步: ${oldTag} → ${newTag}`);
   }
 }
 
@@ -692,10 +729,10 @@ export async function cleanInvalidTags(): Promise<void> {
   let localFailed = 0;
 
   for (const tag of invalidTags) {
-    try {
-      execSync(`git tag -d "${tag}"`, { stdio: "pipe" });
+    const success = await execAsync(`git tag -d "${tag}"`, localSpinner);
+    if (success) {
       localSuccess++;
-    } catch {
+    } else {
       localFailed++;
     }
   }
@@ -704,7 +741,7 @@ export async function cleanInvalidTags(): Promise<void> {
     localSpinner.succeed(`本地标签已删除: ${localSuccess} 个`);
   } else {
     localSpinner.warn(
-      `本地标签删除: 成功 ${localSuccess} 个，失败 ${localFailed} 个`
+      `本地标签删除: 成功 ${localSuccess} 个，失败 ${localFailed} 个`,
     );
   }
 
@@ -724,10 +761,13 @@ export async function cleanInvalidTags(): Promise<void> {
     let remoteFailed = 0;
 
     for (const tag of invalidTags) {
-      try {
-        execSync(`git push origin --delete "${tag}"`, { stdio: "pipe" });
+      const success = await execAsync(
+        `git push origin --delete "${tag}"`,
+        remoteSpinner,
+      );
+      if (success) {
         remoteSuccess++;
-      } catch {
+      } else {
         remoteFailed++;
       }
     }
@@ -736,7 +776,7 @@ export async function cleanInvalidTags(): Promise<void> {
       remoteSpinner.succeed(`远程标签已删除: ${remoteSuccess} 个`);
     } else {
       remoteSpinner.warn(
-        `远程标签删除: 成功 ${remoteSuccess} 个，失败 ${remoteFailed} 个`
+        `远程标签删除: 成功 ${remoteSuccess} 个，失败 ${remoteFailed} 个`,
       );
     }
   }

package/src/commands/update.ts

@@ -1,5 +1,5 @@
-import { execSync } from "child_process";
-import ora from "ora";
+import { execSync, spawn } from "child_process";
+import ora, { Ora } from "ora";
 import boxen from "boxen";
 import semver from "semver";
 import { existsSync, unlinkSync } from "fs";
@@ -90,8 +90,8 @@ export async function update(currentVersion: string): Promise<void> {
             borderStyle: "round",
             borderColor: "green",
             align: "left",
-          }
-        )
+          },
+        ),
       );
       return;
     }
@@ -105,7 +105,7 @@ export async function update(currentVersion: string): Promise<void> {
           colors.yellow(colors.bold("🎉 发现新版本！")),
           "",
           `${colors.dim(currentVersion)}  →  ${colors.green(
-            colors.bold(latestVersion)
+            colors.bold(latestVersion),
           )}`,
         ].join("\n"),
         {
@@ -115,62 +115,95 @@ export async function update(currentVersion: string): Promise<void> {
           borderColor: "yellow",
           align: "center",
           width: 40,
-        }
-      )
+        },
+      ),
     );
 
     // 开始更新
-    const updateSpinner = ora("正在更新...").start();
+    console.log("");
+    console.log(colors.cyan("📦 开始安装新版本..."));
+    console.log("");
 
     // 根据包管理器选择更新命令
     const updateCommand = usingVolta
       ? `volta install ${packageName}@latest`
       : `npm install -g ${packageName}@latest`;
 
-    execSync(updateCommand, {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"],
-    });
+    // 使用 spawn 异步执行，这样可以显示实时输出
+    const [command, ...args] = updateCommand.split(" ");
 
-    updateSpinner.succeed(colors.green("更新成功！"));
+    const updateProcess = spawn(command, args, {
+      stdio: "inherit", // 继承父进程的 stdio，显示实时输出
+    });
 
-    // 清理缓存文件
-    clearUpdateCache();
+    updateProcess.on("close", (code) => {
+      console.log("");
+
+      if (code === 0) {
+        console.log(colors.green("✔ 更新成功！"));
+
+        // 清理缓存文件
+        clearUpdateCache();
+
+        console.log("");
+        console.log(
+          boxen(
+            [
+              colors.green(colors.bold("✨ 更新完成！")),
+              "",
+              `新版本: ${colors.green(colors.bold(latestVersion))}`,
+              "",
+              colors.dim("请执行以下命令验证:"),
+              colors.cyan("  hash -r && gw --version"),
+              "",
+              colors.dim("或重新打开终端"),
+            ].join("\n"),
+            {
+              padding: { top: 1, bottom: 1, left: 2, right: 2 },
+              margin: { top: 0, bottom: 1, left: 2, right: 2 },
+              borderStyle: "round",
+              borderColor: "green",
+              align: "left",
+              width: 40,
+            },
+          ),
+        );
+
+        // 更新成功后退出
+        process.exit(0);
+      } else {
+        console.log(colors.red("✖ 更新失败"));
+        console.log("");
+        console.log(colors.dim("  你可以手动运行以下命令更新:"));
+        console.log(colors.cyan(`  ${updateCommand}`));
+        console.log("");
+        process.exit(1);
+      }
+    });
 
-    console.log("");
-    console.log(
-      boxen(
-        [
-          colors.green(colors.bold("✨ 更新完成！")),
-          "",
-          `新版本: ${colors.green(colors.bold(latestVersion))}`,
-          "",
-          colors.dim("请执行以下命令验证:"),
-          colors.cyan("  hash -r && gw --version"),
-          "",
-          colors.dim("或重新打开终端"),
-        ].join("\n"),
-        {
-          padding: { top: 1, bottom: 1, left: 2, right: 2 },
-          margin: { top: 0, bottom: 1, left: 2, right: 2 },
-          borderStyle: "round",
-          borderColor: "green",
-          align: "left",
-          width: 40,
-        }
-      )
-    );
+    updateProcess.on("error", (error) => {
+      console.log("");
+      console.log(colors.red("✖ 更新失败"));
+      console.log("");
+      console.log(colors.dim("  你可以手动运行以下命令更新:"));
+      console.log(colors.cyan(`  ${updateCommand}`));
+      console.log("");
+      console.log(colors.dim(`  错误信息: ${error.message}`));
+      console.log("");
+      process.exit(1);
+    });
 
     // 更新成功后退出
     process.exit(0);
   } catch (error) {
-    spinner.fail(colors.red("更新失败"));
+    spinner.fail(colors.red("获取版本信息失败"));
     console.log("");
-    console.log(colors.dim("  你可以手动运行以下命令更新:"));
-    const updateCommand = usingVolta
-      ? `volta install ${packageName}@latest`
-      : `npm install -g ${packageName}@latest`;
-    console.log(colors.cyan(`  ${updateCommand}`));
+    console.log(colors.dim("  请检查网络连接后重试"));
+    console.log("");
+
+    if (error instanceof Error) {
+      console.log(colors.dim(`  错误信息: ${error.message}`));
+    }
     console.log("");
     process.exit(1);
   }

package/src/index.ts

@@ -29,6 +29,8 @@ import { commit } from "./commands/commit.js";
 import { checkForUpdates } from "./update-notifier.js";
 import { update } from "./commands/update.js";
 import { log, quickLog } from "./commands/log.js";
+import { amendDate } from "./commands/amend-date.js";
+import { amend } from "./commands/amend.js";
 
 // ========== 全局错误处理 ==========
 
@@ -109,7 +111,7 @@ async function mainMenu(): Promise<void> {
   ███╔╝  ██   ██║██╔══╝   ██╔██╗ 
  ███████╗╚█████╔╝███████╗██╔╝ ██╗
  ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
-`)
+`),
   );
   console.log(colors.dim(`  git-workflow v${colors.yellow(version)}\n`));
 
@@ -157,11 +159,19 @@ async function mainMenu(): Promise<void> {
         value: "stash",
       },
       {
-        name: `[b] � 查看日志               ${colors.dim("gw log")}`,
+        name: `[b] 📜 查看日志               ${colors.dim("gw log")}`,
         value: "log",
       },
       {
-        name: `[c] ⚙️  初始化配置             ${colors.dim("gw init")}`,
+        name: `[c] 🕐 修改提交时间           ${colors.dim("gw ad")}`,
+        value: "amend-date",
+      },
+      {
+        name: `[d] ✏️  修改提交信息           ${colors.dim("gw amend")}`,
+        value: "amend",
+      },
+      {
+        name: `[e] ⚙️  初始化配置             ${colors.dim("gw init")}`,
         value: "init",
       },
       { name: "[0] ❓ 帮助", value: "help" },
@@ -215,6 +225,14 @@ async function mainMenu(): Promise<void> {
       checkGitRepo();
       await log();
       break;
+    case "amend-date":
+      checkGitRepo();
+      await amendDate();
+      break;
+    case "amend":
+      checkGitRepo();
+      await amend();
+      break;
     case "init":
       await init();
       break;
@@ -378,6 +396,23 @@ cli
     return log(logOptions);
   });
 
+cli
+  .command("amend:date [hash]", "修改指定 commit 的提交时间")
+  .alias("ad")
+  .action(async (hash?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return amendDate(hash);
+  });
+
+cli
+  .command("amend [hash]", "修改指定 commit 的提交信息")
+  .action(async (hash?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return amend(hash);
+  });
+
 cli
   .command("clean", "清理缓存和临时文件")
   .alias("cc")
@@ -446,7 +481,7 @@ cli
       console.log("");
       console.log(colors.yellow("⚠️  全局配置文件已删除"));
       console.log(
-        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`)
+        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`),
       );
     }
 

package/src/utils.ts

@@ -1,4 +1,5 @@
-import { execSync, type ExecSyncOptions } from "child_process";
+import { execSync, spawn, type ExecSyncOptions } from "child_process";
+import type { Ora } from "ora";
 
 export interface Colors {
   red: (s: string) => string;
@@ -98,3 +99,60 @@ export type BranchType = "feature" | "hotfix";
 export function divider(): void {
   console.log(colors.dim("─".repeat(40)));
 }
+
+/**
+ * 使用 spawn 异步执行命令，避免阻塞 spinner
+ * @param command 命令字符串
+ * @param spinner 可选的 ora spinner 实例
+ * @returns Promise<boolean> 成功返回 true，失败返回 false
+ */
+export function execAsync(command: string, spinner?: Ora): Promise<boolean> {
+  return new Promise((resolve) => {
+    const [cmd, ...args] = command.split(" ");
+
+    const process = spawn(cmd, args, {
+      stdio: spinner ? "pipe" : "inherit",
+    });
+
+    process.on("close", (code) => {
+      resolve(code === 0);
+    });
+
+    process.on("error", () => {
+      resolve(false);
+    });
+  });
+}
+
+/**
+ * 执行命令并在 spinner 中显示进度
+ * @param command 命令字符串
+ * @param spinner ora spinner 实例
+ * @param successMessage 成功消息
+ * @param errorMessage 错误消息
+ * @returns Promise<boolean> 成功返回 true，失败返回 false
+ */
+export async function execWithSpinner(
+  command: string,
+  spinner: Ora,
+  successMessage?: string,
+  errorMessage?: string,
+): Promise<boolean> {
+  const success = await execAsync(command, spinner);
+
+  if (success) {
+    if (successMessage) {
+      spinner.succeed(successMessage);
+    } else {
+      spinner.succeed();
+    }
+  } else {
+    if (errorMessage) {
+      spinner.fail(errorMessage);
+    } else {
+      spinner.fail();
+    }
+  }
+
+  return success;
+}