git-sync-tui 0.1.4 → 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 useEffect4, useRef as useRef2, 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";
@@ -32,14 +32,18 @@ function StepProgress({ current }) {
         " ",
         isActive ? /* @__PURE__ */ jsx(Text, { bold: true, children: label }) : label
       ] }),
-      !isLast && /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: " \u2500 " })
+      !isLast && /* @__PURE__ */ jsxs(Text, { color: isDone ? "green" : "gray", dimColor: !isDone, children: [
+        " ",
+        "\u2500\u2500\u2500",
+        " "
+      ] })
     ] }, label);
   }) });
 }
 function SectionHeader({ title, subtitle }) {
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs(Text, { bold: true, color: "cyan", children: [
-      "\u25B8 ",
+      "\u25BE ",
       title
     ] }),
     subtitle && /* @__PURE__ */ jsxs(Text, { color: "gray", dimColor: true, children: [
@@ -50,10 +54,8 @@ function SectionHeader({ title, subtitle }) {
 }
 function KeyHints({ hints }) {
   return /* @__PURE__ */ jsx(Box, { gap: 1, flexWrap: "wrap", children: hints.map(({ key, label }) => /* @__PURE__ */ jsxs(Box, { children: [
-    /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "[" }),
-    /* @__PURE__ */ jsx(Text, { color: "cyan", children: key }),
-    /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "]" }),
-    /* @__PURE__ */ jsxs(Text, { color: "gray", dimColor: true, children: [
+    /* @__PURE__ */ jsx(Text, { backgroundColor: "gray", color: "white", bold: true, children: ` ${key} ` }),
+    /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
       " ",
       label
     ] })
@@ -61,7 +63,7 @@ function KeyHints({ hints }) {
 }
 function InlineKeys({ hints }) {
   return /* @__PURE__ */ jsx(Box, { gap: 1, children: hints.map(({ key, label }, i) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-    /* @__PURE__ */ jsxs(Text, { color: "green", children: [
+    /* @__PURE__ */ jsxs(Text, { color: "green", bold: true, children: [
       "[",
       key,
       "]"
@@ -90,15 +92,17 @@ 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, { children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: "\u25C7 " }),
-      /* @__PURE__ */ jsx(Text, { bold: true, children: "git-sync-tui" }),
-      /* @__PURE__ */ jsx(Text, { color: "gray", children: "  cherry-pick --no-commit" }),
-      stashed && /* @__PURE__ */ jsx(Text, { color: "yellow", children: " \u25AA stashed" })
+    /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
+      /* @__PURE__ */ jsx(Text, { backgroundColor: "cyan", color: "white", bold: true, children: " git-sync-tui " }),
+      /* @__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, { children: [
+    /* @__PURE__ */ jsxs(Box, { marginTop: 0, children: [
       /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "  " }),
       /* @__PURE__ */ jsx(StepProgress, { current: step })
     ] })
@@ -158,28 +162,20 @@ async function addRemote(name, url) {
 }
 async function getRemoteBranches(remote2) {
   const git = getGit();
-  let fetchOk = false;
   try {
-    await git.fetch(remote2);
-    fetchOk = true;
+    const lsResult = await git.raw(["ls-remote", "--heads", remote2]);
+    if (lsResult.trim()) {
+      return lsResult.trim().split("\n").map((line) => line.replace(/^.*refs\/heads\//, "")).filter(Boolean).sort();
+    }
   } catch {
   }
   const result = await git.branch(["-r"]);
   const prefix = `${remote2}/`;
   const branches = result.all.filter((b) => b.startsWith(prefix) && !b.includes("HEAD")).map((b) => b.replace(prefix, "")).sort();
   if (branches.length > 0) return branches;
-  try {
-    const lsResult = await git.raw(["ls-remote", "--heads", remote2]);
-    if (!lsResult.trim()) return [];
-    return lsResult.trim().split("\n").map((line) => line.replace(/^.*refs\/heads\//, "")).filter(Boolean).sort();
-  } catch {
-    if (!fetchOk) {
-      throw new Error(`\u65E0\u6CD5\u8FDE\u63A5\u8FDC\u7A0B\u4ED3\u5E93 '${remote2}'\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u4ED3\u5E93\u5730\u5740`);
-    }
-    return [];
-  }
+  throw new Error(`\u65E0\u6CD5\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93 '${remote2}' \u7684\u5206\u652F\u5217\u8868\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u4ED3\u5E93\u5730\u5740`);
 }
-async function getCommits(remote2, branch2, count2 = 30) {
+async function getCommits(remote2, branch2, count2 = 100) {
   const git = getGit();
   const ref = `${remote2}/${branch2}`;
   try {
@@ -194,6 +190,8 @@ async function getCommits(remote2, branch2, count2 = 30) {
   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---"
   ]);
@@ -204,6 +202,27 @@ async function getCommits(remote2, branch2, count2 = 30) {
     return { hash, shortHash, message: message || "", author: author || "", date: date || "" };
   });
 }
+async function getUnsyncedCommits(remote2, branch2, count2 = 100) {
+  const git = getGit();
+  const ref = `${remote2}/${branch2}`;
+  const allCommits = await getCommits(remote2, branch2, count2);
+  try {
+    const result = await git.raw([
+      "cherry",
+      "HEAD",
+      ref
+    ]);
+    const unsyncedHashes = new Set(
+      result.trim().split("\n").filter((line) => line.startsWith("+ ")).map((line) => line.substring(2).trim())
+    );
+    return allCommits.map((c) => ({
+      ...c,
+      synced: !unsyncedHashes.has(c.hash)
+    }));
+  } catch {
+    return allCommits;
+  }
+}
 async function getMultiCommitStat(hashes) {
   if (hashes.length === 0) return "";
   const git = getGit();
@@ -267,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();
@@ -290,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();
@@ -393,10 +532,10 @@ function StashRecovery({ timestamp, onRecover, onSkip }) {
 // src/components/remote-select.tsx
 import { useState as useState3 } from "react";
 import { Box as Box4, Text as Text4, useInput as useInput3 } from "ink";
-import { Select, Spinner as Spinner2, TextInput } from "@inkjs/ui";
+import { Spinner as Spinner2, TextInput } from "@inkjs/ui";
 
 // src/hooks/use-git.ts
-import { useState as useState2, useEffect as useEffect2, useCallback } from "react";
+import { useState as useState2, useEffect as useEffect2, useCallback, useRef } from "react";
 function useAsync(fn, deps = []) {
   const [state, setState] = useState2({
     data: null,
@@ -426,11 +565,49 @@ function useBranches(remote2) {
     [remote2]
   );
 }
-function useCommits(remote2, branch2, count2 = 30) {
-  return useAsync(
-    () => remote2 && branch2 ? getCommits(remote2, branch2, count2) : Promise.resolve([]),
-    [remote2, branch2, count2]
-  );
+function useCommits(remote2, branch2, pageSize = 100) {
+  const [data, setData] = useState2(null);
+  const [loading, setLoading] = useState2(true);
+  const [loadingMore, setLoadingMore] = useState2(false);
+  const [error2, setError] = useState2(null);
+  const [hasMore, setHasMore] = useState2(true);
+  const loadedRef = useRef(0);
+  useEffect2(() => {
+    if (!remote2 || !branch2) {
+      setData([]);
+      setLoading(false);
+      setHasMore(false);
+      return;
+    }
+    setData(null);
+    setLoading(true);
+    setError(null);
+    setHasMore(true);
+    loadedRef.current = 0;
+    getUnsyncedCommits(remote2, branch2, pageSize).then((commits2) => {
+      setData(commits2);
+      setLoading(false);
+      loadedRef.current = commits2.length;
+      setHasMore(commits2.length >= pageSize);
+    }).catch((err) => {
+      setError(err.message);
+      setLoading(false);
+    });
+  }, [remote2, branch2, pageSize]);
+  const loadMore = useCallback(async () => {
+    if (!remote2 || !branch2 || loadingMore || !hasMore) return;
+    setLoadingMore(true);
+    try {
+      const nextCount = loadedRef.current + pageSize;
+      const allCommits = await getUnsyncedCommits(remote2, branch2, nextCount);
+      setData(allCommits);
+      setHasMore(allCommits.length >= nextCount);
+      loadedRef.current = allCommits.length;
+    } catch {
+    }
+    setLoadingMore(false);
+  }, [remote2, branch2, pageSize, loadingMore, hasMore]);
+  return { data, loading, loadingMore, error: error2, hasMore, loadMore };
 }
 function useCommitStat(hashes) {
   const [stat, setStat] = useState2("");
@@ -462,16 +639,32 @@ function extractRemoteName(url) {
 function RemoteSelect({ onSelect, onBack }) {
   const { data: remotes, loading, error: error2, reload } = useRemotes();
   const [phase, setPhase] = useState3("list");
+  const [cursorIndex, setCursorIndex] = useState3(0);
   const [customUrl, setCustomUrl] = useState3("");
   const [addError, setAddError] = useState3(null);
-  useInput3((_input, key) => {
+  const totalItems = (remotes?.length || 0) + 1;
+  useInput3((input, key) => {
+    if (phase !== "list") {
+      if (key.escape) {
+        if (phase === "input-name") {
+          setPhase("input-url");
+        } else if (phase === "input-url") {
+          setPhase("list");
+        }
+      }
+      return;
+    }
     if (key.escape) {
-      if (phase === "input-name") {
+      onBack?.();
+    } else if (key.upArrow) {
+      setCursorIndex((prev) => Math.max(0, prev - 1));
+    } else if (key.downArrow) {
+      setCursorIndex((prev) => Math.min(totalItems - 1, prev + 1));
+    } else if (key.return) {
+      if (remotes && cursorIndex < remotes.length) {
+        onSelect(remotes[cursorIndex].name);
+      } else {
         setPhase("input-url");
-      } else if (phase === "input-url") {
-        setPhase("list");
-      } else if (phase === "list") {
-        onBack?.();
       }
     }
   });
@@ -480,7 +673,8 @@ function RemoteSelect({ onSelect, onBack }) {
   }
   if (error2) {
     return /* @__PURE__ */ jsxs4(Text4, { color: "red", children: [
-      "\u2716 \u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5931\u8D25: ",
+      "\u2716 ",
+      "\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5931\u8D25: ",
       error2
     ] });
   }
@@ -511,7 +705,10 @@ function RemoteSelect({ onSelect, onBack }) {
           }
         )
       ] }),
-      /* @__PURE__ */ jsx4(Text4, { color: "gray", dimColor: true, children: "  \u652F\u6301 HTTPS / SSH \u5730\u5740" })
+      /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
+        "  ",
+        "\u652F\u6301 HTTPS / SSH \u5730\u5740"
+      ] })
     ] });
   }
   if (phase === "input-name") {
@@ -555,99 +752,187 @@ function RemoteSelect({ onSelect, onBack }) {
       ] })
     ] });
   }
-  const options = [
-    ...(remotes || []).map((r) => ({
-      label: `${r.name}  ${r.fetchUrl}`,
-      value: r.name
-    })),
-    {
-      label: "+ \u6DFB\u52A0\u8FDC\u7A0B\u4ED3\u5E93...",
-      value: "__add_custom__"
-    }
-  ];
-  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, children: [
+  const maxNameLen = Math.max(...(remotes || []).map((r) => r.name.length), 0);
+  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx4(SectionHeader, { title: "\u9009\u62E9\u8FDC\u7A0B\u4ED3\u5E93" }),
-    /* @__PURE__ */ jsx4(
-      Select,
-      {
-        options,
-        onChange: (value) => {
-          if (value === "__add_custom__") {
-            setPhase("input-url");
-          } else {
-            onSelect(value);
-          }
-        }
-      }
-    )
+    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginTop: 1, children: [
+      (remotes || []).map((r, i) => {
+        const isCursor = i === cursorIndex;
+        return /* @__PURE__ */ jsxs4(Box4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: isCursor ? "cyan" : "gray", children: isCursor ? "\u203A" : " " }),
+          /* @__PURE__ */ jsx4(Text4, { children: " " }),
+          /* @__PURE__ */ jsx4(Text4, { color: isCursor ? "cyan" : "white", bold: isCursor, children: r.name.padEnd(maxNameLen + 2) }),
+          /* @__PURE__ */ jsx4(Text4, { color: "gray", dimColor: true, children: r.fetchUrl })
+        ] }, r.name);
+      }),
+      /* @__PURE__ */ jsxs4(Box4, { children: [
+        /* @__PURE__ */ jsx4(Text4, { color: cursorIndex === (remotes?.length || 0) ? "cyan" : "gray", children: cursorIndex === (remotes?.length || 0) ? "\u203A" : " " }),
+        /* @__PURE__ */ jsx4(Text4, { children: " " }),
+        /* @__PURE__ */ jsx4(Text4, { color: "green", dimColor: cursorIndex !== (remotes?.length || 0), children: "+ \u6DFB\u52A0\u8FDC\u7A0B\u4ED3\u5E93..." })
+      ] })
+    ] })
   ] });
 }
 
 // src/components/branch-select.tsx
 import { useState as useState4, useMemo } from "react";
 import { Box as Box5, Text as Text5, useInput as useInput4 } from "ink";
-import { Select as Select2, Spinner as Spinner3, TextInput as TextInput2 } from "@inkjs/ui";
+import { Spinner as Spinner3, TextInput as TextInput2 } from "@inkjs/ui";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 function BranchSelect({ remote: remote2, onSelect, onBack }) {
   const { data: branches, loading, error: error2 } = useBranches(remote2);
   const [filter, setFilter] = useState4("");
-  useInput4((_input, key) => {
-    if (key.escape) onBack?.();
-  });
-  const filteredOptions = useMemo(() => {
+  const [cursorIndex, setCursorIndex] = useState4(0);
+  const filteredBranches = useMemo(() => {
     if (!branches) return [];
-    const filtered = filter ? branches.filter((b) => b.toLowerCase().includes(filter.toLowerCase())) : branches;
-    return filtered.map((b) => ({ label: b, value: b }));
+    return filter ? branches.filter((b) => b.toLowerCase().includes(filter.toLowerCase())) : branches;
   }, [branches, filter]);
+  const visibleCount = 10;
+  const startIdx = Math.max(0, Math.min(cursorIndex - Math.floor(visibleCount / 2), filteredBranches.length - visibleCount));
+  const visibleBranches = filteredBranches.slice(startIdx, startIdx + visibleCount);
+  useInput4((input, key) => {
+    if (key.escape) {
+      onBack?.();
+    } else if (key.upArrow) {
+      setCursorIndex((prev) => Math.max(0, prev - 1));
+    } else if (key.downArrow) {
+      setCursorIndex((prev) => Math.min(filteredBranches.length - 1, prev + 1));
+    } else if (key.return) {
+      if (filteredBranches.length > 0) {
+        onSelect(filteredBranches[cursorIndex]);
+      }
+    }
+  });
   if (loading) {
     return /* @__PURE__ */ jsx5(Spinner3, { label: `\u83B7\u53D6 ${remote2} \u7684\u5206\u652F\u5217\u8868...` });
   }
   if (error2) {
     return /* @__PURE__ */ jsxs5(Text5, { color: "red", children: [
-      "\u2716 \u83B7\u53D6\u5206\u652F\u5217\u8868\u5931\u8D25: ",
+      "\u2716 ",
+      "\u83B7\u53D6\u5206\u652F\u5217\u8868\u5931\u8D25: ",
       error2
     ] });
   }
   if (!branches || branches.length === 0) {
-    return /* @__PURE__ */ jsx5(Text5, { color: "red", children: "\u2716 \u672A\u627E\u5230\u8FDC\u7A0B\u5206\u652F" });
+    return /* @__PURE__ */ jsxs5(Text5, { color: "red", children: [
+      "\u2716 ",
+      "\u672A\u627E\u5230\u8FDC\u7A0B\u5206\u652F"
+    ] });
   }
-  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx5(SectionHeader, { title: `\u9009\u62E9\u5206\u652F`, subtitle: `${remote2} \xB7 ${branches.length} \u4E2A\u5206\u652F` }),
-    /* @__PURE__ */ jsxs5(Box5, { children: [
-      /* @__PURE__ */ jsx5(Text5, { color: "gray", children: "/ " }),
+  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx5(SectionHeader, { title: "\u9009\u62E9\u5206\u652F", subtitle: `${remote2} \xB7 ${branches.length} \u4E2A\u5206\u652F` }),
+    /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, children: [
+      /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "/ " }),
       /* @__PURE__ */ jsx5(
         TextInput2,
         {
           placeholder: "\u8F93\u5165\u5173\u952E\u5B57\u8FC7\u6EE4...",
-          onChange: setFilter
+          onChange: (val) => {
+            setFilter(val);
+            setCursorIndex(0);
+          }
         }
       ),
       filter && /* @__PURE__ */ jsxs5(Text5, { color: "gray", dimColor: true, children: [
         " \xB7 \u5339\u914D ",
-        filteredOptions.length
+        filteredBranches.length
       ] })
     ] }),
-    filteredOptions.length > 0 ? /* @__PURE__ */ jsx5(Select2, { options: filteredOptions, onChange: onSelect }) : /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "\u25B2 \u65E0\u5339\u914D\u5206\u652F" })
+    filteredBranches.length > 0 ? /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", marginTop: 1, children: [
+      startIdx > 0 && /* @__PURE__ */ jsxs5(Text5, { color: "gray", dimColor: true, children: [
+        "  ",
+        "\u2191 ",
+        startIdx,
+        " more"
+      ] }),
+      visibleBranches.map((b, i) => {
+        const actualIdx = startIdx + i;
+        const isCursor = actualIdx === cursorIndex;
+        return /* @__PURE__ */ jsxs5(Box5, { children: [
+          /* @__PURE__ */ jsx5(Text5, { color: isCursor ? "cyan" : "gray", children: isCursor ? "\u203A" : " " }),
+          /* @__PURE__ */ jsx5(Text5, { children: " " }),
+          /* @__PURE__ */ jsx5(Text5, { color: isCursor ? "cyan" : "white", bold: isCursor, children: b })
+        ] }, b);
+      }),
+      startIdx + visibleCount < filteredBranches.length && /* @__PURE__ */ jsxs5(Text5, { color: "gray", dimColor: true, children: [
+        "  ",
+        "\u2193 ",
+        filteredBranches.length - startIdx - visibleCount,
+        " more"
+      ] })
+    ] }) : /* @__PURE__ */ jsxs5(Text5, { color: "yellow", children: [
+      "\u25B2 ",
+      "\u65E0\u5339\u914D\u5206\u652F"
+    ] })
   ] });
 }
 
 // src/components/commit-list.tsx
