git-sync-tui 0.1.0 → 0.1.2

package/README.md

@@ -1,68 +1,126 @@
-# git-sync-tui
-
-Interactive TUI tool for cross-repo git commit synchronization.
-
-Cherry-pick commits from remote branches with an interactive terminal UI — select specific commits, preview changes, and sync with `--no-commit` mode for review before committing.
-
-## Features
-
-- **Multi-select commits** — pick non-consecutive commits with Space/Enter
-- **`--no-commit` mode** — changes are staged, not committed, so you can review and edit before committing
-- **Diff preview** — see `--stat` summary of selected commits before executing
-- **Branch search** — filter branches by keyword
-- **Conflict handling** — shows conflicted files when cherry-pick fails
-- **Language agnostic** — works in any git repo (Node.js, Go, Python, Java, etc.)
-
-## Install
+<h1 align="center">🔄 git-sync-tui</h1>
+
+<p align="center">
+  <a href="https://www.npmjs.com/package/git-sync-tui"><img src="https://img.shields.io/npm/v/git-sync-tui.svg?color=0ea5e9" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/git-sync-tui"><img src="https://img.shields.io/npm/dm/git-sync-tui.svg?color=10b981" alt="downloads"></a>
+  <a href="https://github.com/KiWi233333/git-sync-tui/actions/workflows/publish.yml"><img src="https://github.com/KiWi233333/git-sync-tui/actions/workflows/publish.yml/badge.svg" alt="publish"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/node/v/git-sync-tui.svg?color=8b5cf6" alt="node version"></a>
+  <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-f59e0b.svg" alt="license"></a>
+  <a href="https://github.com/KiWi233333/git-sync-tui"><img src="https://img.shields.io/github/stars/KiWi233333/git-sync-tui?style=social" alt="GitHub Stars"></a>
+</p>
+
+<p align="center">
+  <b>Interactive TUI for cross-repository git commit synchronization</b>
+</p>
+
+<p align="center">
+  Cherry-pick commits from remote branches with an intuitive terminal UI.<br>
+  Select specific commits, preview changes, and sync with <code>--no-commit</code> mode for safe review.
+</p>
+
+<p align="center">
+  <a href="#-features">Features</a> ·
+  <a href="#-quick-start">Quick Start</a> ·
+  <a href="#-installation">Installation</a> ·
+  <a href="#-workflow">Workflow</a>
+</p>
+
+<p align="center">
+  <a href="./README.md">English</a> | <a href="./README.zh-CN.md">中文</a>
+</p>
+
+<p align="center">
+  <img src="./assets/demo.gif" alt="git-sync-tui demo" width="680">
+</p>
+
+## ✨ Features
+
+- 🎯 **Multi-select commits** — Cherry-pick non-consecutive commits with Space / Enter
+- 🔍 **Branch search** — Fuzzy filter branches by keyword
+- 👀 **Diff preview** — See `--stat` summary of selected commits before executing
+- ⚡ **Safe mode** — `--no-commit` stages changes for review, never auto-commits
+- ⚠️ **Conflict handling** — Clear display of conflicted files when cherry-pick fails
+- 🌐 **Universal** — Works in any git repository, any language
+
+## 🚀 Quick Start
 
 ```bash
+# Install globally
 npm install -g git-sync-tui
-```
 
-Requires Node.js >= 20.
+# Navigate to your git repo and run
+cd your-project
+git-sync-tui
+```
 
-## Usage
+## 📦 Installation
 
 ```bash
-# Run in any git repository
-git-sync-tui
+npm install -g git-sync-tui
 ```
 
-### Workflow
+> **Requirements:** Node.js >= 20
+
+## 🔄 Workflow
 
 ```
-[Select remote] → [Select branch] → [Multi-select commits] → [Preview stat] → [Confirm] → [Cherry-pick --no-commit] → [Review & commit manually]
+Select Remote  →  Select Branch  →  Multi-select Commits  →  Preview Changes
+                                                                     ↓
+Review & Commit manually  ←  Cherry-pick --no-commit (staged, not committed)
 ```
 
-### Keyboard Shortcuts
+## ⌨️ Keyboard Shortcuts
 
 | Key | Action |
 |-----|--------|
-| `↑` / `↓` | Navigate |
+| `↑` `↓` | Navigate items |
 | `Space` | Toggle commit selection |
 | `Enter` | Confirm selection |
 | `y` / `n` | Confirm / cancel execution |
+| `/` | Search (in branch list) |
 
-### After sync
+## 📋 After Sync
 
 Changes are staged in your working tree (not committed). You can:
 
 ```bash
-git diff --cached          # Review changes
-git commit -m "sync: ..."  # Commit when ready
-git reset HEAD             # Or discard all changes
+# Review staged changes
+git diff --cached
+
+# Commit when ready
+git commit -m "sync: cherry-picked commits from feature-branch"
+
+# Or discard all changes
+git reset HEAD
 ```
 
-## Development
+## 💡 Use Cases
+
+| Scenario | Description |
+|----------|-------------|
+| **Backport fixes** | Cherry-pick critical fixes from main to release branches |
+| **Sync features** | Copy specific commits between feature branches |
+| **Selective merge** | Pick individual commits instead of merging entire branches |
+
+## 🛠️ Development
 
 ```bash
 git clone https://github.com/KiWi233333/git-sync-tui.git
 cd git-sync-tui
 npm install
