git-sync-tui 0.1.5 → 0.1.6

package/dist/cli.js

@@ -11,9 +11,9 @@ import { render } from "ink";
 import meow from "meow";
 
 // src/app.tsx
-import { useState as useState7, useEffect as useEffect5, useRef as useRef3, useCallback as useCallback2 } from "react";
-import { Box as Box9, useApp } from "ink";
-import { Spinner as Spinner6 } from "@inkjs/ui";
+import { useState as useState8, useEffect as useEffect6, useRef as useRef5, useCallback as useCallback3 } from "react";
+import { Box as Box10, useApp } from "ink";
+import { Spinner as Spinner7 } from "@inkjs/ui";
 
 // src/components/ui.tsx
 import React from "react";
@@ -92,11 +92,14 @@ function StatusPanel({ type, title, children }) {
     children
   ] });
 }
-function AppHeader({ step, stashed }) {
+function AppHeader({ step, stashed, noCommit }) {
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
       /* @__PURE__ */ jsx(Text, { backgroundColor: "cyan", color: "white", bold: true, children: " git-sync-tui " }),
-      /* @__PURE__ */ jsx(Text, { color: "gray", children: "cherry-pick --no-commit" }),
+      /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+        "cherry-pick",
+        noCommit ? " --no-commit" : ""
+      ] }),
       stashed && /* @__PURE__ */ jsx(Text, { backgroundColor: "yellow", color: "white", bold: true, children: " STASHED " })
     ] }),
     /* @__PURE__ */ jsxs(Box, { marginTop: 0, children: [
@@ -187,6 +190,8 @@ async function getCommits(remote2, branch2, count2 = 100) {
   const result = await git.raw([
     "log",
     ref,
+    "--first-parent",
+    "--no-merges",
     `--max-count=${count2}`,
     "--format=%H%n%h%n%s%n%an%n%ar%n---"
   ]);
@@ -281,6 +286,45 @@ async function getStagedStat() {
     return "";
   }
 }
+var BACKUP_BRANCH_PREFIX = "git-sync-backup";
+async function createBackupBranch() {
+  const git = getGit();
+  const timestamp = Date.now();
+  const branchName = `${BACKUP_BRANCH_PREFIX}-${timestamp}`;
+  await git.raw(["branch", branchName]);
+  return branchName;
+}
+async function restoreFromBackup(backupBranch) {
+  const git = getGit();
+  try {
+    await git.raw(["rev-parse", "--verify", backupBranch]);
+    await git.raw(["reset", "--hard", backupBranch]);
+    await git.raw(["branch", "-D", backupBranch]);
+    return { success: true };
+  } catch (err) {
+    return {
+      success: false,
+      error: `\u56DE\u9000\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: git reset --hard ${backupBranch}
+${err.message}`
+    };
+  }
+}
+async function deleteBackupBranch(backupBranch) {
+  const git = getGit();
+  try {
+    await git.raw(["branch", "-D", backupBranch]);
+  } catch {
+  }
+}
+async function getCurrentBranch() {
+  const git = getGit();
+  const result = await git.raw(["rev-parse", "--abbrev-ref", "HEAD"]);
+  return result.trim();
+}
+async function createBranchFrom(newBranch, baseBranch) {
+  const git = getGit();
+  await git.raw(["checkout", "-b", newBranch, baseBranch]);
+}
 async function isWorkingDirClean() {
   const git = getGit();
   const status = await git.status();
@@ -304,6 +348,87 @@ async function stashPop() {
     return false;
   }
 }
+async function abortCherryPick() {
+  const git = getGit();
+  try {
+    await git.raw(["cherry-pick", "--abort"]);
+  } catch {
+  }
+}
+async function getConflictFiles() {
+  const git = getGit();
+  const status = await git.status();
+  return status.conflicted;
+}
+async function continueCherryPick() {
+  const git = getGit();
+  try {
+    await git.raw(["cherry-pick", "--continue", "--no-edit"]);
+    return { success: true };
+  } catch (err) {
+    const msg = err.message || "";
+    if (msg.includes("nothing to commit") || msg.includes("empty") || msg.includes("allow-empty")) {
+      return { success: false, error: msg, empty: true };
+    }
+    try {
+      const status = await git.status();
+      const conflictFiles = status.conflicted;
+      return {
+        success: false,
+        error: msg,
+        conflictFiles: conflictFiles.length > 0 ? conflictFiles : void 0
+      };
+    } catch {
+      return { success: false, error: msg };
+    }
+  }
+}
+async function clearCherryPickState() {
+  try {
+    const gitDir = await getGitDir();
+    const cpHead = join(gitDir, "CHERRY_PICK_HEAD");
+    if (existsSync(cpHead)) {
+      unlinkSync(cpHead);
+    }
+  } catch {
+  }
+}
+async function cherryPickOne(hash, useMainline = false, noCommit = true) {
+  const git = getGit();
+  try {
+    const args = ["cherry-pick"];
+    if (noCommit) args.push("--no-commit");
+    if (useMainline) args.push("-m", "1");
+    args.push(hash);
+    await git.raw(args);
+    return { success: true };
+  } catch (err) {
+    try {
+      const status = await git.status();
+      const conflictFiles = status.conflicted;
+      return {
+        success: false,
+        error: err.message,
+        conflictFiles: conflictFiles.length > 0 ? conflictFiles : void 0
+      };
+    } catch {
+      return { success: false, error: err.message };
+    }
+  }
+}
+async function skipCherryPick() {
+  const git = getGit();
+  await git.raw(["cherry-pick", "--skip"]);
+}
+async function isCherryPickInProgress() {
+  const git = getGit();
+  try {
+    const gitDir = await getGitDir();
+    return existsSync(join(gitDir, "CHERRY_PICK_HEAD"));
+  } catch {
+    return false;
+  }
+}
 var STASH_GUARD_FILE = "git-sync-tui-stash-guard";
 async function getGitDir() {
   const git = getGit();
@@ -1043,11 +1168,107 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
   ] });
 }
 
