@zjex/git-workflow 0.4.2 → 0.4.4

package/src/commands/amend.ts

@@ -0,0 +1,189 @@
+import { execSync } from "child_process";
+import { select, input, confirm } from "@inquirer/prompts";
+import { colors, theme, execOutput, divider } from "../utils.js";
+
+/**
+ * 获取最近的 commits
+ * @param limit 数量限制
+ * @returns commit 列表
+ */
+function getRecentCommits(limit: number = 20): Array<{
+  hash: string;
+  message: string;
+  date: string;
+}> {
+  const output = execOutput(`git log -${limit} --pretty=format:"%H|%s|%ai"`);
+
+  if (!output) return [];
+
+  return output.split("\n").map((line) => {
+    const [hash, message, date] = line.split("|");
+    return { hash, message, date };
+  });
+}
+
+/**
+ * 根据 hash 获取 commit 信息
+ * @param hash commit hash (可以是短 hash)
+ * @returns commit 信息或 null
+ */
+function getCommitByHash(hash: string): {
+  hash: string;
+  message: string;
+  date: string;
+} | null {
+  try {
+    const output = execOutput(`git log -1 ${hash} --pretty=format:"%H|%s|%ai"`);
+
+    if (!output) return null;
+
+    const [fullHash, message, date] = output.split("|");
+    return { hash: fullHash, message, date };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 修改指定 commit 的提交信息
+ * @param commitHash 可选的 commit hash
+ */
+export async function amend(commitHash?: string): Promise<void> {
+  console.log(colors.cyan("修改 Commit 提交信息"));
+  divider();
+
+  let selectedCommit: { hash: string; message: string; date: string };
+
+  // ========== 步骤 1: 确定要修改的 commit ==========
+  if (commitHash) {
+    // 如果指定了 hash，直接获取该 commit
+    const commit = getCommitByHash(commitHash);
+    if (!commit) {
+      console.log(colors.red(`✖ 找不到 commit: ${commitHash}`));
+      return;
+    }
+    selectedCommit = commit;
+  } else {
+    // 否则让用户选择
+    const commits = getRecentCommits(20);
+
+    if (commits.length === 0) {
+      console.log(colors.yellow("没有找到任何 commit"));
+      return;
+    }
+
+    selectedCommit = await select({
+      message: "选择要修改的 commit:",
+      choices: commits.map((c) => ({
+        name: `${colors.yellow(c.hash.slice(0, 7))} ${c.message} ${colors.dim(c.date)}`,
+        value: c,
+        description: c.message,
+      })),
+      pageSize: 15,
+      theme,
+    });
+  }
+
+  console.log("");
+  console.log("当前 commit 信息:");
+  console.log(`  Hash:    ${colors.yellow(selectedCommit.hash.slice(0, 7))}`);
+  console.log(`  Message: ${selectedCommit.message}`);
+  console.log(`  Date:    ${colors.dim(selectedCommit.date)}`);
+  divider();
+
+  // ========== 步骤 2: 输入新的 commit message ==========
+  const newMessage = await input({
+    message: "输入新的 commit message:",
+    default: selectedCommit.message,
+    validate: (value) => {
+      if (!value.trim()) {
+        return "commit message 不能为空";
+      }
+      return true;
+    },
+    theme,
+  });
+
+  // ========== 步骤 3: 预览并确认 ==========
+  divider();
+  console.log("修改预览:");
+  console.log(
+    `  Commit:      ${colors.yellow(selectedCommit.hash.slice(0, 7))}`,
+  );
+  console.log(`  旧 Message:  ${colors.dim(selectedCommit.message)}`);
+  console.log(`  新 Message:  ${colors.green(newMessage)}`);
+  divider();
+
+  // 检查是否是最新的 commit
+  const latestHash = execOutput("git rev-parse HEAD");
+  const isLatestCommit = selectedCommit.hash === latestHash;
+
+  if (!isLatestCommit) {
+    console.log(
+      colors.yellow(
+        "⚠️  警告: 修改非最新 commit 需要使用 rebase，可能会改变 commit hash",
+      ),
+    );
+    console.log(colors.dim("   这会影响已推送到远程的 commit，请谨慎操作"));
+    console.log("");
+  }
+
+  const shouldProceed = await confirm({
+    message: "确认修改?",
+    default: false,
+    theme,
+  });
+
+  if (!shouldProceed) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  // ========== 步骤 4: 执行修改 ==========
+  try {
+    if (isLatestCommit) {
+      // 最新 commit，使用 amend
+      execSync(`git commit --amend -m "${newMessage.replace(/"/g, '\\"')}"`, {
+        stdio: "pipe",
+      });
+
+      console.log("");
+      console.log(colors.green("✔ 修改成功"));
+    } else {
+      // 非最新 commit，使用 rebase
+      console.log("");
+      console.log(colors.cyan("正在执行 rebase..."));
+
+      // 使用 git rebase -i 的自动化方式
+      const parentHash = execOutput(`git rev-parse ${selectedCommit.hash}^`);
+
+      // 创建临时的 rebase 脚本
+      const rebaseScript = `#!/bin/sh
+if [ "$1" = "${selectedCommit.hash}" ]; then
+  echo "${newMessage}" > "$2"
+fi
+`;
+
+      // 使用 filter-branch 修改 commit message
+      const filterCmd = `git filter-branch -f --msg-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then echo "${newMessage.replace(/"/g, '\\"')}"; else cat; fi' ${parentHash}..HEAD`;
+
+      execSync(filterCmd, { stdio: "pipe" });
+
+      console.log(colors.green("✔ 修改成功"));
+      console.log("");
+      console.log(colors.yellow("⚠️  注意: commit hash 已改变"));
+      console.log(colors.dim("   如果已推送到远程，需要使用 force push:"));
+      console.log(colors.cyan("   git push --force-with-lease"));
+    }
+
+    console.log("");
+  } catch (error) {
+    console.log("");
+    console.log(colors.red("✖ 修改失败"));
+    if (error instanceof Error) {
+      console.log(colors.dim(error.message));
+    }
+    console.log("");
+    throw error;
+  }
+}

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 已删除",
+    "删除失败",
+  );
 }