-npm start        # Run with tsx
-npm run build    # Build with tsup
+npm start
 ```
 
-## License
+## 🏗️ Tech Stack
+
+- [Ink](https://github.com/vadimdemedes/ink) — React for interactive CLI apps
+- [@inkjs/ui](https://github.com/inkjs/ui) — UI components for Ink
+- [simple-git](https://github.com/steveukx/git-js) — Git commands interface
+
+## 🤝 Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## 📄 License
 
-MIT
+[MIT](./LICENSE) © [KiWi233333](https://github.com/KiWi233333)

package/README.zh-CN.md

@@ -0,0 +1,126 @@
+<h1 align="center">🔄 git-sync-tui</h1>
+
+<p align="center">
+  <a href="https://www.npmjs.com/package/git-sync-tui"><img src="https://img.shields.io/npm/v/git-sync-tui.svg?color=0ea5e9" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/git-sync-tui"><img src="https://img.shields.io/npm/dm/git-sync-tui.svg?color=10b981" alt="downloads"></a>
+  <a href="https://github.com/KiWi233333/git-sync-tui/actions/workflows/publish.yml"><img src="https://github.com/KiWi233333/git-sync-tui/actions/workflows/publish.yml/badge.svg" alt="publish"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/node/v/git-sync-tui.svg?color=8b5cf6" alt="node version"></a>
+  <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-f59e0b.svg" alt="license"></a>
+  <a href="https://github.com/KiWi233333/git-sync-tui"><img src="https://img.shields.io/github/stars/KiWi233333/git-sync-tui?style=social" alt="GitHub Stars"></a>
+</p>
+
+<p align="center">
+  <b>跨仓库 Git 提交同步的交互式 TUI 工具</b>
+</p>
+
+<p align="center">
+  通过直观的终端界面从远程分支 cherry-pick 提交。<br>
+  选择特定提交、预览变更，并使用 <code>--no-commit</code> 模式在提交前安全审查。
+</p>
+
+<p align="center">
+  <a href="#-功能特性">功能</a> ·
+  <a href="#-快速开始">快速开始</a> ·
+  <a href="#-安装">安装</a> ·
+  <a href="#-工作流程">工作流程</a>
+</p>
+
+<p align="center">
+  <a href="./README.md">English</a> | <a href="./README.zh-CN.md">中文</a>
+</p>
+
+<!-- <p align="center">
+  <img src="./assets/demo.gif" alt="git-sync-tui 演示" width="680">
+</p> -->
+
+## ✨ 功能特性
+
+- 🎯 **多选提交** — 使用 Space / Enter 选择不连续的提交进行 cherry-pick
+- 🔍 **分支搜索** — 按关键词模糊过滤分支
+- 👀 **差异预览** — 执行前查看所选提交的 `--stat` 摘要
+- ⚡ **安全模式** — `--no-commit` 仅暂存变更供审查，不会自动提交
+- ⚠️ **冲突处理** — cherry-pick 失败时清晰显示冲突文件
+- 🌐 **通用性** — 适用于任何 Git 仓库，不限语言
+
+## 🚀 快速开始
+
+```bash
+# 全局安装
+npm install -g git-sync-tui
+
+# 进入你的 Git 仓库并运行
+cd your-project
+git-sync-tui
+```
+
+## 📦 安装
+
+```bash
+npm install -g git-sync-tui
+```
+
+> **环境要求：** Node.js >= 20
+
+## 🔄 工作流程
+
+```
+选择远程仓库  →  选择分支  →  多选提交  →  预览变更
+                                              ↓
+手动审查并提交  ←  Cherry-pick --no-commit（已暂存，未提交）
+```
+
+## ⌨️ 快捷键
+
+| 按键 | 操作 |
+|-----|------|
+| `↑` `↓` | 上下导航 |
+| `Space` | 切换提交选择 |
+| `Enter` | 确认选择 |
+| `y` / `n` | 确认 / 取消执行 |
+| `/` | 搜索（在分支列表中） |
+
+## 📋 同步后操作
+
+变更已暂存在工作区（未提交）。你可以：
+
+```bash
+# 查看暂存的变更
+git diff --cached
+
+# 准备好后提交
+git commit -m "sync: 从 feature-branch cherry-pick 提交"
+
+# 或放弃所有变更
+git reset HEAD
+```
+
+## 💡 使用场景
+
+| 场景 | 描述 |
+|------|------|
+| **回溯修复** | 从主分支 cherry-pick 关键修复到发布分支 |
+| **同步特性** | 在特性分支间复制特定提交 |
+| **选择性合并** | 选择单个提交而非合并整个分支 |
+
+## 🛠️ 开发
+
+```bash
+git clone https://github.com/KiWi233333/git-sync-tui.git
+cd git-sync-tui
+npm install
+npm start
+```
+
+## 🏗️ 技术栈
+
+- [Ink](https://github.com/vadimdemedes/ink) — 用于构建交互式 CLI 应用的 React 框架
+- [@inkjs/ui](https://github.com/inkjs/ui) — Ink 的 UI 组件库
+- [simple-git](https://github.com/steveukx/git-js) — Git 命令接口
+
+## 🤝 贡献
+
+欢迎贡献代码！请随时提交 Pull Request。
+
+## 📄 许可证
+
+[MIT](./LICENSE) © [KiWi233333](https://github.com/KiWi233333)

package/dist/cli.js

@@ -5,12 +5,40 @@ import { render } from "ink";
 import meow from "meow";
 
 // src/app.tsx
-import { useState as useState5 } from "react";
-import { Box as Box6, Text as Text6 } from "ink";
+import { useState as useState6, useEffect as useEffect3, useRef as useRef2, useCallback as useCallback2 } from "react";
+import { Box as Box7, Text as Text7, useApp } from "ink";
+import { Spinner as Spinner5 } from "@inkjs/ui";
+
+// src/components/stash-prompt.tsx
+import { Box, Text, useInput } from "ink";
+import { jsx, jsxs } from "react/jsx-runtime";
+function StashPrompt({ onConfirm, onSkip }) {
+  useInput((input) => {
+    if (input === "y" || input === "Y") {
+      onConfirm();
+    } else if (input === "n" || input === "N") {
+      onSkip();
+    }
+  });
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, color: "yellow", children: "\u68C0\u6D4B\u5230\u5DE5\u4F5C\u533A\u6709\u672A\u63D0\u4EA4\u7684\u53D8\u66F4" }),
+      /* @__PURE__ */ jsx(Text, { color: "gray", children: "Cherry-pick \u64CD\u4F5C\u53EF\u80FD\u4F1A\u4E0E\u672A\u63D0\u4EA4\u7684\u5185\u5BB9\u51B2\u7A81" })
+    ] }),
+    /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "\u662F\u5426\u81EA\u52A8 stash \u4FDD\u5B58\u5F53\u524D\u53D8\u66F4? " }),
+      /* @__PURE__ */ jsx(Text, { color: "green", children: "[y]" }),
+      /* @__PURE__ */ jsx(Text, { children: " \u662F / " }),
+      /* @__PURE__ */ jsx(Text, { color: "red", children: "[n]" }),
+      /* @__PURE__ */ jsx(Text, { children: " \u5426\uFF0C\u7EE7\u7EED\u64CD\u4F5C" })
+    ] })
+  ] });
+}
 
 // src/components/remote-select.tsx
-import { Box, Text } from "ink";
-import { Select, Spinner } from "@inkjs/ui";
+import { useState as useState2 } from "react";
+import { Box as Box2, Text as Text2 } from "ink";
+import { Select, Spinner, TextInput } from "@inkjs/ui";
 
 // src/hooks/use-git.ts
 import { useState, useEffect, useCallback } from "react";
@@ -32,6 +60,10 @@ async function getRemotes() {
     fetchUrl: r.refs.fetch
   }));
 }
+async function addRemote(name, url) {
+  const git = getGit();
+  await git.addRemote(name, url);
+}
 async function getRemoteBranches(remote) {
   const git = getGit();
   try {
@@ -80,12 +112,29 @@ ${result.trim()}`);
     return "(\u65E0\u6CD5\u83B7\u53D6 stat \u4FE1\u606F)";
   }
 }