-// src/components/confirm-panel.tsx
+// src/components/branch-check.tsx
+import { useState as useState6, useEffect as useEffect4, useRef as useRef3 } from "react";
 import { Box as Box7, Text as Text7, useInput as useInput6 } from "ink";
+import { Spinner as Spinner5 } from "@inkjs/ui";
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline, onToggleMainline, onConfirm, onCancel }) {
+var BASE_BRANCHES = ["main", "master"];
+function BranchCheck({ targetBranch, onContinue, onBack }) {
+  const [currentBranch, setCurrentBranch] = useState6(null);
+  const [creating, setCreating] = useState6(false);
+  const [error2, setError] = useState6(null);
+  const [matched, setMatched] = useState6(false);
+  const autoCreated = useRef3(false);
+  useEffect4(() => {
+    getCurrentBranch().then((branch2) => {
+      setCurrentBranch(branch2);
+      if (branch2 === targetBranch) {
+        setMatched(true);
+      }
+    });
+  }, [targetBranch]);
+  useEffect4(() => {
+    if (matched) onContinue();
+  }, [matched]);
+  useEffect4(() => {
+    if (currentBranch === null || matched || autoCreated.current) return;
+    if (!BASE_BRANCHES.includes(currentBranch)) return;
+    autoCreated.current = true;
+    setCreating(true);
+    createBranchFrom(targetBranch, currentBranch).then(() => {
+      onContinue();
+    }).catch((err) => {
+      setCreating(false);
+      setError(err.message);
+    });
+  }, [currentBranch, matched, targetBranch]);
+  const doCreate = () => {
+    if (!currentBranch) return;
+    setCreating(true);
+    setError(null);
+    createBranchFrom(targetBranch, currentBranch).then(() => {
+      onContinue();
+    }).catch((err) => {
+      setCreating(false);
+      setError(err.message);
+    });
+  };
   useInput6((input, key) => {
+    if (creating || currentBranch === null || matched) return;
+    if (BASE_BRANCHES.includes(currentBranch)) return;
+    if (input === "y" || input === "Y") {
+      doCreate();
+    } else if (input === "n" || input === "N") {
+      onContinue();
+    } else if (key.escape) {
+      onBack?.();
+    }
+  });
+  if (currentBranch === null || matched) {
+    return /* @__PURE__ */ jsx7(Spinner5, { label: "\u68C0\u67E5\u5F53\u524D\u5206\u652F..." });
+  }
+  if (creating) {
+    return /* @__PURE__ */ jsx7(Spinner5, { label: `\u6B63\u5728\u4ECE ${currentBranch} \u521B\u5EFA\u5206\u652F ${targetBranch}...` });
+  }
+  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx7(SectionHeader, { title: "\u5206\u652F\u68C0\u67E5" }),
+    /* @__PURE__ */ jsxs7(StatusPanel, { type: "warn", title: "\u5F53\u524D\u5206\u652F\u4E0E\u76EE\u6807\u5206\u652F\u4E0D\u4E00\u81F4", children: [
+      /* @__PURE__ */ jsxs7(Box7, { children: [
+        /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "  \u5F53\u524D\u5206\u652F: " }),
+        /* @__PURE__ */ jsx7(Text7, { color: "yellow", bold: true, children: currentBranch })
+      ] }),
+      /* @__PURE__ */ jsxs7(Box7, { children: [
+        /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "  \u76EE\u6807\u5206\u652F: " }),
+        /* @__PURE__ */ jsx7(Text7, { color: "cyan", bold: true, children: targetBranch })
+      ] })
+    ] }),
+    error2 && /* @__PURE__ */ jsxs7(Text7, { color: "red", children: [
+      "\u2716 ",
+      error2
+    ] }),
+    /* @__PURE__ */ jsxs7(Box7, { children: [
+      /* @__PURE__ */ jsxs7(Text7, { bold: true, children: [
+        "\u4ECE ",
+        currentBranch,
+        " \u521B\u5EFA ",
+        targetBranch,
+        " \u5206\u652F? "
+      ] }),
+      /* @__PURE__ */ jsx7(InlineKeys, { hints: [
+        { key: "y", label: "\u521B\u5EFA\u5E76\u5207\u6362" },
+        { key: "n", label: "\u8DF3\u8FC7" },
+        { key: "Esc", label: "\u8FD4\u56DE" }
+      ] })
+    ] })
+  ] });
+}
+
+// src/components/confirm-panel.tsx
+import { Box as Box8, Text as Text8, useInput as useInput7 } from "ink";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline, noCommit, onToggleMainline, onToggleNoCommit, onConfirm, onCancel }) {
+  useInput7((input, key) => {
     if (key.escape) {
       onCancel();
     } else if (input === "y" || input === "Y") {
@@ -1056,43 +1277,54 @@ function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline
       onCancel();
     } else if (hasMerge && (input === "m" || input === "M")) {
       onToggleMainline();
+    } else if (input === "c" || input === "C") {
+      onToggleNoCommit();
     }
   });
   const selectedCommits = selectedHashes.map((hash) => commits2.find((c) => c.hash === hash)).filter(Boolean);
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx7(SectionHeader, { title: "\u786E\u8BA4\u6267\u884C" }),
-    /* @__PURE__ */ jsx7(StatusPanel, { type: "info", title: `cherry-pick --no-commit \xB7 ${selectedCommits.length} \u4E2A commit`, children: selectedCommits.map((c) => /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsxs7(Text7, { color: "yellow", children: [
+  const modeLabel = noCommit ? "--no-commit" : "\u9010\u4E2A\u63D0\u4EA4";
+  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx8(SectionHeader, { title: "\u786E\u8BA4\u6267\u884C" }),
+    /* @__PURE__ */ jsx8(StatusPanel, { type: "info", title: `cherry-pick \xB7 ${modeLabel} \xB7 ${selectedCommits.length} \u4E2A commit`, children: selectedCommits.map((c) => /* @__PURE__ */ jsxs8(Box8, { children: [
+      /* @__PURE__ */ jsxs8(Text8, { color: "yellow", children: [
         "  ",
         c.shortHash
       ] }),
-      /* @__PURE__ */ jsxs7(Text7, { children: [
+      /* @__PURE__ */ jsxs8(Text8, { children: [
         " ",
         c.message
       ] }),
-      /* @__PURE__ */ jsxs7(Text7, { color: "gray", dimColor: true, children: [
+      /* @__PURE__ */ jsxs8(Text8, { color: "gray", dimColor: true, children: [
         " ",
         c.author
       ] })
     ] }, c.hash)) }),
-    hasMerge && /* @__PURE__ */ jsxs7(StatusPanel, { type: "warn", title: "\u68C0\u6D4B\u5230 Merge Commit", children: [
-      /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "  Cherry-pick \u5408\u5E76\u63D0\u4EA4\u9700\u8981\u6307\u5B9A\u7236\u8282\u70B9 (-m 1)" }),
-      /* @__PURE__ */ jsxs7(Box7, { children: [
-        /* @__PURE__ */ jsx7(Text7, { children: "  " }),
-        /* @__PURE__ */ jsx7(Text7, { color: "cyan", children: "[m]" }),
-        /* @__PURE__ */ jsx7(Text7, { children: " \u5207\u6362 -m 1: " }),
-        useMainline ? /* @__PURE__ */ jsx7(Text7, { color: "green", bold: true, children: "\u5DF2\u542F\u7528" }) : /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "\u672A\u542F\u7528" })
+    /* @__PURE__ */ jsxs8(Box8, { children: [
+      /* @__PURE__ */ jsx8(Text8, { color: "cyan", children: "[c]" }),
+      /* @__PURE__ */ jsx8(Text8, { children: " \u63D0\u4EA4\u6A21\u5F0F: " }),
+      noCommit ? /* @__PURE__ */ jsxs8(Box8, { children: [
+        /* @__PURE__ */ jsx8(Text8, { color: "yellow", bold: true, children: "--no-commit" }),
+        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: " (\u6539\u52A8\u6682\u5B58\u5230\u5DE5\u4F5C\u533A\uFF0C\u9700\u624B\u52A8 commit)" })
+      ] }) : /* @__PURE__ */ jsxs8(Box8, { children: [
+        /* @__PURE__ */ jsx8(Text8, { color: "green", bold: true, children: "\u9010\u4E2A\u63D0\u4EA4" }),
+        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: " (\u4FDD\u7559\u539F\u59CB commit \u4FE1\u606F)" })
       ] })
     ] }),
-    /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsx7(Text7, { color: "yellow", children: "\u25B2 " }),
-      /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "--no-commit \u6A21\u5F0F\uFF0C\u6539\u52A8\u5C06\u6682\u5B58\u5230\u5DE5\u4F5C\u533A\uFF0C\u9700\u624B\u52A8 commit" })
+    hasMerge && /* @__PURE__ */ jsxs8(StatusPanel, { type: "warn", title: "\u68C0\u6D4B\u5230 Merge Commit", children: [
+      /* @__PURE__ */ jsx8(Text8, { color: "gray", children: "  Cherry-pick \u5408\u5E76\u63D0\u4EA4\u9700\u8981\u6307\u5B9A\u7236\u8282\u70B9 (-m 1)" }),
+      /* @__PURE__ */ jsxs8(Box8, { children: [
+        /* @__PURE__ */ jsx8(Text8, { children: "  " }),
+        /* @__PURE__ */ jsx8(Text8, { color: "cyan", children: "[m]" }),
+        /* @__PURE__ */ jsx8(Text8, { children: " \u5207\u6362 -m 1: " }),
+        useMainline ? /* @__PURE__ */ jsx8(Text8, { color: "green", bold: true, children: "\u5DF2\u542F\u7528" }) : /* @__PURE__ */ jsx8(Text8, { color: "gray", children: "\u672A\u542F\u7528" })
+      ] })
     ] }),
-    /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsx7(Text7, { bold: true, children: "\u786E\u8BA4\u6267\u884C? " }),
-      /* @__PURE__ */ jsx7(InlineKeys, { hints: [
+    /* @__PURE__ */ jsxs8(Box8, { children: [
+      /* @__PURE__ */ jsx8(Text8, { bold: true, children: "\u786E\u8BA4\u6267\u884C? " }),
+      /* @__PURE__ */ jsx8(InlineKeys, { hints: [
         { key: "y", label: "\u786E\u8BA4" },
         { key: "n", label: "\u53D6\u6D88" },
+        { key: "c", label: "\u5207\u6362\u63D0\u4EA4\u6A21\u5F0F" },
         ...hasMerge ? [{ key: "m", label: "\u5207\u6362 -m 1" }] : [],
         { key: "Esc", label: "\u8FD4\u56DE" }
       ] })
@@ -1101,92 +1333,295 @@ function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline
 }
 
 // src/components/result-panel.tsx
-import { useState as useState6, useEffect as useEffect4 } from "react";
-import { Box as Box8, Text as Text8 } from "ink";
-import { Spinner as Spinner5 } from "@inkjs/ui";
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
-function ResultPanel({ selectedHashes, useMainline, stashed, onStashRestored, onDone }) {
-  const [phase, setPhase] = useState6("executing");
-  const [result, setResult] = useState6(null);
-  const [stagedStat, setStagedStat] = useState6("");
-  const [stashRestored, setStashRestored] = useState6(null);
-  const tryRestoreStash = async () => {
+import { useState as useState7, useEffect as useEffect5, useCallback as useCallback2, useRef as useRef4 } from "react";
+import { Box as Box9, Text as Text9, useInput as useInput8 } from "ink";
+import { Spinner as Spinner6 } from "@inkjs/ui";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRestored, onDone }) {
+  const [phase, setPhase] = useState7("executing");
+  const [conflictFiles, setConflictFiles] = useState7([]);
+  const [currentIndex, setCurrentIndex] = useState7(0);
+  const [stagedStat, setStagedStat] = useState7("");
+  const [stashRestored, setStashRestored] = useState7(null);
+  const [errorMsg, setErrorMsg] = useState7("");
+  const [completedCount, setCompletedCount] = useState7(0);
+  const [skippedCount, setSkippedCount] = useState7(0);
+  const remainingRef = useRef4([]);
+  const backupBranchRef = useRef4("");
+  const orderedHashes = useRef4([...selectedHashes].reverse());
+  const tryRestoreStash = useCallback2(async () => {
     if (!stashed) return true;
     setPhase("restoring");
     const ok = await stashPop();
     setStashRestored(ok);
     if (ok) onStashRestored();
     return ok;
-  };
-  useEffect4(() => {
-    async function run() {
-      const res = await cherryPick(selectedHashes, useMainline);
-      setResult(res);
-      if (res.success) {
-        const stat = await getStagedStat();
-        setStagedStat(stat);
-        await tryRestoreStash();
-        setPhase("done");
-      } else {
-        await tryRestoreStash();
-        setPhase("error");
+  }, [stashed, onStashRestored]);
+  const finishAll = useCallback2(async () => {
+    if (noCommit) {
+      const stat = await getStagedStat();
+      setStagedStat(stat);
+    }
+    if (backupBranchRef.current) {
+      await deleteBackupBranch(backupBranchRef.current);
+    }
+    await tryRestoreStash();
+    setPhase("done");
+  }, [noCommit, tryRestoreStash]);
+  const executeFrom = useCallback2(async (startIndex) => {
+    const hashes = orderedHashes.current;
+    for (let i = startIndex; i < hashes.length; i++) {
+      setCurrentIndex(i);
+      const res = await cherryPickOne(hashes[i], useMainline, noCommit);
+      if (!res.success) {
+        setConflictFiles(res.conflictFiles || []);
+        remainingRef.current = hashes.slice(i + 1);
+        setPhase("conflict");
+        return;
       }
+      setCompletedCount((c) => c + 1);
     }
-    run();
+    await finishAll();
+  }, [useMainline, noCommit, finishAll]);
+  useEffect5(() => {
+    createBackupBranch().then((branch2) => {
+      backupBranchRef.current = branch2;
+      executeFrom(0);
+    });
   }, []);
+  const continueRemaining = useCallback2(async () => {
+    const remaining = remainingRef.current;
+    if (remaining.length === 0) {
+      await finishAll();
+      return;
+    }
+    setPhase("executing");
+    for (let i = 0; i < remaining.length; i++) {
+      setCurrentIndex(orderedHashes.current.length - remaining.length + i);
+      const res = await cherryPickOne(remaining[i], useMainline, noCommit);
+      if (!res.success) {
+        setConflictFiles(res.conflictFiles || []);
+        remainingRef.current = remaining.slice(i + 1);
+        setPhase("conflict");
+        return;
+      }
+      setCompletedCount((c) => c + 1);
+    }
+    await finishAll();
+  }, [useMainline, noCommit, finishAll]);
+  const handleContinue = useCallback2(async () => {
+    const conflicts = await getConflictFiles();
+    if (conflicts.length > 0) {
+      setConflictFiles(conflicts);
+      setErrorMsg("\u4ECD\u6709\u672A\u89E3\u51B3\u7684\u51B2\u7A81\u6587\u4EF6\uFF0C\u8BF7\u5148\u89E3\u51B3\u5E76 git add");
+      return;
+    }
+    setPhase("continuing");
+    setErrorMsg("");
+    const inProgress = await isCherryPickInProgress();
+    if (noCommit) {
+      if (inProgress) await clearCherryPickState();
+      setCompletedCount((c) => c + 1);
+      await continueRemaining();
+    } else if (!inProgress) {
+      setCompletedCount((c) => c + 1);
+      await continueRemaining();
+    } else {
+      const contResult = await continueCherryPick();
+      if (contResult.empty) {
+        setPhase("empty");
+        return;
+      }
+      if (!contResult.success) {
+        setConflictFiles(contResult.conflictFiles || []);
+        setErrorMsg("cherry-pick --continue \u5931\u8D25: " + (contResult.error || "").substring(0, 100));
+        setPhase("conflict");
+        return;
+      }
+      setCompletedCount((c) => c + 1);
+      await continueRemaining();
+    }
+  }, [noCommit, continueRemaining]);
+  const handleSkip = useCallback2(async () => {
+    setPhase("continuing");
+    setErrorMsg("");
+    await skipCherryPick();
+    setSkippedCount((c) => c + 1);
+    await continueRemaining();
+  }, [continueRemaining]);
+  const handleAbort = useCallback2(async () => {
+    setPhase("aborting");
+    await abortCherryPick();
+    if (backupBranchRef.current) {
+      const result = await restoreFromBackup(backupBranchRef.current);
+      if (!result.success) {
+        setErrorMsg(result.error || "");
+      }
+      backupBranchRef.current = "";
+    }
+    await tryRestoreStash();
+    setPhase("aborted");
+  }, [tryRestoreStash]);
+  useInput8((input, key) => {
+    if (phase === "conflict") {
+      if (input === "c" || input === "C") {
+        handleContinue();
+      } else if (input === "a" || input === "A") {
+        handleAbort();
+      } else if (input === "q" || input === "Q") {
+        onDone();
+      }
+    } else if (phase === "empty") {
+      if (input === "s" || input === "S") {
+        handleSkip();
+      } else if (input === "a" || input === "A") {
+        handleAbort();
+      } else if (input === "q" || input === "Q") {
+        onDone();
+      }
+    }
+  });
   if (phase === "executing") {
-    return /* @__PURE__ */ jsx8(Spinner5, { label: `cherry-pick --no-commit (${selectedHashes.length} \u4E2A commit)...` });
+    const mode = noCommit ? "--no-commit" : "";
+    return /* @__PURE__ */ jsx9(Spinner6, { label: `cherry-pick ${mode} (${currentIndex + 1}/${orderedHashes.current.length})...` });
+  }
+  if (phase === "continuing") {
+    return /* @__PURE__ */ jsx9(Spinner6, { label: "\u7EE7\u7EED cherry-pick..." });
+  }
+  if (phase === "aborting") {
+    return /* @__PURE__ */ jsx9(Spinner6, { label: "\u6B63\u5728\u653E\u5F03 cherry-pick..." });
   }
   if (phase === "restoring") {
-    return /* @__PURE__ */ jsx8(Spinner5, { label: "\u6062\u590D\u5DE5\u4F5C\u533A (git stash pop)..." });
+    return /* @__PURE__ */ jsx9(Spinner6, { label: "\u6062\u590D\u5DE5\u4F5C\u533A (git stash pop)..." });
+  }
+  if (phase === "empty") {
+    const total2 = orderedHashes.current.length;
+    const currentHash = orderedHashes.current[total2 - remainingRef.current.length - 1];
+    return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx9(SectionHeader, { title: "\u7A7A\u63D0\u4EA4" }),
+      /* @__PURE__ */ jsx9(StatusPanel, { type: "warn", title: `commit ${currentHash?.substring(0, 7)} \u89E3\u51B3\u51B2\u7A81\u540E\u65E0\u5B9E\u9645\u53D8\u66F4`, children: /* @__PURE__ */ jsx9(Text9, { color: "gray", children: "  \u8BE5 commit \u7684\u6240\u6709\u66F4\u6539\u5728\u51B2\u7A81\u89E3\u51B3\u8FC7\u7A0B\u4E2D\u5DF2\u88AB\u4E22\u5F03" }) }),
+      /* @__PURE__ */ jsx9(Box9, { children: /* @__PURE__ */ jsx9(InlineKeys, { hints: [
+        { key: "s", label: "\u8DF3\u8FC7\u6B64 commit (skip)" },
+        { key: "a", label: "\u653E\u5F03\u5168\u90E8 (abort)" },
+        { key: "q", label: "\u9000\u51FA (\u4FDD\u7559\u5F53\u524D\u72B6\u6001)" }
+      ] }) })
+    ] });
   }
-  if (phase === "error" && result) {
-    return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx8(SectionHeader, { title: "Cherry-pick \u9047\u5230\u51B2\u7A81" }),
-      result.conflictFiles && result.conflictFiles.length > 0 && /* @__PURE__ */ jsx8(StatusPanel, { type: "error", title: "\u51B2\u7A81\u6587\u4EF6", children: result.conflictFiles.map((f) => /* @__PURE__ */ jsxs8(Text8, { color: "red", children: [
+  if (phase === "conflict") {
+    const total2 = orderedHashes.current.length;
+    const doneCount = total2 - remainingRef.current.length - 1;
+    const currentHash = orderedHashes.current[total2 - remainingRef.current.length - 1];
+    return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx9(SectionHeader, { title: "Cherry-pick \u9047\u5230\u51B2\u7A81" }),
+      /* @__PURE__ */ jsxs9(Box9, { gap: 2, children: [
+        /* @__PURE__ */ jsxs9(Text9, { color: "gray", dimColor: true, children: [
+          "\u8FDB\u5EA6: ",
+          doneCount,
+          "/",
+          total2
+        ] }),
+        /* @__PURE__ */ jsxs9(Text9, { color: "yellow", children: [
+          "\u51B2\u7A81 commit: ",
+          currentHash?.substring(0, 7)
+        ] }),
+        remainingRef.current.length > 0 && /* @__PURE__ */ jsxs9(Text9, { color: "gray", dimColor: true, children: [
+          "\u5269\u4F59: ",
+          remainingRef.current.length
+        ] })
+      ] }),
+      conflictFiles.length > 0 && /* @__PURE__ */ jsx9(StatusPanel, { type: "error", title: "\u51B2\u7A81\u6587\u4EF6", children: conflictFiles.map((f) => /* @__PURE__ */ jsxs9(Text9, { color: "red", children: [
         "  ",
         f
       ] }, f)) }),
-      /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx8(Text8, { color: "yellow", children: "\u25B8 \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add \u548C git commit" }),
-        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: "\u25B8 \u6216\u6267\u884C git cherry-pick --abort \u653E\u5F03\u64CD\u4F5C" })
+      /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u25B8 \u8BF7\u5728\u53E6\u4E00\u4E2A\u7EC8\u7AEF\u4E2D\u624B\u52A8\u89E3\u51B3\u51B2\u7A81" }),
+        /* @__PURE__ */ jsxs9(Text9, { color: "gray", dimColor: true, children: [
+          "  1. \u7F16\u8F91\u51B2\u7A81\u6587\u4EF6\uFF0C\u89E3\u51B3\u51B2\u7A81\u6807\u8BB0 ",
+          "<<<<<<< / ======= / >>>>>>>"
+        ] }),
+        /* @__PURE__ */ jsxs9(Text9, { color: "gray", dimColor: true, children: [
+          "  2. \u6267\u884C git add ",
+          "<file>",
+          " \u6807\u8BB0\u5DF2\u89E3\u51B3"
+        ] }),
+        /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "  3. \u56DE\u5230\u6B64\u5904\u6309 [c] \u7EE7\u7EED" })
       ] }),
-      stashed && stashRestored === false && /* @__PURE__ */ jsx8(Text8, { color: "yellow", children: "\u25B2 stash \u6062\u590D\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" }),
-      stashed && stashRestored === true && /* @__PURE__ */ jsx8(Text8, { color: "green", children: "\u2714 \u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)" })
+      errorMsg && /* @__PURE__ */ jsxs9(Text9, { color: "red", children: [
+        "\u2716 ",
+        errorMsg
+      ] }),
+      /* @__PURE__ */ jsx9(Box9, { children: /* @__PURE__ */ jsx9(InlineKeys, { hints: [
+        { key: "c", label: "\u7EE7\u7EED (\u51B2\u7A81\u5DF2\u89E3\u51B3)" },
+        { key: "a", label: "\u653E\u5F03 (abort)" },
+        { key: "q", label: "\u9000\u51FA (\u4FDD\u7559\u5F53\u524D\u72B6\u6001)" }
+      ] }) })
     ] });
   }
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx8(SectionHeader, { title: "\u540C\u6B65\u5B8C\u6210" }),
-    /* @__PURE__ */ jsx8(StatusPanel, { type: "success", title: "\u6682\u5B58\u533A\u53D8\u66F4 (git diff --cached --stat)", children: /* @__PURE__ */ jsx8(Text8, { color: "gray", children: stagedStat || "(\u65E0\u53D8\u66F4)" }) }),
-    stashed && (stashRestored ? /* @__PURE__ */ jsx8(Text8, { color: "green", children: "\u2714 \u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)" }) : /* @__PURE__ */ jsx8(Text8, { color: "yellow", children: "\u25B2 stash pop \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" })),
-    /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx8(Text8, { color: "yellow", children: "\u25B2 \u6539\u52A8\u5DF2\u6682\u5B58\u5230\u5DE5\u4F5C\u533A (--no-commit \u6A21\u5F0F)" }),
-      /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: "  \u5BA1\u67E5\u540E\u624B\u52A8\u6267\u884C:" }),
-      /* @__PURE__ */ jsxs8(Text8, { color: "cyan", children: [
+  if (phase === "aborted") {
+    return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx9(SectionHeader, { title: "\u5DF2\u653E\u5F03\u64CD\u4F5C" }),
+      errorMsg ? /* @__PURE__ */ jsx9(Box9, { flexDirection: "column", children: /* @__PURE__ */ jsxs9(Text9, { color: "red", children: [
+        "\u2716 ",
+        errorMsg
+      ] }) }) : /* @__PURE__ */ jsxs9(Text9, { color: "green", children: [
+        "\u2714 ",
+        "\u5DF2\u56DE\u9000\u5230 cherry-pick \u524D\u7684\u72B6\u6001"
+      ] }),
+      stashed && stashRestored === false && /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u25B2 stash \u6062\u590D\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" }),
+      stashed && stashRestored === true && /* @__PURE__ */ jsxs9(Text9, { color: "green", children: [
+        "\u2714 ",
+        "\u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)"
+      ] })
+    ] });
+  }
+  const total = orderedHashes.current.length;
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx9(SectionHeader, { title: "\u540C\u6B65\u5B8C\u6210" }),
+    /* @__PURE__ */ jsxs9(Box9, { gap: 2, children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: "green", bold: true, children: [
+        "\u2714 ",
+        completedCount,
+        " \u4E2A commit \u5DF2\u540C\u6B65"
+      ] }),
+      skippedCount > 0 && /* @__PURE__ */ jsxs9(Text9, { color: "yellow", children: [
+        skippedCount,
+        " \u4E2A\u5DF2\u8DF3\u8FC7"
+      ] })
+    ] }),
+    noCommit && /* @__PURE__ */ jsx9(StatusPanel, { type: "success", title: "\u6682\u5B58\u533A\u53D8\u66F4 (git diff --cached --stat)", children: /* @__PURE__ */ jsx9(Text9, { color: "gray", children: stagedStat || "(\u65E0\u53D8\u66F4)" }) }),
+    stashed && (stashRestored ? /* @__PURE__ */ jsxs9(Text9, { color: "green", children: [
+      "\u2714 ",
+      "\u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)"
+    ] }) : /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u25B2 stash pop \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" })),
+    noCommit ? /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx9(Text9, { color: "yellow", children: "\u25B2 \u6539\u52A8\u5DF2\u6682\u5B58\u5230\u5DE5\u4F5C\u533A (--no-commit \u6A21\u5F0F)" }),
+      /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "  \u5BA1\u67E5\u540E\u624B\u52A8\u6267\u884C:" }),
+      /* @__PURE__ */ jsxs9(Text9, { color: "cyan", children: [
         "  git diff --cached          ",
-        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: "# \u67E5\u770B\u8BE6\u7EC6 diff" })
+        /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "# \u67E5\u770B\u8BE6\u7EC6 diff" })
       ] }),
-      /* @__PURE__ */ jsxs8(Text8, { color: "cyan", children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: "cyan", children: [
         '  git commit -m "sync: ..."  ',
-        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: "# \u63D0\u4EA4" })
+        /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "# \u63D0\u4EA4" })
       ] }),