-import { useState as useState5, useMemo as useMemo2, useRef } from "react";
+import { useState as useState5, useMemo as useMemo2, useRef as useRef2, useEffect as useEffect3 } from "react";
 import { Box as Box6, Text as Text6, useInput as useInput5 } from "ink";
 import { Spinner as Spinner4 } from "@inkjs/ui";
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+function StatPanel({ stat, loading, count: count2 }) {
+  const STAT_HEIGHT = 8;
+  const [scrollOffset, setScrollOffset] = useState5(0);
+  const lines = useMemo2(() => stat ? stat.split("\n") : [], [stat]);
+  const canScroll = lines.length > STAT_HEIGHT;
+  useEffect3(() => {
+    setScrollOffset(0);
+  }, [stat]);
+  useInput5((input) => {
+    if (!canScroll) return;
+    if (input === "j") {
+      setScrollOffset((prev) => Math.min(prev + 1, lines.length - STAT_HEIGHT));
+    } else if (input === "k") {
+      setScrollOffset((prev) => Math.max(0, prev - 1));
+    }
+  });
+  const visibleLines = canScroll ? lines.slice(scrollOffset, scrollOffset + STAT_HEIGHT) : lines;
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
+    /* @__PURE__ */ jsxs6(Box6, { justifyContent: "space-between", children: [
+      /* @__PURE__ */ jsxs6(Text6, { bold: true, color: "cyan", children: [
+        "\u25C6 ",
+        "\u5DF2\u9009 ",
+        count2,
+        " \u4E2A commit \xB7 diff --stat"
+      ] }),
+      canScroll && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
+        scrollOffset + 1,
+        "-",
+        Math.min(scrollOffset + STAT_HEIGHT, lines.length),
+        "/",
+        lines.length,
+        " [j/k]"
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", height: STAT_HEIGHT, children: loading ? /* @__PURE__ */ jsx6(Spinner4, { label: "\u52A0\u8F7D\u4E2D..." }) : visibleLines.length > 0 ? visibleLines.map((line, i) => /* @__PURE__ */ jsx6(Text6, { color: "gray", children: line }, scrollOffset + i)) : /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: true, children: "(\u65E0\u53D8\u66F4)" }) })
+  ] });
+}
 function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