-async function cherryPick(hashes) {
+async function hasMergeCommits(hashes) {
+  const git = getGit();
+  try {
+    for (const hash of hashes) {
+      const result = await git.raw(["rev-list", "--merges", "-n", "1", hash]);
+      if (result.trim()) return true;
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+async function cherryPick(hashes, useMainline = false) {
   const git = getGit();
   try {
     const orderedHashes = [...hashes].reverse();
     for (const hash of orderedHashes) {
-      await git.raw(["cherry-pick", "--no-commit", hash]);
+      const args = ["cherry-pick", "--no-commit"];
+      if (useMainline) {
+        args.push("-m", "1");
+      }
+      args.push(hash);
+      await git.raw(args);
     }
     return { success: true };
   } catch (err) {
@@ -111,6 +160,29 @@ async function getStagedStat() {
     return "";
   }
 }
+async function isWorkingDirClean() {
+  const git = getGit();
+  const status = await git.status();
+  return status.isClean();
+}
+async function stash() {
+  const git = getGit();
+  try {
+    await git.stash(["push", "--include-untracked", "-m", "Auto-stash by git-sync-tui"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function stashPop() {
+  const git = getGit();
+  try {
+    await git.stash(["pop"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/hooks/use-git.ts
 function useAsync(fn, deps = []) {
@@ -169,259 +241,609 @@ function useCommitStat(hashes) {
 }
 
 // src/components/remote-select.tsx
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 function RemoteSelect({ onSelect }) {
-  const { data: remotes, loading, error } = useRemotes();
+  const { data: remotes, loading, error, reload } = useRemotes();
+  const [phase, setPhase] = useState2("list");
+  const [customUrl, setCustomUrl] = useState2("");
+  const [addError, setAddError] = useState2(null);
   if (loading) {
-    return /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Spinner, { label: "\u6B63\u5728\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5217\u8868..." }) });
+    return /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsx2(Spinner, { label: "\u6B63\u5728\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5217\u8868..." }) });
   }
   if (error) {
-    return /* @__PURE__ */ jsxs(Text, { color: "red", children: [
+    return /* @__PURE__ */ jsxs2(Text2, { color: "red", children: [
       "\u83B7\u53D6\u8FDC\u7A0B\u4ED3\u5E93\u5931\u8D25: ",
       error
     ] });
   }
-  if (!remotes || remotes.length === 0) {
-    return /* @__PURE__ */ jsx(Text, { color: "red", children: "\u672A\u627E\u5230\u4EFB\u4F55\u8FDC\u7A0B\u4ED3\u5E93\uFF0C\u8BF7\u5148 git remote add" });
+  if (phase === "adding") {
+    return /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsx2(Spinner, { label: "\u6B63\u5728\u6DFB\u52A0\u8FDC\u7A0B\u4ED3\u5E93..." }) });
   }
-  const options = remotes.map((r) => ({
-    label: `${r.name}  ${r.fetchUrl}`,
-    value: r.name
-  }));
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: "[1/5] \u9009\u62E9\u8FDC\u7A0B\u4ED3\u5E93" }),
-    /* @__PURE__ */ jsx(Select, { options, onChange: onSelect })
+  if (phase === "input-url") {
+    return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx2(Text2, { bold: true, color: "cyan", children: "[1/5] \u6DFB\u52A0\u8FDC\u7A0B\u4ED3\u5E93" }),
+      addError && /* @__PURE__ */ jsx2(Text2, { color: "red", children: addError }),
+      /* @__PURE__ */ jsxs2(Box2, { children: [
+        /* @__PURE__ */ jsx2(Text2, { children: "\u4ED3\u5E93\u5730\u5740: " }),
+        /* @__PURE__ */ jsx2(
+          TextInput,
+          {
+            placeholder: "https://github.com/user/repo.git",
+            onSubmit: (url) => {
+              if (!url.trim()) {
+                setAddError("\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A");
+                return;
+              }
+              setCustomUrl(url.trim());
+              setPhase("input-name");
+            }
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsx2(Text2, { color: "gray", dimColor: true, children: "\u652F\u6301 HTTPS / SSH \u5730\u5740" })
+    ] });
+  }
+  if (phase === "input-name") {
+    return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx2(Text2, { bold: true, color: "cyan", children: "[1/5] \u6DFB\u52A0\u8FDC\u7A0B\u4ED3\u5E93" }),
+      /* @__PURE__ */ jsxs2(Text2, { color: "gray", children: [
+        "\u5730\u5740: ",
+        customUrl
+      ] }),
+      addError && /* @__PURE__ */ jsx2(Text2, { color: "red", children: addError }),
+      /* @__PURE__ */ jsxs2(Box2, { children: [
+        /* @__PURE__ */ jsx2(Text2, { children: "\u8FDC\u7A0B\u540D\u79F0: " }),
+        /* @__PURE__ */ jsx2(
+          TextInput,
+          {
+            placeholder: "upstream",
+            onSubmit: async (name) => {
+              const remoteName = name.trim();
+              if (!remoteName) {
+                setAddError("\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+                return;
+              }
+              if (remotes?.some((r) => r.name === remoteName)) {
+                setAddError(`\u8FDC\u7A0B "${remoteName}" \u5DF2\u5B58\u5728`);
+                return;
+              }
+              setAddError(null);
+              setPhase("adding");
+              try {
+                await addRemote(remoteName, customUrl);
+                reload();
+                onSelect(remoteName);
+              } catch (err) {
+                setAddError(err.message);
+                setPhase("input-name");
+              }
+            }
+          }
+        )
+      ] })
+    ] });
+  }
+  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__ */ jsxs2(Box2, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx2(Text2, { bold: true, color: "cyan", children: "[1/5] \u9009\u62E9\u8FDC\u7A0B\u4ED3\u5E93" }),
+    /* @__PURE__ */ jsx2(
+      Select,
+      {
+        options,
+        onChange: (value) => {
+          if (value === "__add_custom__") {
+            setPhase("input-url");
+          } else {
+            onSelect(value);
+          }
+        }
+      }
+    )
   ] });
 }
 
 // src/components/branch-select.tsx
-import { useState as useState2, useMemo } from "react";
-import { Box as Box2, Text as Text2 } from "ink";
-import { Select as Select2, Spinner as Spinner2, TextInput } from "@inkjs/ui";
-import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+import { useState as useState3, useMemo } from "react";
+import { Box as Box3, Text as Text3 } from "ink";
+import { Select as Select2, Spinner as Spinner2, TextInput as TextInput2 } from "@inkjs/ui";
+import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 function BranchSelect({ remote, onSelect }) {
   const { data: branches, loading, error } = useBranches(remote);
-  const [filter, setFilter] = useState2("");
+  const [filter, setFilter] = useState3("");
   const filteredOptions = useMemo(() => {
     if (!branches) return [];
     const filtered = filter ? branches.filter((b) => b.toLowerCase().includes(filter.toLowerCase())) : branches;
     return filtered.map((b) => ({ label: b, value: b }));
   }, [branches, filter]);
   if (loading) {
-    return /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsx2(Spinner2, { label: `\u6B63\u5728\u83B7\u53D6 ${remote} \u7684\u5206\u652F\u5217\u8868...` }) });
+    return /* @__PURE__ */ jsx3(Box3, { children: /* @__PURE__ */ jsx3(Spinner2, { label: `\u6B63\u5728\u83B7\u53D6 ${remote} \u7684\u5206\u652F\u5217\u8868...` }) });
   }
   if (error) {
-    return /* @__PURE__ */ jsxs2(Text2, { color: "red", children: [
+    return /* @__PURE__ */ jsxs3(Text3, { color: "red", children: [
       "\u83B7\u53D6\u5206\u652F\u5217\u8868\u5931\u8D25: ",
       error
     ] });
   }
   if (!branches || branches.length === 0) {
-    return /* @__PURE__ */ jsx2(Text2, { color: "red", children: "\u672A\u627E\u5230\u8FDC\u7A0B\u5206\u652F" });
+    return /* @__PURE__ */ jsx3(Text3, { color: "red", children: "\u672A\u627E\u5230\u8FDC\u7A0B\u5206\u652F" });
   }
-  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsxs2(Text2, { bold: true, color: "cyan", children: [
+  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsxs3(Text3, { bold: true, color: "cyan", children: [
       "[2/5] \u9009\u62E9\u5206\u652F (",
       remote,
       ")"
     ] }),
-    /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text2, { color: "gray", children: "\u641C\u7D22: " }),
-      /* @__PURE__ */ jsx2(
-        TextInput,
+    /* @__PURE__ */ jsxs3(Box3, { children: [
+      /* @__PURE__ */ jsx3(Text3, { color: "gray", children: "\u641C\u7D22: " }),
+      /* @__PURE__ */ jsx3(
+        TextInput2,
         {
           placeholder: "\u8F93\u5165\u5173\u952E\u5B57\u8FC7\u6EE4\u5206\u652F...",
           onChange: setFilter
         }
       )
     ] }),
-    /* @__PURE__ */ jsxs2(Text2, { color: "gray", dimColor: true, children: [
+    /* @__PURE__ */ jsxs3(Text3, { color: "gray", dimColor: true, children: [
       "\u5171 ",
       branches.length,
       " \u4E2A\u5206\u652F",
       filter ? `\uFF0C\u5339\u914D ${filteredOptions.length} \u4E2A` : ""
     ] }),
-    filteredOptions.length > 0 ? /* @__PURE__ */ jsx2(Select2, { options: filteredOptions, onChange: onSelect }) : /* @__PURE__ */ jsx2(Text2, { color: "yellow", children: "\u65E0\u5339\u914D\u5206\u652F" })
+    filteredOptions.length > 0 ? /* @__PURE__ */ jsx3(Select2, { options: filteredOptions, onChange: onSelect }) : /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u65E0\u5339\u914D\u5206\u652F" })
   ] });
 }
 
 // src/components/commit-list.tsx
-import { useState as useState3 } from "react";
-import { Box as Box3, Text as Text3 } from "ink";
-import { MultiSelect, Spinner as Spinner3 } from "@inkjs/ui";
-import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+import { useState as useState4, useMemo as useMemo2, useRef } from "react";
+import { Box as Box4, Text as Text4, useInput as useInput2 } from "ink";
+import { Spinner as Spinner3 } from "@inkjs/ui";
+import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 function CommitList({ remote, branch, onSelect }) {
   const { data: commits, loading, error } = useCommits(remote, branch, 30);
-  const [selectedHashes, setSelectedHashes] = useState3([]);
-  const { stat, loading: statLoading } = useCommitStat(selectedHashes);
+  const [selectedIndex, setSelectedIndex] = useState4(0);
+  const [selectedHashes, setSelectedHashes] = useState4(/* @__PURE__ */ new Set());
+  const [shiftMode, setShiftMode] = useState4(false);
+  const anchorIndexRef = useRef(null);
+  const selectedKey = useMemo2(() => Array.from(selectedHashes).sort().join(","), [selectedHashes]);
+  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;
+    setSelectedHashes((prev) => {
+      const next = new Set(prev);
+      if (next.has(hash)) {
+        next.delete(hash);
+        anchorIndexRef.current = null;
+      } else {
+        next.add(hash);
+        anchorIndexRef.current = selectedIndex;
+      }
+      return next;
+    });
+  };
+  const selectRange = (anchor, current) => {
+    if (!commits) 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);
+      }
+      return next;
+    });
+  };
+  const toggleAll = () => {
+    if (!commits || commits.length === 0) return;
+    setSelectedHashes((prev) => {
+      if (prev.size === commits.length) {
+        anchorIndexRef.current = null;
+        return /* @__PURE__ */ new Set();
+      }
+      return new Set(commits.map((c) => c.hash));
+    });
+  };
+  const invertSelection = () => {
+    if (!commits || commits.length === 0) return;
+    setSelectedHashes((prev) => {
+      const next = /* @__PURE__ */ new Set();
+      for (const c of commits) {
+        if (!prev.has(c.hash)) {
+          next.add(c.hash);
+        }
+      }
+      return next;
+    });
+  };
+  const selectToCurrent = () => {
+    if (!commits || commits.length === 0) return;
+    setSelectedHashes((prev) => {
+      const next = new Set(prev);
+      for (let i = 0; i <= selectedIndex; i++) {
+        next.add(commits[i].hash);
+      }
+      return next;
+    });
+  };
+  useInput2((input, key) => {
+    if (!commits || commits.length === 0) return;
+    if (key.shift) {
+      if (!shiftMode) {
+        setShiftMode(true);
+        if (anchorIndexRef.current === null) {
+          anchorIndexRef.current = selectedIndex;
+        }
+      }
+      if (key.upArrow) {
+        const newIndex = Math.max(0, selectedIndex - 1);
+        setSelectedIndex(newIndex);
+        selectRange(anchorIndexRef.current, newIndex);
+      } else if (key.downArrow) {
+        const newIndex = Math.min(commits.length - 1, selectedIndex + 1);
+        setSelectedIndex(newIndex);
+        selectRange(anchorIndexRef.current, newIndex);
+      } else if (input === " ") {
+        if (anchorIndexRef.current !== null) {
+          selectRange(anchorIndexRef.current, selectedIndex);
+        } else {
+          toggleCurrent();
+        }
+      }
+      return;
+    }
+    if (shiftMode) {
+      setShiftMode(false);
+    }
+    if (key.upArrow) {
+      setSelectedIndex((prev) => Math.max(0, prev - 1));
+    } else if (key.downArrow) {
+      setSelectedIndex((prev) => Math.min(commits.length - 1, prev + 1));
+    } else if (input === " ") {
+      toggleCurrent();
+    } else if (input === "a" || input === "A") {
+      toggleAll();
+    } else if (input === "i" || input === "I") {
+      invertSelection();
+    } else if (input === "r" || input === "R") {
+      selectToCurrent();
+    } else if (key.return) {
+      if (selectedHashes.size > 0) {
+        onSelect(Array.from(selectedHashes), commits);
+      }
+    }
+  });
   if (loading) {
-    return /* @__PURE__ */ jsx3(Box3, { children: /* @__PURE__ */ jsx3(Spinner3, { label: `\u6B63\u5728\u83B7\u53D6 ${remote}/${branch} \u7684 commit \u5217\u8868...` }) });
+    return /* @__PURE__ */ jsx4(Box4, { children: /* @__PURE__ */ jsx4(Spinner3, { label: `\u6B63\u5728\u83B7\u53D6 ${remote}/${branch} \u7684 commit \u5217\u8868...` }) });
   }
   if (error) {
-    return /* @__PURE__ */ jsxs3(Text3, { color: "red", children: [
+    return /* @__PURE__ */ jsxs4(Text4, { color: "red", children: [
       "\u83B7\u53D6 commit \u5217\u8868\u5931\u8D25: ",
       error
     ] });
   }
   if (!commits || commits.length === 0) {
-    return /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u8BE5\u5206\u652F\u6CA1\u6709 commit" });
+    return /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: "\u8BE5\u5206\u652F\u6CA1\u6709 commit" });
   }
-  const options = commits.map((c) => ({
-    label: `${c.shortHash} ${c.message}  (${c.author}, ${c.date})`,
-    value: c.hash
-  }));
-  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx3(Text3, { bold: true, color: "cyan", children: "[3/5] \u9009\u62E9\u8981\u540C\u6B65\u7684 commit (Space \u9009\u62E9, Enter \u786E\u8BA4)" }),
-    /* @__PURE__ */ jsxs3(Text3, { color: "gray", dimColor: true, children: [
+  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);
+  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx4(Text4, { bold: true, color: "cyan", children: "[3/5] \u9009\u62E9\u8981\u540C\u6B65\u7684 commit" }),
+    /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
       remote,
       "/",
       branch,
       " \u6700\u8FD1 ",
       commits.length,
-      " \u4E2A commit"
+      " \u4E2A commit | \u5DF2\u9009 ",
+      selectedHashes.size,
+      " \u4E2A",
+      shiftMode && /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: " | Shift \u6A21\u5F0F" })
     ] }),
-    /* @__PURE__ */ jsx3(
-      MultiSelect,
-      {
-        options,
-        onChange: setSelectedHashes,
-        onSubmit: (hashes) => {
-          if (hashes.length > 0) {
-            onSelect(hashes, commits);
-          }
-        }
-      }
-    ),
-    selectedHashes.length > 0 && /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
-      /* @__PURE__ */ jsxs3(Text3, { bold: true, color: "yellow", children: [
+    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
+      startIdx > 0 && /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
+        "  \u2191 ",
+        startIdx,
+        " more..."
+      ] }),
+      visibleCommits.map((c, i) => {
+        const actualIdx = startIdx + i;
+        const isSelected = selectedHashes.has(c.hash);
+        const isCursor = actualIdx === selectedIndex;
+        const isAnchor = actualIdx === anchorIndexRef.current;
+        return /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsxs4(Text4, { backgroundColor: isCursor ? "blue" : void 0, color: isSelected ? "green" : "white", children: [
+            isCursor ? "\u25B6 " : "  ",
+            isAnchor ? "\u2693 " : isSelected ? "\u25CF " : "\u25CB ",
+            c.shortHash,
+            " ",
+            c.message
+          ] }),
+          /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
+            " (",
+            c.author,
+            ")"
+          ] })
+        ] }, c.hash);
+      }),
+      startIdx + visibleCount < commits.length && /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
+        "  \u2193 ",
+        commits.length - startIdx - visibleCount,
+        " more..."
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 0, children: [
+      /* @__PURE__ */ jsxs4(Box4, { gap: 2, children: [
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "\u2191/\u2193" }),
+          " \u5BFC\u822A"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "Space" }),
+          " \u9009\u62E9"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "a" }),
+          " \u5168\u9009"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "i" }),
+          " \u53CD\u9009"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "Enter" }),
+          " \u786E\u8BA4"
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs4(Box4, { gap: 2, children: [
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: "Shift+\u2191/\u2193" }),
+          " \u8FDE\u7EED\u9009\u62E9"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: "Shift+Space" }),
+          " \u8303\u56F4\u9009\u62E9"
+        ] }),
+        /* @__PURE__ */ jsxs4(Text4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "r" }),
+          " \u9009\u81F3\u5F00\u5934"
+        ] })
+      ] })
+    ] }),
+    selectedHashes.size > 0 && /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
+      /* @__PURE__ */ jsxs4(Text4, { bold: true, color: "yellow", children: [
         "\u5DF2\u9009 ",
-        selectedHashes.length,
+        selectedHashes.size,
         " \u4E2A commit \u2014 diff --stat \u9884\u89C8:"
       ] }),
