GitWand

<p align="center"> <img src="assets/logo.svg" alt="GitWand" width="300" height="120"> </p> <h1 align="center">GitWand</h1> <p align="center"> <strong>A fast, native Git client with built-in smart conflict resolution</strong> </p> <p align="center"> <a href="#desktop-app">Desktop</a> &bull; <a href="#conflict-resolution-engine">Conflict engine</a> &bull; <a href="#cli">CLI</a> &bull; <a href="#mcp-server">MCP Server</a> &bull; <a href="#architecture">Architecture</a> &bull; <a href="./ROADMAP.md">Roadmap</a> &bull; <a href="#code-signing-policy">Code signing</a> </p> <p align="center"> <img alt="License" src="https://img.shields.io/badge/license-MIT-8B5CF6"> <img alt="TypeScript" src="https://img.shields.io/badge/TypeScript-100%25-3178C6"> <img alt="Version" src="https://img.shields.io/badge/version-3.6.0-22c55e"> </p> <p align="center"> <a href="https://github.com/sponsors/devlint"> <img alt="Github Sponsor" src="https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86"> </a> </p> ---

GitWand is a lightweight, native Git client built with Tauri 2 and Vue 3. It covers the full daily workflow — changes, history, branches, push/pull — and goes further with automatic resolution of trivial merge conflicts, integrated PR code review with inline comments, and a Git Tree as the primary history view. Since v1.3, AI assists every step of the workflow — branch naming, PR writing, hunk-level review, semantic squash, and natural-language commit search. v2.7+ adds multi-repo Workspaces and Worktrees; v2.8 adds Agent Sessions (MCP); v2.9 adds a cross-repo Launchpad; v2.10 brings multi-forge pull requests across GitHub, GitLab, Bitbucket and Azure DevOps; v2.13 adds inline AI code review; v2.18 overlays CI check annotations directly on the diff; v2.19 adds OAuth device-flow sign-in for GitHub and Azure DevOps (no gh CLI required) plus cross-fork pull requests. The 3.x line makes GitWand a daily driver for AI-assisted work: v3.0 turns the cross-repo dashboard into Today, a triaged action inbox, and publishes the VS Code extension on the Marketplace; v3.2 adds an integrated terminal with AI agent tabs — including one-click AI tasks in isolated worktrees — and a dockable File Explorer / Editor panel.

Desktop app

Git Tree

The Git Tree is the primary history view — a full-resolution DAG that renders the branch topology as an SVG with trunk-pinning, lane cooldowns, WIP node, and ref badges. Click any commit to see its diff; right-click to checkout, reset, branch, tag, or cherry-pick. Branches, stashes, and tags are all managed from here without a separate panel. A filter mode (v3.2) recalculates the DAG to show only matching commits, with quick branch/author toggles, date-bucket separators, branch-name autocomplete, and #<PR number> lookup that resolves straight to the PR's branch.

Repository view

Staged, unstaged, untracked, and conflicted files in a sidebar with inline diffs in the main area. Stage, unstage, discard, and commit without leaving the interface. Partial staging at the line or hunk level.

Commit workflow

Summary + description fields, optional commit signature, Ctrl+Enter shortcut. Unpushed commits can be amended directly from the Git Tree — a pencil icon appears on hover, opening an overlay pre-filled with the existing message.

Branches

Click the branch name in the header to search, switch, create, or delete branches. Merge any branch from the dedicated merge button. Each non-current branch shows a merge preview button that simulates the merge result before committing.

Merge preview

Before merging a branch, GitWand predicts the outcome without touching the working tree — using git merge-base, git show, and git merge-file -p --diff3. The result shows a per-file breakdown:

• Auto-resolvable — GitWand can handle it automatically
• Partial — some hunks need manual resolution
• Manual — complex conflicts requiring human judgment
• Add/delete — file added on one side, deleted on the other

A badge summarises the overall result: Clean merge, 100% auto-resolvable, or N conflicts to review.

Push & Pull

One-click push and pull with badge counters showing ahead/behind commits. Auto-fetch runs in the background every 30 seconds.

Diff viewer

Side-by-side or inline toggle, persisted across sessions. Syntax highlighting for 30+ languages, word-level diff using LCS, collapsible unchanged regions, canvas minimap, hunk navigation (prev/next), double-column line numbers.

File history & blame

Full file history with git log --follow, blame view grouped by commit, time-travel diff between any two versions of a file.

Repo switcher & Workspaces

