git-sync-tui 0.1.3 → 0.1.4

package/dist/cli.js

@@ -156,38 +156,53 @@ async function addRemote(name, url) {
   const git = getGit();
   await git.addRemote(name, url);
 }
-async function getRemoteBranches(remote) {
+async function getRemoteBranches(remote2) {
   const git = getGit();
+  let fetchOk = false;
   try {
-    await git.fetch(remote);
+    await git.fetch(remote2);
+    fetchOk = true;
   } catch {
   }
   const result = await git.branch(["-r"]);
-  const prefix = `${remote}/`;
-  return result.all.filter((b) => b.startsWith(prefix) && !b.includes("HEAD")).map((b) => b.replace(prefix, "")).sort();
+  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 [];
+  }
 }
-async function getCommits(remote, branch, count = 30) {
+async function getCommits(remote2, branch2, count2 = 30) {
   const git = getGit();
-  const ref = `${remote}/${branch}`;
-  const log = await git.log({
-    from: void 0,
-    to: ref,
-    maxCount: count,
-    format: {
-      hash: "%H",
-      shortHash: "%h",
-      message: "%s",
-      author: "%an",
-      date: "%ar"
+  const ref = `${remote2}/${branch2}`;
+  try {
+    await git.raw(["rev-parse", "--verify", ref]);
+  } catch {
+    try {
+      await git.fetch(remote2, branch2);
+    } catch {
+      throw new Error(`\u65E0\u6CD5\u83B7\u53D6 ${ref}\uFF0C\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u4ED3\u5E93\u8FDE\u63A5`);
     }
+  }
+  const result = await git.raw([
+    "log",
+    ref,
+    `--max-count=${count2}`,
+    "--format=%H%n%h%n%s%n%an%n%ar%n---"
+  ]);
+  if (!result.trim()) return [];
+  const entries = result.trim().split("\n---\n").filter(Boolean);
+  return entries.map((block) => {
+    const [hash, shortHash, message, author, date] = block.split("\n");
+    return { hash, shortHash, message: message || "", author: author || "", date: date || "" };
   });
-  return log.all.map((entry) => ({
-    hash: entry.hash,
-    shortHash: entry.hash.substring(0, 7),
-    message: entry.message || "",
-    author: entry.author || "",
-    date: entry.date || ""
-  }));
 }
 async function getMultiCommitStat(hashes) {
   if (hashes.length === 0) return "";
@@ -405,16 +420,16 @@ function useAsync(fn, deps = []) {
 function useRemotes() {
   return useAsync(() => getRemotes(), []);
 }
-function useBranches(remote) {
+function useBranches(remote2) {
   return useAsync(
-    () => remote ? getRemoteBranches(remote) : Promise.resolve([]),
-    [remote]
+    () => remote2 ? getRemoteBranches(remote2) : Promise.resolve([]),
+    [remote2]
   );
 }
-function useCommits(remote, branch, count = 30) {
+function useCommits(remote2, branch2, count2 = 30) {
   return useAsync(
-    () => remote && branch ? getCommits(remote, branch, count) : Promise.resolve([]),
-    [remote, branch, count]
+    () => remote2 && branch2 ? getCommits(remote2, branch2, count2) : Promise.resolve([]),
+    [remote2, branch2, count2]
   );
 }
 function useCommitStat(hashes) {
@@ -445,7 +460,7 @@ function extractRemoteName(url) {
   return lastSegment;
 }
 function RemoteSelect({ onSelect, onBack }) {
-  const { data: remotes, loading, error, reload } = useRemotes();
+  const { data: remotes, loading, error: error2, reload } = useRemotes();
   const [phase, setPhase] = useState3("list");
   const [customUrl, setCustomUrl] = useState3("");
   const [addError, setAddError] = useState3(null);
@@ -463,10 +478,10 @@ function RemoteSelect({ onSelect, onBack }) {
   if (loading) {
     return /* @__PURE__ */ jsx4(Spinner2, { label: "\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93..." });
   }
-  if (error) {
+  if (error2) {
     return /* @__PURE__ */ jsxs4(Text4, { color: "red", children: [
       "\u2716 \u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5931\u8D25: ",
-      error
+      error2
     ] });
   }
   if (phase === "adding") {
@@ -573,8 +588,8 @@ 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 { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function BranchSelect({ remote, onSelect, onBack }) {
-  const { data: branches, loading, error } = useBranches(remote);
+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?.();
@@ -585,19 +600,19 @@ function BranchSelect({ remote, onSelect, onBack }) {
     return filtered.map((b) => ({ label: b, value: b }));
   }, [branches, filter]);
   if (loading) {
-    return /* @__PURE__ */ jsx5(Spinner3, { label: `\u83B7\u53D6 ${remote} \u7684\u5206\u652F\u5217\u8868...` });
+    return /* @__PURE__ */ jsx5(Spinner3, { label: `\u83B7\u53D6 ${remote2} \u7684\u5206\u652F\u5217\u8868...` });
   }
-  if (error) {
+  if (error2) {
     return /* @__PURE__ */ jsxs5(Text5, { color: "red", children: [
       "\u2716 \u83B7\u53D6\u5206\u652F\u5217\u8868\u5931\u8D25: ",
-      error
+      error2
     ] });
   }
   if (!branches || branches.length === 0) {
     return /* @__PURE__ */ jsx5(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: `${remote} \xB7 ${branches.length} \u4E2A\u5206\u652F` }),
+    /* @__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: "/ " }),
       /* @__PURE__ */ jsx5(
@@ -621,8 +636,8 @@ import { useState as useState5, useMemo as useMemo2, useRef } 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 CommitList({ remote, branch, onSelect, onBack }) {
-  const { data: commits, loading, error } = useCommits(remote, branch, 30);
+function CommitList({ remote: remote2, branch: branch2, onSelect, onBack }) {
+  const { data: commits2, loading, error: error2 } = useCommits(remote2, branch2, 30);
   const [selectedIndex, setSelectedIndex] = useState5(0);
   const [selectedHashes, setSelectedHashes] = useState5(/* @__PURE__ */ new Set());
   const [shiftMode, setShiftMode] = useState5(false);
@@ -631,8 +646,8 @@ function CommitList({ remote, branch, onSelect, onBack }) {
   const selectedArray = useMemo2(() => Array.from(selectedHashes), [selectedKey]);
   const { stat, loading: statLoading } = useCommitStat(selectedArray);
   const toggleCurrent = () => {
-    if (!commits || commits.length === 0) return;
-    const hash = commits[selectedIndex].hash;
+    if (!commits2 || commits2.length === 0) return;
+    const hash = commits2[selectedIndex].hash;
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       if (next.has(hash)) {
@@ -646,49 +661,49 @@ function CommitList({ remote, branch, onSelect, onBack }) {
     });
   };
   const selectRange = (anchor, current) => {
-    if (!commits) return;
+    if (!commits2) return;
     const start = Math.min(anchor, current);
     const end = Math.max(anchor, current);
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       for (let i = start; i <= end; i++) {
-        next.add(commits[i].hash);
+        next.add(commits2[i].hash);
       }
       return next;
     });
   };
   const toggleAll = () => {
-    if (!commits || commits.length === 0) return;
+    if (!commits2 || commits2.length === 0) return;
     setSelectedHashes((prev) => {
-      if (prev.size === commits.length) {
+      if (prev.size === commits2.length) {
         anchorIndexRef.current = null;
         return /* @__PURE__ */ new Set();
       }
-      return new Set(commits.map((c) => c.hash));
+      return new Set(commits2.map((c) => c.hash));
     });
   };
   const invertSelection = () => {
-    if (!commits || commits.length === 0) return;
+    if (!commits2 || commits2.length === 0) return;
     setSelectedHashes((prev) => {
       const next = /* @__PURE__ */ new Set();
-      for (const c of commits) {
+      for (const c of commits2) {
         if (!prev.has(c.hash)) next.add(c.hash);
       }
       return next;
     });
   };
   const selectToCurrent = () => {
-    if (!commits || commits.length === 0) return;
+    if (!commits2 || commits2.length === 0) return;
     setSelectedHashes((prev) => {
       const next = new Set(prev);
       for (let i = 0; i <= selectedIndex; i++) {
-        next.add(commits[i].hash);
+        next.add(commits2[i].hash);
       }
       return next;
     });
   };
   useInput5((input, key) => {
-    if (!commits || commits.length === 0) return;
+    if (!commits2 || commits2.length === 0) return;
     if (key.shift) {
       if (!shiftMode) {
         setShiftMode(true);
@@ -701,7 +716,7 @@ function CommitList({ remote, branch, onSelect, onBack }) {
         setSelectedIndex(newIndex);
         selectRange(anchorIndexRef.current, newIndex);
       } else if (key.downArrow) {
-        const newIndex = Math.min(commits.length - 1, selectedIndex + 1);
+        const newIndex = Math.min(commits2.length - 1, selectedIndex + 1);
         setSelectedIndex(newIndex);
         selectRange(anchorIndexRef.current, newIndex);
       } else if (input === " ") {
@@ -717,7 +732,7 @@ function CommitList({ remote, branch, onSelect, onBack }) {
     if (key.upArrow) {
       setSelectedIndex((prev) => Math.max(0, prev - 1));
     } else if (key.downArrow) {
-      setSelectedIndex((prev) => Math.min(commits.length - 1, prev + 1));
+      setSelectedIndex((prev) => Math.min(commits2.length - 1, prev + 1));
     } else if (input === " ") {
       toggleCurrent();
     } else if (input === "a" || input === "A") {
@@ -730,35 +745,35 @@ function CommitList({ remote, branch, onSelect, onBack }) {
       onBack?.();
     } else if (key.return) {
       if (selectedHashes.size > 0) {
-        onSelect(Array.from(selectedHashes), commits);
+        onSelect(Array.from(selectedHashes), commits2);
       }
     }
   });
   if (loading) {
-    return /* @__PURE__ */ jsx6(Spinner4, { label: `\u83B7\u53D6 ${remote}/${branch} \u7684 commit \u5217\u8868...` });
+    return /* @__PURE__ */ jsx6(Spinner4, { label: `\u83B7\u53D6 ${remote2}/${branch2} \u7684 commit \u5217\u8868...` });
   }
-  if (error) {
+  if (error2) {
     return /* @__PURE__ */ jsxs6(Text6, { color: "red", children: [
       "\u2716 \u83B7\u53D6 commit \u5217\u8868\u5931\u8D25: ",
-      error
+      error2
     ] });
   }
-  if (!commits || commits.length === 0) {
+  if (!commits2 || commits2.length === 0) {
     return /* @__PURE__ */ jsx6(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), commits.length - visibleCount));
-  const visibleCommits = commits.slice(startIdx, startIdx + visibleCount);
+  const startIdx = Math.max(0, Math.min(selectedIndex - Math.floor(visibleCount / 2), commits2.length - visibleCount));
+  const visibleCommits = commits2.slice(startIdx, startIdx + visibleCount);
   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: [
       /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
-        remote,
+        remote2,
         "/",
-        branch
+        branch2
       ] }),
       /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
-        commits.length,
+        commits2.length,
         " commits"
       ] }),
       /* @__PURE__ */ jsxs6(Text6, { color: selectedHashes.size > 0 ? "cyan" : "gray", bold: selectedHashes.size > 0, children: [
@@ -797,9 +812,9 @@ function CommitList({ remote, branch, onSelect, onBack }) {
           ] })
         ] }, c.hash);
       }),
-      startIdx + visibleCount < commits.length && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
+      startIdx + visibleCount < commits2.length && /* @__PURE__ */ jsxs6(Text6, { color: "gray", dimColor: true, children: [
         "  \u2193 ",
-        commits.length - startIdx - visibleCount,
+        commits2.length - startIdx - visibleCount,
         " more"
       ] })
     ] }),
@@ -820,7 +835,7 @@ function CommitList({ remote, branch, onSelect, onBack }) {
 // src/components/confirm-panel.tsx
 import { Box as Box7, Text as Text7, useInput as useInput6 } from "ink";
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-function ConfirmPanel({ commits, selectedHashes, hasMerge, useMainline, onToggleMainline, onConfirm, onCancel }) {
+function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline, onToggleMainline, onConfirm, onCancel }) {
   useInput6((input, key) => {
     if (key.escape) {
       onCancel();
@@ -832,7 +847,7 @@ function ConfirmPanel({ commits, selectedHashes, hasMerge, useMainline, onToggle
       onToggleMainline();
     }
   });
-  const selectedCommits = selectedHashes.map((hash) => commits.find((c) => c.hash === hash)).filter(Boolean);
+  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: [
@@ -966,14 +981,15 @@ var STEP_NUMBER = {
   result: 5
 };
 var STEP_DEBOUNCE = 100;
-function App() {
+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 [remote, setRemote] = useState7("");
-  const [branch, setBranch] = useState7("");
+  const [remote2, setRemote] = useState7(initialRemote || "");
+  const [branch2, setBranch] = useState7(initialBranch || "");
   const [selectedHashes, setSelectedHashes] = useState7([]);
-  const [commits, setCommits] = useState7([]);
+  const [commits2, setCommits] = useState7([]);
   const [hasMerge, setHasMerge] = useState7(false);
   const [useMainline, setUseMainline] = useState7(false);
   const [stashed, setStashed] = useState7(false);
@@ -1020,7 +1036,7 @@ function App() {
       }
       const clean = await isWorkingDirClean();
       if (!mountedRef.current) return;
-      setStep(clean ? "remote" : "stash-prompt");
+      setStep(clean ? entryStep : "stash-prompt");
     }
     check();
     const onSignal = () => {
@@ -1045,7 +1061,7 @@ function App() {
       stashedRef.current = true;
       await writeStashGuard();
     }
-    if (mountedRef.current) setStep("remote");
+    if (mountedRef.current) setStep(entryStep);
   };
   const doStashRecover = async () => {
     const entry = await findStashEntry();
@@ -1055,13 +1071,13 @@ function App() {
     await removeStashGuard();
     if (!mountedRef.current) return;
     const clean = await isWorkingDirClean();
-    if (mountedRef.current) setStep(clean ? "remote" : "stash-prompt");
+    if (mountedRef.current) setStep(clean ? entryStep : "stash-prompt");
   };
   const skipStashRecover = async () => {
     await removeStashGuard();
     if (!mountedRef.current) return;
     const clean = await isWorkingDirClean();
-    if (mountedRef.current) setStep(clean ? "remote" : "stash-prompt");
+    if (mountedRef.current) setStep(clean ? entryStep : "stash-prompt");
   };
   const goBack = useCallback2((fromStep) => {
     const backMap = {
@@ -1092,7 +1108,7 @@ function App() {
       StashPrompt,
       {
         onConfirm: doStash,
-        onSkip: () => setStep("remote")
+        onSkip: () => setStep(entryStep)
       }
     ),
     step === "remote" && inputReady && /* @__PURE__ */ jsx9(
@@ -1108,7 +1124,7 @@ function App() {
     step === "branch" && inputReady && /* @__PURE__ */ jsx9(
       BranchSelect,
       {
-        remote,
+        remote: remote2,
         onSelect: (b) => {
           setBranch(b);
           setStep("commits");
@@ -1119,8 +1135,8 @@ function App() {
     step === "commits" && inputReady && /* @__PURE__ */ jsx9(
       CommitList,
       {
-        remote,
-        branch,
+        remote: remote2,
+        branch: branch2,
         onSelect: async (hashes, loadedCommits) => {
           setSelectedHashes(hashes);
           setCommits(loadedCommits);
@@ -1134,7 +1150,7 @@ function App() {
     step === "confirm" && inputReady && /* @__PURE__ */ jsx9(
       ConfirmPanel,
       {
-        commits,
+        commits: commits2,
         selectedHashes,
         hasMerge,
         useMainline,
@@ -1159,32 +1175,244 @@ function App() {
   ] });
 }
 
+// src/cli-runner.ts
+import { createInterface } from "readline";
+function log(msg) {
+  process.stdout.write(msg + "\n");
+}
+function error(msg) {
+  process.stderr.write(msg + "\n");
+}
+function padEnd(str, len) {
+  return str.length >= len ? str : str + " ".repeat(len - str.length);
+}
+async function confirm(message) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(`${message} [y/N] `, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase() === "y");
+    });
+  });
+}
+async function handleStash(noStash2) {
+  const clean = await isWorkingDirClean();
+  if (clean) {
+    log("\u2714 \u5DE5\u4F5C\u533A\u5E72\u51C0");
+    return false;
+  }
+  if (noStash2) {
+    log("\u25B2 \u5DE5\u4F5C\u533A\u6709\u672A\u63D0\u4EA4\u53D8\u66F4\uFF08--no-stash \u8DF3\u8FC7 stash\uFF09");
+    return false;
+  }
+  log("\u25B2 \u5DE5\u4F5C\u533A\u6709\u672A\u63D0\u4EA4\u53D8\u66F4\uFF0C\u81EA\u52A8 stash...");
+  const ok = await stash();
+  if (ok) {
+    await writeStashGuard();
+    log("\u2714 \u5DF2 stash \u5DE5\u4F5C\u533A\u53D8\u66F4");
+    return true;
+  }
+  error("\u2716 stash \u5931\u8D25");
+  process.exit(1);
+  return false;
+}
+async function restoreStash(stashed) {
+  if (!stashed) return;
+  const ok = await stashPop();
+  await removeStashGuard();
+  if (ok) {
+    log("\u2714 \u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)");
+  } else {
+    error("\u25B2 stash pop \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: git stash pop");
+  }
+}
+async function validateRemote(name) {
+  const remotes = await getRemotes();
+  if (!remotes.some((r) => r.name === name)) {
+    const available = remotes.map((r) => r.name).join(", ");
+    error(`\u2716 \u8FDC\u7A0B\u4ED3\u5E93 '${name}' \u4E0D\u5B58\u5728`);
+    if (available) error(`  \u53EF\u7528: ${available}`);
+    process.exit(1);
+  }
+  log(`\u2714 \u8FDC\u7A0B\u4ED3\u5E93 '${name}'`);
+}
+async function validateBranch(remote2, branch2) {
+  const branches = await getRemoteBranches(remote2);
+  if (!branches.includes(branch2)) {
+    error(`\u2716 \u5206\u652F '${branch2}' \u4E0D\u5B58\u5728\u4E8E ${remote2}`);
+    const similar = branches.filter((b) => b.toLowerCase().includes(branch2.toLowerCase())).slice(0, 5);
+    if (similar.length > 0) error(`  \u7C7B\u4F3C: ${similar.join(", ")}`);
+    process.exit(1);
+  }
+  log(`\u2714 \u5206\u652F '${remote2}/${branch2}'`);
+}
+function formatCommitLine(c) {
+  return `  ${c.shortHash}  ${padEnd(c.message.slice(0, 60), 62)} ${padEnd(c.author, 16)} ${c.date}`;
+}
+async function runList(opts) {
+  await validateRemote(opts.remote);
+  log(`\u83B7\u53D6 ${opts.remote}/${opts.branch} \u7684 commit \u5217\u8868...`);
+  await validateBranch(opts.remote, opts.branch);
+  const commits2 = await getCommits(opts.remote, opts.branch, opts.count);
+  if (commits2.length === 0) {
+    log("(\u65E0 commit)");
+    return;
+  }
+  log(`
+Commits on ${opts.remote}/${opts.branch} (${commits2.length}):`);
+  for (const c of commits2) {
+    log(formatCommitLine(c));
+  }
+}
+async function runExec(opts) {
+  const stashed = await handleStash(opts.noStash);
+  await validateRemote(opts.remote);
+  await validateBranch(opts.remote, opts.branch);
+  const allCommits = await getCommits(opts.remote, opts.branch, opts.count);
+  const hashes = opts.commits;
+  const resolved = [];
+  for (const input of hashes) {
+    const match = allCommits.find(
+      (c) => c.hash === input || c.shortHash === input || c.hash.startsWith(input)
+    );
+    if (!match) {
+      error(`\u2716 commit '${input}' \u672A\u627E\u5230\u5728 ${opts.remote}/${opts.branch}`);
+      await restoreStash(stashed);
+      process.exit(1);
+    }
+    resolved.push(match);
+  }
+  const resolvedHashes = resolved.map((c) => c.hash);
+  const hasMerge = await hasMergeCommits(resolvedHashes);
+  if (hasMerge && !opts.mainline) {
+    log("\u25B2 \u68C0\u6D4B\u5230 merge commit\uFF0C\u5EFA\u8BAE\u6DFB\u52A0 --mainline (-m) \u53C2\u6570");
+  }
+  log(`
+Cherry-pick ${resolved.length} \u4E2A commit (--no-commit${opts.mainline ? " -m 1" : ""}):`);
+  for (const c of resolved) {
+    log(formatCommitLine(c));
+  }
+  log("");
+  if (!opts.yes) {
+    const ok = await confirm("\u786E\u8BA4\u6267\u884C?");
+    if (!ok) {
+      log("\u5DF2\u53D6\u6D88");
+      await restoreStash(stashed);
+      process.exit(0);
+    }
+  }
+  const result = await cherryPick(resolvedHashes, opts.mainline);
+  if (result.success) {
+    log("\u2714 Cherry-pick \u5B8C\u6210");
+    const stat = await getStagedStat();
+    if (stat) {
+      log(`
+\u6682\u5B58\u533A\u53D8\u66F4 (git diff --cached --stat):
+${stat}`);
+    }
+    log("\n\u25B2 \u6539\u52A8\u5DF2\u6682\u5B58\u5230\u5DE5\u4F5C\u533A (--no-commit \u6A21\u5F0F)");
+    log("  \u5BA1\u67E5\u540E\u624B\u52A8\u6267\u884C:");
+    log("  git diff --cached          # \u67E5\u770B\u8BE6\u7EC6 diff");
+    log('  git commit -m "sync: ..."  # \u63D0\u4EA4');
+    log("  git reset HEAD             # \u6216\u653E\u5F03");
+  } else {
+    error("\u2716 Cherry-pick \u9047\u5230\u51B2\u7A81");
+    if (result.conflictFiles && result.conflictFiles.length > 0) {
+      error("\u51B2\u7A81\u6587\u4EF6:");
+      for (const f of result.conflictFiles) {
+        error(`  ${f}`);
+      }
+    }
+    error("\n\u25B8 \u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add \u548C git commit");
+    error("\u25B8 \u6216\u6267\u884C git cherry-pick --abort \u653E\u5F03\u64CD\u4F5C");
+  }
+  await restoreStash(stashed);
+  if (!result.success) {
+    process.exit(1);
+  }
+}
+async function runCli(opts) {
+  if (opts.list) {
+    await runList(opts);
+  } else {
+    await runExec(opts);
+  }
+}
+
 // src/cli.tsx
 import { jsx as jsx10 } from "react/jsx-runtime";
 var cli = meow(
   `
   \u7528\u6CD5
-    $ git-sync-tui
+    $ git-sync-tui [options]
 
   \u9009\u9879
-    --help    \u663E\u793A\u5E2E\u52A9
-    --version \u663E\u793A\u7248\u672C
+    -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
+    -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
+    --list                    \u5217\u51FA\u8FDC\u7A0B\u5206\u652F\u7684 commit \u540E\u9000\u51FA
 
-  \u8BF4\u660E
-    \u4EA4\u4E92\u5F0F TUI \u5DE5\u5177\uFF0C\u4ECE\u8FDC\u7A0B\u5206\u652F\u6311\u9009 commit \u540C\u6B65\u5230\u5F53\u524D\u5206\u652F\u3002
-    \u4F7F\u7528 cherry-pick --no-commit \u6A21\u5F0F\uFF0C\u540C\u6B65\u540E\u53EF\u5BA1\u67E5\u518D\u63D0\u4EA4\u3002
+  \u6A21\u5F0F
+    \u65E0\u53C2\u6570                     \u4EA4\u4E92\u5F0F TUI \u6A21\u5F0F
+    -r -b --list              \u5217\u51FA commit\uFF08\u7EAF\u6587\u672C\uFF09
+    -r -b -c                  CLI \u6A21\u5F0F\uFF0C\u786E\u8BA4\u540E\u6267\u884C
+    -r -b -c --yes            CLI \u6A21\u5F0F\uFF0C\u76F4\u63A5\u6267\u884C
+    \u4EC5 -r \u6216 -r -b            TUI \u6A21\u5F0F\uFF0C\u8DF3\u8FC7\u5DF2\u6307\u5B9A\u6B65\u9AA4
 
-  \u5FEB\u6377\u952E
+  TUI \u5FEB\u6377\u952E
     Space       \u9009\u62E9/\u53D6\u6D88 commit
     Shift+\u2191/\u2193   \u8FDE\u7EED\u9009\u62E9
     a           \u5168\u9009/\u53D6\u6D88\u5168\u9009
     i           \u53CD\u9009
     r           \u9009\u81F3\u5F00\u5934
     Enter       \u786E\u8BA4\u9009\u62E9
+    Esc         \u8FD4\u56DE\u4E0A\u4E00\u6B65
     y/n         \u786E\u8BA4/\u53D6\u6D88\u6267\u884C
+
+  \u793A\u4F8B
+    $ git-sync-tui                                           # TUI \u6A21\u5F0F
+    $ git-sync-tui -r upstream -b main --list                # \u5217\u51FA commits
+    $ git-sync-tui -r upstream -b main -c abc1234 --yes      # \u76F4\u63A5\u6267\u884C
+    $ git-sync-tui -r upstream -b main -c abc1234,def5678    # \u786E\u8BA4\u540E\u6267\u884C
+    $ git-sync-tui -r upstream                               # TUI \u6A21\u5F0F\uFF0C\u8DF3\u8FC7\u9009\u62E9\u4ED3\u5E93
 `,
   {
-    importMeta: import.meta
+    importMeta: import.meta,
+    flags: {
+      remote: { type: "string", shortFlag: "r" },
+      branch: { type: "string", shortFlag: "b" },
+      commits: { type: "string", shortFlag: "c" },
+      count: { type: "number", shortFlag: "n", default: 30 },
+      mainline: { type: "boolean", shortFlag: "m", default: false },
+      yes: { type: "boolean", shortFlag: "y", default: false },
+      noStash: { type: "boolean", default: false },
+      list: { type: "boolean", default: false }
+    }
   }
 );
-render(/* @__PURE__ */ jsx10(App, {}));
+var { remote, branch, commits, count, mainline, yes, noStash, list } = cli.flags;
+var commitList = commits ? commits.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
+var hasAllParams = !!(remote && branch && commitList && commitList.length > 0);
+var isListMode = !!(list && remote && branch);
+var isCliMode = hasAllParams || isListMode;
+if (isCliMode) {
+  runCli({
+    remote,
+    branch,
+    commits: commitList,
+    count,
+    mainline,
+    yes,
+    noStash,
+    list
+  }).catch((err) => {
+    console.error("\u2716 " + (err.message || err));
+    process.exit(1);
+  });
+} else {
+  render(/* @__PURE__ */ jsx10(App, { initialRemote: remote, initialBranch: branch }));
+}

package/package.json

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