git-sync-tui 0.1.6 → 0.1.8

package/README.md

@@ -15,14 +15,15 @@
 
 <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.
+  Multi-select commits, preview diff stats, handle conflicts interactively, and sync safely with backup &amp; stash protection.
 </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>
+  <a href="#-workflow">Workflow</a> ·
+  <a href="#%EF%B8%8F-cli-options">CLI Options</a>
 </p>
 
 <p align="center">
@@ -35,11 +36,18 @@
 
 ## ✨ Features
 
-- 🎯 **Multi-select commits** — Cherry-pick non-consecutive commits with Space / Enter
+- 🎯 **Multi-select commits** — Select non-consecutive commits with Space, range-select with Shift+↑↓, toggle all with `a`, invert with `i`
 - 🔍 **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
+- 👀 **Diff preview** — Scrollable `--stat` summary panel with `j`/`k` navigation
+- ⚡ **Dual mode** — `--no-commit` stages changes for review, or commit individually preserving original messages
+- 🔀 **One-by-one cherry-pick** — Executes commits sequentially, pausing on conflicts for interactive resolution
+- ⚠️ **Conflict handling** — Shows conflicted files, resolve in another terminal, then continue/abort/quit
+- 🛡️ **Safe backup** — Creates a backup branch before execution; full rollback on abort
+- 📦 **Auto stash** — Detects uncommitted changes, offers to stash, auto-restores after sync
+- 🔄 **Stash recovery** — Detects interrupted sessions and offers to recover stashed changes
+- 🌿 **Branch check** — Auto-creates target branch from main/master if not on it
+- ✅ **Synced markers** — Marks already-synced commits as `[synced]` in the commit list
+- 🖥️ **CLI mode** — Non-interactive mode with `-r -b -c` flags for scripting
 - 🌐 **Universal** — Works in any git repository, any language
 
 ## 🚀 Quick Start
@@ -64,35 +72,95 @@ npm install -g git-sync-tui
 ## 🔄 Workflow
 
 ```
-Select Remote  →  Select Branch  →  Multi-select Commits  →  Preview Changes
-                                                                     ↓
-Review & Commit manually  ←  Cherry-pick --no-commit (staged, not committed)
+Check workspace  →  Select Remote  →  Select Branch  →  Branch Check  →  Multi-select Commits
+     ↓                                                                          ↓
+Auto stash                                                               Preview diff stats
+(if needed)                                                                     ↓
+                                                                       Confirm & choose mode
+                                                                               ↓
+                                                              Cherry-pick one-by-one (with backup)
+                                                                               ↓
+                                                                    Handle conflicts / Done
+                                                                               ↓
+                                                                    Restore stash & exit
 ```
 
 ## ⌨️ Keyboard Shortcuts
 
+### Commit Selection
+
 | Key | Action |
 |-----|--------|
-| `↑` `↓` | Navigate items |
+| `↑` `↓` | Navigate commits |
 | `Space` | Toggle commit selection |
+| `Shift`+`↑`/`↓` | Range select |
+| `a` | Select all / Deselect all |
+| `i` | Invert selection |
+| `r` | Select from top to cursor |
+| `j` / `k` | Scroll diff stat preview |
 | `Enter` | Confirm selection |
-| `y` / `n` | Confirm / cancel execution |
-| `/` | Search (in branch list) |
+| `Esc` | Go back |
 
-## 📋 After Sync
+### Confirm Panel
+
+| Key | Action |
+|-----|--------|
+| `y` | Confirm execution |
+| `n` | Cancel |
+| `c` | Toggle commit mode (--no-commit / individual) |
+| `m` | Toggle `-m 1` for merge commits |
+| `Esc` | Go back |
 
-Changes are staged in your working tree (not committed). You can:
+### Conflict Handling
 
-```bash
-# Review staged changes
-git diff --cached
+| Key | Action |
+|-----|--------|
+| `c` | Continue (after resolving conflicts) |
+| `a` | Abort (rollback all changes) |
+| `q` | Quit (keep current state) |
 
-# Commit when ready
-git commit -m "sync: cherry-picked commits from feature-branch"
+## ⚙️ CLI Options
 
-# Or discard all changes
-git reset HEAD
 ```
