git-pincer 0.1.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Zero <1143967454@qq.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,164 @@
+<p align="center">
+  <img src="./assets/logo.gif" width="320" alt="git-pincer logo">
+</p>
+
+# git-pincer
+
+[![CI](https://github.com/zlx2019/git-pincer/actions/workflows/ci.yml/badge.svg)](https://github.com/zlx2019/git-pincer/actions/workflows/ci.yml)
+[![crates.io](https://img.shields.io/crates/v/git-pincer.svg)](https://crates.io/crates/git-pincer)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
+[![Rust](https://img.shields.io/badge/rust-1.96.0%2B-orange.svg)](https://www.rust-lang.org)
+
+**English** | [简体中文](./README.zh-CN.md)
+
+> **"Pincer"** — a Git terminal tool written in Rust, focused on helping developers resolve code conflicts in Git merge, rebase, cherry-pick and similar scenarios with ease.
+
+The name comes from Rust's mascot — the crab. A Git conflict is like two branches "pinching" the same piece of code at the same time, while a crab's pincer stands for stability, precision and control. May it work like a trusty pincer: gripping both sides of every conflict firmly, helping you understand the differences and complete the merge more efficiently.
+
+![git-pincer three-pane merge UI](./assets/showcase.png)
+
+## Features
+
+- **Three-pane merge UI** — local | result | remote, with chunk bands colored by change type using IDEA semantics: blue = modified, green = added, gray = deleted, red = conflict. Bands fade as chunks get resolved.
+- **Precise diff rendering** — delta-style word-level emphasis inside changed chunks, plus syntax highlighting (Maple theme via syntect, selected by file extension, gracefully disabled for huge files).
+- **Full flow takeover** — after all files are resolved it runs `git add` and the matching `--continue`, re-probes, and loops until the repository is clean. Multi-commit cherry-picks and multi-round rebases just work.
+- **RPG-style action menu** — running bare `git-pincer` in a clean repository opens a pixel-art menu with a status window that maps your repository to character vitals (Lv. = commit count, HP = uncommitted changes, MP = stashes, EXP = commits ahead). Pick an action, then a branch (merge / rebase) or a commit (cherry-pick / revert); success and failure both pop an in-TUI dialog and return to the menu — no flicker, no exit.
+- **Broad conflict-source support** — merge, rebase, pull, cherry-pick, revert, `git am`, and even flows without a `--continue` such as `stash pop`, `checkout -m` or `apply --3way`.
+- **Native git, zero magic** — everything shells out to your git binary (the same route lazygit and IDEA take), so credentials, hooks, merge strategies and rerere all follow your existing configuration. Arguments are passed as arrays (no shell, no injection), and host `GIT_DIR`-style variables are scrubbed so nested invocations from hooks cannot hijack the wrong repository.
+- **Terminal-aware theming** — dark (Tokyo Night) and light (Maple Light) themes via `--theme <auto|dark|light>`, `COLORFGBG` auto-detection, and automatic xterm-256 quantization on terminals without truecolor support.
+- **Bilingual UI** — every menu, hint and message ships in both English and Chinese; `--lang <auto|zh|en>` with `auto` following the system locale. Messages live in `locales/*.conf` and are embedded at compile time — still a single binary.
+- **Sensible fallbacks** — binary conflicts degrade to whole-file pick-one; a git-free `file` mode parses conflict markers directly; non-TTY invocations fail with a readable message instead of a panic.
+
+## Installation
+
+Requires `git` on your `PATH`.
+
+```bash
+cargo install git-pincer
+```
+
+Prebuilt binaries for major platforms are also attached to [GitHub Releases](https://github.com/zlx2019/git-pincer/releases). To build from source (Rust 1.96+):
+
+```bash
+cargo install --git https://github.com/zlx2019/git-pincer
+```
+
+## Usage
+
+```bash
+git-pincer                      # conflicts present: take over and resolve them
+                                # clean repo: open the interactive action menu
+git-pincer merge <branch>       # run git merge, resolve conflicts if any
+git-pincer rebase <branch>      # run git rebase, looping through every conflicted commit
+git-pincer pull origin main     # arguments are passed straight to git pull
+git-pincer cherry-pick <commit> # multiple commits / options are passed through
+git-pincer revert <commit>      # run git revert and take over the conflicts
+git-pincer file conflict.txt    # git-free: parse a conflict-marked file, write it back
+git-pincer abort                # abort the operation in progress (with confirmation)
+git-pincer completions zsh      # shell completion script (bash/zsh/fish/powershell/elvish)
+```
+
+Tab completion needs a one-time hook into your shell:
+
+```bash
+# zsh
+echo 'eval "$(git-pincer completions zsh)"' >> ~/.zshrc
+# bash
+echo 'eval "$(git-pincer completions bash)"' >> ~/.bashrc
+# fish
+git-pincer completions fish > ~/.config/fish/completions/git-pincer.fish
+```
+
+Global options:
+
+| Option | Description |
+| ------ | ----------- |
+| `-C, --repo <PATH>` | Operate on the repository at `PATH` (defaults to the current directory) |
+| `--theme <auto\|dark\|light>` | UI theme; `auto` inspects `COLORFGBG` and falls back to dark |
+| `--lang <auto\|zh\|en>` | UI language; `auto` follows the system locale (Chinese locales get Chinese, everything else English) |
+| `-v, --verbose` | Echo every git command being executed |
+
+### Configuration
+
+An optional config file is read from `~/.config/git-pincer/config.toml` (`$XDG_CONFIG_HOME` is respected; `%APPDATA%\git-pincer\config.toml` on Windows; the `GIT_PINCER_CONFIG` env var overrides the path entirely). CLI flags always take precedence. A missing file just means defaults; a malformed one fails fast with a readable error.
+
+```toml
+[ui]                    # defaults for the global options above
+theme = "auto"          # auto | dark | light
+lang = "auto"           # auto | zh | en
+verbose = false
+editor = "nvim"          # editor for the e key; falls back to $VISUAL > $EDITOR > vim > vi (notepad on Windows)
+
+[keys]                  # rebind actions — replaces all default keys of that action
+take-local = "o"
+write = "ctrl+s"        # modifiers: ctrl+ / alt+ / shift+; named keys: left, up, tab, enter, space, f1-f12…
+
+[theme.dark]            # override any color by name (same table exists as [theme.light])
+rpg_accent = "#ff7a2f"
+band_conflict = ["#3a1e22", "#5e2d35"]   # band_* / emph_* colors take a [normal, selected] pair
+```
+
+Rebindable actions: `take-local`, `take-remote`, `ignore`, `undo`, `undo-file`, `edit`, `apply-all`, `next-change`, `prev-change`, `next-conflict`, `prev-conflict`, `copy-chunk`, `copy-file`, `copy-local`, `copy-remote`, `write`, `next-file`, `fold`, `quit`, `help`. Overridden keys show up in the hint bar and help overlay automatically. Unknown action names, key conflicts and invalid colors are rejected at startup with the full list of valid values.
+
+Try the TUI without a git repository:
+
+```bash
+cp fixtures/conflict.txt /tmp/ && git-pincer file /tmp/conflict.txt
+```
+
+### Keybindings
+
+| Key | Action |
+| --- | ------ |
+| `h` / `←` | Take the local side (taking both sides of a conflict in order keeps both) |
+| `l` / `→` | Take the remote side |
+| `x` | Ignore the remaining pending sides of the current chunk (keep base) |
+| `u` | Undo all decisions on the current chunk |
+| `U` | Undo all decisions in the current file |
+| `e` | Edit the current chunk in `$EDITOR` |
+| `a` | Apply every non-conflicting change at once |
+| `j` / `k` | Move to the next / previous change chunk |
+| `n` / `p` | Jump to the next / previous unresolved conflict |
+| `Ctrl+d` / `Ctrl+u` | Scroll the viewport half a page down / up (navigation keys re-attach it to the cursor) |
+| `y` / `Y` | Copy the current chunk result / the whole file result |
+| `H` / `L` | Copy the local / remote side of the current chunk |
+| `w` | Write the file (auto-applies remaining non-conflict changes, then `git add`) |
+| `Tab` | Switch to the next file |
+| `z` | Fold / unfold unchanged regions |
+| `q` | Quit (press twice if files are unfinished; the scene is kept) |
+| `?` | Show the full key reference |
+
+### Supported conflict sources
+
+| Source | Detected via | Finished with |
+| ------ | ------------ | ------------- |
+| `git merge` / `git pull` | `MERGE_HEAD` | `git merge --continue` |
+| `git rebase` | `rebase-merge` / `rebase-apply` | `git rebase --continue` (multi-round) |
+| `git cherry-pick` | `CHERRY_PICK_HEAD` | `git cherry-pick --continue` (multi-round) |
+| `git revert` | `REVERT_HEAD` | `git revert --continue` |
+| `git am -3` | `rebase-apply/applying` | `git am --continue` |
+| `stash pop` / `checkout -m` / `apply --3way` | unmerged index entries only | nothing to continue — resolving is enough |
+
+## How it works
+
+- **diff3 core** — two 2-way diffs (base→ours, base→theirs, Myers algorithm with a 500 ms timeout guard) are grouped by base-range collisions into chunks: stable, one-sided, agreed, or conflicting. The grouping is deliberately conservative: reporting one conflict too many beats merging something silently wrong.
+- **Pure-logic session** — every chunk side is pending / applied / ignored; take order defines how content is stitched together, and `$EDITOR` edits override a chunk wholesale. Files containing NUL bytes degrade to a whole-file binary choice.
+- **Thin git wrapper** — conflict contents are read from index stages 1/2/3; writes go through `git add`; repository state (merge / rebase / cherry-pick / revert / am) is probed from the git directory so the right `--continue` is always used.
+
+## Development
+
+```bash
+cargo nextest run --all-features --no-tests pass   # tests
+cargo clippy --all-targets --all-features -- -D warnings
+cargo fmt --all -- --check
+```
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for the toolchain setup, pre-commit hooks and commit conventions.
+
+## Acknowledgements
+
+Built with [ratatui](https://github.com/ratatui/ratatui), [similar](https://github.com/mitsuhiko/similar), [syntect](https://github.com/trishume/syntect) and [clap](https://github.com/clap-rs/clap). Visual design inspired by the IntelliJ IDEA merge tool, [delta](https://github.com/dandavison/delta) and [lazygit](https://github.com/jesseduffield/lazygit).
+
+## License
+
+Distributed under the [MIT](./LICENSE) license.

package/bin/git-pincer.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+"use strict";
+
+// git-pincer 的 npm 启动垫片:
+// 按当前平台定位 optionalDependencies 里对应的二进制子包, 并把参数原样转发给它。
+
+const { spawnSync } = require("node:child_process");
+const path = require("node:path");
+
+// 判断 Linux 是否为 musl 环境(运行时报告中没有 glibc 版本信息即视为 musl)
+function isMusl() {
+  try {
+    return !process.report.getReport().header.glibcVersionRuntime;
+  } catch {
+    return false;
+  }
+}
+
+// 根据平台与架构推导对应的二进制子包名, 不支持的平台返回 null
+function platformPackage() {
+  const { platform, arch } = process;
+  if (platform === "darwin" && arch === "arm64") return "@zero9501/git-pincer-darwin-arm64";
+  if (platform === "darwin" && arch === "x64") return "@zero9501/git-pincer-darwin-x64";
+  if (platform === "linux" && arch === "arm64") return "@zero9501/git-pincer-linux-arm64-gnu";
+  if (platform === "linux" && arch === "x64") {
+    return isMusl() ? "@zero9501/git-pincer-linux-x64-musl" : "@zero9501/git-pincer-linux-x64-gnu";
+  }
+  if (platform === "win32" && arch === "x64") return "@zero9501/git-pincer-win32-x64";
+  return null;
+}
+
+// 定位子包内的可执行文件绝对路径, 失败时输出指引并退出
+function binaryPath() {
+  const pkg = platformPackage();
+  if (!pkg) {
+    console.error(`[git-pincer] unsupported platform: ${process.platform}-${process.arch}`);
+    console.error("[git-pincer] see https://github.com/zlx2019/git-pincer#installation for other install options");
+    process.exit(1);
+  }
+  const exe = process.platform === "win32" ? "git-pincer.exe" : "git-pincer";
+  try {
+    return path.join(path.dirname(require.resolve(`${pkg}/package.json`)), "bin", exe);
+  } catch {
+    console.error(`[git-pincer] platform package ${pkg} is missing; try reinstalling git-pincer`);
+    process.exit(1);
+  }
+}
+
+const result = spawnSync(binaryPath(), process.argv.slice(2), { stdio: "inherit" });
+if (result.error) {
+  console.error(`[git-pincer] failed to launch binary: ${result.error.message}`);
+  process.exit(1);
+}
+if (result.signal) {
+  // 被信号终止时对自身重放同一信号, 让退出码符合 shell 约定(128+N)
+  process.kill(process.pid, result.signal);
+}
+process.exit(result.status ?? 1);

package/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "git-pincer",
+  "version": "0.1.3",
+  "description": "A simple and efficient terminal Git conflict resolution CLI tool.",
+  "keywords": [
+    "git",
+    "merge",
+    "conflict",
+    "diff3",
+    "tui",
+    "cli"
+  ],
+  "homepage": "https://github.com/zlx2019/git-pincer",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zlx2019/git-pincer.git"
+  },
+  "license": "MIT",
+  "author": "Zero <1143967454@qq.com>",
+  "bin": {
+    "git-pincer": "bin/git-pincer.js"
+  },
+  "files": [
+    "bin"
+  ],
+  "engines": {
+    "node": ">=16"
+  },
+  "optionalDependencies": {
+    "@zero9501/git-pincer-darwin-arm64": "0.1.3",
+    "@zero9501/git-pincer-darwin-x64": "0.1.3",
+    "@zero9501/git-pincer-linux-arm64-gnu": "0.1.3",
+    "@zero9501/git-pincer-linux-x64-gnu": "0.1.3",
+    "@zero9501/git-pincer-linux-x64-musl": "0.1.3",
+    "@zero9501/git-pincer-win32-x64": "0.1.3"
+  }
+}