diffler

magit, without Emacs, built for working with coding agents.
A terminal git UI where you stage and commit, review pull requests and their CI,
and leave comments in the diff that your agent answers and fixes.

Install · Quick start · Agents · Keys · FAQ · IRC

I love magit and wanted it as its own program, with the vim-style keys it has in Doom Emacs. Then coding agents came along, and reading what they write became a big part of the day. So in diffler you comment right in the diff, and your agent replies in the thread and fixes the code while you watch.

What it does

Your agent answers your comments

Press c on any line to leave a comment, or select a few lines with V first to comment on all of them. Your agent replies in each thread and fixes the code, and the diff updates while you watch.

It walks you through its change

Your agent can publish a walkthrough of what it changed: one stop per decision, each pointing at the code it is about, and open it in diffler. It can also take you straight to any file, line or pull request.

Pull requests without the browser

b p lists the open pull requests with their CI, review state and labels, on GitHub, GitLab and Forgejo. Open one to read its conversation, review the diff and submit your review. C lists every comment on the side, and R requests a reviewer, Copilot included. H hides the comments bots left, so you can focus on what people wrote.

CI logs, down to the failing step

o lists the CI runs of your branch. Open a run, then the step that failed, to read its log. Press w on a pull request to check it out in its own worktree, and it opens as a new tab next to your project.

And more

• Stage files, hunks or single lines, commit, amend, branch, stash, push and pull, all from the keyboard.
• Comment on any file of the repo, too.
• Press y to copy what you selected with V, or a file's comments as markdown to paste into any agent. On a pull request it copies the URL.
• Open your repos and worktrees as tabs and switch between them with one key.
• Step back through a file's history and see who changed each line.
• It works in git and jj repos.
• It shows images right in the terminal, over kitty, sixel or iTerm2.

Install

macOS

brew tap matheusfillipe/diffler https://github.com/matheusfillipe/diffler
brew install diffler

Windows

winget install matheusfillipe.diffler

Or with Scoop:

scoop bucket add diffler https://github.com/matheusfillipe/diffler
scoop install diffler

Arch Linux

yay -S diffler-bin

Nix

nix profile install github:matheusfillipe/diffler

Cargo

cargo install diffler

npm

npm install -g @mattfillipe/diffler

Prebuilt binaries for Linux, macOS and Windows, on x86_64 and arm64, are on the releases page.

Quick start

Run diffler in any git repo.

• Enter opens the file, diff or pull request under the cursor
• s stages, c c commits
• c comments on the line
• e opens the file in your editor
• Ctrl+k finds any command, ? shows every key

With a coding agent

Connect your agent once:

Claude Code

claude plugin marketplace add matheusfillipe/diffler
claude plugin install diffler@diffler

This also adds /df to answer your comments, /dfa for a walkthrough of a change, and /dfr to review one.

opencode

Add the server to opencode.json in the project, or globally in ~/.config/opencode/opencode.json:

{
  "mcp": {
    "diffler": {
      "type": "local",
      "command": ["npx", "-y", "diffler-mcp"],
      "enabled": true
    }
  }
}

Then install the /df, /dfa and /dfr commands:

mkdir -p ~/.config/opencode/commands
for c in df dfa dfr; do curl -fsSLo ~/.config/opencode/commands/$c.md \
  https://raw.githubusercontent.com/matheusfillipe/diffler/main/.opencode/commands/$c.md; done

Any other MCP agent

Run npx -y diffler-mcp as a stdio server. It connects to the diffler running in your repo. A client that speaks streamable HTTP can also connect to http://127.0.0.1:8417/mcp, where the first diffler you start listens.

Then ask your agent to answer your comments (/df in Claude Code and opencode). It replies in each thread and fixes the code. Its tools are in docs/mcp.md, and diffler --no-mcp turns the connection off.

FAQ

Do I need a coding agent to use diffler?
No. It is a full git UI by itself. diffler --no-mcp turns the agent connection off.

Does it send my code or usage data anywhere?
No. diffler has no telemetry. It talks to GitHub, GitLab or Forgejo only when you open their pull requests or CI, with the credentials you already set up for gh, glab or Forgejo.

Who can reach the agent connection?
Only programs on your machine. The MCP server listens on 127.0.0.1.

Can an agent post on my pull request?
No. What an agent writes stays in diffler on your machine. Only comments and replies under your name go to the forge, and only when you submit the review yourself.

Is it safe to let an agent read review comments?
Other people write the comments on a pull request, and your agent reads them as plain text. diffler passes them on unchanged, so treat them like any text from the internet when you decide what your agent may do.

Keys

You move like in vim: j/k, gg/G, / to search, Ctrl+d/Ctrl+u to scroll.

Key	What it does
Enter	Open what's under the cursor
s / u	Stage / unstage a file, a hunk, or the lines you selected with V
cc	Commit
c	Comment on the line, or on a range you selected with V, in a diff or any file
m	Mark the file as viewed
t	Change how the file list is grouped
|	Switch between a unified and a side-by-side diff
] / [	Jump to the next / previous hunk
za / Tab	Fold or unfold a hunk, or the earlier replies of a thread
* / #	Find where the symbol on the line is used
d	Review against another branch or commit
C	Open the list of comments
H	Hide or show comments from bots, in every tab
gf	Open any file in the repo
Alt+n	Open another project as a tab, then Alt+h / Alt+l to switch
w	Open, create or remove a worktree
y / Y	Copy your selection or this file's comments / all comments, to paste into any agent
gy / gx	Copy / open the GitHub, GitLab or Forgejo link to the line
B	See who last changed each line
{ / }	Step to the file's older / newer version
e	Open the file in your editor
q	Go back, or quit

The mouse works too: right-click anything for a menu. You can remap every key in docs/config.example.toml.

Configuration

diffler reads ~/.config/diffler/config.toml, then .diffler/config.toml in the repo, then the command line flags, and the later ones win. docs/config.example.toml lists every option. To see the merged result and where each value came from, run:

diffler config --dump

Themes

Press T to switch themes live, or set ui.theme. The gallery shows all of them. To make your own, put a TOML file in ~/.config/diffler/themes/, and docs/themes lists every key you can set.

Similar projects and inspiration

• magit and neogit
• lazygit
• gitui
• gitu
• tuicr
• jjui

Development

just ci     # fmt + clippy + tests
just e2e    # PTY end-to-end suite (needs uv)

You need Rust 1.90 or newer, just and cargo-nextest. Run prek install once to set up the git hooks. CONTRIBUTING.md has the rest.

License

MIT or Apache-2.0, at your option.