-      statLoading ? /* @__PURE__ */ jsx3(Spinner3, { label: "\u52A0\u8F7D\u4E2D..." }) : /* @__PURE__ */ jsx3(Text3, { color: "gray", children: stat || "(\u65E0\u53D8\u66F4)" })
+      statLoading ? /* @__PURE__ */ jsx4(Spinner3, { label: "\u52A0\u8F7D\u4E2D..." }) : /* @__PURE__ */ jsx4(Text4, { color: "gray", children: stat || "(\u65E0\u53D8\u66F4)" })
     ] })
   ] });
 }
 
 // src/components/confirm-panel.tsx
-import { Box as Box4, Text as Text4, useInput } from "ink";
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-function ConfirmPanel({ commits, selectedHashes, onConfirm, onCancel }) {
-  useInput((input) => {
+import { Box as Box5, Text as Text5, useInput as useInput3 } from "ink";
+import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+function ConfirmPanel({ commits, selectedHashes, hasMerge, useMainline, onToggleMainline, onConfirm, onCancel }) {
+  useInput3((input) => {
     if (input === "y" || input === "Y") {
       onConfirm();
     } else if (input === "n" || input === "N" || input === "q") {
       onCancel();
+    } else if (hasMerge && (input === "m" || input === "M")) {
+      onToggleMainline();
     }
   });
   const selectedCommits = selectedHashes.map((hash) => commits.find((c) => c.hash === hash)).filter(Boolean);
-  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx4(Text4, { bold: true, color: "cyan", children: "[4/5] \u786E\u8BA4\u6267\u884C" }),
-    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [
-      /* @__PURE__ */ jsxs4(Text4, { bold: true, children: [
+  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx5(Text5, { bold: true, color: "cyan", children: "[4/5] \u786E\u8BA4\u6267\u884C" }),
+    /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [
+      /* @__PURE__ */ jsxs5(Text5, { bold: true, children: [
         "\u5C06 cherry-pick --no-commit \u4EE5\u4E0B ",
         selectedCommits.length,
         " \u4E2A commit:"
       ] }),
-      selectedCommits.map((c) => /* @__PURE__ */ jsxs4(Text4, { children: [
-        /* @__PURE__ */ jsxs4(Text4, { color: "green", children: [
+      selectedCommits.map((c) => /* @__PURE__ */ jsxs5(Text5, { children: [
+        /* @__PURE__ */ jsxs5(Text5, { color: "green", children: [
           "  ",
           c.shortHash
         ] }),
-        /* @__PURE__ */ jsxs4(Text4, { children: [
+        /* @__PURE__ */ jsxs5(Text5, { children: [
           " ",
           c.message
         ] }),
-        /* @__PURE__ */ jsxs4(Text4, { color: "gray", dimColor: true, children: [
+        /* @__PURE__ */ jsxs5(Text5, { color: "gray", dimColor: true, children: [
           " (",
           c.author,
           ")"
         ] })
       ] }, c.hash))
     ] }),
-    /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { color: "yellow", children: "\u26A0 " }),
-      /* @__PURE__ */ jsx4(Text4, { children: "\u4F7F\u7528 --no-commit \u6A21\u5F0F\uFF0C\u6539\u52A8\u5C06\u6682\u5B58\u5230\u5DE5\u4F5C\u533A\uFF0C\u9700\u624B\u52A8 commit" })
+    hasMerge && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", borderStyle: "single", borderColor: "red", paddingX: 1, children: [
+      /* @__PURE__ */ jsx5(Text5, { bold: true, color: "red", children: "\u68C0\u6D4B\u5230 Merge Commit" }),
+      /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "Cherry-pick \u5408\u5E76\u63D0\u4EA4\u9700\u8981\u6307\u5B9A\u7236\u8282\u70B9 (-m 1)" }),
+      /* @__PURE__ */ jsxs5(Text5, { children: [
+        /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "[m]" }),
+        /* @__PURE__ */ jsx5(Text5, { children: " \u5207\u6362 -m 1: " }),
+        useMainline ? /* @__PURE__ */ jsx5(Text5, { color: "green", children: "\u5DF2\u542F\u7528" }) : /* @__PURE__ */ jsx5(Text5, { color: "gray", children: "\u672A\u542F\u7528" })
+      ] })
     ] }),
-    /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { bold: true, children: "\u786E\u8BA4\u6267\u884C? " }),
-      /* @__PURE__ */ jsx4(Text4, { color: "green", children: "[y]" }),
-      /* @__PURE__ */ jsx4(Text4, { children: " \u786E\u8BA4 / " }),
-      /* @__PURE__ */ jsx4(Text4, { color: "red", children: "[n]" }),
-      /* @__PURE__ */ jsx4(Text4, { children: " \u53D6\u6D88" })
+    /* @__PURE__ */ jsxs5(Box5, { children: [
+      /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "\u26A0 " }),
+      /* @__PURE__ */ jsx5(Text5, { children: "\u4F7F\u7528 --no-commit \u6A21\u5F0F\uFF0C\u6539\u52A8\u5C06\u6682\u5B58\u5230\u5DE5\u4F5C\u533A\uFF0C\u9700\u624B\u52A8 commit" })
+    ] }),
+    /* @__PURE__ */ jsxs5(Box5, { children: [
+      /* @__PURE__ */ jsx5(Text5, { bold: true, children: "\u786E\u8BA4\u6267\u884C? " }),
+      /* @__PURE__ */ jsx5(Text5, { color: "green", children: "[y]" }),
+      /* @__PURE__ */ jsx5(Text5, { children: " \u786E\u8BA4 / " }),
+      /* @__PURE__ */ jsx5(Text5, { color: "red", children: "[n]" }),
+      /* @__PURE__ */ jsx5(Text5, { children: " \u53D6\u6D88" }),
+      hasMerge && /* @__PURE__ */ jsxs5(Text5, { children: [
+        " / ",
+        /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "[m]" }),
+        " \u5207\u6362 -m 1"
+      ] })
     ] })
   ] });
 }
 
 // src/components/result-panel.tsx
-import { useState as useState4, useEffect as useEffect3 } from "react";
-import { Box as Box5, Text as Text5 } from "ink";
+import { useState as useState5, useEffect as useEffect2 } from "react";
+import { Box as Box6, Text as Text6 } from "ink";
 import { Spinner as Spinner4 } from "@inkjs/ui";
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function ResultPanel({ selectedHashes, onDone }) {
-  const [phase, setPhase] = useState4("executing");
-  const [result, setResult] = useState4(null);
-  const [stagedStat, setStagedStat] = useState4("");
-  useEffect3(() => {
+import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+function ResultPanel({ selectedHashes, useMainline, stashed, onStashRestored, onDone }) {
+  const [phase, setPhase] = useState5("executing");
+  const [result, setResult] = useState5(null);
+  const [stagedStat, setStagedStat] = useState5("");
+  const [stashRestored, setStashRestored] = useState5(null);
+  const tryRestoreStash = async () => {
+    if (!stashed) return true;
+    setPhase("restoring");
+    const ok = await stashPop();
+    setStashRestored(ok);
+    if (ok) onStashRestored();
+    return ok;
+  };
+  useEffect2(() => {
     async function run() {
-      const res = await cherryPick(selectedHashes);
+      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");
       }
     }
     run();
   }, []);
   if (phase === "executing") {
-    return /* @__PURE__ */ jsx5(Box5, { children: /* @__PURE__ */ jsx5(Spinner4, { label: `\u6B63\u5728\u6267\u884C cherry-pick --no-commit (${selectedHashes.length} \u4E2A commit)...` }) });
+    return /* @__PURE__ */ jsx6(Box6, { children: /* @__PURE__ */ jsx6(Spinner4, { label: `\u6B63\u5728\u6267\u884C cherry-pick --no-commit (${selectedHashes.length} \u4E2A commit)...` }) });
+  }
+  if (phase === "restoring") {
+    return /* @__PURE__ */ jsx6(Box6, { children: /* @__PURE__ */ jsx6(Spinner4, { label: "\u6B63\u5728\u6062\u590D\u5DE5\u4F5C\u533A (git stash pop)..." }) });
   }
   if (phase === "error" && result) {
-    return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx5(Text5, { bold: true, color: "red", children: "[5/5] Cherry-pick \u9047\u5230\u51B2\u7A81" }),
-      result.conflictFiles && result.conflictFiles.length > 0 && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", borderStyle: "single", borderColor: "red", paddingX: 1, children: [
-        /* @__PURE__ */ jsx5(Text5, { bold: true, children: "\u51B2\u7A81\u6587\u4EF6:" }),
-        result.conflictFiles.map((f) => /* @__PURE__ */ jsxs5(Text5, { color: "red", children: [
+    return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx6(Text6, { bold: true, color: "red", children: "[5/5] Cherry-pick \u9047\u5230\u51B2\u7A81" }),
+      result.conflictFiles && result.conflictFiles.length > 0 && /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", borderStyle: "single", borderColor: "red", paddingX: 1, children: [
+        /* @__PURE__ */ jsx6(Text6, { bold: true, children: "\u51B2\u7A81\u6587\u4EF6:" }),
+        result.conflictFiles.map((f) => /* @__PURE__ */ jsxs6(Text6, { color: "red", children: [
           "  ",
           f
         ] }, f))
       ] }),
-      /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "\u8BF7\u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add \u548C git commit" }),
-      /* @__PURE__ */ jsx5(Text5, { color: "gray", dimColor: true, children: "\u6216\u6267\u884C git cherry-pick --abort \u653E\u5F03\u64CD\u4F5C" })
+      /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: "\u8BF7\u624B\u52A8\u89E3\u51B3\u51B2\u7A81\u540E\u6267\u884C git add \u548C git commit" }),
+      /* @__PURE__ */ jsx6(Text6, { color: "gray", dimColor: true, children: "\u6216\u6267\u884C git cherry-pick --abort \u653E\u5F03\u64CD\u4F5C" }),
+      stashed && stashRestored === false && /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: "\u6CE8\u610F: stash \u6062\u590D\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" }),
+      stashed && stashRestored === true && /* @__PURE__ */ jsx6(Text6, { color: "green", children: "\u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)" })
     ] });
   }