+Usage
+  $ git-sync-tui [options]
+
+Options
+  -r, --remote <name>       Remote name
+  -b, --branch <name>       Remote branch name
+  -c, --commits <hashes>    Commit hashes (comma-separated)
+  -n, --count <number>      Number of commits to show (default: 100)
+  -m, --mainline            Use -m 1 for merge commits
+  -y, --yes                 Skip confirmation
+  --no-stash                Skip stash prompt
+  --list                    List remote branch commits and exit
+
+Modes
+  No arguments               Interactive TUI mode
+  -r -b --list               List commits (plain text)
+  -r -b -c                   CLI mode, confirm before execution
+  -r -b -c --yes             CLI mode, execute directly
+  -r or -r -b only           TUI mode, skip completed steps
+
+Examples
+  $ git-sync-tui                                           # TUI mode
+  $ git-sync-tui -r upstream -b main --list                # List commits
+  $ git-sync-tui -r upstream -b main -c abc1234 --yes      # Execute directly
+  $ git-sync-tui -r upstream -b main -c abc1234,def5678    # Confirm then execute
+  $ git-sync-tui -r upstream                               # TUI mode, skip remote select
+```
+
+## 📋 After Sync
+
+**--no-commit mode** — Changes are staged in your working tree (not committed):
+
+```bash
+git diff --cached                        # Review staged changes
+git commit -m "sync: cherry-picked commits from feature-branch"  # Commit
+git reset HEAD                           # Or discard all changes
+```
+
+**Individual commit mode** — Original commit messages are preserved. Check with `git log`.
 
 ## 💡 Use Cases
 
@@ -107,8 +175,8 @@ git reset HEAD
 ```bash
 git clone https://github.com/KiWi233333/git-sync-tui.git
 cd git-sync-tui
-npm install
-npm start
+pnpm install
+pnpm start
 ```
 
 ## 🏗️ Tech Stack
@@ -116,6 +184,7 @@ npm start
 - [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
+- [meow](https://github.com/sindresorhus/meow) — CLI argument parsing
 
 ## 🤝 Contributing
 

package/README.zh-CN.md

@@ -15,14 +15,15 @@
 
 <p align="center">
   通过直观的终端界面从远程分支 cherry-pick 提交。<br>
-  选择特定提交、预览变更，并使用 <code>--no-commit</code> 模式在提交前安全审查。
+  多选提交、预览 diff 统计、交互式处理冲突，支持备份分支和 stash 保护机制。
 </p>
 
 <p align="center">
   <a href="#-功能特性">功能</a> ·
   <a href="#-快速开始">快速开始</a> ·
   <a href="#-安装">安装</a> ·
-  <a href="#-工作流程">工作流程</a>
+  <a href="#-工作流程">工作流程</a> ·
+  <a href="#%EF%B8%8F-命令行选项">命令行选项</a>
 </p>
 
 <p align="center">
@@ -35,11 +36,18 @@
 
 ## ✨ 功能特性
 
-- 🎯 **多选提交** — 使用 Space / Enter 选择不连续的提交进行 cherry-pick
+- 🎯 **多选提交** — 使用 Space 选择不连续的提交，Shift+↑↓ 连选，`a` 全选，`i` 反选
 - 🔍 **分支搜索** — 按关键词模糊过滤分支
-- 👀 **差异预览** — 执行前查看所选提交的 `--stat` 摘要
-- ⚡ **安全模式** — `--no-commit` 仅暂存变更供审查，不会自动提交
-- ⚠️ **冲突处理** — cherry-pick 失败时清晰显示冲突文件
+- 👀 **差异预览** — 可滚动的 `--stat` 摘要面板，支持 `j`/`k` 上下滚动
+- ⚡ **双模式** — `--no-commit` 仅暂存变更供审查，或逐个提交保留原始 commit 信息
+- 🔀 **逐个 cherry-pick** — 按顺序执行提交，遇到冲突时暂停等待交互处理
+- ⚠️ **冲突处理** — 显示冲突文件列表，在另一终端解决后继续/放弃/退出
+- 🛡️ **安全备份** — 执行前自动创建备份分支，放弃时完整回滚
+- 📦 **自动 stash** — 检测未提交变更，提示 stash 保存，同步后自动恢复
+- 🔄 **Stash 恢复** — 检测上次中断的会话，提供恢复 stash 的选项
+- 🌿 **分支检查** — 若当前不在目标分支，自动从 main/master 创建并切换
+- ✅ **已同步标记** — 在 commit 列表中标记已同步的提交为 `[已同步]`
+- 🖥️ **CLI 模式** — 支持 `-r -b -c` 参数的非交互模式，适用于脚本
 - 🌐 **通用性** — 适用于任何 Git 仓库，不限语言
 
 ## 🚀 快速开始
@@ -64,35 +72,95 @@ npm install -g git-sync-tui
 ## 🔄 工作流程
 
 ```