-  const { data: commits2, loading, error: error2 } = useCommits(remote2, branch2, 30);
+  const { data: commits2, loading, loadingMore, error: error2, hasMore, loadMore } = useCommits(remote2, branch2, 100);
   const [selectedIndex, setSelectedIndex] = useState5(0);
   const [selectedHashes, setSelectedHashes] = useState5(/* @__PURE__ */ new Set());
   const [shiftMode, setShiftMode] = useState5(false);
-  const anchorIndexRef = useRef(null);
+  const anchorIndexRef = useRef2(null);
   const selectedKey = useMemo2(() => Array.from(selectedHashes).sort().join(","), [selectedHashes]);
   const selectedArray = useMemo2(() => Array.from(selectedHashes), [selectedKey]);
   const { stat, loading: statLoading } = useCommitStat(selectedArray);
+  const syncedCount = useMemo2(() => {
+    if (!commits2) return 0;
+    return commits2.filter((c) => c.synced).length;
+  }, [commits2]);
+  useEffect3(() => {
+    if (!commits2 || !hasMore || loadingMore) return;
+    if (selectedIndex >= commits2.length - 5) {
+      loadMore();
+    }
+  }, [selectedIndex, commits2?.length, hasMore, loadingMore, loadMore]);
   const toggleCurrent = () => {
     if (!commits2 || commits2.length === 0) return;
-    const hash = commits2[selectedIndex].hash;
+    const commit = commits2[selectedIndex];
+    if (commit.synced) return;
+    const hash = commit.hash;
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       if (next.has(hash)) {
@@ -667,19 +952,22 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       for (let i = start; i <= end; i++) {
-        next.add(commits2[i].hash);
+        if (!commits2[i].synced) {
+          next.add(commits2[i].hash);
+        }
       }
       return next;
     });
   };
   const toggleAll = () => {
     if (!commits2 || commits2.length === 0) return;
+    const unsyncedCommits = commits2.filter((c) => !c.synced);
     setSelectedHashes((prev) => {
-      if (prev.size === commits2.length) {
+      if (prev.size === unsyncedCommits.length) {
         anchorIndexRef.current = null;
         return /* @__PURE__ */ new Set();
       }
-      return new Set(commits2.map((c) => c.hash));
+      return new Set(unsyncedCommits.map((c) => c.hash));
     });
   };
   const invertSelection = () => {
@@ -687,7 +975,7 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
     setSelectedHashes((prev) => {
       const next = /* @__PURE__ */ new Set();
       for (const c of commits2) {
-        if (!prev.has(c.hash)) next.add(c.hash);
+        if (!c.synced && !prev.has(c.hash)) next.add(c.hash);
       }
       return next;
     });
@@ -697,7 +985,9 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       for (let i = 0; i <= selectedIndex; i++) {
-        next.add(commits2[i].hash);
+        if (!commits2[i].synced) {
+          next.add(commits2[i].hash);
+        }
       }
       return next;
     });