-  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsx5(Text5, { bold: true, color: "green", children: "[5/5] \u540C\u6B65\u5B8C\u6210!" }),
-    /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [
-      /* @__PURE__ */ jsx5(Text5, { bold: true, children: "\u6682\u5B58\u533A\u53D8\u66F4\u6982\u89C8 (git diff --cached --stat):" }),
-      /* @__PURE__ */ jsx5(Text5, { color: "gray", children: stagedStat || "(\u65E0\u53D8\u66F4)" })
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsx6(Text6, { bold: true, color: "green", children: "[5/5] \u540C\u6B65\u5B8C\u6210!" }),
+    /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [
+      /* @__PURE__ */ jsx6(Text6, { bold: true, children: "\u6682\u5B58\u533A\u53D8\u66F4\u6982\u89C8 (git diff --cached --stat):" }),
+      /* @__PURE__ */ jsx6(Text6, { color: "gray", children: stagedStat || "(\u65E0\u53D8\u66F4)" })
     ] }),
-    /* @__PURE__ */ jsx5(Text5, { color: "yellow", children: "\u6539\u52A8\u5DF2\u6682\u5B58\u5230\u5DE5\u4F5C\u533A (--no-commit \u6A21\u5F0F)" }),
-    /* @__PURE__ */ jsx5(Text5, { children: "\u8BF7\u5BA1\u67E5\u540E\u624B\u52A8\u6267\u884C:" }),
-    /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "  git diff --cached          # \u67E5\u770B\u8BE6\u7EC6 diff" }),
-    /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: '  git commit -m "\u540C\u6B65 commit" # \u63D0\u4EA4' }),
-    /* @__PURE__ */ jsx5(Text5, { color: "cyan", children: "  git reset HEAD             # \u6216\u653E\u5F03\u6240\u6709\u6539\u52A8" })
+    stashed && (stashRestored ? /* @__PURE__ */ jsx6(Text6, { color: "green", children: "\u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)" }) : /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: "stash pop \u5931\u8D25\uFF0C\u8BF7\u624B\u52A8 git stash pop" })),
+    /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: "\u6539\u52A8\u5DF2\u6682\u5B58\u5230\u5DE5\u4F5C\u533A (--no-commit \u6A21\u5F0F)" }),
+    /* @__PURE__ */ jsx6(Text6, { children: "\u8BF7\u5BA1\u67E5\u540E\u624B\u52A8\u6267\u884C:" }),
+    /* @__PURE__ */ jsx6(Text6, { color: "cyan", children: "  git diff --cached          # \u67E5\u770B\u8BE6\u7EC6 diff" }),
+    /* @__PURE__ */ jsx6(Text6, { color: "cyan", children: '  git commit -m "\u540C\u6B65 commit" # \u63D0\u4EA4' }),
+    /* @__PURE__ */ jsx6(Text6, { color: "cyan", children: "  git reset HEAD             # \u6216\u653E\u5F03\u6240\u6709\u6539\u52A8" })
   ] });
 }
 
 // src/app.tsx
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { execSync } from "child_process";
+import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function App() {
-  const [step, setStep] = useState5("remote");
-  const [remote, setRemote] = useState5("");
-  const [branch, setBranch] = useState5("");
-  const [selectedHashes, setSelectedHashes] = useState5([]);
-  const [commits, setCommits] = useState5([]);
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs6(Box6, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsx6(Text6, { bold: true, inverse: true, color: "white", children: " git-sync-tui " }),
-      /* @__PURE__ */ jsx6(Text6, { children: " " }),
-      /* @__PURE__ */ jsx6(Text6, { color: "gray", children: "\u4EA4\u4E92\u5F0F commit \u540C\u6B65\u5DE5\u5177 (cherry-pick --no-commit)" })
+  const { exit } = useApp();
+  const [step, setStep] = useState6("checking");
+  const [remote, setRemote] = useState6("");
+  const [branch, setBranch] = useState6("");
+  const [selectedHashes, setSelectedHashes] = useState6([]);
+  const [commits, setCommits] = useState6([]);
+  const [hasMerge, setHasMerge] = useState6(false);
+  const [useMainline, setUseMainline] = useState6(false);
+  const [stashed, setStashed] = useState6(false);
+  const stashedRef = useRef2(false);
+  const stashRestoredRef = useRef2(false);
+  const restoreStashSync = useCallback2(() => {
+    if (stashedRef.current && !stashRestoredRef.current) {
+      try {
+        execSync("git stash pop", { stdio: "ignore" });
+        stashRestoredRef.current = true;
+      } catch {
+        try {
+          process.stderr.write("\n\u26A0 stash \u81EA\u52A8\u6062\u590D\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u6267\u884C: git stash pop\n");
+        } catch {
+        }
+      }
+    }
+  }, []);
+  const markStashRestored = useCallback2(() => {
+    stashRestoredRef.current = true;
+  }, []);
+  useEffect3(() => {
+    isWorkingDirClean().then((clean) => {
+      if (clean) {
+        setStep("remote");
+      } else {
+        setStep("stash-prompt");
+      }
+    });
+    const onSignal = () => {
+      restoreStashSync();
+      process.exit(0);
+    };
+    process.on("SIGINT", onSignal);
+    process.on("SIGTERM", onSignal);
+    process.on("beforeExit", restoreStashSync);
+    return () => {
+      process.off("SIGINT", onSignal);
+      process.off("SIGTERM", onSignal);
+      process.off("beforeExit", restoreStashSync);
+    };
+  }, [restoreStashSync]);
+  const doStash = async () => {
+    const ok = await stash();
+    if (ok) {
+      setStashed(true);
+      stashedRef.current = true;
+    }
+    setStep("remote");
+  };
+  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs7(Box7, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsx7(Text7, { bold: true, inverse: true, color: "white", children: " git-sync-tui " }),
+      /* @__PURE__ */ jsx7(Text7, { children: " " }),
+      /* @__PURE__ */ jsx7(Text7, { color: "gray", children: "\u4EA4\u4E92\u5F0F commit \u540C\u6B65\u5DE5\u5177 (cherry-pick --no-commit)" }),
+      stashed && /* @__PURE__ */ jsx7(Text7, { color: "yellow", children: " (\u5DF2\u81EA\u52A8 stash)" })
     ] }),