-选择远程仓库  →  选择分支  →  多选提交  →  预览变更
-                                              ↓
-手动审查并提交  ←  Cherry-pick --no-commit（已暂存，未提交）
+检查工作区  →  选择远程仓库  →  选择分支  →  分支检查  →  多选提交
+    ↓                                                      ↓
+自动 stash                                            预览 diff 统计
+(如需要)                                                   ↓
+                                                    确认并选择模式
+                                                          ↓
+                                               逐个 cherry-pick（带备份）
+                                                          ↓
+                                                  处理冲突 / 完成
+                                                          ↓
+                                                  恢复 stash 并退出
 ```
 
 ## ⌨️ 快捷键
 
+### 提交选择
+
 | 按键 | 操作 |
 |-----|------|
 | `↑` `↓` | 上下导航 |
 | `Space` | 切换提交选择 |
+| `Shift`+`↑`/`↓` | 连续选择 |
+| `a` | 全选 / 取消全选 |
+| `i` | 反选 |
+| `r` | 从开头选至光标 |
+| `j` / `k` | 滚动 diff stat 预览 |
 | `Enter` | 确认选择 |
-| `y` / `n` | 确认 / 取消执行 |
-| `/` | 搜索（在分支列表中） |
+| `Esc` | 返回上一步 |
 
-## 📋 同步后操作
+### 确认面板
+
+| 按键 | 操作 |
+|-----|------|
+| `y` | 确认执行 |
+| `n` | 取消 |
+| `c` | 切换提交模式（--no-commit / 逐个提交） |
+| `m` | 切换 `-m 1`（merge commit 时） |
+| `Esc` | 返回 |
 
-变更已暂存在工作区（未提交）。你可以：
+### 冲突处理
 
-```bash
-# 查看暂存的变更
-git diff --cached
+| 按键 | 操作 |
+|-----|------|
+| `c` | 继续（冲突已解决） |
+| `a` | 放弃（回滚全部变更） |
+| `q` | 退出（保留当前状态） |
 
-# 准备好后提交
-git commit -m "sync: 从 feature-branch cherry-pick 提交"
+## ⚙️ 命令行选项
 
-# 或放弃所有变更
-git reset HEAD
 ```
+用法
+  $ git-sync-tui [options]
+
+选项
+  -r, --remote <name>       指定远程仓库名称
+  -b, --branch <name>       指定远程分支名称
+  -c, --commits <hashes>    指定 commit hash（逗号分隔）
+  -n, --count <number>      显示 commit 数量（默认 100）
+  -m, --mainline            对 merge commit 使用 -m 1
+  -y, --yes                 跳过确认直接执行
+  --no-stash                跳过 stash 提示
+  --list                    列出远程分支的 commit 后退出
+
+模式
+  无参数                     交互式 TUI 模式
+  -r -b --list              列出 commit（纯文本）
+  -r -b -c                  CLI 模式，确认后执行
+  -r -b -c --yes            CLI 模式，直接执行
+  仅 -r 或 -r -b            TUI 模式，跳过已指定步骤
+
+示例
+  $ git-sync-tui                                           # TUI 模式
+  $ git-sync-tui -r upstream -b main --list                # 列出 commits
+  $ git-sync-tui -r upstream -b main -c abc1234 --yes      # 直接执行
+  $ git-sync-tui -r upstream -b main -c abc1234,def5678    # 确认后执行
+  $ git-sync-tui -r upstream                               # TUI 模式，跳过选择仓库
+```
+
+## 📋 同步后操作
+
+**--no-commit 模式** — 变更已暂存在工作区（未提交）：
+
+```bash
+git diff --cached                        # 查看暂存的变更
+git commit -m "sync: 从 feature-branch cherry-pick 提交"  # 提交
+git reset HEAD                           # 或放弃所有变更
+```
+
+**逐个提交模式** — 保留原始 commit 信息，可通过 `git log` 查看。
 
 ## 💡 使用场景
 