@@ -754,16 +1044,21 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
   }
   if (error2) {
     return /* @__PURE__ */ jsxs6(Text6, { color: "red", children: [
-      "\u2716 \u83B7\u53D6 commit \u5217\u8868\u5931\u8D25: ",
+      "\u2716 ",
+      "\u83B7\u53D6 commit \u5217\u8868\u5931\u8D25: ",
       error2
     ] });
   }
   if (!commits2 || commits2.length === 0) {
-    return /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: "\u25B2 \u8BE5\u5206\u652F\u6CA1\u6709 commit" });
+    return /* @__PURE__ */ jsxs6(Text6, { color: "yellow", children: [
+      "\u25B2 ",
+      "\u8BE5\u5206\u652F\u6CA1\u6709 commit"
+    ] });
   }
   const visibleCount = 10;
   const startIdx = Math.max(0, Math.min(selectedIndex - Math.floor(visibleCount / 2), commits2.length - visibleCount));
   const visibleCommits = commits2.slice(startIdx, startIdx + visibleCount);
+  const unsyncedTotal = commits2.length - syncedCount;
   return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ jsx6(SectionHeader, { title: "\u9009\u62E9\u8981\u540C\u6B65\u7684 commit" }),
     /* @__PURE__ */ jsxs6(Box6, { gap: 2, children: [
@@ -774,17 +1069,28 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
       ] }),
       /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
         commits2.length,