-    step === "remote" && /* @__PURE__ */ jsx6(
+    step === "checking" && /* @__PURE__ */ jsx7(Spinner5, { label: "\u68C0\u67E5\u5DE5\u4F5C\u533A\u72B6\u6001..." }),
+    step === "stash-prompt" && /* @__PURE__ */ jsx7(
+      StashPrompt,
+      {
+        onConfirm: doStash,
+        onSkip: () => setStep("remote")
+      }
+    ),
+    step === "remote" && /* @__PURE__ */ jsx7(
       RemoteSelect,
       {
         onSelect: (r) => {
@@ -430,7 +852,7 @@ function App() {
         }
       }
     ),
-    step === "branch" && /* @__PURE__ */ jsx6(
+    step === "branch" && /* @__PURE__ */ jsx7(
       BranchSelect,
       {
         remote,
@@ -440,39 +862,50 @@ function App() {
         }
       }
     ),
-    step === "commits" && /* @__PURE__ */ jsx6(
+    step === "commits" && /* @__PURE__ */ jsx7(
       CommitList,
       {
         remote,
         branch,
-        onSelect: (hashes, loadedCommits) => {
+        onSelect: async (hashes, loadedCommits) => {
           setSelectedHashes(hashes);
           setCommits(loadedCommits);
+          const merge = await hasMergeCommits(hashes);
+          setHasMerge(merge);
           setStep("confirm");
         }
       }
     ),
-    step === "confirm" && /* @__PURE__ */ jsx6(
+    step === "confirm" && /* @__PURE__ */ jsx7(
       ConfirmPanel,
       {
         commits,
         selectedHashes,
+        hasMerge,
+        useMainline,
+        onToggleMainline: () => setUseMainline((v) => !v),
         onConfirm: () => setStep("result"),
         onCancel: () => setStep("commits")
       }
     ),
-    step === "result" && /* @__PURE__ */ jsx6(
+    step === "result" && /* @__PURE__ */ jsx7(
       ResultPanel,
       {
         selectedHashes,
-        onDone: () => process.exit(0)
+        useMainline,
+        stashed,
+        onStashRestored: markStashRestored,
+        onDone: () => {
+          restoreStashSync();
+          exit();
+        }
       }
     )
   ] });
 }
 
 // src/cli.tsx
-import { jsx as jsx7 } from "react/jsx-runtime";
+import { jsx as jsx8 } from "react/jsx-runtime";
 var cli = meow(
   `
   \u7528\u6CD5
@@ -487,13 +920,16 @@ var cli = meow(
     \u4F7F\u7528 cherry-pick --no-commit \u6A21\u5F0F\uFF0C\u540C\u6B65\u540E\u53EF\u5BA1\u67E5\u518D\u63D0\u4EA4\u3002
 
   \u5FEB\u6377\u952E
-    Space     \u9009\u62E9/\u53D6\u6D88 commit
-    Enter     \u786E\u8BA4\u9009\u62E9
-    \u2191/\u2193       \u5BFC\u822A
-    y/n       \u786E\u8BA4/\u53D6\u6D88\u6267\u884C
+    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
+    y/n         \u786E\u8BA4/\u53D6\u6D88\u6267\u884C
 `,
   {
     importMeta: import.meta
   }
 );
-render(/* @__PURE__ */ jsx7(App, {}));
+render(/* @__PURE__ */ jsx8(App, {}));

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "git-sync-tui",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.2",
+  "packageManager": "pnpm@10.32.1",
   "description": "Interactive TUI tool for cross-repo git commit synchronization (cherry-pick --no-commit)",
   "author": "KiWi233333",
   "repository": {
@@ -12,6 +13,10 @@
   "bugs": {
     "url": "https://github.com/KiWi233333/git-sync-tui/issues"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
+  },
   "bin": {
     "git-sync-tui": "dist/cli.js"
   },
@@ -21,11 +26,20 @@
   "engines": {
     "node": ">=20"
   },
+  "volta": {
+    "node": "24.14.0"
+  },
   "scripts": {
     "start": "tsx src/cli.tsx",
     "dev": "tsx watch src/cli.tsx",
     "build": "tsup",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "pnpm run build",
+    "release": "pnpm run release:patch",
+    "release:patch": "pnpm version patch && git push --follow-tags",
+    "release:minor": "pnpm version minor && git push --follow-tags",
+    "release:major": "pnpm version major && git push --follow-tags",
+    "release:beta": "pnpm version prerelease --preid=beta && git push --follow-tags",
+    "release:retag": "tsx scripts/retag.ts"
   },
   "keywords": [
     "git",