@zjex/git-workflow 0.4.3 → 0.4.4

package/dist/index.js

@@ -10,7 +10,7 @@ var __export = (target, all) => {
 };
 
 // src/utils.ts
-import { execSync } from "child_process";
+import { execSync, spawn } from "child_process";
 function exec(cmd, silent = false) {
   try {
     const options = {
@@ -51,6 +51,37 @@ function getMainBranch() {
 function divider() {
   console.log(colors.dim("\u2500".repeat(40)));
 }
+function execAsync(command, spinner) {
+  return new Promise((resolve) => {
+    const [cmd, ...args] = command.split(" ");
+    const process2 = spawn(cmd, args, {
+      stdio: spinner ? "pipe" : "inherit"
+    });
+    process2.on("close", (code) => {
+      resolve(code === 0);
+    });
+    process2.on("error", () => {
+      resolve(false);
+    });
+  });
+}
+async function execWithSpinner(command, spinner, successMessage, errorMessage) {
+  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;
+}
 var colors, TODAY, theme;
 var init_utils = __esm({
   "src/utils.ts"() {
@@ -90,7 +121,7 @@ __export(update_notifier_exports, {
   checkForUpdates: () => checkForUpdates,
   clearUpdateCache: () => clearUpdateCache
 });
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3, unlinkSync as unlinkSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4 } from "path";
@@ -154,7 +185,7 @@ function backgroundCheck(currentVersion, packageName) {
 }
 function isUsingVolta() {
   try {
-    const whichGw = execSync6("which gw", { encoding: "utf-8" }).trim();
+    const whichGw = execSync3("which gw", { encoding: "utf-8" }).trim();
     return whichGw.includes(".volta");
   } catch {
     return false;
@@ -162,7 +193,7 @@ function isUsingVolta() {
 }
 async function getLatestVersion(packageName) {
   try {
-    const result = execSync6(`npm view ${packageName} version`, {
+    const result = execSync3(`npm view ${packageName} version`, {
       encoding: "utf-8",
       timeout: 3e3,
       stdio: ["pipe", "pipe", "ignore"]
@@ -244,7 +275,7 @@ async function performUpdate(packageName) {
     spinner: "dots"
   }).start();
   try {
-    execSync6(updateCommand, {
+    execSync3(updateCommand, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -327,7 +358,6 @@ import { ExitPromptError } from "@inquirer/core";
 
 // src/commands/branch.ts
 init_utils();
-import { execSync as execSync2 } from "child_process";
 import { select, input } from "@inquirer/prompts";
 import ora from "ora";
 
@@ -511,12 +541,15 @@ async function createBranch(type, baseBranchArg) {
     }
     if (shouldPush) {
       const pushSpinner = ora("\u6B63\u5728\u63A8\u9001\u5230\u8FDC\u7A0B...").start();
-      try {
-        execSync2(`git push -u origin "${branchName}"`, { stdio: "pipe" });
-        pushSpinner.succeed(`\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B: origin/${branchName}`);
-      } catch {
-        pushSpinner.warn(
-          "\u8FDC\u7A0B\u63A8\u9001\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push -u origin " + branchName
+      const success = await execWithSpinner(
+        `git push -u origin "${branchName}"`,
+        pushSpinner,
+        `\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B: origin/${branchName}`,
+        "\u8FDC\u7A0B\u63A8\u9001\u5931\u8D25"
+      );
+      if (!success) {
+        console.log(
+          colors.dim(`  \u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push -u origin ${branchName}`)
         );
       }
     }
@@ -586,14 +619,12 @@ async function deleteBranch(branchArg) {
         return;
       }
       const spinner = ora(`\u6B63\u5728\u5220\u9664\u8FDC\u7A0B\u5206\u652F: origin/${remoteBranch}`).start();
-      try {
-        execSync2(`git push origin --delete "${remoteBranch}"`, {
-          stdio: "pipe"
-        });
-        spinner.succeed(`\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${remoteBranch}`);
-      } catch {
-        spinner.fail("\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25");
-      }
+      await execWithSpinner(
+        `git push origin --delete "${remoteBranch}"`,
+        spinner,
+        `\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${remoteBranch}`,
+        "\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25"
+      );
       return;
     }
   }
@@ -618,12 +649,12 @@ async function deleteBranch(branchArg) {
       });
       if (deleteRemote) {
         const spinner = ora(`\u6B63\u5728\u5220\u9664\u8FDC\u7A0B\u5206\u652F: origin/${branch}`).start();
-        try {
-          execSync2(`git push origin --delete "${branch}"`, { stdio: "pipe" });
-          spinner.succeed(`\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${branch}`);
-        } catch {
-          spinner.fail("\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25");
-        }
+        await execWithSpinner(
+          `git push origin --delete "${branch}"`,
+          spinner,
+          `\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${branch}`,
+          "\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25"
+        );
       }
     } else {
       console.log(colors.red(`\u5206\u652F\u4E0D\u5B58\u5728: ${branch}`));
@@ -643,27 +674,28 @@ async function deleteBranch(branchArg) {
     return;
   }
   const localSpinner = ora(`\u6B63\u5728\u5220\u9664\u672C\u5730\u5206\u652F: ${branch}`).start();
-  try {
-    execSync2(`git branch -D "${branch}"`, { stdio: "pipe" });
-    localSpinner.succeed(`\u672C\u5730\u5206\u652F\u5DF2\u5220\u9664: ${branch}`);
-  } catch {
-    localSpinner.fail("\u672C\u5730\u5206\u652F\u5220\u9664\u5931\u8D25");
+  const localSuccess = await execWithSpinner(
+    `git branch -D "${branch}"`,
+    localSpinner,
+    `\u672C\u5730\u5206\u652F\u5DF2\u5220\u9664: ${branch}`,
+    "\u672C\u5730\u5206\u652F\u5220\u9664\u5931\u8D25"
+  );
+  if (!localSuccess) {
     return;
   }
   if (hasRemote) {
     const remoteSpinner = ora(`\u6B63\u5728\u5220\u9664\u8FDC\u7A0B\u5206\u652F: origin/${branch}`).start();
-    try {
-      execSync2(`git push origin --delete "${branch}"`, { stdio: "pipe" });
-      remoteSpinner.succeed(`\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${branch}`);
-    } catch {
-      remoteSpinner.fail("\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25");
-    }
+    await execWithSpinner(
+      `git push origin --delete "${branch}"`,
+      remoteSpinner,
+      `\u8FDC\u7A0B\u5206\u652F\u5DF2\u5220\u9664: origin/${branch}`,
+      "\u8FDC\u7A0B\u5206\u652F\u5220\u9664\u5931\u8D25"
+    );
   }
 }
 
 // src/commands/tag.ts
 init_utils();
-import { execSync as execSync3 } from "child_process";
 import { select as select2, input as input2 } from "@inquirer/prompts";
 import ora2 from "ora";
 async function listTags(prefix) {
@@ -970,28 +1002,29 @@ async function createTag(inputPrefix) {
     console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
     return;
   }
-  doCreateTag(nextTag);
+  await doCreateTag(nextTag);
 }
-function doCreateTag(tagName) {
+async function doCreateTag(tagName) {
   divider();
   const spinner = ora2(`\u6B63\u5728\u521B\u5EFA tag: ${tagName}`).start();
-  try {
-    execSync3(`git tag -a "${tagName}" -m "Release ${tagName}"`, {
-      stdio: "pipe"
-    });
-    spinner.succeed(`Tag \u521B\u5EFA\u6210\u529F: ${tagName}`);
-  } catch {
-    spinner.fail("tag \u521B\u5EFA\u5931\u8D25");
+  const success = await execWithSpinner(
+    `git tag -a "${tagName}" -m "Release ${tagName}"`,
+    spinner,
+    `Tag \u521B\u5EFA\u6210\u529F: ${tagName}`,
+    "tag \u521B\u5EFA\u5931\u8D25"
+  );
+  if (!success) {
     return;
   }
   const pushSpinner = ora2("\u6B63\u5728\u63A8\u9001\u5230\u8FDC\u7A0B...").start();
-  try {
-    execSync3(`git push origin "${tagName}"`, { stdio: "pipe" });
-    pushSpinner.succeed(`Tag \u5DF2\u63A8\u9001: ${tagName}`);
-  } catch {
-    pushSpinner.warn(
-      `\u8FDC\u7A0B\u63A8\u9001\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin ${tagName}`
-    );
+  const pushSuccess = await execWithSpinner(
+    `git push origin "${tagName}"`,
+    pushSpinner,
+    `Tag \u5DF2\u63A8\u9001: ${tagName}`,
+    "\u8FDC\u7A0B\u63A8\u9001\u5931\u8D25"
+  );
+  if (!pushSuccess) {
+    console.log(colors.dim(`  \u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin ${tagName}`));
   }
 }
 async function deleteTag() {
@@ -1029,11 +1062,13 @@ async function deleteTag() {
   }
   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");
+  const localSuccess = await execWithSpinner(
+    `git tag -d "${tagToDelete}"`,
+    spinner,
+    `\u672C\u5730 tag \u5DF2\u5220\u9664: ${tagToDelete}`,
+    "\u672C\u5730 tag \u5220\u9664\u5931\u8D25"
+  );
+  if (!localSuccess) {
     return;
   }
   const deleteRemote = await select2({
@@ -1046,10 +1081,12 @@ async function deleteTag() {
   });
   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 {
+    const remoteSuccess = await execWithSpinner(
+      `git push origin --delete "${tagToDelete}"`,
+      pushSpinner,
+      `\u8FDC\u7A0B tag \u5DF2\u5220\u9664: ${tagToDelete}`
+    );
+    if (!remoteSuccess) {
       pushSpinner.warn(
         `\u8FDC\u7A0B\u5220\u9664\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin --delete ${tagToDelete}`
       );
@@ -1096,25 +1133,32 @@ async function updateTag() {
   }
   divider();
   const spinner = ora2(`\u6B63\u5728\u91CD\u547D\u540D tag: ${oldTag} \u2192 ${newTag}`).start();
-  try {
-    const commit2 = execOutput(`git rev-list -n 1 "${oldTag}"`).trim();
-    const message = execOutput(
-      `git tag -l --format='%(contents)' "${oldTag}"`
-    ).trim();
-    if (message) {
-      execSync3(`git tag -a "${newTag}" "${commit2}" -m "${message}"`, {
-        stdio: "pipe"
-      });
-    } else {
-      execSync3(`git tag "${newTag}" "${commit2}"`, { stdio: "pipe" });
-    }
-    execSync3(`git tag -d "${oldTag}"`, { stdio: "pipe" });
-    spinner.succeed(`Tag \u5DF2\u91CD\u547D\u540D: ${oldTag} \u2192 ${newTag}`);
-  } catch (error) {
+  const commit2 = execOutput(`git rev-list -n 1 "${oldTag}"`).trim();
+  const message = execOutput(
+    `git tag -l --format='%(contents)' "${oldTag}"`
+  ).trim();
+  let createSuccess;
+  if (message) {
+    createSuccess = await execWithSpinner(
+      `git tag -a "${newTag}" "${commit2}" -m "${message}"`,
+      spinner
+    );
+  } else {
+    createSuccess = await execWithSpinner(
+      `git tag "${newTag}" "${commit2}"`,
+      spinner
+    );
+  }
+  if (!createSuccess) {
     spinner.fail("tag \u91CD\u547D\u540D\u5931\u8D25");
-    console.log(colors.red(String(error)));
     return;
   }
+  const deleteSuccess = await execAsync(`git tag -d "${oldTag}"`, spinner);
+  if (!deleteSuccess) {
+    spinner.fail("\u5220\u9664\u65E7 tag \u5931\u8D25");
+    return;
+  }
+  spinner.succeed(`Tag \u5DF2\u91CD\u547D\u540D: ${oldTag} \u2192 ${newTag}`);
   const pushRemote = await select2({
     message: "\u662F\u5426\u540C\u6B65\u5230\u8FDC\u7A0B?",
     choices: [
@@ -1125,17 +1169,29 @@ async function updateTag() {
   });
   if (pushRemote) {
     const pushSpinner = ora2("\u6B63\u5728\u540C\u6B65\u5230\u8FDC\u7A0B...").start();
-    try {
-      execSync3(`git push origin "${newTag}"`, { stdio: "pipe" });
-      execSync3(`git push origin --delete "${oldTag}"`, { stdio: "pipe" });
-      pushSpinner.succeed(`\u8FDC\u7A0B tag \u5DF2\u540C\u6B65: ${oldTag} \u2192 ${newTag}`);
-    } catch {
+    const pushNewSuccess = await execAsync(
+      `git push origin "${newTag}"`,
+      pushSpinner
+    );
+    if (!pushNewSuccess) {
       pushSpinner.warn(
         `\u8FDC\u7A0B\u540C\u6B65\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C:
   git push origin ${newTag}
   git push origin --delete ${oldTag}`
       );
+      return;
     }
+    const deleteOldSuccess = await execAsync(
+      `git push origin --delete "${oldTag}"`,
+      pushSpinner
+    );
+    if (!deleteOldSuccess) {
+      pushSpinner.warn(
+        `\u8FDC\u7A0B\u65E7 tag \u5220\u9664\u5931\u8D25\uFF0C\u53EF\u7A0D\u540E\u624B\u52A8\u6267\u884C: git push origin --delete ${oldTag}`
+      );
+      return;
+    }
+    pushSpinner.succeed(`\u8FDC\u7A0B tag \u5DF2\u540C\u6B65: ${oldTag} \u2192 ${newTag}`);
   }
 }
 async function cleanInvalidTags() {
@@ -1185,10 +1241,10 @@ async function cleanInvalidTags() {
   let localSuccess = 0;
   let localFailed = 0;
   for (const tag of invalidTags) {
-    try {
-      execSync3(`git tag -d "${tag}"`, { stdio: "pipe" });
+    const success = await execAsync(`git tag -d "${tag}"`, localSpinner);
+    if (success) {
       localSuccess++;
-    } catch {
+    } else {
       localFailed++;
     }
   }
@@ -1212,10 +1268,13 @@ async function cleanInvalidTags() {
     let remoteSuccess = 0;
     let remoteFailed = 0;
     for (const tag of invalidTags) {
-      try {
-        execSync3(`git push origin --delete "${tag}"`, { stdio: "pipe" });
+      const success = await execAsync(
+        `git push origin --delete "${tag}"`,
+        remoteSpinner
+      );
+      if (success) {
         remoteSuccess++;
-      } catch {
+      } else {
         remoteFailed++;
       }
     }
@@ -1675,7 +1734,7 @@ async function init() {
 
 // src/commands/stash.ts
 init_utils();
-import { execSync as execSync4, spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { select as select5, input as input4 } from "@inquirer/prompts";
 import ora3 from "ora";
 import boxen from "boxen";
@@ -1779,10 +1838,10 @@ async function showStashActions(entry) {
   });
   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);
@@ -1822,25 +1881,29 @@ async function createStash() {
     theme
   });
   const spinner = ora3("\u521B\u5EFA stash...").start();
-  try {
-    let cmd = "git stash push";
-    if (includeUntracked) cmd += " -u";
-    if (message) cmd += ` -m "${message.replace(/"/g, '\\"')}"`;
-    execSync4(cmd, { stdio: "pipe" });
-    spinner.succeed("Stash \u521B\u5EFA\u6210\u529F");
+  let cmd = "git stash push";
+  if (includeUntracked) cmd += " -u";
+  if (message) cmd += ` -m "${message.replace(/"/g, '\\"')}"`;
+  const success = await execWithSpinner(
+    cmd,
+    spinner,
+    "Stash \u521B\u5EFA\u6210\u529F",
+    "Stash \u521B\u5EFA\u5931\u8D25"
+  );
+  if (success) {
     await stash();
-  } catch {
-    spinner.fail("Stash \u521B\u5EFA\u5931\u8D25");
   }
 }
-function applyStash(index, pop) {
+async function applyStash(index, pop) {
   const action = pop ? "pop" : "apply";
   const spinner = ora3(`${pop ? "\u5F39\u51FA" : "\u5E94\u7528"} stash...`).start();
-  try {
-    execSync4(`git stash ${action} stash@{${index}}`, { stdio: "pipe" });
-    spinner.succeed(`Stash ${pop ? "\u5DF2\u5F39\u51FA" : "\u5DF2\u5E94\u7528"}`);
-  } catch {
-    spinner.fail("\u64CD\u4F5C\u5931\u8D25\uFF0C\u53EF\u80FD\u5B58\u5728\u51B2\u7A81");
+  const success = await execWithSpinner(
+    `git stash ${action} stash@{${index}}`,
+    spinner,
+    `Stash ${pop ? "\u5DF2\u5F39\u51FA" : "\u5DF2\u5E94\u7528"}`,
+    "\u64CD\u4F5C\u5931\u8D25\uFF0C\u53EF\u80FD\u5B58\u5728\u51B2\u7A81"
+  );
+  if (!success) {
     const status = execOutput("git status --porcelain");
     if (status.includes("UU") || status.includes("AA")) {
       console.log(colors.yellow("\n\u5B58\u5728\u51B2\u7A81\uFF0C\u8BF7\u624B\u52A8\u89E3\u51B3\u540E\u63D0\u4EA4"));
@@ -1938,7 +2001,7 @@ function startPager(content) {
   return new Promise((resolve) => {
     const pager = process.env.PAGER || "less";
     try {
-      const pagerProcess = spawn(pager, ["-R", "-S", "-F", "-X", "-i"], {
+      const pagerProcess = spawn2(pager, ["-R", "-S", "-F", "-X", "-i"], {
         stdio: ["pipe", "inherit", "inherit"],
         env: { ...process.env, LESS: "-R -S -F -X -i" }
       });
@@ -1979,14 +2042,12 @@ async function createBranchFromStash(index) {
   const branchName = await getBranchName(type);
   if (!branchName) return;
   const spinner = ora3(`\u521B\u5EFA\u5206\u652F ${branchName}...`).start();
-  try {
-    execSync4(`git stash branch "${branchName}" stash@{${index}}`, {
-      stdio: "pipe"
-    });
-    spinner.succeed(`\u5206\u652F\u5DF2\u521B\u5EFA: ${branchName} (stash \u5DF2\u81EA\u52A8\u5F39\u51FA)`);
-  } catch {
-    spinner.fail("\u521B\u5EFA\u5206\u652F\u5931\u8D25");
-  }
+  await execWithSpinner(
+    `git stash branch "${branchName}" stash@{${index}}`,
+    spinner,
+    `\u5206\u652F\u5DF2\u521B\u5EFA: ${branchName} (stash \u5DF2\u81EA\u52A8\u5F39\u51FA)`,
+    "\u521B\u5EFA\u5206\u652F\u5931\u8D25"
+  );
 }
 async function dropStash(index) {
   const confirmed = await select5({
@@ -2002,17 +2063,17 @@ async function dropStash(index) {
     return;
   }
   const spinner = ora3("\u5220\u9664 stash...").start();
-  try {
-    execSync4(`git stash drop stash@{${index}}`, { stdio: "pipe" });
-    spinner.succeed("Stash \u5DF2\u5220\u9664");
-  } catch {
-    spinner.fail("\u5220\u9664\u5931\u8D25");
-  }
+  await execWithSpinner(
+    `git stash drop stash@{${index}}`,
+    spinner,
+    "Stash \u5DF2\u5220\u9664",
+    "\u5220\u9664\u5931\u8D25"
+  );
 }
 
 // src/commands/commit.ts
 init_utils();
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { writeFileSync as writeFileSync3, unlinkSync } from "fs";
 import { tmpdir } from "os";
 import { join as join3 } from "path";
@@ -2430,7 +2491,7 @@ async function commit() {
   const config2 = getConfig();
   const autoStage = config2.autoStage ?? true;
   if (autoStage) {
-    execSync5("git add -A", { stdio: "pipe" });
+    execSync2("git add -A", { stdio: "pipe" });
   }
   let { staged, unstaged } = parseGitStatus();
   if (staged.length === 0 && unstaged.length > 0 && !autoStage) {
@@ -2455,7 +2516,7 @@ async function commit() {
       return;
     }
     for (const file of filesToStage) {
-      execSync5(`git add "${file}"`, { stdio: "pipe" });
+      execSync2(`git add "${file}"`, { stdio: "pipe" });
     }
     console.log(colors.green(`\u2714 \u5DF2\u6682\u5B58 ${filesToStage.length} \u4E2A\u6587\u4EF6`));
     divider();
@@ -2547,7 +2608,7 @@ async function commit() {
   const spinner = ora4("\u6B63\u5728\u63D0\u4EA4...").start();
   try {
     if (autoStage) {
-      execSync5("git add -A", { stdio: "pipe" });
+      execSync2("git add -A", { stdio: "pipe" });
     }
     const finalStatus = parseGitStatus();
     if (finalStatus.staged.length === 0) {
@@ -2563,7 +2624,7 @@ async function commit() {
     const tmpFile = join3(tmpdir(), `.gw-commit-msg-${Date.now()}`);
     try {
       writeFileSync3(tmpFile, message, "utf-8");
-      execSync5(`git commit -F "${tmpFile}"`, {
+      execSync2(`git commit -F "${tmpFile}"`, {
         stdio: ["pipe", "pipe", "pipe"]
       });
     } finally {
@@ -2674,7 +2735,7 @@ init_update_notifier();
 
 // src/commands/update.ts
 init_utils();
-import { execSync as execSync7 } from "child_process";
+import { execSync as execSync4, spawn as spawn3 } from "child_process";
 import ora6 from "ora";
 import boxen3 from "boxen";
 import semver2 from "semver";
@@ -2693,7 +2754,7 @@ function clearUpdateCache2() {
 }
 async function getLatestVersion2(packageName) {
   try {
-    const result = execSync7(`npm view ${packageName} version`, {
+    const result = execSync4(`npm view ${packageName} version`, {
       encoding: "utf-8",
       timeout: 3e3,
       stdio: ["pipe", "pipe", "ignore"]
@@ -2705,7 +2766,7 @@ async function getLatestVersion2(packageName) {
 }
 function isUsingVolta2() {
   try {
-    const whichGw = execSync7("which gw", { encoding: "utf-8" }).trim();
+    const whichGw = execSync4("which gw", { encoding: "utf-8" }).trim();
     return whichGw.includes(".volta");
   } catch {
     return false;
@@ -2765,44 +2826,73 @@ async function update(currentVersion) {
         }
       )
     );
-    const updateSpinner = ora6("\u6B63\u5728\u66F4\u65B0...").start();
+    console.log("");
+    console.log(colors.cyan("\u{1F4E6} \u5F00\u59CB\u5B89\u88C5\u65B0\u7248\u672C..."));
+    console.log("");
     const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
-    execSync7(updateCommand, {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
+    const [command, ...args] = updateCommand.split(" ");
+    const updateProcess = spawn3(command, args, {
+      stdio: "inherit"
+      // 继承父进程的 stdio，显示实时输出
+    });
+    updateProcess.on("close", (code) => {
+      console.log("");
+      if (code === 0) {
+        console.log(colors.green("\u2714 \u66F4\u65B0\u6210\u529F\uFF01"));
+        clearUpdateCache2();
+        console.log("");
+        console.log(
+          boxen3(
+            [
+              colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
+              "",
+              `\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: 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("\u2716 \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(`  ${updateCommand}`));
+        console.log("");
+        process.exit(1);
+      }
+    });
+    updateProcess.on("error", (error) => {
+      console.log("");
+      console.log(colors.red("\u2716 \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(`  ${updateCommand}`));
+      console.log("");
+      console.log(colors.dim(`  \u9519\u8BEF\u4FE1\u606F: ${error.message}`));
+      console.log("");
+      process.exit(1);
     });
-    updateSpinner.succeed(colors.green("\u66F4\u65B0\u6210\u529F\uFF01"));
-    clearUpdateCache2();
-    console.log("");
-    console.log(
-      boxen3(
-        [
-          colors.green(colors.bold("\u2728 \u66F4\u65B0\u5B8C\u6210\uFF01")),
-          "",
-          `\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: 2, right: 2 },
-          margin: { top: 0, bottom: 1, left: 2, right: 2 },
-          borderStyle: "round",
-          borderColor: "green",
-          align: "left",
-          width: 40
-        }
-      )
-    );
     process.exit(0);
   } catch (error) {
-    spinner.fail(colors.red("\u66F4\u65B0\u5931\u8D25"));
+    spinner.fail(colors.red("\u83B7\u53D6\u7248\u672C\u4FE1\u606F\u5931\u8D25"));
     console.log("");
-    console.log(colors.dim("  \u4F60\u53EF\u4EE5\u624B\u52A8\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0:"));
-    const updateCommand = usingVolta ? `volta install ${packageName}@latest` : `npm install -g ${packageName}@latest`;
-    console.log(colors.cyan(`  ${updateCommand}`));
+    console.log(colors.dim("  \u8BF7\u68C0\u67E5\u7F51\u7EDC\u8FDE\u63A5\u540E\u91CD\u8BD5"));
+    console.log("");
+    if (error instanceof Error) {
+      console.log(colors.dim(`  \u9519\u8BEF\u4FE1\u606F: ${error.message}`));
+    }
     console.log("");
     process.exit(1);
   }
@@ -2810,9 +2900,9 @@ async function update(currentVersion) {
 
 // src/commands/log.ts
 init_utils();
-import { execSync as execSync8 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 import boxen4 from "boxen";
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 function parseGitLog(output) {
   const commits = [];
   const lines = output.trim().split("\n");
@@ -3030,7 +3120,7 @@ function formatTimelineStyle(commits) {
 function startInteractivePager(content) {
   const pager = process.env.PAGER || "less";
   try {
-    const pagerProcess = spawn2(pager, ["-R", "-S", "-F", "-X", "-i"], {
+    const pagerProcess = spawn4(pager, ["-R", "-S", "-F", "-X", "-i"], {
       stdio: ["pipe", "inherit", "inherit"],
       env: { ...process.env, LESS: "-R -S -F -X -i" }
     });
@@ -3060,7 +3150,7 @@ function executeTimelineLog(options) {
     if (options.until) cmd += ` --until="${options.until}"`;
     if (options.grep) cmd += ` --grep="${options.grep}"`;
     if (options.all) cmd += ` --all`;
-    const output = execSync8(cmd, {
+    const output = execSync5(cmd, {
       encoding: "utf8",
       stdio: "pipe",
       maxBuffer: 1024 * 1024 * 10
@@ -3120,7 +3210,7 @@ async function log(options = {}) {
 
 // src/commands/amend-date.ts
 init_utils();
-import { execSync as execSync9 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 import { select as select8, input as input6, confirm } from "@inquirer/prompts";
 function formatGitDate(date) {
   const year = date.getFullYear();
@@ -3243,7 +3333,7 @@ async function amendDate(commitHash) {
   }
   try {
     if (isLatestCommit) {
-      execSync9(
+      execSync6(
         `GIT_AUTHOR_DATE="${formattedDate}" GIT_COMMITTER_DATE="${formattedDate}" git commit --amend --no-edit --reset-author`,
         { stdio: "pipe", shell: "/bin/bash" }
       );
@@ -3254,7 +3344,7 @@ async function amendDate(commitHash) {
       console.log(colors.cyan("\u6B63\u5728\u6267\u884C rebase..."));
       const parentHash = execOutput(`git rev-parse ${selectedCommit.hash}^`);
       const filterCmd = `git filter-branch -f --env-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then export GIT_AUTHOR_DATE="${formattedDate}"; export GIT_COMMITTER_DATE="${formattedDate}"; fi' ${parentHash}..HEAD`;
-      execSync9(filterCmd, { stdio: "pipe" });
+      execSync6(filterCmd, { stdio: "pipe" });
       console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
       console.log("");
       console.log(colors.yellow("\u26A0\uFE0F  \u6CE8\u610F: commit hash \u5DF2\u6539\u53D8"));
@@ -3275,7 +3365,7 @@ async function amendDate(commitHash) {
 
 // src/commands/amend.ts
 init_utils();
-import { execSync as execSync10 } from "child_process";
+import { execSync as execSync7 } from "child_process";
 import { select as select9, input as input7, confirm as confirm2 } from "@inquirer/prompts";
 function getRecentCommits2(limit = 20) {
   const output = execOutput(`git log -${limit} --pretty=format:"%H|%s|%ai"`);
@@ -3370,7 +3460,7 @@ async function amend(commitHash) {
   }
   try {
     if (isLatestCommit) {
-      execSync10(`git commit --amend -m "${newMessage.replace(/"/g, '\\"')}"`, {
+      execSync7(`git commit --amend -m "${newMessage.replace(/"/g, '\\"')}"`, {
         stdio: "pipe"
       });
       console.log("");
@@ -3385,7 +3475,7 @@ if [ "$1" = "${selectedCommit.hash}" ]; then
 fi
 `;
       const filterCmd = `git filter-branch -f --msg-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then echo "${newMessage.replace(/"/g, '\\"')}"; else cat; fi' ${parentHash}..HEAD`;
-      execSync10(filterCmd, { stdio: "pipe" });
+      execSync7(filterCmd, { stdio: "pipe" });
       console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
       console.log("");
       console.log(colors.yellow("\u26A0\uFE0F  \u6CE8\u610F: commit hash \u5DF2\u6539\u53D8"));
@@ -3429,7 +3519,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.4.3" : "0.0.0-dev";
+var version = true ? "0.4.4" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`