-        " commits"
+        " commits",
+        hasMore ? "+" : ""
+      ] }),
+      syncedCount > 0 && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
+        syncedCount,
+        " \u5DF2\u540C\u6B65"
+      ] }),
+      /* @__PURE__ */ jsxs6(Text6, { color: "green", children: [
+        unsyncedTotal,
+        " \u5F85\u540C\u6B65"
       ] }),
       /* @__PURE__ */ jsxs6(Text6, { color: selectedHashes.size > 0 ? "cyan" : "gray", bold: selectedHashes.size > 0, children: [
         "\u5DF2\u9009 ",
         selectedHashes.size
       ] }),
-      shiftMode && /* @__PURE__ */ jsx6(Text6, { color: "yellow", bold: true, children: "SHIFT" })
+      shiftMode && /* @__PURE__ */ jsx6(Text6, { color: "yellow", bold: true, children: "SHIFT" }),
+      loadingMore && /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: true, children: "\u52A0\u8F7D\u4E2D..." })
     ] }),
     /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
       startIdx > 0 && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
-        "  \u2191 ",
+        "  ",
+        "\u2191 ",
         startIdx,
         " more"
       ] }),
@@ -793,30 +1099,60 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
         const isSelected = selectedHashes.has(c.hash);
         const isCursor = actualIdx === selectedIndex;
         const isAnchor = actualIdx === anchorIndexRef.current;