The current repo name in the header opens a dropdown showing recently opened repositories. Pin favourites, switch instantly — no file picker needed. Workspaces (v2.7) group multiple repos into a single dashboard with cross-repo status, coordinated push/pull, and quick-create worktrees (⌘⇧N). Each project tab carries a worktree submenu (v3.2) listing main plus every worktree — select one to switch that project's checkout in place, no extra tab.

Today

Today (⌘L; introduced as Launchpad in v2.9, reworked in v3.0) is a cross-repo triaged action inbox: everything in flight — WIP, PRs, Issues, Team — sorted into urgency tiers, each row carrying a state-aware primary action (Merge · Review · Resolve · Reply · See failure). Pin or snooze any item; the Team tab loads lazily for performance on large workspaces.

Pull Requests & Code Review

Browse, create, checkout, and merge pull/merge requests across GitHub, GitLab, Bitbucket and Azure DevOps without leaving the app. GitWand auto-detects the forge from the remote and routes to the right provider; accounts are managed once in Settings. The PR list sits in the sidebar and the full detail — diff, CI checks, comments, inline review — fills the main area.

• Sign in with OAuth — "Sign in with GitHub" and "Sign in with Azure DevOps" use the OAuth device flow; tokens are stored in the OS keychain and the GitHub PR workflow runs tokenless over the REST API, with no gh CLI required (the CLI path still works when no token is configured)
• Cross-fork pull requests — when origin is a fork, open a PR straight against the upstream parent (default), and see the PRs you opened upstream listed alongside your fork's own
• Inline comments — read and write review comments anchored to diff lines, with full threading and code suggestions (```suggestion ``` blocks applicable in one click)
• Inline CI check annotations — failed-check annotations overlay the diff with gutter icons (❌/⚠/ℹ) and hover tooltips, with a per-file count in the sidebar (GitHub, GitLab and Bitbucket)
• Review submission — Approve / Request changes / Comment, with a draft queue to accumulate comments before sending
• 🧠 Intelligence panel — conflict prediction (git merge-tree before merging), hotspot analysis, review scope, static AI suggestions, file review history

Agent Sessions

The Agents panel (v2.8) shows active MCP sessions and lets you launch Claude Code directly from GitWand — the agent's changes appear live in the diff viewer. The MCP catalog (Settings > MCP) lets you install any MCP server in one click.

Integrated terminal & AI tasks

The terminal panel (v3.2) renders through WebGL with inline search (Ctrl+F), clickable links, and typed tabs — shell, claude, codex — each with its own icon and an unread-output dot. "Launch Claude Code" / "Launch Codex" open a real PTY tab, and "New AI task" creates a scratch git worktree and opens a Claude Code tab in it in one click — the agent works in isolation, and when it's done you either merge the work back or delete the worktree from the project tab's submenu. Hardened with a shell-executable whitelist, safe_repo_path() on all filesystem operations, and PTY orphan prevention.

File Explorer / Editor

A dockable Files panel (v3.2, drag/resize/fullscreen) lists the full repo tree — gitignore-aware, via git ls-files — and opens files in a lazy-loaded CodeMirror 6 editor with syntax highlighting, per-tab undo history, and a lock/undo/save toolbar. Reachable from the Files tile in the AppDock, with per-repo layout settings.

Settings

Language (English, French, Spanish, Brazilian Portuguese, Simplified Chinese — OS auto-detected), theme (dark/light/system), commit signature, diff mode, external editor, Git binary path, and switch behavior (stash/ask/refuse). AI providers cover API backends (Claude / OpenAI-compatible / Ollama) and local CLI agents (Claude Code, Codex, opencode, GitHub Copilot CLI), each with its own model picker. Accounts manages forge sign-in — OAuth device flow for GitHub and Azure DevOps, App Passwords / CLI for the others. All persisted in app settings.

Installing

Download the latest build for your platform from GitHub Releases:

• macOS — .dmg (Universal: Apple Silicon + Intel, Developer ID signed + Apple-notarized)
• Linux — .AppImage or .deb
• Windows — .msi or .exe

On Windows, you can also install via winget:

winget install Devlint.GitWand

Running from source

git clone https://github.com/devlint/GitWand.git
cd GitWand
pnpm install

# Browser dev mode — no Rust needed
cd apps/desktop && pnpm dev:web

# Tauri desktop mode — requires Rust toolchain
# Install Rust: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
source "$HOME/.cargo/env"

# Desktop Dev Build (In the apps/desktop/ folder)
pnpm --filter desktop tauri dev

# On linux you may have to run
WEBKIT_DISABLE_COMPOSITING_MODE=1 pnpm --filter desktop tauri dev

--