-      /* @__PURE__ */ jsxs8(Text8, { color: "cyan", children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: "cyan", children: [
         "  git reset HEAD             ",
-        /* @__PURE__ */ jsx8(Text8, { color: "gray", dimColor: true, children: "# \u6216\u653E\u5F03" })
+        /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "# \u6216\u653E\u5F03" })
       ] })
-    ] })
+    ] }) : /* @__PURE__ */ jsx9(Box9, { flexDirection: "column", children: /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "  \u5DF2\u4FDD\u7559\u539F\u59CB commit \u4FE1\u606F\uFF0C\u53EF\u901A\u8FC7 git log \u67E5\u770B" }) })
   ] });
 }
 
 // src/app.tsx
 import { execSync } from "child_process";
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 var STEP_NUMBER = {
   checking: 0,
   "stash-recovery": 0,
   "stash-prompt": 0,
   remote: 1,
   branch: 2,
+  "branch-check": 2,
   commits: 3,
   confirm: 4,
   result: 5
@@ -1194,22 +1629,23 @@ var STEP_NUMBER = {
 var STEP_DEBOUNCE = 100;
 function App({ initialRemote, initialBranch }) {
   const { exit } = useApp();
-  const entryStep = initialRemote && initialBranch ? "commits" : initialRemote ? "branch" : "remote";
-  const [step, setStepRaw] = useState7("checking");
-  const [inputReady, setInputReady] = useState7(true);
-  const [remote2, setRemote] = useState7(initialRemote || "");
-  const [branch2, setBranch] = useState7(initialBranch || "");
-  const [selectedHashes, setSelectedHashes] = useState7([]);
-  const [commits2, setCommits] = useState7([]);
-  const [hasMerge, setHasMerge] = useState7(false);
-  const [useMainline, setUseMainline] = useState7(false);
-  const [stashed, setStashed] = useState7(false);
-  const [guardTimestamp, setGuardTimestamp] = useState7();
-  const stashedRef = useRef3(false);
-  const stashRestoredRef = useRef3(false);
-  const mountedRef = useRef3(true);
-  const debounceTimer = useRef3(null);
-  const setStep = useCallback2((newStep) => {
+  const entryStep = initialRemote && initialBranch ? "branch-check" : initialRemote ? "branch" : "remote";
+  const [step, setStepRaw] = useState8("checking");
+  const [inputReady, setInputReady] = useState8(true);
+  const [remote2, setRemote] = useState8(initialRemote || "");
+  const [branch2, setBranch] = useState8(initialBranch || "");
+  const [selectedHashes, setSelectedHashes] = useState8([]);
+  const [commits2, setCommits] = useState8([]);
+  const [hasMerge, setHasMerge] = useState8(false);
+  const [useMainline, setUseMainline] = useState8(false);
+  const [noCommit, setNoCommit] = useState8(false);
+  const [stashed, setStashed] = useState8(false);
+  const [guardTimestamp, setGuardTimestamp] = useState8();
+  const stashedRef = useRef5(false);
+  const stashRestoredRef = useRef5(false);
+  const mountedRef = useRef5(true);
+  const debounceTimer = useRef5(null);
+  const setStep = useCallback3((newStep) => {
     setInputReady(false);
     setStepRaw(newStep);
     if (debounceTimer.current) clearTimeout(debounceTimer.current);
@@ -1217,7 +1653,7 @@ function App({ initialRemote, initialBranch }) {
       if (mountedRef.current) setInputReady(true);
     }, STEP_DEBOUNCE);
   }, []);
-  const restoreStashSync = useCallback2(() => {
+  const restoreStashSync = useCallback3(() => {
     if (stashedRef.current && !stashRestoredRef.current) {
       try {
         execSync("git stash pop", { stdio: "ignore" });
@@ -1231,11 +1667,11 @@ function App({ initialRemote, initialBranch }) {
       }
     }
   }, []);
-  const markStashRestored = useCallback2(() => {
+  const markStashRestored = useCallback3(() => {
     stashRestoredRef.current = true;
     removeStashGuard();
   }, []);
-  useEffect5(() => {
+  useEffect6(() => {
     mountedRef.current = true;
     async function check() {
       const guard = await checkStashGuard();
@@ -1290,9 +1726,10 @@ function App({ initialRemote, initialBranch }) {
     const clean = await isWorkingDirClean();
     if (mountedRef.current) setStep(clean ? entryStep : "stash-prompt");
   };
-  const goBack = useCallback2((fromStep) => {
+  const goBack = useCallback3((fromStep) => {
     const backMap = {
       branch: "remote",
+      "branch-check": "branch",
       commits: "branch",
       confirm: "commits"
     };
@@ -1304,10 +1741,10 @@ function App({ initialRemote, initialBranch }) {
       exit();
     }
   }, [setStep, restoreStashSync, exit]);
-  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx9(AppHeader, { step: STEP_NUMBER[step], stashed }),
-    step === "checking" && /* @__PURE__ */ jsx9(Spinner6, { label: "\u68C0\u67E5\u5DE5\u4F5C\u533A\u72B6\u6001..." }),
-    step === "stash-recovery" && inputReady && /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx10(AppHeader, { step: STEP_NUMBER[step], stashed, noCommit }),
+    step === "checking" && /* @__PURE__ */ jsx10(Spinner7, { label: "\u68C0\u67E5\u5DE5\u4F5C\u533A\u72B6\u6001..." }),
+    step === "stash-recovery" && inputReady && /* @__PURE__ */ jsx10(
       StashRecovery,
       {
         timestamp: guardTimestamp,
@@ -1315,14 +1752,14 @@ function App({ initialRemote, initialBranch }) {
         onSkip: skipStashRecover
       }
     ),
-    step === "stash-prompt" && inputReady && /* @__PURE__ */ jsx9(
+    step === "stash-prompt" && inputReady && /* @__PURE__ */ jsx10(
       StashPrompt,
       {
         onConfirm: doStash,
         onSkip: () => setStep(entryStep)
       }
     ),
-    step === "remote" && inputReady && /* @__PURE__ */ jsx9(
+    step === "remote" && inputReady && /* @__PURE__ */ jsx10(
       RemoteSelect,
       {
         onSelect: (r) => {
@@ -1332,49 +1769,58 @@ function App({ initialRemote, initialBranch }) {
         onBack: () => goBack("remote")
       }
     ),
-    step === "branch" && inputReady && /* @__PURE__ */ jsx9(
+    step === "branch" && inputReady && /* @__PURE__ */ jsx10(
       BranchSelect,
       {
         remote: remote2,
         onSelect: (b) => {
           setBranch(b);
-          setStep("commits");
+          setStep("branch-check");
         },
         onBack: () => goBack("branch")
       }
     ),
-    step === "commits" && inputReady && /* @__PURE__ */ jsx9(
+    step === "branch-check" && inputReady && /* @__PURE__ */ jsx10(
+      BranchCheck,
+      {
+        targetBranch: branch2,
+        onContinue: () => setStep("commits"),
+        onBack: () => goBack("branch-check")
+      }
+    ),
+    step === "commits" && inputReady && /* @__PURE__ */ jsx10(
       CommitList,
       {
         remote: remote2,
         branch: branch2,
-        onSelect: async (hashes, loadedCommits) => {
+        onSelect: (hashes, loadedCommits) => {
           setSelectedHashes(hashes);
           setCommits(loadedCommits);
-          const merge = await hasMergeCommits(hashes);
-          setHasMerge(merge);
           setStep("confirm");
         },
         onBack: () => goBack("commits")
       }
     ),
-    step === "confirm" && inputReady && /* @__PURE__ */ jsx9(
+    step === "confirm" && inputReady && /* @__PURE__ */ jsx10(
       ConfirmPanel,
       {
         commits: commits2,
         selectedHashes,
         hasMerge,
         useMainline,
+        noCommit,
         onToggleMainline: () => setUseMainline((v) => !v),
+        onToggleNoCommit: () => setNoCommit((v) => !v),
         onConfirm: () => setStep("result"),
         onCancel: () => goBack("confirm")
       }
     ),
-    step === "result" && /* @__PURE__ */ jsx9(
+    step === "result" && /* @__PURE__ */ jsx10(
       ResultPanel,
       {
         selectedHashes,
         useMainline,
+        noCommit,
         stashed,
         onStashRestored: markStashRestored,
         onDone: () => {
@@ -1551,7 +1997,7 @@ async function runCli(opts) {
 }
 
 // src/cli.tsx
-import { jsx as jsx10 } from "react/jsx-runtime";
+import { jsx as jsx11 } from "react/jsx-runtime";
 var cli = meow(
   `
   \u7528\u6CD5
@@ -1625,5 +2071,5 @@ if (isCliMode) {
     process.exit(1);
   });
 } else {
-  render(/* @__PURE__ */ jsx10(App, { initialRemote: remote, initialBranch: branch }));
+  render(/* @__PURE__ */ jsx11(App, { initialRemote: remote, initialBranch: branch }));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "git-sync-tui",
   "type": "module",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "packageManager": "pnpm@10.32.1",
   "description": "Interactive TUI tool for cross-repo git commit synchronization (cherry-pick --no-commit)",
   "author": "KiWi233333",