@zjex/git-workflow 0.4.3 → 0.4.4

package/package.json

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

package/src/commands/branch.ts

@@ -7,6 +7,7 @@ import {
   theme,
   exec,
   execOutput,
+  execWithSpinner,
   getMainBranch,
   divider,
   type BranchType,
@@ -35,8 +36,8 @@ export async function getBranchName(type: BranchType): Promise<string | null> {
   // 描述是否必填，默认非必填
   const requireDescription =
     type === "feature"
-      ? config.featureRequireDescription ?? false
-      : config.hotfixRequireDescription ?? false;
+      ? (config.featureRequireDescription ?? false)
+      : (config.hotfixRequireDescription ?? false);
   const descMessage = requireDescription
     ? "请输入描述:"
     : "请输入描述 (可跳过):";
@@ -62,7 +63,7 @@ export async function getBranchName(type: BranchType): Promise<string | null> {
 
 export async function createBranch(
   type: BranchType,
-  baseBranchArg?: string | null
+  baseBranchArg?: string | null,
 ): Promise<void> {
   const config = getConfig();
 
@@ -142,12 +143,16 @@ export async function createBranch(
 
     if (shouldPush) {
       const pushSpinner = ora("正在推送到远程...").start();
-      try {
-        execSync(`git push -u origin "${branchName}"`, { stdio: "pipe" });
-        pushSpinner.succeed(`已推送到远程: origin/${branchName}`);
-      } catch {
-        pushSpinner.warn(
-          "远程推送失败，可稍后手动执行: git push -u origin " + branchName
+      const success = await execWithSpinner(
+        `git push -u origin "${branchName}"`,
+        pushSpinner,
+        `已推送到远程: origin/${branchName}`,
+        "远程推送失败",
+      );
+
+      if (!success) {
+        console.log(
+          colors.dim(`  可稍后手动执行: git push -u origin ${branchName}`),
         );
       }
     }
@@ -175,20 +180,23 @@ export async function deleteBranch(branchArg?: string): Promise<void> {
   if (!branch) {
     // 获取本地分支
     const localBranches = execOutput(
-      "git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short)'"
+      "git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short)'",
     )
       .split("\n")
       .filter((b) => b && b !== currentBranch);
 
     // 获取远程分支（排除 HEAD 和已有本地分支的）
     const remoteBranches = execOutput(
-      "git for-each-ref --sort=-committerdate refs/remotes/origin/ --format='%(refname:short)'"
+      "git for-each-ref --sort=-committerdate refs/remotes/origin/ --format='%(refname:short)'",
     )
       .split("\n")
       .map((b) => b.replace("origin/", ""))
       .filter(
         (b) =>
-          b && b !== "HEAD" && b !== currentBranch && !localBranches.includes(b)
+          b &&
+          b !== "HEAD" &&
+          b !== currentBranch &&
+          !localBranches.includes(b),
       );
 
     if (localBranches.length === 0 && remoteBranches.length === 0) {
@@ -252,14 +260,12 @@ export async function deleteBranch(branchArg?: string): Promise<void> {
       }
 
       const spinner = ora(`正在删除远程分支: origin/${remoteBranch}`).start();
-      try {
-        execSync(`git push origin --delete "${remoteBranch}"`, {
-          stdio: "pipe",
-        });
-        spinner.succeed(`远程分支已删除: origin/${remoteBranch}`);
-      } catch {
-        spinner.fail("远程分支删除失败");
-      }
+      await execWithSpinner(
+        `git push origin --delete "${remoteBranch}"`,
+        spinner,
+        `远程分支已删除: origin/${remoteBranch}`,
+        "远程分支删除失败",
+      );
       return;
     }
   }
@@ -275,7 +281,7 @@ export async function deleteBranch(branchArg?: string): Promise<void> {
   if (!localExists) {
     if (hasRemote) {
       console.log(
-        colors.yellow(`本地分支不存在，但远程分支存在: origin/${branch}`)
+        colors.yellow(`本地分支不存在，但远程分支存在: origin/${branch}`),
       );
       const deleteRemote = await select({
         message: `确认删除远程分支 origin/${branch}?`,
@@ -288,12 +294,12 @@ export async function deleteBranch(branchArg?: string): Promise<void> {
 
       if (deleteRemote) {
         const spinner = ora(`正在删除远程分支: origin/${branch}`).start();
-        try {
-          execSync(`git push origin --delete "${branch}"`, { stdio: "pipe" });
-          spinner.succeed(`远程分支已删除: origin/${branch}`);
-        } catch {
-          spinner.fail("远程分支删除失败");
-        }
+        await execWithSpinner(
+          `git push origin --delete "${branch}"`,
+          spinner,
+          `远程分支已删除: origin/${branch}`,
+          "远程分支删除失败",
+        );
       }
     } else {
       console.log(colors.red(`分支不存在: ${branch}`));
@@ -319,21 +325,24 @@ export async function deleteBranch(branchArg?: string): Promise<void> {
   }
 
   const localSpinner = ora(`正在删除本地分支: ${branch}`).start();
-  try {
-    execSync(`git branch -D "${branch}"`, { stdio: "pipe" });
-    localSpinner.succeed(`本地分支已删除: ${branch}`);
-  } catch {
-    localSpinner.fail("本地分支删除失败");
+  const localSuccess = await execWithSpinner(
+    `git branch -D "${branch}"`,
+    localSpinner,
+    `本地分支已删除: ${branch}`,
+    "本地分支删除失败",
+  );
+
+  if (!localSuccess) {
     return;
   }
 
   if (hasRemote) {
     const remoteSpinner = ora(`正在删除远程分支: origin/${branch}`).start();
-    try {
-      execSync(`git push origin --delete "${branch}"`, { stdio: "pipe" });
-      remoteSpinner.succeed(`远程分支已删除: origin/${branch}`);
-    } catch {
-      remoteSpinner.fail("远程分支删除失败");
-    }
+    await execWithSpinner(
+      `git push origin --delete "${branch}"`,
+      remoteSpinner,
+      `远程分支已删除: origin/${branch}`,
+      "远程分支删除失败",
+    );
   }
 }

package/src/commands/stash.ts

@@ -1,4 +1,4 @@
-import { execSync, spawn } from "child_process";
+import { spawn } from "child_process";
 import { select, input } from "@inquirer/prompts";
 import ora from "ora";
 import boxen from "boxen";
@@ -7,6 +7,8 @@ import {
   theme,
   divider,
   execOutput,
+  execAsync,
+  execWithSpinner,
   type BranchType,
 } from "../utils.js";
 import { getBranchName } from "./branch.js";
@@ -40,7 +42,7 @@ function parseStashList(): StashEntry[] {
       message = message || "(no message)";
 
       const filesRaw = execOutput(
-        `git stash show stash@{${index}} --name-only 2>/dev/null`
+        `git stash show stash@{${index}} --name-only 2>/dev/null`,
       );
       const files = filesRaw ? filesRaw.split("\n").filter(Boolean) : [];
 
@@ -145,10 +147,10 @@ async function showStashActions(entry: StashEntry): Promise<void> {
 
   switch (action) {
     case "apply":
-      applyStash(entry.index, false);
+      await applyStash(entry.index, false);
       break;
     case "pop":
-      applyStash(entry.index, true);
+      await applyStash(entry.index, true);
       break;
     case "branch":
       await createBranchFromStash(entry.index);
@@ -193,27 +195,34 @@ async function createStash(): Promise<void> {
   });
 
   const spinner = ora("创建 stash...").start();
-  try {
-    let cmd = "git stash push";
-    if (includeUntracked) cmd += " -u";
-    if (message) cmd += ` -m "${message.replace(/"/g, '\\"')}"`;
-    execSync(cmd, { stdio: "pipe" });
-    spinner.succeed("Stash 创建成功");
+  let cmd = "git stash push";
+  if (includeUntracked) cmd += " -u";
+  if (message) cmd += ` -m "${message.replace(/"/g, '\\"')}"`;
+
+  const success = await execWithSpinner(
+    cmd,
+    spinner,
+    "Stash 创建成功",
+    "Stash 创建失败",
+  );
+
+  if (success) {
     await stash();
-  } catch {
-    spinner.fail("Stash 创建失败");
   }
 }
 
-function applyStash(index: number, pop: boolean): void {
+async function applyStash(index: number, pop: boolean): Promise<void> {
   const action = pop ? "pop" : "apply";
   const spinner = ora(`${pop ? "弹出" : "应用"} stash...`).start();
 
-  try {
-    execSync(`git stash ${action} stash@{${index}}`, { stdio: "pipe" });
-    spinner.succeed(`Stash ${pop ? "已弹出" : "已应用"}`);
-  } catch {
-    spinner.fail("操作失败，可能存在冲突");
+  const success = await execWithSpinner(
+    `git stash ${action} stash@{${index}}`,
+    spinner,
+    `Stash ${pop ? "已弹出" : "已应用"}`,
+    "操作失败，可能存在冲突",
+  );
+
+  if (!success) {
     const status = execOutput("git status --porcelain");
     if (status.includes("UU") || status.includes("AA")) {
       console.log(colors.yellow("\n存在冲突，请手动解决后提交"));
@@ -225,7 +234,7 @@ async function showDiff(index: number): Promise<void> {
   try {
     // 获取差异内容（不使用颜色，我们自己格式化）
     const diffOutput = execOutput(
-      `git stash show -p --no-color stash@{${index}}`
+      `git stash show -p --no-color stash@{${index}}`,
     );
 
     if (!diffOutput) {
@@ -424,14 +433,12 @@ async function createBranchFromStash(index: number): Promise<void> {
   if (!branchName) return;
 
   const spinner = ora(`创建分支 ${branchName}...`).start();
-  try {
-    execSync(`git stash branch "${branchName}" stash@{${index}}`, {
-      stdio: "pipe",
-    });
-    spinner.succeed(`分支已创建: ${branchName} (stash 已自动弹出)`);
-  } catch {
-    spinner.fail("创建分支失败");
-  }
+  await execWithSpinner(
+    `git stash branch "${branchName}" stash@{${index}}`,
+    spinner,
+    `分支已创建: ${branchName} (stash 已自动弹出)`,
+    "创建分支失败",
+  );
 }
 
 async function dropStash(index: number): Promise<void> {
@@ -450,10 +457,10 @@ async function dropStash(index: number): Promise<void> {
   }
 
   const spinner = ora("删除 stash...").start();
-  try {
-    execSync(`git stash drop stash@{${index}}`, { stdio: "pipe" });
-    spinner.succeed("Stash 已删除");
-  } catch {
-    spinner.fail("删除失败");
-  }
+  await execWithSpinner(
+    `git stash drop stash@{${index}}`,
+    spinner,
+    "Stash 已删除",
+    "删除失败",
+  );
 }

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} 个`,
       );
     }
   }