+        const isSynced = !!c.synced;
         return /* @__PURE__ */ jsxs6(Box6, { children: [
-          /* @__PURE__ */ jsxs6(Text6, { backgroundColor: isCursor ? "blue" : void 0, color: isSelected ? "green" : "white", children: [
-            isCursor ? "\u25B8 " : "  ",
-            isAnchor ? "\u2693" : isSelected ? "\u25CF" : "\u25CB",
-            " "
-          ] }),
-          /* @__PURE__ */ jsx6(Text6, { backgroundColor: isCursor ? "blue" : void 0, color: "yellow", children: c.shortHash }),
-          /* @__PURE__ */ jsxs6(Text6, { backgroundColor: isCursor ? "blue" : void 0, color: isSelected ? "green" : "white", children: [
-            " ",
-            c.message
-          ] }),
+          /* @__PURE__ */ jsxs6(
+            Text6,
+            {
+              backgroundColor: isCursor ? isSynced ? "gray" : "blue" : void 0,
+              color: isSynced ? "gray" : isSelected ? "green" : "white",
+              dimColor: isSynced,
+              children: [
+                isCursor ? "\u25B8 " : "  ",
+                isSynced ? "\u2713" : isAnchor ? "\u2693" : isSelected ? "\u25CF" : "\u25CB",
+                " "
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx6(
+            Text6,
+            {
+              backgroundColor: isCursor ? isSynced ? "gray" : "blue" : void 0,
+              color: isSynced ? "gray" : "yellow",
+              dimColor: isSynced,
+              children: c.shortHash
+            }
+          ),
+          /* @__PURE__ */ jsxs6(
+            Text6,
+            {
+              backgroundColor: isCursor ? isSynced ? "gray" : "blue" : void 0,
+              color: isSynced ? "gray" : isSelected ? "green" : "white",
+              dimColor: isSynced,
+              children: [
+                " ",
+                c.message
+              ]
+            }
+          ),
           /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
             " ",
             c.author,
             " \xB7 ",
             c.date
-          ] })
+          ] }),
+          isSynced && /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: true, children: " [\u5DF2\u540C\u6B65]" })
         ] }, c.hash);
       }),