@@ -107,8 +175,8 @@ git reset HEAD
 ```bash
 git clone https://github.com/KiWi233333/git-sync-tui.git
 cd git-sync-tui
-npm install
-npm start
+pnpm install
+pnpm start
 ```
 
 ## 🏗️ 技术栈
@@ -116,6 +184,7 @@ 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 命令接口
+- [meow](https://github.com/sindresorhus/meow) — CLI 参数解析
 
 ## 🤝 贡献
 

package/dist/cli.js

@@ -1,18 +1,12 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/cli.tsx
 import { render } from "ink";
 import meow from "meow";
 
 // src/app.tsx
-import { useState as useState8, useEffect as useEffect6, useRef as useRef5, useCallback as useCallback3 } from "react";
-import { Box as Box10, useApp } from "ink";
+import { useState as useState9, useEffect as useEffect7, useRef as useRef5, useCallback as useCallback4 } from "react";
+import { Box as Box11, useApp } from "ink";
 import { Spinner as Spinner7 } from "@inkjs/ui";
 
 // src/components/ui.tsx
@@ -140,11 +134,13 @@ import { Spinner } from "@inkjs/ui";
 // src/utils/git.ts
 import simpleGit from "simple-git";
 import { existsSync, writeFileSync, unlinkSync, readFileSync } from "fs";
+import { execSync } from "child_process";
 import { join } from "path";
 var gitInstance = null;
 function getGit(cwd) {
-  if (!gitInstance || cwd) {
-    gitInstance = simpleGit(cwd);
+  if (cwd) return simpleGit(cwd);
+  if (!gitInstance) {
+    gitInstance = simpleGit();
   }
   return gitInstance;
 }
@@ -227,13 +223,14 @@ async function getMultiCommitStat(hashes) {
   if (hashes.length === 0) return "";
   const git = getGit();
   try {
-    const stats = [];
-    for (const hash of hashes) {
-      const result = await git.raw(["diff-tree", "--stat", "--no-commit-id", "-r", hash]);
-      if (result.trim()) stats.push(`${hash.substring(0, 7)}:
-${result.trim()}`);
-    }
-    return stats.join("\n\n");
+    const results = await Promise.all(
+      hashes.map(async (hash) => {
+        const result = await git.raw(["diff-tree", "--stat", "--no-commit-id", "-r", hash]);
+        return result.trim() ? `${hash.substring(0, 7)}:
+${result.trim()}` : "";
+      })
+    );
+    return results.filter(Boolean).join("\n\n");
   } catch {
     return "(\u65E0\u6CD5\u83B7\u53D6 stat \u4FE1\u606F)";
   }
@@ -454,8 +451,7 @@ async function removeStashGuard() {
 }
 function removeStashGuardSync() {
   try {
-    const { execSync: execSync2 } = __require("child_process");
-    const gitDir = String(execSync2("git rev-parse --git-dir", { encoding: "utf-8" })).trim();
+    const gitDir = String(execSync("git rev-parse --git-dir", { encoding: "utf-8" })).trim();
     const guardPath = join(gitDir, STASH_GUARD_FILE);
     if (existsSync(guardPath)) {
       unlinkSync(guardPath);
@@ -542,10 +538,12 @@ function useAsync(fn, deps = []) {
     loading: true,
     error: null
   });
+  const fnRef = useRef(fn);
+  fnRef.current = fn;
   const load = useCallback(async () => {
     setState({ data: null, loading: true, error: null });
     try {
-      const data = await fn();
+      const data = await fnRef.current();
       setState({ data, loading: false, error: null });
     } catch (err) {
       setState({ data: null, loading: false, error: err.message });
@@ -612,20 +610,23 @@ function useCommits(remote2, branch2, pageSize = 100) {
 function useCommitStat(hashes) {
   const [stat, setStat] = useState2("");
   const [loading, setLoading] = useState2(false);
+  const hashKey = hashes.join(",");
+  const stableHashes = useRef(hashes);
+  stableHashes.current = hashes;
   useEffect2(() => {
-    if (hashes.length === 0) {
+    if (stableHashes.current.length === 0) {
       setStat("");
       return;
     }
     setLoading(true);
-    getMultiCommitStat(hashes).then((s) => {
+    getMultiCommitStat(stableHashes.current).then((s) => {
       setStat(s);
       setLoading(false);
     }).catch(() => {
       setStat("(\u83B7\u53D6\u5931\u8D25)");
       setLoading(false);
     });
-  }, [hashes.join(",")]);
+  }, [hashKey]);
   return { stat, loading };
 }
 
@@ -1180,6 +1181,8 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
   const [error2, setError] = useState6(null);
   const [matched, setMatched] = useState6(false);
   const autoCreated = useRef3(false);
+  const onContinueRef = useRef3(onContinue);
+  onContinueRef.current = onContinue;
   useEffect4(() => {
     getCurrentBranch().then((branch2) => {
       setCurrentBranch(branch2);
@@ -1189,7 +1192,7 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
     });
   }, [targetBranch]);
   useEffect4(() => {
-    if (matched) onContinue();
+    if (matched) onContinueRef.current();
   }, [matched]);
   useEffect4(() => {
     if (currentBranch === null || matched || autoCreated.current) return;
@@ -1197,7 +1200,7 @@ function BranchCheck({ targetBranch, onContinue, onBack }) {
     autoCreated.current = true;
     setCreating(true);
     createBranchFrom(targetBranch, currentBranch).then(() => {
-      onContinue();
+      onContinueRef.current();
     }).catch((err) => {
       setCreating(false);
       setError(err.message);
@@ -1333,7 +1336,7 @@ function ConfirmPanel({ commits: commits2, selectedHashes, hasMerge, useMainline
 }
 
 // src/components/result-panel.tsx
-import { useState as useState7, useEffect as useEffect5, useCallback as useCallback2, useRef as useRef4 } from "react";
+import { useState as useState7, useEffect as useEffect5, useCallback as useCallback3, 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";
@@ -1349,7 +1352,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
   const remainingRef = useRef4([]);
   const backupBranchRef = useRef4("");
   const orderedHashes = useRef4([...selectedHashes].reverse());
-  const tryRestoreStash = useCallback2(async () => {
+  const tryRestoreStash = useCallback3(async () => {
     if (!stashed) return true;
     setPhase("restoring");
     const ok = await stashPop();
@@ -1357,7 +1360,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     if (ok) onStashRestored();
     return ok;
   }, [stashed, onStashRestored]);
-  const finishAll = useCallback2(async () => {
+  const finishAll = useCallback3(async () => {
     if (noCommit) {
       const stat = await getStagedStat();
       setStagedStat(stat);
@@ -1368,7 +1371,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     await tryRestoreStash();
     setPhase("done");
   }, [noCommit, tryRestoreStash]);
-  const executeFrom = useCallback2(async (startIndex) => {
+  const executeFrom = useCallback3(async (startIndex) => {
     const hashes = orderedHashes.current;
     for (let i = startIndex; i < hashes.length; i++) {
       setCurrentIndex(i);
@@ -1389,7 +1392,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
       executeFrom(0);
     });
   }, []);
-  const continueRemaining = useCallback2(async () => {
+  const continueRemaining = useCallback3(async () => {
     const remaining = remainingRef.current;
     if (remaining.length === 0) {
       await finishAll();
@@ -1409,7 +1412,7 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     }
     await finishAll();
   }, [useMainline, noCommit, finishAll]);
-  const handleContinue = useCallback2(async () => {
+  const handleContinue = useCallback3(async () => {
     const conflicts = await getConflictFiles();
     if (conflicts.length > 0) {
       setConflictFiles(conflicts);
@@ -1442,14 +1445,14 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
       await continueRemaining();
     }
   }, [noCommit, continueRemaining]);
-  const handleSkip = useCallback2(async () => {
+  const handleSkip = useCallback3(async () => {
     setPhase("continuing");
     setErrorMsg("");
     await skipCherryPick();
     setSkippedCount((c) => c + 1);
     await continueRemaining();
   }, [continueRemaining]);
-  const handleAbort = useCallback2(async () => {
+  const handleAbort = useCallback3(async () => {
     setPhase("aborting");
     await abortCherryPick();
     if (backupBranchRef.current) {
@@ -1463,6 +1466,10 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
     setPhase("aborted");
   }, [tryRestoreStash]);
   useInput8((input, key) => {
+    if (phase === "done" || phase === "aborted") {
+      onDone();
+      return;
+    }
     if (phase === "conflict") {
       if (input === "c" || input === "C") {
         handleContinue();
@@ -1571,7 +1578,8 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
       stashed && stashRestored === true && /* @__PURE__ */ jsxs9(Text9, { color: "green", children: [
         "\u2714 ",
         "\u5DF2\u6062\u590D\u5DE5\u4F5C\u533A\u53D8\u66F4 (stash pop)"
-      ] })
+      ] }),
+      /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "\u6309\u4EFB\u610F\u952E\u9000\u51FA" })
     ] });
   }
   const total = orderedHashes.current.length;
@@ -1608,13 +1616,137 @@ function ResultPanel({ selectedHashes, useMainline, noCommit, stashed, onStashRe
         "  git reset HEAD             ",
         /* @__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" }) })
+    ] }) : /* @__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" }) }),
+    /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, children: "\u6309\u4EFB\u610F\u952E\u9000\u51FA" })
   ] });
 }
 
-// src/app.tsx
-import { execSync } from "child_process";
+// src/components/update-banner.tsx
+import { useState as useState8, useEffect as useEffect6 } from "react";
+import { Box as Box10, Text as Text10 } from "ink";
+
+// src/utils/update-check.ts
+import https from "https";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync } from "fs";
+import { join as join2 } from "path";
+import { homedir } from "os";
+var PKG_NAME = "git-sync-tui";
+var CHECK_INTERVAL = 24 * 60 * 60 * 1e3;
+var REQUEST_TIMEOUT = 3e3;
+function getCachePath() {
+  const dir = join2(homedir(), ".config", "git-sync-tui");
+  return join2(dir, "update-check.json");
+}
+function readCache() {
+  try {
+    const raw = readFileSync2(getCachePath(), "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function writeCache(data) {
+  try {
+    const dir = join2(homedir(), ".config", "git-sync-tui");
+    mkdirSync(dir, { recursive: true });
+    writeFileSync2(getCachePath(), JSON.stringify(data));
+  } catch {
+  }
+}
+function fetchLatestVersion() {
+  return new Promise((resolve) => {
+    const req = https.get(
+      `https://registry.npmjs.org/${PKG_NAME}/latest`,
+      { timeout: REQUEST_TIMEOUT, headers: { Accept: "application/json" } },
+      (res) => {
+        if (res.statusCode !== 200) {
+          resolve(null);
+          return;
+        }
+        let data = "";
+        res.on("data", (chunk) => {
+          data += chunk.toString();
+        });
+        res.on("end", () => {
+          try {
+            const json = JSON.parse(data);
+            resolve(json.version || null);
+          } catch {
+            resolve(null);
+          }
+        });
+      }
+    );
+    req.on("error", () => resolve(null));
+    req.on("timeout", () => {
+      req.destroy();
+      resolve(null);
+    });
+  });
+}
+function compareVersions(current, latest) {
+  const parse = (v) => v.replace(/^v/, "").split(".").map(Number);
+  const c = parse(current);
+  const l = parse(latest);
+  for (let i = 0; i < 3; i++) {
+    if ((l[i] || 0) > (c[i] || 0)) return true;
+    if ((l[i] || 0) < (c[i] || 0)) return false;
+  }
+  return false;
+}
+async function checkForUpdate(currentVersion) {
+  const noUpdate = { hasUpdate: false, current: currentVersion, latest: currentVersion };
+  const cache = readCache();
+  if (cache && Date.now() - cache.checkedAt < CHECK_INTERVAL) {
+    return {
+      hasUpdate: compareVersions(currentVersion, cache.latest),
+      current: currentVersion,
+      latest: cache.latest
+    };
+  }
+  const latest = await fetchLatestVersion();
+  if (!latest) return noUpdate;
+  writeCache({ latest, checkedAt: Date.now() });
+  return {
+    hasUpdate: compareVersions(currentVersion, latest),
+    current: currentVersion,
+    latest
+  };
+}
+
+// src/components/update-banner.tsx
 import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+function UpdateBanner({ currentVersion }) {
+  const [info, setInfo] = useState8(null);
+  useEffect6(() => {
+    let cancelled = false;
+    checkForUpdate(currentVersion).then((result) => {
+      if (!cancelled && result.hasUpdate) {
+        setInfo(result);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [currentVersion]);
+  if (!info) return null;
+  return /* @__PURE__ */ jsx10(Box10, { marginTop: 1, children: /* @__PURE__ */ jsxs10(Text10, { color: "yellow", children: [
+    "\u{1F4A1} ",
+    "\u65B0\u7248\u672C\u53EF\u7528 ",
+    /* @__PURE__ */ jsx10(Text10, { bold: true, color: "green", children: info.latest }),
+    /* @__PURE__ */ jsxs10(Text10, { color: "gray", children: [
+      " (\u5F53\u524D ",
+      info.current,
+      ")"
+    ] }),
+    /* @__PURE__ */ jsx10(Text10, { color: "cyan", children: " \u2192 npm i -g git-sync-tui" })
+  ] }) });
+}
+
+// src/app.tsx
+import { execSync as execSync2 } from "child_process";
+import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
+var APP_VERSION = "0.1.8";
 var STEP_NUMBER = {
   checking: 0,
   "stash-recovery": 0,
@@ -1630,22 +1762,22 @@ var STEP_DEBOUNCE = 100;
 function App({ initialRemote, initialBranch }) {
   const { exit } = useApp();
   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 [step, setStepRaw] = useState9("checking");
+  const [inputReady, setInputReady] = useState9(true);
+  const [remote2, setRemote] = useState9(initialRemote || "");
+  const [branch2, setBranch] = useState9(initialBranch || "");
+  const [selectedHashes, setSelectedHashes] = useState9([]);
+  const [commits2, setCommits] = useState9([]);
+  const [hasMerge, setHasMerge] = useState9(false);
+  const [useMainline, setUseMainline] = useState9(false);
+  const [noCommit, setNoCommit] = useState9(false);
+  const [stashed, setStashed] = useState9(false);
+  const [guardTimestamp, setGuardTimestamp] = useState9();
   const stashedRef = useRef5(false);
   const stashRestoredRef = useRef5(false);
   const mountedRef = useRef5(true);
   const debounceTimer = useRef5(null);
-  const setStep = useCallback3((newStep) => {
+  const setStep = useCallback4((newStep) => {
     setInputReady(false);
     setStepRaw(newStep);
     if (debounceTimer.current) clearTimeout(debounceTimer.current);
@@ -1653,10 +1785,10 @@ function App({ initialRemote, initialBranch }) {
       if (mountedRef.current) setInputReady(true);
     }, STEP_DEBOUNCE);
   }, []);
-  const restoreStashSync = useCallback3(() => {
+  const restoreStashSync = useCallback4(() => {
     if (stashedRef.current && !stashRestoredRef.current) {
       try {
-        execSync("git stash pop", { stdio: "ignore" });
+        execSync2("git stash pop", { stdio: "ignore" });
         stashRestoredRef.current = true;
         removeStashGuardSync();
       } catch {
@@ -1667,11 +1799,11 @@ function App({ initialRemote, initialBranch }) {
       }
     }
   }, []);
-  const markStashRestored = useCallback3(() => {
+  const markStashRestored = useCallback4(() => {
     stashRestoredRef.current = true;
     removeStashGuard();
   }, []);
-  useEffect6(() => {
+  useEffect7(() => {
     mountedRef.current = true;
     async function check() {
       const guard = await checkStashGuard();
@@ -1726,7 +1858,7 @@ function App({ initialRemote, initialBranch }) {
     const clean = await isWorkingDirClean();
     if (mountedRef.current) setStep(clean ? entryStep : "stash-prompt");
   };
-  const goBack = useCallback3((fromStep) => {
+  const goBack = useCallback4((fromStep) => {
     const backMap = {
       branch: "remote",
       "branch-check": "branch",
@@ -1741,10 +1873,10 @@ function App({ initialRemote, initialBranch }) {
       exit();
     }
   }, [setStep, restoreStashSync, exit]);
-  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(
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx11(AppHeader, { step: STEP_NUMBER[step], stashed, noCommit }),
+    step === "checking" && /* @__PURE__ */ jsx11(Spinner7, { label: "\u68C0\u67E5\u5DE5\u4F5C\u533A\u72B6\u6001..." }),
+    step === "stash-recovery" && inputReady && /* @__PURE__ */ jsx11(
       StashRecovery,
       {
         timestamp: guardTimestamp,
@@ -1752,14 +1884,14 @@ function App({ initialRemote, initialBranch }) {
         onSkip: skipStashRecover
       }
     ),
-    step === "stash-prompt" && inputReady && /* @__PURE__ */ jsx10(
+    step === "stash-prompt" && inputReady && /* @__PURE__ */ jsx11(
       StashPrompt,
       {
         onConfirm: doStash,
         onSkip: () => setStep(entryStep)
       }
     ),
-    step === "remote" && inputReady && /* @__PURE__ */ jsx10(
+    step === "remote" && inputReady && /* @__PURE__ */ jsx11(
       RemoteSelect,
       {
         onSelect: (r) => {
@@ -1769,7 +1901,7 @@ function App({ initialRemote, initialBranch }) {
         onBack: () => goBack("remote")
       }
     ),
-    step === "branch" && inputReady && /* @__PURE__ */ jsx10(
+    step === "branch" && inputReady && /* @__PURE__ */ jsx11(
       BranchSelect,
       {
         remote: remote2,
@@ -1780,7 +1912,7 @@ function App({ initialRemote, initialBranch }) {
         onBack: () => goBack("branch")
       }
     ),
-    step === "branch-check" && inputReady && /* @__PURE__ */ jsx10(
+    step === "branch-check" && inputReady && /* @__PURE__ */ jsx11(
       BranchCheck,
       {
         targetBranch: branch2,
@@ -1788,20 +1920,22 @@ function App({ initialRemote, initialBranch }) {
         onBack: () => goBack("branch-check")
       }
     ),
-    step === "commits" && inputReady && /* @__PURE__ */ jsx10(
+    step === "commits" && inputReady && /* @__PURE__ */ jsx11(
       CommitList,
       {
         remote: remote2,
         branch: branch2,
-        onSelect: (hashes, loadedCommits) => {
+        onSelect: async (hashes, loadedCommits) => {
           setSelectedHashes(hashes);
           setCommits(loadedCommits);
+          const merge = await hasMergeCommits(hashes);
+          setHasMerge(merge);
           setStep("confirm");
         },
         onBack: () => goBack("commits")
       }
     ),
-    step === "confirm" && inputReady && /* @__PURE__ */ jsx10(
+    step === "confirm" && inputReady && /* @__PURE__ */ jsx11(
       ConfirmPanel,
       {
         commits: commits2,
@@ -1815,7 +1949,7 @@ function App({ initialRemote, initialBranch }) {
         onCancel: () => goBack("confirm")
       }
     ),
-    step === "result" && /* @__PURE__ */ jsx10(
+    step === "result" && /* @__PURE__ */ jsx11(
       ResultPanel,
       {
         selectedHashes,
@@ -1828,21 +1962,20 @@ function App({ initialRemote, initialBranch }) {
           exit();
         }
       }
-    )
+    ),
+    /* @__PURE__ */ jsx11(UpdateBanner, { currentVersion: APP_VERSION })
   ] });
 }
 
 // src/cli-runner.ts
 import { createInterface } from "readline";
+var APP_VERSION2 = "0.1.8";
 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) => {
@@ -1904,7 +2037,7 @@ async function validateBranch(remote2, branch2) {
   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}`;
+  return `  ${c.shortHash}  ${c.message.slice(0, 60).padEnd(62)} ${c.author.padEnd(16)} ${c.date}`;
 }
 async function runList(opts) {
   await validateRemote(opts.remote);
@@ -1988,16 +2121,24 @@ ${stat}`);
     process.exit(1);
   }
 }
+async function printUpdateNotice() {
+  const info = await checkForUpdate(APP_VERSION2);
+  if (info.hasUpdate) {
+    log(`
+\u{1F4A1} \u65B0\u7248\u672C\u53EF\u7528 ${info.latest} (\u5F53\u524D ${info.current}) \u2192 npm i -g git-sync-tui`);
+  }
+}
 async function runCli(opts) {
   if (opts.list) {
     await runList(opts);
   } else {
     await runExec(opts);
   }
+  await printUpdateNotice();
 }
 
 // src/cli.tsx
-import { jsx as jsx11 } from "react/jsx-runtime";
+import { jsx as jsx12 } from "react/jsx-runtime";
 var cli = meow(
   `
   \u7528\u6CD5
@@ -2071,5 +2212,5 @@ if (isCliMode) {
     process.exit(1);
   });
 } else {
-  render(/* @__PURE__ */ jsx11(App, { initialRemote: remote, initialBranch: branch }));
+  render(/* @__PURE__ */ jsx12(App, { initialRemote: remote, initialBranch: branch }));
 }

package/package.json

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