-      startIdx + visibleCount < commits2.length && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
-        "  \u2193 ",
+      startIdx + visibleCount < commits2.length ? /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
+        "  ",
+        "\u2193 ",
         commits2.length - startIdx - visibleCount,
         " more"
-      ] })
+      ] }) : hasMore ? /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
+        "  ",
+        "\u2193 \u6EDA\u52A8\u52A0\u8F7D\u66F4\u591A..."
+      ] }) : null
     ] }),
     /* @__PURE__ */ jsx6(KeyHints, { hints: [
       { key: "\u2191\u2193", label: "\u5BFC\u822A" },
@@ -828,15 +1164,111 @@ function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
       { key: "Enter", label: "\u786E\u8BA4" },
       { key: "Esc", label: "\u8FD4\u56DE" }
     ] }),
-    selectedHashes.size > 0 && /* @__PURE__ */ jsx6(StatusPanel, { type: "info", title: `\u5DF2\u9009 ${selectedHashes.size} \u4E2A commit \xB7 diff --stat`, children: statLoading ? /* @__PURE__ */ jsx6(Spinner4, { label: "\u52A0\u8F7D\u4E2D..." }) : /* @__PURE__ */ jsx6(Text6, { color: "gray", children: stat || "(\u65E0\u53D8\u66F4)" }) })
+    selectedHashes.size > 0 && /* @__PURE__ */ jsx6(StatPanel, { stat, loading: statLoading, count: selectedHashes.size })
   ] });
 }
 
-// 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") {
@@ -845,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" }
       ] })
@@ -890,92 +1333,295 @@ function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline
 }
 
 // src/components/result-panel.tsx
-import { useState as useState6, useEffect as useEffect3 } 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;
-  };
-  useEffect3(() => {
-    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 === "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 === "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 === "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
@@ -983,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 = useRef2(false);
-  const stashRestoredRef = useRef2(false);
-  const mountedRef = useRef2(true);
-  const debounceTimer = useRef2(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);
@@ -1006,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" });
@@ -1020,11 +1667,11 @@ function App({ initialRemote, initialBranch }) {
       }
     }
   }, []);
-  const markStashRestored = useCallback2(() => {
+  const markStashRestored = useCallback3(() => {
     stashRestoredRef.current = true;
     removeStashGuard();
   }, []);
-  useEffect4(() => {
+  useEffect6(() => {
     mountedRef.current = true;
     async function check() {
       const guard = await checkStashGuard();
@@ -1079,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"
     };
@@ -1093,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,
@@ -1104,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) => {
@@ -1121,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: () => {
@@ -1340,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
@@ -1350,7 +2007,7 @@ var cli = meow(
     -r, --remote <name>       \u6307\u5B9A\u8FDC\u7A0B\u4ED3\u5E93\u540D\u79F0
     -b, --branch <name>       \u6307\u5B9A\u8FDC\u7A0B\u5206\u652F\u540D\u79F0
     -c, --commits <hashes>    \u6307\u5B9A commit hash\uFF08\u9017\u53F7\u5206\u9694\uFF09
-    -n, --count <number>      \u663E\u793A commit \u6570\u91CF\uFF08\u9ED8\u8BA4 30\uFF09
+    -n, --count <number>      \u663E\u793A commit \u6570\u91CF\uFF08\u9ED8\u8BA4 100\uFF09
     -m, --mainline            \u5BF9 merge commit \u4F7F\u7528 -m 1
     -y, --yes                 \u8DF3\u8FC7\u786E\u8BA4\u76F4\u63A5\u6267\u884C
     --no-stash                \u8DF3\u8FC7 stash \u63D0\u793A
@@ -1386,7 +2043,7 @@ var cli = meow(
       remote: { type: "string", shortFlag: "r" },
       branch: { type: "string", shortFlag: "b" },
       commits: { type: "string", shortFlag: "c" },
-      count: { type: "number", shortFlag: "n", default: 30 },
+      count: { type: "number", shortFlag: "n", default: 100 },
       mainline: { type: "boolean", shortFlag: "m", default: false },
       yes: { type: "boolean", shortFlag: "y", default: false },
       noStash: { type: "boolean", default: false },
@@ -1414,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 }));
 }